rpms/methane/devel methane-1.4.7-pulseaudio.patch, NONE, 1.1 methane-help.desktop, 1.1, 1.2 methane.desktop, 1.2, 1.3 methane.spec, 1.3, 1.4

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	methane-help.desktop methane.desktop methane.spec 
Added Files:
	methane-1.4.7-pulseaudio.patch 
Log Message:
* Sun Feb 17 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.7-4
- Rebuild for new libmikmod
- Rebuild with gcc 4.3
- Try pulseaudio (esd) before oss (mikmod doesn't support alsa)


methane-1.4.7-pulseaudio.patch:

--- NEW FILE methane-1.4.7-pulseaudio.patch ---
diff -up methane-1.4.7/source/mikmod/audiodrv.cpp~ methane-1.4.7/source/mikmod/audiodrv.cpp
--- methane-1.4.7/source/mikmod/audiodrv.cpp~	2008-02-18 14:36:29.000000000 +0100
+++ methane-1.4.7/source/mikmod/audiodrv.cpp	2008-02-18 14:36:29.000000000 +0100
@@ -140,13 +140,9 @@ void CMikModDrv::InitDriver(void)
 	MikMod_RegisterDriver(&drv_win);
 	MikMod_RegisterDriver(&drv_nos);
 #else		// Must be Linux
-	if (drv_oss.Name)	// Valid OSS driver
+	if (drv_esd.Name)	// Register esd first for pulseaudiu support
 	{
-		if (drv_oss.CommandLine)	// Valid Commandline
-		{
-			drv_oss.CommandLine("buffer=14,count=2");
-		}
-		MikMod_RegisterDriver(&drv_oss);
+		MikMod_RegisterDriver(&drv_esd);
 	}
 	if (drv_alsa.Name)	// Valid ALSA driver
 	{
@@ -156,6 +152,14 @@ void CMikModDrv::InitDriver(void)
 		}
 		MikMod_RegisterDriver(&drv_alsa);
 	}
+	if (drv_oss.Name)	// Valid OSS driver
+	{
+		if (drv_oss.CommandLine)	// Valid Commandline
+		{
+			drv_oss.CommandLine("buffer=14,count=2");
+		}
+		MikMod_RegisterDriver(&drv_oss);
+	}
 	MikMod_RegisterDriver(&drv_nos);
 #endif
 


Index: methane-help.desktop
===================================================================
RCS file: /cvs/extras/rpms/methane/devel/methane-help.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- methane-help.desktop	14 Feb 2007 07:57:12 -0000	1.1
+++ methane-help.desktop	18 Feb 2008 15:56:01 -0000	1.2
@@ -1,7 +1,6 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Super Methane Brothers Documentation
-Exec=htmlview file:///usr/share/doc/methane-version/docs/info.html
+Exec=xdg-open file:///usr/share/doc/methane-version/docs/info.html
 Icon=methane-help
 Terminal=false
 StartupNotify=true


Index: methane.desktop
===================================================================
RCS file: /cvs/extras/rpms/methane/devel/methane.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- methane.desktop	25 Sep 2007 07:20:44 -0000	1.2
+++ methane.desktop	18 Feb 2008 15:56:01 -0000	1.3
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Super Methane Brothers
 Name[af]=Super Metaan Broers
 Name[ca]=Els germans Super metà 


Index: methane.spec
===================================================================
RCS file: /cvs/extras/rpms/methane/devel/methane.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- methane.spec	25 Sep 2007 07:20:44 -0000	1.3
+++ methane.spec	18 Feb 2008 15:56:01 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           methane
 Version:        1.4.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Super Methane Brothers
 Group:          Amusements/Games
 License:        GPLv2+
@@ -13,6 +13,7 @@
 Patch0:         methane-clanlib08.patch
 Patch1:         methane-highscore.patch
 Patch2:         methane-fullscreen.patch
+Patch3:         methane-1.4.7-pulseaudio.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ClanLib-devel mikmod-devel desktop-file-utils
 Requires:       hicolor-icon-theme opengl-games-utils
@@ -28,6 +29,7 @@
 %patch0 -p1 -z .cl08
 %patch1 -p1 -z .highscore
 %patch2 -p1 -z .fullscreen
+%patch3 -p1 -z .pa
 # we don't want every beeping file to be executable!
 chmod -x `find -type f`
 # put the correct version in methane-help.desktop
@@ -91,6 +93,11 @@
 
 
 %changelog
+* Sun Feb 17 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.7-4
+- Rebuild for new libmikmod
+- Rebuild with gcc 4.3
+- Try pulseaudio (esd) before oss (mikmod doesn't support alsa)
+
 * Tue Sep 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.7-3
 - Use opengl-games-utils wrapper to show error dialog when DRI is missing