xserver-xorg-video-cirrus: Changes to 'ubuntu'
Rebased ref, commits from common ancestor:
commit 32d2ff984b923966f63c3ad6b92918c7daff3f77
Author: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Date: Thu Mar 12 11:04:22 2015 +0100
Rebuild against 1.17.
- Add 11-pci-tag.diff to get rid of a build error.
- Get rid of modesetting recommends, part of xorg-server now.
diff --git a/debian/changelog b/debian/changelog
index 859f2d4..7bcfc6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-cirrus (1:1.5.2-2ubuntu1) vivid; urgency=medium
+
+ * Rebuild against 1.17.
+ - Add 11-pci-tag.diff to get rid of a build error.
+ - Get rid of modesetting recommends, part of xorg-server now.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Thu, 12 Mar 2015 11:02:14 +0100
+
xserver-xorg-video-cirrus (1:1.5.2-2) unstable; urgency=medium
* Remove Cyril Brulebois from Uploaders.
diff --git a/debian/control b/debian/control
index a732a03..97804fb 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
dh-autoreconf,
quilt,
pkg-config,
- xserver-xorg-dev (>= 2:1.12),
+ xserver-xorg-dev (>= 2:1.16.99.901),
x11proto-video-dev,
x11proto-core-dev,
x11proto-fonts-dev,
@@ -25,8 +25,6 @@ Depends:
${shlibs:Depends},
${misc:Depends},
${xviddriver:Depends},
-Recommends:
- xserver-xorg-video-modesetting,
Provides:
${xviddriver:Provides}
Description: X.Org X server -- Cirrus display driver
diff --git a/debian/patches/11-pci-tag.diff b/debian/patches/11-pci-tag.diff
new file mode 100644
index 0000000..3d68f9f
--- /dev/null
+++ b/debian/patches/11-pci-tag.diff
@@ -0,0 +1,54 @@
+commit df389885adf71ed3b045c2fde9fd3ba4329e1a58
+Author: Dave Airlie <airlied@gmail.com>
+Date: Sat Sep 20 18:51:17 2014 +1000
+
+ cirrus: don't use pciTag
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+diff --git a/src/alp_driver.c b/src/alp_driver.c
+index 36f2039..bd5e52f 100644
+--- a/src/alp_driver.c
++++ b/src/alp_driver.c
+@@ -519,9 +519,11 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
+ pCir->Chipset = pCir->pEnt->chipset;
+ /* Find the PCI info for this screen */
+ pCir->PciInfo = xf86GetPciInfoForEntity(pCir->pEnt->index);
++#ifndef XSERVER_LIBPCIACCESS
+ pCir->PciTag = pciTag(PCI_DEV_BUS(pCir->PciInfo),
+ PCI_DEV_DEV(pCir->PciInfo),
+ PCI_DEV_FUNC(pCir->PciInfo));
++#endif
+
+ #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
+ if (!xf86IsPc98())
+diff --git a/src/cir.h b/src/cir.h
+index 0a5d403..84f64b5 100644
+--- a/src/cir.h
++++ b/src/cir.h
+@@ -23,7 +23,9 @@ typedef struct {
+ ScrnInfoPtr pScrn;
+ CARD32 properties;
+ pciVideoPtr PciInfo;
++#ifndef XSERVER_LIBPCIACCESS
+ PCITAG PciTag;
++#endif
+ unsigned long PIOReg;
+ union {
+ struct lgRec *lg;
+diff --git a/src/lg_driver.c b/src/lg_driver.c
+index c20bbd0..589d14e 100644
+--- a/src/lg_driver.c
++++ b/src/lg_driver.c
+@@ -382,9 +382,11 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
+
+ /* Find the PCI info for this screen */
+ pCir->PciInfo = xf86GetPciInfoForEntity(pCir->pEnt->index);
++#ifndef XSERVER_LIBPCIACCESS
+ pCir->PciTag = pciTag(PCI_DEV_BUS(pCir->PciInfo),
+ PCI_DEV_DEV(pCir->PciInfo),
+ PCI_DEV_FUNC(pCir->PciInfo));
++#endif
+
+ if (xf86LoadSubModule(pScrn, "int10")) {
+ xf86Int10InfoPtr int10InfoPtr;
diff --git a/debian/patches/series b/debian/patches/series
index 354eb33..fd80bac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
10-qemu.diff
+11-pci-tag.diff
commit 6f621833abdc3c3acb4b92838f5ec03c90386100
Author: Julien Cristau <jcristau@debian.org>
Date: Sun May 11 01:22:56 2014 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index e0f76f6..859f2d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-cirrus (1:1.5.2-2) UNRELEASED; urgency=medium
+xserver-xorg-video-cirrus (1:1.5.2-2) unstable; urgency=medium
* Remove Cyril Brulebois from Uploaders.
* Recommend xserver-xorg-video-modesetting, for kms on qemu.
- -- Julien Cristau <jcristau@debian.org> Sun, 11 May 2014 01:13:54 +0200
+ -- Julien Cristau <jcristau@debian.org> Sun, 11 May 2014 01:22:34 +0200
xserver-xorg-video-cirrus (1:1.5.2-1) unstable; urgency=low
commit c2b3486837fa203ec92dda88cddcd29bb3022741
Author: Julien Cristau <jcristau@debian.org>
Date: Sun May 11 01:14:59 2014 +0200
Recommend xserver-xorg-video-modesetting, for kms on qemu.
diff --git a/debian/changelog b/debian/changelog
index 390c837..e0f76f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-cirrus (1:1.5.2-2) UNRELEASED; urgency=medium
* Remove Cyril Brulebois from Uploaders.
+ * Recommend xserver-xorg-video-modesetting, for kms on qemu.
-- Julien Cristau <jcristau@debian.org> Sun, 11 May 2014 01:13:54 +0200
diff --git a/debian/control b/debian/control
index dd9a046..a732a03 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,8 @@ Depends:
${shlibs:Depends},
${misc:Depends},
${xviddriver:Depends},
+Recommends:
+ xserver-xorg-video-modesetting,
Provides:
${xviddriver:Provides}
Description: X.Org X server -- Cirrus display driver
commit 90ea573c52e30538e49bbfd037186015b526b6d2
Author: Julien Cristau <jcristau@debian.org>
Date: Sun May 11 01:14:06 2014 +0200
Remove Cyril Brulebois from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 94a30db..390c837 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-cirrus (1:1.5.2-2) UNRELEASED; urgency=medium
+
+ * Remove Cyril Brulebois from Uploaders.
+
+ -- Julien Cristau <jcristau@debian.org> Sun, 11 May 2014 01:13:54 +0200
+
xserver-xorg-video-cirrus (1:1.5.2-1) unstable; urgency=low
[ Maarten Lankhorst ]
diff --git a/debian/control b/debian/control
index d840f48..dd9a046 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: xserver-xorg-video-cirrus
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 8),
dh-autoreconf,
commit 2490152421c8ad723949492c859aca58a517b697
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Sep 17 08:41:11 2013 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 8648f49..94a30db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-cirrus (1:1.5.2-1) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.5.2-1) unstable; urgency=low
[ Maarten Lankhorst ]
* New upstream release.
@@ -11,7 +11,7 @@ xserver-xorg-video-cirrus (1:1.5.2-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Disable silent build rules.
- -- Maarten Lankhorst <maarten.lankhorst@canonical.com> Mon, 16 Jul 2012 15:30:58 +0200
+ -- Julien Cristau <jcristau@debian.org> Tue, 17 Sep 2013 08:34:42 +0200
xserver-xorg-video-cirrus (1:1.4.0-2) unstable; urgency=low
commit c7d2726e93313e10e7ef0ca6a38920bc0eaf69f7
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Sep 17 08:33:54 2013 +0200
Build against xserver 1.12
diff --git a/debian/changelog b/debian/changelog
index 29e2b88..8648f49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,6 @@ xserver-xorg-video-cirrus (1:1.5.2-1) UNRELEASED; urgency=low
[ Maarten Lankhorst ]
* New upstream release.
- * Require xserver 1.13rc1
* Refresh 10-qemu.diff
[ Michele Cane ]
diff --git a/debian/control b/debian/control
index e86ad63..d840f48 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
dh-autoreconf,
quilt,
pkg-config,
- xserver-xorg-dev (>= 2:1.12.99.901),
+ xserver-xorg-dev (>= 2:1.12),
x11proto-video-dev,
x11proto-core-dev,
x11proto-fonts-dev,
commit 47f8449f7ed69199d7651bbdb0ef7868f723b076
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Sep 17 08:31:13 2013 +0200
Disable silent build rules.
diff --git a/debian/changelog b/debian/changelog
index 5a843fd..29e2b88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ xserver-xorg-video-cirrus (1:1.5.2-1) UNRELEASED; urgency=low
* Bump Standards-Version to 3.9.4, no changes needed.
* Refresh patches.
+ [ Julien Cristau ]
+ * Disable silent build rules.
+
-- Maarten Lankhorst <maarten.lankhorst@canonical.com> Mon, 16 Jul 2012 15:30:58 +0200
xserver-xorg-video-cirrus (1:1.4.0-2) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 3d192dc..496a59a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,8 @@
#!/usr/bin/make -f
+override_dh_auto_configure:
+ dh_auto_configure -- --disable-silent-rules
+
# Install in debian/tmp to retain control through dh_install:
override_dh_auto_install:
dh_auto_install --destdir=debian/tmp
commit 4d141f88dd3c58620c37f05ac89771609640b4c2
Author: Michele Cane <michele.cane@gmail.com>
Date: Sun Sep 8 21:31:27 2013 +0200
Refresh patches
diff --git a/debian/changelog b/debian/changelog
index 270bbea..5a843fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xserver-xorg-video-cirrus (1:1.5.2-1) UNRELEASED; urgency=low
[ Michele Cane ]
* Bump Standards-Version to 3.9.4, no changes needed.
+ * Refresh patches.
-- Maarten Lankhorst <maarten.lankhorst@canonical.com> Mon, 16 Jul 2012 15:30:58 +0200
diff --git a/debian/patches/10-qemu.diff b/debian/patches/10-qemu.diff
index 7089205..23ba00a 100644
--- a/debian/patches/10-qemu.diff
+++ b/debian/patches/10-qemu.diff
@@ -3,9 +3,11 @@ Default to 1024x768 for Qemu.
Stolen from Fedora.
Pointed out by Guido Günther <agx@sigxcpu.org> in #586693.
---- a/src/alp_driver.c
-+++ b/src/alp_driver.c
-@@ -775,7 +775,21 @@
+Index: xserver-xorg-video-cirrus.git/src/alp_driver.c
+===================================================================
+--- xserver-xorg-video-cirrus.git.orig/src/alp_driver.c 2013-09-08 21:30:19.000000000 +0200
++++ xserver-xorg-video-cirrus.git/src/alp_driver.c 2013-09-08 21:30:19.000000000 +0200
+@@ -772,7 +772,21 @@
else
xf86SetDDCproperties(pScrn,xf86PrintEDID(
xf86DoEDID_DDC2(XF86_SCRN_ARG(pScrn),pCir->I2CPtr1)));
commit 6cd7cef87189c744bdea4e972fb76eb89a0f9772
Author: Michele Cane <michele.cane@gmail.com>
Date: Sun Sep 8 21:28:29 2013 +0200
Bump Standards-Version to 3.9.4, no changes needed.
diff --git a/debian/changelog b/debian/changelog
index 38e9429..270bbea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
xserver-xorg-video-cirrus (1:1.5.2-1) UNRELEASED; urgency=low
+ [ Maarten Lankhorst ]
* New upstream release.
* Require xserver 1.13rc1
* Refresh 10-qemu.diff
+ [ Michele Cane ]
+ * Bump Standards-Version to 3.9.4, no changes needed.
+
-- Maarten Lankhorst <maarten.lankhorst@canonical.com> Mon, 16 Jul 2012 15:30:58 +0200
xserver-xorg-video-cirrus (1:1.4.0-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 7470065..e86ad63 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends:
x11proto-render-dev,
x11proto-xext-dev,
xutils-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
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 6d558a146edbf3ef5b489a2729eb90491c1800b2
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jul 16 22:42:02 2012 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index e4030f1..d6bb0e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-cirrus (1:1.4.0-2) unstable; urgency=low
+
+ * cirrus: don't bind if there is a PCI kernel driver loaded, for
+ compatibility with the cirrus KMS driver in Linux 3.5.
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 16 Jul 2012 22:41:46 +0200
+
xserver-xorg-video-cirrus (1:1.4.0-1) unstable; urgency=low
* New upstream release:
Reply to: