Author: belegdol Update of /cvs/free/rpms/bsnes/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20610 Modified Files: .cvsignore README.bsnes bsnes.spec sources Added Files: bsnes-source-cleanup startscript Removed Files: bsnes-0.086-gcc47.patch bsnes-0.086-systemwide.patch Log Message: * Sat Aug 25 2012 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.091-1 - Updated to 0.091 - Switched to Debian approach for system-wide installation - Updated %description - Dropped README.Fedora - Overhauled the package dropping the debugger and accuracy profile --- NEW FILE bsnes-source-cleanup --- #!/bin/bash VERSION=$1 tar -xJvf bsnes_v$VERSION-source.tar.xz rm bsnes_v$VERSION-source/bsnes/profile/Super\ Game\ Boy.sfc/boot.rom rm bsnes_v$VERSION-source/bsnes/profile/Game\ Boy\ Color.sys/boot.rom rm bsnes_v$VERSION-source/bsnes/profile/Game\ Boy.sys/boot.rom rm bsnes_v$VERSION-source/bsnes/profile/Super\ Famicom.sys/spc700.rom tar -cJvf bsnes_v$VERSION-source-noroms.tar.xz bsnes_v$VERSION-source --- NEW FILE startscript --- #!/bin/bash if test ! -d $HOME/.config/bsnes then mkdir -p $HOME/.config/bsnes fi if test ! -f $HOME/.config/bsnes/cheats.xml then cp /usr/share/bsnes/cheats.xml $HOME/.config/bsnes fi if test ! -d $HOME/.config/bsnes/shaders then mkdir -p $HOME/.config/bsnes/shaders fi for shader in $(ls /usr/share/bsnes/shaders/*.OpenGL.shader) do if test ! -f $HOME/.config/bsnes/shaders/${shader##*/} then ln -s $shader $HOME/.config/bsnes/shaders fi done find /usr/share/bsnes -type d -regex ".*\.s[fy][cs]" | while read sdir do if test ! -d "$HOME/.config/bsnes/${sdir##*/}" then mkdir "$HOME/.config/bsnes/${sdir##*/}" fi for sfile in $(ls "$sdir") do if test ! -f "$HOME/.config/bsnes/${sdir##*/}/${sfile##*/}" then ln -s "$sdir/$sfile" "$HOME/.config/bsnes/${sdir##*/}" fi done done /usr/libexec/bsnes "$@" Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/bsnes/devel/.cvsignore,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- .cvsignore 16 Feb 2012 19:21:16 -0000 1.35 +++ .cvsignore 25 Aug 2012 10:57:36 -0000 1.36 @@ -1 +1 @@ -bsnes_v086-source.tar.bz2 +bsnes_v091-source-noroms.tar.xz Index: README.bsnes =================================================================== RCS file: /cvs/free/rpms/bsnes/devel/README.bsnes,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- README.bsnes 22 Jun 2011 20:01:55 -0000 1.4 +++ README.bsnes 25 Aug 2012 10:57:36 -0000 1.5 @@ -1,12 +1,8 @@ RPM Fusion bsnes package ============================================================================== -RPM Fusion bsnes package is patched to install cheat.xml, filters and shaders -in system-wide location. If you run into issues using these, please don't -complain to upstream, but use RPM Fusion bugzilla first. - -Moreover, due to [1] newer versions of bsnes are more strict when it comes to -file formats accepted. The snespurify-qt utility can be used to convert the -images. They have to be uncompressed. - -[1] http://byuu.org/bsnes/legacy-formats +bsnes requires firmware/BIOS images to function properly. They need to +be placed in ~/.config/bsnes, in the existing subfolders. The manifest.xml +files contain the info on the correct website. +Some of these files can be downloaded from bsnes website (they are included in +the bsnes archive), some need to be obtained by other means. Index: bsnes.spec =================================================================== RCS file: /cvs/free/rpms/bsnes/devel/bsnes.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- bsnes.spec 2 Mar 2012 22:07:34 -0000 1.49 +++ bsnes.spec 25 Aug 2012 10:57:37 -0000 1.50 @@ -1,16 +1,17 @@ -%global vernumber 086 +%global vernumber 091 Name: bsnes Version: 0.%{vernumber} -Release: 2%{?dist}.1 +Release: 1%{?dist} Summary: SNES emulator focused on accuracy License: GPLv3 -URL: http://byuu.org/bsnes/ -Source0: http://bsnes.googlecode.com/files/%{name}_v%{vernumber}-source.tar.bz2 -Source2: README.bsnes -Patch0: bsnes-0.086-gcc47.patch -Patch1: bsnes-0.086-systemwide.patch +URL: http://byuu.org/%{name}/ +#bsnes needs copyrighted firmware to work. use the bsnes-source-cleanup script to clean the tarball +Source0: http://%{name}.googlecode.com/files/%{name}_v%{vernumber}-source-noroms.tar.xz +Source1: startscript +Source2: bsnes-source-cleanup +Source3: README.bsnes #bsnes does not use system snes_ntsc because the modified video processing #filter algorithm calls back into bsnes specific c++ colortable code, that @@ -29,106 +30,92 @@ Obsoletes: %{name}-supergameboy < 0.079 %description -bsnes is an emulator that began development on 2004-10-14. The purpose of the -emulator is a bit different from other emulators: it focuses on accuracy, -debugging functionality, and clean code. -The emulator does not focus on things that would hinder accuracy. This -includes speed and game-specific hacks for compatibility. As a result, the -minimum system requirements for bsnes are quite high. +bsnes is a multi-system emulator that began development on 2004-10-14. It +currently supports the following systems: +* Nintendo +* Super Nintendo +* Game Boy +* Game Boy Color +* Game Boy Advance +* Nintendo DS + +bsnes also supports the following subsystems: +* Super Game Boy +* BS-X Satellaview +* Sufami Turbo + +bsnes focuses on accuracy and clean code above all else. It never uses speed or +compatibilty hacks. As a result, the minimum system requirements are greater +than with other emulators. %prep %setup -qn %{name}_v%{vernumber}-source -%patch0 -p1 -b .gcc47 -%patch1 -p1 -b .systemwide #fix permissions find . -type f -not -name \*.sh -exec chmod 644 {} \; #use system optflags -sed -i "s/-O3/$RPM_OPT_FLAGS/" bsnes/Makefile -sed -i "s/-O3/$RPM_OPT_FLAGS -fPIC/" snesfilter/Makefile -sed -i "s/-O3/$RPM_OPT_FLAGS/" snespurify/cc-gtk.sh +sed -i "s/-O3/$RPM_OPT_FLAGS/" %{name}/Makefile +sed -i "s/-O3/$RPM_OPT_FLAGS/" purify/Makefile #don't strip the binaries prematurely -sed -i "s/link += -s/link +=/" bsnes/Makefile -sed -i "s/link := -s/link :=/" snesfilter/Makefile -sed -i "s/-s //" snespurify/cc-gtk.sh - -#use the proper compiler and moc commands -sed -i "s/g++-4.5/g++/" snespurify/cc-gtk.sh +sed -i "s/link += -s/link +=/" %{name}/Makefile +sed -i "s/link := -s/link := -lX11/" purify/Makefile #install fedora-specific readme install -pm 644 %{SOURCE2} README.Fedora -#use proper system-wide path for filters -sed -i 's@/usr/lib@%{_libdir}@' bsnes/ui/general/main-window.cpp - %build -#prepare for building compatibity and accuracy profile, as well as the debugger -cp -pR bsnes bsnes-accuracy -cp -pR bsnes laevateinn - -pushd bsnes +pushd %{name} 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 +pushd purify make %{?_smp_mflags} compiler=gcc popd -pushd snespurify -./cc-gtk.sh -popd %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 -install -pm 755 snesfilter/out/*.filter $RPM_BUILD_ROOT%{_libdir}/%{name}/filters -install -pm 755 snespurify/snespurify-gtk $RPM_BUILD_ROOT%{_bindir} +install -Dpm 755 %{name}/out/%{name} $RPM_BUILD_ROOT%{_libexecdir}/%{name} +install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name} +install -d $RPM_BUILD_ROOT%{_datadir}/applications +desktop-file-install --vendor=rpmfusion --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + %{name}/data/%{name}.desktop +install -Dpm 644 %{name}/data/%{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png +install -Dpm 644 %{name}/data/cheats.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/cheats.xml +install -Dpm 755 purify/purify $RPM_BUILD_ROOT%{_bindir} install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/shaders -install -pm 644 snesshader/*.shader $RPM_BUILD_ROOT%{_datadir}/%{name}/shaders +install -pm 644 shaders/*.shader $RPM_BUILD_ROOT%{_datadir}/%{name}/shaders + +#install firmwares +pushd %{name}/profile +find -type f | while read sfile +do + install -Dpm 644 "$sfile" "$RPM_BUILD_ROOT%{_datadir}/%{name}/$sfile" +done +popd %files %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 +%{_bindir}/%{name} +%{_bindir}/purify +%{_libexecdir}/%{name} +%{_datadir}/%{name} +%{_datadir}/pixmaps/%{name}.png +%{_datadir}/applications/rpmfusion-%{name}.desktop %changelog +* Sat Aug 25 2012 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.091-1 +- Updated to 0.091 +- Switched to Debian approach for system-wide installation +- Updated %%description +- Dropped README.Fedora +- Overhauled the package dropping the debugger and accuracy profile + * Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.086-2.1 - Rebuilt for c++ ABI breakage Index: sources =================================================================== RCS file: /cvs/free/rpms/bsnes/devel/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 16 Feb 2012 19:21:16 -0000 1.35 +++ sources 25 Aug 2012 10:57:37 -0000 1.36 @@ -1 +1 @@ -54f73b38d24405186b538e01713b0c1f bsnes_v086-source.tar.bz2 +2617c51d49c95e49f8ec6651639f5dbc bsnes_v091-source-noroms.tar.xz --- bsnes-0.086-gcc47.patch DELETED --- --- bsnes-0.086-systemwide.patch DELETED ---