Grab some updates from upstream cvs to add support for SuperH.

Package-Manager: portage-2.1_pre2

6 files changed, 71 insertions, 14 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index d8a26868e04b..d21c48dfe88b 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.94 2005/12/14 05:57:39 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.95 2005/12/29 08:10:53 vapier Exp $
+
+  29 Dec 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/libsdl-1.2.9-endian-cvs-updates.patch, libsdl-1.2.8-r1.ebuild,
+  libsdl-1.2.9.ebuild, libsdl-1.2.9-r1.ebuild:
+  Grab some updates from upstream cvs to add support for SuperH.
 
   14 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   libsdl-1.2.9-r1.ebuild:
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index cde092c48c2f..f737403eb26e 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 317310f4b53b0cc11a5b458eed25801a ChangeLog 14906
+MD5 127b282d3208f71fe8d03b18d414091c ChangeLog 15138
 MD5 0c2020ec3ce37ea0612064c52d1014b1 files/1.2.6-alsa-1.0.0.patch 557
 MD5 4f1ce33c931d461bed06277f60341085 files/1.2.6-nobuggy-X.patch 568
 MD5 71a857d2bbcc34c4807638eb5d710f2e files/1.2.7-26headers.patch 1017
@@ -34,19 +34,20 @@ MD5 c214458f3c67b5451a5f305a2532ce64 files/libsdl-1.2.9-PIC-hermes-cpuid.patch 4
 MD5 25b8b048d7e5d2a6edc59a66f34566e7 files/libsdl-1.2.9-PIC-load-mmx-masks-from-stack.patch 3901
 MD5 351838164a2c51a3cc19516e1ee8d3e7 files/libsdl-1.2.9-PIC-yuv-mmx.patch 13260
 MD5 7fd44027d68e34cfdd399e23931caa94 files/libsdl-1.2.9-dlvsym-check.patch 907
+MD5 5133fc3223d62fd0a24e9343c5520b69 files/libsdl-1.2.9-endian-cvs-updates.patch 1667
 MD5 27b5c7cf673424d9c9ce5e26d5031385 files/libsdl-1.2.9-gcc-mmx.patch 15320
 MD5 1aec1ecf1921c28a0b02c6e47c35b192 files/libsdl-1.2.9-no-exec-stack.patch 1146
 MD5 7335dd719002ab81477446278b2f786f files/libsdl-1.2.9-sdl-blit-mmx-check.patch 551
 MD5 39ea3c7b2e0ed9dd50ff4368cf272620 libsdl-1.2.6-r3.ebuild 3014
 MD5 9d408bc00468d47211d02072479e2134 libsdl-1.2.7-r3.ebuild 3959
-MD5 991e8e9bbd269b2c1326fa0c5146b38b libsdl-1.2.8-r1.ebuild 5064
-MD5 d7556cdea305459a2e01b23ee9386eb7 libsdl-1.2.9-r1.ebuild 4726
-MD5 950a76c3f9f7cf9503758f5432319e2b libsdl-1.2.9.ebuild 4279
+MD5 0f27c7fa8eb7147511ec0b2e97ba0811 libsdl-1.2.8-r1.ebuild 5127
+MD5 9ba6d66fbf87cf756f82768cff428b02 libsdl-1.2.9-r1.ebuild 4779
+MD5 54ddaa71e61770f816552d986ebb2dd1 libsdl-1.2.9.ebuild 4335
 MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDo4ai2+ySkm8kpY0RAgumAJsFoVQethai2fFFH06tH3O6ebp/GQCgsCAN
