Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=bc005b07ece3599b7a2ee15b9d2fd2b9ded83369
commit bc005b07ece3599b7a2ee15b9d2fd2b9ded83369
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Sun Sep 20 13:45:49 2009 +0200
xf86-video-radeonhd-1.2.5-2-i686
- revert from snapshot to latest stable + backport the necesary patches
diff --git a/source/x11/xf86-video-radeonhd/0001-Fix-autoconf-issues.patch
b/source/x11/xf86-video-radeonhd/0001-Fix-autoconf-issues.patch
new file mode 100644
index 0000000..201318a
--- /dev/null
+++ b/source/x11/xf86-video-radeonhd/0001-Fix-autoconf-issues.patch
@@ -0,0 +1,45 @@
+From da5b9c2fb0338e616f5376b6e40b4531fa3d7e1c Mon Sep 17 00:00:00 2001
+From: Matthias Hopf <mh...@suse.de>
+Date: Mon, 3 Aug 2009 17:17:44 +0200
+Subject: [PATCH] Fix autoconf issues.
+
+Apparently, autoconf 2.64 has "interesting" issues with spaces in double
+quoted strings, as used in configure.ac. Change that to parantheses.
+Based on a patch by Jens Lody <radeo...@jenslody.de>.
+
+Additionally, autogen.sh didn't --force so far.
+---
+ autogen.sh | 4 ++--
+ configure.ac | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d288ab4..58cf072 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -51,19 +51,19 @@ AH_BOTTOM([#endif])
+
+ AC_ARG_WITH(xorg-module-dir,
+ AC_HELP_STRING([--with-xorg-module-dir=DIR],
+- [Default xorg module directory
[[default=$libdir/xorg/modules]]]),
++ [Default xorg module directory (default
$libdir/xorg/modules)]),
+ [moduledir="$withval"],
+ [moduledir="$libdir/xorg/modules"])
+
+ AC_ARG_ENABLE(exa,
+ AC_HELP_STRING([--disable-exa],
+- [Disable EXA support [[default enabled]]]),
++ [Disable EXA support (default enabled)]),
+ [EXA="$enableval"],
+ [EXA=yes])
+
+ AC_ARG_ENABLE(dri,
+ AC_HELP_STRING([--disable-dri],
+- [Disable DRI support [[default enabled]]]),
++ [Disable DRI support (default enabled)]),
+ [DRI="$enableval"],
+ [DRI=yes])
+
+--
+1.6.3.3
+
diff --git
a/source/x11/xf86-video-radeonhd/0002-radeonhd-Update-to-xextproto-7.1-support.patch
b/source/x11/xf86-video-radeonhd/0002-radeonhd-Update-to-xextproto-7.1-support.patch
new file mode 100644
index 0000000..a731535
--- /dev/null
+++
b/source/x11/xf86-video-radeonhd/0002-radeonhd-Update-to-xextproto-7.1-support.patch
@@ -0,0 +1,88 @@
+From b22e7a21a589b5205ad61a8cf39a61c8e5ca5791 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Thu, 16 Jul 2009 13:27:21 +1000
+Subject: [PATCH] radeonhd: Update to xextproto 7.1 support.
+
+DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
+need to include dpmsconst.h if xextproto 7.1 is available.
+
+Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+---
+ configure.ac | 4 ++++
+ src/rhd_biosscratch.c | 5 +++++
+ src/rhd_driver.c | 5 +++++
+ src/rhd_randr.c | 5 +++++
+ 4 files changed, 19 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7680a3d..c2f06cf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -79,6 +79,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+ # @@@@ need to check for the right server version once RandR 1.2 is in.
+ # @@@ do we really need fontsproto here?
+ PKG_CHECK_MODULES(XORG, [xorg-server 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]),
++ HAVE_XEXTPROTO_71="no")
++AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
+ sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+
+
+diff --git a/src/rhd_biosscratch.c b/src/rhd_biosscratch.c
+index d2a905c..87cbd4c 100644
+--- a/src/rhd_biosscratch.c
++++ b/src/rhd_biosscratch.c
+@@ -43,8 +43,13 @@
+ # include <stdio.h>
+ # endif
+
++#ifdef HAVE_XEXTPROTO_71
++# include "X11/extensions/dpmsconst.h"
++#else
+ # define DPMS_SERVER
+ # include "X11/extensions/dpms.h"
++#endif
++
+
+ # include "rhd.h"
+
+diff --git a/src/rhd_driver.c b/src/rhd_driver.c
+index ba60253..a208978 100644
+--- a/src/rhd_driver.c
++++ b/src/rhd_driver.c
+@@ -66,8 +66,13 @@
+ /* Needed by Resources Access Control (RAC) */
+ #include "xf86RAC.h"
+
++#ifdef HAVE_XEXTPROTO_71
++#include "X11/extensions/dpmsconst.h"
++#else
+ #define DPMS_SERVER
+ #include "X11/extensions/dpms.h"
++#endif
++
+
+ /* int10 - for now at least */
+ #include "xf86int10.h"
+diff --git a/src/rhd_randr.c b/src/rhd_randr.c
+index 1ed9562..3fc2f14 100644
+--- a/src/rhd_randr.c
++++ b/src/rhd_randr.c
+@@ -48,8 +48,13 @@
+ # include "xf86RandR12.h"
+ # include "xaa.h"
+ # include "exa.h"
++#ifdef HAVE_XEXTPROTO_71
++# include "X11/extensions/dpmsconst.h"
++#else
+ # define DPMS_SERVER
+ # include "X11/extensions/dpms.h"
++#endif
++
+ # include "X11/Xatom.h"
+ #endif /* RANDR_12_SUPPORT */
+
+--
+1.6.3.3
+
diff --git
a/source/x11/xf86-video-radeonhd/0003-radeonhd-update-for-resources-RAC-API-removal.patch
b/source/x11/xf86-video-radeonhd/0003-radeonhd-update-for-resources-RAC-API-removal.patch
new file mode 100644
index 0000000..de6c123
--- /dev/null
+++
b/source/x11/xf86-video-radeonhd/0003-radeonhd-update-for-resources-RAC-API-removal.patch
@@ -0,0 +1,51 @@
+From e688cffa33ececfef8630c05380f93d9e38b3edf Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airl...@redhat.com>
+Date: Tue, 28 Jul 2009 13:32:35 +1000
+Subject: [PATCH] radeonhd: update for resources/RAC API removal
+
+---
+ src/rhd_driver.c | 9 ++++++---
+ 1 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/rhd_driver.c b/src/rhd_driver.c
+index 943108c..e7dca79 100644
+--- a/src/rhd_driver.c
++++ b/src/rhd_driver.c
+@@ -38,7 +38,11 @@
+ /* For PIO/MMIO */
+ #include "compiler.h"
+
++#ifndef XSERVER_LIBPCIACCESS
+ #include "xf86Resources.h"
++/* Needed by Resources Access Control (RAC) */
++#include "xf86RAC.h"
++#endif
+
+ #include "xf86PciInfo.h"
+ /* do we need to access PCI config space directly? */
+@@ -63,9 +67,6 @@
+
+ #include "fb.h"
+
+-/* Needed by Resources Access Control (RAC) */
+-#include "xf86RAC.h"
+-
+ #ifdef HAVE_XEXTPROTO_71
+ #include "X11/extensions/dpmsconst.h"
+ #else
+@@ -562,10 +563,12 @@ RHDPreInit(ScrnInfoPtr pScrn, int flags)
+
+ pScrn->chipset = (char *)xf86TokenToString(RHDChipsets, rhdPtr->ChipSet);
+
++#ifndef XSERVER_LIBPCIACCESS
+ /* We will disable access to VGA legacy resources emulation and
+ save/restore VGA thru MMIO when necessary */
+ if (xf86RegisterResources(rhdPtr->entityIndex, NULL, ResNone))
+ goto error0;
++#endif
+
+ #ifndef ATOM_ASIC_INIT
+ if (xf86LoadSubModule(pScrn, "int10")) {
+--
+1.6.3.3
+
diff --git
a/source/x11/xf86-video-radeonhd/0004-radeonhd-further-RAC-resources-changes.patch
b/source/x11/xf86-video-radeonhd/0004-radeonhd-further-RAC-resources-changes.patch
new file mode 100644
index 0000000..3aed854
--- /dev/null
+++
b/source/x11/xf86-video-radeonhd/0004-radeonhd-further-RAC-resources-changes.patch
@@ -0,0 +1,71 @@
+From d389503eace03c0d8adf2028ade099b7a7f38a8a Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airl...@redhat.com>
+Date: Tue, 28 Jul 2009 13:39:32 +1000
+Subject: [PATCH] radeonhd: further RAC/resources changes
+
+---
+ src/rhd_driver.c | 4 ++++
+ src/rhd_id.c | 5 ++++-
+ 2 files changed, 8 insertions(+), 1 deletions(-)
+
+diff --git a/src/rhd_driver.c b/src/rhd_driver.c
+index e7dca79..ad102d9 100644
+--- a/src/rhd_driver.c
++++ b/src/rhd_driver.c
+@@ -541,10 +541,12 @@ RHDPreInit(ScrnInfoPtr pScrn, int flags)
+ goto error0;
+ }
+
++#ifndef XSERVER_LIBPCIACCESS
+ if (rhdPtr->pEnt->resources) {
+ xfree(rhdPtr->pEnt);
+ goto error0;
+ }
++#endif
+
+ pScrn->videoRam = rhdPtr->pEnt->device->videoRam;
+ rhdPtr->entityIndex = rhdPtr->pEnt->index;
+@@ -1277,7 +1279,9 @@ RHDScreenInit(int scrnIndex, ScreenPtr pScreen, int
argc, char **argv)
+ CMAP_PALETTED_TRUECOLOR |
CMAP_RELOAD_ON_MODE_SWITCH))
+ return FALSE;
+
++#ifndef XSERVER_LIBPCIACCESS
+ pScrn->racIoFlags = pScrn->racMemFlags = racflag;
++#endif
+
+ /* Function to unblank, so that we don't show an uninitialised FB */
+ pScreen->SaveScreen = RHDSaveScreen;
+diff --git a/src/rhd_id.c b/src/rhd_id.c
+index a95e9e9..53cdf7a 100644
+--- a/src/rhd_id.c
++++ b/src/rhd_id.c
+@@ -29,7 +29,9 @@
+ #include "git_version.h"
+
+ #include "xf86.h"
++#ifndef XSERVER_LIBPCIACCESS
+ #include "xf86Resources.h"
++#endif
+
+ #include "rhd.h"
+ #ifdef ATOM_BIOS
+@@ -101,7 +103,6 @@ SymTabRec RHDChipsets[] = {
+ { -1, NULL }
+ };
+
+-resRange res_none[] = { _END };
+
+ /*
+ * This is what people would refer to as "Petite".
+@@ -113,6 +114,8 @@ resRange res_none[] = { _END };
+ # define PCI_ID_LIST struct pci_id_match RHDDeviceMatch[]
+ # define LIST_END { 0, 0, (~0), (~0), 0, 0, 0 }
+ #else
++resRange res_none[] = { _END };
++
+ # define RHD_DEVICE_ENTRY(d, i, r) \
+ { (i), (d), r }
+ # define RHD_DEVICE_MATCH(d, i) \
+--
+1.6.4
+
diff --git
a/source/x11/xf86-video-radeonhd/0005-Adapt-for-nuked-xf86LoaderReqSymLists-in-Xserver-1.6.patch
b/source/x11/xf86-video-radeonhd/0005-Adapt-for-nuked-xf86LoaderReqSymLists-in-Xserver-1.6.patch
new file mode 100644
index 0000000..801227f
--- /dev/null
+++
b/source/x11/xf86-video-radeonhd/0005-Adapt-for-nuked-xf86LoaderReqSymLists-in-Xserver-1.6.patch
@@ -0,0 +1,49 @@
+From 9e8608c4ee55ca7798c3c120938d2ecf1f7e9f00 Mon Sep 17 00:00:00 2001
+From: Matthias Hopf <mh...@suse.de>
+Date: Mon, 8 Jun 2009 13:45:21 +0200
+Subject: [PATCH] Adapt for nuked xf86LoaderReqSymLists() in Xserver 1.6.99.1.
+
+---
+ src/rhd_driver.c | 17 ++++++++++++++---
+ 1 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/src/rhd_driver.c b/src/rhd_driver.c
+index 8fcf32d..bc82505 100644
+--- a/src/rhd_driver.c
++++ b/src/rhd_driver.c
+@@ -989,8 +989,14 @@ RHDPreInit(ScrnInfoPtr pScrn, int flags)
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to load XAA module."
+ " Falling back to ShadowFB.\n");
+ rhdPtr->AccelMethod = RHD_ACCEL_SHADOWFB;
+- } else
++ }
++ /* This is functionally void since 7.0 (old version scheme,
++ * and removed since 1.6.99.1 (new version scheme) */
++ /* Assume anything >= 6.* is old version scheme */
++#if XORG_VERSION_CURRENT >= 6 * 10000000
++ else
+ xf86LoaderReqSymLists(xaaSymbols, NULL);
++#endif
+ }
+
+ #ifdef USE_EXA
+@@ -1000,9 +1006,14 @@ RHDPreInit(ScrnInfoPtr pScrn, int flags)
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to load EXA module."
+ " Falling back to ShadowFB.\n");
+ rhdPtr->AccelMethod = RHD_ACCEL_SHADOWFB;
+- } else {
+- xf86LoaderReqSymLists(exaSymbols, NULL);
+ }
++ /* This is functionally void since 7.0 (old version scheme,
++ * and removed since 1.6.99.1 (new version scheme) */
++ /* Assume anything >= 6.* is old version scheme */
++#if XORG_VERSION_CURRENT >= 6 * 10000000
++ else
++ xf86LoaderReqSymLists(exaSymbols, NULL);
++#endif
+ }
+ #endif /* USE_EXA */
+
+--
+1.6.3.3
+
diff --git a/source/x11/xf86-video-radeonhd/FrugalBuild
b/source/x11/xf86-video-radeonhd/FrugalBuild
index 767890f..6030c14 100644
--- a/source/x11/xf86-video-radeonhd/FrugalBuild
+++ b/source/x11/xf86-video-radeonhd/FrugalBuild
@@ -1,12 +1,12 @@
# Compiling Time: 0.12 SBU
# Maintainer: Christian Hamar alias krix <kr...@linuxforum.hu>
-USE_DEVEL=${USE_DEVEL:-"y"}
+USE_DEVEL=${USE_DEVEL:-"n"}
pkgname=xf86-video-radeonhd
pkgver=1.2.5
Fuse $USE_DEVEL && pkgver=1.2.5.55.g27cfbaa
-pkgrel=1
+pkgrel=2
pkgdesc="X.Org driver for AMD GPG r5xx/r6xx chipsets"
url="http://xorg.freedesktop.org";
groups=('x11' 'xorg-core' 'xorg-drivers')
@@ -15,7 +15,17 @@ depends=('xorg-server>=1.6.3' 'pciutils'
'libpciaccess>=0.10.6' 'libdrm')
makedepends=('randrproto>1.3.0' 'renderproto' 'videoproto>=2.2.2'
'util-macros>=1.2.1' \
'resourceproto' 'dri2proto' 'glproto' 'xf86driproto')
Finclude xorg
-sha1sums=('64fc0eb5209adba5479396bafe53b50ded6c0940')
+source=($source 0001-Fix-autoconf-issues.patch
+ 0002-radeonhd-Update-to-xextproto-7.1-support.patch
+ 0003-radeonhd-update-for-resources-RAC-API-removal.patch
+ 0004-radeonhd-further-RAC-resources-changes.patch
+ 0005-Adapt-for-nuked-xf86LoaderReqSymLists-in-Xserver-1.6.patch)
+sha1sums=('64fc0eb5209adba5479396bafe53b50ded6c0940' \
+ '9399efe9842b0cba149ae185186d6a5de65c592c' \
+ '153f2ba4a28d0d883808a9c70f32012ab20d985c' \
+ 'b66a81dc9f826b34c2da7508017b5af85f04787e' \
+ '1b4a4801515f2965d540112e8e7f844efa0aba8a' \
+ '5cc8e053e7d1b84ee1c857e6eda877123b4b4ddb')
Fconfopts="$Fconfopts --enable-dri"
if Fuse $USE_DEVEL; then
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
