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

Samuel Hocevar sho at costa.debian.org
Sun Aug 13 17:03:56 UTC 2006 

Author: sho
Date: 2006-08-13 17:03:55 +0000 (Sun, 13 Aug 2006)
New Revision: 88

Added:
   unstable/libsdl1.2/debian/patches/016_page_size.diff
   unstable/libsdl1.2/debian/patches/017_x11_keytounicode.diff
Modified:
   unstable/libsdl1.2/debian/changelog
   unstable/libsdl1.2/debian/control
   unstable/libsdl1.2/debian/patches/series
Log:
libsdl1.2 (1.2.11-3) unstable; urgency=low

  * debian/patches/017_x11_keytounicode.diff:
    + New patch. Export X11_KeyToUnicode() to legacy applications, but warn
      about such usage to stderr (Closes: #376560).

 -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Sun, 13 Aug 2006 11:02:14 +0200

libsdl1.2 (1.2.11-2) unstable; urgency=low

  * debian/control:
    + Build-depend on libdirectfb-dev (>= 0.9.25.1) to make sure our binaries
      no longer depend on libdirectfb-0.9-24.

  * debian/patches/016_page_size.diff:
    + New patch courtesy of Margarita Manterola. Fix an FTBFS on powerpc due
      to PAGE_SIZE being dropped (Closes: #381248).

 -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Fri,  4 Aug 2006 12:15:55 +0200


Modified: unstable/libsdl1.2/debian/changelog
===================================================================
--- unstable/libsdl1.2/debian/changelog	2006-08-07 21:33:58 UTC (rev 87)
+++ unstable/libsdl1.2/debian/changelog	2006-08-13 17:03:55 UTC (rev 88)
@@ -1,3 +1,23 @@
+libsdl1.2 (1.2.11-3) unstable; urgency=low
+
+  * debian/patches/017_x11_keytounicode.diff:
+    + New patch. Export X11_KeyToUnicode() to legacy applications, but warn
+      about such usage to stderr (Closes: #376560).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Sun, 13 Aug 2006 11:02:14 +0200
+
+libsdl1.2 (1.2.11-2) unstable; urgency=low
+
+  * debian/control:
+    + Build-depend on libdirectfb-dev (>= 0.9.25.1) to make sure our binaries
+      no longer depend on libdirectfb-0.9-24.
+
+  * debian/patches/016_page_size.diff:
+    + New patch courtesy of Margarita Manterola. Fix an FTBFS on powerpc due
+      to PAGE_SIZE being dropped (Closes: #381248).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Fri,  4 Aug 2006 12:15:55 +0200
+
 libsdl1.2 (1.2.11-1) unstable; urgency=low
 
   * New upstream release.

Modified: unstable/libsdl1.2/debian/control
===================================================================
--- unstable/libsdl1.2/debian/control	2006-08-07 21:33:58 UTC (rev 87)
+++ unstable/libsdl1.2/debian/control	2006-08-13 17:03:55 UTC (rev 88)
@@ -4,7 +4,7 @@
 Maintainer: Debian SDL packages maintainers <pkg-sdl-maintainers at lists.alioth.debian.org>
 Uploaders: Matthew Danish <mrd at debian.org>, Zephaniah E. Hull <warp at debian.org>, Lawrence Williams <lawrence_cecil_williams at hotmail.com>, Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Aurelien Jarno <aurel32 at debian.org>, Josselin Mouette <joss at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: dpkg (>= 1.13.2), debhelper (>= 4.0), quilt, nasm [i386 kfreebsd-i386], libaa1-dev, libx11-dev, libxext-dev, libxt-dev, libxv-dev, x-dev, libaudiofile-dev, libesd0-dev, xlibmesa-gl-dev | libgl-dev, libsvga1-dev [amd64 i386], libarts1-dev, libartsc0-dev, libasound2-dev [i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libaudio-dev, libdirectfb-dev (>= 0.9.22), libusbhid-dev [kfreebsd-i386 kfreebsd-amd64]
+Build-Depends: dpkg (>= 1.13.2), debhelper (>= 4.0), quilt, nasm [i386 kfreebsd-i386], libaa1-dev, libx11-dev, libxext-dev, libxt-dev, libxv-dev, x-dev, libaudiofile-dev, libesd0-dev, xlibmesa-gl-dev | libgl-dev, libsvga1-dev [amd64 i386], libarts1-dev, libartsc0-dev, libasound2-dev [i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libaudio-dev, libdirectfb-dev (>= 0.9.25.1), libusbhid-dev [kfreebsd-i386 kfreebsd-amd64]
 
 Package: libsdl1.2debian
 Architecture: any

Added: unstable/libsdl1.2/debian/patches/016_page_size.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/016_page_size.diff	2006-08-07 21:33:58 UTC (rev 87)
+++ unstable/libsdl1.2/debian/patches/016_page_size.diff	2006-08-13 17:03:55 UTC (rev 88)
@@ -0,0 +1,24 @@
+diff -Naru libsdl1.2-1.2.11/src/video/fbcon/SDL_fbvideo.c libsdl1.2-patched/src/video/fbcon/SDL_fbvideo.c
+--- libsdl1.2-1.2.11/src/video/fbcon/SDL_fbvideo.c	2006-05-17 00:16:07.000000000 -0300
++++ libsdl1.2-patched/src/video/fbcon/SDL_fbvideo.c	2006-08-02 20:46:35.748443472 -0300
+@@ -547,7 +547,7 @@
+ 
+ 	/* Memory map the device, compensating for buggy PPC mmap() */
+ 	mapped_offset = (((long)finfo.smem_start) -
+-	                (((long)finfo.smem_start)&~(PAGE_SIZE-1)));
++	                (((long)finfo.smem_start)&~(sysconf(_SC_PAGESIZE)-1)));
+ 	mapped_memlen = finfo.smem_len+mapped_offset;
+ 	mapped_mem = do_mmap(NULL, mapped_memlen,
+ 	                  PROT_READ|PROT_WRITE, MAP_SHARED, console_fd, 0);
+diff -Naru libsdl1.2-1.2.11/src/video/ps2gs/SDL_gsyuv.c libsdl1.2-patched/src/video/ps2gs/SDL_gsyuv.c
+--- libsdl1.2-1.2.11/src/video/ps2gs/SDL_gsyuv.c	2006-05-17 00:16:07.000000000 -0300
++++ libsdl1.2-patched/src/video/ps2gs/SDL_gsyuv.c	2006-08-02 20:35:18.992336121 -0300
+@@ -180,7 +180,7 @@
+ 
+ 	/* Allocate a DMA area for pixel conversion */
+ 	bpp = this->screen->format->BytesPerPixel;
+-	map_offset = (mapped_len + (PAGE_SIZE - 1)) & ~(PAGE_SIZE - 1);
++	map_offset = (mapped_len + (sysconf(_SC_PAGESIZE) - 1)) & ~(sysconf(_SC_PAGESIZE) - 1);
+ 	hwdata->dma_len = hwdata->macroblocks * (16 * 16 + 8 * 8 + 8 * 8) +
+ 	                  width * height * bpp +
+ 	                  hwdata->macroblocks * (16 * sizeof(long long)) +

Added: unstable/libsdl1.2/debian/patches/017_x11_keytounicode.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/017_x11_keytounicode.diff	2006-08-07 21:33:58 UTC (rev 87)
+++ unstable/libsdl1.2/debian/patches/017_x11_keytounicode.diff	2006-08-13 17:03:55 UTC (rev 88)
@@ -0,0 +1,29 @@
+Index: libsdl1.2-1.2.11/src/video/x11/SDL_x11events.c
+===================================================================
+--- libsdl1.2-1.2.11.orig/src/video/x11/SDL_x11events.c	2006-08-13 12:03:13.000000000 +0200
++++ libsdl1.2-1.2.11/src/video/x11/SDL_x11events.c	2006-08-13 12:07:09.000000000 +0200
+@@ -957,8 +957,11 @@
+  * sequences (dead accents, compose key sequences) will not work since the
+  * state has been irrevocably lost.
+  */
++extern DECLSPEC Uint16 SDLCALL X11_KeyToUnicode(SDLKey, SDLMod);
++
+ Uint16 X11_KeyToUnicode(SDLKey keysym, SDLMod modifiers)
+ {
++	static int warning = 1;
+ 	struct SDL_VideoDevice *this = current_video;
+ 	char keybuf[32];
+ 	int i;
+@@ -966,6 +969,12 @@
+ 	XKeyEvent xkey;
+ 	Uint16 unicode;
+ 
++	if ( warning ) {
++		warning = 0;
++		fprintf(stderr, "WARNING: Application is using X11_KeyToUnicode().\n");
++		fprintf(stderr, "This is not an official SDL function, please report this as a bug.\n");
++	}
++
+ 	if ( !this || !SDL_Display ) {
+ 		return 0;
+ 	}

Modified: unstable/libsdl1.2/debian/patches/series
===================================================================
--- unstable/libsdl1.2/debian/patches/series	2006-08-07 21:33:58 UTC (rev 87)
+++ unstable/libsdl1.2/debian/patches/series	2006-08-13 17:03:55 UTC (rev 88)
@@ -14,4 +14,6 @@
 #013_hermes_pic_support.diff
 014_missing_mmx_blit.diff
 015_kfreebsd_gnu.diff
+016_page_size.diff
+017_x11_keytounicode.diff
 100_dont_propagate_lpthread.diff

More information about the Pkg-sdl-commits mailing list