[Pkg-sdl-commits] r72 - in unstable/libsdl1.2/debian: . patches

Samuel Hocevar sho at costa.debian.org
Wed May 31 14:03:47 CEST 2006 

Author: sho
Date: 2006-05-31 12:03:46 +0000 (Wed, 31 May 2006)
New Revision: 72

Modified:
   unstable/libsdl1.2/debian/changelog
   unstable/libsdl1.2/debian/patches/011_mprotect.diff
   unstable/libsdl1.2/debian/patches/series
   unstable/libsdl1.2/debian/rules
Log:
  * debian/patches/011_mprotect.diff:
    + Fixed and refreshed patches.

  * Minor cleanup in debian/rules.


Modified: unstable/libsdl1.2/debian/changelog
===================================================================
--- unstable/libsdl1.2/debian/changelog	2006-05-30 05:35:18 UTC (rev 71)
+++ unstable/libsdl1.2/debian/changelog	2006-05-31 12:03:46 UTC (rev 72)
@@ -2,6 +2,8 @@
 
   * New upstream release (Closes: #368374).
     + Transparent support with XGL (Closes: #368799).
+    + If the X libraries are UTF-8 aware, fix the Unicode result instead of
+      relying on XLookupString() (Closes: #361802).
 
   [ Aurelien Jarno ]
   * debian/control, debian/rules:
@@ -41,15 +43,13 @@
   * debian/patches/000_autogen_autotools_fix.diff:
   * debian/patches/000_nasm_include.diff:
   * debian/patches/000_relibtoolize.diff:
+  * debian/patches/011_mprotect.diff:
     + Fixed and refreshed patches.
 
-  * debian/patches/011_mprotect.diff:
   * debian/patches/013_hermes_pic_support.diff:
-    + Temporarily disabled unappliable patches.
+    + Temporarily disabled unappliable patch. Upstream is working on a
+      different solution, but keep it around just in case.
 
-  * If the X libraries are UTF-8 aware, fix the Unicode result instead of
-    relying on XLookupString() (Closes: #361802).
-
  -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Sat, 13 May 2006 23:12:38 +0200
 
 libsdl1.2 (1.2.9-5) unstable; urgency=low

Modified: unstable/libsdl1.2/debian/patches/011_mprotect.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/011_mprotect.diff	2006-05-30 05:35:18 UTC (rev 71)
+++ unstable/libsdl1.2/debian/patches/011_mprotect.diff	2006-05-31 12:03:46 UTC (rev 72)
@@ -1,10 +1,10 @@
-Index: libsdl1.2-1.2.9+0/src/video/SDL_stretch.c
+Index: libsdl1.2-1.2.10/src/video/SDL_stretch.c
 ===================================================================
---- libsdl1.2-1.2.9+0.orig/src/video/SDL_stretch.c	2006-05-13 18:18:14.000000000 +0200
-+++ libsdl1.2-1.2.9+0/src/video/SDL_stretch.c	2006-05-13 18:18:15.000000000 +0200
-@@ -43,10 +43,23 @@
-      !defined(__WATCOMC__) && !defined(__LCC__) && !defined(__FREEBCC__)) || \
-     (defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT))
+--- libsdl1.2-1.2.10.orig/src/video/SDL_stretch.c	2006-05-01 10:02:48.000000000 +0200
++++ libsdl1.2-1.2.10/src/video/SDL_stretch.c	2006-05-31 01:05:09.000000000 +0200
+@@ -38,10 +38,23 @@
+      defined(__WATCOMC__) || \
+      (defined(__GNUC__) && defined(__i386__))) && SDL_ASSEMBLY_ROUTINES
  #define USE_ASM_STRETCH
 +#if defined(__linux__)
 +#define USE_MPROTECT
@@ -23,29 +23,25 @@
 +#include <sys/mman.h>
 +#endif
 +
- #if defined(WIN32) || defined(i386)
+ #if defined(_M_IX86) || defined(i386)
  #define PREFIX16	0x66
  #define STORE_BYTE	0xAA
-@@ -58,10 +71,16 @@
+@@ -53,7 +66,13 @@
  #error Need assembly opcodes for this architecture
  #endif
  
+-static unsigned char copy_row[4096];
 +#define MAX_CODE_LENGTH 4096
 +
- #if defined(__ELF__) && defined(__GNUC__)
--extern unsigned char _copy_row[4096] __attribute__ ((alias ("copy_row")));
-+extern unsigned char *_copy_row __attribute__ ((alias ("copy_row")));
-+#endif
 +#ifdef USE_MPROTECT
 +static unsigned char *copy_row;
 +#else
 +static unsigned char copy_row[MAX_CODE_LENGTH];
- #endif
--static unsigned char copy_row[4096];
++#endif
  
  static int generate_rowbytes(int src_w, int dst_w, int bpp)
  {
-@@ -70,12 +89,25 @@
+@@ -62,12 +81,25 @@
  		int src_w;
  		int dst_w;
  	} last;
@@ -71,7 +67,7 @@
  	/* See if we need to regenerate the copy buffer */
  	if ( (src_w == last.src_w) &&
  	     (dst_w == last.dst_w) && (bpp == last.bpp) ) {
-@@ -99,6 +131,9 @@
+@@ -91,6 +123,9 @@
  		SDL_SetError("ASM stretch of %d bytes isn't supported\n", bpp);
  		return(-1);
  	}
@@ -81,7 +77,7 @@
  	pos = 0x10000;
  	inc = (src_w << 16) / dst_w;
  	eip = copy_row;
-@@ -119,10 +154,13 @@
+@@ -111,10 +146,13 @@
  	*eip++ = RETURN;
  
  	/* Verify that we didn't overflow (too late) */
@@ -96,7 +92,7 @@
  	return(0);
  }
  