-O+V+URQ9x3S5jOMxY/2Yn2c=
-=gEZ4
+iD8DBQFDs5oq2+ySkm8kpY0RAoI4AJ0TOwvlB2XfBja2uJyOt0MQMZXTOwCeMagV
+aBWF8YXcoB5xTepNCz96ZIQ=
+=okOg
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libsdl/files/libsdl-1.2.9-endian-cvs-updates.patch b/media-libs/libsdl/files/libsdl-1.2.9-endian-cvs-updates.patch
new file mode 100644
index 000000000000..cd6121a6a091
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-1.2.9-endian-cvs-updates.patch
@@ -0,0 +1,48 @@
+grab some updates from upstream cvs to support some more architectures
+
+Index: include/SDL_byteorder.h
+===================================================================
+RCS file: /home/sdlweb/libsdl.org/cvs/SDL12/include/SDL_byteorder.h,v
+retrieving revision 1.9
+retrieving revision 1.11
+diff -u -p -r1.9 -r1.11
+--- include/SDL_byteorder.h	12 Nov 2004 22:09:17 -0000	1.9
++++ include/SDL_byteorder.h	23 Nov 2005 07:29:53 -0000	1.11
+@@ -34,6 +34,16 @@ static char rcsid =
+ #define SDL_LIL_ENDIAN	1234
+ #define SDL_BIG_ENDIAN	4321
+ 
++#ifdef __linux__
++# include <endian.h>
++# if BYTE_ORDER == LITTLE_ENDIAN
++#  define SDL_BYTEORDER SDL_LIL_ENDIAN
++# else
++#  define SDL_BYTEORDER SDL_BIG_ENDIAN
++# endif
++
++#else
++
+ /* Pardon the mess, I'm trying to determine the endianness of this host.
+    I'm doing it by preprocessor defines rather than some sort of configure
+    script so that application code can use this too.  The "right" way would
+@@ -42,14 +52,16 @@ static char rcsid =
+ #if (defined(__i386__) || defined(__i386)) || \
+      defined(__ia64__) || defined(WIN32) || \
+     (defined(__alpha__) || defined(__alpha)) || \
+-     defined(__arm__) || \
++    (defined(__arm__) || defined(__thumb__)) || \
++    (defined(__sh__) || defined(__sh64__)) || \
+     (defined(__mips__) && defined(__MIPSEL__)) || \
+-     defined(__SYMBIAN32__) || \
+-     defined(__x86_64__) || \
+-     defined(__LITTLE_ENDIAN__)
++     defined(__SYMBIAN32__) || defined(__x86_64__) || \
++     defined(__OS2__) || defined(__LITTLE_ENDIAN__)
+ #define SDL_BYTEORDER	SDL_LIL_ENDIAN
+ #else
+ #define SDL_BYTEORDER	SDL_BIG_ENDIAN
+ #endif
+ 
++#endif /* __linux__ */
++
+ #endif /* _SDL_byteorder_h */
diff --git a/media-libs/libsdl/libsdl-1.2.8-r1.ebuild b/media-libs/libsdl/libsdl-1.2.8-r1.ebuild
index 88a6b542c001..34e3e1307c00 100644
--- a/media-libs/libsdl/libsdl-1.2.8-r1.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.8-r1.ebuild,v 1.24 2005/12/17 03:31:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.8-r1.ebuild,v 1.25 2005/12/29 08:10:53 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc-macos ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc-macos ppc64 sh sparc x86"
 # WARNING:
 # if you have the noaudio, novideo, nojoystick, or noflagstrip use flags
 # in USE and something breaks, you pick up the pieces.  Be prepared for
@@ -60,6 +60,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-sdl-config.patch
 	epatch "${FILESDIR}"/${P}-no-cxx.patch
 	epatch "${FILESDIR}"/libsdl-1.2.9-dlvsym-check.patch #105160
+	epatch "${FILESDIR}"/libsdl-1.2.9-endian-cvs-updates.patch
 
 	# This patch breaks compiling >-O0 on gcc4 ; bug #87809
 	[ "`gcc-major-version`" -lt "4" ] && epatch "${FILESDIR}"/${P}-gcc2.patch.bz2 #86481
diff --git a/media-libs/libsdl/libsdl-1.2.9-r1.ebuild b/media-libs/libsdl/libsdl-1.2.9-r1.ebuild
index c08b3d256515..f035d404a45b 100644
--- a/media-libs/libsdl/libsdl-1.2.9-r1.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.9-r1.ebuild,v 1.6 2005/12/14 05:57:39 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.9-r1.ebuild,v 1.7 2005/12/29 08:10:53 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86"
 # WARNING:
 # if you have the noaudio, novideo, nojoystick, or noflagstrip use flags
 # in USE and something breaks, you pick up the pieces.  Be prepared for
@@ -75,6 +75,7 @@ src_unpack() {
 	[[ $(gcc-major-version) != "2" ]] && epatch "${FILESDIR}"/libsdl-1.2.9-PIC-yuv-mmx.patch
 	epatch "${FILESDIR}"/${P}-sdl-blit-mmx-check.patch #104533
 	epatch "${FILESDIR}"/${P}-DirectFB-updates.patch
+	epatch "${FILESDIR}"/${P}-endian-cvs-updates.patch
 
 	./autogen.sh || die "autogen failed"
 	epunt_cxx
diff --git a/media-libs/libsdl/libsdl-1.2.9.ebuild b/media-libs/libsdl/libsdl-1.2.9.ebuild
index 08a79c65c5ae..5138fe34434f 100644
--- a/media-libs/libsdl/libsdl-1.2.9.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.9.ebuild,v 1.8 2005/10/29 02:47:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.9.ebuild,v 1.9 2005/12/29 08:10:53 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86"
 # WARNING:
 # if you have the noaudio, novideo, nojoystick, or noflagstrip use flags
 # in USE and something breaks, you pick up the pieces.  Be prepared for
@@ -61,6 +61,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/libsdl-1.2.9-dlvsym-check.patch #105160
 	epatch "${FILESDIR}"/1.2.8-gcc4.patch
 	epatch "${FILESDIR}"/${P}-DirectFB-updates.patch
+	epatch "${FILESDIR}"/${P}-endian-cvs-updates.patch
 
 	./autogen.sh || die "autogen failed"
 	epunt_cxx