debian/changelog | 19 +++++++------------
debian/patches/fix-driver-loading.diff | 30 ++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 38 insertions(+), 12 deletions(-)
New commits:
commit 7924cd3004ef2f28b5fe97c7175c2581b72ab105
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Wed Sep 26 11:24:10 2012 +0300
fix the version
diff --git a/debian/changelog b/debian/changelog
index ca43f6b..81bb0dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-mga (1:1.6.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-mga (1:1.6.1-1) UNRELEASED; urgency=low
* New upstream release
* Bump Standards-Version to 3.9.3 (no changes needed).
commit d0452b4474f997e4081f7ebf6c41a0a81507f8f7
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Wed Sep 26 11:15:44 2012 +0300
release to quantal
diff --git a/debian/changelog b/debian/changelog
index 3728717..a69f9a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-mga (1:1.6.0-0ubuntu2) UNRELEASED; urgency=low
+xserver-xorg-video-mga (1:1.6.0-0ubuntu2) quantal; urgency=low
* Added fix-driver-load.diff, fixes loading the driver when the
xserver it was built against has no support for XAA anymore. (LP:
commit 1c06b2dddca780f4925134862053ba0dbb36e1ee
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Wed Sep 26 11:15:07 2012 +0300
Added fix-driver-load.diff, fixes loading the driver when the xserver it
was built against has no support for XAA anymore. (LP: #1044797)
diff --git a/debian/changelog b/debian/changelog
index bfb5329..3728717 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-mga (1:1.6.0-0ubuntu2) UNRELEASED; urgency=low
+
+ * Added fix-driver-load.diff, fixes loading the driver when the
+ xserver it was built against has no support for XAA anymore. (LP:
+ #1044797)
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Wed, 26 Sep 2012 11:14:51 +0300
+
xserver-xorg-video-mga (1:1.6.0-0ubuntu1) quantal-proposed; urgency=low
* Sync from unreleased debian git.
diff --git a/debian/patches/fix-driver-loading.diff
b/debian/patches/fix-driver-loading.diff
new file mode 100644
index 0000000..b1e1004
--- /dev/null
+++ b/debian/patches/fix-driver-loading.diff
@@ -0,0 +1,30 @@
+commit e777a2845bfeefad386db35d694e4b1cd74a0dd5
+Author: Dave Airlie <airl...@redhat.com>
+Date: Wed Sep 26 15:18:44 2012 +1000
+
+ mga: add stub storm functions if not using XAA
+
+ If we aren't using XAA just add stub storm init/sync functions.
+
+ This lets the driver load yay.
+
+ Signed-off-by: Dave Airlie <airl...@redhat.com>
+
+diff --git a/src/mga_driver.c b/src/mga_driver.c
+index f4f54a1..3db3a74 100644
+--- a/src/mga_driver.c
++++ b/src/mga_driver.c
+@@ -4185,3 +4185,13 @@ MGAG100BlackMagic(ScrnInfoPtr pScrn)
+ usleep(10);
+ }
+
++#ifndef HAVE_XAA_H
++void MGAStormEngineInit( ScrnInfoPtr pScrn )
++{
++}
++
++void
++MGAStormSync(ScrnInfoPtr pScrn)
++{
++}
++#endif
diff --git a/debian/patches/series b/debian/patches/series
index 7b69d6a..6abb0c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01_no_nonfree.diff
02_tentatively_unbreak_dual_head.diff
+fix-driver-loading.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/e1tgn5k-0001hj...@vasks.debian.org
