[arch-commits] Commit in xf86-video-trident/repos (6 files)
Jan de Groot
jgc at archlinux.org
Sat Mar 24 10:03:49 UTC 2012
Date: Saturday, March 24, 2012 @ 06:03:48
Author: jgc
Revision: 154198
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xf86-video-trident/repos/extra-i686/PKGBUILD
(from rev 154197, xf86-video-trident/trunk/PKGBUILD)
xf86-video-trident/repos/extra-x86_64/PKGBUILD
(from rev 154197, xf86-video-trident/trunk/PKGBUILD)
Deleted:
xf86-video-trident/repos/extra-i686/PKGBUILD
xf86-video-trident/repos/extra-i686/trident-1.3.4-git.patch
xf86-video-trident/repos/extra-x86_64/PKGBUILD
xf86-video-trident/repos/extra-x86_64/trident-1.3.4-git.patch
--------------------------------------+
extra-i686/PKGBUILD | 65 +---
extra-i686/trident-1.3.4-git.patch | 523 ---------------------------------
extra-x86_64/PKGBUILD | 65 +---
extra-x86_64/trident-1.3.4-git.patch | 523 ---------------------------------
4 files changed, 62 insertions(+), 1114 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-03-24 10:03:23 UTC (rev 154197)
+++ extra-i686/PKGBUILD 2012-03-24 10:03:48 UTC (rev 154198)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-trident
-pkgver=1.3.4
-pkgrel=6
-pkgdesc="X.org Trident video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903' 'xf86dgaproto')
-conflicts=('xorg-server<1.11.99.903')
-groups=('xorg-drivers' 'xorg')
-options=(!libtool)
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
- trident-1.3.4-git.patch)
-sha1sums=('7c40f5c02bddf399862782b708941e79302318af'
- 'cba17aad6cf2f051d89e65ffe26242ed62ea4454')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i ${srcdir}/trident-1.3.4-git.patch
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
Copied: xf86-video-trident/repos/extra-i686/PKGBUILD (from rev 154197, xf86-video-trident/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-03-24 10:03:48 UTC (rev 154198)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-trident
+pkgver=1.3.5
+pkgrel=1
+pkgdesc="X.org Trident video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel>=1.12.0' 'xf86dgaproto')
+conflicts=('xorg-server<1.12.0')
+groups=('xorg-drivers' 'xorg')
+options=(!libtool)
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('4bb3d091ab7788e1883d6d9e7e0c7ecbf9f57e5ef03d94a5082c2870dbbfc50b')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
Deleted: extra-i686/trident-1.3.4-git.patch
===================================================================
--- extra-i686/trident-1.3.4-git.patch 2012-03-24 10:03:23 UTC (rev 154197)
+++ extra-i686/trident-1.3.4-git.patch 2012-03-24 10:03:48 UTC (rev 154198)
@@ -1,523 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index be54427..0fc2066 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,47 +20,47 @@
- #
- # Process this file with autoconf to produce a configure script
-
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-trident],
-- 1.3.4,
-+ [1.3.4],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
-- xf86-video-trident)
--
-+ [xf86-video-trident])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
-
-+# Initialize Automake
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
--
- AM_MAINTAINER_MODE
-
--# Require xorg-macros: XORG_DEFAULT_OPTIONS
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
- m4_ifndef([XORG_MACROS_VERSION],
-- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
--XORG_MACROS_VERSION(1.3)
-+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
- XORG_DEFAULT_OPTIONS
-
--# Checks for programs.
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
-
- AH_TOP([#include "xorg-server.h"])
-
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
-- AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+ AS_HELP_STRING([--with-xorg-module-dir=DIR],
- [Default xorg module directory [[default=$libdir/xorg/modules]]]),
- [moduledir="$withval"],
- [moduledir="$libdir/xorg/modules"])
-
--# Checks for extensions
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
-
--# Checks for pkg-config packages
-+# Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
- PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
- HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
-@@ -90,17 +90,14 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
-
- # Checks for libraries.
-
--# Checks for header files.
--AC_HEADER_STDC
--
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
-
- DRIVER_NAME=trident
- AC_SUBST([DRIVER_NAME])
-
--AC_OUTPUT([
-- Makefile
-- src/Makefile
-- man/Makefile
-+AC_CONFIG_FILES([
-+ Makefile
-+ src/Makefile
-+ man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 8f2454b..b3688ce 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME at .man
-
- CLEANFILES = $(driverman_DATA)
-
--SED = sed
--
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
-- XORGMANNAME = X Version 11
--
--MAN_SUBSTS = \
-- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-- -e 's|__xservername__|Xorg|g' \
-- -e 's|__xconfigfile__|xorg.conf|g' \
-- -e 's|__projectroot__|$(prefix)|g' \
-- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
-- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
-- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-+
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-+
-
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
-
- .man.$(DRIVER_MAN_SUFFIX):
-- sed $(MAN_SUBSTS) < $< > $@
-+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-diff --git a/man/trident.man b/man/trident.man
-index 8d04ed0..f461e10 100644
---- a/man/trident.man
-+++ b/man/trident.man
-@@ -1,4 +1,3 @@
--.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident.man,v 1.14 2003/05/29 21:48:09 herrb Exp $
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
- .TH TRIDENT __drivermansuffix__ __vendorversion__
-diff --git a/src/blade_accel_exa.c b/src/blade_accel_exa.c
-index 80e3f23..3129623 100644
---- a/src/blade_accel_exa.c
-+++ b/src/blade_accel_exa.c
-@@ -251,14 +251,6 @@ static void WaitMarker(ScreenPtr pScreen, int marker)
- }
- }
-
--static Bool PrepareAccess(PixmapPtr pPix, int index)
--{
--}
--
--static void FinishAccess(PixmapPtr pPix, int index)
--{
--}
--
- static void BladeInitializeAccelerator(ScrnInfoPtr pScrn)
- {
- TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
-diff --git a/src/trident.h b/src/trident.h
-index c15d39c..a28c9fc 100644
---- a/src/trident.h
-+++ b/src/trident.h
-@@ -70,7 +70,7 @@ typedef struct {
- typedef struct {
- ScrnInfoPtr pScrn;
- pciVideoPtr PciInfo;
-- PCITAG PciTag;
-+ uint32_t PciTag;
- EntityInfoPtr pEnt;
- ExaDriverPtr EXADriverPtr;
- int useEXA;
-@@ -85,7 +85,7 @@ typedef struct {
- unsigned char * IOBase;
- unsigned char * FbBase;
- long FbMapSize;
-- IOADDRESS PIOBase;
-+ unsigned long PIOBase;
- Bool NoAccel;
- Bool HWCursor;
- Bool UsePCIRetry;
-diff --git a/src/trident_dga.c b/src/trident_dga.c
-index 78fa8f4..dd836a6 100644
---- a/src/trident_dga.c
-+++ b/src/trident_dga.c
-@@ -83,15 +83,15 @@ TRIDENTDGAInit(ScreenPtr pScreen)
- while(pMode) {
-
- if(0 /*pScrn->displayWidth != pMode->HDisplay*/) {
-- newmodes = xrealloc(modes, (num + 2) * sizeof(DGAModeRec));
-+ newmodes = realloc(modes, (num + 2) * sizeof(DGAModeRec));
- oneMore = TRUE;
- } else {
-- newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
-+ newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec));
- oneMore = FALSE;
- }
-
- if(!newmodes) {
-- xfree(modes);
-+ free(modes);
- return FALSE;
- }
- modes = newmodes;
-diff --git a/src/trident_driver.c b/src/trident_driver.c
-index 31cbb83..472c9b7 100644
---- a/src/trident_driver.c
-+++ b/src/trident_driver.c
-@@ -63,7 +63,7 @@
-
- #ifdef XFreeXDGA
- #define _XF86DGA_SERVER_
--#include <X11/extensions/xf86dgastr.h>
-+#include <X11/extensions/xf86dgaproto.h>
- #endif
-
- #include "globals.h"
-@@ -560,7 +560,7 @@ TRIDENTFreeRec(ScrnInfoPtr pScrn)
- {
- if (pScrn->driverPrivate == NULL)
- return;
-- xfree(pScrn->driverPrivate);
-+ free(pScrn->driverPrivate);
- pScrn->driverPrivate = NULL;
- }
-
-@@ -900,7 +900,7 @@ TRIDENTProbe(DriverPtr drv, int flags)
- foundScreen = TRUE;
- }
- }
-- xfree(usedChips);
-+ free(usedChips);
- }
- }
-
-@@ -933,11 +933,11 @@ TRIDENTProbe(DriverPtr drv, int flags)
- foundScreen = TRUE;
- }
- }
-- xfree(usedChips);
-+ free(usedChips);
- }
- #endif
-
-- xfree(devSections);
-+ free(devSections);
- return foundScreen;
- }
-
-@@ -1109,7 +1109,12 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
- hwp = VGAHWPTR(pScrn);
- vgaHWGetIOBase(hwp);
- vgaIOBase = hwp->IOBase;
-+
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- pTrident->PIOBase = hwp->PIOOffset;
-+#else
-+ pTrident->PIOBase = 0;
-+#endif
-
- #ifndef XSERVER_LIBPCIACCESS
- xf86SetOperatingState(resVga, pTrident->pEnt->index, ResUnusedOpr);
-@@ -1163,7 +1168,7 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
- xf86CollectOptions(pScrn, NULL);
-
- /* Process the options */
-- if (!(pTrident->Options = xalloc(sizeof(TRIDENTOptions))))
-+ if (!(pTrident->Options = malloc(sizeof(TRIDENTOptions))))
- return FALSE;
- memcpy(pTrident->Options, TRIDENTOptions, sizeof(TRIDENTOptions));
- xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pTrident->Options);
-@@ -2617,7 +2622,10 @@ TRIDENTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
- TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
- TRIDENTRegPtr tridentReg;
-
-- if (!xf86IsPc98()) WAITFORVSYNC;
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+ if (!xf86IsPc98())
-+#endif
-+ WAITFORVSYNC;
-
- TridentFindClock(pScrn,mode->Clock);
-
-@@ -2709,8 +2717,10 @@ TRIDENTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
-
- vgaHWProtect(pScrn, FALSE);
-
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- if (xf86IsPc98())
- PC98TRIDENTEnable(pScrn);
-+#endif
-
- if (pTrident->TVChipset != 0)
- VIA_TVInit(pScrn);
-@@ -2782,7 +2792,10 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- if (!TRIDENTMapMem(pScrn))
- return FALSE;
-
-- if (!xf86IsPc98()) {
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+ if (!xf86IsPc98())
-+#endif
-+ {
- #ifdef VBE_INFO
- if (pTrident->vbeModes) {
- pTrident->pVbe = VBEInit(NULL,pTrident->pEnt->index);
-@@ -2796,7 +2809,7 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- }
- }
- }
--
-+
- hwp = VGAHWPTR(pScrn);
-
- if (IsPciCard && UseMMIO) {
-@@ -2813,9 +2826,12 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- * Some Trident chip on PC-9821 needs setup,
- * because VGA chip is not initialized by VGA BIOS.
- */
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- if (IsPciCard && xf86IsPc98()) {
- PC98TRIDENTInit(pScrn);
-- } else tridentSetModeBIOS(pScrn,pScrn->currentMode);
-+ } else
-+#endif
-+ tridentSetModeBIOS(pScrn,pScrn->currentMode);
-
- /* Initialise the first mode */
- if (!TRIDENTModeInit(pScrn, pScrn->currentMode))
-@@ -2868,7 +2884,7 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-
- if(pTrident->ShadowFB) {
- pTrident->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
-- pTrident->ShadowPtr = xalloc(pTrident->ShadowPitch * height);
-+ pTrident->ShadowPtr = malloc(pTrident->ShadowPitch * height);
- displayWidth = pTrident->ShadowPitch / (pScrn->bitsPerPixel >> 3);
- FBStart = pTrident->ShadowPtr;
- } else {
-@@ -2958,7 +2974,7 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- (miBankProcPtr)TVGA8900SetReadWrite;
- if (!miInitializeBanking(pScreen, pScrn->virtualX, pScrn->virtualY,
- pScrn->displayWidth, pBankInfo)) {
-- xfree(pBankInfo);
-+ free(pBankInfo);
- pBankInfo = NULL;
- if (pTrident->pVbe)
- vbeFree(pTrident->pVbe);
-@@ -3200,8 +3216,10 @@ TRIDENTLeaveVT(int scrnIndex, int flags)
- TRIDENTRestore(pScrn);
- vgaHWLock(hwp);
-
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- if (xf86IsPc98())
- PC98TRIDENTDisable(pScrn);
-+#endif
-
- if (IsPciCard && UseMMIO) TRIDENTDisableMMIO(pScrn);
- }
-@@ -3225,28 +3243,31 @@ TRIDENTCloseScreen(int scrnIndex, ScreenPtr pScreen)
- pTrident->AccelInfoRec->Sync(pScrn);
- else if (!pTrident->NoAccel && pTrident->useEXA)
- pTrident->EXADriverPtr->WaitMarker(pScreen, 0);
--
-+
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- if (xf86IsPc98())
- PC98TRIDENTDisable(pScrn);
-+#endif
-
- TRIDENTRestore(pScrn);
- vgaHWLock(hwp);
- if (IsPciCard && UseMMIO) TRIDENTDisableMMIO(pScrn);
- TRIDENTUnmapMem(pScrn);
- }
-+
- if (pTrident->AccelInfoRec)
- XAADestroyInfoRec(pTrident->AccelInfoRec);
- if (pTrident->EXADriverPtr) {
- exaDriverFini(pScreen);
-- xfree(pTrident->EXADriverPtr);
-+ free(pTrident->EXADriverPtr);
- pTrident->EXADriverPtr = NULL;
- }
- if (pTrident->CursorInfoRec)
- xf86DestroyCursorInfoRec(pTrident->CursorInfoRec);
- if (pTrident->ShadowPtr)
-- xfree(pTrident->ShadowPtr);
-+ free(pTrident->ShadowPtr);
- if (pTrident->DGAModes)
-- xfree(pTrident->DGAModes);
-+ free(pTrident->DGAModes);
- pScrn->vtSema = FALSE;
-
- if(pTrident->BlockHandler)
-@@ -3317,15 +3338,17 @@ static void
- TRIDENTEnableMMIO(ScrnInfoPtr pScrn)
- {
- TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
-- IOADDRESS vgaIOBase = pTrident->PIOBase + VGAHWPTR(pScrn)->IOBase;
-+ unsigned long vgaIOBase = pTrident->PIOBase + VGAHWPTR(pScrn)->IOBase;
- CARD8 temp = 0, protect = 0;
-
- /*
- * Skip MMIO Enable in PC-9821 PCI Trident Card!!
- * Because of lack of non PCI VGA port
- */
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- if (IsPciCard && xf86IsPc98())
- return;
-+#endif
-
- /* Goto New Mode */
- outb(pTrident->PIOBase + 0x3C4, 0x0B);
-@@ -3366,8 +3389,10 @@ TRIDENTDisableMMIO(ScrnInfoPtr pScrn)
- * Skip MMIO Disable in PC-9821 PCI Trident Card!!
- * Because of lack of non PCI VGA port
- */
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- if (IsPciCard && xf86IsPc98())
- return;
-+#endif
-
- /* Goto New Mode */
- OUTB(0x3C4, 0x0B); temp = INB(0x3C5);
-@@ -3395,6 +3420,7 @@ TRIDENTDisableMMIO(ScrnInfoPtr pScrn)
- outb(pTrident->PIOBase + 0x3C5, temp);
- }
-
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- /* Initialize VGA Block for Trident Chip on PC-98x1 */
- static void
- PC98TRIDENTInit(ScrnInfoPtr pScrn)
-@@ -3637,7 +3663,7 @@ PC98TRIDENT96xxDisable(ScrnInfoPtr pScrn)
- outb(0x6A, 0x06);
- outb(0x68, 0x0F);
- }
--
-+#endif
-
- /*
- * This is a terrible hack! If we are on a notebook in a stretched
-diff --git a/src/trident_video.c b/src/trident_video.c
-index 0c5497b..0ae1d14 100644
---- a/src/trident_video.c
-+++ b/src/trident_video.c
-@@ -125,7 +125,7 @@ void TRIDENTInitVideo(ScreenPtr pScreen)
- adaptors = &newAdaptor;
- } else {
- newAdaptors = /* need to free this someplace */
-- xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
-+ malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
- if(newAdaptors) {
- memcpy(newAdaptors, adaptors, num_adaptors *
- sizeof(XF86VideoAdaptorPtr));
-@@ -140,7 +140,7 @@ void TRIDENTInitVideo(ScreenPtr pScreen)
- xf86XVScreenInit(pScreen, adaptors, num_adaptors);
-
- if(newAdaptors)
-- xfree(newAdaptors);
-+ free(newAdaptors);
-
- if (pTrident->videoFlags)
- xf86DrvMsgVerb(pScrn->scrnIndex,X_INFO,3,
-@@ -321,7 +321,7 @@ TRIDENTSetupImageVideo(ScreenPtr pScreen)
- XF86VideoAdaptorPtr adapt;
- TRIDENTPortPrivPtr pPriv;
-
-- if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
-+ if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
- sizeof(TRIDENTPortPrivRec) +
- sizeof(DevUnion))))
- return NULL;
-@@ -978,18 +978,18 @@ TRIDENTAllocateSurface(
- surface->width = w;
- surface->height = h;
-
-- if(!(surface->pitches = xalloc(sizeof(int)))) {
-+ if(!(surface->pitches = malloc(sizeof(int)))) {
- xf86FreeOffscreenLinear(linear);
- return BadAlloc;
- }
-- if(!(surface->offsets = xalloc(sizeof(int)))) {
-- xfree(surface->pitches);
-+ if(!(surface->offsets = malloc(sizeof(int)))) {
-+ free(surface->pitches);
- xf86FreeOffscreenLinear(linear);
- return BadAlloc;
- }
-- if(!(pPriv = xalloc(sizeof(OffscreenPrivRec)))) {
-- xfree(surface->pitches);
-- xfree(surface->offsets);
-+ if(!(pPriv = malloc(sizeof(OffscreenPrivRec)))) {
-+ free(surface->pitches);
-+ free(surface->offsets);
- xf86FreeOffscreenLinear(linear);
- return BadAlloc;
- }
-@@ -1034,9 +1034,9 @@ TRIDENTFreeSurface(
- if(pPriv->isOn)
- TRIDENTStopSurface(surface);
- xf86FreeOffscreenLinear(pPriv->linear);
-- xfree(surface->pitches);
-- xfree(surface->offsets);
-- xfree(surface->devPrivate.ptr);
-+ free(surface->pitches);
-+ free(surface->offsets);
-+ free(surface->devPrivate.ptr);
-
- return Success;
- }
-@@ -1128,7 +1128,7 @@ TRIDENTInitOffscreenImages(ScreenPtr pScreen)
- XF86OffscreenImagePtr offscreenImages;
-
- /* need to free this someplace */
-- if(!(offscreenImages = xalloc(sizeof(XF86OffscreenImageRec))))
-+ if(!(offscreenImages = malloc(sizeof(XF86OffscreenImageRec))))
- return;
-
- offscreenImages[0].image = &Images[0];
-@@ -1342,7 +1342,10 @@ WaitForVBlank(ScrnInfoPtr pScrn)
- * full vblank has passed.
- * - Alan.
- */
-- if (!xf86IsPc98()) {
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+ if (!xf86IsPc98())
-+#endif
-+ {
- WAITFORVSYNC;
- WAITFORVSYNC;
- }
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-03-24 10:03:23 UTC (rev 154197)
+++ extra-x86_64/PKGBUILD 2012-03-24 10:03:48 UTC (rev 154198)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-trident
-pkgver=1.3.4
-pkgrel=6
-pkgdesc="X.org Trident video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903' 'xf86dgaproto')
-conflicts=('xorg-server<1.11.99.903')
-groups=('xorg-drivers' 'xorg')
-options=(!libtool)
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
- trident-1.3.4-git.patch)
-sha1sums=('7c40f5c02bddf399862782b708941e79302318af'
- 'cba17aad6cf2f051d89e65ffe26242ed62ea4454')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i ${srcdir}/trident-1.3.4-git.patch
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
Copied: xf86-video-trident/repos/extra-x86_64/PKGBUILD (from rev 154197, xf86-video-trident/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-03-24 10:03:48 UTC (rev 154198)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-trident
+pkgver=1.3.5
+pkgrel=1
+pkgdesc="X.org Trident video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel>=1.12.0' 'xf86dgaproto')
+conflicts=('xorg-server<1.12.0')
+groups=('xorg-drivers' 'xorg')
+options=(!libtool)
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('4bb3d091ab7788e1883d6d9e7e0c7ecbf9f57e5ef03d94a5082c2870dbbfc50b')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
Deleted: extra-x86_64/trident-1.3.4-git.patch
===================================================================
--- extra-x86_64/trident-1.3.4-git.patch 2012-03-24 10:03:23 UTC (rev 154197)
+++ extra-x86_64/trident-1.3.4-git.patch 2012-03-24 10:03:48 UTC (rev 154198)
@@ -1,523 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index be54427..0fc2066 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,47 +20,47 @@
- #
- # Process this file with autoconf to produce a configure script
-
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-trident],
-- 1.3.4,
-+ [1.3.4],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
-- xf86-video-trident)
--
-+ [xf86-video-trident])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
-
-+# Initialize Automake
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
--
- AM_MAINTAINER_MODE
-
--# Require xorg-macros: XORG_DEFAULT_OPTIONS
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
- m4_ifndef([XORG_MACROS_VERSION],
-- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
--XORG_MACROS_VERSION(1.3)
-+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
- XORG_DEFAULT_OPTIONS
-
--# Checks for programs.
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
-
- AH_TOP([#include "xorg-server.h"])
-
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
-- AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+ AS_HELP_STRING([--with-xorg-module-dir=DIR],
- [Default xorg module directory [[default=$libdir/xorg/modules]]]),
- [moduledir="$withval"],
- [moduledir="$libdir/xorg/modules"])
-
--# Checks for extensions
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
-
--# Checks for pkg-config packages
-+# Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
- PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
- HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
-@@ -90,17 +90,14 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
-
- # Checks for libraries.
-
--# Checks for header files.
--AC_HEADER_STDC
--
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
-
- DRIVER_NAME=trident
- AC_SUBST([DRIVER_NAME])
-
--AC_OUTPUT([
-- Makefile
-- src/Makefile
-- man/Makefile
-+AC_CONFIG_FILES([
-+ Makefile
-+ src/Makefile
-+ man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 8f2454b..b3688ce 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME at .man
-
- CLEANFILES = $(driverman_DATA)
-
--SED = sed
--
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
-- XORGMANNAME = X Version 11
--
--MAN_SUBSTS = \
-- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-- -e 's|__xservername__|Xorg|g' \
-- -e 's|__xconfigfile__|xorg.conf|g' \
-- -e 's|__projectroot__|$(prefix)|g' \
-- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
-- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
-- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-+
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-+
-
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
-
- .man.$(DRIVER_MAN_SUFFIX):
-- sed $(MAN_SUBSTS) < $< > $@
-+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-diff --git a/man/trident.man b/man/trident.man
-index 8d04ed0..f461e10 100644
---- a/man/trident.man
-+++ b/man/trident.man
-@@ -1,4 +1,3 @@
--.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident.man,v 1.14 2003/05/29 21:48:09 herrb Exp $
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
- .TH TRIDENT __drivermansuffix__ __vendorversion__
-diff --git a/src/blade_accel_exa.c b/src/blade_accel_exa.c
-index 80e3f23..3129623 100644
---- a/src/blade_accel_exa.c
-+++ b/src/blade_accel_exa.c
-@@ -251,14 +251,6 @@ static void WaitMarker(ScreenPtr pScreen, int marker)
- }
- }
-
--static Bool PrepareAccess(PixmapPtr pPix, int index)
--{
--}
--
--static void FinishAccess(PixmapPtr pPix, int index)
--{
--}
--
- static void BladeInitializeAccelerator(ScrnInfoPtr pScrn)
- {
- TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
-diff --git a/src/trident.h b/src/trident.h
-index c15d39c..a28c9fc 100644
---- a/src/trident.h
-+++ b/src/trident.h
-@@ -70,7 +70,7 @@ typedef struct {
- typedef struct {
- ScrnInfoPtr pScrn;
- pciVideoPtr PciInfo;
-- PCITAG PciTag;
-+ uint32_t PciTag;
- EntityInfoPtr pEnt;
- ExaDriverPtr EXADriverPtr;
- int useEXA;
-@@ -85,7 +85,7 @@ typedef struct {
- unsigned char * IOBase;
- unsigned char * FbBase;
- long FbMapSize;
-- IOADDRESS PIOBase;
-+ unsigned long PIOBase;
- Bool NoAccel;
- Bool HWCursor;
- Bool UsePCIRetry;
-diff --git a/src/trident_dga.c b/src/trident_dga.c
-index 78fa8f4..dd836a6 100644
---- a/src/trident_dga.c
-+++ b/src/trident_dga.c
-@@ -83,15 +83,15 @@ TRIDENTDGAInit(ScreenPtr pScreen)
- while(pMode) {
-
- if(0 /*pScrn->displayWidth != pMode->HDisplay*/) {
-- newmodes = xrealloc(modes, (num + 2) * sizeof(DGAModeRec));
-+ newmodes = realloc(modes, (num + 2) * sizeof(DGAModeRec));
- oneMore = TRUE;
- } else {
-- newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
-+ newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec));
- oneMore = FALSE;
- }
-
- if(!newmodes) {
-- xfree(modes);
-+ free(modes);
- return FALSE;
- }
- modes = newmodes;
-diff --git a/src/trident_driver.c b/src/trident_driver.c
-index 31cbb83..472c9b7 100644
---- a/src/trident_driver.c
-+++ b/src/trident_driver.c
-@@ -63,7 +63,7 @@
-
- #ifdef XFreeXDGA
- #define _XF86DGA_SERVER_
--#include <X11/extensions/xf86dgastr.h>
-+#include <X11/extensions/xf86dgaproto.h>
- #endif
-
- #include "globals.h"
-@@ -560,7 +560,7 @@ TRIDENTFreeRec(ScrnInfoPtr pScrn)
- {
- if (pScrn->driverPrivate == NULL)
- return;
-- xfree(pScrn->driverPrivate);
-+ free(pScrn->driverPrivate);
- pScrn->driverPrivate = NULL;
- }
-
-@@ -900,7 +900,7 @@ TRIDENTProbe(DriverPtr drv, int flags)
- foundScreen = TRUE;
- }
- }
-- xfree(usedChips);
-+ free(usedChips);
- }
- }
-
-@@ -933,11 +933,11 @@ TRIDENTProbe(DriverPtr drv, int flags)
- foundScreen = TRUE;
- }
- }
-- xfree(usedChips);
-+ free(usedChips);
- }
- #endif
-
-- xfree(devSections);
-+ free(devSections);
- return foundScreen;
- }
-
-@@ -1109,7 +1109,12 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
- hwp = VGAHWPTR(pScrn);
- vgaHWGetIOBase(hwp);
- vgaIOBase = hwp->IOBase;
-+
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- pTrident->PIOBase = hwp->PIOOffset;
-+#else
-+ pTrident->PIOBase = 0;
-+#endif
-
- #ifndef XSERVER_LIBPCIACCESS
- xf86SetOperatingState(resVga, pTrident->pEnt->index, ResUnusedOpr);
-@@ -1163,7 +1168,7 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
- xf86CollectOptions(pScrn, NULL);
-
- /* Process the options */
-- if (!(pTrident->Options = xalloc(sizeof(TRIDENTOptions))))
-+ if (!(pTrident->Options = malloc(sizeof(TRIDENTOptions))))
- return FALSE;
- memcpy(pTrident->Options, TRIDENTOptions, sizeof(TRIDENTOptions));
- xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pTrident->Options);
-@@ -2617,7 +2622,10 @@ TRIDENTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
- TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
- TRIDENTRegPtr tridentReg;
-
-- if (!xf86IsPc98()) WAITFORVSYNC;
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+ if (!xf86IsPc98())
-+#endif
-+ WAITFORVSYNC;
-
- TridentFindClock(pScrn,mode->Clock);
-
-@@ -2709,8 +2717,10 @@ TRIDENTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
-
- vgaHWProtect(pScrn, FALSE);
-
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- if (xf86IsPc98())
- PC98TRIDENTEnable(pScrn);
-+#endif
-
- if (pTrident->TVChipset != 0)
- VIA_TVInit(pScrn);
-@@ -2782,7 +2792,10 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- if (!TRIDENTMapMem(pScrn))
- return FALSE;
-
-- if (!xf86IsPc98()) {
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+ if (!xf86IsPc98())
-+#endif
-+ {
- #ifdef VBE_INFO
- if (pTrident->vbeModes) {
- pTrident->pVbe = VBEInit(NULL,pTrident->pEnt->index);
-@@ -2796,7 +2809,7 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- }
- }
- }
--
-+
- hwp = VGAHWPTR(pScrn);
-
- if (IsPciCard && UseMMIO) {
-@@ -2813,9 +2826,12 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- * Some Trident chip on PC-9821 needs setup,
- * because VGA chip is not initialized by VGA BIOS.
- */
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- if (IsPciCard && xf86IsPc98()) {
- PC98TRIDENTInit(pScrn);
-- } else tridentSetModeBIOS(pScrn,pScrn->currentMode);
-+ } else
-+#endif
-+ tridentSetModeBIOS(pScrn,pScrn->currentMode);
-
- /* Initialise the first mode */
- if (!TRIDENTModeInit(pScrn, pScrn->currentMode))
-@@ -2868,7 +2884,7 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-
- if(pTrident->ShadowFB) {
- pTrident->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
-- pTrident->ShadowPtr = xalloc(pTrident->ShadowPitch * height);
-+ pTrident->ShadowPtr = malloc(pTrident->ShadowPitch * height);
- displayWidth = pTrident->ShadowPitch / (pScrn->bitsPerPixel >> 3);
- FBStart = pTrident->ShadowPtr;
- } else {
-@@ -2958,7 +2974,7 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- (miBankProcPtr)TVGA8900SetReadWrite;
- if (!miInitializeBanking(pScreen, pScrn->virtualX, pScrn->virtualY,
- pScrn->displayWidth, pBankInfo)) {
-- xfree(pBankInfo);
-+ free(pBankInfo);
- pBankInfo = NULL;
- if (pTrident->pVbe)
- vbeFree(pTrident->pVbe);
-@@ -3200,8 +3216,10 @@ TRIDENTLeaveVT(int scrnIndex, int flags)
- TRIDENTRestore(pScrn);
- vgaHWLock(hwp);
-
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- if (xf86IsPc98())
- PC98TRIDENTDisable(pScrn);
-+#endif
-
- if (IsPciCard && UseMMIO) TRIDENTDisableMMIO(pScrn);
- }
-@@ -3225,28 +3243,31 @@ TRIDENTCloseScreen(int scrnIndex, ScreenPtr pScreen)
- pTrident->AccelInfoRec->Sync(pScrn);
- else if (!pTrident->NoAccel && pTrident->useEXA)
- pTrident->EXADriverPtr->WaitMarker(pScreen, 0);
--
-+
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- if (xf86IsPc98())
- PC98TRIDENTDisable(pScrn);
-+#endif
-
- TRIDENTRestore(pScrn);
- vgaHWLock(hwp);
- if (IsPciCard && UseMMIO) TRIDENTDisableMMIO(pScrn);
- TRIDENTUnmapMem(pScrn);
- }
-+
- if (pTrident->AccelInfoRec)
- XAADestroyInfoRec(pTrident->AccelInfoRec);
- if (pTrident->EXADriverPtr) {
- exaDriverFini(pScreen);
-- xfree(pTrident->EXADriverPtr);
-+ free(pTrident->EXADriverPtr);
- pTrident->EXADriverPtr = NULL;
- }
- if (pTrident->CursorInfoRec)
- xf86DestroyCursorInfoRec(pTrident->CursorInfoRec);
- if (pTrident->ShadowPtr)
-- xfree(pTrident->ShadowPtr);
-+ free(pTrident->ShadowPtr);
- if (pTrident->DGAModes)
-- xfree(pTrident->DGAModes);
-+ free(pTrident->DGAModes);
- pScrn->vtSema = FALSE;
-
- if(pTrident->BlockHandler)
-@@ -3317,15 +3338,17 @@ static void
- TRIDENTEnableMMIO(ScrnInfoPtr pScrn)
- {
- TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
-- IOADDRESS vgaIOBase = pTrident->PIOBase + VGAHWPTR(pScrn)->IOBase;
-+ unsigned long vgaIOBase = pTrident->PIOBase + VGAHWPTR(pScrn)->IOBase;
- CARD8 temp = 0, protect = 0;
-
- /*
- * Skip MMIO Enable in PC-9821 PCI Trident Card!!
- * Because of lack of non PCI VGA port
- */
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- if (IsPciCard && xf86IsPc98())
- return;
-+#endif
-
- /* Goto New Mode */
- outb(pTrident->PIOBase + 0x3C4, 0x0B);
-@@ -3366,8 +3389,10 @@ TRIDENTDisableMMIO(ScrnInfoPtr pScrn)
- * Skip MMIO Disable in PC-9821 PCI Trident Card!!
- * Because of lack of non PCI VGA port
- */
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- if (IsPciCard && xf86IsPc98())
- return;
-+#endif
-
- /* Goto New Mode */
- OUTB(0x3C4, 0x0B); temp = INB(0x3C5);
-@@ -3395,6 +3420,7 @@ TRIDENTDisableMMIO(ScrnInfoPtr pScrn)
- outb(pTrident->PIOBase + 0x3C5, temp);
- }
-
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- /* Initialize VGA Block for Trident Chip on PC-98x1 */
- static void
- PC98TRIDENTInit(ScrnInfoPtr pScrn)
-@@ -3637,7 +3663,7 @@ PC98TRIDENT96xxDisable(ScrnInfoPtr pScrn)
- outb(0x6A, 0x06);
- outb(0x68, 0x0F);
- }
--
-+#endif
-
- /*
- * This is a terrible hack! If we are on a notebook in a stretched
-diff --git a/src/trident_video.c b/src/trident_video.c
-index 0c5497b..0ae1d14 100644
---- a/src/trident_video.c
-+++ b/src/trident_video.c
-@@ -125,7 +125,7 @@ void TRIDENTInitVideo(ScreenPtr pScreen)
- adaptors = &newAdaptor;
- } else {
- newAdaptors = /* need to free this someplace */
-- xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
-+ malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
- if(newAdaptors) {
- memcpy(newAdaptors, adaptors, num_adaptors *
- sizeof(XF86VideoAdaptorPtr));
-@@ -140,7 +140,7 @@ void TRIDENTInitVideo(ScreenPtr pScreen)
- xf86XVScreenInit(pScreen, adaptors, num_adaptors);
-
- if(newAdaptors)
-- xfree(newAdaptors);
-+ free(newAdaptors);
-
- if (pTrident->videoFlags)
- xf86DrvMsgVerb(pScrn->scrnIndex,X_INFO,3,
-@@ -321,7 +321,7 @@ TRIDENTSetupImageVideo(ScreenPtr pScreen)
- XF86VideoAdaptorPtr adapt;
- TRIDENTPortPrivPtr pPriv;
-
-- if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
-+ if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
- sizeof(TRIDENTPortPrivRec) +
- sizeof(DevUnion))))
- return NULL;
-@@ -978,18 +978,18 @@ TRIDENTAllocateSurface(
- surface->width = w;
- surface->height = h;
-
-- if(!(surface->pitches = xalloc(sizeof(int)))) {
-+ if(!(surface->pitches = malloc(sizeof(int)))) {
- xf86FreeOffscreenLinear(linear);
- return BadAlloc;
- }
-- if(!(surface->offsets = xalloc(sizeof(int)))) {
-- xfree(surface->pitches);
-+ if(!(surface->offsets = malloc(sizeof(int)))) {
-+ free(surface->pitches);
- xf86FreeOffscreenLinear(linear);
- return BadAlloc;
- }
-- if(!(pPriv = xalloc(sizeof(OffscreenPrivRec)))) {
-- xfree(surface->pitches);
-- xfree(surface->offsets);
-+ if(!(pPriv = malloc(sizeof(OffscreenPrivRec)))) {
-+ free(surface->pitches);
-+ free(surface->offsets);
- xf86FreeOffscreenLinear(linear);
- return BadAlloc;
- }
-@@ -1034,9 +1034,9 @@ TRIDENTFreeSurface(
- if(pPriv->isOn)
- TRIDENTStopSurface(surface);
- xf86FreeOffscreenLinear(pPriv->linear);
-- xfree(surface->pitches);
-- xfree(surface->offsets);
-- xfree(surface->devPrivate.ptr);
-+ free(surface->pitches);
-+ free(surface->offsets);
-+ free(surface->devPrivate.ptr);
-
- return Success;
- }
-@@ -1128,7 +1128,7 @@ TRIDENTInitOffscreenImages(ScreenPtr pScreen)
- XF86OffscreenImagePtr offscreenImages;
-
- /* need to free this someplace */
-- if(!(offscreenImages = xalloc(sizeof(XF86OffscreenImageRec))))
-+ if(!(offscreenImages = malloc(sizeof(XF86OffscreenImageRec))))
- return;
-
- offscreenImages[0].image = &Images[0];
-@@ -1342,7 +1342,10 @@ WaitForVBlank(ScrnInfoPtr pScrn)
- * full vblank has passed.
- * - Alan.
- */
-- if (!xf86IsPc98()) {
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+ if (!xf86IsPc98())
-+#endif
-+ {
- WAITFORVSYNC;
- WAITFORVSYNC;
- }
More information about the arch-commits
mailing list