8:41 a.m.
Author: belegdol
Update of /cvs/nonfree/rpms/bsnes/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5805
Modified Files:
.cvsignore bsnes-0.037a-strip.patch bsnes-system-zlib.patch
bsnes.spec sources
Log Message:
* Sun May 10 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.046-1
- Updated to 0.046
- Dropped libXtst-devel BuildRequires
- Updated the strip patch again
- Updated the zlib patch again
- Updated the optflags fix
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 23 Apr 2009 11:23:07 -0000 1.8
+++ .cvsignore 11 May 2009 08:41:55 -0000 1.9
@@ -1 +1 @@
-bsnes_v045.tar.bz2
+bsnes_v046.tar.bz2
bsnes-0.037a-strip.patch:
Index: bsnes-0.037a-strip.patch
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-10/bsnes-0.037a-strip.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bsnes-0.037a-strip.patch 23 Apr 2009 11:23:07 -0000 1.3
+++ bsnes-0.037a-strip.patch 11 May 2009 08:41:55 -0000 1.4
@@ -1,10 +1,11 @@
---- src/Makefile.strip 2009-03-29 08:14:20.000000000 +0200
-+++ src/Makefile 2009-03-29 12:19:56.000000000 +0200
-@@ -14,7 +14,6 @@
- cpp = $(subst cc,++,$(compiler))
- obj = o
- rule = -c $< -o $@
-- link = -s
- mkbin = -o$1
- mkdef = -D$1
- mkincpath = -I$1
+--- src/Makefile.strip 2009-05-10 02:59:55.000000000 +0200
++++ src/Makefile 2009-05-10 19:10:41.000000000 +0200
+@@ -8,7 +8,7 @@
+ c := $(compiler)
+ cpp := $(subst cc,++,$(compiler))
+ flags := -O3 -fomit-frame-pointer -Ilib
+-link := -s
++link :=
+
+ # profile-guided instrumentation:
+ # flags += -fprofile-generate
bsnes-system-zlib.patch:
Index: bsnes-system-zlib.patch
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-10/bsnes-system-zlib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bsnes-system-zlib.patch 17 Dec 2008 09:27:28 -0000 1.2
+++ bsnes-system-zlib.patch 11 May 2009 08:41:55 -0000 1.3
@@ -1,26 +1,26 @@
---- src/Makefile.system-zlib 2008-02-15 11:16:23.000000000 +0100
-+++ src/Makefile 2008-02-15 11:28:12.000000000 +0100
-@@ -82,6 +82,7 @@
+--- src/Makefile.system-zlib 2009-05-10 19:20:21.000000000 +0200
++++ src/Makefile 2009-05-10 19:20:21.000000000 +0200
+@@ -71,6 +71,7 @@
ifeq ($(enable_gzip),true)
objects += adler32 compress crc32 deflate gzio inffast inflate inftrees ioapi trees
unzip zip zutil
- flags += $(call mkdef,GZIP_SUPPORT)
+ flags += -DGZIP_SUPPORT
+ link += $(shell pkg-config --libs minizip)
endif
ifeq ($(enable_jma),true)
---- src/reader/zipreader.hpp.system-zlib 2008-10-17 12:14:16.000000000 +0200
-+++ src/reader/zipreader.hpp 2008-11-29 21:36:02.000000000 +0100
+--- src/lib/libreader/gzreader.hpp.system-zlib 2009-05-02 18:18:10.000000000 +0200
++++ src/lib/libreader/gzreader.hpp 2009-05-10 19:21:27.000000000 +0200
@@ -1,4 +1,4 @@
--#include "zlib/unzip.h"
-+#include <minizip/unzip.h>
-
- #define ZIP_MAX_FILE_NAME PATH_MAX
-
---- src/reader/gzreader.hpp.system-zlib 2005-12-18 10:20:14.000000000 +0100
-+++ src/reader/gzreader.hpp 2008-02-15 11:25:45.000000000 +0100
-@@ -1,4 +1,4 @@
--#include "zlib/zlib.h"
+-#include <zlib/zlib.h>
+#include <zlib.h>
class GZReader : public Reader {
private:
+--- src/lib/libreader/zipreader.hpp.system-zlib 2009-05-02 18:18:02.000000000 +0200
++++ src/lib/libreader/zipreader.hpp 2009-05-10 19:22:37.000000000 +0200
+@@ -1,4 +1,4 @@
+-#include <zlib/unzip.h>
++#include <minizip/unzip.h>
+
+ #define ZIP_MAX_FILE_NAME PATH_MAX
+
Index: bsnes.spec
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-10/bsnes.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bsnes.spec 23 Apr 2009 11:23:07 -0000 1.8
+++ bsnes.spec 11 May 2009 08:41:55 -0000 1.9
@@ -1,4 +1,4 @@
-%define vernumber 045
+%define vernumber 046
Name: bsnes
Version: 0.%{vernumber}
@@ -23,7 +23,6 @@
BuildRequires: freealut-devel
BuildRequires: libao-devel
BuildRequires: libXv-devel
-BuildRequires: libXtst-devel
BuildRequires: minizip-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: SDL-devel
@@ -52,7 +51,7 @@
#use system optflags
-sed -i "s#flags = -O3#flags = $RPM_OPT_FLAGS#" src/Makefile
+sed -i "s#flags := -O3#flags := $RPM_OPT_FLAGS#" src/Makefile
#install fedora-specific readme
install -pm 644 %{SOURCE2} README.Fedora
@@ -86,6 +85,13 @@
%changelog
+* Sun May 10 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.046-1
+- Updated to 0.046
+- Dropped libXtst-devel BuildRequires
+- Updated the strip patch again
+- Updated the zlib patch again
+- Updated the optflags fix
+
* Mon Apr 20 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.045-1
- Updated to 0.045
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 23 Apr 2009 11:23:07 -0000 1.8
+++ sources 11 May 2009 08:41:55 -0000 1.9
@@ -1 +1 @@
-23ba7aa90e4803387039b412c6f8178b bsnes_v045.tar.bz2
+3091093b9ded18e9c9a974079a2d127b bsnes_v046.tar.bz2