rpms/frozen-bubble/F-9 frozen-bubble-2.1.0-bigendianaudio.patch, NONE, 1.1 frozen-bubble.spec, 1.11, 1.12

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Sun Jul 6 11:56:38 UTC 2008


Author: jwrdegoede

Update of /cvs/extras/rpms/frozen-bubble/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30830

Modified Files:
	frozen-bubble.spec 
Added Files:
	frozen-bubble-2.1.0-bigendianaudio.patch 
Log Message:
* Sun Jul  6 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.1.0-9
- Fix audio on bigendian archs (bz 454109), patch by Ian Chapman


frozen-bubble-2.1.0-bigendianaudio.patch:

--- NEW FILE frozen-bubble-2.1.0-bigendianaudio.patch ---
--- frozen-bubble.orig	2008-03-03 20:49:40.000000000 +0000
+++ frozen-bubble	2008-07-04 19:00:13.000000000 +0100
@@ -66,6 +66,8 @@
 use fbsyms;
 use FBLE;
 
+use Config;
+
 $| = 1;
 
 $TARGET_ANIM_SPEED = 20;        # number of milliseconds that should last between two animation frames
@@ -281,7 +283,13 @@
 }
 
 sub init_sound() {
-    $mixer = eval { SDL::Mixer->new(-frequency => 44100, -channels => 2, -size => 1024); };
+    # Endian Test
+    if ($Config{byteorder} == 4321 || $Config{byteorder} == 87654321) {
+        $mixer = eval { SDL::Mixer->new(-frequency => 44100, -format => &AUDIO_S16MSB, -channels => 2, -size => 1024); };
+    }
+    else {
+        $mixer = eval { SDL::Mixer->new(-frequency => 44100, -channels => 2, -size => 1024); };
+    }
     if ($@) {
 	$@ =~ s| at \S+ line.*\n||;
 	print STDERR "\nWarning: can't initialize sound (reason: $@).\n";


Index: frozen-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/F-9/frozen-bubble.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- frozen-bubble.spec	3 Mar 2008 19:09:26 -0000	1.11
+++ frozen-bubble.spec	6 Jul 2008 11:55:39 -0000	1.12
@@ -1,13 +1,14 @@
 Summary: Frozen Bubble arcade game
 Name: frozen-bubble
 Version: 2.1.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2
 Group: Amusements/Games
 URL: http://www.frozen-bubble.org/
 Source0: http://www.frozen-bubble.org/data/frozen-bubble-%{version}.tar.bz2
 Source1: frozen-bubble.desktop
 Source2: fb-server.init
+Patch0: frozen-bubble-2.1.0-bigendianaudio.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: perl-SDL >= 2.1.3, SDL_mixer-devel, SDL_Pango-devel
@@ -35,6 +36,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 # Add a directory to the module path for the app's private perl modules
 %{__sed} -ie "s#use fb_stuff;#use lib qw(%{_libdir}/%{name}/perl);\n&#" \
     frozen-bubble frozen-bubble-editor
@@ -159,6 +161,9 @@
 
 
 %changelog
+* Sun Jul  6 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.1.0-9
+- Fix audio on bigendian archs (bz 454109), patch by Ian Chapman
+
 * Mon Mar  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1.0-8
 - rebuild for new perl (again)
 




More information about the fedora-extras-commits mailing list