From: Robert Schwebel <r.schwebel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCH 05/28] sdl: clean up patches
Date: Sun, 30 Oct 2011 23:00:36 +0100 [thread overview]
Message-ID: <1320012059-24971-5-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>
---
.../0001-SDL-1.2.10-sdl-config.in.diff.patch | 54 ++++++++++++++++
patches/SDL-1.2.14/0002-fix-parallel-build.patch | 28 ++++++++
patches/SDL-1.2.14/0003-fix-PPC-build.patch | 68 ++++++++++++++++++++
patches/SDL-1.2.14/SDL-1.2.10-sdl-config.in.diff | 50 --------------
patches/SDL-1.2.14/fix-parallel-build.diff | 23 -------
patches/SDL-1.2.14/fix-ppc-build.diff | 64 ------------------
patches/SDL-1.2.14/series | 3 -
7 files changed, 150 insertions(+), 140 deletions(-)
create mode 100644 patches/SDL-1.2.14/0001-SDL-1.2.10-sdl-config.in.diff.patch
create mode 100644 patches/SDL-1.2.14/0002-fix-parallel-build.patch
create mode 100644 patches/SDL-1.2.14/0003-fix-PPC-build.patch
delete mode 100644 patches/SDL-1.2.14/SDL-1.2.10-sdl-config.in.diff
delete mode 100644 patches/SDL-1.2.14/fix-parallel-build.diff
delete mode 100644 patches/SDL-1.2.14/fix-ppc-build.diff
delete mode 100644 patches/SDL-1.2.14/series
diff --git a/patches/SDL-1.2.14/0001-SDL-1.2.10-sdl-config.in.diff.patch b/patches/SDL-1.2.14/0001-SDL-1.2.10-sdl-config.in.diff.patch
new file mode 100644
index 0000000..a8e127d
--- /dev/null
+++ b/patches/SDL-1.2.14/0001-SDL-1.2.10-sdl-config.in.diff.patch
@@ -0,0 +1,54 @@
+From fd1d1db0ce2f814fb9f1b9c50b3dca495b44110a Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Sat, 29 Oct 2011 18:49:04 +0200
+Subject: [PATCH 1/3] SDL-1.2.10-sdl-config.in.diff
+
+Subject teach sdl-config about sysroot
+
+Teach sdl-config the concept of sysroot, but disable manual prefix overwriting.
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ sdl-config.in | 14 +++++++-------
+ 1 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/sdl-config.in b/sdl-config.in
+index e0fcc0c..0159c47 100644
+--- a/sdl-config.in
++++ b/sdl-config.in
+@@ -23,10 +23,10 @@ while test $# -gt 0; do
+
+ case $1 in
+ --prefix=*)
+- prefix=$optarg
+- if test $exec_prefix_set = no ; then
+- exec_prefix=$optarg
+- fi
++# prefix=$optarg
++# if test $exec_prefix_set = no ; then
++# exec_prefix=$optarg
++# fi
+ ;;
+ --prefix)
+ echo $prefix
+@@ -42,14 +42,14 @@ while test $# -gt 0; do
+ echo @SDL_VERSION@
+ ;;
+ --cflags)
+- echo -I@includedir@/SDL @SDL_CFLAGS@
++ echo -I${SYSROOT}@includedir@/SDL @SDL_CFLAGS@
+ ;;
+ @ENABLE_SHARED_TRUE@ --libs)
+-@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
++@ENABLE_SHARED_TRUE@ echo -L${SYSROOT}@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
+ @ENABLE_SHARED_TRUE@ ;;
+ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs)
+ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs)
+-@ENABLE_STATIC_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
++@ENABLE_STATIC_TRUE@ echo -L${SYSROOT}@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
+ @ENABLE_STATIC_TRUE@ ;;
+ *)
+ echo "${usage}" 1>&2
+--
+1.7.7
+
diff --git a/patches/SDL-1.2.14/0002-fix-parallel-build.patch b/patches/SDL-1.2.14/0002-fix-parallel-build.patch
new file mode 100644
index 0000000..00f4a8d
--- /dev/null
+++ b/patches/SDL-1.2.14/0002-fix-parallel-build.patch
@@ -0,0 +1,28 @@
+From 1cbec744c03d82ebb520cd1efbfea1a5641e0cbd Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Sat, 29 Oct 2011 18:49:04 +0200
+Subject: [PATCH 2/3] 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>
+---
+ Makefile.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index e29dc6d..359ca12 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -75,7 +75,7 @@ depend:
+
+ include $(depend)
+
+-$(objects)/$(TARGET): $(OBJECTS)
++$(objects)/$(TARGET): $(OBJECTS) $(objects)
+ $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
+
+ $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
+--
+1.7.7
+
diff --git a/patches/SDL-1.2.14/0003-fix-PPC-build.patch b/patches/SDL-1.2.14/0003-fix-PPC-build.patch
new file mode 100644
index 0000000..72495c3
--- /dev/null
+++ b/patches/SDL-1.2.14/0003-fix-PPC-build.patch
@@ -0,0 +1,68 @@
+From feb9de54dd41c9a3672fac6c3e30f4dbbe6e4b26 Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sat, 29 Oct 2011 18:49:05 +0200
+Subject: [PATCH 3/3] fix PPC build
+
+From upstream SVN:
+------------------------------------------------------------------------
+Author: slouken
+Date: 2009-12-11 07:14:13 -0800 (Fri, 11 Dec 2009)
+New Revision: 5374
+
+Modified:
+ branches/SDL-1.2/configure.in
+Log:
+Fixed bug #895
+
+ Markus Rothe 2009-12-07 09:32:46 PST
+
+Check if libspe2 is available
+
+Building on PowerPC64 results in:
+
+[...]
+In file included from ./src/video/ps3/SDL_ps3events_c.h:33,
+ from ./src/video/ps3/SDL_ps3video.c:32:
+./src/video/ps3/SDL_ps3video.h:34:21: error: libspe2.h: No such file or
+directory
+In file included from ./src/video/ps3/SDL_ps3events_c.h:33,
+ from ./src/video/ps3/SDL_ps3video.c:32:
+./src/video/ps3/SDL_ps3video.h:75: error: expected specifier-qualifier-list
+before 'spe_context_ptr_t'
+./src/video/ps3/SDL_ps3video.c:78: error: expected '=', ',', ';', 'asm' or
+'__attribute__' before 'fb_writer_spu'
+./src/video/ps3/SDL_ps3video.c: In function 'PS3_VideoInit':
+./src/video/ps3/SDL_ps3video.c:167: error: 'spu_data_t' has no member named
+'program'
+./src/video/ps3/SDL_ps3video.c:167: error: 'fb_writer_spu' undeclared (first
+use in this function)
+[...]
+
+The problem is that the ps3 video driver is being build regardless if libspe2
+is installed or not. The attached patch fixes this problem.
+
+[ Note: The other headers that are being checked for are coming from the linux
+headers package on powerpc64. As a result these are also available if you're on
+a generic powerpc64 machine and not a PS3 only. ]
+------------------------------------------------------------------------
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ configure.in | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index a7e9b18..b99c186 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1317,6 +1317,7 @@ CheckPS3()
+ AC_TRY_COMPILE([
+ #include <linux/fb.h>
+ #include <asm/ps3fb.h>
++ #include <libspe2.h>
+ ],[
+ ],[
+ video_ps3=yes
+--
+1.7.7
+
diff --git a/patches/SDL-1.2.14/SDL-1.2.10-sdl-config.in.diff b/patches/SDL-1.2.14/SDL-1.2.10-sdl-config.in.diff
deleted file mode 100644
index b12655c..0000000
--- a/patches/SDL-1.2.14/SDL-1.2.10-sdl-config.in.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Subject teach sdl-config about sysroot
-
-Teach sdl-config the concept of sysroot, but disable manual prefix overwriting.
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-
----
-# 20091210 rsc: is this patch ready for mainline?
-
- sdl-config.in | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-Index: SDL-1.2.13/sdl-config.in
-===================================================================
---- SDL-1.2.13.orig/sdl-config.in
-+++ SDL-1.2.13/sdl-config.in
-@@ -23,10 +23,10 @@ while test $# -gt 0; do
-
- case $1 in
- --prefix=*)
-- prefix=$optarg
-- if test $exec_prefix_set = no ; then
-- exec_prefix=$optarg
-- fi
-+# prefix=$optarg
-+# if test $exec_prefix_set = no ; then
-+# exec_prefix=$optarg
-+# fi
- ;;
- --prefix)
- echo $prefix
-@@ -42,14 +42,14 @@ while test $# -gt 0; do
- echo @SDL_VERSION@
- ;;
- --cflags)
-- echo -I@includedir@/SDL @SDL_CFLAGS@
-+ echo -I${SYSROOT}@includedir@/SDL @SDL_CFLAGS@
- ;;
- @ENABLE_SHARED_TRUE@ --libs)
--@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
-+@ENABLE_SHARED_TRUE@ echo -L${SYSROOT}@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
- @ENABLE_SHARED_TRUE@ ;;
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs)
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs)
--@ENABLE_STATIC_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
-+@ENABLE_STATIC_TRUE@ echo -L${SYSROOT}@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
- @ENABLE_STATIC_TRUE@ ;;
- *)
- echo "${usage}" 1>&2
diff --git a/patches/SDL-1.2.14/fix-parallel-build.diff b/patches/SDL-1.2.14/fix-parallel-build.diff
deleted file mode 100644
index 7df5224..0000000
--- a/patches/SDL-1.2.14/fix-parallel-build.diff
+++ /dev/null
@@ -1,23 +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>
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: SDL-1.2.13/Makefile.in
-===================================================================
---- SDL-1.2.13.orig/Makefile.in
-+++ SDL-1.2.13/Makefile.in
-@@ -75,7 +75,7 @@ depend:
-
- include $(depend)
-
--$(objects)/$(TARGET): $(OBJECTS)
-+$(objects)/$(TARGET): $(OBJECTS) $(objects)
- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
-
- $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
diff --git a/patches/SDL-1.2.14/fix-ppc-build.diff b/patches/SDL-1.2.14/fix-ppc-build.diff
deleted file mode 100644
index bf536c9..0000000
--- a/patches/SDL-1.2.14/fix-ppc-build.diff
+++ /dev/null
@@ -1,64 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: fix PPC build
-
-From upstream SVN:
-------------------------------------------------------------------------
-Author: slouken
-Date: 2009-12-11 07:14:13 -0800 (Fri, 11 Dec 2009)
-New Revision: 5374
-
-Modified:
- branches/SDL-1.2/configure.in
-Log:
-Fixed bug #895
-
- Markus Rothe 2009-12-07 09:32:46 PST
-
-Check if libspe2 is available
-
-Building on PowerPC64 results in:
-
-[...]
-In file included from ./src/video/ps3/SDL_ps3events_c.h:33,
- from ./src/video/ps3/SDL_ps3video.c:32:
-./src/video/ps3/SDL_ps3video.h:34:21: error: libspe2.h: No such file or
-directory
-In file included from ./src/video/ps3/SDL_ps3events_c.h:33,
- from ./src/video/ps3/SDL_ps3video.c:32:
-./src/video/ps3/SDL_ps3video.h:75: error: expected specifier-qualifier-list
-before 'spe_context_ptr_t'
-./src/video/ps3/SDL_ps3video.c:78: error: expected '=', ',', ';', 'asm' or
-'__attribute__' before 'fb_writer_spu'
-./src/video/ps3/SDL_ps3video.c: In function 'PS3_VideoInit':
-./src/video/ps3/SDL_ps3video.c:167: error: 'spu_data_t' has no member named
-'program'
-./src/video/ps3/SDL_ps3video.c:167: error: 'fb_writer_spu' undeclared (first
-use in this function)
-[...]
-
-The problem is that the ps3 video driver is being build regardless if libspe2
-is installed or not. The attached patch fixes this problem.
-
-[ Note: The other headers that are being checked for are coming from the linux
-headers package on powerpc64. As a result these are also available if you're on
-a generic powerpc64 machine and not a PS3 only. ]
-------------------------------------------------------------------------
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-
----
- configure.in | 1 +
- 1 file changed, 1 insertion(+)
-
-Index: b/configure.in
-===================================================================
---- a/configure.in
-+++ b/configure.in
-@@ -1317,6 +1317,7 @@ CheckPS3()
- AC_TRY_COMPILE([
- #include <linux/fb.h>
- #include <asm/ps3fb.h>
-+ #include <libspe2.h>
- ],[
- ],[
- video_ps3=yes
diff --git a/patches/SDL-1.2.14/series b/patches/SDL-1.2.14/series
deleted file mode 100644
index e5d4d7b..0000000
--- a/patches/SDL-1.2.14/series
+++ /dev/null
@@ -1,3 +0,0 @@
-SDL-1.2.10-sdl-config.in.diff
-fix-parallel-build.diff
-fix-ppc-build.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 ` Robert Schwebel [this message]
2011-10-30 22:00 ` [ptxdist] [PATCH 06/28] sdl-mixer: " Robert Schwebel
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-5-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