diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
| commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
| tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /media-libs/libsdl2/files | |
| parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) | |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'media-libs/libsdl2/files')
| -rw-r--r-- | media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch (renamed from media-libs/libsdl2/files/libsdl2-2.0.6-static-libs.patch) | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.6-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch index a1427a075b4c..595d8a51fd39 100644 --- a/media-libs/libsdl2/files/libsdl2-2.0.6-static-libs.patch +++ b/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch @@ -1,31 +1,31 @@ ---- SDL2-2.0.6/configure.in -+++ SDL2-2.0.6/configure.in -@@ -3546,7 +3546,7 @@ +--- SDL2-2.0.12/configure.ac ++++ SDL2-2.0.12/configure.ac +@@ -3751,7 +3751,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 -lversion $LIBUUID -static-libgcc" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion $LIBUUID -static-libgcc" # The Windows platform requires special setup -@@ -3956,10 +3956,10 @@ +@@ -4194,10 +4194,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\\\\ +-\\$(objects)/\\2.o: \\1/\\2.rc \\$(objects)/.created\\\\ - \\$(WINDRES) \\$< \\$@,g"` -+\\$(objects)/\\2.lo: \\1/\\2.rc\\\\ ++\\$(objects)/\\2.lo: \\1/\\2.rc \\$(objects)/.created\\\\ + \\$(LIBTOOL) --mode=compile --tag=RC \\$(WINDRES) -i \\$< -o \\$@,g"` SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES` SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES` ---- SDL2-2.0.6/Makefile.in -+++ SDL2-2.0.6/Makefile.in -@@ -143,13 +143,13 @@ +--- SDL2-2.0.12/Makefile.in ++++ SDL2-2.0.12/Makefile.in +@@ -148,13 +148,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) |