rpms/allegro/devel allegro-4.2.0-64bit.patch, NONE, 1.1 allegro-4.2.0-alsa-big-endian.patch, NONE, 1.1 allegro.spec, 1.24, 1.25

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/allegro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2175

Modified Files:
	allegro.spec 
Added Files:
	allegro-4.2.0-64bit.patch allegro-4.2.0-alsa-big-endian.patch 
Log Message:
* Mon Feb 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.0-8
- fix sound not working on PPC (bz 183112)
- fix allegro not finding and loading plugins/modules on x86_64 (bz 183113)


allegro-4.2.0-64bit.patch:

--- NEW FILE allegro-4.2.0-64bit.patch ---
--- allegro-4.2.0/src/unix/umodules.c.64bit	2006-02-26 14:43:37.000000000 +0100
+++ allegro-4.2.0/src/unix/umodules.c	2006-02-26 14:44:26.000000000 +0100
@@ -44,7 +44,12 @@
 /* where to look for modules.lst */
 static char *module_path[] =
 {
-   "/usr/local/lib/allegro/", "/usr/lib/allegro/", NULL
+#ifdef __LP64__
+   "/usr/lib64/allegro/",
+#else
+   "/usr/lib/allegro/",
+#endif
+   NULL
 };
 
 

allegro-4.2.0-alsa-big-endian.patch:

--- NEW FILE allegro-4.2.0-alsa-big-endian.patch ---
--- allegro-4.2.0/src/unix/alsa9.c~	2006-02-26 09:11:32.000000000 +0100
+++ allegro-4.2.0/src/unix/alsa9.c	2006-02-26 09:11:32.000000000 +0100
@@ -361,7 +361,7 @@
 	 alsa_bits = 8;
 	 break;
 
-      case SND_PCM_FORMAT_U16_LE:
+      case SND_PCM_FORMAT_U16_NE:
 	 if (sizeof(short) != 2) {
 	    ustrzcpy(allegro_error, ALLEGRO_ERROR_SIZE, get_config_text("Unsupported sample format"));
 	    goto Error;


Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- allegro.spec	11 Feb 2006 16:31:59 -0000	1.24
+++ allegro.spec	27 Feb 2006 09:58:51 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           allegro
 Version:        4.2.0
-Release:        7
+Release:        8
 
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -16,6 +16,8 @@
 Patch2:         allegro-4.0.3-cfg.patch
 Patch3:         allegro-4.2.0-nostrip.patch
 Patch4:         allegro-4.2.0-digmid.patch
+Patch5:         allegro-4.2.0-alsa-big-endian.patch
+Patch6:         allegro-4.2.0-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  esound-devel, texinfo, perl, arts-devel
 BuildRequires:  xorg-x11-proto-devel, libX11-devel, libXext-devel, libXt-devel
@@ -124,6 +126,8 @@
 %patch2 -p1 -b .config
 %patch3 -p1 -z .nostrip
 %patch4 -p1 -z .digmid
+%patch5 -p1 -z .alsa-big-endian
+%patch6 -p1 -z .64bit
 
 %build
 %configure \
@@ -210,6 +214,10 @@
 
 
 %changelog
+* Mon Feb 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.0-8
+- fix sound not working on PPC (bz 183112)
+- fix allegro not finding and loading plugins/modules on x86_64 (bz 183113)
+
 * Tue Feb  8 2006 Jindrich Novy <jnovy at redhat.com> 4.2.0-7
 - set timidity++ as Requires instead of BuildRequires