diff options
| author | piernov <piernov@piernov.org> | 2012-05-30 17:09:51 +0000 |
|---|---|---|
| committer | piernov <piernov@piernov.org> | 2012-05-30 17:09:51 +0000 |
| commit | 062db8dd11886d9468edb69b391ebb8f3577193d (patch) | |
| tree | d419a5de04ef19ce6c50a776b0788cdc7eca74eb /xorg | |
| parent | a7e1824a44090f76d67fe2130667bef06533fa65 (diff) | |
| download | nutyx-extra-062db8dd11886d9468edb69b391ebb8f3577193d.tar.gz nutyx-extra-062db8dd11886d9468edb69b391ebb8f3577193d.tar.bz2 nutyx-extra-062db8dd11886d9468edb69b391ebb8f3577193d.tar.xz nutyx-extra-062db8dd11886d9468edb69b391ebb8f3577193d.zip | |
xorg 1.12.2-1 màj port
Diffstat (limited to 'xorg')
| -rw-r--r-- | xorg/.md5sum.i686 | 3 | ||||
| -rw-r--r-- | xorg/.md5sum.x86_64 | 3 | ||||
| -rw-r--r-- | xorg/Pkgfile | 12 | ||||
| -rw-r--r-- | xorg/apm-1.2.3-git.patch | 34 | ||||
| -rw-r--r-- | xorg/driver-1.12.2.md5 (renamed from xorg/driver-1.12.1.md5) | 0 |
5 files changed, 6 insertions, 46 deletions
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.2.md5 index 32c99423a..32c99423a 100644 --- a/xorg/driver-1.12.1.md5 +++ b/xorg/driver-1.12.2.md5 |