wok-next rev 20504
Combine cairo & cairo-gl, remove old mesa-wayland, rebuild libsdl with OpenGL support (mupen64plus require); up cookutils, vivaldi (fix arch, need to up version?), weston.
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Fri Mar 16 12:14:10 2018 +0200 (2018-03-16) |
| parents | da9e80c5d4bb |
| children | 0879a3baa73c |
| files | cairo-gl/receipt cairo/receipt cookutils/receipt libsdl/receipt mesa-wayland/receipt mesa-wayland/stuff/nouveau-fix-header.patch mupen64plus/receipt vivaldi/receipt weston/receipt |
line diff
1.1 --- a/cairo-gl/receipt Fri Mar 16 06:03:21 2018 +0200 1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1.3 @@ -1,71 +0,0 @@ 1.4 -# SliTaz package receipt v2. 1.5 - 1.6 -PACKAGE="cairo-gl" 1.7 -VERSION="1.14.4" 1.8 -CATEGORY="x-window" 1.9 -SHORT_DESC="2D graphics library with GL support" 1.10 -MAINTAINER="pankso@slitaz.org" 1.11 -LICENSE="MPL LGPL2.1" 1.12 -SOURCE="cairo" 1.13 -TARBALL="$SOURCE-$VERSION.tar.xz" 1.14 -WEB_SITE="https://www.cairographics.org/" 1.15 -WGET_URL="${WEB_SITE}releases/$TARBALL" 1.16 - 1.17 -BUILD_DEPENDS="pkg-config glib-dev libpng16-dev zlib-dev fontconfig-dev \ 1.18 -freetype-dev xorg-libX11-dev xorg-pixman-dev xorg-libXau-dev xorg-libXdmcp-dev \ 1.19 -xorg-libXrender-dev xorg-xcb-util-dev xorg-libxcb-dev expat-dev libxml2-dev \ 1.20 -mesa-dev eudev-dev xorg-libXxf86vm-dev libdrm-dev mesa-libegl \ 1.21 -xorg-libxshmfence-dev" 1.22 -SPLIT="cairo-gl cairo-gl-dev cairo-gl-tools" 1.23 -SIBLINGS="cairo" 1.24 - 1.25 -# Rules to configure and make the package. 1.26 -compile_rules() 1.27 -{ 1.28 - ./configure \ 1.29 - --prefix=/usr \ 1.30 - --enable-xcb \ 1.31 - --enable-tee \ 1.32 - --enable-gl \ 1.33 - --disable-static \ 1.34 - $CONFIGURE_ARGS && 1.35 - make $MAKEFLAGS && 1.36 - make DESTDIR=$DESTDIR install 1.37 -} 1.38 - 1.39 -# Rules to gen a SliTaz package suitable for Tazpkg. 1.40 -genpkg_rules() 1.41 -{ 1.42 - case $PACKAGE in 1.43 - cairo-gl) 1.44 - DEPENDS="bzlib fontconfig freetype glib glibc-base harfbuzz \ 1.45 - libdrm libffi libpng16 xorg-libxcb libxml2 mesa mesa-libegl \ 1.46 - pcre xorg-pixman eudev xorg-libX11 xorg-libXau \ 1.47 - xorg-libXdamage xorg-libXdmcp xorg-libXext \ 1.48 - xorg-libXfixes xorg-libXrender xorg-libXxf86vm zlib" 1.49 - mkdir -p $fs/usr/lib 1.50 - cp -a $install/usr/lib/*.so* $fs/usr/lib 1.51 - ;; 1.52 - cairo-gl-dev) 1.53 - CAT="development|2D graphics library with GL support, development files" 1.54 - DEPENDS="cairo-gl cairo-gl-tools fontconfig-dev freetype-dev \ 1.55 - glib-dev harfbuzz-dev libdrm-dev libffi-dev libpng16-dev \ 1.56 - xorg-libxcb-dev libxml2-dev mesa-wayland-dev pcre-dev \ 1.57 - xorg-pixman-dev udev-dev wayland-dev xorg-libX11-dev \ 1.58 - xorg-libXau-dev xorg-libXdamage-dev xorg-libXdmcp-dev \ 1.59 - xorg-libXext-dev xorg-libXfixes-dev \ 1.60 - xorg-libXrender-dev xorg-libXxf86vm-dev" 1.61 - mkdir -p $fs/usr/lib 1.62 - cp -a $install/usr/lib/*.*a $fs/usr/lib 1.63 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 1.64 - cp -a $install/usr/include $fs/usr 1.65 - ;; 1.66 - cairo-gl-tools) 1.67 - CAT="development|2D graphics library, development tools" 1.68 - DEPENDS="cairo-gl libbfd wayland" 1.69 - mkdir -p $fs/usr/lib/cairo 1.70 - cp -a $install/usr/bin $fs/usr 1.71 - cp -a $install/usr/lib/cairo/*.so* $fs/usr/lib/cairo 1.72 - ;; 1.73 - esac 1.74 -}
2.1 --- a/cairo/receipt Fri Mar 16 06:03:21 2018 +0200 2.2 +++ b/cairo/receipt Fri Mar 16 12:14:10 2018 +0200 2.3 @@ -17,9 +17,9 @@ 2.4 expat-dev libxml2-dev" 2.5 SPLIT="cairo cairo-tools cairo-dev" 2.6 2.7 -#BUILD_DEPENDS="$BUILD_DEPENDS mesa-dev eudev-dev xorg-libXxf86vm-dev \ 2.8 -#libdrm-dev mesa-libegl xorg-libxshmfence-dev" 2.9 -#SPLIT="$SPLIT cairo-gl:gl cairo-gl-tools:gl cairo-gl-dev:gl" 2.10 +BUILD_DEPENDS="$BUILD_DEPENDS mesa-dev eudev-dev xorg-libXxf86vm-dev \ 2.11 +libdrm-dev mesa-libegl xorg-libxshmfence-dev" 2.12 +SPLIT="$SPLIT cairo-gl:gl cairo-gl-tools:gl cairo-gl-dev:gl" 2.13 2.14 compile_rules() { 2.15 case "$ARCH" in 2.16 @@ -48,45 +48,42 @@ 2.17 case $PACKAGE in 2.18 cairo) 2.19 copy libcairo.so* libcairo-gobject.so* libcairo-script-interpreter.so* 2.20 - DEPENDS="bzlib fontconfig freetype glib glibc-base harfbuzz libffi \ 2.21 - libpng16 xorg-libxcb libxml2 pcre xorg-pixman xorg-libX11 xorg-libXau \ 2.22 - xorg-libXdmcp xorg-libXext xorg-libXrender zlib" 2.23 + DEPENDS="fontconfig freetype glib libpng16 xorg-libX11 xorg-libxcb \ 2.24 + xorg-pixman zlib" 2.25 ;; 2.26 cairo-tools) 2.27 copy bin/ cairo-fdr.so* cairo-sphinx.so* libcairo-trace.so* 2.28 CAT="development|development tools" 2.29 - DEPENDS="cairo libbfd" 2.30 + DEPENDS="cairo glib xorg-libX11 xorg-libXrender xorg-libxcb \ 2.31 + xorg-pixman zlib" 2.32 ;; 2.33 cairo-dev) 2.34 copy @dev 2.35 - DEPENDS="cairo cairo-tools bzip2 fontconfig-dev freetype-dev \ 2.36 - glib-dev harfbuzz-dev libffi-dev libpng16-dev xorg-libxcb-dev \ 2.37 - libxml2-dev pcre-dev xorg-pixman-dev xorg-libX11-dev xorg-libXau-dev \ 2.38 - xorg-libXdmcp-dev xorg-libXext-dev xorg-libXrender-dev" 2.39 + DEPENDS="cairo cairo-tools \ 2.40 + fontconfig-dev freetype-dev glib-dev libpng16-dev xorg-libX11-dev \ 2.41 + xorg-libXext-dev xorg-libXrender-dev xorg-libxcb-dev \ 2.42 + xorg-pixman-dev zlib-dev" 2.43 ;; 2.44 2.45 cairo-gl) 2.46 copy usr/lib/*.so* 2.47 CAT="x-window|with GL support" 2.48 - DEPENDS="bzlib fontconfig freetype glib glibc-base harfbuzz libdrm \ 2.49 - libffi libpng16 xorg-libxcb libxml2 mesa mesa-libegl pcre xorg-pixman eudev \ 2.50 - xorg-libX11 xorg-libXau xorg-libXdamage xorg-libXdmcp xorg-libXext \ 2.51 - xorg-libXfixes xorg-libXrender xorg-libXxf86vm zlib" 2.52 + DEPENDS="fontconfig freetype glib libpng16 mesa mesa-libegl \ 2.53 + xorg-libX11 xorg-libxcb xorg-pixman zlib" 2.54 ;; 2.55 cairo-gl-tools) 2.56 copy usr/bin/ usr/lib/cairo/*.so* 2.57 CAT="development|development tools with GL support" 2.58 - DEPENDS="cairo-gl libbfd wayland" 2.59 + DEPENDS="cairo-gl glib mesa mesa-libegl xorg-libX11 \ 2.60 + xorg-libXrender xorg-libxcb xorg-pixman zlib" 2.61 ;; 2.62 cairo-gl-dev) 2.63 copy @dev 2.64 CAT="development|development files with GL support" 2.65 - DEPENDS="cairo-gl cairo-gl-tools fontconfig-dev freetype-dev \ 2.66 - glib-dev harfbuzz-dev libdrm-dev libffi-dev libpng16-dev xorg-libxcb-dev \ 2.67 - libxml2-dev mesa-wayland-dev pcre-dev xorg-pixman-dev udev-dev \ 2.68 - wayland-dev xorg-libX11-dev xorg-libXau-dev xorg-libXdamage-dev \ 2.69 - xorg-libXdmcp-dev xorg-libXext-dev xorg-libXfixes-dev \ 2.70 - xorg-libXrender-dev xorg-libXxf86vm-dev" 2.71 + DEPENDS="cairo-gl cairo-gl-tools \ 2.72 + fontconfig-dev freetype-dev glib-dev libpng16-dev mesa-dev \ 2.73 + xorg-libX11-dev xorg-libXext-dev xorg-libXrender-dev \ 2.74 + xorg-libxcb-dev xorg-pixman-dev zlib-dev" 2.75 ;; 2.76 esac 2.77 }
3.1 --- a/cookutils/receipt Fri Mar 16 06:03:21 2018 +0200 3.2 +++ b/cookutils/receipt Fri Mar 16 12:14:10 2018 +0200 3.3 @@ -1,7 +1,7 @@ 3.4 # SliTaz package receipt v2. 3.5 3.6 PACKAGE="cookutils" 3.7 -VERSION="1035" 3.8 +VERSION="1036" 3.9 CATEGORY="base-system" 3.10 SHORT_DESC="SliTaz packages builder new generation" 3.11 MAINTAINER="pankso@slitaz.org" 3.12 @@ -40,7 +40,7 @@ 3.13 esac 3.14 } 3.15 3.16 -post_install_cookutils() { 3.17 +NO_post_install_cookutils() { 3.18 case "$(cat "$1/etc/hostname" 2>/dev/null)" in 3.19 tank*) 3.20 if ! chroot "$1/" tazpkg list | grep -q aufs ; then
4.1 --- a/libsdl/receipt Fri Mar 16 06:03:21 2018 +0200 4.2 +++ b/libsdl/receipt Fri Mar 16 12:14:10 2018 +0200 4.3 @@ -12,8 +12,8 @@ 4.4 TARBALL="SDL-$VERSION.tar.gz" 4.5 WGET_URL="http://www.libsdl.org/release/$TARBALL" 4.6 4.7 -BUILD_DEPENDS="nasm alsa-lib-dev xorg-libX11-dev xorg-libXrandr-dev \ 4.8 -glu-dev tslib-dev" 4.9 +BUILD_DEPENDS="nasm alsa-lib-dev xorg-libX11-dev xorg-libICE-dev \ 4.10 +xorg-libXrandr-dev mesa-dev glu-dev tslib-dev libusb-dev" 4.11 SPLIT="libsdl-dev" 4.12 4.13 compile_rules() { 4.14 @@ -21,6 +21,7 @@ 4.15 -i src/video/x11/SDL_x11sym.h && 4.16 4.17 ./configure \ 4.18 + CPPFLAGS="-I/usr/include/libusb-1.0" \ 4.19 --disable-static \ 4.20 $CONFIGURE_ARGS && 4.21 make &&
5.1 --- a/mesa-wayland/receipt Fri Mar 16 06:03:21 2018 +0200 5.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 5.3 @@ -1,63 +0,0 @@ 5.4 -# SliTaz package receipt v2. 5.5 - 5.6 -PACKAGE="mesa-wayland" 5.7 -VERSION="9.1.3" 5.8 -CATEGORY="x-window" 5.9 -SHORT_DESC="3D Graphics Library that is an open-source implementaton of OpenGL" 5.10 -MAINTAINER="pascal.bellard@slitaz.org" 5.11 -LICENSE="MIT" 5.12 -WEB_SITE="http://www.mesa3d.org/" 5.13 - 5.14 -TARBALL="MesaLib-$VERSION.tar.bz2" 5.15 -WGET_URL="ftp://ftp.freedesktop.org/pub/mesa/$VERSION/$TARBALL" 5.16 - 5.17 -BUILD_DEPENDS_arm="expat-dev libdrm-dev xorg-libXdamage-dev pkg-config \ 5.18 -xorg-libXxf86vm-dev xorg-libXt-dev xorg-dri2proto xorg-glproto \ 5.19 -lesstif libxml2-python lesstif-dev xorg-server-dev udev-dev wayland-dev gettext" 5.20 -BUILD_DEPENDS="expat-dev libdrm-dev xorg-libXdamage-dev pkg-config \ 5.21 -xorg-libXxf86vm-dev xorg-libXt-dev xorg-dri2proto xorg-glproto lesstif \ 5.22 -libxml2-python lesstif-dev xorg-server-dev udev-dev wayland-dev gettext talloc \ 5.23 -xorg-makedepend xorg-imake file libdrm-nouveau llvm libtool automake autoconf \ 5.24 -libpthread-stubs-dev" 5.25 -SPLIT="mesa-wayland-dev" 5.26 - 5.27 -compile_rules() { 5.28 - find . -name 'nouveau*.h' \ 5.29 - | xargs sed -i 's|libdrm/nouveau.h|libdrm/nouveau/nouveau.h|' 5.30 - ./autogen.sh \ 5.31 - --prefix=/usr \ 5.32 - --sysconfdir=/etc/X11/${PACKAGE} \ 5.33 - --enable-gles2 \ 5.34 - --disable-gallium-egl \ 5.35 - --with-egl-platforms=x11,wayland,drm \ 5.36 - --enable-gbm \ 5.37 - --enable-shared-glapi \ 5.38 - --with-gallium-drivers=r300,r600,swrast,nouveau \ 5.39 - $CONFIGURE_ARGS && 5.40 - make $MAKEFLAGS && make install 5.41 -} 5.42 - 5.43 -genpkg_rules() { 5.44 - case $PACKAGE in 5.45 - mesa-wayland) 5.46 - mkdir -p $fs/usr/lib/dri 5.47 - cp -a $install/etc $fs 5.48 - cp -a $install/usr/lib/*.so* $fs/usr/lib 5.49 - cp -a $install/usr/lib/dri/*.so* $fs/usr/lib/dri 5.50 - 5.51 - DEPENDS="expat libdrm xorg-libXdamage xorg-libXxf86vm xorg-libXt \ 5.52 - udev wayland" 5.53 - SUGGESTED="nvidia" 5.54 - PROVIDE="libgl" 5.55 - ;; 5.56 - *-dev) 5.57 - mkdir -p $fs/usr/lib/dri 5.58 - cp -a $install/usr/include $fs/usr 5.59 - cp -a $install/usr/lib/*.*a $fs/usr/lib 5.60 - cp -a $install/usr/lib/dri/*.*a $fs/usr/lib/dri 5.61 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 5.62 - DEPENDS="mesa-wayland udev-dev" 5.63 - ;; 5.64 - esac 5.65 -} 5.66 -
6.1 --- a/mesa-wayland/stuff/nouveau-fix-header.patch Fri Mar 16 06:03:21 2018 +0200 6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 6.3 @@ -1,86 +0,0 @@ 6.4 -From 5c102dd94f435e97507213fbd128e50dd15f5f54 Mon Sep 17 00:00:00 2001 6.5 -From: Ben Skeggs <bskeggs@redhat.com> 6.6 -Date: Mon, 20 Dec 2010 03:39:36 +0000 6.7 -Subject: nouveau: fix includes for latest libdrm 6.8 - 6.9 -Signed-off-by: Ben Skeggs <bskeggs@redhat.com> 6.10 ---- 6.11 -diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h 6.12 -index ab480ca..747b084 100644 6.13 ---- a/src/gallium/drivers/nouveau/nouveau_winsys.h 6.14 -+++ b/src/gallium/drivers/nouveau/nouveau_winsys.h 6.15 -@@ -10,7 +10,7 @@ 6.16 - #include "nouveau/nouveau_grobj.h" 6.17 - #include "nouveau/nouveau_notifier.h" 6.18 - #include "nouveau/nouveau_resource.h" 6.19 --#include "nouveau/nouveau_pushbuf.h" 6.20 -+#include "nouveau/nv04_pushbuf.h" 6.21 - 6.22 - #ifndef NV04_PFIFO_MAX_PACKET_LEN 6.23 - #define NV04_PFIFO_MAX_PACKET_LEN 2047 6.24 -diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c 6.25 -index ce48022..a99df76 100644 6.26 ---- a/src/gallium/drivers/nv50/nv50_surface.c 6.27 -+++ b/src/gallium/drivers/nv50/nv50_surface.c 6.28 -@@ -22,7 +22,7 @@ 6.29 - 6.30 - #define __NOUVEAU_PUSH_H__ 6.31 - #include <stdint.h> 6.32 --#include "nouveau/nouveau_pushbuf.h" 6.33 -+#include "nouveau/nv04_pushbuf.h" 6.34 - #include "nv50_context.h" 6.35 - #include "nv50_resource.h" 6.36 - #include "pipe/p_defines.h" 6.37 -diff --git a/src/gallium/drivers/nvfx/nv04_2d.c b/src/gallium/drivers/nvfx/nv04_2d.c 6.38 -index e0e65e7..e2fadd3 100644 6.39 ---- a/src/gallium/drivers/nvfx/nv04_2d.c 6.40 -+++ b/src/gallium/drivers/nvfx/nv04_2d.c 6.41 -@@ -34,11 +34,11 @@ 6.42 - #include <stdio.h> 6.43 - #include <stdint.h> 6.44 - #include <nouveau/nouveau_device.h> 6.45 --#include <nouveau/nouveau_pushbuf.h> 6.46 - #include <nouveau/nouveau_channel.h> 6.47 - #include <nouveau/nouveau_bo.h> 6.48 - #include <nouveau/nouveau_notifier.h> 6.49 - #include <nouveau/nouveau_grobj.h> 6.50 -+#include <nouveau/nv04_pushbuf.h> 6.51 - #include "nv04_2d.h" 6.52 - 6.53 - #include "nouveau/nv_object.xml.h" 6.54 -diff --git a/src/gallium/drivers/nvfx/nvfx_vbo.c b/src/gallium/drivers/nvfx/nvfx_vbo.c 6.55 -index 597664e..339b317 100644 6.56 ---- a/src/gallium/drivers/nvfx/nvfx_vbo.c 6.57 -+++ b/src/gallium/drivers/nvfx/nvfx_vbo.c 6.58 -@@ -9,8 +9,7 @@ 6.59 - #include "nvfx_resource.h" 6.60 - 6.61 - #include "nouveau/nouveau_channel.h" 6.62 -- 6.63 --#include "nouveau/nouveau_pushbuf.h" 6.64 -+#include "nouveau/nv04_pushbuf.h" 6.65 - 6.66 - static inline unsigned 6.67 - util_guess_unique_indices_count(unsigned mode, unsigned indices) 6.68 -diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h 6.69 -index 8036b18..c5ac128 100644 6.70 ---- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h 6.71 -+++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h 6.72 -@@ -38,7 +38,6 @@ 6.73 - #include <assert.h> 6.74 - 6.75 - #include "nouveau_device.h" 6.76 --#include "nouveau_pushbuf.h" 6.77 - #include "nouveau_grobj.h" 6.78 - #include "nouveau_channel.h" 6.79 - #include "nouveau_bo.h" 6.80 -@@ -46,6 +45,7 @@ 6.81 - #include "nouveau_screen.h" 6.82 - #include "nouveau_state.h" 6.83 - #include "nouveau_surface.h" 6.84 -+#include "nv04_pushbuf.h" 6.85 - 6.86 - #define DRIVER_DATE "20091015" 6.87 - #define DRIVER_AUTHOR "Nouveau" 6.88 --- 6.89 -cgit v0.8.3-6-g21f6
7.1 --- a/mupen64plus/receipt Fri Mar 16 06:03:21 2018 +0200 7.2 +++ b/mupen64plus/receipt Fri Mar 16 12:14:10 2018 +0200 7.3 @@ -1,4 +1,4 @@ 7.4 -# SliTaz package receipt. 7.5 +# SliTaz package receipt v2. 7.6 7.7 PACKAGE="mupen64plus" 7.8 VERSION="2.5" 7.9 @@ -6,27 +6,26 @@ 7.10 SHORT_DESC="Nintendo64 Emulator" 7.11 MAINTAINER="slaxemulator@gmail.com" 7.12 LICENSE="GPL2" 7.13 +WEB_SITE="http://www.mupen64plus.org/" 7.14 + 7.15 TARBALL="$PACKAGE-bundle-src-$VERSION.tar.gz" 7.16 -WEB_SITE="http://www.mupen64plus.org/" 7.17 WGET_URL="https://github.com/mupen64plus/mupen64plus-core/releases/download/$VERSION/$TARBALL" 7.18 -TAGS="emulator nintendo64" 7.19 7.20 -DEPENDS="bzlib freetype libboost-filesystem glu libsamplerate libsdl speex" 7.21 BUILD_DEPENDS="gtk+-dev libboost-dev libboost-filesystem glu-dev \ 7.22 -libsamplerate-dev libsdl-dev libsdl-ttf-dev mesa-dev speex-dev yasm zlib-dev" 7.23 +libsamplerate-dev libsdl-dev libsdl-ttf-dev mesa-dev speex-dev yasm zlib-dev \ 7.24 +speexdsp-dev" 7.25 7.26 -# Rules to configure and make the package. 7.27 -compile_rules() 7.28 -{ 7.29 +compile_rules() { 7.30 export PREFIX=/usr DESTDIR=$install 7.31 ./m64p_build.sh && 7.32 - ./m64p_install.sh 7.33 + ./m64p_install.sh || return 1 7.34 + 7.35 + find $install -name '*.so*' -exec chmod 755 '{}' \; 7.36 } 7.37 7.38 -# Rules to gen a SliTaz package suitable for Tazpkg. 7.39 -genpkg_rules() 7.40 -{ 7.41 - cp -a $install/* $fs 7.42 - rm -r $fs/usr/include 7.43 - find $fs -name '*.so*' -exec chmod a+x \{\} \; 7.44 +genpkg_rules() { 7.45 + copy @std 7.46 + DEPENDS="freetype glu libboost-filesystem libboost-system libpng16 \ 7.47 + libsamplerate libsdl mesa speexdsp zlib" 7.48 + TAGS="emulator nintendo64" 7.49 }
8.1 --- a/vivaldi/receipt Fri Mar 16 06:03:21 2018 +0200 8.2 +++ b/vivaldi/receipt Fri Mar 16 12:14:10 2018 +0200 8.3 @@ -7,8 +7,9 @@ 8.4 MAINTAINER="al.bobylev@gmail.com" 8.5 LICENSE="custom" 8.6 WEB_SITE="https://vivaldi.com/" 8.7 +HOST_ARCH="i486 x86_64" 8.8 8.9 -TARBALL="vivaldi-stable-$VERSION-1.i386.rpm" 8.10 +TARBALL="vivaldi-stable-$VERSION-1.${ARCH/i486/i386}.rpm" 8.11 WGET_URL="https://downloads.vivaldi.com/stable/$TARBALL" 8.12 8.13 compile_rules() {
9.1 --- a/weston/receipt Fri Mar 16 06:03:21 2018 +0200 9.2 +++ b/weston/receipt Fri Mar 16 12:14:10 2018 +0200 9.3 @@ -11,38 +11,37 @@ 9.4 TARBALL="$PACKAGE-$VERSION.tar.xz" 9.5 WGET_URL="http://wayland.freedesktop.org/releases/$TARBALL" 9.6 9.7 -BUILD_DEPENDS="wayland-dev mesa-wayland-dev cairo-gl-dev libxkbcommon-dev \ 9.8 +BUILD_DEPENDS="wayland-dev mesa-dev cairo-gl-dev libxkbcommon-dev \ 9.9 libunwind-dev mtdev-dev xorg-libXcursor-dev pam-dev xz-dev \ 9.10 -gegl-dev libdrm-dev xorg-libXxf86vm-dev udev-dev pkg-config jpeg-dev" 9.11 +gegl-dev libdrm-dev xorg-libXxf86vm-dev eudev-dev libjpeg-turbo-dev expat-dev \ 9.12 +xorg-libxshmfence-dev" 9.13 SPLIT="weston-dev" 9.14 9.15 compile_rules() { 9.16 + fix ld 9.17 ./configure \ 9.18 --prefix=/usr \ 9.19 --libexec=/usr/lib/weston \ 9.20 --disable-documentation \ 9.21 --enable-fbdev-compositor && 9.22 - make && make install 9.23 + fix libtool && 9.24 + make && make install || return 1 9.25 + 9.26 + # Custom weston-session 9.27 + cp -f $stuff/weston-session $install/usr/bin 9.28 } 9.29 9.30 genpkg_rules() { 9.31 case $PACKAGE in 9.32 weston) 9.33 - mkdir -p $fs/usr/lib/weston $fs/usr/share 9.34 - cp -a $install/usr/bin $fs/usr 9.35 - cp -a $install/usr/lib/weston/*.so* $fs/usr/lib/weston 9.36 - cp -a $install/usr/lib/weston/weston-* $fs/usr/lib/weston 9.37 - cp -a $install/usr/share/weston $fs/usr/share 9.38 - # Custom weston-session 9.39 - cp -f $stuff/weston-session $fs/usr/bin 9.40 - DEPENDS="wayland mesa-wayland cairo-gl libxkbcommon libunwind \ 9.41 - mtdev xorg-libXcursor pam liblzma" 9.42 + copy @std 9.43 + DEPENDS="cairo-gl eudev libdrm libjpeg-turbo libpng16 libunwind \ 9.44 + libxkbcommon-wayland mesa mesa-libegl mesa-libgbm \ 9.45 + mesa-libwayland-egl mtdev pam wayland xorg-libX11 xorg-libXcursor \ 9.46 + xorg-libxcb xorg-pixman" 9.47 ;; 9.48 *-dev) 9.49 - mkdir -p $fs/usr/lib/weston $fs/usr/share 9.50 - cp -a $install/usr/include $fs/usr 9.51 - cp -a $install/usr/lib/weston/*.*a $fs/usr/lib/weston 9.52 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 9.53 + copy @dev 9.54 ;; 9.55 esac 9.56 }