xserver-xorg-video-cirrus: Changes to 'debian-unstable'
ChangeLog | 18 ++++++++++++++++++
configure.ac | 2 +-
debian/changelog | 8 ++++++++
debian/control | 4 ++--
src/alp_driver.c | 6 +++++-
src/cir_driver.c | 3 ++-
src/cir_shadow.c | 1 -
src/lg_driver.c | 5 ++++-
8 files changed, 40 insertions(+), 7 deletions(-)
New commits:
commit 4d6f60994929bea1040234af454375afcd6018b2
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Dec 5 10:56:32 2009 +0200
Build against Xserver 1.7.
diff --git a/debian/changelog b/debian/changelog
index 9625c75..b56de1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-cirrus (1:1.3.1-2) UNRELEASED; urgency=low
* New upstream release.
* Bump Standards-Version to 3.8.3.
+ * Build against Xserver 1.7.
-- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 10:53:56 +0200
diff --git a/debian/control b/debian/control
index ecd403c..48239c4 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org
Build-Depends:
debhelper (>= 5),
pkg-config,
- xserver-xorg-dev (>= 2:1.5.99.901),
+ xserver-xorg-dev (>= 2:1.7),
x11proto-video-dev,
x11proto-core-dev,
x11proto-fonts-dev,
commit f3fb2d13f218a45219edc9bb89a3c396e7ec9029
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Dec 5 10:55:10 2009 +0200
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index 5260617..9625c75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-cirrus (1:1.3.1-2) UNRELEASED; urgency=low
* New upstream release.
+ * Bump Standards-Version to 3.8.3.
-- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 10:53:56 +0200
diff --git a/debian/control b/debian/control
index 2462f4c..ecd403c 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
automake,
libtool,
xutils-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-cirrus
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-cirrus.git
commit e8afb9021e1b866c0615a14a19b0e904faa51208
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Dec 5 10:54:13 2009 +0200
Update the changelogs.
diff --git a/ChangeLog b/ChangeLog
index 912b6ba..59ef5d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+commit 5cbe6d11d11070da698a6a3ddd5d95d1cff34da1
+Author: Dave Airlie <airlied@redhat.com>
+Date: Thu Jul 30 12:04:26 2009 +1000
+
+ cirrus: bump for release 1.3.2
+
+commit 4ecaa548a996475fbb4c6403698b2ecaf35e9d6b
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 15:22:40 2009 +1000
+
+ cirrus: change to using ABI version check
+
+commit 2765aba56fe66038ab7de554474b8d30995f3ef0
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 13:32:29 2009 +1000
+
+ cirrus: update for resources/RAC API removal
+
commit ecdf94e86d44bdbeff1bb944fb372da92d2fa907
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 2 10:28:20 2009 -0400
diff --git a/debian/changelog b/debian/changelog
index 35cf87c..5260617 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-cirrus (1:1.3.1-2) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 10:53:56 +0200
+
xserver-xorg-video-cirrus (1:1.3.1-1) unstable; urgency=low
[ Julien Cristau ]
commit 5cbe6d11d11070da698a6a3ddd5d95d1cff34da1
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 30 12:04:26 2009 +1000
cirrus: bump for release 1.3.2
diff --git a/configure.ac b/configure.ac
index 14b3a6f..d205eb3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-cirrus],
- 1.3.1,
+ 1.3.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-cirrus)
commit 4ecaa548a996475fbb4c6403698b2ecaf35e9d6b
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:40 2009 +1000
cirrus: change to using ABI version check
diff --git a/src/alp_driver.c b/src/alp_driver.c
index c5c531d..fe81757 100644
--- a/src/alp_driver.c
+++ b/src/alp_driver.c
@@ -36,7 +36,7 @@
/* This driver needs to be modified to not use vgaHW for multihead operation */
#include "vgaHW.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86RAC.h"
#include "xf86Resources.h"
#endif
diff --git a/src/cir_driver.c b/src/cir_driver.c
index 758e2fb..5466c48 100644
--- a/src/cir_driver.c
+++ b/src/cir_driver.c
@@ -21,7 +21,7 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#endif
/* All drivers need this */
diff --git a/src/lg_driver.c b/src/lg_driver.c
index 9d0850b..cfc3e65 100644
--- a/src/lg_driver.c
+++ b/src/lg_driver.c
@@ -39,7 +39,7 @@
/* This driver needs to be modified to not use vgaHW for multihead operation */
#include "vgaHW.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86RAC.h"
#include "xf86Resources.h"
#endif
commit 2765aba56fe66038ab7de554474b8d30995f3ef0
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:32:29 2009 +1000
cirrus: update for resources/RAC API removal
diff --git a/src/alp_driver.c b/src/alp_driver.c
index a14a5e8..c5c531d 100644
--- a/src/alp_driver.c
+++ b/src/alp_driver.c
@@ -36,8 +36,10 @@
/* This driver needs to be modified to not use vgaHW for multihead operation */
#include "vgaHW.h"
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86RAC.h"
#include "xf86Resources.h"
+#endif
/* All drivers initialising the SW cursor need this */
#include "mipointer.h"
@@ -695,7 +697,8 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
(unsigned long)pCir->IOAddress);
} else
xf86DrvMsg(pScrn->scrnIndex, from1, "Not Using MMIO\n");
-
+
+#ifndef XSERVER_LIBPCIACCESS
/*
* XXX Check if this is correct
*/
@@ -712,6 +715,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
"xf86RegisterResources() found resource conflicts\n");
return FALSE;
}
+#endif
if (!xf86LoadSubModule(pScrn, "i2c")) {
AlpFreeRec(pScrn);
diff --git a/src/cir_driver.c b/src/cir_driver.c
index 4cdce94..758e2fb 100644
--- a/src/cir_driver.c
+++ b/src/cir_driver.c
@@ -21,8 +21,9 @@
#include "xf86.h"
#include "xf86_OSproc.h"
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86Resources.h"
-
+#endif
/* All drivers need this */
/* Drivers for PCI hardware need this */
diff --git a/src/cir_shadow.c b/src/cir_shadow.c
index e8b8d35..b89890a 100644
--- a/src/cir_shadow.c
+++ b/src/cir_shadow.c
@@ -11,7 +11,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
#include "shadowfb.h"
diff --git a/src/lg_driver.c b/src/lg_driver.c
index 2574472..9d0850b 100644
--- a/src/lg_driver.c
+++ b/src/lg_driver.c
@@ -39,8 +39,10 @@
/* This driver needs to be modified to not use vgaHW for multihead operation */
#include "vgaHW.h"
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86RAC.h"
#include "xf86Resources.h"
+#endif
/* All drivers initialising the SW cursor need this */
#include "mipointer.h"
@@ -571,6 +573,7 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
pCir->FbMapSize = pScrn->videoRam * 1024;
pCir->IoMapSize = 0x4000; /* 16K for moment, will increase */
+#ifndef XSERVER_LIBPCIACCESS
pScrn->racIoFlags = RAC_COLORMAP
#ifndef EXPERIMENTAL
| RAC_VIEWPORT
@@ -584,7 +587,7 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
"xf86RegisterResources() found resource conflicts\n");
return FALSE;
}
-
+#endif
if (!xf86LoadSubModule(pScrn, "ddc")) {
LgFreeRec(pScrn);
return FALSE;
Reply to: