From 6d2859b86338bc56e61c410f39f9fbc8bf557365 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 4 Feb 2015 21:31:29 +0100 Subject: [PATCH 01/17] xorg-server: update to 1.17.0. - Bump xserver-abi-extension to 9. - Bump xserver-abi-video to 19. - This now has modesetting built-in, replaces xf86-video-modesetting. The video pkgs must be rebuilt against the new ABI. --- srcpkgs/xorg-server/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template index 30b4bddc3ff..36df851296f 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -1,6 +1,6 @@ # Template build file for 'xorg-server'. pkgname=xorg-server -version=1.16.3 +version=1.17.0 revision=1 build_style=gnu-configure configure_args="--enable-ipv6 --enable-xcsecurity --enable-record @@ -20,7 +20,7 @@ maintainer="Juan RP " homepage="http://xorg.freedesktop.org" license="MIT/X11, BSD" distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2" -checksum=5e0f443238af1078b48f6eea98a382861b59187da221c2cf714d31c1d560b0fb +checksum=4e8548bae163129d2fc8f8e1f3b6071fe9d62821e3d5617507ccd2f589526166 lib32disabled=yes @@ -34,10 +34,11 @@ makedepends=" libXfont-devel libXmu-devel libXrender-devel libXfixes-devel libXi-devel libXaw-devel libdrm-devel libXtst-devel libXres-devel libxkbui-devel libxkbfile-devel libXxf86dga-devel libXv-devel pixman-devel libxshmfence-devel - wayland-devel libepoxy-devel" + wayland-devel libepoxy-devel xcb-util-renderutil-devel" # See hw/xfree86/common/xf86Module.h. Only care for the major version. depends="xkeyboard-config" -provides="xserver-abi-extension-8_1 xserver-abi-input-21_1 xserver-abi-video-18_1" +provides="xserver-abi-extension-9_1 xserver-abi-input-21_1 xserver-abi-video-19_1" +replaces="xf86-video-modesetting>=0" # Package build options build_options="systemd" @@ -77,7 +78,6 @@ xorg-server-xnest_package() { vmove usr/share/man/man1/Xnest.1 } } - xorg-server-xephyr_package() { short_desc="X server outputting to a window on a pre-existing X display" pkg_install() { From a48607f2667c53ccf493edd164d024bb8b5b1538 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 4 Feb 2015 21:42:13 +0100 Subject: [PATCH 02/17] xf86-video-intel: rebuild against xorg-server-1.17. --- srcpkgs/xf86-video-intel/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xf86-video-intel/template b/srcpkgs/xf86-video-intel/template index 6bf2b523fe7..d2c77ebe7da 100644 --- a/srcpkgs/xf86-video-intel/template +++ b/srcpkgs/xf86-video-intel/template @@ -1,15 +1,15 @@ # Template build file for 'xf86-video-intel'. pkgname=xf86-video-intel version=2.99.917 -revision=2 +revision=3 lib32disabled=yes build_style=gnu-configure configure_args="--with-default-accel=sna --enable-kms-only --enable-sna" hostmakedepends="pkg-config dri2proto>=2.6" makedepends="libudev-devel libdrm-devel libpciaccess-devel libXext-devel libXfixes-devel libXv-devel libXvMC-devel xcb-util-devel>=0.3.9 MesaLib-devel - xorg-server-devel>=1.16<1.17" -depends="virtual?xserver-abi-video>=18_1 mesa-intel-dri" + xorg-server-devel>=1.17<1.18" +depends="virtual?xserver-abi-video-19_1 mesa-intel-dri" only_for_archs="i686 x86_64" short_desc="Xorg DDX Intel video driver" maintainer="Juan RP " From 7c01cb1ccd79803687b4c0f772d17a6d11db81a7 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 4 Feb 2015 21:44:19 +0100 Subject: [PATCH 03/17] xf86-video-ati: rebuild against xorg-server-1.17. --- srcpkgs/xf86-video-ati/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xf86-video-ati/template b/srcpkgs/xf86-video-ati/template index c0956394e23..795b1f2d55e 100644 --- a/srcpkgs/xf86-video-ati/template +++ b/srcpkgs/xf86-video-ati/template @@ -1,15 +1,15 @@ # Template build file for 'xf86-video-ati'. pkgname=xf86-video-ati version=7.5.0 -revision=1 +revision=2 lib32disabled=yes only_for_archs="i686 x86_64" build_style=gnu-configure configure_args="--enable-glamor" hostmakedepends="pkg-config" makedepends="xf86driproto libudev-devel libpciaccess-devel - libdrm-devel pixman-devel MesaLib-devel xorg-server-devel>=1.16<1.17" -depends="virtual?xserver-abi-video-18_1 mesa-ati-dri" + libdrm-devel pixman-devel MesaLib-devel xorg-server-devel>=1.17<1.18" +depends="virtual?xserver-abi-video-19_1 mesa-ati-dri" replaces="xf86-video-ati>=0" short_desc="Xorg ATI Radeon video driver" maintainer="Juan RP " From 7027f7b085b658b6ad4248a4bbf83e8f6111d048 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 4 Feb 2015 21:47:07 +0100 Subject: [PATCH 04/17] xf86-video-cirrus: rebuild against xorg-server-1.17. --- srcpkgs/xf86-video-cirrus/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xf86-video-cirrus/template b/srcpkgs/xf86-video-cirrus/template index 59be1a8ebf2..6b97dbcc1f6 100644 --- a/srcpkgs/xf86-video-cirrus/template +++ b/srcpkgs/xf86-video-cirrus/template @@ -1,12 +1,12 @@ # Template build file for 'xf86-video-cirrus'. pkgname=xf86-video-cirrus version=1.5.2 -revision=4 +revision=5 lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="xorg-server-devel>=1.16<1.17" -depends="virtual?xserver-abi-video-18_1" +makedepends="xorg-server-devel>=1.17<1.18" +depends="virtual?xserver-abi-video-19_1" short_desc="Xorg Cirrus Logic video driver" homepage="http://xorg.freedesktop.org" license="MIT" From 0f476f29d8aed8b2beee99325616e3eb22659c42 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 4 Feb 2015 21:53:37 +0100 Subject: [PATCH 05/17] xf86-video-fbdev: rebuild against xorg-server-1.17. --- srcpkgs/xf86-video-fbdev/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xf86-video-fbdev/template b/srcpkgs/xf86-video-fbdev/template index 844541dff6a..5850f59e83c 100644 --- a/srcpkgs/xf86-video-fbdev/template +++ b/srcpkgs/xf86-video-fbdev/template @@ -1,12 +1,12 @@ # Template build file for 'xf86-video-fbdev'. pkgname=xf86-video-fbdev version=0.4.4 -revision=4 +revision=5 lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="xorg-server-devel>=1.16<1.17" -depends="virtual?xserver-abi-video-18_1" +makedepends="xorg-server-devel>=1.17<1.18" +depends="virtual?xserver-abi-video-19_1" short_desc="Xorg framebuffer video driver" homepage="http://xorg.freedesktop.org" license="MIT" From 171dd76872b3cf7e0138dc46177ffff0c1649118 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 4 Feb 2015 21:57:40 +0100 Subject: [PATCH 06/17] xf86-video-fbturbo: rebuild against xorg-sever-1.17. --- srcpkgs/xf86-video-fbturbo/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xf86-video-fbturbo/template b/srcpkgs/xf86-video-fbturbo/template index 71c0df3369b..30b1bec8eed 100644 --- a/srcpkgs/xf86-video-fbturbo/template +++ b/srcpkgs/xf86-video-fbturbo/template @@ -1,7 +1,7 @@ # Template build file for 'xf86-video-fbturbo'. pkgname=xf86-video-fbturbo version=0.4.0 -revision=7 +revision=8 build_style=gnu-configure short_desc="Xorg DDX driver for Allwinner A10/A13 and other ARM devices" homepage="http://github.com/ssvb/xf86-video-fbturbo" @@ -11,9 +11,9 @@ distfiles="https://github.com/ssvb/xf86-video-fbturbo/archive/${version}.tar.gz" checksum=10411686de0a9d8b2cde300b0d68e9f1d22e3611470d357ef3afc337f123ca0f only_for_archs="armv6l armv7l" -hostmakedepends="pkg-config xorg-server-devel>=1.16<1.17" -makedepends="libXrandr-devel xorg-server-devel>=1.16<1.17" -depends="virtual?xserver-abi-video-18_1" +hostmakedepends="pkg-config xorg-server-devel>=1.17<1.18" +makedepends="libXrandr-devel xorg-server-devel>=1.17<1.18" +depends="virtual?xserver-abi-video-19_1" replaces="xf86-video-fbturbo>=0" if [ "$XBPS_TARGET_MACHINE" = "armv7l" ]; then From 87e8c25b81dab9ccdb1749507ea6dc38a5bec7ad Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 4 Feb 2015 22:02:42 +0100 Subject: [PATCH 07/17] xf86-video-geode: update for xorg-server-1.17, but set it as broken. --- srcpkgs/xf86-video-geode/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xf86-video-geode/template b/srcpkgs/xf86-video-geode/template index 19b14b5b648..4fe3364b586 100644 --- a/srcpkgs/xf86-video-geode/template +++ b/srcpkgs/xf86-video-geode/template @@ -6,8 +6,9 @@ lib32disabled=yes build_style=gnu-configure # This is x86 specific. only_for_archs=i686 -makedepends="pkg-config libXv-devel libXrandr-devel xorg-server-devel>=1.16<1.17" -depends="virtual?xserver-abi-video-18_1" +broken="does not build with xorg-server-1.17" +makedepends="pkg-config libXv-devel libXrandr-devel xorg-server-devel>=1.17<1.18" +depends="virtual?xserver-abi-video-19_1" short_desc="Xorg AMD Geode GX/LX video driver" maintainer="Juan RP " distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2" From 1541a332f7c010a33246b77d4a107bc453728dbf Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 4 Feb 2015 22:03:17 +0100 Subject: [PATCH 08/17] xf86-video-modesetting: removed; superseded by xorg-server-1.17. --- srcpkgs/xf86-video-modesetting/template | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 srcpkgs/xf86-video-modesetting/template diff --git a/srcpkgs/xf86-video-modesetting/template b/srcpkgs/xf86-video-modesetting/template deleted file mode 100644 index 06aed73c266..00000000000 --- a/srcpkgs/xf86-video-modesetting/template +++ /dev/null @@ -1,15 +0,0 @@ -# Template build file for 'xf86-video-modesetting'. -pkgname=xf86-video-modesetting -version=0.9.0 -revision=2 -lib32disabled=yes -build_style=gnu-configure -hostmakedepends="pkg-config" -makedepends="libdrm-devel>=2.4.37 xorg-server-devel>=1.16<1.17" -depends="virtual?xserver-abi-video-18_1" -short_desc="X.org generic modesetting video driver" -maintainer="Juan RP " -homepage="http://xorg.freedesktop.org/" -license="MIT" -distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" -checksum=90cf085573203dfadd48ea69bd694c4d04ccbe088b6855e9c85c34bb8a95d75c From 385e65aadbad39bed8900cc6f38e0099813fc86a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 4 Feb 2015 22:04:21 +0100 Subject: [PATCH 09/17] xf86-video-nouveau: rebuild against xorg-server-1.17. --- srcpkgs/xf86-video-nouveau/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xf86-video-nouveau/template b/srcpkgs/xf86-video-nouveau/template index 47d9875f988..0c30424d540 100644 --- a/srcpkgs/xf86-video-nouveau/template +++ b/srcpkgs/xf86-video-nouveau/template @@ -1,13 +1,13 @@ # Template build file for 'xf86-video-nouveau'. pkgname=xf86-video-nouveau version=1.0.11 -revision=1 +revision=2 lib32disabled=yes build_style=gnu-configure only_for_archs="i686 x86_64" hostmakedepends="pkg-config" -makedepends="libudev-devel>=183 libdrm-devel xorg-server-devel>=1.16<1.17" -depends="virtual?xserver-abi-video-18_1 mesa-nouveau-dri" +makedepends="libudev-devel libdrm-devel xorg-server-devel>=1.17<1.18" +depends="virtual?xserver-abi-video-19_1 mesa-nouveau-dri" short_desc="Xorg opensource NVIDIA video driver" maintainer="Juan RP " homepage="http://nouveau.freedesktop.org/wiki/" From f0b820ae6f0e1c1c83f4b66470177c7ed16d4124 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 4 Feb 2015 22:06:35 +0100 Subject: [PATCH 10/17] xf86-video-openchrome: update for xorg-server-1.17; broken currently. --- srcpkgs/xf86-video-openchrome/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xf86-video-openchrome/template b/srcpkgs/xf86-video-openchrome/template index 869d10d6f6c..284ee07a69d 100644 --- a/srcpkgs/xf86-video-openchrome/template +++ b/srcpkgs/xf86-video-openchrome/template @@ -4,11 +4,12 @@ version=0.3.1 revision=6 lib32disabled=yes only_for_archs=i686 +broken="does not build xorg-server-1.17" build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libdrm-devel libX11-devel libXext-devel libXv-devel libXvMC-devel - MesaLib-devel xorg-server-devel>=1.16<1.17" -depends="virtual?xserver-abi-video-18_1" + MesaLib-devel xorg-server-devel>=1.17<1.18" +depends="virtual?xserver-abi-video-19_1" short_desc="Xorg VIA Unichromes video driver" homepage="http://xorg.freedesktop.org" license="MIT" From a32c57067cca601e6a2d44ffae24b71b590c8f64 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 4 Feb 2015 22:08:19 +0100 Subject: [PATCH 11/17] xf86-video-sisusb: rebuild against xorg-server-1.17. --- srcpkgs/xf86-video-sisusb/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xf86-video-sisusb/template b/srcpkgs/xf86-video-sisusb/template index e432f746e6e..e7833427db9 100644 --- a/srcpkgs/xf86-video-sisusb/template +++ b/srcpkgs/xf86-video-sisusb/template @@ -1,12 +1,12 @@ # Template build file for 'xf86-video-sisusb'. pkgname=xf86-video-sisusb version=0.9.6 -revision=7 +revision=8 lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="xorg-server-devel>=1.16<1.17" -depends="virtual?xserver-abi-video-18_1" +makedepends="xorg-server-devel>=1.17<1.18" +depends="virtual?xserver-abi-video-19_1" short_desc="Xorg SiS USB video driver" homepage="http://xorg.freedesktop.org/" license="Custom" From cc8fb60d4f40e970e6d3bbeef4e242c0d3ea57ed Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 4 Feb 2015 22:09:12 +0100 Subject: [PATCH 12/17] xf86-video-vesa: rebuild against xorg-server-1.17. --- srcpkgs/xf86-video-vesa/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xf86-video-vesa/template b/srcpkgs/xf86-video-vesa/template index 95a72c75b6e..1b49c213fe8 100644 --- a/srcpkgs/xf86-video-vesa/template +++ b/srcpkgs/xf86-video-vesa/template @@ -2,12 +2,12 @@ pkgname=xf86-video-vesa version="2:2.3.3" wrksrc="${pkgname}-${version#*:}" -revision=4 +revision=5 lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="xorg-server-devel>=1.16<1.17" -depends="virtual?xserver-abi-video-18_1" +makedepends="xorg-server-devel>=1.17<1.18" +depends="virtual?xserver-abi-video-19_1" short_desc="Xorg VESA video driver" homepage="http://xorg.freedesktop.org" license="MIT" From 86746bca1fc6b9718d78bc4731cdae6b0c17ad10 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 4 Feb 2015 22:10:21 +0100 Subject: [PATCH 13/17] xf86-video-vmware: rebuild against xorg-server-1.17. --- srcpkgs/xf86-video-vmware/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xf86-video-vmware/template b/srcpkgs/xf86-video-vmware/template index 1d6662759c2..1ce03d35427 100644 --- a/srcpkgs/xf86-video-vmware/template +++ b/srcpkgs/xf86-video-vmware/template @@ -1,14 +1,14 @@ # Template build file for 'xf86-video-vmware'. pkgname=xf86-video-vmware version=13.1.0 -revision=1 +revision=2 lib32disabled=yes only_for_archs="i686 x86_64" build_style=gnu-configure configure_args="--enable-vmwarectrl-client" hostmakedepends="pkg-config" -makedepends="libdrm-devel MesaLib-devel>=10.1 xorg-server-devel>=1.16<1.17" -depends="virtual?xserver-abi-video-18_1 mesa-vmwgfx-dri" +makedepends="libdrm-devel MesaLib-devel>=10.1 xorg-server-devel>=1.17<1.18" +depends="virtual?xserver-abi-video-19_1 mesa-vmwgfx-dri" short_desc="Modular Xorg VMware virtual video driver" maintainer="Juan RP " homepage="http://xorg.freedesktop.org" From a91221bde5e69efbab6fe3e978d28be56d93cffb Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 4 Feb 2015 22:11:37 +0100 Subject: [PATCH 14/17] nvidia{,-stable}: accept xorg-server-1.17. --- srcpkgs/nvidia-stable/template | 4 ++-- srcpkgs/nvidia/template | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/nvidia-stable/template b/srcpkgs/nvidia-stable/template index 1d7cca3c1bc..bbabcb37aa1 100644 --- a/srcpkgs/nvidia-stable/template +++ b/srcpkgs/nvidia-stable/template @@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux (long-lived series)" pkgname=nvidia-stable version=340.76 -revision=2 +revision=3 maintainer="Juan RP " license="Propietary NVIDIA license" homepage="http://www.nvidia.com" @@ -13,7 +13,7 @@ only_for_archs="i686 x86_64" repository="nonfree" create_wrksrc=yes short_desc="${_desc} - Libraries and Utilities" -depends="virtual?xserver-abi-video<19 nvidia-stable-dkms-${version}_${revision} pkg-config" +depends="virtual?xserver-abi-video<20 nvidia-stable-dkms-${version}_${revision} pkg-config" conflicts="catalyst>=0" provides="nvidia-${version}_${revision} libGL-${version}_${revision}" diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template index 6618edfe6a0..889c2a5a0ac 100644 --- a/srcpkgs/nvidia/template +++ b/srcpkgs/nvidia/template @@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux" pkgname=nvidia version=346.35 -revision=2 +revision=3 maintainer="Juan RP " license="Propietary NVIDIA license" homepage="http://www.nvidia.com" @@ -13,7 +13,7 @@ only_for_archs="i686 x86_64" repository="nonfree" create_wrksrc=yes short_desc="${_desc} - Libraries and Utilities" -depends="virtual?xserver-abi-video<19 nvidia-dkms-${version}_${revision} pkg-config" +depends="virtual?xserver-abi-video<20 nvidia-dkms-${version}_${revision} pkg-config" conflicts="catalyst>=0" provides="libGL-${version}_${revision}" From 1f281341240fe3c9e5496d8c4ac0138379f1c149 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 5 Feb 2015 07:10:24 +0100 Subject: [PATCH 15/17] nvidia304: apply linux-3.18 patch from nvidia; accept xorg-server-1.17. --- srcpkgs/nvidia304/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nvidia304/template b/srcpkgs/nvidia304/template index 84630d345a1..02a2476cab9 100644 --- a/srcpkgs/nvidia304/template +++ b/srcpkgs/nvidia304/template @@ -3,7 +3,7 @@ _desc="NVIDIA drivers for linux (304.xx series)" pkgname=nvidia304 version=304.125 -revision=2 +revision=3 maintainer="Juan RP " license="Propietary NVIDIA license" homepage="http://www.nvidia.com" @@ -12,7 +12,7 @@ repository="nonfree" create_wrksrc=yes only_for_archs="i686 x86_64" short_desc="${_desc} - Libraries and Utilities" -depends="virtual?xserver-abi-video<19 ${pkgname}-dkms-${version}_${revision} pkg-config" +depends="virtual?xserver-abi-video<20 ${pkgname}-dkms-${version}_${revision} pkg-config" provides="nvidia-${version}_${revision} libGL-${version}_${revision}" replaces="nvidia>=0 libGL>=0" conflicts="catalyst>=0" @@ -33,6 +33,10 @@ do_extract() { ./${_pkg}.run --extract-only rm -f ${_pkg}.run } +do_configure() { + cd ${_pkg} + patch -sNp0 -i ${XBPS_SRCPKGDIR}/nvidia/files/linux-3.18.patch +} do_install() { cd ${_pkg} From 59b795c7a085aa9667c2f65a7d54291cb60d6270 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 5 Feb 2015 07:56:00 +0100 Subject: [PATCH 16/17] virtualbox-ose: rebuild against xorg-server-1.17. --- .../patches/004-system-xorg.patch | 25 +++++++--------- .../patches/xorg-server-1.17.patch | 30 +++++++++++++++++++ srcpkgs/virtualbox-ose/template | 9 +++--- 3 files changed, 44 insertions(+), 20 deletions(-) create mode 100644 srcpkgs/virtualbox-ose/patches/xorg-server-1.17.patch diff --git a/srcpkgs/virtualbox-ose/patches/004-system-xorg.patch b/srcpkgs/virtualbox-ose/patches/004-system-xorg.patch index c527f7f20b8..acf0033357b 100644 --- a/srcpkgs/virtualbox-ose/patches/004-system-xorg.patch +++ b/srcpkgs/virtualbox-ose/patches/004-system-xorg.patch @@ -1,6 +1,5 @@ -diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/common/crOpenGL/Makefile.kmk ---- VirtualBox-4.2.10.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-03-19 18:55:28.774951223 +0000 -+++ VirtualBox-4.2.10/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-03-19 18:58:06.337193736 +0000 +--- src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-03-19 18:55:28.774951223 +0000 ++++ src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-03-19 18:58:06.337193736 +0000 @@ -63,18 +63,12 @@ VBoxOGL_INCS = . if1of ($(KBUILD_TARGET), linux solaris freebsd) @@ -25,9 +24,8 @@ diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk VBoxOGL_DEFS += VBOX_NO_NATIVEGL endif -diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk ---- VirtualBox-4.2.10.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-03-19 18:55:28.778284533 +0000 -+++ VirtualBox-4.2.10/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000 +--- src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-03-19 18:55:28.778284533 +0000 ++++ src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000 @@ -40,8 +40,8 @@ VBoxGuestR3LibShared ifndef VBOX_ONLY_TESTSUITE @@ -39,9 +37,8 @@ diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile endif endif LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86 -diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/Makefile.kmk ---- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/Makefile.kmk 2013-03-19 18:55:28.974949837 +0000 -+++ VirtualBox-4.2.10/src/VBox/Additions/x11/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000 +--- src/VBox/Additions/x11/Makefile.kmk 2013-03-19 18:55:28.974949837 +0000 ++++ src/VBox/Additions/x11/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000 @@ -17,6 +17,10 @@ SUB_DEPTH = ../../../.. include $(KBUILD_PATH)/subheader.kmk @@ -53,9 +50,8 @@ diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/Makefile.kmk VirtualBox- # Include sub-makefiles. if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk -diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/vboxmouse/Makefile.kmk ---- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2013-03-19 18:55:28.818284256 +0000 -+++ VirtualBox-4.2.10/src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000 +--- src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2013-03-19 18:55:28.818284256 +0000 ++++ src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000 @@ -29,7 +29,6 @@ # vboxmouse_drv # @@ -112,9 +108,8 @@ diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk V vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC vboxmouse_drv_16_INCS := \ -diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk ---- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2013-03-19 18:55:28.974949837 +0000 -+++ VirtualBox-4.2.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000 +--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2013-03-19 18:55:28.974949837 +0000 ++++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000 @@ -53,7 +53,6 @@ # vboxvideo_drv # diff --git a/srcpkgs/virtualbox-ose/patches/xorg-server-1.17.patch b/srcpkgs/virtualbox-ose/patches/xorg-server-1.17.patch new file mode 100644 index 00000000000..3e3f0dfa58e --- /dev/null +++ b/srcpkgs/virtualbox-ose/patches/xorg-server-1.17.patch @@ -0,0 +1,30 @@ +--- src/VBox/Additions/x11/vboxvideo/edid.c 2014-11-21 16:16:53.000000000 +0100 ++++ src/VBox/Additions/x11/vboxvideo/edid.c 2015-02-05 07:37:15.213061546 +0100 +@@ -44,6 +44,7 @@ + * Dave Airlie + */ + ++#include + #include + #include + #include +--- src/VBox/Additions/x11/vboxvideo/pointer.c 2014-11-21 16:16:53.000000000 +0100 ++++ src/VBox/Additions/x11/vboxvideo/pointer.c 2015-02-05 07:48:43.910512564 +0100 +@@ -22,6 +22,7 @@ + # include + #endif + ++#include + #include "xf86.h" + #define NEED_XF86_TYPES + #include +--- src/VBox/Additions/x11/vboxvideo/vboxvideo.c 2014-11-21 16:16:53.000000000 +0100 ++++ src/VBox/Additions/x11/vboxvideo/vboxvideo.c 2015-02-05 07:38:16.019638643 +0100 +@@ -59,6 +59,7 @@ + # include + #endif + ++#include + #include "xf86.h" + #include "xf86_OSproc.h" + #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template index dc432abb6bd..e226e105e3c 100644 --- a/srcpkgs/virtualbox-ose/template +++ b/srcpkgs/virtualbox-ose/template @@ -1,9 +1,8 @@ # Template file for 'virtualbox-ose' pkgname=virtualbox-ose version=4.3.20 -revision=4 +revision=5 wrksrc="VirtualBox-${version}" -patch_args="-Np1" short_desc="General-purpose full virtualizer for x86 hardware" maintainer="Juan RP " homepage="http://virtualbox.org" @@ -18,7 +17,7 @@ hostmakedepends="perl pkg-config dev86 yasm acpica-utils" makedepends="libressl-devel>=2.1.3 libcurl-devel libpng-devel>=1.6 libvpx-devel alsa-lib-devel pulseaudio-devel SDL-devel qt-devel libXcursor-devel libXinerama-devel libXcomposite-devel libIDL-devel libglib-devel - pam-devel python-devel libxslt-devel libcap-devel xorg-server-devel>=1.16<1.17 + pam-devel python-devel libxslt-devel libcap-devel xorg-server-devel>=1.17<1.18 device-mapper-devel docbook-xsl" if [ "$XBPS_MACHINE" = "x86_64" ]; then @@ -44,6 +43,7 @@ do_configure() { --disable-python --disable-kmods --nofatal } do_build() { + export USERNAME="$(whoami)" source ./env.sh kmk ${makejobs} all } @@ -134,8 +134,7 @@ virtualbox-ose-dkms_package() { } virtualbox-ose-guest_package() { lib32disabled=yes - replaces="runit-void<20141013_2" - depends="xserver-abi-video-18_1 virtualbox-ose-guest-dkms-${version}_${revision}" + depends="xserver-abi-video-19_1 virtualbox-ose-guest-dkms-${version}_${revision}" short_desc+=" - guest utilities" pkg_install() { From 9dd4e9a1ef1bfd5ddaebec6db71df121f7b6d4d9 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 5 Feb 2015 08:17:14 +0100 Subject: [PATCH 17/17] xf86-video-cirrus: added patch from upstream for xorg-server-1.17. --- .../patches/df389885adf71ed.patch | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 srcpkgs/xf86-video-cirrus/patches/df389885adf71ed.patch diff --git a/srcpkgs/xf86-video-cirrus/patches/df389885adf71ed.patch b/srcpkgs/xf86-video-cirrus/patches/df389885adf71ed.patch new file mode 100644 index 00000000000..2a896632396 --- /dev/null +++ b/srcpkgs/xf86-video-cirrus/patches/df389885adf71ed.patch @@ -0,0 +1,56 @@ +From df389885adf71ed3b045c2fde9fd3ba4329e1a58 Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Sat, 20 Sep 2014 18:51:17 +1000 +Subject: cirrus: don't use pciTag + +Signed-off-by: Dave Airlie + +diff --git a/src/alp_driver.c b/src/alp_driver.c +index 36f2039..bd5e52f 100644 +--- src/alp_driver.c ++++ src/alp_driver.c +@@ -519,9 +519,11 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags) + pCir->Chipset = pCir->pEnt->chipset; + /* Find the PCI info for this screen */ + pCir->PciInfo = xf86GetPciInfoForEntity(pCir->pEnt->index); ++#ifndef XSERVER_LIBPCIACCESS + pCir->PciTag = pciTag(PCI_DEV_BUS(pCir->PciInfo), + PCI_DEV_DEV(pCir->PciInfo), + PCI_DEV_FUNC(pCir->PciInfo)); ++#endif + + #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 + if (!xf86IsPc98()) +diff --git a/src/cir.h b/src/cir.h +index 0a5d403..84f64b5 100644 +--- src/cir.h ++++ src/cir.h +@@ -23,7 +23,9 @@ typedef struct { + ScrnInfoPtr pScrn; + CARD32 properties; + pciVideoPtr PciInfo; ++#ifndef XSERVER_LIBPCIACCESS + PCITAG PciTag; ++#endif + unsigned long PIOReg; + union { + struct lgRec *lg; +diff --git a/src/lg_driver.c b/src/lg_driver.c +index c20bbd0..589d14e 100644 +--- src/lg_driver.c ++++ src/lg_driver.c +@@ -382,9 +382,11 @@ LgPreInit(ScrnInfoPtr pScrn, int flags) + + /* Find the PCI info for this screen */ + pCir->PciInfo = xf86GetPciInfoForEntity(pCir->pEnt->index); ++#ifndef XSERVER_LIBPCIACCESS + pCir->PciTag = pciTag(PCI_DEV_BUS(pCir->PciInfo), + PCI_DEV_DEV(pCir->PciInfo), + PCI_DEV_FUNC(pCir->PciInfo)); ++#endif + + if (xf86LoadSubModule(pScrn, "int10")) { + xf86Int10InfoPtr int10InfoPtr; +-- +cgit v0.10.2 +