debian/changelog | 1 +
debian/patches/01_fix_build.diff | 13 +++++++++++++
debian/patches/series | 2 +-
3 files changed, 15 insertions(+), 1 deletion(-)
New commits:
commit d29293f0c99489cfdd9312f8797062755d383d83
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Wed Jul 18 16:50:35 2012 +0200
Add 01_fix_build.diff to build on new X
diff --git a/debian/changelog b/debian/changelog
index b66bfe9..5ad0c9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-mach64 (6.9.3-1) UNRELEASED; urgency=low
* New upstream release.
* Bump Standards-Version to 3.9.3
+ * Add 01_fix_build.diff to build on new X
-- Maarten Lankhorst <maarten.lankho...@canonical.com> Wed, 18 Jul 2012
16:10:36 +0200
diff --git a/debian/patches/01_fix_build.diff b/debian/patches/01_fix_build.diff
new file mode 100644
index 0000000..22b1d3b
--- /dev/null
+++ b/debian/patches/01_fix_build.diff
@@ -0,0 +1,13 @@
+diff --git a/src/atiscreen.c b/src/atiscreen.c
+index 2957877..b1fbd3c 100644
+--- a/src/atiscreen.c
++++ b/src/atiscreen.c
+@@ -580,7 +580,7 @@ ATIScreenInit(SCREEN_INIT_ARGS_DECL)
+ #ifdef TV_OUT
+ /* Fix-up TV out after ImpacTV probe */
+ if (pATI->OptionTvOut && pATI->Chip < ATI_CHIP_264GTPRO)
+- ATISwitchMode(0, pScreenInfo->currentMode, 0);
++ ATISwitchMode(SWITCH_MODE_ARGS(pScreenInfo,
pScreenInfo->currentMode));
+ #endif /* TV_OUT */
+
+ #ifdef XF86DRI_DEVEL
diff --git a/debian/patches/series b/debian/patches/series
index fdffa2a..1f24f51 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-# placeholder
+01_fix_build.diff
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1srvar-0001tv...@vasks.debian.org
