[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xprint: Changes to 'debian-unstable'



 Xext/Makefile.am                                            |    2 
 Xext/modinit.h                                              |    8 
 debian/changelog                                            |   12 
 debian/patches/13_debian_add_xkbpath_env_variable.diff      |   27 --
 debian/patches/21_glx_align_fixes.patch                     |   57 ----
 debian/patches/46_reduce_wakeups_from_smart_scheduler.patch |  157 ------------
 debian/patches/93_xprint_fonts_fix                          |   12 
 debian/patches/series                                       |    4 
 debian/rules                                                |    3 
 9 files changed, 20 insertions(+), 262 deletions(-)

New commits:
commit 1f767c71ec756bbcc0497a2a6850705766830643
Author: Drew Parsons <dparsons@debian.org>
Date:   Sun May 18 01:39:15 2008 +1000

    Disable GLX support temporarily
    
    until Debian packages mesa git master.
    Needed to define __GLcoreModule, for instance.

diff --git a/debian/rules b/debian/rules
index 7e7572f..126757e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,7 +62,8 @@ confflags += --disable-static \
 	     --with-os-name="$(shell uname)" \
 	     --with-os-vendor="$(VENDOR) ($(SOURCE_NAME) $(SOURCE_VERSION))" \
 	     --with-int10=x86emu \
-	     --disable-type1
+	     --disable-type1 \
+	     --disable-glx
 
 build: patch build-stamp
 build-stamp: 

commit eb59ea86ed24ffac6b7494ce44c6ba84bbf3854c
Author: Drew Parsons <dparsons@debian.org>
Date:   Sat May 17 23:24:58 2008 +1000

    Remove deprecrated debian patches
    
    21,46,93 have been incorporated upstream,
    13 is not relevant to Xprint.

diff --git a/debian/changelog b/debian/changelog
index c472aec..639a827 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,12 +9,20 @@ xprint (2:1.5~git20080513-1) UNRELEASED; urgency=low
     - disables dbus from xprint. dbus had been causing Xprt's
       Dispatch() loop to spin at 95% cpu. Closes: #472180.
     - configured to build with libs, allowing patch
-      94_xprint_XSERVER_LIBS to be removed. 
+      94_xprint_XSERVER_LIBS to be removed.
+    - incorporates patches: 
+      		   21_glx_align_fixes.patch
+		   46_reduce_wakeups_from_smart_scheduler.patch
+		   93_xprint_fonts_fix
+		   94_xprint_XSERVER_LIBS
+    - removes other ddxs, deprecating many others of the debian patches.
   * Adjust debian/control and rules to only build xprint.
+  * Drop 13_debian_add_xkbpath_env_variable.diff (xkb is not relevant
+    to Xprint). 
   * Oh yes, like the Night of the Zombies, xprint is Back! 
     Closes: #448970.
 
- -- Drew Parsons <dparsons@debian.org>  Wed, 14 May 2008 01:28:56 +1000
+ -- Drew Parsons <dparsons@debian.org>  Sat, 17 May 2008 23:14:11 +1000
 
 xorg-server (2:1.4.1~git20080507-1) unstable; urgency=low
 
diff --git a/debian/patches/13_debian_add_xkbpath_env_variable.diff b/debian/patches/13_debian_add_xkbpath_env_variable.diff
deleted file mode 100644
index 0692f46..0000000
--- a/debian/patches/13_debian_add_xkbpath_env_variable.diff
+++ /dev/null
@@ -1,27 +0,0 @@
---- xorg-server.orig/xkb/xkbInit.c
-+++ xorg-server/xkb/xkbInit.c
-@@ -835,6 +835,14 @@
- extern unsigned char	XkbDfltAccessXOptions;
- 
- int
-+xkbInitGlobals()
-+{
-+    char * xkbpath= getenv("XKBPATH");
-+    if (xkbpath!=NULL)
-+	XkbBaseDirectory= xkbpath;
-+}
-+
-+int
- XkbProcessArguments(int argc,char *argv[],int i)
- {
-     if (strcmp(argv[i],"-kb")==0) {
---- xorg-server.orig/os/utils.c
-+++ xorg-server/os/utils.c
-@@ -684,6 +684,7 @@
-  */
- void InitGlobals(void)
- {
-+    xkbInitGlobals();
-     ddxInitGlobals();
- }
- 
diff --git a/debian/patches/21_glx_align_fixes.patch b/debian/patches/21_glx_align_fixes.patch
deleted file mode 100644
index e597094..0000000
--- a/debian/patches/21_glx_align_fixes.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- xorg-server.orig/GL/glx/Makefile.am
-+++ xorg-server/GL/glx/Makefile.am
-@@ -14,7 +14,8 @@
- 	-I@MESA_SOURCE@/src/mesa/glapi \
- 	-I@MESA_SOURCE@/src/mesa/main \
- 	-DXFree86Server \
--	@GLX_DEFINES@
-+	@GLX_DEFINES@ \
-+	@GLX_ARCH_DEFINES@
- 
- # none yet
- #sdk_HEADERS =
---- xorg-server.orig/configure.ac
-+++ xorg-server/configure.ac
-@@ -287,6 +287,7 @@
- 	case $host_os in
- 		*netbsd*)	AC_DEFINE(USE_ALPHA_PIO, 1, [NetBSD PIO alpha IO]) ;;
- 	esac
-+	GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee"
- 	;;
-   arm*)
- 	ARM_VIDEO=yes
-@@ -317,6 +318,7 @@
- 	xorg_loader_sparcmuldiv="yes"
- 	SPARC64_VIDEO=yes
- 	BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c"
-+	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
- 	;;
-   x86_64*|amd64*)
-   	use_x86_asm="yes"
-@@ -332,8 +334,16 @@
- 				SYS_LIBS=-lamd64
- 				;;
- 	esac
-+	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
-+	;;
-+  ia64*)
-+  	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
-+	;;
-+  s390*)
-+  	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
- 	;;
- esac
-+AC_SUBST(GLX_ARCH_DEFINES)
- 
- dnl BSD *_video.c selection
- AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes])
---- xorg-server.orig/hw/dmx/glxProxy/Makefile.am
-+++ xorg-server/hw/dmx/glxProxy/Makefile.am
-@@ -32,6 +32,7 @@
-                         unpack.h
- 
- AM_CFLAGS = \
-+	    @GLX_ARCH_DEFINES@ \
-             $(DIX_CFLAGS) \
-             -I$(top_srcdir)/hw/dmx \
-             -I$(top_srcdir)/include \
diff --git a/debian/patches/46_reduce_wakeups_from_smart_scheduler.patch b/debian/patches/46_reduce_wakeups_from_smart_scheduler.patch
deleted file mode 100644
index fa3e4a8..0000000
--- a/debian/patches/46_reduce_wakeups_from_smart_scheduler.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-commit 2338d5c9914e2a43c3a4f7ee0f4355ad0a1ad9e7
-Author: Arjan van de Ven <arjan@linux.intel.com>
-Date:   Sun Oct 28 09:37:52 2007 +0100
-
-    reduce wakeups from smart scheduler
-    
-    The smart scheduler itimer currently always fires after each request
-    (which in turn causes the CPU to wake out of idle, burning precious
-    power). Rather than doing this, just stop the timer before going into
-    the select() portion of the WaitFor loop. It's a cheap system call, and
-    it will only get called if there's no more commands batched up from the
-    active fd.
-    
-    This change also allows some of the functions to be simplified;
-    setitimer() will only fail if it's passed invalid data, and we don't do
-    that... so make it void and remove all the conditional code that deals
-    with failure.
-    
-    The change also allows us to remove a few variables that were used for
-    housekeeping between the signal handler and the main loop.
-    
-    Signed-off-by: Keith Packard <keithp@koto.keithp.com>
-
-commit 0e9ef65fa583bf2393dd0fda82df6f092387b425
-Author: Keith Packard <keithp@koto.keithp.com>
-Date:   Wed Nov 7 16:33:10 2007 -0800
-
-    Don't frob timers unless SmartSchedule is running
-
---- xorg-server.orig/include/dixstruct.h
-+++ xorg-server/include/dixstruct.h
-@@ -150,11 +150,9 @@
- extern long SmartScheduleInterval;
- extern long SmartScheduleSlice;
- extern long SmartScheduleMaxSlice;
--extern unsigned long SmartScheduleIdleCount;
- extern Bool SmartScheduleDisable;
--extern Bool SmartScheduleIdle;
--extern Bool SmartScheduleTimerStopped;
--extern Bool SmartScheduleStartTimer(void);
-+extern void SmartScheduleStartTimer(void);
-+extern void SmartScheduleStopTimer(void);
- #define SMART_MAX_PRIORITY  (20)
- #define SMART_MIN_PRIORITY  (-20)
- 
---- xorg-server.orig/os/WaitFor.c
-+++ xorg-server/os/WaitFor.c
-@@ -217,7 +217,8 @@
- 	XFD_COPYSET(&AllSockets, &LastSelectMask);
- #ifdef SMART_SCHEDULE
- 	}
--	SmartScheduleIdle = TRUE;
-+	SmartScheduleStopTimer ();
-+
- #endif
- 	BlockHandler((pointer)&wt, (pointer)&LastSelectMask);
- 	if (NewOutputPending)
-@@ -237,13 +238,7 @@
- 	selecterr = GetErrno();
- 	WakeupHandler(i, (pointer)&LastSelectMask);
- #ifdef SMART_SCHEDULE
--	if (i >= 0)
--	{
--	    SmartScheduleIdle = FALSE;
--	    SmartScheduleIdleCount = 0;
--	    if (SmartScheduleTimerStopped)
--		(void) SmartScheduleStartTimer ();
--	}
-+	SmartScheduleStartTimer ();
- #endif
- 	if (i <= 0) /* An error or timeout occurred */
- 	{
---- xorg-server.orig/os/utils.c
-+++ xorg-server/os/utils.c
-@@ -1513,10 +1513,6 @@
- 
- #ifdef SMART_SCHEDULE
- 
--unsigned long	SmartScheduleIdleCount;
--Bool		SmartScheduleIdle;
--Bool		SmartScheduleTimerStopped;
--
- #ifdef SIGVTALRM
- #define SMART_SCHEDULE_POSSIBLE
- #endif
-@@ -1526,49 +1522,43 @@
- #define SMART_SCHEDULE_TIMER		ITIMER_REAL
- #endif
- 
--static void
-+void
- SmartScheduleStopTimer (void)
- {
- #ifdef SMART_SCHEDULE_POSSIBLE
-     struct itimerval	timer;
-     
-+    if (SmartScheduleDisable)
-+	return;
-     timer.it_interval.tv_sec = 0;
-     timer.it_interval.tv_usec = 0;
-     timer.it_value.tv_sec = 0;
-     timer.it_value.tv_usec = 0;
-     (void) setitimer (ITIMER_REAL, &timer, 0);
--    SmartScheduleTimerStopped = TRUE;
- #endif
- }
- 
--Bool
-+void
- SmartScheduleStartTimer (void)
- {
- #ifdef SMART_SCHEDULE_POSSIBLE
-     struct itimerval	timer;
-     
--    SmartScheduleTimerStopped = FALSE;
-+    if (SmartScheduleDisable)
-+	return;
-     timer.it_interval.tv_sec = 0;
-     timer.it_interval.tv_usec = SmartScheduleInterval * 1000;
-     timer.it_value.tv_sec = 0;
-     timer.it_value.tv_usec = SmartScheduleInterval * 1000;
--    return setitimer (ITIMER_REAL, &timer, 0) >= 0;
-+    setitimer (ITIMER_REAL, &timer, 0);
- #endif
--    return FALSE;
- }
- 
- #ifdef SMART_SCHEDULE_POSSIBLE
- static void
- SmartScheduleTimer (int sig)
- {
--    int olderrno = errno;
--
-     SmartScheduleTime += SmartScheduleInterval;
--    if (SmartScheduleIdle)
--    {
--	SmartScheduleStopTimer ();
--    }
--    errno = olderrno;
- }
- #endif
- 
-@@ -1592,14 +1582,6 @@
- 	perror ("sigaction for smart scheduler");
- 	return FALSE;
-     }
--    /* Set up the virtual timer */
--    if (!SmartScheduleStartTimer ())
--    {
--	perror ("scheduling timer");
--	return FALSE;
--    }
--    /* stop the timer and wait for WaitForSomething to start it */
--    SmartScheduleStopTimer ();
-     return TRUE;
- #else
-     return FALSE;
diff --git a/debian/patches/93_xprint_fonts_fix b/debian/patches/93_xprint_fonts_fix
deleted file mode 100644
index 78060c5..0000000
--- a/debian/patches/93_xprint_fonts_fix
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN xorg-server-old/hw/xprint/ps/psout_ft.c xorg-server/hw/xprint/ps/psout_ft.c
---- xorg-server-old/hw/xprint/ps/psout_ft.c	2006-04-02 10:09:43.000000000 +1000
-+++ xorg-server/hw/xprint/ps/psout_ft.c	2006-04-14 22:22:42.000000000 +1000
-@@ -280,6 +280,8 @@
-       else
-       {
-         sprintf(buf, "%s", baseFontName);
-+        xfree(self->FontName);
-+        self->FontName = NULL;
-       }
- 
-       if( self->FontSize == -1 )
diff --git a/debian/patches/series b/debian/patches/series
index 8679272..68f56db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,4 @@
-13_debian_add_xkbpath_env_variable.diff
-21_glx_align_fixes.patch
-46_reduce_wakeups_from_smart_scheduler.patch
 91_ttf2pt1
 91_ttf2pt1_updates
 92_xprint-security-holes-fix.patch
 93_spooltodir_check_file_exists
