#969:

* add dac fix to all dummy RPM builds * remove EOLed Fedora 19 and 20 git-svn-id: https://xpra.org/svn/Xpra/trunk@10620 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Sep 11, 2015 · c4de0b5 · c4de0b5
1 parent cc8784f
commit c4de0b5
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 465 deletions.
diff --git a/rpmbuild/0004-honour-dac.patch b/rpmbuild/0004-honour-dac.patch
@@ -0,0 +1,22 @@
+diff --git a/src/dummy_driver.c b/src/dummy_driver.c
+index 6062c39..470e125 100644
+--- a/src/dummy_driver.c
++++ b/src/dummy_driver.c
+@@ -281,7 +281,7 @@ DUMMYPreInit(ScrnInfoPtr pScrn, int flags)
+     ClockRangePtr clockRanges;
+     int i;
+     DUMMYPtr dPtr;
+-    int maxClock = 230000;
++    int maxClock = 300000;
+     GDevPtr device = xf86GetEntityInfo(pScrn->entityList[0])->device;
+
+     if (flags & PROBE_DETECT) 
+@@ -391,7 +391,7 @@ DUMMYPreInit(ScrnInfoPtr pScrn, int flags)
+     clockRanges->next = NULL;
+     clockRanges->ClockMulFactor = 1;
+     clockRanges->minClock = 11000;   /* guessed §§§ */
+-    clockRanges->maxClock = 300000;
++    clockRanges->maxClock = maxClock;
+     clockRanges->clockIndex = -1;		/* programmable */
+     clockRanges->interlaceAllowed = TRUE; 
+     clockRanges->doubleScanAllowed = TRUE;
diff --git a/rpmbuild/xorg-x11-drv-dummy.el6.spec b/rpmbuild/xorg-x11-drv-dummy.el6.spec
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 dummy video driver
 Name:      xorg-x11-drv-dummy
 Version:   0.3.6
-Release:   15.xpra5%{?dist}
+Release:   15.xpra6%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -15,6 +15,7 @@ Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Patch0:    0001-Remove-mibstore.h.patch
 Patch1:    0002-Constant-DPI.patch
 Patch2:    0003-fix-pointer-limits.patch
+Patch3:    0004-honour-dac.patch
 
 ExcludeArch: s390 s390x
 
@@ -32,6 +33,7 @@ X.Org X11 dummy video driver.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %configure --disable-static
@@ -54,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{driverdir}/dummy_drv.so
 
 %changelog
+* Fri Sep 11 2015 Antoine Martin <antoine@nagafix.co.uk> - 0.3.6-15.xpra6
+- add dac fix
+
 * Thu Dec 11 2014 Antoine Martin <antoine@nagafix.co.uk> - 0.3.6-15.xpra5
 - force rebuild with fixed CentOS environment (unwanted upgrades)
 

diff --git a/rpmbuild/xorg-x11-drv-dummy.el7.spec b/rpmbuild/xorg-x11-drv-dummy.el7.spec
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 dummy video driver
 Name:      xorg-x11-drv-dummy
 Version:   0.3.6
-Release:   15.xpra2%{?dist}
+Release:   15.xpra3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -14,6 +14,7 @@ Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Patch0:    0001-Remove-mibstore.h.patch
 Patch1:    0002-Constant-DPI.patch
 Patch2:    0003-fix-pointer-limits.patch
+Patch3:    0004-honour-dac.patch
 
 ExcludeArch: s390 s390x
 
@@ -31,6 +32,7 @@ X.Org X11 dummy video driver.
 %patch0 -p1 -b .mibstore
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 autoreconf -vif
@@ -54,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{driverdir}/dummy_drv.so
 
 %changelog
+* Fri Sep 11 2015 Antoine Martin <antoine@nagafix.co.uk> - 0.3.6-15.xpra3
+- add dac fix
+
 * Wed Nov 05 2014 Antoine Martin <antoine@nagafix.co.uk> - 0.3.6-15.xpra2
 - add cursor limit fix
 

diff --git a/rpmbuild/xorg-x11-drv-dummy.fc19.spec b/rpmbuild/xorg-x11-drv-dummy.fc19.spec