From 062db8dd11886d9468edb69b391ebb8f3577193d Mon Sep 17 00:00:00 2001 From: piernov Date: Wed, 30 May 2012 17:09:51 +0000 Subject: xorg 1.12.2-1 màj port MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xorg/.md5sum.i686 | 3 +- xorg/.md5sum.x86_64 | 3 +- xorg/Pkgfile | 12 +++----- xorg/apm-1.2.3-git.patch | 34 ----------------------- xorg/driver-1.12.1.md5 | 71 ------------------------------------------------ xorg/driver-1.12.2.md5 | 71 ++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 77 insertions(+), 117 deletions(-) delete mode 100644 xorg/apm-1.2.3-git.patch delete mode 100644 xorg/driver-1.12.1.md5 create mode 100644 xorg/driver-1.12.2.md5 (limited to 'xorg') diff --git a/xorg/.md5sum.i686 b/xorg/.md5sum.i686 index 59617716e..ec2ca83ee 100644 --- a/xorg/.md5sum.i686 +++ b/xorg/.md5sum.i686 @@ -1,2 +1 @@ -6dc2f57e178884d093867adc08d6863d apm-1.2.3-git.patch -c897a08fbccaa34d8a31d8301fa959a7 driver-1.12.1.md5 +b606c143ef4be9bac5c2ed586be431c8 driver-1.12.2.md5 diff --git a/xorg/.md5sum.x86_64 b/xorg/.md5sum.x86_64 index 59617716e..ec2ca83ee 100644 --- a/xorg/.md5sum.x86_64 +++ b/xorg/.md5sum.x86_64 @@ -1,2 +1 @@ -6dc2f57e178884d093867adc08d6863d apm-1.2.3-git.patch -c897a08fbccaa34d8a31d8301fa959a7 driver-1.12.1.md5 +b606c143ef4be9bac5c2ed586be431c8 driver-1.12.2.md5 diff --git a/xorg/Pkgfile b/xorg/Pkgfile index 56edf18a5..b1b5ced1e 100644 --- a/xorg/Pkgfile +++ b/xorg/Pkgfile @@ -6,15 +6,14 @@ # Run on: dejavu-ttf,xorg-xinit,xorg-xauth,xorg-rgb,xkeyboard-config,xorg-twm,xorg-xclock,xorg-xterm,xorg-server,mtdev name=xorg -version=1.12.1 +version=1.12.2 release=1 section="driver" -source=($section-$version.md5 - apm-1.2.3-git.patch) +source=($section-$version.md5) build() { -unset MAKEFLAGS -for package in $(grep -v '^#' ${section}-${version}.md5 |cut -d " " -f 3) + unset MAKEFLAGS + for package in $(grep -v '^#' ${section}-${version}.md5 |cut -d " " -f 3) do [[ -r $PKGMK_SOURCE_DIR/$package ]] || wget http://xorg.freedesktop.org/releases/individual/${section}/$package -O $PKGMK_SOURCE_DIR/$package cp $PKGMK_SOURCE_DIR/$package ./ @@ -23,9 +22,6 @@ for package in $(grep -v '^#' ${section}-${version}.md5 |cut -d " " -f 3) tar -xf $package pushd $packagedir - if [ "${packagedir}" == "xf86-video-apm-1.2.3" ]; then - patch -p1 < $SRC/apm-1.2.3-git.patch - fi ./configure $XORG_CONFIG \ --with-xorg-module-dir=$XORG_PREFIX/lib/X11/modules make diff --git a/xorg/apm-1.2.3-git.patch b/xorg/apm-1.2.3-git.patch deleted file mode 100644 index f6dd525c7..000000000 --- a/xorg/apm-1.2.3-git.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/src/apm.h b/src/apm.h -index bc66714..86c7663 100644 ---- a/src/apm.h -+++ b/src/apm.h -@@ -109,7 +109,7 @@ typedef struct { - char *MemMap; - pointer BltMap; - Bool UnlockCalled; -- IOADDRESS iobase, xport, xbase; -+ unsigned long iobase, xport, xbase; - unsigned char savedSR10; - CARD8 MiscOut; - CARD8 c9, d9, db, Rush; -diff --git a/src/apm_driver.c b/src/apm_driver.c -index f172bab..f77bb2b 100644 ---- a/src/apm_driver.c -+++ b/src/apm_driver.c -@@ -418,8 +418,14 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags) - - hwp = VGAHWPTR(pScrn); - vgaHWGetIOBase(hwp); -- pApm->iobase = hwp->PIOOffset; -- pApm->xport = hwp->PIOOffset + 0x3C4; -+#if ABI_VIDEODRV_VERSION < 12 -+#define PIOOFFSET hwp->PIOOffset -+#else -+/* FIXME reintroduce domain support */ -+#define PIOOFFSET 0 -+#endif -+ pApm->iobase = PIOOFFSET; -+ pApm->xport = PIOOFFSET + 0x3C4; - - /* Set pScrn->monitor */ - pScrn->monitor = pScrn->confScreen->monitor; diff --git a/xorg/driver-1.12.1.md5 b/xorg/driver-1.12.1.md5 deleted file mode 100644 index 32c99423a..000000000 --- a/xorg/driver-1.12.1.md5 +++ /dev/null @@ -1,71 +0,0 @@ -# Xorg drivers MD5sum et Paquet -# -# Attention 2 espaces entre le MD5sum et le paquet -# -# xf86-input-acecad-1.3.0.tar.bz2 -8231f6ce1c477eac653c9deb527fa3c xf86-input-aiptek-1.4.1.tar.bz2 -# xf86-input-citron-2.2.2.tar.bz2 -# xf86-input-digitaledge-1.1.1.tar.bz2 -# xf86-input-dmc-1.1.2.tar.bz2 -# xf86-input-dynapro-1.1.2.tar.bz2 -# xf86-input-elo2300-1.1.2.tar.bz2 -# xf86-input-elographics-1.2.3.tar.bz2 -4449b2e94900e98d2f41c2f46dd0397e xf86-input-evdev-2.7.0.tar.bz2 -# xf86-input-fpit-1.3.0.tar.bz2 -# xf86-input-hyperpen-1.3.0.tar.bz2 -# xf86-input-jamstudio-1.2.0.tar.bz2 -01f416753016f01e328b1098157a5266 xf86-input-joystick-1.6.1.tar.bz2 -09744e8dc9a1fe5e61927c1073cd3428 xf86-input-keyboard-1.6.1.tar.bz2 -# xf86-input-magellan-1.2.0.tar.bz2 -871c828b88e9c973f1457724b35576fb xf86-input-mouse-1.7.2.tar.bz2 -# xf86-input-mutouch-1.2.1.tar.bz2 -# xf86-input-palmax-1.2.0.tar.bz2 -# xf86-input-penmount-1.4.0.tar.bz2 -# xf86-input-spaceorb-1.1.1.tar.bz2 -# xf86-input-summa-1.2.0.tar.bz2 -d10a7ee362d015975fbef11c6beaac97 xf86-input-synaptics-1.6.1.tar.bz2 -# xf86-input-ur98-1.1.0.tar.bz2 -2b3bfea9ba1f73d9d68bddd0d6b20112 xf86-input-vmmouse-12.9.0.tar.bz2 -93821f21e807260b05431c62437a8b32 xf86-input-void-1.4.0.tar.bz2 -# xf86-video-amd-2.7.7.7.tar.bz2 -7692dac140c15172935872a77417bed2 xf86-video-apm-1.2.4.tar.bz2 -21f5db0beca2d3d99aae739174d5b44f xf86-video-ark-0.7.4.tar.bz2 -# xf86-video-ast-0.89.0.tar.bz2 -17dd4f0bf4dbe9839e5f7d1161994222 xf86-video-ati-6.14.4.tar.bz2 -# xf86-video-chips-1.2.1.tar.bz2 -# xf86-video-cirrus-1.3.0.tar.bz2 -# xf86-video-dummy-0.3.1.tar.bz2 -53a533d9e0c2da50962282526bace074 xf86-video-fbdev-0.4.2.tar.bz2 -# a99c521db731c2f1df309057a8465e4c xf86-video-geode-2.11.12.tar.bz2 -c4edb998485020debffeafc491ea759e xf86-video-glint-1.2.7.tar.bz2 -392c4ffd3c752af6f92e71e1efd68c66 xf86-video-i128-1.3.5.tar.bz2 -# xf86-video-i740-1.3.0.tar.bz2 -f397bddfc88d4c9b30b56526c1e02e8e xf86-video-intel-2.19.0.tar.bz2 -# xf86-video-mach64-6.8.1.tar.bz2 -# xf86-video-mga-1.4.10.tar.bz2 -5d24106c566d4f7401fc4467a435af68 xf86-video-modesetting-0.3.0.tar.bz2 -# xf86-video-neomagic-1.2.2.tar.bz2 -# xf86-video-newport-0.2.2.tar.bz2 -# xf86-video-nsc-2.8.3.tar.bz2 -b12f0b2114849d1a542d8084732573d3 xf86-video-nv-2.1.18.tar.bz2 -244507baf1900f1e923604c4a0f05925 xf86-video-openchrome-0.2.906.tar.bz2 -c0ee45ce06654b9f2e6ddac478d5fbd6 xf86-video-qxl-0.0.17.tar.bz2 -# xf86-video-r128-6.8.0.tar.bz2 -7b6641aa9d836f1621b9b220ad6771b8 xf86-video-radeonhd-1.3.0.tar.bz2 -# xf86-video-rendition-4.2.1.tar.bz2 -c8d27317de8f38be0548c25634e89350 xf86-video-s3-0.6.4.tar.bz2 -# xf86-video-s3virge-1.10.2.tar.bz2 -664c7d9c93049ebe96af262ec448451f xf86-video-savage-2.3.4.tar.bz2 -b5acd392d799e2bb67ea702a83feb4a0 xf86-video-siliconmotion-1.7.6.tar.bz2 -# xf86-video-sis-0.10.1.tar.bz2 -# xf86-video-sisusb-0.9.1.tar.bz2 -# xf86-video-tdfx-1.4.1.tar.bz2 -# xf86-video-tga-1.2.0.tar.bz2 -# xf86-video-trident-1.3.1.tar.bz2 -# xf86-video-tseng-1.2.1.tar.bz2 -# xf86-video-v4l-0.2.0.tar.bz2 -02e6eacc2d1e07ac893b62481905d6f0 xf86-video-vesa-2.3.1.tar.bz2 -# xf86-video-vga-4.1.0.tar.bz2 -0743ec7c479603fba60d118858fd5783 xf86-video-vmware-12.0.2.tar.bz2 -# xf86-video-voodoo-1.2.1.tar.bz2 -# b4ac771ae81b52fca9b6fa68006a258a xf86-video-xgi-1.6.0.tar.bz2 → Ne compile pas avec xorg-server 1.12.0 diff --git a/xorg/driver-1.12.2.md5 b/xorg/driver-1.12.2.md5 new file mode 100644 index 000000000..32c99423a --- /dev/null +++ b/xorg/driver-1.12.2.md5 @@ -0,0 +1,71 @@ +# Xorg drivers MD5sum et Paquet +# +# Attention 2 espaces entre le MD5sum et le paquet +# +# xf86-input-acecad-1.3.0.tar.bz2 +8231f6ce1c477eac653c9deb527fa3c xf86-input-aiptek-1.4.1.tar.bz2 +# xf86-input-citron-2.2.2.tar.bz2 +# xf86-input-digitaledge-1.1.1.tar.bz2 +# xf86-input-dmc-1.1.2.tar.bz2 +# xf86-input-dynapro-1.1.2.tar.bz2 +# xf86-input-elo2300-1.1.2.tar.bz2 +# xf86-input-elographics-1.2.3.tar.bz2 +4449b2e94900e98d2f41c2f46dd0397e xf86-input-evdev-2.7.0.tar.bz2 +# xf86-input-fpit-1.3.0.tar.bz2 +# xf86-input-hyperpen-1.3.0.tar.bz2 +# xf86-input-jamstudio-1.2.0.tar.bz2 +01f416753016f01e328b1098157a5266 xf86-input-joystick-1.6.1.tar.bz2 +09744e8dc9a1fe5e61927c1073cd3428 xf86-input-keyboard-1.6.1.tar.bz2 +# xf86-input-magellan-1.2.0.tar.bz2 +871c828b88e9c973f1457724b35576fb xf86-input-mouse-1.7.2.tar.bz2 +# xf86-input-mutouch-1.2.1.tar.bz2 +# xf86-input-palmax-1.2.0.tar.bz2 +# xf86-input-penmount-1.4.0.tar.bz2 +# xf86-input-spaceorb-1.1.1.tar.bz2 +# xf86-input-summa-1.2.0.tar.bz2 +d10a7ee362d015975fbef11c6beaac97 xf86-input-synaptics-1.6.1.tar.bz2 +# xf86-input-ur98-1.1.0.tar.bz2 +2b3bfea9ba1f73d9d68bddd0d6b20112 xf86-input-vmmouse-12.9.0.tar.bz2 +93821f21e807260b05431c62437a8b32 xf86-input-void-1.4.0.tar.bz2 +# xf86-video-amd-2.7.7.7.tar.bz2 +7692dac140c15172935872a77417bed2 xf86-video-apm-1.2.4.tar.bz2 +21f5db0beca2d3d99aae739174d5b44f xf86-video-ark-0.7.4.tar.bz2 +# xf86-video-ast-0.89.0.tar.bz2 +17dd4f0bf4dbe9839e5f7d1161994222 xf86-video-ati-6.14.4.tar.bz2 +# xf86-video-chips-1.2.1.tar.bz2 +# xf86-video-cirrus-1.3.0.tar.bz2 +# xf86-video-dummy-0.3.1.tar.bz2 +53a533d9e0c2da50962282526bace074 xf86-video-fbdev-0.4.2.tar.bz2 +# a99c521db731c2f1df309057a8465e4c xf86-video-geode-2.11.12.tar.bz2 +c4edb998485020debffeafc491ea759e xf86-video-glint-1.2.7.tar.bz2 +392c4ffd3c752af6f92e71e1efd68c66 xf86-video-i128-1.3.5.tar.bz2 +# xf86-video-i740-1.3.0.tar.bz2 +f397bddfc88d4c9b30b56526c1e02e8e xf86-video-intel-2.19.0.tar.bz2 +# xf86-video-mach64-6.8.1.tar.bz2 +# xf86-video-mga-1.4.10.tar.bz2 +5d24106c566d4f7401fc4467a435af68 xf86-video-modesetting-0.3.0.tar.bz2 +# xf86-video-neomagic-1.2.2.tar.bz2 +# xf86-video-newport-0.2.2.tar.bz2 +# xf86-video-nsc-2.8.3.tar.bz2 +b12f0b2114849d1a542d8084732573d3 xf86-video-nv-2.1.18.tar.bz2 +244507baf1900f1e923604c4a0f05925 xf86-video-openchrome-0.2.906.tar.bz2 +c0ee45ce06654b9f2e6ddac478d5fbd6 xf86-video-qxl-0.0.17.tar.bz2 +# xf86-video-r128-6.8.0.tar.bz2 +7b6641aa9d836f1621b9b220ad6771b8 xf86-video-radeonhd-1.3.0.tar.bz2 +# xf86-video-rendition-4.2.1.tar.bz2 +c8d27317de8f38be0548c25634e89350 xf86-video-s3-0.6.4.tar.bz2 +# xf86-video-s3virge-1.10.2.tar.bz2 +664c7d9c93049ebe96af262ec448451f xf86-video-savage-2.3.4.tar.bz2 +b5acd392d799e2bb67ea702a83feb4a0 xf86-video-siliconmotion-1.7.6.tar.bz2 +# xf86-video-sis-0.10.1.tar.bz2 +# xf86-video-sisusb-0.9.1.tar.bz2 +# xf86-video-tdfx-1.4.1.tar.bz2 +# xf86-video-tga-1.2.0.tar.bz2 +# xf86-video-trident-1.3.1.tar.bz2 +# xf86-video-tseng-1.2.1.tar.bz2 +# xf86-video-v4l-0.2.0.tar.bz2 +02e6eacc2d1e07ac893b62481905d6f0 xf86-video-vesa-2.3.1.tar.bz2 +# xf86-video-vga-4.1.0.tar.bz2 +0743ec7c479603fba60d118858fd5783 xf86-video-vmware-12.0.2.tar.bz2 +# xf86-video-voodoo-1.2.1.tar.bz2 +# b4ac771ae81b52fca9b6fa68006a258a xf86-video-xgi-1.6.0.tar.bz2 → Ne compile pas avec xorg-server 1.12.0 -- cgit v1.2.3-54-g00ecf