From 30d0663272bb023711e862871fd9bcc5ce72b52e Mon Sep 17 00:00:00 2001 From: Stefano Ragni Date: Mon, 11 Nov 2019 20:55:57 +0100 Subject: [PATCH 1/9] mesa: reorganize dri subpackages by megadrivers instead of vendors Mesa dri drivers for different vendors are actually hard links to the same file, called a `megadriver`, so they are better grouped in the same subpackage. This solves issues when stripping debug info. --- srcpkgs/mesa-XvMC | 1 + srcpkgs/mesa-dri | 1 + srcpkgs/mesa-vaapi | 1 + srcpkgs/mesa-vdpau | 1 + srcpkgs/mesa-vulkan-intel | 1 + srcpkgs/mesa-vulkan-radeon | 1 + .../mesa/patches/no-unlink-megadrivers.patch | 15 ++ srcpkgs/mesa/template | 145 +++++++++++------- 8 files changed, 111 insertions(+), 55 deletions(-) create mode 120000 srcpkgs/mesa-XvMC create mode 120000 srcpkgs/mesa-dri create mode 120000 srcpkgs/mesa-vaapi create mode 120000 srcpkgs/mesa-vdpau create mode 120000 srcpkgs/mesa-vulkan-intel create mode 120000 srcpkgs/mesa-vulkan-radeon create mode 100644 srcpkgs/mesa/patches/no-unlink-megadrivers.patch diff --git a/srcpkgs/mesa-XvMC b/srcpkgs/mesa-XvMC new file mode 120000 index 00000000000000..1ad1bbec7ab303 --- /dev/null +++ b/srcpkgs/mesa-XvMC @@ -0,0 +1 @@ +mesa \ No newline at end of file diff --git a/srcpkgs/mesa-dri b/srcpkgs/mesa-dri new file mode 120000 index 00000000000000..1ad1bbec7ab303 --- /dev/null +++ b/srcpkgs/mesa-dri @@ -0,0 +1 @@ +mesa \ No newline at end of file diff --git a/srcpkgs/mesa-vaapi b/srcpkgs/mesa-vaapi new file mode 120000 index 00000000000000..1ad1bbec7ab303 --- /dev/null +++ b/srcpkgs/mesa-vaapi @@ -0,0 +1 @@ +mesa \ No newline at end of file diff --git a/srcpkgs/mesa-vdpau b/srcpkgs/mesa-vdpau new file mode 120000 index 00000000000000..1ad1bbec7ab303 --- /dev/null +++ b/srcpkgs/mesa-vdpau @@ -0,0 +1 @@ +mesa \ No newline at end of file diff --git a/srcpkgs/mesa-vulkan-intel b/srcpkgs/mesa-vulkan-intel new file mode 120000 index 00000000000000..1ad1bbec7ab303 --- /dev/null +++ b/srcpkgs/mesa-vulkan-intel @@ -0,0 +1 @@ +mesa \ No newline at end of file diff --git a/srcpkgs/mesa-vulkan-radeon b/srcpkgs/mesa-vulkan-radeon new file mode 120000 index 00000000000000..1ad1bbec7ab303 --- /dev/null +++ b/srcpkgs/mesa-vulkan-radeon @@ -0,0 +1 @@ +mesa \ No newline at end of file diff --git a/srcpkgs/mesa/patches/no-unlink-megadrivers.patch b/srcpkgs/mesa/patches/no-unlink-megadrivers.patch new file mode 100644 index 00000000000000..3f904abe80203f --- /dev/null +++ b/srcpkgs/mesa/patches/no-unlink-megadrivers.patch @@ -0,0 +1,15 @@ +This patch is needed to retain the master .so, so that only that filename is +stripped while the related hard links are excluded. +diff --git bin/install_megadrivers.py bin/install_megadrivers.py +index 470137e..7d56def 100644 +--- bin/install_megadrivers.py ++++ bin/install_megadrivers.py +@@ -71,7 +71,7 @@ def main(): + os.chdir(ret) + + # Remove meson-created master .so and symlinks +- os.unlink(master) ++ #os.unlink(master) + name, ext = os.path.splitext(master) + while ext != '.so': + if os.path.lexists(name): diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template index 2c51cc3b68098c..38280892874e21 100644 --- a/srcpkgs/mesa/template +++ b/srcpkgs/mesa/template @@ -1,7 +1,7 @@ # Template file for 'mesa' pkgname=mesa version=19.2.7 -revision=3 +revision=4 wrksrc="mesa-${version}" build_style=meson configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true @@ -17,7 +17,7 @@ makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel libvdpau-devel libxshmfence-devel ncurses-devel talloc-devel zlib-devel $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel libXrandr-devel libglvnd-devel" -depends="libglvnd" +depends="libglvnd mesa-dri>=${version}_${revision}" short_desc="Graphics library similar to SGI's OpenGL" maintainer="Juan RP " license="MIT, LGPL-2.1-or-later" @@ -46,8 +46,10 @@ i686*|x86_64*) configure_args+=" -Dvulkan-overlay-layer=true" hostmakedepends+=" clang" makedepends+=" libclc-git" - subpackages+=" libxatracker mesa-ati-dri mesa-intel-dri mesa-nouveau-dri" - subpackages+=" mesa-vmwgfx-dri mesa-opencl mesa-vulkan-overlay-layer" + subpackages+=" libxatracker mesa-opencl mesa-dri mesa-vaapi mesa-vdpau" + subpackages+=" mesa-XvMC mesa-vulkan-intel mesa-vulkan-radeon mesa-vulkan-overlay-layer" + # Transitional dummy packages + subpackages+=" mesa-ati-dri mesa-intel-dri mesa-nouveau-dri mesa-vmwgfx-dri" ;; ppc*) # Enable all ppc drivers. @@ -63,13 +65,17 @@ ppc*) esac hostmakedepends+=" clang" makedepends+=" libclc-git" + subpackages+=" mesa-opencl mesa-dri mesa-vaapi mesa-vdpau mesa-XvMC mesa-vulkan-radeon" + subpackages+=" mesa-vulkan-overlay-layer" + # Transitional dummy packages subpackages+=" mesa-ati-dri mesa-nouveau-dri" - subpackages+=" mesa-opencl mesa-vulkan-overlay-layer" ;; aarch64*) configure_args+=" -Dgallium-drivers=nouveau,tegra,swrast,vc4" configure_args+=" -Dvulkan-drivers= -Ddri-drivers=" configure_args+=" -Dgallium-xa=false -Ddri3=true" + subpackages+=" mesa-dri mesa-vaapi mesa-vdpau mesa-XvMC" + # Transitional dummy packages subpackages+=" mesa-tegra-dri mesa-nouveau-dri mesa-vc4-dri" ;; armv7l*) @@ -77,6 +83,8 @@ armv7l*) configure_args+=" -Dgallium-drivers=swrast,vc4" configure_args+=" -Dvulkan-drivers= -Ddri-drivers= -Dgallium-xvmc=false" configure_args+=" -Dgallium-xa=false -Dgallium-vdpau=false -Dgallium-va=false" + subpackages+=" mesa-dri" + # Transitional dummy packages subpackages+=" mesa-vc4-dri" ;; *) @@ -85,6 +93,7 @@ armv7l*) configure_args+=" -Ddri-drivers= -Dvulkan-drivers= -Dgallium-va=false" configure_args+=" -Dgallium-vdpau=false -Dgallium-xvmc=false" configure_args+=" -Dgallium-xa=false" + subpackages+=" mesa-dri" ;; esac @@ -106,7 +115,6 @@ esac case "$XBPS_TARGET_MACHINE" in # Disable TLS with musl: https://bugs.freedesktop.org/show_bug.cgi?id=35268 - # TODO: maybe this is handled by libglvnd now *-musl) configure_args+=" -Duse-elf-tls=false";; *) configure_args+=" -Dglx=dri";; esac @@ -177,81 +185,72 @@ libxatracker_package() { } } -mesa-ati-dri_package() { - short_desc="Mesa DRI drivers for ATI GPUs" - depends="mesa-${version}_${revision}" - lib32files="/usr/share/vulkan/icd.d/radeon_icd.i686.json" +mesa-opencl_package() { + short_desc="Mesa implementation of OpenCL (r600+ only)" + depends="libclc libOpenCL" pkg_install() { - vmove "usr/lib/libXvMCr[36]00.so.*" - vmove "usr/lib/vdpau/libvdpau_r[36]00.so*" - vmove "usr/lib/vdpau/libvdpau_radeon*.so*" - vmove "usr/lib/xorg/modules/drivers/radeon*" - vmove "usr/lib/xorg/modules/drivers/r[236]00*" - vmove usr/lib/dri/r* - vmove "usr/share/vulkan/icd.d/radeon_icd*.json" - vmove "usr/lib/libvulkan_radeon.so" - vmove "usr/lib/gallium-pipe/pipe_r[36]00.so" - vmove usr/lib/gallium-pipe/pipe_radeonsi.so + vmove etc/OpenCL + vmove "usr/lib/libMesaOpenCL.so.*" } } -mesa-intel-dri_package() { - short_desc="Mesa DRI drivers for Intel GPUs" +mesa-dri_package() { + short_desc="Mesa DRI drivers" depends="mesa-${version}_${revision}" - lib32files="/usr/share/vulkan/icd.d/intel_icd.i686.json" + nostrip_files="i915_dri.so i965_dri.so kms_swrast_dri.so nouveau_dri.so + nouveau_vieux_dri.so r200_dri.so r300_dri.so r600_dri.so radeon_dri.so + radeonsi_dri.so swrast_dri.so tegra_dri.so vc4_dri.so virtio_gpu_dri.so + vmwgfx_dri.so" pkg_install() { - vmove "usr/lib/xorg/modules/drivers/i9[16]5_dri.*" - vmove "usr/share/vulkan/icd.d/intel_icd*.json" - vmove "usr/lib/libvulkan_intel.so" + vmove "usr/lib/xorg/modules/drivers"; + if [ -d "$DESTDIR/usr/lib/gallium-pipe" ]; then + vmove "usr/lib/gallium-pipe/pipe_*.so" + fi } } -mesa-nouveau-dri_package() { - short_desc="Mesa DRI drivers for NVIDIA GPUs (nouveau dri)" - depends="mesa-${version}_${revision}" +mesa-vaapi_package() { + short_desc="Mesa VA-API drivers" + nostrip_files="nouveau_drv_video.so r600_drv_video.so radeonsi_drv_video.so" pkg_install() { - vmove "usr/lib/libXvMCnouveau.so.*" - vmove "usr/lib/vdpau/libvdpau_nouveau.so*" - vmove "usr/lib/xorg/modules/drivers/nouveau*" - vmove "usr/lib/dri/nouveau*" - case "$XBPS_TARGET_MACHINE" in - aarch64*) ;; - *) vmove usr/lib/gallium-pipe/pipe_nouveau.so ;; - esac + vmove "usr/lib/dri/*_drv_video.so" } } -mesa-vmwgfx-dri_package() { - short_desc="Mesa DRI drivers for VMware" - depends="mesa-${version}_${revision}" +mesa-vdpau_package() { + short_desc="Mesa VDPAU drivers" + nostrip_files="libvdpau_r300.so.1.0.0 libvdpau_r600.so.1.0.0 + libvdpau_radeonsi.so.1.0.0 libvdpau_nouveau.so.1.0.0" + noshlibprovides=yes # manually set them in case they are needed pkg_install() { - vmove "usr/lib/xorg/modules/drivers/vmwgfx*" - vmove usr/lib/gallium-pipe/pipe_vmwgfx.so + vmove "usr/lib/vdpau/libvdpau_*" } } -mesa-vc4-dri_package() { - short_desc="Mesa DRI drivers for Videocore IV GPU" - depends="mesa-${version}_${revision}" +mesa-XvMC_package() { + short_desc="Mesa XvMC drivers" + nostrip_files="libXvMCnouveau.so.1.0.0 libXvMCr600.so.1.0.0" + noshlibprovides=yes # manually set them in case they are needed pkg_install() { - vmove "usr/lib/xorg/modules/drivers/vc4*" + vmove "usr/lib/libXvMC*" } } -mesa-opencl_package() { - short_desc="Mesa implementation of OpenCL (r600+ only)" - depends="libclc libOpenCL mesa-${version}_${revision}" +mesa-vulkan-intel_package() { + short_desc="Mesa Intel Vulkan driver" + lib32files="/usr/share/vulkan/icd.d/intel_icd.i686.json" pkg_install() { - vmove etc/OpenCL - vmove "usr/lib/libMesaOpenCL*" + vmove "usr/share/vulkan/icd.d/intel_icd*.json" + vmove "usr/lib/libvulkan_intel.so" } } -mesa-tegra-dri_package() { - short_desc="Mesa DRI drivers for Tegra GPU" - depends="mesa-nouveau-dri-${version}_${revision}" +mesa-vulkan-radeon_package() { + short_desc="Mesa Radeon Vulkan driver" + lib32files="/usr/share/vulkan/icd.d/radeon_icd.i686.json" pkg_install() { - vmove "usr/lib/xorg/modules/drivers/tegra*" + vmove "usr/share/vulkan/icd.d/radeon_icd*.json" + vmove "usr/lib/libvulkan_radeon.so" } } @@ -262,3 +261,39 @@ mesa-vulkan-overlay-layer_package() { vmove usr/share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json } } + +mesa-ati-dri_package() { + build_style=meta + short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)" + depends="mesa-dri mesa-vaapi mesa-vdpau mesa-XvMC mesa-vulkan-radeon" +} + +mesa-intel-dri_package() { + build_style=meta + short_desc="Mesa DRI drivers for Intel GPUs (transitional dummy package)" + depends="mesa-dri mesa-vulkan-intel" +} + +mesa-nouveau-dri_package() { + build_style=meta + short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)" + depends="mesa-dri mesa-vaapi mesa-vdpau mesa-XvMC" +} + +mesa-vmwgfx-dri_package() { + build_style=meta + short_desc="Mesa DRI drivers for VMware (transitional dummy package)" + depends="mesa-dri" +} + +mesa-vc4-dri_package() { + build_style=meta + short_desc="Mesa DRI drivers for Videocore IV GPU (transitional dummy package)" + depends="mesa-dri" +} + +mesa-tegra-dri_package() { + build_style=meta + short_desc="Mesa DRI drivers for Tegra GPU (transitional dummy package)" + depends="mesa-dri" +} From 2543c918f160171c4c24b573036a57aee2066fa5 Mon Sep 17 00:00:00 2001 From: Stefano Ragni Date: Mon, 11 Nov 2019 21:08:54 +0100 Subject: [PATCH 2/9] common/shlibs: remove unused mesa XvMC libs --- common/shlibs | 2 -- 1 file changed, 2 deletions(-) diff --git a/common/shlibs b/common/shlibs index 144029d5200d88..ef819f9bb868f4 100644 --- a/common/shlibs +++ b/common/shlibs @@ -309,8 +309,6 @@ libXfontcache.so.1 libXfontcache-1.0.4_1 libXv.so.1 libXv-1.0.4_1 libXvMC.so.1 libXvMC-1.0.4_1 libXvMCW.so.1 libXvMC-1.0.4_1 -libXvMCr600.so.1 mesa-ati-dri-10.1.0_1 -libXvMCnouveau.so.1 mesa-nouveau-dri-10.1.0_1 libxcb-errors.so.0 xcb-util-errors-1.0_1 libxcb-icccm.so.4 xcb-util-wm-0.3.9_1 libxcb-ewmh.so.2 xcb-util-wm-0.3.9_1 From 28b4ed906450b75c70492ded35bf871848da6322 Mon Sep 17 00:00:00 2001 From: Stefano Ragni Date: Tue, 19 Nov 2019 19:56:59 +0100 Subject: [PATCH 3/9] rpi-firmware: mesa-dri pkgs reorganization --- srcpkgs/rpi-firmware/files/config.txt | 2 +- srcpkgs/rpi-firmware/template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rpi-firmware/files/config.txt b/srcpkgs/rpi-firmware/files/config.txt index fc2b042f092123..a5b8eb245bb716 100755 --- a/srcpkgs/rpi-firmware/files/config.txt +++ b/srcpkgs/rpi-firmware/files/config.txt @@ -74,7 +74,7 @@ ## Enable/Disable experimental desktop GL driver -## requires package: mesa-vc4-dri +## requires package: mesa-dri ## with full kms #dtoverlay=vc4-kms-v3d diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template index 4d31e05152bd9e..3b99c21ac45555 100644 --- a/srcpkgs/rpi-firmware/template +++ b/srcpkgs/rpi-firmware/template @@ -4,7 +4,7 @@ _gitshort="${_githash:0:7}" pkgname=rpi-firmware version=20191118 -revision=1 +revision=2 archs=noarch wrksrc="firmware-${_githash}" short_desc="Firmware files for the Raspberry Pi (git ${_gitshort})" From db38bed15d0687576728afefa1883796e0e55035 Mon Sep 17 00:00:00 2001 From: Stefano Ragni Date: Tue, 19 Nov 2019 19:57:19 +0100 Subject: [PATCH 4/9] steam: mesa-dri pkgs reorganization --- srcpkgs/steam/INSTALL.msg | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/srcpkgs/steam/INSTALL.msg b/srcpkgs/steam/INSTALL.msg index 483402b52ce487..b94c26fe5370db 100644 --- a/srcpkgs/steam/INSTALL.msg +++ b/srcpkgs/steam/INSTALL.msg @@ -7,9 +7,7 @@ Generic: For users of the open source drivers: - - mesa-ati-dri-32bit (AMD) - - mesa-intel-dri-32bit (Intel) - - mesa-nouveau-dri-32bit (NVIDIA) + - mesa-32bit For users of the proprietary NVIDIA driver: From 20b75b2fb56a63c0d0227399742ad613bd33989e Mon Sep 17 00:00:00 2001 From: Stefano Ragni Date: Tue, 19 Nov 2019 19:58:32 +0100 Subject: [PATCH 5/9] xf86-video-amdgpu: mesa-dri pkgs reorganization --- srcpkgs/xf86-video-amdgpu/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template index 8488f26a9315f3..7b50bcd9951572 100644 --- a/srcpkgs/xf86-video-amdgpu/template +++ b/srcpkgs/xf86-video-amdgpu/template @@ -1,13 +1,13 @@ # Template file for 'xf86-video-amdgpu' pkgname=xf86-video-amdgpu version=19.1.0 -revision=1 +revision=2 archs="i686* x86_64* ppc64* ppc ppc-musl" build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel pixman-devel MesaLib-devel xorg-server-devel" -depends="virtual?xserver-abi-video-24_1 mesa-ati-dri" +depends="virtual?xserver-abi-video-24_1 mesa-dri" short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)" maintainer="Orphaned " license="MIT" From 2b83a35db280b5b145eb5b32d94c5b5b27fe034e Mon Sep 17 00:00:00 2001 From: Stefano Ragni Date: Tue, 19 Nov 2019 19:58:44 +0100 Subject: [PATCH 6/9] xf86-video-ati: mesa-dri pkgs reorganization --- srcpkgs/xf86-video-ati/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xf86-video-ati/template b/srcpkgs/xf86-video-ati/template index 6cff9e0ca8ef53..825b2076023d92 100644 --- a/srcpkgs/xf86-video-ati/template +++ b/srcpkgs/xf86-video-ati/template @@ -1,13 +1,13 @@ # Template file for 'xf86-video-ati' pkgname=xf86-video-ati version=19.1.0 -revision=1 +revision=2 archs="i686* x86_64* ppc ppc-musl ppc64*" build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel pixman-devel MesaLib-devel xorg-server-devel" -depends="virtual?xserver-abi-video-24_1 mesa-ati-dri" +depends="virtual?xserver-abi-video-24_1 mesa-dri" short_desc="Xorg ATI Radeon video driver" maintainer="Orphaned " license="MIT" From 5fb00225a0584ac7734154ea0846e9b96fb8ea5e Mon Sep 17 00:00:00 2001 From: Stefano Ragni Date: Tue, 19 Nov 2019 19:58:57 +0100 Subject: [PATCH 7/9] xf86-video-intel: mesa-dri pkgs reorganization --- srcpkgs/xf86-video-intel/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xf86-video-intel/template b/srcpkgs/xf86-video-intel/template index 8f0b071b218ca0..1d722450d4c9e5 100644 --- a/srcpkgs/xf86-video-intel/template +++ b/srcpkgs/xf86-video-intel/template @@ -1,7 +1,7 @@ # Template file for 'xf86-video-intel' pkgname=xf86-video-intel version=2.99.917.899 -revision=1 +revision=2 _commit=f66d39544bb8339130c96d282a80f87ca1606caf archs="i686* x86_64*" build_style=gnu-configure @@ -9,7 +9,7 @@ configure_args="--with-default-dri=3" hostmakedepends="git automake libtool pkg-config xorg-util-macros" makedepends="libXScrnSaver-devel libXcursor-devel libXinerama-devel libXrandr-devel libXvMC-devel xorg-server-devel" -depends="virtual?xserver-abi-video-24_1 mesa-intel-dri" +depends="virtual?xserver-abi-video-24_1 mesa-dri" short_desc="Xorg DDX Intel video driver" maintainer="Benjamin Slade " license="MIT" From 210b8cf5c5683c800b25d8fe9335f18b61fddf2c Mon Sep 17 00:00:00 2001 From: Stefano Ragni Date: Tue, 19 Nov 2019 19:59:12 +0100 Subject: [PATCH 8/9] xf86-video-nouveau: mesa-dri pkgs reorganization --- srcpkgs/xf86-video-nouveau/template | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xf86-video-nouveau/template b/srcpkgs/xf86-video-nouveau/template index 73b56ab443c4bd..81129aa30f467c 100644 --- a/srcpkgs/xf86-video-nouveau/template +++ b/srcpkgs/xf86-video-nouveau/template @@ -1,18 +1,22 @@ # Template file for 'xf86-video-nouveau' pkgname=xf86-video-nouveau version=1.0.16 -revision=1 -build_style=gnu-configure +revision=2 archs="i686* x86_64* ppc ppc-musl ppc64*" +build_style=gnu-configure hostmakedepends="pkg-config" makedepends="eudev-libudev-devel libdrm-devel xorg-server-devel" -depends="virtual?xserver-abi-video-24_1 mesa-nouveau-dri" +depends="virtual?xserver-abi-video-24_1 mesa-dri" short_desc="Xorg opensource NVIDIA video driver" maintainer="Orphaned " -license="GPL-2" +license="MIT" homepage="http://nouveau.freedesktop.org/wiki/" distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.gz" checksum=83553d4625e2990e569312e26540bebbdb2de14896ad4e9a9c872eda1df6cc7d lib32disabled=yes LDFLAGS="-Wl,-z,lazy" + +post_install() { + vlicense COPYING +} From cb050620ba64f8fbad6ecebec9bb7b86539ec386 Mon Sep 17 00:00:00 2001 From: Stefano Ragni Date: Tue, 19 Nov 2019 19:59:33 +0100 Subject: [PATCH 9/9] xf86-video-vmware: mesa-dri pkgs reorganization --- srcpkgs/xf86-video-vmware/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xf86-video-vmware/template b/srcpkgs/xf86-video-vmware/template index 441bcdb58e9c6d..1da7f33d8ef11d 100644 --- a/srcpkgs/xf86-video-vmware/template +++ b/srcpkgs/xf86-video-vmware/template @@ -1,14 +1,13 @@ -# Template build file for 'xf86-video-vmware' +# Template file for 'xf86-video-vmware' pkgname=xf86-video-vmware version=13.3.0 -revision=1 -lib32disabled=yes +revision=2 archs="i686* x86_64*" build_style=gnu-configure configure_args="--enable-vmwarectrl-client" hostmakedepends="pkg-config" makedepends="libdrm-devel MesaLib-devel xorg-server-devel" -depends="virtual?xserver-abi-video-24_1 mesa-vmwgfx-dri" +depends="virtual?xserver-abi-video-24_1 mesa-dri" short_desc="Modular Xorg VMware virtual video driver" maintainer="Orphaned " license="MIT" @@ -16,6 +15,8 @@ homepage="http://xorg.freedesktop.org" distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2" checksum=47971924659e51666a757269ad941a059ef5afe7a47b5101c174a6022ac4066c +lib32disabled=yes + LDFLAGS="-Wl,-z,lazy" post_install() {