rpms/bsnes/F-17 bsnes-0.086-gcc47.patch, NONE, 1.1 bsnes-0.086-systemwide.patch, NONE, 1.1 .cvsignore, 1.34, 1.35 bsnes.spec, 1.46, 1.47 sources, 1.34, 1.35 bsnes-0.085-systemwide.patch, 1.1, NONE

Fri Feb 17 19:13:53 CET 2012

Author: belegdol

Update of /cvs/free/rpms/bsnes/F-17
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21697

Modified Files:
	.cvsignore bsnes.spec sources 
Added Files:
	bsnes-0.086-gcc47.patch bsnes-0.086-systemwide.patch 
Removed Files:
	bsnes-0.085-systemwide.patch 
Log Message:
* Tue Feb 14 2012 Julian Sikorski <belegdol at fedoraproject.org> - 0.086-1
- Updated to 0.086
- Dropped obsolete Group, Buildroot, %clean and %defattr
- Updated the systemlibs patch
- Build Compatibility and Accuracy profiles, as well as the laevateinn debugger
- Fixed gcc-4.7 build failure


bsnes-0.086-gcc47.patch:
 string.hpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bsnes-0.086-gcc47.patch ---
diff -up bsnes_v086-source/bsnes/nall/string.hpp.gcc47 bsnes_v086-source/bsnes/nall/string.hpp
--- bsnes_v086-source/bsnes/nall/string.hpp.gcc47	2012-02-13 05:51:19.000000000 +0100
+++ bsnes_v086-source/bsnes/nall/string.hpp	2012-02-17 19:00:18.721016544 +0100
@@ -25,8 +25,8 @@
 #include <nall/string/base.hpp>
 #include <nall/string/bml.hpp>
 #include <nall/string/bsv.hpp>
-#include <nall/string/core.hpp>
 #include <nall/string/cast.hpp>
+#include <nall/string/core.hpp>
 #include <nall/string/compare.hpp>
 #include <nall/string/convert.hpp>
 #include <nall/string/cstring.hpp>

bsnes-0.086-systemwide.patch:
 ui-debugger/Makefile        |    3 ---
 ui/Makefile                 |    3 ---
 ui/general/main-window.cpp  |    4 ++--
 ui/tools/cheat-database.cpp |    2 +-
 4 files changed, 3 insertions(+), 9 deletions(-)

--- NEW FILE bsnes-0.086-systemwide.patch ---
diff -up bsnes_v086-source/bsnes/ui-debugger/Makefile.systemwide bsnes_v086-source/bsnes/ui-debugger/Makefile
--- bsnes_v086-source/bsnes/ui-debugger/Makefile.systemwide	2012-02-13 05:54:10.000000000 +0100
+++ bsnes_v086-source/bsnes/ui-debugger/Makefile	2012-02-15 23:37:47.524754749 +0100
@@ -66,11 +66,8 @@ endif
 install:
 ifeq ($(platform),x)
 	install -D -m 755 out/$(name) $(DESTDIR)$(prefix)/bin/$(name)
-	mkdir -p ~/.config/$(name)
 #	install -D -m 644 data/$(name).png $(DESTDIR)$(prefix)/share/pixmaps/$(name).png
 #	install -D -m 644 data/$(name).desktop $(DESTDIR)$(prefix)/share/applications/$(name).desktop
-	cp data/cheats.xml ~/.config/$(name)/cheats.xml
-	chmod 777 ~/.config/$(name) ~/.config/$(name)/cheats.xml
 endif
 
 uninstall:
