rpms/Hermes/FC-4 Hermes.gcc4.patch,NONE,1.1 Hermes.spec,1.9,1.10

[Thomas Vander Stichele (thomasvs)]

Author: thomasvs

Update of /cvs/extras/rpms/Hermes/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1467

Modified Files:
	Hermes.spec 
Added Files:
	Hermes.gcc4.patch 
Log Message:
add a patch for gcc4

Hermes.gcc4.patch:

--- NEW FILE Hermes.gcc4.patch ---
diff -aur Hermes-1.3.3/src/HeadMMX.h Hermes-1.3.3.patched/src/HeadMMX.h
--- Hermes-1.3.3/src/HeadMMX.h	2000-12-06 05:55:28.000000000 +0100
+++ Hermes-1.3.3.patched/src/HeadMMX.h	2005-06-16 12:47:17.000000000 +0200
@@ -56,6 +56,7 @@
   extern "C" {   
   #endif
 
+#if 0
   void ConvertMMX(HermesConverterInterface *) __attribute__ ((alias ("_ConvertMMX")));
   void ClearMMX_32(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_32")));
   void ClearMMX_24(HermesClearInterface *)  __attribute__ ((alias ("_ClearMMX_24")));
@@ -70,6 +71,8 @@
   void ConvertMMXpII32_16RGB555() __attribute__ ((alias ("_ConvertMMXpII32_16RGB555")));
   void ConvertMMXpII32_16BGR555() __attribute__ ((alias ("_ConvertMMXpII32_16BGR555")));
 
+#endif
+
   #ifdef __cplusplus
   }
   #endif
diff -aur Hermes-1.3.3/src/HeadX86.h Hermes-1.3.3.patched/src/HeadX86.h
--- Hermes-1.3.3/src/HeadX86.h	2000-12-06 05:55:28.000000000 +0100
+++ Hermes-1.3.3.patched/src/HeadX86.h	2005-06-16 12:47:37.000000000 +0200
@@ -88,6 +88,7 @@
   extern "C" {
   #endif
 
+#if 0
   int Hermes_X86_CPU() __attribute__ ((alias ("_Hermes_X86_CPU")));
 
   void ConvertX86(HermesConverterInterface *) __attribute__ ((alias ("_ConvertX86")));
@@ -137,6 +138,8 @@
   extern int32 ConvertX86p16_32RGBA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGBA888_LUT_X86")));
   extern int32 ConvertX86p16_32BGRA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGRA888_LUT_X86")));
 
+#endif
+
   #ifdef __cplusplus
   }
   #endif
Only in Hermes-1.3.3.patched/src: Hermes.lo
Only in Hermes-1.3.3.patched/src: Hermes.o
Only in Hermes-1.3.3.patched/src: hrconfig.h
Only in Hermes-1.3.3.patched/src: libHermes.la
Only in Hermes-1.3.3.patched/src: .libs
Only in Hermes-1.3.3.patched/src: List.lo
Only in Hermes-1.3.3.patched/src: List.o
Only in Hermes-1.3.3.patched/src: Makefile
Only in Hermes-1.3.3.patched/src: mmx_clr.lo
Only in Hermes-1.3.3.patched/src: mmx_clr.o
Only in Hermes-1.3.3.patched/src: mmx_main.lo
Only in Hermes-1.3.3.patched/src: mmx_main.o
Only in Hermes-1.3.3.patched/src: mmxp2_32.lo
Only in Hermes-1.3.3.patched/src: mmxp2_32.o
Only in Hermes-1.3.3.patched/src: mmxp_32.lo
Only in Hermes-1.3.3.patched/src: mmxp_32.o
Only in Hermes-1.3.3.patched/src: Palette.lo
Only in Hermes-1.3.3.patched/src: Palette.o
Only in Hermes-1.3.3.patched/src: stamp-h1
Only in Hermes-1.3.3.patched/src: Utility.lo
Only in Hermes-1.3.3.patched/src: Utility.o
Only in Hermes-1.3.3.patched/src: x86_clr.lo
Only in Hermes-1.3.3.patched/src: x86_clr.o
Only in Hermes-1.3.3.patched/src: x86_main.lo
Only in Hermes-1.3.3.patched/src: x86_main.o
Only in Hermes-1.3.3.patched/src: x86p_16.lo
Only in Hermes-1.3.3.patched/src: x86p_16.o
Only in Hermes-1.3.3.patched/src: x86p_32.lo
Only in Hermes-1.3.3.patched/src: x86p_32.o
Only in Hermes-1.3.3.patched/src: x86p_cpy.lo
Only in Hermes-1.3.3.patched/src: x86p_cpy.o
Only in Hermes-1.3.3.patched/src: x86p_i8.lo
Only in Hermes-1.3.3.patched/src: x86p_i8.o
Only in Hermes-1.3.3.patched/src: x86p_s32.lo
Only in Hermes-1.3.3.patched/src: x86p_s32.o


Index: Hermes.spec
===================================================================
RCS file: /cvs/extras/rpms/Hermes/FC-4/Hermes.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Hermes.spec	22 May 2005 23:45:23 -0000	1.9
+++ Hermes.spec	16 Jun 2005 13:56:54 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           Hermes
 Version:        1.3.3
-Release: 8
+Release:	9%{?dist}
 
 Summary:        Pixel format conversion library
 
@@ -8,6 +8,7 @@
 License:        LGPL
 URL:            http://clanlib.org/hermes/
 Source:         http://clanlib.org/download/files/%{name}-%{version}.tar.bz2
+Patch:          Hermes.gcc4.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -41,6 +42,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %configure
@@ -73,6 +75,9 @@
 %{_libdir}/libHermes.so
 
 %changelog
+* Thu Jun 16 2005 Thomas Vander Stichele <thomas at apestaart dot org> - 1.3.3-9
+- add a patch for gcc4
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.3.3-8
 - rebuild on all arches
 
@@ -80,7 +85,7 @@
 - rebuilt
 
 * Thu Dec 04 2003 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0:1.3.3-o.fdr.6: remove commented parts from scriplets
+- 0:1.3.3-0.fdr.6: remove commented parts from scriplets
 
 * Sun Sep 07 2003 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0:1.3.3-0.fdr.5: put back epochs, change download URL