Fix for building with gcc4 (within bounds - here I need to

build with -O0 to get it done).  Patch from Fedora.

Package-Manager: portage-2.0.51.20-r4

4 files changed, 167 insertions, 13 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index 2064ba2b2d20..0935e496c706 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.77 2005/04/24 02:59:06 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.78 2005/04/25 01:10:12 azarah Exp $
+
+  25 Apr 2005; Martin Schlemmer <azarah@gentoo.org> +files/1.2.8-gcc4.patch,
+  libsdl-1.2.8-r1.ebuild:
+  Fix for building with gcc4 (within bounds - here I need to
+  build with -O0 to get it done).  Patch from Fedora.
 
   23 Apr 2005; Kito <kito@gentoo.org> libsdl-1.2.8-r1.ebuild:
   ~ppc-macos keyword, fix for libgcc_s on darwin.
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index fbb450d035b2..9c08c1da1d30 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -1,25 +1,36 @@
-MD5 e5e2c700d71dc4cf372e56d030a5c90d ChangeLog 11791
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 cbbab78f5125f834ffb0f83be4957736 libsdl-1.2.6-r3.ebuild 3013
-MD5 7f079469132865bdd25780277639f098 libsdl-1.2.7-r3.ebuild 3960
+MD5 3b4836a77e8f6df045028f84e89dd9b8 ChangeLog 12012
 MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974
-MD5 c535fa5305144e51f9979de908a7d99b libsdl-1.2.8-r1.ebuild 4417
-MD5 0c2020ec3ce37ea0612064c52d1014b1 files/1.2.6-alsa-1.0.0.patch 557
-MD5 60ecfde6cc7b734ef03b93357c537674 files/1.2.8-keyrepeat.patch 598
-MD5 803844293dc7df2bb7d2323c03977b71 files/1.2.7-libcaca.patch 23266
+MD5 dc422953436a92690bd6f7b0f0c2d4d5 libsdl-1.2.8-r1.ebuild 4550
+MD5 7f079469132865bdd25780277639f098 libsdl-1.2.7-r3.ebuild 3960
+MD5 4f1ce33c931d461bed06277f60341085 files/1.2.6-nobuggy-X.patch 568
 MD5 b66ce90b8939cef871c1c9b065fc0658 files/digest-libsdl-1.2.6-r3 62
-MD5 206ddd08dd3e33819d03245d11af3014 files/1.2.7-gcc34.patch 8196
 MD5 419d8c241f85b4deba895c615faa5612 files/libsdl-1.2.6-fullscreen.patch 1094
 MD5 e71ab5ce20cb7c70631a59f9d209cce1 files/1.2.7-joystick.patch 1317
-MD5 4f1ce33c931d461bed06277f60341085 files/1.2.6-nobuggy-X.patch 568
 MD5 4f1ce33c931d461bed06277f60341085 files/1.2.7-nobuggy-X.patch 568
-MD5 e0c6c6ffc15475282fc864b8f52f0abf files/1.2.8-linux26.patch 1268
+MD5 4ce5ec18eafcf0b1c6caf31c9f67cb1d files/digest-libsdl-1.2.8-r1 62
+MD5 206ddd08dd3e33819d03245d11af3014 files/1.2.7-gcc34.patch 8196
+MD5 803844293dc7df2bb7d2323c03977b71 files/1.2.7-libcaca.patch 23266
+MD5 0c2020ec3ce37ea0612064c52d1014b1 files/1.2.6-alsa-1.0.0.patch 557
+MD5 323ad5b1e83521630dd4d54819c5efbd files/1.2.8-gcc2.patch 743
 MD5 abf0c6fe9d93e5b0cc9a4dbb6d93ad87 files/1.2.7-joystick2.patch 16196
 MD5 5d1fcf4587b0ce9cd723aa69f9ef7dba files/1.2.8-amd64-endian.patch 651
 MD5 71a857d2bbcc34c4807638eb5d710f2e files/1.2.7-26headers.patch 1017
