9:36 a.m.
Author: belegdol
Update of /cvs/free/rpms/bsnes/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5067
Modified Files:
.cvsignore bsnes.spec sources
Added Files:
bsnes-0.064-newppcelf.patch bsnes-0.064-noppcelfppc64.patch
Removed Files:
bsnes-0.054-noppcelfppc64.patch libco.ppc-elf-2.diff
Log Message:
* Sat Apr 17 2010 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.064-1
- Updated to 0.064
- Rediffed the patches
- Dropped pixelshaders subpackage since upstream did not ship it
bsnes-0.064-newppcelf.patch:
ppc-elf.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
--- NEW FILE bsnes-0.064-newppcelf.patch ---
diff -up bsnes-0.064/src/libco/ppc-elf.c.newppcelf bsnes-0.064/src/libco/ppc-elf.c
--- bsnes-0.064/src/libco/ppc-elf.c.newppcelf 2010-04-12 06:29:18.000000000 +0200
+++ bsnes-0.064/src/libco/ppc-elf.c 2010-04-17 14:33:09.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.064-noppcelfppc64.patch:
libco.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE bsnes-0.064-noppcelfppc64.patch ---
diff -up bsnes-0.064/src/libco/libco.c.noppcelfppc64 bsnes-0.064/src/libco/libco.c
--- bsnes-0.064/src/libco/libco.c.noppcelfppc64 2010-04-12 06:29:18.000000000 +0200
+++ bsnes-0.064/src/libco/libco.c 2010-04-17 14:37:11.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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore 28 Mar 2010 17:54:55 -0000 1.23
+++ .cvsignore 25 Apr 2010 09:36:09 -0000 1.24
@@ -1 +1 @@
-bsnes_v063.tar.bz2
+bsnes_v064.tar.bz2
Index: bsnes.spec
===================================================================
RCS file: /cvs/free/rpms/bsnes/F-12/bsnes.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- bsnes.spec 28 Mar 2010 17:54:55 -0000 1.29
+++ bsnes.spec 25 Apr 2010 09:36:09 -0000 1.30
@@ -1,6 +1,6 @@
%bcond_with snesreader
-%global vernumber 063
+%global vernumber 064
Name: bsnes
Version: 0.%{vernumber}
@@ -14,8 +14,8 @@
#http://byuu.org/download.php?file=%{name}_v%{vernumber}.tar.bz2
Source0: %{name}_v%{vernumber}.tar.bz2
Source2: README.bsnes
-Patch1: libco.ppc-elf-2.diff
-Patch2: bsnes-0.054-noppcelfppc64.patch
+Patch1: bsnes-0.064-newppcelf.patch
+Patch2: bsnes-0.064-noppcelfppc64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#bsnes does not use system snes_ntsc because the modified video processing
@@ -29,6 +29,8 @@
BuildRequires: SDL-devel
BuildRequires: qt-devel
+Obsoletes: %{name}-pixelshaders < 0.064
+
%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,
@@ -37,14 +39,6 @@
includes speed and game-specific hacks for compatibility. As a result, the
minimum system requirements for bsnes are quite high.
-%package pixelshaders
-Summary: Pixel shaders for %{name}
-Group: Applications/Emulators
-Requires: %{name} = %{version}-%{release}
-
-%description pixelshaders
-This subpackage contains pixel shader effects for bsnes.
-
%package snesfilter
Summary: Visual filters for %{name}
Group: Applications/Emulators
@@ -75,19 +69,12 @@
%prep
%setup -qc
-pushd src/lib/libco
%patch1 -p1 -b .newppcelf
-popd
%patch2 -p1 -b .noppcelfppc64
#fix permissions
find . -type f -not -name \*.sh -exec chmod 644 {} \;
-#fix end-of-line encoding
-sed -i 's/\r//' pixelshaders/HLSL/sepia.fx
-sed -i 's/\r//' pixelshaders/Pixellate/fragment
-sed -i 's/\r//' pixelshaders/Pixellate/vertex
-
#use system optflags
for sourcedir in snesfilter snesreader src supergameboy
do
@@ -149,16 +136,6 @@
install -pm 755 lib$sourcedir.so $RPM_BUILD_ROOT%{_libdir}/lib$sourcedir.so
popd
done
-install -Dpm 644 pixelshaders/HDRTV/vertex
$RPM_BUILD_ROOT%{_datadir}/%{name}/pixelshaders/HDRTV/vertex
-install -Dpm 644 pixelshaders/HDRTV/fragment
$RPM_BUILD_ROOT%{_datadir}/%{name}/pixelshaders/HDRTV/fragment
-install -Dpm 644 pixelshaders/HLSL/sepia.fx
$RPM_BUILD_ROOT%{_datadir}/%{name}/pixelshaders/HLSL/sepia.fx
-install -Dpm 644 pixelshaders/Curvature/fragment
$RPM_BUILD_ROOT%{_datadir}/%{name}/pixelshaders/Curvature/fragment
-install -Dpm 644 pixelshaders/Scale2x/vertex
$RPM_BUILD_ROOT%{_datadir}/%{name}/pixelshaders/Scale2x/vertex
-install -Dpm 644 pixelshaders/Scale2x/fragment
$RPM_BUILD_ROOT%{_datadir}/%{name}/pixelshaders/Scale2x/fragment
-install -Dpm 644 pixelshaders/Pixellate/vertex
$RPM_BUILD_ROOT%{_datadir}/%{name}/pixelshaders/Pixellate/vertex
-install -Dpm 644 pixelshaders/Pixellate/fragment
$RPM_BUILD_ROOT%{_datadir}/%{name}/pixelshaders/Pixellate/fragment
-install -Dpm 644 pixelshaders/HQ2x/vertex
$RPM_BUILD_ROOT%{_datadir}/%{name}/pixelshaders/HQ2x/vertex
-install -Dpm 644 pixelshaders/HQ2x/fragment
$RPM_BUILD_ROOT%{_datadir}/%{name}/pixelshaders/HQ2x/fragment
%clean
@@ -192,10 +169,6 @@
%{_datadir}/pixmaps/bsnes.png
%{_datadir}/applications/rpmfusion-bsnes.desktop
-%files pixelshaders
-%defattr(-,root,root,-)
-%{_datadir}/%{name}
-
%files snesfilter
%defattr(-,root,root,-)
%{_libdir}/libsnesfilter.so
@@ -212,6 +185,11 @@
%changelog
+* Sat Apr 17 2010 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.064-1
+- Updated to 0.064
+- Rediffed the patches
+- Dropped pixelshaders subpackage since upstream did not ship it
+
* Sun Mar 28 2010 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.063-1
- Updated to 0.063
- Dropped upstreamed dso patch
Index: sources
===================================================================
RCS file: /cvs/free/rpms/bsnes/F-12/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 28 Mar 2010 17:54:55 -0000 1.23
+++ sources 25 Apr 2010 09:36:09 -0000 1.24
@@ -1 +1 @@
-f84892d7e44451c2807308c3135936cf bsnes_v063.tar.bz2
+4830e56e7805a869ddd405bc0d7badfb bsnes_v064.tar.bz2
--- bsnes-0.054-noppcelfppc64.patch DELETED ---
--- libco.ppc-elf-2.diff DELETED ---