summaryrefslogtreecommitdiffstats
path: root/patches/SDL_mixer-1.2.11
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2011-11-01 15:31:10 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-11-01 15:31:10 +0100
commit35f5af714dd987d4420e8f36b73bee851975c9cf (patch)
treee3e693016f97d8b910a8ebae354b31c320bba83d /patches/SDL_mixer-1.2.11
parent53d6ddad7d054c1f0303591c3e6663b2b084d3ce (diff)
downloadptxdist-35f5af714dd987d4420e8f36b73bee851975c9cf.tar.gz
ptxdist-35f5af714dd987d4420e8f36b73bee851975c9cf.tar.xz
sdl-mixer: clean up patches
Based on a patch by Robert Schwebel <r.schwebel@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/SDL_mixer-1.2.11')
-rw-r--r--patches/SDL_mixer-1.2.11/0001-fix-parallel-build.patch (renamed from patches/SDL_mixer-1.2.11/fix-parallel-build.diff)13
-rw-r--r--patches/SDL_mixer-1.2.11/0002-fix-cross-compiling-issue.patch (renamed from patches/SDL_mixer-1.2.11/fix-cross-compiling.diff)10
-rw-r--r--patches/SDL_mixer-1.2.11/series7
3 files changed, 17 insertions, 13 deletions
diff --git a/patches/SDL_mixer-1.2.11/fix-parallel-build.diff b/patches/SDL_mixer-1.2.11/0001-fix-parallel-build.patch
index 7130df161..99bb837e3 100644
--- a/patches/SDL_mixer-1.2.11/fix-parallel-build.diff
+++ b/patches/SDL_mixer-1.2.11/0001-fix-parallel-build.patch
@@ -1,5 +1,6 @@
From: Marc Kleine-Budde <mkl@pengutronix.de>
-Subject: fix parallel build
+Date: Sat, 29 Oct 2011 18:51:39 +0200
+Subject: [PATCH] fix parallel build
We have to create the objects dir before saving gcc's output into it.
@@ -13,12 +14,12 @@ V1:
mkl: patch for 1.2.8
Makefile.in | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ 1 files 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
+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@
diff --git a/patches/SDL_mixer-1.2.11/fix-cross-compiling.diff b/patches/SDL_mixer-1.2.11/0002-fix-cross-compiling-issue.patch
index 0e3399f56..66dde567c 100644
--- a/patches/SDL_mixer-1.2.11/fix-cross-compiling.diff
+++ b/patches/SDL_mixer-1.2.11/0002-fix-cross-compiling-issue.patch
@@ -1,16 +1,16 @@
From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: fix cross-compiling issue
+Date: Sat, 29 Oct 2011 18:51:39 +0200
+Subject: [PATCH] fix cross-compiling issue
use AC_COMPILE_IFELSE instead of AC_TRY_RUN
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
---
configure.in | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
+ 1 files changed, 8 insertions(+), 6 deletions(-)
-Index: b/configure.in
-===================================================================
+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
diff --git a/patches/SDL_mixer-1.2.11/series b/patches/SDL_mixer-1.2.11/series
index 98808fa07..881e6b3aa 100644
--- a/patches/SDL_mixer-1.2.11/series
+++ b/patches/SDL_mixer-1.2.11/series
@@ -1,2 +1,5 @@
-fix-parallel-build.diff
-fix-cross-compiling.diff
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-fix-parallel-build.patch
+0002-fix-cross-compiling-issue.patch
+# 6d52e70075099a363f22c56add5be9b9 - git-ptx-patches magic