rpms/wesnoth/devel wesnoth-1.3.16-remove-ogg-test.patch,1.1,1.2

Jon Ciesla limb at fedoraproject.org
Wed Feb 25 17:04:54 UTC 2009


Author: limb

Update of /cvs/pkgs/rpms/wesnoth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28624

Modified Files:
	wesnoth-1.3.16-remove-ogg-test.patch 
Log Message:
Patch fix.


wesnoth-1.3.16-remove-ogg-test.patch:

Index: wesnoth-1.3.16-remove-ogg-test.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/devel/wesnoth-1.3.16-remove-ogg-test.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wesnoth-1.3.16-remove-ogg-test.patch	26 Feb 2008 12:11:36 -0000	1.1
+++ wesnoth-1.3.16-remove-ogg-test.patch	25 Feb 2009 17:04:24 -0000	1.2
@@ -1,26 +1,20 @@
---- configure.ac	2008-02-22 14:10:36.000000000 -0600
-+++ configure.ac	2008-02-22 14:10:36.000000000 -0600
-@@ -890,23 +890,6 @@
- 	LIBS="$LIBS $SDL_LIBS $SDL_MIXER_LIBS"
- 
- 	ac_link="$LDPREFIX $ac_link"
--        AC_RUN_IFELSE([AC_LANG_SOURCE([
--	#include <SDL_mixer.h>
--        #include <stdlib.h>
+--- configure.ac~	2009-02-02 13:31:10.000000000 -0600
++++ configure.ac	2009-02-02 13:31:10.000000000 -0600
+@@ -877,17 +876,0 @@
+-    AC_RUN_IFELSE([AC_LANG_SOURCE([
+-    #include <SDL_mixer.h>
+-    #include <stdlib.h>
 -
--	int main(int argc, char **argv)
--        {
--	    Mix_Music* music = Mix_LoadMUS("data/core/music/main_menu.ogg");
--	    if (music == NULL)
--		exit(1);
--	    exit(0);
--        }
--	])],
--	[AC_MSG_RESULT(yes)],
--	[AC_MSG_RESULT(no)]
--	[AC_MSG_ERROR([*** SDL_mixer has no OGG support! You need SDL_mixer with OGG support])],
--	[AC_MSG_RESULT([not tested in cross-compiling])])
+-    int main(int argc, char **argv)
+-    {
+-	Mix_Music* music = Mix_LoadMUS("data/core/music/main_menu.ogg");
+-	if (music == NULL)
+-	    exit(1);
+-	exit(0);
+-    }
+-    ])],
+-    [AC_MSG_RESULT(yes)],
+-    [AC_MSG_RESULT(no)]
+-    [AC_MSG_ERROR([*** SDL_mixer has no OGG support! You need SDL_mixer with OGG support])],
+-    [AC_MSG_RESULT([not tested in cross-compiling])])
 -
- 
-         CPPFLAGS=$OLD_CPPFLAGS
-         CFLAGS=$OLD_CFLAGS




More information about the fedora-extras-commits mailing list