From: Robert Schwebel <r.schwebel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCH 06/28] sdl-mixer: clean up patches
Date: Sun, 30 Oct 2011 23:00:37 +0100 [thread overview]
Message-ID: <1320012059-24971-6-git-send-email-r.schwebel@pengutronix.de> (raw)
In-Reply-To: <1320012059-24971-1-git-send-email-r.schwebel@pengutronix.de>
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
.../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 <mkl@pengutronix.de>
+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 <mkl@pengutronix.de>
+Signed-off-by: Robert Schwebel <rsc@pengutronix.de>
+---
+ 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 <m.olbrich@pengutronix.de>
+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 <m.olbrich@pengutronix.de>
+---
+ 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 <m.olbrich@pengutronix.de>
-Subject: 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(-)
-
-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 <mkl@pengutronix.de>
-Subject: fix parallel build
-
-We have to create the objects dir before saving gcc's output into it.
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-Signed-off-by: Robert Schwebel <rsc@pengutronix.de>
----
-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
ptxdist@pengutronix.de
next prev parent reply other threads:[~2011-10-30 22:00 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-30 22:00 [ptxdist] Patch cleanup Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 02/28] devicekit-disks: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 03/28] mplayer: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 04/28] policykit: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 05/28] sdl: " Robert Schwebel
2011-10-30 22:00 ` Robert Schwebel [this message]
2011-10-30 22:00 ` [ptxdist] [PATCH 07/28] atop: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 08/28] bing: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 09/28] bridge-utils: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 10/28] bzip2: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 11/28] cbmbasic: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 12/28] cpufrequtils: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 13/28] cvs: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 14/28] daemonize: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 15/28] dibbler: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 16/28] e2fsprogs: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 17/28] efax: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 18/28] eggdbus: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 19/28] elektra: remove orphaned package Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 20/28] etherwake: clean up patches Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 21/28] fakeroot: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 22/28] fbtest: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 23/28] font-alias: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 24/28] freetype: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 25/28] glademm: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 26/28] gpsd: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 27/28] gst-plugins-gl: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 28/28] gtk: " Robert Schwebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320012059-24971-6-git-send-email-r.schwebel@pengutronix.de \
--to=r.schwebel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox