Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-emulation/snes9x/files: snes9x-1.53-build.patch
Date: Mon, 26 Sep 2011 22:23:37
Message-Id: 20110926222328.5730D2004C@flycatcher.gentoo.org
1 mr_bones_ 11/09/26 22:23:28
2
3 Added: snes9x-1.53-build.patch
4 Log:
5 version bump (bug #380809); also builds against newer zlib (bug #384547)
6
7 (Portage version: 2.1.10.11/cvs/Linux i686)
8
9 Revision Changes Path
10 1.1 games-emulation/snes9x/files/snes9x-1.53-build.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/snes9x/files/snes9x-1.53-build.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/snes9x/files/snes9x-1.53-build.patch?rev=1.1&content-type=text/plain
14
15 Index: snes9x-1.53-build.patch
16 ===================================================================
17 diff -ru snes9x-1.53-src.orig/gtk/configure.ac snes9x-1.53-src/gtk/configure.ac
18 --- snes9x-1.53-src.orig/gtk/configure.ac 2011-04-24 09:38:10.000000000 -0400
19 +++ snes9x-1.53-src/gtk/configure.ac 2011-09-26 16:06:46.746352405 -0400
20 @@ -29,7 +29,7 @@
21
22 AM_GLIB_GNU_GETTEXT
23
24 -snes9xlocaledir='${prefix}/${DATADIRNAME}/locale'
25 +snes9xlocaledir='/usr/share/locale'
26 AC_SUBST(snes9xlocaledir)
27
28 AC_ARG_WITH(debug,
29 diff -ru snes9x-1.53-src.orig/gtk/po/Makefile.in.in snes9x-1.53-src/gtk/po/Makefile.in.in
30 --- snes9x-1.53-src.orig/gtk/po/Makefile.in.in 2011-04-24 16:12:50.000000000 -0400
31 +++ snes9x-1.53-src/gtk/po/Makefile.in.in 2011-09-26 16:07:05.844485532 -0400
32 @@ -34,7 +34,7 @@
33 datarootdir = @datarootdir@
34 libdir = @libdir@
35 DATADIRNAME = @DATADIRNAME@
36 -itlocaledir = $(prefix)/$(DATADIRNAME)/locale
37 +itlocaledir = /usr/share/locale
38 subdir = po
39 install_sh = @install_sh@
40 # Automake >= 1.8 provides @mkdir_p@.
41 diff -ru snes9x-1.53-src.orig/unix/Makefile.in snes9x-1.53-src/unix/Makefile.in
42 --- snes9x-1.53-src.orig/unix/Makefile.in 2011-04-24 09:38:10.000000000 -0400
43 +++ snes9x-1.53-src/unix/Makefile.in 2011-09-26 16:06:46.746352405 -0400
44 @@ -47,7 +47,7 @@
45 exit 1
46
47 snes9x: $(OBJECTS)
48 - $(CCC) $(INCLUDES) -o $@ $(OBJECTS) -lm @S9XLIBS@
49 + $(CCC) $(LDFLAGS) $(INCLUDES) -o $@ $(OBJECTS) -lm @S9XLIBS@
50
51 ../jma/s9x-jma.o: ../jma/s9x-jma.cpp
52 $(CCC) $(INCLUDES) -c $(CCFLAGS) -fexceptions $*.cpp -o $@
53 diff -ru snes9x-1.53-src.orig/unix/configure.ac snes9x-1.53-src/unix/configure.ac
54 --- snes9x-1.53-src.orig/unix/configure.ac 2011-04-24 09:38:10.000000000 -0400
55 +++ snes9x-1.53-src/unix/configure.ac 2011-09-26 16:06:46.747352203 -0400
56 @@ -56,20 +56,6 @@
57 # *** Execution begins here ***
58 # *****************************
59
60 -# Remove -g and -O2 flags manually.
61 -
62 -if test "x$CFLAGS" != "x"; then
63 - CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-g//'`"
64 - CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-O2//'`"
65 -fi
66 -
67 -if test "x$CXXFLAGS" != "x"; then
68 - CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-g//'`"
69 - CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-O2//'`"
70 -fi
71 -
72 -# Test what compiler flags we should use.
73 -
74 AC_ARG_ENABLE([debug],
75 [AS_HELP_STRING([--enable-debug],
76 [leave debug information in the final binary (default: no)])],
77 @@ -79,9 +65,6 @@
78 AC_S9X_COMPILER_FLAG([-g], [g])
79 AC_S9X_COMPILER_FLAG([-O0], [o0])
80 else
81 - AC_S9X_COMPILER_FLAG([-O3], [o3], [
82 - AC_S9X_COMPILER_FLAG([-O2], [o2], [
83 - AC_S9X_COMPILER_FLAG([-O1], [o1])])])
84 AC_S9X_COMPILER_FLAG([-fomit-frame-pointer], [omit_frame_pointer])
85 fi