wok-next rev 20182

qt5, mesa17 : split more, up deps.
author Xander Ziiryanoff <psychomaniak@xakep.ru>
date Thu Nov 02 14:38:29 2017 +0100 (2017-11-02)
parents 31b0fa204936
children c78b38baa3f0
files mesa17/receipt qt5/receipt
line diff
     1.1 --- a/mesa17/receipt	Thu Nov 02 13:24:48 2017 +0100
     1.2 +++ b/mesa17/receipt	Thu Nov 02 14:38:29 2017 +0100
     1.3 @@ -18,7 +18,7 @@
     1.4  xorg-libXdamage-dev xorg-libXfixes-dev xorg-libXxf86vm-dev expat-dev \
     1.5  elfutils-dev llvm-dev xorg-libpciaccess-dev wayland-dev libva-dev libvdpau-dev \
     1.6  zlib-dev"
     1.7 -SPLIT="mesa17-dri mesa17-libegl mesa17-libgbm mesa17-osmesa \
     1.8 +SPLIT="mesa17-dri mesa17-libegl mesa17-libgbm mesa17-osmesa mesa17-libswrAVX \
     1.9  mesa17-libwayland-egl mesa17-libxatracker mesa17-vdpau mesa17 mesa17-dev"
    1.10  
    1.11  compile_rules() {
    1.12 @@ -101,11 +101,16 @@
    1.13  			xorg-libxcb xorg-libxshmfence zlib"
    1.14  			PROVIDE="mesa-vdpau"
    1.15  			;;
    1.16 +		*-libswrAVX)
    1.17 +			copy libswrAVX*so*
    1.18 +			CAT="x-window|Fast software rendering driver for CPU with AVX"
    1.19 +			DEPENDS="mesa17 llvm-libs"
    1.20 +			;;
    1.21  		mesa17)
    1.22  			copy @std
    1.23  			remove_already_packed
    1.24  			CAT="x-window|main OpenGL libraries"
    1.25 -			DEPENDS="expat libdrm llvm-libs xorg-libX11 xorg-libXau \
    1.26 +			DEPENDS="expat libdrm xorg-libX11 xorg-libXau \
    1.27  			xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes \
    1.28  			xorg-libXxf86vm xorg-libxcb xorg-libxshmfence zlib"
    1.29  			SUGGESTED="nvidia"
     2.1 --- a/qt5/receipt	Thu Nov 02 13:24:48 2017 +0100
     2.2 +++ b/qt5/receipt	Thu Nov 02 14:38:29 2017 +0100
     2.3 @@ -32,7 +32,7 @@
     2.4  qt5-serialbus        qt5-serialport       qt5-speech           \
     2.5  qt5-svg              qt5-tools            qt5-virtualkeyboard  \
     2.6  qt5-wayland          qt5-webchannel       qt5-websockets       \
     2.7 -qt5-x11extras        qt5-xmlpatterns      \
     2.8 +qt5-x11extras        qt5-xmlpatterns      qt5-base-egl	\
     2.9  \
    2.10  qt5-locale-ar    qt5-locale-ca    qt5-locale-cs    qt5-locale-da \
    2.11  qt5-locale-de    qt5-locale-en    qt5-locale-es    qt5-locale-fa \
    2.12 @@ -179,6 +179,10 @@
    2.13  			CAT="development|GTK+3 theme support"
    2.14  			DEPENDS="qt5-base atk cairo gdk-pixbuf glib gtk+3 mesa17 pango \
    2.15  			xorg-libX11 xorg-libXext";;
    2.16 +		qt5-base-egl)
    2.17 +			copy libQt5Egl*
    2.18 +			CAT="development|EGL libs"
    2.19 +			DEPENDS="qt5-base mesa17 mesa17-libegl mesa17-libgbm" ;;
    2.20  		*)
    2.21  			# examine folders in $src to understand what we need to copy from $install
    2.22  			examine="$src/qt${PACKAGE#qt5-}"
    2.23 @@ -210,6 +214,7 @@
    2.24  		qt5-3d)
    2.25  			CAT="development|3D module"
    2.26  			DEPENDS="qt5-base qt5-declarative qt5-gamepad mesa17 zlib";;
    2.27 +
    2.28  		qt5-base)
    2.29  			# Move binaries (that required for compiling the packages) to qt5-dev
    2.30  			rm -r $fs/usr/bin
    2.31 @@ -217,12 +222,15 @@
    2.32  			# Move to qt5-base-gtk3 because only it depends on GTK3 and friends
    2.33  			rm $fs/usr/lib/qt5/plugins/platformthemes/libqgtk3.so
    2.34  
    2.35 +			# Move to qt5-base-egl
    2.36 +			rm -f $fs/usr/lib/libQt5Egl*
    2.37 +
    2.38  			CAT="development|Base module"
    2.39  			DEPENDS="dbus eudev fontconfig freetype glib icu libcrypto libcups \
    2.40  			libdrm libharfbuzz libicu libinput libjpeg-turbo libpng16 \
    2.41 -			libsqlite3 libssl libxkbcommon mesa17 mesa17-libegl mesa17-libgbm \
    2.42 +			libsqlite3 libssl libxkbcommon libxkbcommon-x11 mesa17  \
    2.43  			mtdev tslib xorg-libICE xorg-libSM xorg-libX11 xorg-libXext \
    2.44 -			xorg-libXi xorg-libxcb zlib";;
    2.45 +			xorg-libXi xorg-libxcb zlib libatomic";;
    2.46  		qt5-canvas3d)
    2.47  			CAT="development|Canvas3D module"
    2.48  			DEPENDS="qt5-base qt5-declarative mesa17";;