diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2012-01-22 20:07:37 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2012-01-22 20:07:37 +0000 |
| commit | 571aeebc7a5e9709ba754600a03c55c312c6a3df (patch) | |
| tree | 1b192bc6ddbcd2a1d4a3ec061a78628fdaf16cd1 /media-libs/libsdl/files | |
| parent | Version bump wrt bug #399759. (diff) | |
| download | gentoo-2-571aeebc7a5e9709ba754600a03c55c312c6a3df.tar.gz gentoo-2-571aeebc7a5e9709ba754600a03c55c312c6a3df.tar.bz2 gentoo-2-571aeebc7a5e9709ba754600a03c55c312c6a3df.zip | |
version bump
(Portage version: 2.1.10.41/cvs/Linux i686)
Diffstat (limited to 'media-libs/libsdl/files')
5 files changed, 28 insertions, 9 deletions
diff --git a/media-libs/libsdl/files/libsdl-1.2.13-cld.patch b/media-libs/libsdl/files/libsdl-1.2.13-cld.patch index 4e0b9a08446f..f91f63bbf052 100644 --- a/media-libs/libsdl/files/libsdl-1.2.13-cld.patch +++ b/media-libs/libsdl/files/libsdl-1.2.13-cld.patch @@ -2,8 +2,8 @@ fix from upstream for the cld issue on x86 http://bugs.gentoo.org/217097 ---- include/SDL_stdinc.h (revision 3535) -+++ include/SDL_stdinc.h (revision 3536) +--- include/SDL_stdinc.h ++++ include/SDL_stdinc.h @@ -373,6 +373,7 @@ do { \ __asm__ __volatile__ ( \ "std\n\t" \ diff --git a/media-libs/libsdl/files/libsdl-1.2.14-click.patch b/media-libs/libsdl/files/libsdl-1.2.14-click.patch index 1fe0241e9364..f6e048b2cf6b 100644 --- a/media-libs/libsdl/files/libsdl-1.2.14-click.patch +++ b/media-libs/libsdl/files/libsdl-1.2.14-click.patch @@ -1,5 +1,5 @@ ---- SDL-1.2.14/src/video/x11/SDL_x11events.c 2009-10-12 16:07:15.000000000 -0700 -+++ SDL-1.2/src/video/x11/SDL_x11events.c 2010-07-19 23:57:48.365397095 -0700 +--- SDL-1.2.14/src/video/x11/SDL_x11events.c ++++ SDL-1.2/src/video/x11/SDL_x11events.c @@ -441,8 +441,10 @@ if ( xevent.xcrossing.mode == NotifyUngrab ) printf("Mode: NotifyUngrab\n"); diff --git a/media-libs/libsdl/files/libsdl-1.2.14-glibc213.patch b/media-libs/libsdl/files/libsdl-1.2.14-glibc213.patch index ab695f9b4616..364f69d02f5d 100644 --- a/media-libs/libsdl/files/libsdl-1.2.14-glibc213.patch +++ b/media-libs/libsdl/files/libsdl-1.2.14-glibc213.patch @@ -1,6 +1,5 @@ -diff -r 6bb01861c4c0 src/video/SDL_blit.c ---- a/src/video/SDL_blit.c Wed Feb 16 04:49:07 2011 -0800 -+++ b/src/video/SDL_blit.c Wed Feb 16 22:51:23 2011 +0100 +--- a/src/video/SDL_blit.c ++++ b/src/video/SDL_blit.c @@ -214,7 +214,7 @@ dstskip = w+info->d_skip; if ( dst < src ) { diff --git a/media-libs/libsdl/files/libsdl-1.2.14-joystick.patch b/media-libs/libsdl/files/libsdl-1.2.14-joystick.patch index 7f7e7a2e3940..1d699eac5019 100644 --- a/media-libs/libsdl/files/libsdl-1.2.14-joystick.patch +++ b/media-libs/libsdl/files/libsdl-1.2.14-joystick.patch @@ -1,5 +1,5 @@ ---- SDL-1.2.14/src/joystick/linux/SDL_sysjoystick.c 2009-10-18 13:54:40.000000000 -0400 -+++ SDL-1.2.14-mod/src/joystick/linux/SDL_sysjoystick.c 2010-08-15 22:28:19.000000000 -0400 +--- SDL-1.2.14/src/joystick/linux/SDL_sysjoystick.c ++++ SDL-1.2.14-mod/src/joystick/linux/SDL_sysjoystick.c @@ -700,26 +700,26 @@ continue; } diff --git a/media-libs/libsdl/files/libsdl-1.2.15-sdl-config.patch b/media-libs/libsdl/files/libsdl-1.2.15-sdl-config.patch new file mode 100644 index 000000000000..f430428e6e90 --- /dev/null +++ b/media-libs/libsdl/files/libsdl-1.2.15-sdl-config.patch @@ -0,0 +1,20 @@ +Only output -L -rpath cruft if using a non-standard install location. + +Makes ABI / cross-compiling easier on the soul. + +--- sdl-config.in ++++ sdl-config.in +@@ -44,7 +44,12 @@ + echo -I@includedir@/SDL @SDL_CFLAGS@ + ;; + @ENABLE_SHARED_TRUE@ --libs) +-@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@ ++@ENABLE_SHARED_TRUE@ if test x"${prefix}" != x"/usr" ; then ++@ENABLE_SHARED_TRUE@ libdirs="-L@libdir@" ++@ENABLE_SHARED_TRUE@ else ++@ENABLE_SHARED_TRUE@ libdirs="" ++@ENABLE_SHARED_TRUE@ fi ++@ENABLE_SHARED_TRUE@ echo $libdirs @SDL_RLD_FLAGS@ @SDL_LIBS@ + @ENABLE_SHARED_TRUE@ ;; + @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs) + @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs) |