diff --git a/srcpkgs/xf86-input-evdev/template b/srcpkgs/xf86-input-evdev/template index b83476f64a..3af4df9ab8 100644 --- a/srcpkgs/xf86-input-evdev/template +++ b/srcpkgs/xf86-input-evdev/template @@ -1,10 +1,10 @@ # Template build file for 'xf86-input-evdev'. pkgname=xf86-input-evdev version=2.8.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="xorg-server-devel>=1.13.3_3 mtdev-devel" +makedepends="xorg-server-devel>=1.14 mtdev-devel" short_desc="Xorg event device input driver" maintainer="Juan RP " homepage="http://xorg.freedesktop.org/" @@ -14,7 +14,7 @@ checksum=2f5b4403955f8e82603acff7f8f21a67e89a7c0230e1506c6924c4b9dd8f0e57 xf86-input-evdev-devel_package() { depends="xorg-server-devel ${sourcepkg}>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig @@ -22,7 +22,7 @@ xf86-input-evdev-devel_package() { } xf86-input-evdev_package() { - depends="xserver-abi-input>=18<19" + depends="xserver-abi-input-19_1" pkg_install() { vmove usr } diff --git a/srcpkgs/xf86-input-joystick/template b/srcpkgs/xf86-input-joystick/template index 5e15853697..2bb3a5991d 100644 --- a/srcpkgs/xf86-input-joystick/template +++ b/srcpkgs/xf86-input-joystick/template @@ -1,10 +1,10 @@ # Template build file for 'xf86-input-joystick'. pkgname=xf86-input-joystick version=1.6.2 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="xorg-server-devel>=1.13.1" +makedepends="xorg-server-devel>=1.14" short_desc="Joystick Input driver for Xorg" maintainer="Juan RP " homepage="http://xorg.freedesktop.org/" @@ -17,7 +17,7 @@ post_install() { } xf86-input-joystick-devel_package() { - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig @@ -25,9 +25,8 @@ xf86-input-joystick-devel_package() { } xf86-input-joystick_package() { - depends="xserver-abi-input>=18<19" + depends="xserver-abi-input-19_1" pkg_install() { - vmove etc - vmove usr + vmove all } } diff --git a/srcpkgs/xf86-input-synaptics/template b/srcpkgs/xf86-input-synaptics/template index 57e6111415..e22e16bc97 100644 --- a/srcpkgs/xf86-input-synaptics/template +++ b/srcpkgs/xf86-input-synaptics/template @@ -1,11 +1,11 @@ # Template build file for 'xf86-input-synaptics'. pkgname=xf86-input-synaptics version=1.7.1 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libX11-devel libXtst-devel mtdev-devel - pixman-devel libpciaccess-devel xorg-server-devel>=1.13.1" + pixman-devel libpciaccess-devel xorg-server-devel>=1.14" short_desc="Xorg synaptics touchpad input driver" maintainer="Juan RP " homepage="http://www.x.org/" @@ -22,8 +22,8 @@ xf86-input-synaptics-devel_package() { } xf86-input-synaptics_package() { - depends="xserver-abi-input>=18<19" + depends="xserver-abi-input-19_1" pkg_install() { - vmove usr + vmove all } } diff --git a/srcpkgs/xf86-input-vmmouse/template b/srcpkgs/xf86-input-vmmouse/template index 758814b031..b4f90973d0 100644 --- a/srcpkgs/xf86-input-vmmouse/template +++ b/srcpkgs/xf86-input-vmmouse/template @@ -1,9 +1,9 @@ # Template build file for 'xf86-input-vmmouse'. pkgname=xf86-input-vmmouse version=13.0.0 -revision=1 +revision=2 build_style=gnu-configure -makedepends="xorg-server-devel>=1.13.1" +makedepends="xorg-server-devel>=1.14" short_desc="Xorg VMware virtual mouse input driver" maintainer="Juan RP " homepage="http://xorg.freedesktop.org" @@ -17,8 +17,8 @@ post_install() { } xf86-input-vmmouse_package() { - depends="xserver-abi-input>=18<19" + depends="xserver-abi-input-19_1" pkg_install() { - vmove usr + vmove all } } diff --git a/srcpkgs/xf86-input-wacom/template b/srcpkgs/xf86-input-wacom/template index 0f19acd212..5c15d69452 100644 --- a/srcpkgs/xf86-input-wacom/template +++ b/srcpkgs/xf86-input-wacom/template @@ -1,10 +1,10 @@ # Template build file for 'xf86-input-wacom'. pkgname=xf86-input-wacom version=0.19.0 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="xorg-server-devel>=1.13.1 libXrandr-devel libXinerama-devel libXi-devel" +makedepends="xorg-server-devel>=1.14 libXrandr-devel libXinerama-devel libXi-devel" short_desc="Xorg Wacom tablet input driver" maintainer="Juan RP " homepage="http://xorg.freedesktop.org" @@ -17,7 +17,7 @@ post_install() { } xf86-input-wacom-devel_package() { - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig @@ -25,8 +25,8 @@ xf86-input-wacom-devel_package() { } xf86-input-wacom_package() { - depends="xserver-abi-input>=18<19" + depends="xserver-abi-input-19_1" pkg_install() { - vmove usr + vmove all } } diff --git a/srcpkgs/xf86-video-ati/template b/srcpkgs/xf86-video-ati/template index f94453a3e1..9082c0baad 100644 --- a/srcpkgs/xf86-video-ati/template +++ b/srcpkgs/xf86-video-ati/template @@ -1,10 +1,11 @@ # Template build file for 'xf86-video-ati'. pkgname=xf86-video-ati version=7.1.0 -revision=1 +revision=2 build_style=gnu-configure -makedepends="pkg-config xf86driproto libudev-devel>=183 libpciaccess-devel - libdrm-devel pixman-devel MesaLib-devel>=9.0.2 xorg-server-devel>=1.13<1.14" +hostmakedepends="pkg-config" +makedepends="xf86driproto libudev-devel>=183 libpciaccess-devel + libdrm-devel pixman-devel MesaLib-devel>=9.0.2 xorg-server-devel>=1.14" short_desc="Xorg ATI Radeon video driver" maintainer="Juan RP " homepage="http://xorg.freedesktop.org" @@ -14,8 +15,8 @@ checksum=c8ae44051fcb331625217f98c09a3aa69f493052b69d62c03f41fed0bfe610cd xf86-video-ati_package() { replaces="xf86-video-ati>=0" - depends="xserver-abi-video>=13<14 mesa-ati-dri" + depends="xserver-abi-video-14_1 mesa-ati-dri" pkg_install() { - vmove usr + vmove all } } diff --git a/srcpkgs/xf86-video-fbdev/template b/srcpkgs/xf86-video-fbdev/template index 1db4aded19..58e4486a68 100644 --- a/srcpkgs/xf86-video-fbdev/template +++ b/srcpkgs/xf86-video-fbdev/template @@ -1,10 +1,10 @@ # Template build file for 'xf86-video-fbdev'. pkgname=xf86-video-fbdev version=0.4.3 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="xorg-server-devel>=1.13<1.14" +makedepends="xorg-server-devel>=1.14" short_desc="Xorg framebuffer video driver" homepage="http://xorg.freedesktop.org" license="MIT" @@ -17,8 +17,8 @@ if [ "$CROSS_BUILD" ]; then fi xf86-video-fbdev_package() { - depends="xserver-abi-video>=13<14" + depends="xserver-abi-video-14_1" pkg_install() { - vmove usr + vmove all } } diff --git a/srcpkgs/xf86-video-geode/patches/ed0b153f320a95a11bd561726d2405823573500e.patch b/srcpkgs/xf86-video-geode/patches/ed0b153f320a95a11bd561726d2405823573500e.patch new file mode 100644 index 0000000000..add2fbfd9a --- /dev/null +++ b/srcpkgs/xf86-video-geode/patches/ed0b153f320a95a11bd561726d2405823573500e.patch @@ -0,0 +1,46 @@ +From ed0b153f320a95a11bd561726d2405823573500e Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Thu, 10 Jan 2013 03:16:26 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson +--- +diff --git a/src/geode_driver.c b/src/geode_driver.c +index b27bfd5..9cd0af9 100644 +--- src/geode_driver.c ++++ src/geode_driver.c +@@ -59,8 +59,6 @@ + /* Machine independent stuff */ + #include "mipointer.h" + #include "micmap.h" +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" + #include "vgaHW.h" + #include "vbe.h" + +diff --git a/src/gx_driver.c b/src/gx_driver.c +index 5268f29..7f44e19 100644 +--- src/gx_driver.c ++++ src/gx_driver.c +@@ -1350,7 +1350,6 @@ GXScreenInit(SCREEN_INIT_ARGS_DECL) + if (!pGeode->NoAccel) + GXAccelInit(pScrn); + +- miInitializeBackingStore(pScrn); + xf86SetBackingStore(pScrn); + + /* Set up the soft cursor */ +diff --git a/src/lx_driver.c b/src/lx_driver.c +index 6d7f37f..146578e 100644 +--- src/lx_driver.c ++++ src/lx_driver.c +@@ -932,7 +932,6 @@ LXScreenInit(SCREEN_INIT_ARGS_DECL) + if (!pGeode->NoAccel) + pGeode->NoAccel = LXExaInit(pScrn) ? FALSE : TRUE; + +- miInitializeBackingStore(pScrn); + xf86SetBackingStore(pScrn); + + /* Set up the soft cursor */ +-- +cgit v0.9.0.2-2-gbebe diff --git a/srcpkgs/xf86-video-geode/template b/srcpkgs/xf86-video-geode/template index 77b7c27ed8..d826892ae4 100644 --- a/srcpkgs/xf86-video-geode/template +++ b/srcpkgs/xf86-video-geode/template @@ -1,7 +1,7 @@ # Template build file for 'xf86-video-geode'. pkgname=xf86-video-geode version=2.11.14 -revision=2 +revision=3 build_style=gnu-configure short_desc="Xorg AMD Geode GX/LX video driver" maintainer="Juan RP " @@ -9,16 +9,14 @@ distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2" homepage="http://xorg.freedesktop.org/" license="MIT" checksum=4c750b46c932934faa008919922f5ac8a572afcfe265ac8d7c203b8167a0cfcc -long_desc=" - This is the Xorg video driver for AMD Geode GX/LX video cards." # This is x86 specific. only_for_archs=i686 -makedepends="pkg-config libXv-devel libXrandr-devel xorg-server-devel>=1.13<1.14" +makedepends="pkg-config libXv-devel libXrandr-devel xorg-server-devel>=1.14" xf86-video-geode_package() { - depends="xserver-abi-video>=13<14" + depends="xserver-abi-video-14_1" pkg_install() { - vmove usr + vmove all } } diff --git a/srcpkgs/xf86-video-intel/template b/srcpkgs/xf86-video-intel/template index 71e5f146ff..b4a8594a12 100644 --- a/srcpkgs/xf86-video-intel/template +++ b/srcpkgs/xf86-video-intel/template @@ -1,12 +1,12 @@ # Template build file for 'xf86-video-intel'. pkgname=xf86-video-intel version=2.21.11 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-default-accel=sna --enable-kms-only --enable-sna" makedepends="pkg-config dri2proto>=2.6 libudev-devel>=183 libdrm-devel libpciaccess-devel libXext-devel libXfixes-devel libXv-devel libXvMC-devel - xcb-util-devel>=0.3.9 MesaLib-devel xorg-server-devel>=1.13<1.14" + xcb-util-devel>=0.3.9 MesaLib-devel xorg-server-devel>=1.14" short_desc="Xorg DDX Intel video driver" maintainer="Juan RP " homepage="http://xorg.freedesktop.org/" @@ -21,8 +21,8 @@ post_install() { } xf86-video-intel_package() { - depends="xserver-abi-video>=13<14 mesa-intel-dri" + depends="xserver-abi-video>=14_1 mesa-intel-dri" pkg_install() { - vmove usr + vmove all } } diff --git a/srcpkgs/xf86-video-modesetting/template b/srcpkgs/xf86-video-modesetting/template index 936245c02e..8805eca249 100644 --- a/srcpkgs/xf86-video-modesetting/template +++ b/srcpkgs/xf86-video-modesetting/template @@ -1,10 +1,10 @@ # Template build file for 'xf86-video-modesetting'. pkgname=xf86-video-modesetting version=0.8.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="libdrm-devel>=2.4.37 xorg-server-devel>=1.13<1.14" +makedepends="libdrm-devel>=2.4.37 xorg-server-devel>=1.14" short_desc="X.org generic modesetting video driver" maintainer="Juan RP " homepage="http://xorg.freedesktop.org/" @@ -13,8 +13,8 @@ distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" checksum=13dc349e9aa50987ab2479d27d6879cda2c1f9ad8c8d3a1422a2f53c36f047f8 xf86-video-modesetting_package() { - depends="xserver-abi-video>=13<14" + depends="xserver-abi-video-14_1" pkg_install() { - vmove usr + vmove all } } diff --git a/srcpkgs/xf86-video-nouveau/template b/srcpkgs/xf86-video-nouveau/template index b477f46bb3..7b8d8d3c51 100644 --- a/srcpkgs/xf86-video-nouveau/template +++ b/srcpkgs/xf86-video-nouveau/template @@ -1,10 +1,10 @@ # Template build file for 'xf86-video-nouveau'. pkgname=xf86-video-nouveau version=1.0.8 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="libudev-devel>=183 libdrm-devel xorg-server-devel>=1.13<1.14" +makedepends="libudev-devel>=183 libdrm-devel xorg-server-devel>=1.14" short_desc="Xorg opensource NVIDIA video driver" maintainer="Juan RP " homepage="http://nouveau.freedesktop.org/wiki/" @@ -13,8 +13,8 @@ distfiles="http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${ve checksum=9b904314b8e9c7a5800724a6a31038ed88fa3fcfd35da6f4015fc104c8283617 xf86-video-nouveau_package() { - depends="xserver-abi-video>=13<14 mesa-nouveau-dri" + depends="xserver-abi-video-14_1 mesa-nouveau-dri" pkg_install() { - vmove usr + vmove all } } diff --git a/srcpkgs/xf86-video-openchrome/template b/srcpkgs/xf86-video-openchrome/template index 77b6f5ac7a..38ba061efb 100644 --- a/srcpkgs/xf86-video-openchrome/template +++ b/srcpkgs/xf86-video-openchrome/template @@ -1,24 +1,22 @@ # Template build file for 'xf86-video-openchrome'. pkgname=xf86-video-openchrome version=0.3.1 -revision=2 +revision=3 only_for_archs=i686 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libdrm-devel libX11-devel libXext-devel libXv-devel libXvMC-devel - MesaLib-devel xorg-server-devel>=1.13<1.14" + MesaLib-devel xorg-server-devel>=1.14" short_desc="Xorg VIA Unichromes video driver" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" checksum=eb459a86e20fa090577315a0d9964bf3f94abc5241c5408453f326eaf8915ce7 -long_desc=" - This is the X11 video driver for VIA Unichromes video cards." xf86-video-openchrome_package() { - depends="xserver-abi-video>=13<14" + depends="xserver-abi-video-14_1" pkg_install() { - vmove usr + vmove all } } diff --git a/srcpkgs/xf86-video-sisusb/patches/git-fixes.patch b/srcpkgs/xf86-video-sisusb/patches/git-fixes.patch new file mode 100644 index 0000000000..48c4288c67 --- /dev/null +++ b/srcpkgs/xf86-video-sisusb/patches/git-fixes.patch @@ -0,0 +1,29 @@ +From 293d0902705c272b83432a955fb6a3c96dd6cea7 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Tue, 25 Sep 2012 12:54:52 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson +--- +diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c +index 539b9f1..0fdc8e9 100644 +--- src/sisusb_driver.c ++++ src/sisusb_driver.c +@@ -39,7 +39,6 @@ + #include "shadowfb.h" + #include "micmap.h" + #include "mipointer.h" +-#include "mibstore.h" + + #include "sisusb_regs.h" + #include "sisusb_dac.h" +@@ -1907,7 +1906,6 @@ SISUSBScreenInit(SCREEN_INIT_ARGS_DECL) + /* Initialize the accelerators */ + SiSUSBAccelInit(pScreen); + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* NO SilkenMouse. Never. Ever. */ +-- +cgit v0.9.0.2-2-gbebe diff --git a/srcpkgs/xf86-video-sisusb/template b/srcpkgs/xf86-video-sisusb/template index a94d8bb820..1b6ac6b3ee 100644 --- a/srcpkgs/xf86-video-sisusb/template +++ b/srcpkgs/xf86-video-sisusb/template @@ -1,9 +1,9 @@ # Template build file for 'xf86-video-sisusb'. pkgname=xf86-video-sisusb version=0.9.6 -revision=2 +revision=3 build_style=gnu-configure -makedepends="pkg-config xorg-server-devel>=1.13<1.14" +makedepends="pkg-config xorg-server-devel>=1.14" short_desc="Xorg SiS USB video driver" homepage="http://xorg.freedesktop.org/" license="Custom" @@ -16,8 +16,8 @@ long_desc=" that are connected via a Net2280-based USB dongle for the Xorg X11 server." xf86-video-sisusb_package() { - depends="xserver-abi-video>=13<14" + depends="xserver-abi-video-14_1" pkg_install() { - vmove usr + vmove all } } diff --git a/srcpkgs/xf86-video-vesa/patches/git-fixes.patch b/srcpkgs/xf86-video-vesa/patches/git-fixes.patch new file mode 100644 index 0000000000..5ddc079c9d --- /dev/null +++ b/srcpkgs/xf86-video-vesa/patches/git-fixes.patch @@ -0,0 +1,55 @@ +From 7aafaf56fbca97f36c775462c1ceea3e03700c42 Mon Sep 17 00:00:00 2001 +From: Alexandr Shadchin +Date: Sat, 18 Aug 2012 14:53:34 +0000 +Subject: Fix check function in VESASaveRestore + +Signed-off-by: Alexandr Shadchin +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +--- +diff --git a/src/vesa.c b/src/vesa.c +index 8ac77da..11cd26c 100644 +--- src/vesa.c ++++ src/vesa.c +@@ -1626,7 +1626,7 @@ VESASaveRestore(ScrnInfoPtr pScrn, vbeSaveRestoreFunction function) + { + VESAPtr pVesa; + +- if (MODE_QUERY < 0 || function > MODE_RESTORE) ++ if (function < MODE_QUERY || function > MODE_RESTORE) + return (FALSE); + + pVesa = VESAGetRec(pScrn); +-- +cgit v0.9.0.2-2-gbebe +From 60d2dc115c4b6210d3b1e05f5b0c39d1f7917cbc Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Tue, 25 Sep 2012 12:55:03 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson +--- +diff --git a/src/vesa.c b/src/vesa.c +index 11cd26c..b73d104 100644 +--- src/vesa.c ++++ src/vesa.c +@@ -49,9 +49,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" +- + /* Colormap handling */ + #include "micmap.h" + #include "xf86cmap.h" +@@ -1081,7 +1078,6 @@ VESAScreenInit(SCREEN_INIT_ARGS_DECL) + VESADGAInit(pScrn, pScreen); + + xf86SetBlackWhitePixels(pScreen); +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* software cursor */ +-- +cgit v0.9.0.2-2-gbebe diff --git a/srcpkgs/xf86-video-vesa/template b/srcpkgs/xf86-video-vesa/template index ceccc7f77f..e88ee734c5 100644 --- a/srcpkgs/xf86-video-vesa/template +++ b/srcpkgs/xf86-video-vesa/template @@ -3,10 +3,10 @@ pkgname=xf86-video-vesa _distver="2.3.2" version="2:${_distver}" wrksrc="${pkgname}-${_distver}" -revision=4 +revision=5 build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="xorg-server-devel>=1.13<1.14" +makedepends="xorg-server-devel>=1.14" short_desc="Xorg VESA video driver" homepage="http://xorg.freedesktop.org" license="MIT" @@ -21,8 +21,8 @@ if [ "$CROSS_BUILD" ]; then fi xf86-video-vesa_package() { - depends="xserver-abi-video>=13<14" + depends="xserver-abi-video-14_1" pkg_install() { - vmove usr + vmove all } } diff --git a/srcpkgs/xf86-video-vmware/template b/srcpkgs/xf86-video-vmware/template index b0e76f41b2..a5f0f60e3c 100644 --- a/srcpkgs/xf86-video-vmware/template +++ b/srcpkgs/xf86-video-vmware/template @@ -1,11 +1,11 @@ # Template build file for 'xf86-video-vmware'. pkgname=xf86-video-vmware version=13.0.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-vmwarectrl-client" makedepends="pkg-config libdrm-devel MesaLib-devel>=9.0.1 - xorg-server-devel>=1.13<1.14" + xorg-server-devel>=1.14" short_desc="Modular Xorg VMware virtual video driver" maintainer="Juan RP " homepage="http://xorg.freedesktop.org" @@ -14,7 +14,7 @@ distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2" checksum=802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d xf86-video-vmware_package() { - depends="xserver-abi-video>=13<14 mesa-vmwgfx-dri" + depends="xserver-abi-video-14_1 mesa-vmwgfx-dri" pkg_install() { vmove all }