-MD5 323ad5b1e83521630dd4d54819c5efbd files/1.2.8-gcc2.patch 743
 MD5 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7-r3 62
 MD5 88437c556d9b4571f08de4a4e2d9323a files/1.2.8-libcaca.patch 23278
 MD5 4f1ce33c931d461bed06277f60341085 files/1.2.8-nobuggy-X.patch 568
-MD5 4ce5ec18eafcf0b1c6caf31c9f67cb1d files/digest-libsdl-1.2.8-r1 62
 MD5 e6471a33cb0d62a807640ef3eccffb5f files/1.2.8-direct-8bit-color.patch 7414
+MD5 4e92be33d24fa96149b0e68eb916e259 files/1.2.8-gcc4.patch 6875
+MD5 60ecfde6cc7b734ef03b93357c537674 files/1.2.8-keyrepeat.patch 598
+MD5 e0c6c6ffc15475282fc864b8f52f0abf files/1.2.8-linux26.patch 1268
 MD5 358c3d6380bf0b6ba3e78ce47c5ec578 files/libsdl-1.2.8-gcc2.patch.bz2 2639
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCbER41ZcsMnZjRyIRAmYgAKC3foEVpA1rNVQSKfru6cJspnUyCgCgidCm
+iNmoBtu/3ObdQRaTEbo0pPQ=
+=Gju3
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libsdl/files/1.2.8-gcc4.patch b/media-libs/libsdl/files/1.2.8-gcc4.patch
new file mode 100644
index 000000000000..be775d1a6fc4
--- /dev/null
+++ b/media-libs/libsdl/files/1.2.8-gcc4.patch
@@ -0,0 +1,135 @@
+--- SDL-1.2.8/src/hermes/HeadMMX.h.gcc4	2001-04-26 12:45:45.000000000 -0400
++++ SDL-1.2.8/src/hermes/HeadMMX.h	2005-04-14 07:00:01.390719842 -0400
+@@ -50,21 +50,19 @@
+   extern "C" {   
+   #endif
+ 
+-  void ConvertMMX(HermesConverterInterface *) __attribute__ ((alias ("_ConvertMMX")));
+-#if 0
+-  void ClearMMX_32(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_32")));
+-  void ClearMMX_24(HermesClearInterface *)  __attribute__ ((alias ("_ClearMMX_24")));
+-  void ClearMMX_16(HermesClearInterface *)  __attribute__ ((alias ("_ClearMMX_16")));
+-  void ClearMMX_8(HermesClearInterface *)  __attribute__ ((alias ("_ClearMMX_8")));
+-
+-  void ConvertMMXp32_16RGB555() __attribute__ ((alias ("_ConvertMMXp32_16RGB555")));
+-#endif
+-
+-  void ConvertMMXpII32_24RGB888() __attribute__ ((alias ("_ConvertMMXpII32_24RGB888")));
+-  void ConvertMMXpII32_16RGB565() __attribute__ ((alias ("_ConvertMMXpII32_16RGB565")));
+-  void ConvertMMXpII32_16BGR565() __attribute__ ((alias ("_ConvertMMXpII32_16BGR565")));
+-  void ConvertMMXpII32_16RGB555() __attribute__ ((alias ("_ConvertMMXpII32_16RGB555")));
+-  void ConvertMMXpII32_16BGR555() __attribute__ ((alias ("_ConvertMMXpII32_16BGR555")));
++  extern void _ConvertMMX(HermesConverterInterface *);
++  extern void _ConvertMMXpII32_24RGB888();
++  extern void _ConvertMMXpII32_16RGB565();
++  extern void _ConvertMMXpII32_16BGR565();
++  extern void _ConvertMMXpII32_16RGB555();
++  extern void _ConvertMMXpII32_16BGR555();
++
++  #define ConvertMMX _ConvertMMX
++  #define ConvertMMXpII32_24RGB888 _ConvertMMXpII32_24RGB888
++  #define ConvertMMXpII32_16RGB565 _ConvertMMXpII32_16RGB565
++  #define ConvertMMXpII32_16BGR565 _ConvertMMXpII32_16BGR565
++  #define ConvertMMXpII32_16RGB555 _ConvertMMXpII32_16RGB555
++  #define ConvertMMXpII32_16BGR555 _ConvertMMXpII32_16BGR555
+ 
+   #ifdef __cplusplus
+   }
+--- SDL-1.2.8/src/hermes/HeadX86.h.gcc4	2002-06-08 13:45:39.000000000 -0400
++++ SDL-1.2.8/src/hermes/HeadX86.h	2005-04-14 07:04:00.579143961 -0400
+@@ -79,56 +79,47 @@
+   extern "C" {
+   #endif
+ 
+-  int Hermes_X86_CPU() __attribute__ ((alias ("_Hermes_X86_CPU")));
++  extern int _Hermes_X86_CPU();
+ 
+-  void ConvertX86(HermesConverterInterface *) __attribute__ ((alias ("_ConvertX86")));
++  extern void _ConvertX86(HermesConverterInterface *);
++
++  extern void _ConvertX86p32_32BGR888();
++  extern void _ConvertX86p32_32RGBA888();
++  extern void _ConvertX86p32_32BGRA888();
++  extern void _ConvertX86p32_24RGB888();
++  extern void _ConvertX86p32_24BGR888();
++  extern void _ConvertX86p32_16RGB565();
++  extern void _ConvertX86p32_16BGR565();
++  extern void _ConvertX86p32_16RGB555();
++  extern void _ConvertX86p32_16BGR555();
++  extern void _ConvertX86p32_8RGB332();
++
++  extern void _ConvertX86p16_16BGR565();
++  extern void _ConvertX86p16_16RGB555();
++  extern void _ConvertX86p16_16BGR555();
++  extern void _ConvertX86p16_8RGB332();
++
++
++  #define Hermes_X86_CPU _Hermes_X86_CPU
++
++  #define ConvertX86 _ConvertX86
++
++  #define ConvertX86p32_32BGR888 _ConvertX86p32_32BGR888
++  #define ConvertX86p32_32RGBA888 _ConvertX86p32_32RGBA888
++  #define ConvertX86p32_32BGRA888 _ConvertX86p32_32BGRA888
++  #define ConvertX86p32_24RGB888 _ConvertX86p32_24RGB888
++  #define ConvertX86p32_24BGR888 _ConvertX86p32_24BGR888
++  #define ConvertX86p32_16RGB565 _ConvertX86p32_16RGB565
++  #define ConvertX86p32_16BGR565 _ConvertX86p32_16BGR565
++  #define ConvertX86p32_16RGB555 _ConvertX86p32_16RGB555
++  #define ConvertX86p32_16BGR555 _ConvertX86p32_16BGR555
++  #define ConvertX86p32_8RGB332 _ConvertX86p32_8RGB332
++
++  #define ConvertX86p16_16BGR565 _ConvertX86p16_16BGR565
++  #define ConvertX86p16_16RGB555 _ConvertX86p16_16RGB555
++  #define ConvertX86p16_16BGR555 _ConvertX86p16_16BGR555
++  #define ConvertX86p16_8RGB332 _ConvertX86p16_8RGB332
+ 
+-#if 0
+-  void ClearX86_32(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_32")));
+-  void ClearX86_24(HermesClearInterface *)  __attribute__ ((alias ("_ClearX86_24")));
+-  void ClearX86_16(HermesClearInterface *)  __attribute__ ((alias ("_ClearX86_16")));
+-  void ClearX86_8(HermesClearInterface *)  __attribute__ ((alias ("_ClearX86_8")));
+-#endif
+-
+-  void ConvertX86p32_32BGR888() __attribute__ ((alias ("_ConvertX86p32_32BGR888")));
+-  void ConvertX86p32_32RGBA888() __attribute__ ((alias ("_ConvertX86p32_32RGBA888")));
+-  void ConvertX86p32_32BGRA888() __attribute__ ((alias ("_ConvertX86p32_32BGRA888")));
+-  void ConvertX86p32_24RGB888() __attribute__ ((alias ("_ConvertX86p32_24RGB888")));
+-  void ConvertX86p32_24BGR888() __attribute__ ((alias ("_ConvertX86p32_24BGR888")));
+-  void ConvertX86p32_16RGB565() __attribute__ ((alias ("_ConvertX86p32_16RGB565")));
+-  void ConvertX86p32_16BGR565() __attribute__ ((alias ("_ConvertX86p32_16BGR565")));
+-  void ConvertX86p32_16RGB555() __attribute__ ((alias ("_ConvertX86p32_16RGB555")));
+-  void ConvertX86p32_16BGR555() __attribute__ ((alias ("_ConvertX86p32_16BGR555")));
+-  void ConvertX86p32_8RGB332() __attribute__ ((alias ("_ConvertX86p32_8RGB332")));
+-
+-#if 0
+-  void ConvertX86p16_32RGB888() __attribute__ ((alias ("_ConvertX86p16_32RGB888")));
+-  void ConvertX86p16_32BGR888() __attribute__ ((alias ("_ConvertX86p16_32BGR888")));
+-  void ConvertX86p16_32RGBA888() __attribute__ ((alias ("_ConvertX86p16_32RGBA888")));
+-  void ConvertX86p16_32BGRA888() __attribute__ ((alias ("_ConvertX86p16_32BGRA888")));
+-  void ConvertX86p16_24RGB888() __attribute__ ((alias ("_ConvertX86p16_24RGB888")));
+-  void ConvertX86p16_24BGR888() __attribute__ ((alias ("_ConvertX86p16_24BGR888")));
+-#endif
+-  void ConvertX86p16_16BGR565() __attribute__ ((alias ("_ConvertX86p16_16BGR565")));
+-  void ConvertX86p16_16RGB555() __attribute__ ((alias ("_ConvertX86p16_16RGB555")));
+-  void ConvertX86p16_16BGR555() __attribute__ ((alias ("_ConvertX86p16_16BGR555")));
+-  void ConvertX86p16_8RGB332() __attribute__ ((alias ("_ConvertX86p16_8RGB332")));
+-
+-#if 0
+-  void CopyX86p_4byte() __attribute__ ((alias ("_CopyX86p_4byte")));
+-  void CopyX86p_3byte() __attribute__ ((alias ("_CopyX86p_3byte")));
+-  void CopyX86p_2byte() __attribute__ ((alias ("_CopyX86p_2byte")));
+-  void CopyX86p_1byte() __attribute__ ((alias ("_CopyX86p_1byte")));
+-
+-  void ConvertX86pI8_32() __attribute__ ((alias ("_ConvertX86pI8_32")));
+-  void ConvertX86pI8_24() __attribute__ ((alias ("_ConvertX86pI8_24")));
+-  void ConvertX86pI8_16() __attribute__ ((alias ("_ConvertX86pI8_16")));
+-
+-  extern int ConvertX86p16_32RGB888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGB888_LUT_X86")));
+-  extern int ConvertX86p16_32BGR888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGR888_LUT_X86")));
+-  extern int ConvertX86p16_32RGBA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGBA888_LUT_X86")));
+-  extern int ConvertX86p16_32BGRA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGRA888_LUT_X86")));
+-#endif
+ 
+   #ifdef __cplusplus
+   }
diff --git a/media-libs/libsdl/libsdl-1.2.8-r1.ebuild b/media-libs/libsdl/libsdl-1.2.8-r1.ebuild
index 81d8b4bd8bdb..45fe55b2b6be 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.8 2005/04/24 17:51:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.8-r1.ebuild,v 1.9 2005/04/25 01:10:12 azarah Exp $
 
 inherit flag-o-matic toolchain-funcs eutils gnuconfig
 
@@ -54,6 +54,9 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PV}-linux26.patch #74608
 	#epatch "${FILESDIR}"/${PV}-direct-8bit-color.patch #76946
 	epatch "${FILESDIR}"/${PV}-amd64-endian.patch #77300
+	#fix for building with gcc4 (within bounds - here I need to
+	#build with -O0 to get it done)
+	epatch "${FILESDIR}"/${PV}-gcc4.patch
 
 	if use nas && ! use X ; then #32447
 		sed -i \