diff options
Diffstat (limited to 'media-libs/libsdl2/files')
3 files changed, 44 insertions, 89 deletions
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.10-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.10-static-libs.patch new file mode 100644 index 000000000000..0b01568af6ad --- /dev/null +++ b/media-libs/libsdl2/files/libsdl2-2.0.10-static-libs.patch @@ -0,0 +1,44 @@ +--- SDL2-2.0.10/configure.ac ++++ SDL2-2.0.10/configure.ac +@@ -3648,7 +3648,7 @@ + if test -f /lib/w32api/libuuid.a; then + LIBUUID=/lib/w32api/libuuid.a + else +- LIBUUID=-luuid ++ LIBUUID=-Wl,-luuid + fi + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion $LIBUUID -static-libgcc" + # The Windows platform requires special setup +@@ -4069,10 +4069,10 @@ + + VERSION_OBJECTS=`echo $VERSION_SOURCES` + VERSION_DEPENDS=`echo $VERSION_SOURCES` +-VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'` ++VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.lo,g'` + VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\ +-\\$(objects)/\\2.o: \\1/\\2.rc\\\\ +- \\$(WINDRES) \\$< \\$@,g"` ++\\$(objects)/\\2.lo: \\1/\\2.rc\\\\ ++ \\$(LIBTOOL) --mode=compile --tag=RC \\$(WINDRES) -i \\$< -o \\$@,g"` + + SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES` + SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES` +--- SDL2-2.0.10/Makefile.in ++++ SDL2-2.0.10/Makefile.in +@@ -147,13 +147,13 @@ + .PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d) + + $(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) $(VERSION_OBJECTS) +- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) $(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) ++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) + + $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) +- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLMAIN_OBJECTS) -rpath $(libdir) ++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static + + $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS) +- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLTEST_OBJECTS) -rpath $(libdir) ++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static + + install: all install-bin install-hdrs install-lib install-data + install-bin: diff --git a/media-libs/libsdl2/files/libsdl2-2.0.8-rework-variables.patch b/media-libs/libsdl2/files/libsdl2-2.0.8-rework-variables.patch deleted file mode 100644 index 9fc43f2b38cf..000000000000 --- a/media-libs/libsdl2/files/libsdl2-2.0.8-rework-variables.patch +++ /dev/null @@ -1,68 +0,0 @@ - -# HG changeset patch -# User Sam Lantinga <slouken@libsdl.org> -# Date 1524545759 25200 -# Node ID 28be2719184c8177899d96b696bcf5e28451266f -# Parent 2a7839691e3d88c0480c4a855126d5fa03f9ff6a -Fixed bug 4144 - CMake complains about trailing spaces in sdl2.pc - - Azamat H. Hackimov - -When you try use SDL2 2.0.8 in CMake project in Linux, it complains about trailing spaces in sdl2.pc: - -CMake Error at CMakeLists.txt:147 (add_executable): - Target "TestSimpleMain" links to item "-L/usr/lib64 -lSDL2 " which has - leading or trailing whitespace. This is now an error according to policy - CMP0004. - -diff -r 2a7839691e3d -r 28be2719184c configure ---- a/configure Mon Apr 23 21:50:03 2018 -0700 -+++ b/configure Mon Apr 23 21:55:59 2018 -0700 -@@ -15752,10 +15752,17 @@ - # fi - #done - SDL_CFLAGS="$BASE_CFLAGS" --SDL_LIBS="-lSDL2 $BASE_LDFLAGS" --CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS" --CFLAGS="$CFLAGS $EXTRA_CFLAGS" --LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" -+SDL_LIBS="-lSDL2" -+if "$BASE_LDFLAGS" != "" ; then -+ SDL_LIBS="$SDL_LIBS $BASE_LDFLAGS" -+fi -+if "$EXTRA_CFLAGS" != "" ; then -+ CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS" -+ CFLAGS="$CFLAGS $EXTRA_CFLAGS" -+fi -+if "$EXTRA_LDFLAGS" != "" ; then -+ LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" -+fi - - base_libdir=`echo \${libdir} | sed 's/.*\/\(.*\)/\1/; q'` - -diff -r 2a7839691e3d -r 28be2719184c configure.in ---- a/configure.in Mon Apr 23 21:50:03 2018 -0700 -+++ b/configure.in Mon Apr 23 21:55:59 2018 -0700 -@@ -123,10 +123,17 @@ - # fi - #done - SDL_CFLAGS="$BASE_CFLAGS" --SDL_LIBS="-lSDL2 $BASE_LDFLAGS" --CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS" --CFLAGS="$CFLAGS $EXTRA_CFLAGS" --LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" -+SDL_LIBS="-lSDL2" -+if [ "$BASE_LDFLAGS" != "" ]; then -+ SDL_LIBS="$SDL_LIBS $BASE_LDFLAGS" -+fi -+if [ "$EXTRA_CFLAGS" != "" ]; then -+ CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS" -+ CFLAGS="$CFLAGS $EXTRA_CFLAGS" -+fi -+if [ "$EXTRA_LDFLAGS" != "" ]; then -+ LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" -+fi - - dnl set this to use on systems that use lib64 instead of lib - base_libdir=`echo \${libdir} | sed 's/.*\/\(.*\)/\1/; q'` - diff --git a/media-libs/libsdl2/files/libsdl2-2.0.8-wayland-headers.patch b/media-libs/libsdl2/files/libsdl2-2.0.8-wayland-headers.patch deleted file mode 100644 index 95dd17304810..000000000000 --- a/media-libs/libsdl2/files/libsdl2-2.0.8-wayland-headers.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur a/configure.in b/configure.in ---- a/configure.in 2018-03-01 16:34:41.000000000 +0000 -+++ b/configure.in 2018-09-21 21:02:34.823834390 +0100 -@@ -1411,7 +1411,8 @@ - - WAYLAND_PROTOCOLS_UNSTABLE="relative-pointer-unstable-v1 pointer-constraints-unstable-v1 xdg-shell-unstable-v6" - -- SOURCES="$SOURCES $srcdir/src/video/wayland/*.c" -+ WAYLAND_SOURCES="$srcdir/src/video/wayland/*.c" -+ SOURCES="$SOURCES $WAYLAND_SOURCES" - EXTRA_CFLAGS="$EXTRA_CFLAGS $WAYLAND_CFLAGS -I\$(gen)" - AC_ARG_ENABLE(wayland-shared, - AC_HELP_STRING([--enable-wayland-shared], [dynamically load Wayland support [[default=maybe]]]), -@@ -4003,6 +4004,7 @@ - $WAYLAND_PROTOCOLS_CLIENT_HEADER_UNSTABLE_DEPENDS - $WAYLAND_PROTOCOLS_CODE_UNSTABLE_DEPENDS - $WAYLAND_PROTOCOLS_OBJECTS_UNSTABLE -+`echo ; for s in $WAYLAND_SOURCES ; do echo -n "\$s:" ; for p in $WAYLAND_PROTOCOLS_UNSTABLE ; do echo -n " \\$(gen)/\$p-client-protocol.h" ; done ; echo ; done ; echo` - " - fi - |