rpms/SDL/devel SDL-1.2.8-gcc4.patch,1.1,1.2 SDL.spec,1.26,1.27
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Apr 14 11:14:24 UTC 2005
Update of /cvs/dist/rpms/SDL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16629
Modified Files:
SDL-1.2.8-gcc4.patch SDL.spec
Log Message:
[tw] - new version of the gcc4 fix
SDL-1.2.8-gcc4.patch:
HeadMMX.h | 28 +++++++++----------
HeadX86.h | 87 +++++++++++++++++++++++++++-----------------------------------
2 files changed, 52 insertions(+), 63 deletions(-)
Index: SDL-1.2.8-gcc4.patch
===================================================================
RCS file: /cvs/dist/rpms/SDL/devel/SDL-1.2.8-gcc4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SDL-1.2.8-gcc4.patch 12 Apr 2005 13:41:20 -0000 1.1
+++ SDL-1.2.8-gcc4.patch 14 Apr 2005 11:14:21 -0000 1.2
@@ -1,22 +1,135 @@
---- SDL-1.2.8/src/hermes/HeadMMX.h.gcc4 2001-04-26 18:45:45.000000000 +0200
-+++ SDL-1.2.8/src/hermes/HeadMMX.h 2005-04-12 15:12:21.934221853 +0200
-@@ -45,7 +45,7 @@
-
- /* Fix the underscore business with ELF compilers */
-
--#if defined(__ELF__) && defined(__GNUC__)
-+#if defined(__ELF__) && defined(__GNUC__OLD)
- #ifdef __cplusplus
+--- 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
---- SDL-1.2.8/src/hermes/HeadX86.h.gcc4 2002-06-08 19:45:39.000000000 +0200
-+++ SDL-1.2.8/src/hermes/HeadX86.h 2005-04-12 15:12:27.201835526 +0200
-@@ -74,7 +74,7 @@
- /* Now fix up the ELF underscore problem */
+- 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
--#if defined(__ELF__) && defined(__GNUC__)
-+#if defined(__ELF__) && defined(__GNUC__OLD)
#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
+ }
Index: SDL.spec
===================================================================
RCS file: /cvs/dist/rpms/SDL/devel/SDL.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- SDL.spec 12 Apr 2005 15:15:31 -0000 1.26
+++ SDL.spec 14 Apr 2005 11:14:21 -0000 1.27
@@ -1,7 +1,7 @@
Summary: A cross-platform multimedia library.
Name: SDL
Version: 1.2.8
-Release: 3
+Release: 3.1
Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
Patch0: SDL-1.1.7-byteorder.patch
Patch4: SDL-1.2.3-prefersounddaemons.patch
@@ -97,6 +97,9 @@
%{_mandir}/man3/SDL*.3*
%changelog
+* Thu Apr 14 2005 Thomas Woerner <twoerner at redhat.com> 1.2.8-3.1
+- new version of the gcc4 fix
+
* Tue Apr 12 2005 Thomas Woerner <twoerner at redhat.com> 1.2.8-3
- fixed gcc4 compile problems
- fixed x86_64 endian problem
More information about the fedora-cvs-commits
mailing list