-@@ -284,15 +322,20 @@
+@@ -276,14 +314,19 @@
  			copy_row3(srcp, srcrect->w, dstp, dstrect->w);
  			break;
  		    default:
@@ -108,19 +104,18 @@
 +#endif
  #ifdef __GNUC__
  			__asm__ __volatile__ (
--			"call _copy_row"
+-			"call *%4"
 +			"call %4"
  			: "=&D" (u1), "=&S" (u2)
--			: "0" (dstp), "1" (srcp)
+-			: "0" (dstp), "1" (srcp), "r" (copy_row)
 +			: "0" (dstp), "1" (srcp), "r" (code)
  			: "memory" );
- #else
- #ifdef WIN32
--		{ void *code = &copy_row;
+ #elif defined(_MSC_VER) || defined(__WATCOMC__)
+-		{ void *code = copy_row;
  			__asm {
  				push edi
  				push esi
-@@ -304,11 +347,11 @@
+@@ -295,10 +338,10 @@
  				pop esi
  				pop edi
  			}
@@ -128,7 +123,6 @@
  #else
  #error Need inline assembly for this compiler
  #endif
- #endif /* __GNUC__ */
 +		}
  			break;
  		}

Modified: unstable/libsdl1.2/debian/patches/series
===================================================================
--- unstable/libsdl1.2/debian/patches/series	2006-05-30 05:35:18 UTC (rev 71)
+++ unstable/libsdl1.2/debian/patches/series	2006-05-31 12:03:46 UTC (rev 72)
@@ -7,7 +7,7 @@
 005_x11_keysym_fix.diff
 006_gcc4_compilation_fix.diff
 009_alsa_priority.diff
-#011_mprotect.diff
+011_mprotect.diff
 #013_hermes_pic_support.diff
 014_missing_mmx_blit.diff
 015_kfreebsd_gnu.diff

Modified: unstable/libsdl1.2/debian/rules
===================================================================
--- unstable/libsdl1.2/debian/rules	2006-05-30 05:35:18 UTC (rev 71)
+++ unstable/libsdl1.2/debian/rules	2006-05-31 12:03:46 UTC (rev 72)
@@ -123,7 +123,6 @@
 
 # Build architecture-dependent files here.
 binary-arch: build install
-#	dh_testversion
 	dh_testdir
 	dh_testroot
 	dh_installdocs -A BUGS CREDITS README README-SDL.txt
@@ -134,7 +133,6 @@
 	tar cf examples.tar test; \
 	rm -rf test
 	dh_installman -plibsdl1.2-dev debian/sdl-config.1
-	#dh_undocumented
 	dh_installchangelogs
 	dh_install --sourcedir=debian/tmp
 	for sound in $(SOUNDS); do \
@@ -156,8 +154,5 @@
 	dh_md5sums
 	dh_builddeb $(no_libasound)
 
-source diff:                                                                  
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary

More information about the Pkg-sdl-commits mailing list