xserver-xorg-video-dummy: Changes to 'upstream-unstable'
autogen.sh |4 ++ configure.ac |5 +-- src/dummy_driver.c | 72 - 3 files changed, 11 insertions(+), 70 deletions(-) New commits: commit 4a6df6b4eecae769771eba0136bf8271d01258fb Author: Julien CristauDate: Wed Dec 14 21:57:18 2016 +0100 xf86-video-dummy 0.3.8 Signed-off-by: Julien Cristau diff --git a/configure.ac b/configure.ac index 30cf405..4eb7fae 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-dummy], -[0.3.7], +[0.3.8], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-dummy]) AC_CONFIG_SRCDIR([Makefile.am]) commit 52a6346c63c20c79f54c34e2950ccc5f1d2fb138 Author: Julien Cristau Date: Wed Dec 14 21:59:29 2016 +0100 configure: require xorg-server 1.4.99.901 dixChangeWindowProperty was introduced in that release. Signed-off-by: Julien Cristau diff --git a/configure.ac b/configure.ac index 005611d..30cf405 100644 --- a/configure.ac +++ b/configure.ac @@ -66,7 +66,7 @@ AC_SUBST([DGA]) AM_CONDITIONAL([DGA], [test "x$DGA" = xyes]) # Obtain compiler/linker options for the driver dependencies -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4.99.901] xproto fontsproto $REQUIRED_MODULES) # Checks for libraries. commit e434975017eb90fa702653592ae590bc22aa483c Author: Aaron Plattner Date: Thu Sep 22 09:14:26 2016 -0700 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 Reviewed-by: Antoine Martin Tested-by: Antoine Martin 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 BoolDUMMYSaveScreen(ScreenPtr pScreen, int mode); /* Internally used functions */ -static Bool dummyModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode); -static voiddummySave(ScrnInfoPtr pScrn); -static voiddummyRestore(ScrnInfoPtr pScrn, Bool restoreText); static BooldummyDriverFunc(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" commit 367c778240b4266958f33cec3653d5389e283557 Author: Antoine Martin Date: Tue Sep 20 13:34:40 2016 +0700 remove dead code in dummy driver Signed-off-by: Antoine Martin Reviewed-by: Eric Engestrom Reviewed-by: Aaron Plattner
xserver-xorg-video-dummy: Changes to 'upstream-unstable'
configure.ac |2 +- src/dummy_driver.c |4 2 files changed, 1 insertion(+), 5 deletions(-) New commits: commit 4160421c642fc6b2dd3100a06f236efc6bbe0e08 Author: Julien Cristau jcris...@debian.org Date: Mon Sep 9 19:45:23 2013 +0200 Bump to 0.3.7 Signed-off-by: Julien Cristau jcris...@debian.org diff --git a/configure.ac b/configure.ac index c74f3a0..06e6d87 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-dummy], -[0.3.6], +[0.3.7], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-dummy]) AC_CONFIG_SRCDIR([Makefile.am]) commit 44f04fd3046043ed31369025f34353c4e0e5c1cd Author: Adam Jackson a...@redhat.com Date: Tue Sep 25 08:54:36 2012 -0400 Remove mibstore.h Signed-off-by: Adam Jackson a...@redhat.com diff --git a/src/dummy_driver.c b/src/dummy_driver.c index 62066d6..6062c39 100644 --- a/src/dummy_driver.c +++ b/src/dummy_driver.c @@ -14,9 +14,6 @@ /* All drivers initialising the SW cursor need this */ #include mipointer.h -/* All drivers implementing backing store need this */ -#include mibstore.h - /* All drivers using the mi colormap manipulation need this */ #include micmap.h @@ -617,7 +614,6 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL) , lines - pScrn-virtualY); } -miInitializeBackingStore(pScreen); xf86SetBackingStore(pScreen); xf86SetSilkenMouse(pScreen); -- 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/e1vk7ft-o8...@vasks.debian.org
xserver-xorg-video-dummy: Changes to 'upstream-unstable'
configure.ac |2 - src/Makefile.am|2 + src/compat-api.h | 101 + src/dummy.h| 10 - src/dummy_cursor.c |4 +- src/dummy_dga.c| 10 ++--- src/dummy_driver.c | 61 7 files changed, 150 insertions(+), 40 deletions(-) New commits: commit fee6b520a620eed80e22840b8149abc50815f771 Author: Dave Airlie airl...@gmail.com Date: Wed Jul 18 19:39:32 2012 +1000 dummy: bump to 0.3.6 for release Signed-off-by: Dave Airlie airl...@redhat.com diff --git a/configure.ac b/configure.ac index 6861485..c74f3a0 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-dummy], -[0.3.5], +[0.3.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-dummy]) AC_CONFIG_SRCDIR([Makefile.am]) commit 1491470ee0745bf8303fa085bd30f7464098f1f2 Author: Dave Airlie airl...@redhat.com Date: Tue Jun 5 11:14:37 2012 +0100 dummy: convert to the new server APIs. Signed-off-by: Dave Airlie airl...@redhat.com diff --git a/src/compat-api.h b/src/compat-api.h index 1bb7724..b74a582 100644 --- a/src/compat-api.h +++ b/src/compat-api.h @@ -38,4 +38,64 @@ #define xf86ScrnToScreen(s) screenInfo.screens[(s)-scrnIndex] #endif +#ifndef XF86_SCRN_INTERFACE + +#define SCRN_ARG_TYPE int +#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)] + +#define SCREEN_ARG_TYPE int +#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)] + +#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv + +#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask +#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask + +#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen +#define CLOSE_SCREEN_ARGS scrnIndex, pScreen + +#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags +#define ADJUST_FRAME_ARGS(arg, x, y) (arg)-scrnIndex, x, y, 0 + +#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags +#define SWITCH_MODE_ARGS(arg, m) (arg)-scrnIndex, m, 0 + +#define FREE_SCREEN_ARGS_DECL int arg, int flags +#define FREE_SCREEN_ARGS(x) (x)-scrnIndex, 0 + +#define VT_FUNC_ARGS_DECL int arg, int flags +#define VT_FUNC_ARGS(flags) pScrn-scrnIndex, (flags) + +#define XF86_ENABLEDISABLEFB_ARG(x) ((x)-scrnIndex) +#else +#define SCRN_ARG_TYPE ScrnInfoPtr +#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1) + +#define SCREEN_ARG_TYPE ScreenPtr +#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1) + +#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv + +#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask +#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask + +#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen +#define CLOSE_SCREEN_ARGS pScreen + +#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y +#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y + +#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode +#define SWITCH_MODE_ARGS(arg, m) arg, m + +#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg +#define FREE_SCREEN_ARGS(x) (x) + +#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg +#define VT_FUNC_ARGS(flags) pScrn + +#define XF86_ENABLEDISABLEFB_ARG(x) (x) + +#endif + #endif diff --git a/src/dummy.h b/src/dummy.h index 24279a2..c3fdd6e 100644 --- a/src/dummy.h +++ b/src/dummy.h @@ -20,8 +20,8 @@ typedef enum { /* function prototypes */ -extern Bool DUMMYSwitchMode(int scrnIndex, DisplayModePtr mode, int flags); -extern void DUMMYAdjustFrame(int scrnIndex, int x, int y, int flags); +extern Bool DUMMYSwitchMode(SWITCH_MODE_ARGS_DECL); +extern void DUMMYAdjustFrame(ADJUST_FRAME_ARGS_DECL); /* in dummy_cursor.c */ extern Bool DUMMYCursorInit(ScreenPtr pScrn); diff --git a/src/dummy_dga.c b/src/dummy_dga.c index a35f3c9..d16d09f 100644 --- a/src/dummy_dga.c +++ b/src/dummy_dga.c @@ -116,8 +116,8 @@ DUMMY_SetMode( if(!pMode) { /* restore the original mode */ if(pDUMMY-DGAactive) { pScrn-currentMode = DUMMYSavedDGAModes[index]; -DUMMYSwitchMode(index, pScrn-currentMode, 0); - DUMMYAdjustFrame(index, 0, 0, 0); +DUMMYSwitchMode(SWITCH_MODE_ARGS(pScrn, pScrn-currentMode)); + DUMMYAdjustFrame(ADJUST_FRAME_ARGS(pScrn, 0, 0)); pDUMMY-DGAactive = FALSE; } } else { @@ -126,7 +126,7 @@ DUMMY_SetMode( pDUMMY-DGAactive = TRUE; } -DUMMYSwitchMode(index, pMode-mode, 0); +DUMMYSwitchMode(SWITCH_MODE_ARGS(pScrn, pMode-mode)); } return TRUE; @@ -149,7 +149,7 @@ DUMMY_SetViewport( ){ DUMMYPtr pDUMMY = DUMMYPTR(pScrn); - DUMMYAdjustFrame(pScrn-pScreen-myNum, x, y, flags); + DUMMYAdjustFrame(ADJUST_FRAME_ARGS(pScrn, x, y)); pDUMMY-DGAViewportStatus = 0; } diff --git
xserver-xorg-video-dummy: Changes to 'upstream-unstable'
configure.ac |2 +- src/dummy_driver.c |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 02918fd53434a23a72fe878a90f4ec48ef0e0416 Author: Jeremy Huddleston jerem...@apple.com Date: Mon Jan 9 01:00:40 2012 -0800 Don't use XFreeXDGA to determine DGA support If our server supports DGA and we want to build the dummy driver without it, XFreeXDGA will be defined by the server and will be picked up rather than our configuration option. This change forces us to honor our configuration hoice. Signed-off-by: Jeremy Huddleston jerem...@apple.com diff --git a/configure.ac b/configure.ac index d92e22a..6861485 100644 --- a/configure.ac +++ b/configure.ac @@ -61,7 +61,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto) if test x$DGA = xyes; then XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) - AC_DEFINE(XFreeXDGA, 1, [Support DGA extension]) + AC_DEFINE(USE_DGA, 1, [Support DGA extension]) fi AC_SUBST([DGA]) AM_CONDITIONAL([DGA], [test x$DGA = xyes]) diff --git a/src/dummy_driver.c b/src/dummy_driver.c index 041ca96..6533b27 100644 --- a/src/dummy_driver.c +++ b/src/dummy_driver.c @@ -45,7 +45,7 @@ #include X11/Xproto.h #include scrnintstr.h #include servermd.h -#ifdef XFreeXDGA +#ifdef USE_DGA #define _XF86DGA_SERVER_ #include X11/extensions/xf86dgaproto.h #endif @@ -592,7 +592,7 @@ DUMMYScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) xf86SetBlackWhitePixels(pScreen); -#ifdef XFreeXDGA +#ifdef USE_DGA DUMMYDGAInit(pScreen); #endif -- 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/e1rzvry-0005ma...@vasks.debian.org
xserver-xorg-video-dummy: Changes to 'upstream-unstable'
COPYING| 12 +--- configure.ac | 44 ++-- src/Makefile.am|9 - src/dummy_dga.c|6 ++ src/dummy_driver.c | 24 +--- 5 files changed, 50 insertions(+), 45 deletions(-) New commits: commit bccf37f052748386902112b770b89d81bddfaeb8 Author: Cyril Brulebois k...@debian.org Date: Sun Jan 1 07:15:36 2012 +0100 dummy 0.3.5 Signed-off-by: Cyril Brulebois k...@debian.org diff --git a/configure.ac b/configure.ac index e3623f9..d92e22a 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-dummy], -[0.3.4], +[0.3.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-dummy]) AC_CONFIG_SRCDIR([Makefile.am]) commit dd9be3b21842aacdee5501cd2e0bfafb11b5ec08 Author: Jeremy Huddleston jerem...@apple.com Date: Wed Sep 14 14:50:36 2011 -0500 Add a configure option to disable dga Signed-off-by: Jeremy Huddleston jerem...@apple.com Reviewed-by: Jamey Sharp ja...@minilop.net Signed-off-by: Jamey Sharp ja...@minilop.net diff --git a/configure.ac b/configure.ac index 1d73f6b..e3623f9 100644 --- a/configure.ac +++ b/configure.ac @@ -47,6 +47,7 @@ AC_PROG_LIBTOOL AH_TOP([#include xorg-server.h]) # Define a configure option for an alternate module directory +AC_ARG_ENABLE(dga, AS_HELP_STRING([--disable-dga], [Build DGA extension (default: yes)]), [DGA=$enableval], [DGA=yes]) AC_ARG_WITH(xorg-module-dir, [ --with-xorg-module-dir=DIR ], [ moduledir=$withval ], [ moduledir=$libdir/xorg/modules ]) @@ -57,7 +58,13 @@ AC_SUBST(moduledir) XORG_DRIVER_CHECK_EXT(RANDR, randrproto) XORG_DRIVER_CHECK_EXT(RENDER, renderproto) XORG_DRIVER_CHECK_EXT(XV, videoproto) -XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) + +if test x$DGA = xyes; then + XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) + AC_DEFINE(XFreeXDGA, 1, [Support DGA extension]) +fi +AC_SUBST([DGA]) +AM_CONDITIONAL([DGA], [test x$DGA = xyes]) # Obtain compiler/linker options for the driver dependencies PKG_CHECK_MODULES(XORG, [xorg-server = 1.0.99.901] xproto fontsproto $REQUIRED_MODULES) diff --git a/src/Makefile.am b/src/Makefile.am index 6705742..52b9921 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,6 +33,10 @@ dummy_drv_ladir = @moduledir@/drivers dummy_drv_la_SOURCES = \ dummy_cursor.c \ - dummy_dga.c \ dummy_driver.c \ dummy.h + +if DGA +dummy_drv_la_SOURCES +=\ + dummy_dga.c +endif diff --git a/src/dummy_driver.c b/src/dummy_driver.c index e6124e8..041ca96 100644 --- a/src/dummy_driver.c +++ b/src/dummy_driver.c @@ -592,7 +592,9 @@ DUMMYScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) xf86SetBlackWhitePixels(pScreen); +#ifdef XFreeXDGA DUMMYDGAInit(pScreen); +#endif if (dPtr-swCursor) xf86DrvMsg(scrnIndex, X_CONFIG, Using Software Cursor.\n); commit dd598ca433d2386687f9543457e4c6ffdb16d7c4 Author: Jeremy Huddleston jerem...@apple.com Date: Wed Sep 14 14:32:02 2011 -0500 Use malloc/free instead of deprecated X versions Signed-off-by: Jeremy Huddleston jerem...@apple.com Reviewed-by: Jamey Sharp ja...@minilop.net Signed-off-by: Jamey Sharp ja...@minilop.net diff --git a/src/dummy_dga.c b/src/dummy_dga.c index 82912e5..9710aef 100644 --- a/src/dummy_dga.c +++ b/src/dummy_dga.c @@ -49,10 +49,10 @@ DUMMYDGAInit(ScreenPtr pScreen) while(pMode) { - newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec)); + newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec)); if(!newmodes) { - xfree(modes); + free(modes); return FALSE; } modes = newmodes; commit d70dde48087a0d5c3930860ab97585d39de7b57e Author: Jeremy Huddleston jerem...@apple.com Date: Wed Sep 14 14:30:55 2011 -0500 Dummy drivers don't need PCI. Signed-off-by: Jeremy Huddleston jerem...@apple.com Reviewed-by: Jamey Sharp ja...@minilop.net Signed-off-by: Jamey Sharp ja...@minilop.net diff --git a/src/dummy_dga.c b/src/dummy_dga.c index 2c74600..82912e5 100644 --- a/src/dummy_dga.c +++ b/src/dummy_dga.c @@ -4,8 +4,6 @@ #include xf86.h #include xf86_OSproc.h -#include xf86Pci.h -#include xf86PciInfo.h #include dgaproc.h #include dummy.h commit bdc59411136b16ca3447336f22e95010bf709a53 Author: Adam Jackson a...@redhat.com Date: Wed May 25 06:05:29 2011 -0400 Port away from xalloc/xfree Signed-off-by: Adam Jackson a...@redhat.com diff --git a/src/dummy_driver.c b/src/dummy_driver.c index 1ff9f08..e6124e8 100644 --- a/src/dummy_driver.c +++ b/src/dummy_driver.c @@ -202,7 +202,7 @@ DUMMYFreeRec(ScrnInfoPtr pScrn) { if (pScrn-driverPrivate == NULL) return; -
xserver-xorg-video-dummy: Changes to 'upstream-unstable'
.gitignore | 70 - ChangeLog | 52 --- Makefile.am|9 ++ configure.ac | 13 ++--- src/.gitignore |6 src/dummy_driver.c | 17 6 files changed, 91 insertions(+), 76 deletions(-) New commits: commit 483db0376d08be806c9bd51646f226f9510a4e48 Author: Adam Jackson a...@redhat.com Date: Tue Dec 1 10:51:30 2009 -0500 dummy 0.3.3 Signed-off-by: Adam Jackson a...@redhat.com diff --git a/configure.ac b/configure.ac index c565243..c9857f7 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-dummy], -0.3.2, +0.3.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-dummy) commit 1ea8367691e69b289c2b5ca67d8ace39994347f8 Author: Adam Jackson a...@redhat.com Date: Tue Dec 1 10:36:35 2009 -0500 Don't try to make an INSTALL file INSTALL_CMD is empty. This breaks make distcheck. I don't know why, but I also don't care. Signed-off-by: Adam Jackson a...@redhat.com diff --git a/Makefile.am b/Makefile.am index 40ad32b..af06d52 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,14 +19,11 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SUBDIRS = src -MAINTAINERCLEANFILES = ChangeLog INSTALL +MAINTAINERCLEANFILES = ChangeLog -.PHONY: ChangeLog INSTALL - -INSTALL: - $(INSTALL_CMD) +.PHONY: ChangeLog ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog INSTALL +dist-hook: ChangeLog commit 84b8dac3e6d869aa7e7b012add892fad9c3ce136 Author: Gaetan Nadon mems...@videotron.ca Date: Mon Nov 23 09:25:05 2009 -0500 Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES Now that the INSTALL file is generated. Allows running make maintainer-clean. diff --git a/Makefile.am b/Makefile.am index 4f54c1b..40ad32b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SUBDIRS = src +MAINTAINERCLEANFILES = ChangeLog INSTALL .PHONY: ChangeLog INSTALL commit be0e614859c5754a18dc7c8ad2dd55090ab166c7 Author: Gaetan Nadon mems...@videotron.ca Date: Wed Oct 28 14:41:41 2009 -0400 INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 Automake 'foreign' option is specified in configure.ac. Remove from Makefile.am diff --git a/Makefile.am b/Makefile.am index 99e2179..4f54c1b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,7 +18,6 @@ # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -AUTOMAKE_OPTIONS = foreign SUBDIRS = src .PHONY: ChangeLog INSTALL commit 2fc665b979a56faaac388b065c4cd91e0d2994d3 Author: Gaetan Nadon mems...@videotron.ca Date: Wed Oct 28 14:09:09 2009 -0400 INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 Add missing INSTALL file. Use standard GNU file on building tarball README may have been updated Remove AUTHORS file as it is empty and no content available yet. Remove NEWS file as it is empty and no content available yet. diff --git a/Makefile.am b/Makefile.am index 09940ce..99e2179 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,9 +21,12 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index de86c3a..c565243 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,7 @@ AC_CONFIG_SRCDIR([Makefile.am]) AM_CONFIG_HEADER([config.h]) AC_CONFIG_AUX_DIR(.) -AM_INIT_AUTOMAKE([dist-bzip2]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit 27946998e6ec8537e7137fd453e229d81c092f54 Author: Gaetan Nadon mems...@videotron.ca Date: Mon Oct 26 12:54:21 2009 -0400 Several driver modules do not have a ChangeLog target in Makefile.am #23814 The git generated ChangeLog replaces the hand written one. Update configure.ac to xorg-macros level 1.3. Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros Update Makefile.am to add ChangeLog target if missing Remove ChangeLog from EXTRA_DIST or *CLEAN variables This is a pre-req for the INSTALL_CMD diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 89f15c8..000 --- a/ChangeLog +++ /dev/null @@ -1,52 +0,0 @@ -2006-04-06 Adam Jackson a...@freedesktop.org - - * configure.ac: - * src/dummy.h: - * src/dummy_cursor.c: - * src/dummy_dga.c: - * src/dummy_driver.c: - Unlibcwrap. Bump server version requirement. Bump to 0.2.0. - - * src/dummy_driver.c: - VERSION - DUMMY_VERSION - -2005-12-20
xserver-xorg-video-dummy: Changes to 'upstream-unstable'
README | 20 configure.ac |2 +- src/dummy_driver.c | 31 --- 3 files changed, 21 insertions(+), 32 deletions(-) New commits: commit ecf513ae11399c5778ff7d988e838a2b6211a88b Author: Adam Jackson a...@redhat.com Date: Thu Jul 2 11:08:25 2009 -0400 dummy 0.3.2 diff --git a/configure.ac b/configure.ac index b365f8d..b81b504 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-dummy], -0.3.1, +0.3.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-dummy) commit 8fe24e48acc7ec03972ee0acb5d7ab205ecbf7e0 Author: Adam Jackson a...@redhat.com Date: Thu May 28 14:54:17 2009 -0400 Remove useless loader symbol lists. diff --git a/src/dummy_driver.c b/src/dummy_driver.c index 1f44d7e..6f4b562 100644 --- a/src/dummy_driver.c +++ b/src/dummy_driver.c @@ -125,30 +125,6 @@ static const OptionInfoRec DUMMYOptions[] = { { -1, NULL, OPTV_NONE, {0}, FALSE } }; - -/* - * List of symbols from other modules that this module references. This - * list is used to tell the loader that it is OK for symbols here to be - * unresolved providing that it hasn't been told that they haven't been - * told that they are essential via a call to xf86LoaderReqSymbols() or - * xf86LoaderReqSymLists(). The purpose is this is to avoid warnings about - * unresolved symbols that are not required. - */ - -static const char *fbSymbols[] = { -fbPictureInit, -fbScreenInit, -NULL -}; - -static const char *ramdacSymbols[] = { -xf86CreateCursorInfoRec, -xf86DestroyCursorInfoRec, -xf86InitCursor, -NULL -}; - - #ifdef XFree86LOADER static MODULESETUPPROTO(dummySetup); @@ -188,11 +164,6 @@ dummySetup(pointer module, pointer opts, int *errmaj, int *errmin) */ /* -* Tell the loader about symbols from other modules that this module -* might refer to. -*/ - LoaderRefSymLists(fbSymbols, ramdacSymbols, NULL); - /* * The return value must be non-NULL on success even though there * is no TearDownProc. */ @@ -470,12 +441,10 @@ DUMMYPreInit(ScrnInfoPtr pScrn, int flags) if (xf86LoadSubModule(pScrn, fb) == NULL) { RETURN; } -xf86LoaderReqSymLists(fbSymbols, NULL); if (!dPtr-swCursor) { if (!xf86LoadSubModule(pScrn, ramdac)) RETURN; - xf86LoaderReqSymLists(ramdacSymbols, NULL); } /* We have no contiguous physical fb in physical memory */ commit 17885c5cb1dbcfb48ee593260bcd1b1ff2887989 Author: Alan Coopersmith alan.coopersm...@sun.com Date: Fri Jan 30 20:38:25 2009 -0800 Add README with pointers to mailing list, bugzilla git repos diff --git a/README b/README new file mode 100644 index 000..917276a --- /dev/null +++ b/README @@ -0,0 +1,20 @@ +xf86-video-dummy - virtual/offscreen frame buffer driver for the Xorg X server + +Please submit bugs patches to the Xorg bugzilla: + +https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +All questions regarding this software should be directed at the +Xorg mailing list: + +http://lists.freedesktop.org/mailman/listinfo/xorg + +The master development code repository can be found at: + +git://anongit.freedesktop.org/git/xorg/driver/xf86-video-dummy + +http://cgit.freedesktop.org/xorg/driver/xf86-video-dummy + +For more information on the git code manager, see: + +http://wiki.x.org/wiki/GitPage -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xserver-xorg-video-dummy: Changes to 'upstream-unstable'
configure.ac |2 +- src/dummy_driver.c |3 --- 2 files changed, 1 insertion(+), 4 deletions(-) New commits: commit d876e719969e9d33e7e4502448a544f12eb0fab8 Author: Julien Cristau jcris...@debian.org Date: Sun Jan 25 23:25:33 2009 +0100 dummy 0.3.1 diff --git a/configure.ac b/configure.ac index c0d0552..b365f8d 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-dummy], -0.3.0, +0.3.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-dummy) commit 33e86171bd1815a23f35bb992a91c02785c22402 Author: Adam Jackson a...@redhat.com Date: Fri Aug 15 14:05:04 2008 -0400 Uninclude xf86Version.h diff --git a/src/dummy_driver.c b/src/dummy_driver.c index 02ba1d9..1f44d7e 100644 --- a/src/dummy_driver.c +++ b/src/dummy_driver.c @@ -11,9 +11,6 @@ #include xf86.h #include xf86_OSproc.h -/* This is used for module versioning */ -#include xf86Version.h - /* All drivers initialising the SW cursor need this */ #include mipointer.h -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xserver-xorg-video-dummy: Changes to 'upstream-unstable'
.cvsignore | 19 --- .gitignore | 20 configure.ac |2 +- src/.cvsignore |6 -- src/.gitignore |6 ++ src/dummy.h|1 - src/dummy_driver.c |7 +++ 7 files changed, 30 insertions(+), 31 deletions(-) New commits: commit 0dcdce106d01aa6ff611436c3f8374241e7a8da8 Author: Adam Jackson [EMAIL PROTECTED] Date: Wed Mar 19 17:31:28 2008 -0400 dummy 0.3.0 diff --git a/configure.ac b/configure.ac index f019cd1..c0d0552 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-dummy], -0.2.0, +0.3.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-dummy) commit ba7ab1d468e9a5ba37c064b3b128fa3bbb721044 Author: Adam Jackson [EMAIL PROTECTED] Date: Wed Mar 19 17:26:51 2008 -0400 Death to RCS tags. diff --git a/src/dummy.h b/src/dummy.h index 17d872d..3442f63 100644 --- a/src/dummy.h +++ b/src/dummy.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* All drivers should typically include these */ #include xf86.h diff --git a/src/dummy_driver.c b/src/dummy_driver.c index 77d5bea..02ba1d9 100644 --- a/src/dummy_driver.c +++ b/src/dummy_driver.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy_driver.c,v 1.5tsi Exp $ */ /* * Copyright 2002, SuSE Linux AG, Author: Egbert Eich commit 2aeec40b3d48705bc1de9da3f06deac365c25895 Author: James Cloos [EMAIL PROTECTED] Date: Mon Sep 3 05:52:30 2007 -0400 Add *~ to .gitignore to skip patch/emacs droppings diff --git a/.gitignore b/.gitignore index fb1befd..2df4a8d 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ libtool ltmain.sh missing stamp-h1 +*~ commit 1874204e0c807c1686c28782d5eef62bd49fab04 Author: James Cloos [EMAIL PROTECTED] Date: Thu Aug 23 19:25:48 2007 -0400 Rename .cvsignore to .gitignore diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index fb1befd..000 --- a/.cvsignore +++ /dev/null @@ -1,19 +0,0 @@ -Makefile -Makefile.in -*.la -*.lo -aclocal.m4 -autom4te.cache -config.guess -config.h -config.h.in -config.log -config.status -config.sub -configure -depcomp -install-sh -libtool -ltmain.sh -missing -stamp-h1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..fb1befd --- /dev/null +++ b/.gitignore @@ -0,0 +1,19 @@ +Makefile +Makefile.in +*.la +*.lo +aclocal.m4 +autom4te.cache +config.guess +config.h +config.h.in +config.log +config.status +config.sub +configure +depcomp +install-sh +libtool +ltmain.sh +missing +stamp-h1 diff --git a/src/.cvsignore b/src/.cvsignore deleted file mode 100644 index 9730646..000 --- a/src/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.la -*.lo diff --git a/src/.gitignore b/src/.gitignore new file mode 100644 index 000..9730646 --- /dev/null +++ b/src/.gitignore @@ -0,0 +1,6 @@ +.deps +.libs +Makefile +Makefile.in +*.la +*.lo commit 345de2bd048fcc7b177a3b504522fe100b34f1e0 Author: Brice Goglin [EMAIL PROTECTED] Date: Tue Aug 7 10:50:06 2007 +0200 Define DUMMY_*_VERSION* using PACKAGE_VERSION_* diff --git a/src/dummy_driver.c b/src/dummy_driver.c index 6e8b3e2..77d5bea 100644 --- a/src/dummy_driver.c +++ b/src/dummy_driver.c @@ -85,9 +85,9 @@ static Bool dummyDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, #define DUMMY_NAME DUMMY #define DUMMY_DRIVER_NAME dummy -#define DUMMY_MAJOR_VERSION 0 -#define DUMMY_MINOR_VERSION 2 -#define DUMMY_PATCHLEVEL 0 +#define DUMMY_MAJOR_VERSION PACKAGE_VERSION_MAJOR +#define DUMMY_MINOR_VERSION PACKAGE_VERSION_MINOR +#define DUMMY_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL /* * This is intentionally screen-independent. It indicates the binding -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-dummy: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: commit 22e38bed8cd2d1e54c47d0763436012eeccb2d32 Author: Adam Jackson [EMAIL PROTECTED] Date: Fri Apr 7 18:59:48 2006 + VERSION - DUMMY_VERSION commit 7432eaf48b70437bd55e5cc98833cce224d9e131 Author: Adam Jackson [EMAIL PROTECTED] Date: Fri Apr 7 18:50:19 2006 + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. commit 474af880791908da7e006c4d500bc7318107bbd1 Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Dec 21 02:29:59 2005 + Update package version for X11R7 release. commit 9b9ea496e698e4d078c67b8f5674fd6479e3b2bb Author: Adam Jackson [EMAIL PROTECTED] Date: Mon Dec 19 16:25:53 2005 + Stub COPYING files commit d2cff58c1e7ff03109bd17c5f8247b9b166b71f2 Author: Kevin E Martin [EMAIL PROTECTED] Date: Thu Dec 15 00:24:17 2005 + Update package version number for final X11R7 release candidate. commit 39f1e4449acb3e5da96a86e2544e9be968b1 Author: Kevin E Martin [EMAIL PROTECTED] Date: Sat Dec 3 05:49:33 2005 + Update package version number for X11R7 RC3 release. commit 1b47f2e8f47501122a3b613b95ea5de99f76a8c2 Author: Kevin E Martin [EMAIL PROTECTED] Date: Fri Dec 2 02:16:08 2005 + Remove extraneous AC_MSG_RESULT. commit c2c245b18409db7013dee0b0b4b7176daae7e290 Author: Adam Jackson [EMAIL PROTECTED] Date: Tue Nov 29 23:29:58 2005 + Only build dlloader modules by default. commit e6887d858e8b837c29c7833ab4b55034b736c6d8 Author: Eric Anholt [EMAIL PROTECTED] Date: Mon Nov 21 10:49:12 2005 + Add .cvsignores for drivers. commit ec562722d0ae21f82a0dcc1a4a3e45ed52592aed Author: Kevin E Martin [EMAIL PROTECTED] Date: Tue Nov 15 05:42:03 2005 + Add check for DGA extension to fix issues when building with separate build roots. commit 1073cc5a2bd62b6972fcda4d4d9ccbe43f2506d4 Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Nov 9 21:15:14 2005 + Update package version number for X11R7 RC2 release. commit 5ced29a35f7571899f281af094fbd1f242f95e7d Author: Kevin E Martin [EMAIL PROTECTED] Date: Tue Nov 1 15:08:52 2005 + Update pkgcheck depedencies to work with separate build roots. commit ffa97f23462ff045834b4abae33cf645ed6c3517 Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Oct 19 02:48:02 2005 + Update package version number for RC1 release. commit 4bb6048d8d0d87f3d91a93fef737882434702bb0 Author: Alan Coopersmith [EMAIL PROTECTED] Date: Mon Oct 17 00:09:02 2005 + Use sed cpp to substitute variables in driver man pages commit f586bde47b9ed6561b5350c03b088acfe2e227f6 Author: Daniel Stone [EMAIL PROTECTED] Date: Thu Aug 18 09:03:46 2005 + Update autogen.sh to one that does objdir != srcdir. commit d43c40d00ab34ae85e4684cc3860f641b0bea65c Author: Søren Sandmann Pedersen [EMAIL PROTECTED] Date: Wed Aug 10 14:07:24 2005 + Don\'t lose existing CFLAGS in all the input drivers and some of the video drivers commit ef552d7e1765386c652748a97df67f4ba00beef0 Author: Kevin E Martin [EMAIL PROTECTED] Date: Fri Jul 29 21:22:43 2005 + Various changes preparing packages for RC0: - Verify and update package version numbers as needed - Implement versioning scheme - Change bug address to point to bugzilla bug entry form - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to reenable it) - Fix makedepend to use pkgconfig and pass distcheck - Update build script to build macros first - Update modular Xorg version commit c5f63f703d838cfae54269c595e14a06ea04f243 Author: Søren Sandmann Pedersen [EMAIL PROTECTED] Date: Wed Jul 13 21:52:24 2005 + Add Makefile.am here. Also, for the record, CVS needs a bullet through its head commit 30a2cce4b61e2b0e550479ee87f25c895cbca513 Author: Søren Sandmann Pedersen [EMAIL PROTECTED] Date: Wed Jul 13 21:45:21 2005 + Build system for dummy video driver commit ec9e85771609d6ec8a94b777fc784db4d1026f20 Author: Adam Jackson [EMAIL PROTECTED] Date: Mon Jul 11 02:29:47 2005 + Prep for modular builds by adding guarded #include config.h everywhere. commit 7b856f1c89ceae998c2133fcd9bba2c1493744e0 Author: Adam Jackson [EMAIL PROTECTED] Date: Sat Jun 25 21:16:54 2005 + Bug #3626: _X_EXPORT tags for video and input drivers. commit a467602c6c419bd7288d80ad50a6fa62aeff3ec8 Author: Daniel Stone [EMAIL PROTECTED] Date: Wed Apr 20 12:25:23 2005 + Fix includes right throughout the Xserver tree: change foo.h to X11/foo.h for core headers, e.g. X.h, Xpoll.h; change foo.h, extensions/foo.h and X11/foo.h to X11/extensions/foo.h for extension headers, e.g. Xv.h; change foo.[ch] to X11/Xtrans/foo.[ch] for Xtrans files. commit 53407449153e20f7529ed9b403cee5aab25880d0 Author: Adam Jackson [EMAIL PROTECTED] Date: Fri Feb 25 16:38:34 2005 + Bug #2605: Make the cyrix, dummy, glint,