[arch-commits] CVS update of extra/x11-drivers/xf86-video-ati (2 files)
Jan de Groot
jgc at archlinux.org
Sat Jan 26 10:54:22 UTC 2008
Date: Saturday, January 26, 2008 @ 05:54:22
Author: jgc
Path: /home/cvs-extra/extra/x11-drivers/xf86-video-ati
Modified: PKGBUILD (1.29 -> 1.30)
Removed: 02_add_option_for_lvds_mode.diff (1.1)
upgpkg: xf86-video-ati 6.7.197-1
----------------------------------+
02_add_option_for_lvds_mode.diff | 141 -------------------------------------
PKGBUILD | 21 ++---
2 files changed, 8 insertions(+), 154 deletions(-)
Index: extra/x11-drivers/xf86-video-ati/02_add_option_for_lvds_mode.diff
diff -u extra/x11-drivers/xf86-video-ati/02_add_option_for_lvds_mode.diff:1.1 extra/x11-drivers/xf86-video-ati/02_add_option_for_lvds_mode.diff:removed
--- extra/x11-drivers/xf86-video-ati/02_add_option_for_lvds_mode.diff:1.1 Fri Nov 9 08:51:42 2007
+++ extra/x11-drivers/xf86-video-ati/02_add_option_for_lvds_mode.diff Sat Jan 26 05:54:22 2008
@@ -1,141 +0,0 @@
-From: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
-Date: Sun, 7 Oct 2007 23:39:47 +0000 (-0400)
-Subject: RADEON: still more LVDS fixes
-X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-ati.git;a=commitdiff;h=051435610a66735fd455bbb526fa294fcfe8c0b6
-
-RADEON: still more LVDS fixes
-
-Seems some laptops need the native mode from the bios for
-LVDS while others seem to prefer a CVT mode. Add an option
-to pick the preferred mode. The default it to use the bios
-table timing.
----
-
---- a/man/radeon.man
-+++ b/man/radeon.man
-@@ -383,6 +383,14 @@ case. This is only useful for LVDS pane
- The default is
- .B on.
- .TP
-+.BI "Option \*qLVDSBiosNativeMode\*q \*q" boolean \*q
-+On some laptops, the LVDS mode from the timing tables in the bios does
-+not work properly. In those cases, a CVT mode seems to work better.
-+If you get a blank screen or have LVDS display problems, disable this
-+option to use a CVT mode.
-+The default is
-+.B on.
-+.TP
- .BI "Option \*qDRI\*q \*q" boolean \*q
- Enable DRI support. This option allows you to enable to disable the DRI.
- The default is
---- a/src/radeon.h
-+++ b/src/radeon.h
-@@ -157,7 +157,8 @@ typedef enum {
- #if defined(__powerpc__)
- OPTION_MAC_MODEL,
- #endif
-- OPTION_DEFAULT_TMDS_PLL
-+ OPTION_DEFAULT_TMDS_PLL,
-+ OPTION_LVDS_BIOS_NATIVE_MODE
- } RADEONOpts;
-
-
-@@ -816,6 +817,8 @@ typedef struct {
- RADEONMacModel MacModel;
- #endif
-
-+ Bool LVDSBiosNativeMode;
-+
- Rotation rotation;
- void (*PointerMoved)(int, int, int);
- CreateScreenResourcesProcPtr CreateScreenResources;
---- a/src/radeon_driver.c
-+++ b/src/radeon_driver.c
-@@ -190,6 +190,7 @@ static const OptionInfoRec RADEONOptions
- #if defined(__powerpc__)
- { OPTION_MAC_MODEL, "MacModel", OPTV_STRING, {0}, FALSE },
- #endif
-+ { OPTION_LVDS_BIOS_NATIVE_MODE, "LVDSBiosNativeMode", OPTV_BOOLEAN, {0}, TRUE },
- { -1, NULL, OPTV_NONE, {0}, FALSE }
- };
-
---- a/src/radeon_modes.c
-+++ b/src/radeon_modes.c
-@@ -95,20 +95,45 @@ static DisplayModePtr RADEONTVModes(xf86
- static DisplayModePtr RADEONFPNativeMode(xf86OutputPtr output)
- {
- ScrnInfoPtr pScrn = output->scrn;
-+ RADEONInfoPtr info = RADEONPTR(pScrn);
- RADEONOutputPrivatePtr radeon_output = output->driver_private;
- DisplayModePtr new = NULL;
-+ char stmp[32];
-
- if (radeon_output->PanelXRes != 0 &&
- radeon_output->PanelYRes != 0 &&
- radeon_output->DotClock != 0) {
-
-- /* Add native panel size */
-- new = xf86CVTMode(radeon_output->PanelXRes, radeon_output->PanelYRes, 60.0, TRUE, FALSE);
-+ if (info->LVDSBiosNativeMode) {
-+ new = xnfcalloc(1, sizeof (DisplayModeRec));
-+ sprintf(stmp, "%dx%d", radeon_output->PanelXRes, radeon_output->PanelYRes);
-+ new->name = xnfalloc(strlen(stmp) + 1);
-+ strcpy(new->name, stmp);
-+ new->HDisplay = radeon_output->PanelXRes;
-+ new->VDisplay = radeon_output->PanelYRes;
-+
-+ new->HTotal = new->HDisplay + radeon_output->HBlank;
-+ new->HSyncStart = new->HDisplay + radeon_output->HOverPlus;
-+ new->HSyncEnd = new->HSyncStart + radeon_output->HSyncWidth;
-+ new->VTotal = new->VDisplay + radeon_output->VBlank;
-+ new->VSyncStart = new->VDisplay + radeon_output->VOverPlus;
-+ new->VSyncEnd = new->VSyncStart + radeon_output->VSyncWidth;
-+
-+ new->Clock = radeon_output->DotClock;
-+ new->Flags = 0;
-+
-+ } else {
-+ /* Add native panel size */
-+ new = xf86CVTMode(radeon_output->PanelXRes, radeon_output->PanelYRes, 60.0, FALSE, FALSE);
-
-- new->type = M_T_DRIVER | M_T_PREFERRED;
-+ }
-
-- new->next = NULL;
-- new->prev = NULL;
-+ if (new) {
-+ new->type = M_T_DRIVER | M_T_PREFERRED;
-+
-+ new->next = NULL;
-+ new->prev = NULL;
-+ }
-
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Added native panel mode: %dx%d\n",
- radeon_output->PanelXRes, radeon_output->PanelYRes);
-@@ -159,7 +184,7 @@ static void RADEONAddScreenModes(xf86Out
- }
- }
-
-- new = xf86CVTMode(width, height, 60.0, TRUE, FALSE);
-+ new = xf86CVTMode(width, height, 60.0, FALSE, FALSE);
-
- new->type |= M_T_USERDEF;
-
---- a/src/radeon_output.c
-+++ b/src/radeon_output.c
-@@ -2440,6 +2440,15 @@ RADEONGetLVDSInfo (xf86OutputPtr output)
- }
- }
-
-+ info->LVDSBiosNativeMode = TRUE;
-+ if (!xf86ReturnOptValBool(info->Options, OPTION_LVDS_BIOS_NATIVE_MODE, TRUE)) {
-+ info->LVDSBiosNativeMode = FALSE;
-+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using CVT mode for LVDS\n");
-+ } else {
-+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using LVDS Native Mode\n");
-+ }
-+
-+
- /* The panel size we collected from BIOS may not be the
- * maximum size supported by the panel. If not, we update
- * it now. These will be used if no matching mode can be
Index: extra/x11-drivers/xf86-video-ati/PKGBUILD
diff -u extra/x11-drivers/xf86-video-ati/PKGBUILD:1.29 extra/x11-drivers/xf86-video-ati/PKGBUILD:1.30
--- extra/x11-drivers/xf86-video-ati/PKGBUILD:1.29 Fri Dec 21 22:43:02 2007
+++ extra/x11-drivers/xf86-video-ati/PKGBUILD Sat Jan 26 05:54:22 2008
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD,v 1.29 2007/12/22 03:43:02 alexander Exp $
+# $Id: PKGBUILD,v 1.30 2008/01/26 10:54:22 jgc Exp $
# Maintainer: Alexander Baldeck <alexander at archlinux.org>
# Contributor: Jan de Groot <jgc at archlinux.org>
pkgname=xf86-video-ati
pkgver=6.7.197
pkgrel=1
-_mesaver="7.0.1"
+_mesaver="7.0.3-rc1"
pkgdesc="X.org ati video driver"
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
depends=('libdrm>=2.3.0')
-makedepends=('pkgconfig' 'xorg-server>=1.4' 'imake' 'mesa>=7.0.1' 'xf86driproto' \
- 'diffutils')
+makedepends=('pkgconfig' 'xorg-server>=1.4' 'imake' 'mesa>=7.0.3rc1' 'glproto'
+ 'xf86driproto' 'diffutils')
groups=('xorg-video-drivers')
options=('!libtool')
license=('custom')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
- http://dl.sourceforge.net/mesa3d/MesaLib-${_mesaver}.tar.bz2)
+ ftp://ftp.archlinux.org/other/mesa/MesaLib-${_mesaver}.tar.bz2)
build() {
cd ${startdir}/src/${pkgname}-${pkgver}
@@ -37,18 +37,13 @@
echo "MKDEP = makedepend" >> ${CONFIG}
echo "DRI_DIRS = r128 radeon r200 r300" >> ${CONFIG}
echo "DRI_DRIVER_SEARCH_DIR = /usr/lib/xorg/modules/dri" >> ${CONFIG}
+ echo "DRI_DRIVER_INSTALL_DIR = /usr/lib/xorg/modules/dri" >> ${CONFIG}
echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${CONFIG}
echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> ${CONFIG}
ln -s ${CONFIG} current
cd ${startdir}/src/Mesa-${_mesaver}/src/mesa
- make libmesa.a || return 1
+ make linux-solo || return 1
cd drivers/dri
-
- mkdir -p ${startdir}/pkg/usr/lib/xorg/modules/dri
- make || return 1
- install -m 755 */*_dri.so ${startdir}/pkg/usr/lib/xorg/modules/dri/
+ make DESTDIR=${startdir}/pkg install || return 1
}
-
-md5sums=('7bd53945ce6d0b48b7fd558039e82aa2'
- 'c056abd763e899114bf745c9eedbf9ad')
More information about the arch-commits
mailing list