-93_xprint_fonts_fix

commit c7164e9c393a7e333063ac5af89b130e179c072e
Author: Drew Parsons <dparsons@debian.org>
Date:   Sun May 18 01:34:40 2008 +1000

    Create dummy modinit.h for Xext.
    
    modinit.h had been part of hw/xfree86/dixmods/extmod, enabling
    initialisation of extension modules.  Xprint does not implement
    extension modules, so the header file is provided as a dummy file
    instead, now that the xprint ddx is separated from the xfree86 ddx..

diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index b03feda..2d5f2e9 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -10,8 +10,6 @@ else
 noinst_LTLIBRARIES = libXext.la
 endif
 
-INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
-
 AM_CFLAGS = $(DIX_CFLAGS)
 
 if XORG
diff --git a/Xext/modinit.h b/Xext/modinit.h
new file mode 100644
index 0000000..87c9d28
--- /dev/null
+++ b/Xext/modinit.h
@@ -0,0 +1,8 @@
+/* Initialisation of Extension Modules is enabled via modinit.
+
+  This was implemented in the Xorg xserver (xfree86 ddx), 
+  see hw/xfree86/dixmods/extmod, but is not implemented for Xprt (xprint ddx)
+
+  This header file, referenced in the Xext extension files, is therefore given
+  as a dummy header file for xprint.
+*/


Reply to: