Signed-off-by: Robert Schwebel <[email protected]> --- .../SDL_mixer-1.2.11/0001-fix-parallel-build.patch | 46 +++++++++++++++++++ .../0002-fix-cross-compiling-issue.patch | 43 ++++++++++++++++++ patches/SDL_mixer-1.2.11/fix-cross-compiling.diff | 39 ---------------- patches/SDL_mixer-1.2.11/fix-parallel-build.diff | 47 -------------------- patches/SDL_mixer-1.2.11/series | 2 - 5 files changed, 89 insertions(+), 88 deletions(-) create mode 100644 patches/SDL_mixer-1.2.11/0001-fix-parallel-build.patch create mode 100644 patches/SDL_mixer-1.2.11/0002-fix-cross-compiling-issue.patch delete mode 100644 patches/SDL_mixer-1.2.11/fix-cross-compiling.diff delete mode 100644 patches/SDL_mixer-1.2.11/fix-parallel-build.diff delete mode 100644 patches/SDL_mixer-1.2.11/series
diff --git a/patches/SDL_mixer-1.2.11/0001-fix-parallel-build.patch b/patches/SDL_mixer-1.2.11/0001-fix-parallel-build.patch new file mode 100644 index 0000000..dd2fb7e --- /dev/null +++ b/patches/SDL_mixer-1.2.11/0001-fix-parallel-build.patch @@ -0,0 +1,46 @@ +From a95ef6e2f9a97a0a2af6dcdd1dacd91fb213da14 Mon Sep 17 00:00:00 2001 +From: Marc Kleine-Budde <[email protected]> +Date: Sat, 29 Oct 2011 18:51:39 +0200 +Subject: [PATCH 1/2] fix parallel build + +We have to create the objects dir before saving gcc's output into it. + +Signed-off-by: Marc Kleine-Budde <[email protected]> +Signed-off-by: Robert Schwebel <[email protected]> +--- + Makefile.in | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 76fdd3c..26961b7 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -71,13 +71,13 @@ $(objects): + -include $(PLAYMUS_OBJECTS:.lo=.d) + @PLAYMUS_DEPENDS@ + +-$(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS) ++$(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS) $(objects) + $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) + +-$(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET) ++$(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET) $(objects) + $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) + +-$(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET) ++$(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET) $(objects) + $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) + + install: all install-hdrs install-lib #install-bin +@@ -92,7 +92,7 @@ install-hdrs: + install-lib: $(objects) $(objects)/$(TARGET) + $(SHELL) $(auxdir)/mkinstalldirs $(libdir) + $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(libdir)/$(TARGET) +-install-bin: ++install-bin: $(objects) + $(SHELL) $(auxdir)/mkinstalldirs $(bindir) + $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(objects)/playwave$(EXE) $(bindir)/playwave$(EXE) + $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(objects)/playmus$(EXE) $(bindir)/playmus$(EXE) +-- +1.7.7 + diff --git a/patches/SDL_mixer-1.2.11/0002-fix-cross-compiling-issue.patch b/patches/SDL_mixer-1.2.11/0002-fix-cross-compiling-issue.patch new file mode 100644 index 0000000..d1af1c8 --- /dev/null +++ b/patches/SDL_mixer-1.2.11/0002-fix-cross-compiling-issue.patch @@ -0,0 +1,43 @@ +From 3b6f7fb6dda3449f5e6721c5a26ebad913c47c28 Mon Sep 17 00:00:00 2001 +From: Michael Olbrich <[email protected]> +Date: Sat, 29 Oct 2011 18:51:39 +0200 +Subject: [PATCH 2/2] fix cross-compiling issue + +use AC_COMPILE_IFELSE instead of AC_TRY_RUN + +Signed-off-by: Michael Olbrich <[email protected]> +--- + configure.in | 14 ++++++++------ + 1 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/configure.in b/configure.in +index 7d23387..a3f440b 100644 +--- a/configure.in ++++ b/configure.in +@@ -417,15 +417,17 @@ if test x$enable_music_flac = xyes; then + LIBS_SAVED="$LIBS" + LIBS="-lFLAC" + AC_MSG_CHECKING([for libflac so-name version >= $libflac_ver]) +- AC_TRY_RUN([ ++ AC_COMPILE_IFELSE([ + #include "FLAC/export.h" +-#include "stdio.h" ++ ++#ifndef FLAC_API_VERSION_CURRENT ++#error no version ++#endif ++#if FLAC_API_VERSION_CURRENT < $libflac_ver ++#error too old ++#endif + int main( int argc, char *argv[] ) { +-#if defined(FLAC_API_VERSION_CURRENT) && (FLAC_API_VERSION_CURRENT >= $libflac_ver) + return 0; +-#else +- return 1; +-#endif + } + ], have_flac_ver=yes, have_flac_ver=no) + LIBS="$LIBS_SAVED" +-- +1.7.7 + diff --git a/patches/SDL_mixer-1.2.11/fix-cross-compiling.diff b/patches/SDL_mixer-1.2.11/fix-cross-compiling.diff deleted file mode 100644 index 0e3399f..0000000 --- a/patches/SDL_mixer-1.2.11/fix-cross-compiling.diff +++ /dev/null @@ -1,39 +0,0 @@ -From: Michael Olbrich <[email protected]> -Subject: fix cross-compiling issue - -use AC_COMPILE_IFELSE instead of AC_TRY_RUN - -Signed-off-by: Michael Olbrich <[email protected]> - ---- - configure.in | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -Index: b/configure.in -=================================================================== ---- a/configure.in -+++ b/configure.in -@@ -417,15 +417,17 @@ if test x$enable_music_flac = xyes; then - LIBS_SAVED="$LIBS" - LIBS="-lFLAC" - AC_MSG_CHECKING([for libflac so-name version >= $libflac_ver]) -- AC_TRY_RUN([ -+ AC_COMPILE_IFELSE([ - #include "FLAC/export.h" --#include "stdio.h" -+ -+#ifndef FLAC_API_VERSION_CURRENT -+#error no version -+#endif -+#if FLAC_API_VERSION_CURRENT < $libflac_ver -+#error too old -+#endif - int main( int argc, char *argv[] ) { --#if defined(FLAC_API_VERSION_CURRENT) && (FLAC_API_VERSION_CURRENT >= $libflac_ver) - return 0; --#else -- return 1; --#endif - } - ], have_flac_ver=yes, have_flac_ver=no) - LIBS="$LIBS_SAVED" diff --git a/patches/SDL_mixer-1.2.11/fix-parallel-build.diff b/patches/SDL_mixer-1.2.11/fix-parallel-build.diff deleted file mode 100644 index 7130df1..0000000 --- a/patches/SDL_mixer-1.2.11/fix-parallel-build.diff +++ /dev/null @@ -1,47 +0,0 @@ -From: Marc Kleine-Budde <[email protected]> -Subject: fix parallel build - -We have to create the objects dir before saving gcc's output into it. - -Signed-off-by: Marc Kleine-Budde <[email protected]> -Signed-off-by: Robert Schwebel <[email protected]> ---- -V2: - rsc: ported to 1.2.11 - -V1: - mkl: patch for 1.2.8 - - Makefile.in | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -Index: SDL_mixer-1.2.11/Makefile.in -=================================================================== ---- SDL_mixer-1.2.11.orig/Makefile.in -+++ SDL_mixer-1.2.11/Makefile.in -@@ -71,13 +71,13 @@ $(objects): - -include $(PLAYMUS_OBJECTS:.lo=.d) - @PLAYMUS_DEPENDS@ - --$(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS) -+$(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS) $(objects) - $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) - --$(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET) -+$(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET) $(objects) - $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) - --$(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET) -+$(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET) $(objects) - $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) - - install: all install-hdrs install-lib #install-bin -@@ -92,7 +92,7 @@ install-hdrs: - install-lib: $(objects) $(objects)/$(TARGET) - $(SHELL) $(auxdir)/mkinstalldirs $(libdir) - $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(libdir)/$(TARGET) --install-bin: -+install-bin: $(objects) - $(SHELL) $(auxdir)/mkinstalldirs $(bindir) - $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(objects)/playwave$(EXE) $(bindir)/playwave$(EXE) - $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(objects)/playmus$(EXE) $(bindir)/playmus$(EXE) diff --git a/patches/SDL_mixer-1.2.11/series b/patches/SDL_mixer-1.2.11/series deleted file mode 100644 index 98808fa..0000000 --- a/patches/SDL_mixer-1.2.11/series +++ /dev/null @@ -1,2 +0,0 @@ -fix-parallel-build.diff -fix-cross-compiling.diff -- 1.7.7 -- ptxdist mailing list [email protected]
