rpms/allegro/F-8 allegro-4.2.2-gcc43-asm.patch, NONE, 1.1 allegro-4.0.3-cfg.patch, 1.2, 1.3 allegro.spec, 1.48, 1.49

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/allegro/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20376

Modified Files:
	allegro-4.0.3-cfg.patch allegro.spec 
Added Files:
	allegro-4.2.2-gcc43-asm.patch 
Log Message:
* Mon May  5 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.2-10
- Look for /etc/timidity.cfg instead of /usr/share/timidity/timidity.cfg,
  as the latter is no longer available now that Fedora has switched from
  timidity++-patches to PersonalCopy-Lite-patches


allegro-4.2.2-gcc43-asm.patch:

--- NEW FILE allegro-4.2.2-gcc43-asm.patch ---
diff -up allegro-4.2.2/src/i386/icpus.s~ allegro-4.2.2/src/i386/icpus.s
--- allegro-4.2.2/src/i386/icpus.s~	2008-03-20 15:11:46.000000000 +0100
+++ allegro-4.2.2/src/i386/icpus.s	2008-03-20 15:11:46.000000000 +0100
@@ -67,7 +67,7 @@ FUNC(_i_is_fpu)
 
    fninit
    movl $0x5A5A, %eax
-   fnstsw %eax
+   fnstsw %ax
    cmpl $0, %eax
    jne is_fpu_not_found
 

allegro-4.0.3-cfg.patch:

Index: allegro-4.0.3-cfg.patch
===================================================================
RCS file: /cvs/extras/rpms/allegro/F-8/allegro-4.0.3-cfg.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- allegro-4.0.3-cfg.patch	25 Jan 2006 10:07:50 -0000	1.2
+++ allegro-4.0.3-cfg.patch	5 May 2008 17:18:51 -0000	1.3
@@ -5,7 +5,7 @@
  
  # patch set for the DIGMID software wavetable driver
 -patches = 
-+patches = /usr/share/timidity/timidity.cfg
++patches = /etc/timidity.cfg
  
  
  


Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/F-8/allegro.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- allegro.spec	22 Jan 2008 10:27:06 -0000	1.48
+++ allegro.spec	5 May 2008 17:18:51 -0000	1.49
@@ -1,6 +1,6 @@
 Name:           allegro
 Version:        4.2.2
-Release:        7%{?dist}
+Release:        10%{?dist}
 
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -20,6 +20,7 @@
 Patch6:         allegro-4.0.3-libdir.patch
 Patch7:         allegro-4.2.2-pulseaudio.patch
 Patch8:         allegro-4.2.2-gcc43.patch
+Patch9:         allegro-4.2.2-gcc43-asm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  esound-devel, texinfo, perl, arts-devel, glib2-devel
 BuildRequires:  xorg-x11-proto-devel, libX11-devel, libXext-devel, libXt-devel
@@ -58,6 +59,7 @@
 Summary(it):    Una libreria per la programmazione di videogiochi
 Summary(cs):    Knihovna pro programování her
 Group:          Development/Libraries
+Provides:       %{name}-static = %{version}-%{release}
 Requires:       %{name} = %{version}-%{release}, xorg-x11-proto-devel
 Requires:       libX11-devel, libXcursor-devel
 Requires(post): /sbin/install-info
@@ -163,6 +165,7 @@
 %patch6 -p1 -z .multilib2
 %patch7 -p1 -z .pulse
 %patch8 -p1 -z .gcc43
+%patch9 -p1 -z .gcc43-asm
 iconv -f iso-8859-1 -t utf-8 docs/src/allegro._tx > docs/src/allegro._tx.tmp
 mv docs/src/allegro._tx.tmp docs/src/allegro._tx
 
@@ -174,12 +177,12 @@
 %endif
   --enable-svgalib=no \
   --enable-dbglib=yes \
-  --enable-proflib=yes
-%ifnarch %{ix86}
-make CFLAGS="$RPM_OPT_FLAGS -DALLEGRO_USE_C -I%{_includedir}/kde/artsc"
-%else
-make CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/kde/artsc"
-%endif
+  --enable-proflib=yes \
+  --enable-opts=generic
+# GRRR configure insists on adding -fomit-frame-pointer, remove it
+sed -i 's/-fomit-frame-pointer//g' makefile
+# Explicitly set PROG_LDFLAGS to avoid stripping of the utilities
+make CFLAGS="$RPM_OPT_FLAGS" PROG_LDFLAGS="-Wl,--export-dynamic"
 
 
 %install
@@ -291,6 +294,19 @@
 
 
 %changelog
+* Mon May  5 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.2-10
+- Look for /etc/timidity.cfg instead of /usr/share/timidity/timidity.cfg,
+  as the latter is no longer available now that Fedora has switched from
+  timidity++-patches to PersonalCopy-Lite-patches
+
+* Tue Apr  1 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.2-9
+- Fix i386 asm code compilation with latest binutils
+- Remove -fomit-frame-pointer from the compile flags of the default build, so
+  that we get a usefull debuginfo even for the normal (non debug/profile) lib
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 4.2.2-8
+- Autorebuild for GCC 4.3
+
 * Mon Jan 21 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.2-7
 - Add makedoc utility to allegro-devel as allegro-makedoc (bz 429450)
 - Fix sound when using pulseaudio