Author: belegdol Update of /cvs/free/rpms/bsnes/F-12 In directory se02.es.rpmfusion.net:/tmp/cvs-serv20376 Modified Files: .cvsignore bsnes.spec sources Added Files: bsnes-0.068-newppcelf.patch bsnes-0.068-noppcelfppc64.patch Removed Files: bsnes-0.064-newppcelf.patch bsnes-0.064-noppcelfppc64.patch Log Message: * Mon Aug 23 2010 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.068-1 - Updated to 0.068 - Updated both ppc elf patches - Adapted to new source structure bsnes-0.068-newppcelf.patch: ppc-elf.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) --- NEW FILE bsnes-0.068-newppcelf.patch --- diff -up bsnes-0.068/bsnes/libco/ppc-elf.c.newppcelf bsnes-0.068/bsnes/libco/ppc-elf.c --- bsnes-0.068/bsnes/libco/ppc-elf.c.newppcelf 2010-08-21 18:59:27.000000000 +0200 +++ bsnes-0.068/bsnes/libco/ppc-elf.c 2010-08-24 10:45:19.000000000 +0200 @@ -66,9 +66,15 @@ typedef void * cothread_t; /* * co_active_context is either in a global offset table (if we are * compiling -fPIC or -fPIE) or has an absolute position. + * + * __attribute__((__used__)) is necessary because newer versions of + * gcc might replace co_active_context with an inline constant. This + * optimization would cause a linker error. This is because gcc cannot + * detect that our __asm__ uses co_active_context. */ static void *co_main_stack_pointer; -static cothread_t co_active_context = &co_main_stack_pointer; +static cothread_t co_active_context __attribute__((__used__)) = + &co_main_stack_pointer; extern cothread_t co_active() { return co_active_context; bsnes-0.068-noppcelfppc64.patch: libco.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE bsnes-0.068-noppcelfppc64.patch --- diff -up bsnes-0.068/bsnes/libco/libco.c.noppcelfppc64 bsnes-0.068/bsnes/libco/libco.c --- bsnes-0.068/bsnes/libco/libco.c.noppcelfppc64 2010-08-21 18:59:27.000000000 +0200 +++ bsnes-0.068/bsnes/libco/libco.c 2010-08-24 10:45:19.000000000 +0200 @@ -8,7 +8,7 @@ #include "x86.c" #elif defined(__GNUC__) && defined(__amd64__) #include "amd64.c" -#elif defined(__GNUC__) && defined(__powerpc__) && defined(__ELF__) +#elif defined(__GNUC__) && defined(__PPC32__) && defined(__ELF__) #include "ppc-elf.c" #elif defined(__GNUC__) #include "sjlj.c" Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/bsnes/F-12/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 1 Aug 2010 19:32:29 -0000 1.26 +++ .cvsignore 24 Aug 2010 09:38:02 -0000 1.27 @@ -1 +1 @@ -bsnes_v067.tar.bz2 +bsnes_v068.tar.bz2 Index: bsnes.spec =================================================================== RCS file: /cvs/free/rpms/bsnes/F-12/bsnes.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- bsnes.spec 1 Aug 2010 19:32:29 -0000 1.33 +++ bsnes.spec 24 Aug 2010 09:38:02 -0000 1.34 @@ -1,4 +1,4 @@ -%global vernumber 067 +%global vernumber 068 Name: bsnes Version: 0.%{vernumber} @@ -10,8 +10,8 @@ URL: http://byuu.org/bsnes/ Source0: http://bsnes.googlecode.com/files/%{name}_v%{vernumber}.tar.bz2 Source2: README.bsnes -Patch1: bsnes-0.064-newppcelf.patch -Patch2: bsnes-0.064-noppcelfppc64.patch +Patch1: bsnes-0.068-newppcelf.patch +Patch2: bsnes-0.068-noppcelfppc64.patch Patch3: bsnes-0.064-systemlibs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -72,7 +72,7 @@ find . -type f -not -name \*.sh -exec chmod 644 {} \; #use system optflags -for sourcedir in snesfilter snesreader src supergameboy +for sourcedir in snesfilter snesreader bsnes supergameboy do pushd $sourcedir sed -i "s#-O3#$RPM_OPT_FLAGS#" Makefile @@ -80,7 +80,7 @@ done #don't strip the binaries prematurely -for sourcedir in snesfilter snesreader src supergameboy +for sourcedir in snesfilter snesreader bsnes supergameboy do pushd $sourcedir sed -i "s/link += -s/link +=/" Makefile @@ -92,7 +92,7 @@ #pulseaudio on fedora 11 is too old %if 0%{?fedora} < 12 -sed -i &quot;s(a)audio.pulseaudio @@" src/ui_qt/Makefile +sed -i &quot;s(a)audio.pulseaudio @@" bsnes/ui_qt/Makefile %endif @@ -104,13 +104,13 @@ popd done -pushd src +pushd bsnes make %{?_smp_mflags} platform=x compiler=gcc moc=moc-qt4 %install rm -rf $RPM_BUILD_ROOT -pushd src +pushd bsnes make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} desktop-file-install --vendor=rpmfusion \ --delete-original --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -152,8 +152,8 @@ %files %defattr(-,root,root,-) -%doc README.Fedora src/data/*.html -%{_bindir}/bsnes +%doc README.Fedora bsnes/qt/data/*.html +%{_bindir}/bsnes-compatibility %{_datadir}/pixmaps/bsnes.png %{_datadir}/applications/rpmfusion-bsnes.desktop @@ -171,6 +171,11 @@ %changelog +* Mon Aug 23 2010 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.068-1 +- Updated to 0.068 +- Updated both ppc elf patches +- Adapted to new source structure + * Sun Aug 01 2010 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.067-1 - Updated to 0.067 Index: sources =================================================================== RCS file: /cvs/free/rpms/bsnes/F-12/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 1 Aug 2010 19:32:29 -0000 1.26 +++ sources 24 Aug 2010 09:38:02 -0000 1.27 @@ -1 +1 @@ -c0cc823fe0b15a892af9e6d864214e29 bsnes_v067.tar.bz2 +9ff2f6dc64f54f0da538cefade64b3a7 bsnes_v068.tar.bz2 --- bsnes-0.064-newppcelf.patch DELETED --- --- bsnes-0.064-noppcelfppc64.patch DELETED ---