Author: belegdol Update of /cvs/free/rpms/bsnes/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv14447 Modified Files: .cvsignore bsnes.spec sources Added Files: bsnes-0.084-systemwide.patch Removed Files: bsnes-0.079-systemwide.patch Log Message: * Wed Nov 09 2011 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.084-1 - Updated to 0.084 - License is now GPLv3 - Updated the systemwide patch - cheats.xml → cheats.bml - Apply the change enabling system-wide cheats as a patch bsnes-0.084-systemwide.patch: Makefile | 3 --- general/main-window.cpp | 4 ++-- tools/cheat-database.cpp | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) --- NEW FILE bsnes-0.084-systemwide.patch --- diff -up bsnes_v084-source/bsnes/ui/general/main-window.cpp.systemwide bsnes_v084-source/bsnes/ui/general/main-window.cpp --- bsnes_v084-source/bsnes/ui/general/main-window.cpp.systemwide 2011-11-07 10:10:46.000000000 +0100 +++ bsnes_v084-source/bsnes/ui/general/main-window.cpp 2011-11-09 23:27:47.964132102 +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_v084-source/bsnes/ui/Makefile.systemwide bsnes_v084-source/bsnes/ui/Makefile --- bsnes_v084-source/bsnes/ui/Makefile.systemwide 2011-10-13 21:54:51.000000000 +0200 +++ bsnes_v084-source/bsnes/ui/Makefile 2011-11-09 23:26:20.834677869 +0100 @@ -77,11 +77,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.bml ~/.config/$(name)/cheats.bml - chmod 777 ~/.config/$(name) ~/.config/$(name)/cheats.bml endif uninstall: diff -up bsnes_v084-source/bsnes/ui/tools/cheat-database.cpp.systemwide bsnes_v084-source/bsnes/ui/tools/cheat-database.cpp --- bsnes_v084-source/bsnes/ui/tools/cheat-database.cpp.systemwide 2011-11-03 02:34:23.000000000 +0100 +++ bsnes_v084-source/bsnes/ui/tools/cheat-database.cpp 2011-11-09 23:28:52.984471072 +0100 @@ -34,7 +34,7 @@ void CheatDatabase::findCodes() { cheatCode.reset(); string data; - data.readfile(application->path("cheats.bml")); + data.readfile("/usr/share/bsnes/cheats.bml"); BML::Document document(data); for(auto &root : document) { if(root.name != "cartridge") continue; Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/bsnes/devel/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 23 Aug 2011 20:58:25 -0000 1.32 +++ .cvsignore 9 Nov 2011 22:47:06 -0000 1.33 @@ -1 +1 @@ -bsnes_v082-source.tar.bz2 +bsnes_v084-source.tar.bz2 Index: bsnes.spec =================================================================== RCS file: /cvs/free/rpms/bsnes/devel/bsnes.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- bsnes.spec 23 Aug 2011 20:58:25 -0000 1.44 +++ bsnes.spec 9 Nov 2011 22:47:07 -0000 1.45 @@ -1,4 +1,4 @@ -%global vernumber 082 +%global vernumber 084 Name: bsnes Version: 0.%{vernumber} @@ -6,11 +6,11 @@ Summary: SNES emulator focused on accuracy Group: Applications/Emulators -License: GPLv2 +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.079-systemwide.patch +Patch1: bsnes-0.084-systemwide.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #bsnes does not use system snes_ntsc because the modified video processing @@ -19,7 +19,7 @@ BuildRequires: desktop-file-utils BuildRequires: freealut-devel BuildRequires: gtk2-devel -BuildRequires: libao-devel +BuildRequires: libao-devel BuildRequires: libXv-devel BuildRequires: pulseaudio-libs-devel BuildRequires: SDL-devel @@ -39,7 +39,7 @@ %prep -%setup -q -n %{name}_v%{vernumber}-source +%setup -qcn %{name}_v%{vernumber}-source %patch1 -p1 -b .systemwide #fix permissions @@ -61,9 +61,7 @@ #install fedora-specific readme install -pm 644 %{SOURCE2} README.Fedora -#use proper system-wide paths for filters and cheats.xml -sed -i &#39;s@path.home(&quot;cheats.xml&quot;)@&quot;/usr/share/bsnes/cheats.xml&quot;(a)&#39; \ - bsnes/ui/tools/cheat-database.cpp +#use proper system-wide path for filters sed -i 's@/usr/lib@%{_libdir}@' bsnes/ui/general/main-window.cpp @@ -88,7 +86,7 @@ $RPM_BUILD_ROOT%{_datadir}/applications/bsnes.desktop popd install -d $RPM_BUILD_ROOT%{_datadir}/%{name} -install -pm 644 bsnes/data/cheats.xml $RPM_BUILD_ROOT%{_datadir}/%{name} +install -pm 644 bsnes/data/cheats.bml $RPM_BUILD_ROOT%{_datadir}/%{name} install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/filters install -pm 755 snesfilter/out/*.filter $RPM_BUILD_ROOT%{_libdir}/%{name}/filters install -pm 755 snespurify/snespurify-gtk $RPM_BUILD_ROOT%{_bindir} @@ -111,6 +109,13 @@ %changelog +* Wed Nov 09 2011 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.084-1 +- Updated to 0.084 +- License is now GPLv3 +- Updated the systemwide patch +- cheats.xml → cheats.bml +- Apply the change enabling system-wide cheats as a patch + * Tue Aug 23 2011 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.082-1 - Updated to 0.082 - Dropped unneeded patches Index: sources =================================================================== RCS file: /cvs/free/rpms/bsnes/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 23 Aug 2011 20:58:25 -0000 1.32 +++ sources 9 Nov 2011 22:47:07 -0000 1.33 @@ -1 +1 @@ -c7deead3fb28bcf1aa7bcef44f236f59 bsnes_v082-source.tar.bz2 +ba66a8aa91b8f17812cc91ffeb63e489 bsnes_v084-source.tar.bz2 --- bsnes-0.079-systemwide.patch DELETED ---