diff -u libsdl1.2-1.2.14/debian/control libsdl1.2-1.2.14/debian/control --- libsdl1.2-1.2.14/debian/control +++ libsdl1.2-1.2.14/debian/control @@ -1,7 +1,8 @@ Source: libsdl1.2 Priority: optional Section: libs -Maintainer: Debian SDL packages maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian SDL packages maintainers Uploaders: Barry deFreese Standards-Version: 3.8.4 Build-Depends: dpkg (>= 1.13.2), @@ -18,7 +19,6 @@ libgl1-mesa-dev, libasound2-dev [linux-any], libcaca-dev, - libdirectfb-dev (>= 1.0) [!hurd-i386], libusbhid-dev [kfreebsd-any], libglu1-mesa-dev Vcs-Svn: svn://svn.debian.org/pkg-sdl/unstable/libsdl.2 @@ -49,21 +49,9 @@ SDL is a library that allows programs portable low level access to a video framebuffer, audio output, mouse, and keyboard. . - This version of SDL is compiled with X11, caca and DirectFB graphics + This version of SDL is compiled with X11 and caca graphics drivers and OSS, ALSA, NAS and PulseAudio sound drivers. -Package: libsdl1.2debian-udeb -XC-Package-Type: udeb -Architecture: any -Section: debian-installer -Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Simple DirectMedia Layer (with directfb graphics and no sound) - SDL is a library that allows programs portable low level access to a video - framebuffer, audio output, mouse, and keyboard. - . - This version of SDL is compiled with directfb graphics and no sound. - Package: libsdl1.2-dev Architecture: any Section: libdevel @@ -73,7 +61,6 @@ libglu1-mesa-dev, libasound2-dev [linux-any], libpulse-dev, - libdirectfb-dev (>= 0.9.22), libcaca-dev, libusbhid-dev [kfreebsd-any], libxt-dev, diff -u libsdl1.2-1.2.14/debian/changelog libsdl1.2-1.2.14/debian/changelog --- libsdl1.2-1.2.14/debian/changelog +++ libsdl1.2-1.2.14/debian/changelog @@ -1,3 +1,19 @@ +libsdl1.2 (1.2.14-6.4ubuntu1) precise; urgency=low + + * Merge from Debian testing (LP: #898147), remaining changes: + - Drop directfb support. This is the only package which still pulls the + rather sizable directfb into a standard installation, and we never + actually used/supported it anyway. Drop directfb build/binary dependencies + and libsdl1.2debian-udeb package; don't build udeb flavour and drop + --enable-video-directfb from confflags. + - Disable PlayStation 3 Cell driver on ppc64 as well as on powerpc. + - Replace memcpy by memmove in SDL_blit.c, as per SDL bug 1090 + see http://hg.libsdl.org/SDL/rev/d898ee5431f5 + - Add 321_x11_add_support_to__NET_WM_PID.diff to support pid exportation + in each x11 SDL window, needed mostly by pygame and BAMF. + + -- Felix Geyer Wed, 30 Nov 2011 13:46:31 +0100 + libsdl1.2 (1.2.14-6.4) unstable; urgency=low * Non-maintainer upload. @@ -41,6 +57,45 @@ -- Lisandro Damián Nicanor Pérez Meyer Fri, 08 Apr 2011 23:35:29 +0200 +libsdl1.2 (1.2.14-6.1ubuntu4) oneiric; urgency=low + + * Added 321_x11_add_support_to__NET_WM_PID.diff to support pid exportation + in each x11 SDL window, needed mostly by pygame and BAMF (LP: #777417). + + -- Marco Trevisan (Treviño) Wed, 06 Jul 2011 15:07:19 +0200 + +libsdl1.2 (1.2.14-6.1ubuntu3) natty; urgency=low + + * Replace memcpy by memmove in SDL_blit.c, as per SDL bug 1090 + see http://hg.libsdl.org/SDL/rev/d898ee5431f5 + (LP: #725044). + + -- Dr. David Alan Gilbert Sun, 13 Mar 2011 01:05:52 +0000 + +libsdl1.2 (1.2.14-6.1ubuntu2) natty; urgency=low + + * Disable PlayStation 3 Cell driver on ppc64 as well as on powerpc. + + -- Colin Watson Tue, 15 Feb 2011 12:57:15 +0000 + +libsdl1.2 (1.2.14-6.1ubuntu1) natty; urgency=low + + [ Ubuntu Merge-o-Matic ] + * Merge from Debian unstable. Remaining changes: + - Drop aRts support: drop libarts1-dev and libartsc0-dev build-deps, + deps, drop libsdl1.2debian-arts package from control, drop alternate dep + of libsdl1.2-debian on libsdl1.2debian-arts, pass --enable-arts=no in + confflags, drop arts from FLAVOURS in rules. + - Drop svgalib support: drop build-dep and deps on libsvga1-dev, drop + mention of "svga" driver in libsdl1.2debian's description. + - Drop directfb support. This is the only package which still pulls the + rather sizable directfb into a standard installation, and we never + actually used/supported it anyway. Drop directfb build/binary dependencies and + libsdl1.2debian-udeb package; don't build udeb flavour and drop + --enable-video-directfb from all_confflags. + + -- Martin Pitt Tue, 12 Oct 2010 15:59:02 +0200 + libsdl1.2 (1.2.14-6.1) unstable; urgency=medium * Non-maintainer upload. diff -u libsdl1.2-1.2.14/debian/rules libsdl1.2-1.2.14/debian/rules --- libsdl1.2-1.2.14/debian/rules +++ libsdl1.2-1.2.14/debian/rules @@ -28,8 +28,7 @@ --disable-video-ggi --disable-video-svga --disable-video-aalib \ --disable-nas --disable-esd --disable-arts \ --disable-alsa-shared --disable-pulseaudio-shared \ - --disable-x11-shared \ - --enable-video-directfb + --disable-x11-shared all_confflags = --enable-video-caca udeb_confflags = --enable-video-directfb \ --disable-video-x11 \ @@ -58,8 +57,8 @@ confflags += --enable-nasm endif -# Don't use PlayStation 3 Cell driver on powerpc -ifeq ($(DEB_HOST_ARCH_CPU),powerpc) +# Don't use PlayStation 3 Cell driver on powerpc or ppc64 +ifneq (,$(findstring $(DEB_BUILD_ARCH_CPU),powerpc ppc64)) confflags += --enable-video-ps3=no \ --disable-altivec endif @@ -69,7 +68,7 @@ dh_testdir QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 touch configure # Fix timestamp - for dir in all udeb; do \ + for dir in all; do \ if ( [ "$$dir" = "all" ] ); then \ SWITCHES="$(all_confflags)"; \ elif ( [ "$$dir" = "udeb" ] ); then \ @@ -85,7 +84,7 @@ build: build-stamp build-stamp: configure-stamp dh_testdir - for dir in all udeb; do \ + for dir in all; do \ $(MAKE) -j $(NJOBS) -C builddir/$$dir || exit 1; \ done touch build-stamp @@ -127,12 +126,11 @@ dh_installchangelogs dh_install --sourcedir=debian/tmp sed -i -e "s/^dependency_libs=.*/dependency_libs=''/" debian/libsdl1.2-dev/usr/lib/libSDL.la - dh_install --sourcedir=builddir/udeb/ -plibsdl1.2debian-udeb build/.libs/*.so.* usr/lib/; rm -rf debian/libsdl1.2debian/usr/include dh_strip dh_compress dh_fixperms - dh_makeshlibs -V"libsdl1.2debian (>= $(SHLIBVER))" --add-udeb=libsdl1.2debian-udeb + dh_makeshlibs -V"libsdl1.2debian (>= $(SHLIBVER))" dh_installdeb dh_shlibdeps dh_gencontrol diff -u libsdl1.2-1.2.14/debian/patches/series libsdl1.2-1.2.14/debian/patches/series --- libsdl1.2-1.2.14/debian/patches/series +++ libsdl1.2-1.2.14/debian/patches/series @@ -19,0 +20,2 @@ +321_x11_add_support_to__NET_WM_PID.diff +900_sdlblitmemcpyfix.diff only in patch2: unchanged: --- libsdl1.2-1.2.14.orig/debian/patches/900_sdlblitmemcpyfix.diff +++ libsdl1.2-1.2.14/debian/patches/900_sdlblitmemcpyfix.diff @@ -0,0 +1,18 @@ +From: Sam Lantinga +Description: Fixed bug #1090 (SDL_BlitCopyOverlap() assumes memcpy() operates in order) + The much more complete fix is in SDL 1.3, but this is a band-aid that will fix the bug for 1.2. +Origin: http://hg.libsdl.org/SDL/rev/d898ee5431f5 +Bug: http://bugzilla.libsdl.org/show_bug.cgi?id=1090 +Bug-Ubuntu: https://launchpad.net/bugs/725044 + +--- a/src/video/SDL_blit.c ++++ b/src/video/SDL_blit.c +@@ -214,7 +214,7 @@ + dstskip = w+info->d_skip; + if ( dst < src ) { + while ( h-- ) { +- SDL_memcpy(dst, src, w); ++ SDL_memmove(dst, src, w); + src += srcskip; + dst += dstskip; + } only in patch2: unchanged: --- libsdl1.2-1.2.14.orig/debian/patches/321_x11_add_support_to__NET_WM_PID.diff +++ libsdl1.2-1.2.14/debian/patches/321_x11_add_support_to__NET_WM_PID.diff @@ -0,0 +1,46 @@ +Subject: [PATCH] X11: Added support to _NET_WM_PID and WM_CLIENT_MACHINE atoms +Date: Tue, 28 Jun 2011 22:27:13 +0200 +From: Marco Trevisan (Treviño) + +# HG changeset patch +# User Marco Trevisan (Treviño) +# Date 1309292807 -7200 +# Branch SDL-1.2 +# Node ID aa87bdcb6f5b3fdc83fbceda566705457fbcc2d1 +# Parent 80ae1ac3bdc9cbcc2932b6cfcfc322320f0d819d +X11: Added support to _NET_WM_PID and WM_CLIENT_MACHINE atoms + +Add support to the _NET_WM_PID atom which is needed by many windows +managers to correctly associate a SDL window to its process and to +related .desktop file and icon for the given host. + +diff -r 80ae1ac3bdc9 -r aa87bdcb6f5b src/video/x11/SDL_x11video.c +--- a/src/video/x11/SDL_x11video.c Sat Jun 04 15:34:32 2011 -0400 ++++ b/src/video/x11/SDL_x11video.c Tue Jun 28 22:26:47 2011 +0200 +@@ -417,6 +417,25 @@ + } + } + ++ { ++ char hostname[256]; ++ ++ if (gethostname(hostname, sizeof(hostname)) > -1) { ++ hostname[sizeof(hostname)-1] = '\0'; ++ pid_t pid = getpid(); ++ ++ if (pid > 0) { ++ Atom _NET_WM_PID = XInternAtom(SDL_Display, "_NET_WM_PID", False); ++ Atom WM_CLIENT_MACHINE = XInternAtom(SDL_Display, "WM_CLIENT_MACHINE", False); ++ ++ XChangeProperty(SDL_Display, WMwindow, _NET_WM_PID, XA_CARDINAL, 32, ++ PropModeReplace, (unsigned char *)&pid, 1); ++ XChangeProperty(SDL_Display, WMwindow, WM_CLIENT_MACHINE, XA_STRING, 8, ++ PropModeReplace, hostname, SDL_strlen(hostname)); ++ } ++ } ++ } ++ + /* Setup the communication with the IM server */ + /* create_aux_windows may be called several times against the same + Display. We should reuse the SDL_IM if one has been opened for +