diff -up bsnes_v086-source/bsnes/ui/general/main-window.cpp.systemwide bsnes_v086-source/bsnes/ui/general/main-window.cpp
--- bsnes_v086-source/bsnes/ui/general/main-window.cpp.systemwide	2012-02-03 23:33:00.000000000 +0100
+++ bsnes_v086-source/bsnes/ui/general/main-window.cpp	2012-02-15 23:36:37.693287851 +0100
@@ -332,7 +332,7 @@ void MainWindow::synchronize() {
 }
 
 void MainWindow::setupVideoFilters() {
-  string path = { application->basepath, "filters/" };
+  string path = { "/usr/lib/bsnes/filters/" };
   lstring files = directory::files(path, "*.filter");
   if(files.size() == 0) {
     path = { application->userpath, "filters/" };
@@ -363,7 +363,7 @@ void MainWindow::setupVideoFilters() {
 }
 
 void MainWindow::setupVideoShaders() {
-  string path = { application->basepath, "shaders/" };
+  string path = { "/usr/share/bsnes/shaders/" };
   lstring files = directory::files(path, { "*.", config->video.driver, ".shader" });
   if(files.size() == 0) {
     path = { application->userpath, "shaders/" };
diff -up bsnes_v086-source/bsnes/ui/Makefile.systemwide bsnes_v086-source/bsnes/ui/Makefile
--- bsnes_v086-source/bsnes/ui/Makefile.systemwide	2012-02-06 02:04:19.000000000 +0100
+++ bsnes_v086-source/bsnes/ui/Makefile	2012-02-15 23:36:35.509273332 +0100
@@ -67,11 +67,8 @@ endif
 install:
 ifeq ($(platform),x)
 	install -D -m 755 out/$(name) $(DESTDIR)$(prefix)/bin/$(name)
-	mkdir -p ~/.config/$(name)
 	install -D -m 644 data/$(name).png $(DESTDIR)$(prefix)/share/pixmaps/$(name).png
 	install -D -m 644 data/$(name).desktop $(DESTDIR)$(prefix)/share/applications/$(name).desktop
-	cp data/cheats.xml ~/.config/$(name)/cheats.xml
-	chmod 777 ~/.config/$(name) ~/.config/$(name)/cheats.xml
 endif
 
 uninstall:
diff -up bsnes_v086-source/bsnes/ui/tools/cheat-database.cpp.systemwide bsnes_v086-source/bsnes/ui/tools/cheat-database.cpp
--- bsnes_v086-source/bsnes/ui/tools/cheat-database.cpp.systemwide	2012-02-13 05:50:01.000000000 +0100
+++ bsnes_v086-source/bsnes/ui/tools/cheat-database.cpp	2012-02-15 23:36:35.509273332 +0100
@@ -34,7 +34,7 @@ void CheatDatabase::findCodes() {
   cheatCode.reset();
 
   string data;
-  data.readfile(application->path("cheats.xml"));
+  data.readfile("/usr/share/bsnes/cheats.xml");
   XML::Document document(data);
   for(auto &node : document["database"]) {
     if(node.name != "cartridge") continue;


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/bsnes/F-17/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	3 Jan 2012 19:20:26 -0000	1.34
+++ .cvsignore	17 Feb 2012 18:13:53 -0000	1.35
@@ -1 +1 @@
-bsnes_v085-source.tar.bz2
+bsnes_v086-source.tar.bz2


Index: bsnes.spec
===================================================================
RCS file: /cvs/free/rpms/bsnes/F-17/bsnes.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- bsnes.spec	3 Jan 2012 19:20:27 -0000	1.46
+++ bsnes.spec	17 Feb 2012 18:13:53 -0000	1.47
@@ -1,17 +1,16 @@
-%global vernumber 085
+%global vernumber 086
 
 Name:           bsnes
 Version:        0.%{vernumber}
 Release:        1%{?dist}
 Summary:        SNES emulator focused on accuracy
 
-Group:          Applications/Emulators
 License:        GPLv3
 URL:            http://byuu.org/bsnes/
 Source0:        http://bsnes.googlecode.com/files/%{name}_v%{vernumber}-source.tar.bz2
 Source2:        README.bsnes
-Patch1:         bsnes-0.085-systemwide.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         bsnes-0.086-gcc47.patch
+Patch1:         bsnes-0.086-systemwide.patch
 
 #bsnes does not use system snes_ntsc because the modified video processing
 #filter algorithm calls back into bsnes specific c++ colortable code, that
@@ -40,6 +39,7 @@
 
 %prep
 %setup -qn %{name}_v%{vernumber}-source
+%patch0 -p1 -b .gcc47
 %patch1 -p1 -b .systemwide
 
 #fix permissions
@@ -66,8 +66,18 @@
 
 
 %build
+#prepare for building compatibity and accuracy profile, as well as the debugger
+cp -pR bsnes bsnes-accuracy
+cp -pR bsnes laevateinn
+
 pushd bsnes
-make %{?_smp_mflags} compiler=gcc phoenix=gtk
+make %{?_smp_mflags} compiler=gcc profile=compatibility phoenix=gtk
+popd
+pushd bsnes-accuracy
+make %{?_smp_mflags} compiler=gcc profile=accuracy phoenix=gtk
+popd
+pushd laevateinn
+make %{?_smp_mflags} compiler=gcc ui=ui-debugger phoenix=gtk
 popd
 pushd snesfilter
 make %{?_smp_mflags} compiler=gcc
@@ -80,11 +90,22 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 pushd bsnes
+sed -i 's/Name=bsnes/Name=bsnes (Compatibility profile)/' data/bsnes.desktop
 make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix}
 desktop-file-install --vendor=rpmfusion \
         --delete-original --dir $RPM_BUILD_ROOT%{_datadir}/applications \
         $RPM_BUILD_ROOT%{_datadir}/applications/bsnes.desktop
 popd
+pushd bsnes-accuracy
+sed -i 's/Name=bsnes/Name=bsnes (Accuracy profile)/' data/bsnes.desktop
+sed -i 's/Exec=bsnes/Exec=bsnes-accuracy/' data/bsnes.desktop
+install -pm 755 out/bsnes $RPM_BUILD_ROOT%{_bindir}/bsnes-accuracy
+desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+         data/bsnes.desktop
+popd
+pushd laevateinn
+install -pm 755 out/laevateinn $RPM_BUILD_ROOT%{_bindir}
+popd
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -pm 644 bsnes/data/cheats.xml $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/filters
@@ -93,22 +114,28 @@
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/shaders
 install -pm 644 snesshader/*.shader $RPM_BUILD_ROOT%{_datadir}/%{name}/shaders
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 
 %files
-%defattr(-,root,root,-)
 %doc README.Fedora
 %{_bindir}/bsnes
+%{_bindir}/bsnes-accuracy
+%{_bindir}/laevateinn
 %{_bindir}/snespurify-gtk
 %{_libdir}/bsnes
 %{_datadir}/bsnes
 %{_datadir}/pixmaps/bsnes.png
+%{_datadir}/applications/bsnes.desktop
 %{_datadir}/applications/rpmfusion-bsnes.desktop
 
 
 %changelog
+* Tue Feb 14 2012 Julian Sikorski <belegdol at fedoraproject.org> - 0.086-1
+- Updated to 0.086
+- Dropped obsolete Group, Buildroot, %%clean and %%defattr
+- Updated the systemlibs patch
+- Build Compatibility and Accuracy profiles, as well as the laevateinn debugger
+- Fixed gcc-4.7 build failure
+
 * Tue Jan 03 2012 Julian Sikorski <belegdol at fedoraproject.org> - 0.085-1
 - Updated to 0.085
 - Updated the systemwide patch


Index: sources
===================================================================
RCS file: /cvs/free/rpms/bsnes/F-17/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	3 Jan 2012 19:20:27 -0000	1.34
+++ sources	17 Feb 2012 18:13:53 -0000	1.35
@@ -1 +1 @@
-2419710087ba28c894e5aa1c3c41b6e7  bsnes_v085-source.tar.bz2
+54f73b38d24405186b538e01713b0c1f  bsnes_v086-source.tar.bz2


--- bsnes-0.085-systemwide.patch DELETED ---

