[arch-commits] Commit in xf86-video-dummy/trunk (PKGBUILD git-fixes.patch)
Laurent Carlier
lcarlier at archlinux.org
Tue Nov 22 05:35:50 UTC 2016
Date: Tuesday, November 22, 2016 @ 05:35:49
Author: lcarlier
Revision: 281795
upgpkg: xf86-video-dummy 0.3.7-6
xorg-server-1.19 rebuild
Added:
xf86-video-dummy/trunk/git-fixes.patch
Modified:
xf86-video-dummy/trunk/PKGBUILD
-----------------+
PKGBUILD | 21 +++-
git-fixes.patch | 236 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 250 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-11-22 05:28:19 UTC (rev 281794)
+++ PKGBUILD 2016-11-22 05:35:49 UTC (rev 281795)
@@ -3,18 +3,25 @@
pkgname=xf86-video-dummy
pkgver=0.3.7
-pkgrel=5
+pkgrel=6
pkgdesc="X.org dummy video driver"
arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
license=('custom')
depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=20' 'xf86dgaproto')
-conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<20' 'X-ABI-VIDEODRV_VERSION>=21')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('56f84fcbc515685529ad8e10bca1072731d9c096b97c5d35ddc95cd589b98680')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23' 'xf86dgaproto')
+conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 'X-ABI-VIDEODRV_VERSION>=24')
+groups=('xorg-drivers')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+ git-fixes.patch)
+sha256sums=('56f84fcbc515685529ad8e10bca1072731d9c096b97c5d35ddc95cd589b98680'
+ '973c7a8a1c0fc143bd79e6a11cb06ed398671a9ee51c1edf5eaf4f24116e7704')
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i ../git-fixes.patch
+}
+
build() {
cd ${pkgname}-${pkgver}
./configure --prefix=/usr
Added: git-fixes.patch
===================================================================
--- git-fixes.patch (rev 0)
+++ git-fixes.patch 2016-11-22 05:35:49 UTC (rev 281795)
@@ -0,0 +1,236 @@
+From 29433844c8b8989ea2ac64bd92b3ad61b6f9cf10 Mon Sep 17 00:00:00 2001
+From: Antoine Martin <antoine at nagafix.co.uk>
+Date: Thu, 17 Sep 2015 10:55:25 -0400
+Subject: [PATCH 3/6] Honor DacSpeed setting in xorg.conf
+
+Reviewed-by: Adam Jackson <ajax at redhat.com>
+Signed-off-by: Antoine Martin <antoine at nagafix.co.uk>
+---
+ src/dummy_driver.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+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;
+--
+2.10.2
+
+
+From 8706f60ab457867c120dd44e812b8fadc2be7179 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Thu, 14 Jan 2016 10:30:40 +1000
+Subject: [PATCH 4/6] Switch to using dixChangeWindowProperty
+
+eb36924ead40564325aa56d54a973dc8fb4eae83 removed ChangeWindowProperty from the
+server.
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+Reviewed-by: Jon Turney <jon.turney at dronecode.org.uk>
+---
+ src/dummy_driver.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/dummy_driver.c b/src/dummy_driver.c
+index 470e125..9d4d5bf 100644
+--- a/src/dummy_driver.c
++++ b/src/dummy_driver.c
+@@ -790,8 +790,9 @@ DUMMYCreateWindow(WindowPtr pWin)
+ if (! ValidAtom(VFB_PROP))
+ VFB_PROP = MakeAtom(VFB_PROP_NAME, strlen(VFB_PROP_NAME), 1);
+
+- ret = ChangeWindowProperty(pWinRoot, VFB_PROP, XA_STRING,
+- 8, PropModeReplace, (int)4, (pointer)"TRUE", FALSE);
++ ret = dixChangeWindowProperty(serverClient, pWinRoot, VFB_PROP,
++ XA_STRING, 8, PropModeReplace,
++ (int)4, (pointer)"TRUE", FALSE);
+ if( ret != Success)
+ ErrorF("Could not set VFB root window property");
+ dPtr->prop = TRUE;
+--
+2.10.2
+
+
+From 367c778240b4266958f33cec3653d5389e283557 Mon Sep 17 00:00:00 2001
+From: Antoine Martin <antoine at nagafix.co.uk>
+Date: Tue, 20 Sep 2016 13:34:40 +0700
+Subject: [PATCH 5/6] remove dead code in dummy driver
+
+Signed-off-by: Antoine Martin <antoine at nagafix.co.uk>
+Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>
+Reviewed-by: Aaron Plattner <aplattner at nvidia.com>
+Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
+---
+ src/dummy_driver.c | 19 -------------------
+ 1 file changed, 19 deletions(-)
+
+diff --git a/src/dummy_driver.c b/src/dummy_driver.c
+index 9d4d5bf..cf15053 100644
+--- a/src/dummy_driver.c
++++ b/src/dummy_driver.c
+@@ -673,25 +673,6 @@ DUMMYSwitchMode(SWITCH_MODE_ARGS_DECL)
+ void
+ DUMMYAdjustFrame(ADJUST_FRAME_ARGS_DECL)
+ {
+- SCRN_INFO_PTR(arg);
+- int Base;
+-
+- Base = (y * pScrn->displayWidth + x) >> 2;
+-
+- /* Scale Base by the number of bytes per pixel. */
+- switch (pScrn->depth) {
+- case 8 :
+- break;
+- case 15 :
+- case 16 :
+- Base *= 2;
+- break;
+- case 24 :
+- Base *= 3;
+- break;
+- default :
+- break;
+- }
+ }
+
+ /* Mandatory */
+--
+2.10.2
+
+
+From e434975017eb90fa702653592ae590bc22aa483c Mon Sep 17 00:00:00 2001
+From: Aaron Plattner <aplattner at nvidia.com>
+Date: Thu, 22 Sep 2016 09:14:26 -0700
+Subject: [PATCH 6/6] Remove pointless empty functions
+
+These functions might be useful in a real driver, but with no
+hardware, they're pointless. Get rid of them.
+
+v2: Rebase, get rid of pointless calls to DUMMYAdjustFrame, return TRUE from
+DUMMYSwitchMode.
+
+Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
+Reviewed-by: Antoine Martin <antoine at nagafix.co.uk>
+Tested-by: Antoine Martin <antoine at nagafix.co.uk>
+---
+ src/dummy_driver.c | 44 +-------------------------------------------
+ 1 file changed, 1 insertion(+), 43 deletions(-)
+
+diff --git a/src/dummy_driver.c b/src/dummy_driver.c
+index cf15053..2656602 100644
+--- a/src/dummy_driver.c
++++ b/src/dummy_driver.c
+@@ -65,9 +65,6 @@ static ModeStatus DUMMYValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode,
+ static Bool DUMMYSaveScreen(ScreenPtr pScreen, int mode);
+
+ /* Internally used functions */
+-static Bool dummyModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
+-static void dummySave(ScrnInfoPtr pScrn);
+-static void dummyRestore(ScrnInfoPtr pScrn, Bool restoreText);
+ static Bool dummyDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op,
+ pointer ptr);
+
+@@ -461,14 +458,6 @@ DUMMYPreInit(ScrnInfoPtr pScrn, int flags)
+ static Bool
+ DUMMYEnterVT(VT_FUNC_ARGS_DECL)
+ {
+- SCRN_INFO_PTR(arg);
+-
+- /* Should we re-save the text mode on each VT enter? */
+- if(!dummyModeInit(pScrn, pScrn->currentMode))
+- return FALSE;
+-
+- DUMMYAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
+-
+ return TRUE;
+ }
+
+@@ -476,8 +465,6 @@ DUMMYEnterVT(VT_FUNC_ARGS_DECL)
+ static void
+ DUMMYLeaveVT(VT_FUNC_ARGS_DECL)
+ {
+- SCRN_INFO_PTR(arg);
+- dummyRestore(pScrn, TRUE);
+ }
+
+ static void
+@@ -535,15 +522,6 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL)
+
+ if (!(dPtr->FBBase = malloc(pScrn->videoRam * 1024)))
+ return FALSE;
+-
+- /*
+- * next we save the current state and setup the first mode
+- */
+- dummySave(pScrn);
+-
+- if (!dummyModeInit(pScrn,pScrn->currentMode))
+- return FALSE;
+- DUMMYAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
+
+ /*
+ * Reset visual list.
+@@ -665,8 +643,7 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL)
+ Bool
+ DUMMYSwitchMode(SWITCH_MODE_ARGS_DECL)
+ {
+- SCRN_INFO_PTR(arg);
+- return dummyModeInit(pScrn, mode);
++ return TRUE;
+ }
+
+ /* Mandatory */
+@@ -683,7 +660,6 @@ DUMMYCloseScreen(CLOSE_SCREEN_ARGS_DECL)
+ DUMMYPtr dPtr = DUMMYPTR(pScrn);
+
+ if(pScrn->vtSema){
+- dummyRestore(pScrn, TRUE);
+ free(dPtr->FBBase);
+ }
+
+@@ -725,24 +701,6 @@ DUMMYValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags)
+ return(MODE_OK);
+ }
+
+-static void
+-dummySave(ScrnInfoPtr pScrn)
+-{
+-}
+-
+-static void
+-dummyRestore(ScrnInfoPtr pScrn, Bool restoreText)
+-{
+-}
+-
+-static Bool
+-dummyModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
+-{
+- dummyRestore(pScrn, FALSE);
+-
+- return(TRUE);
+-}
+-
+ Atom VFB_PROP = 0;
+ #define VFB_PROP_NAME "VFB_IDENT"
+
+--
+2.10.2
+
More information about the arch-commits
mailing list