rpms/rpmfusion-free-release/devel rpmfusion-free-release.spec, 1.17, 1.18
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/rpmfusion-free-release/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25885
Modified Files:
rpmfusion-free-release.spec
Log Message:
* Mon Apr 26 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 14-0.2
- fix compatibility symlink
Index: rpmfusion-free-release.spec
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-release/devel/rpmfusion-free-release.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rpmfusion-free-release.spec 24 Apr 2010 18:07:41 -0000 1.17
+++ rpmfusion-free-release.spec 26 Apr 2010 15:12:15 -0000 1.18
@@ -3,7 +3,7 @@
Name: rpmfusion-%{repo}-release
Version: 14
-Release: 0.1
+Release: 0.2
Summary: RPM Fusion (%{repo}) Repository Configuration
Group: System Environment/Base
@@ -66,7 +66,7 @@
$RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg
# compatibility symlink for easy transition to F11
-ln -s $(basename %{SOURCE12}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora
+ln -s $(basename %{SOURCE13}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora
# Links for the keys
for i in i386 x86_64 ppc ppc64; do
@@ -91,6 +91,9 @@
%config(noreplace) %{_sysconfdir}/yum.repos.d/*
%changelog
+* Mon Apr 26 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 14-0.2
+- fix compatibility symlink
+
* Sat Apr 24 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 14-0.1
- rebuild for rawhide
14 years
rpms/rpmfusion-free-release/F-13 rpmfusion-free-release.spec, 1.17, 1.18
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/rpmfusion-free-release/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25446
Modified Files:
rpmfusion-free-release.spec
Log Message:
* Mon Apr 26 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 13-2
- fix compatibility symlink
14 years
rpms/kffmpegthumbnailer/devel kffmpegthumbnailer.spec,1.1,1.2
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/kffmpegthumbnailer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15451
Modified Files:
kffmpegthumbnailer.spec
Log Message:
* Mon Apr 26 2010 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.1.0-3
- add requires qt-devel
Index: kffmpegthumbnailer.spec
===================================================================
RCS file: /cvs/free/rpms/kffmpegthumbnailer/devel/kffmpegthumbnailer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kffmpegthumbnailer.spec 20 Apr 2010 13:41:14 -0000 1.1
+++ kffmpegthumbnailer.spec 26 Apr 2010 12:43:34 -0000 1.2
@@ -1,6 +1,6 @@
Name: kffmpegthumbnailer
Version: 1.1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A video thumbnailer for kde based on ffmpegthumbnailer
Group: Applications/Multimedia
@@ -9,7 +9,7 @@
Source0: http://ffmpegthumbnailer.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ffmpegthumbnailer-devel
+BuildRequires: ffmpegthumbnailer-devel, qt-devel
Requires: kdebase-workspace
@@ -49,6 +49,9 @@
%{_kde4_libdir}/kde4/kffmpegthumbnailer.so
%changelog
+* Mon Apr 26 2010 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.1.0-3
+- add requires qt-devel
+
* Mon Apr 12 2010 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.1.0-2
- requires kdebase-workspace
- remove INSTALL from doc
14 years
rpms/mplayer/devel mplayer-llrintf.patch, NONE, 1.1 mplayer-x264.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 mplayer-nodvdcss.patch, 1.6, 1.7 mplayer.spec, 1.28, 1.29 sources, 1.17, 1.18 mplayer-qcelp.patch, 1.2, NONE
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14934
Modified Files:
.cvsignore mplayer-nodvdcss.patch mplayer.spec sources
Added Files:
mplayer-llrintf.patch mplayer-x264.patch
Removed Files:
mplayer-qcelp.patch
Log Message:
* Sat Apr 24 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.115.20100424svn
- 20100424 snapshot
- patch to build against older x264
mplayer-llrintf.patch:
configure | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE mplayer-llrintf.patch ---
--- mplayer.orig/configure
+++ mplayer/configure
@@ -3041,7 +3041,7 @@
fi
echores "$_posix4"
-for func in exp2 exp2f llrint log2 log2f lrint lrintf round roundf truncf; do
+for func in exp2 exp2f llrint llrintf log2 log2f lrint lrintf round roundf truncf; do
echocheck $func
cat > $TMPC << EOF
#include <math.h>
@@ -9167,6 +9167,7 @@
$def_hardcoded_tables
$def_libavcodec_mpegaudio_hp
$def_llrint
+$def_llrintf
$def_local_aligned_8
$def_local_aligned_16
$def_log2
mplayer-x264.patch:
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE mplayer-x264.patch ---
diff -up mplayer-export-2010-04-24/configure.x264 mplayer-export-2010-04-24/configure
--- mplayer-export-2010-04-24/configure.x264 2010-04-24 19:00:26.000000000 +0200
+++ mplayer-export-2010-04-24/configure 2010-04-24 19:00:26.000000000 +0200
@@ -7482,7 +7482,7 @@ if test "$_x264" = auto ; then
cat > $TMPC << EOF
#include <inttypes.h>
#include <x264.h>
-#if X264_BUILD < 89
+#if X264_BUILD < 83
#error We do not support old versions of x264. Get the latest from git.
#endif
int main(void) { x264_encoder_open((void*)0); return 0; }
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 28 Mar 2010 00:08:38 -0000 1.16
+++ .cvsignore 25 Apr 2010 19:27:43 -0000 1.17
@@ -1,2 +1,2 @@
Blue-1.7.tar.bz2
-mplayer-export-2010-03-27.tar.bz2
+mplayer-export-2010-04-24.tar.bz2
mplayer-nodvdcss.patch:
Makefile | 7 -------
configure | 2 +-
2 files changed, 1 insertion(+), 8 deletions(-)
Index: mplayer-nodvdcss.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer-nodvdcss.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mplayer-nodvdcss.patch 30 Oct 2009 01:10:22 -0000 1.6
+++ mplayer-nodvdcss.patch 25 Apr 2010 19:27:43 -0000 1.7
@@ -1,7 +1,7 @@
-diff -up mplayer-export-2009-10-29/configure.nodvdcss mplayer-export-2009-10-29/configure
---- mplayer-export-2009-10-29/configure.nodvdcss 2009-10-28 14:55:18.000000000 +0100
-+++ mplayer-export-2009-10-29/configure 2009-10-30 00:36:25.000000000 +0100
-@@ -639,7 +639,7 @@ _dvdnavconfig=dvdnav-config
+diff -up mplayer-export-2010-03-27/configure.nodvdcss mplayer-export-2010-03-27/configure
+--- mplayer-export-2010-03-27/configure.nodvdcss 2010-03-25 20:53:05.000000000 +0100
++++ mplayer-export-2010-03-27/configure 2010-03-27 22:54:31.000000000 +0100
+@@ -648,7 +648,7 @@ _dvdnavconfig=dvdnav-config
_dvdreadconfig=dvdread-config
_dvdread=auto
_dvdread_internal=auto
@@ -10,10 +10,10 @@
_xanim=auto
_real=auto
_live=auto
-diff -up mplayer-export-2009-10-29/Makefile.nodvdcss mplayer-export-2009-10-29/Makefile
---- mplayer-export-2009-10-29/Makefile.nodvdcss 2009-10-19 11:56:18.000000000 +0200
-+++ mplayer-export-2009-10-29/Makefile 2009-10-30 00:37:10.000000000 +0100
-@@ -150,11 +150,6 @@ SRCS_COMMON-$(LIBDCA) +=
+diff -up mplayer-export-2010-03-27/Makefile.nodvdcss mplayer-export-2010-03-27/Makefile
+--- mplayer-export-2010-03-27/Makefile.nodvdcss 2010-03-27 22:54:31.000000000 +0100
++++ mplayer-export-2010-03-27/Makefile 2010-03-27 22:55:40.000000000 +0100
+@@ -158,11 +158,6 @@ SRCS_COMMON-$(LIBDCA) +=
SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \
libmpcodecs/vd_libdv.c \
libmpdemux/demux_rawdv.c
@@ -25,17 +25,17 @@
SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c
-@@ -752,7 +747,6 @@ DIRS = . \
- libavutil/ppc \
+@@ -778,7 +773,6 @@ DIRS = . \
libavutil/sh4 \
+ libavutil/tomi \
libavutil/x86 \
- libdvdcss \
libdvdnav \
libdvdnav/vm \
libdvdread4 \
-@@ -871,7 +865,6 @@ codec-cfg.d codec-cfg.o: codecs.conf.h
+@@ -907,7 +901,6 @@ codec-cfg.d codec-cfg.o: codecs.conf.h
$(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): help_mp.h
- $(call ADDSUFFIXES,.d .o,mpcommon vobsub stream/stream_cddb stream/network libmpdemux/muxer_avi gui/win32/gui): version.h
+ $(call ADDSUFFIXES,.d .o,mpcommon vobsub stream/stream_cddb stream/network libmpdemux/muxer_avi gui/win32/gui osdep/mplayer.rc): version.h
-libdvdcss/%: CFLAGS := -Ilibdvdcss -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) $(CFLAGS)
libdvdnav/%: CFLAGS := -Ilibdvdnav -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" $(CFLAGS)
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- mplayer.spec 28 Mar 2010 00:08:38 -0000 1.28
+++ mplayer.spec 25 Apr 2010 19:27:43 -0000 1.29
@@ -1,12 +1,12 @@
%define codecdir %{_libdir}/codecs
-%define pre 20100327svn
+%define pre 20100424svn
%define svn 1
-%define svnbuild 2010-03-27
+%define svnbuild 2010-04-24
%define faad2min 1:2.6.1
Name: mplayer
Version: 1.0
-Release: 0.114.%{pre}%{?dist}
+Release: 0.115.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
Group: Applications/Multimedia
@@ -28,6 +28,8 @@
Patch8: %{name}-manlinks.patch
Patch14: %{name}-nodvdcss.patch
Patch15: %{name}-libgif.patch
+Patch16: %{name}-x264.patch
+Patch17: %{name}-llrintf.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
@@ -221,6 +223,8 @@
%patch8 -p1 -b .manlinks
%patch14 -p1 -b .nodvdcss
%patch15 -p1 -b .libgif
+%patch16 -p1 -b .x264
+%patch17 -p1 -b .llrintf
doconv() {
iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \
@@ -235,7 +239,7 @@
%build
pushd GUI
-%{mp_configure}--enable-gui
+%{mp_configure}--enable-gui --disable-mencoder
%{__make} %{?_smp_mflags}
popd
@@ -254,7 +258,7 @@
%install
rm -rf $RPM_BUILD_ROOT doc
-make install DESTDIR=$RPM_BUILD_ROOT STRIPBINARIES=no
+make install DESTDIR=$RPM_BUILD_ROOT INSTALLSTRIP=
for file in aconvert.sh divx2svcd.sh mencvcd.sh midentify.sh mpconsole.sh qepdvcd.sh subsearch.sh ; do
install -pm 755 TOOLS/$file $RPM_BUILD_ROOT%{_bindir}/`basename $file .sh`
done
@@ -393,6 +397,10 @@
%{_datadir}/mplayer/*.fp
%changelog
+* Sat Apr 24 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.115.20100424svn
+- 20100424 snapshot
+- patch to build against older x264
+
* Sat Mar 27 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.114.20100327svn
- 20100327 snapshot
- drop unused patch
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 28 Mar 2010 00:08:38 -0000 1.17
+++ sources 25 Apr 2010 19:27:43 -0000 1.18
@@ -1,2 +1,2 @@
e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2
-2046c98215915a4cc5cf47335a3e23e9 mplayer-export-2010-03-27.tar.bz2
+db1f4d70e2c1dc400e543269a525208b mplayer-export-2010-04-24.tar.bz2
--- mplayer-qcelp.patch DELETED ---
14 years
rpms/lame/F-11 lame.spec,1.4,1.5
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/lame/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9331
Modified Files:
lame.spec
Log Message:
* Sun Apr 25 2010 Dominik Mierzejewski <rpm at greysector.net> - 3.98.3-1.1
- bump and rebuild to try and fix ppc64 builder problem
Index: lame.spec
===================================================================
RCS file: /cvs/free/rpms/lame/F-11/lame.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lame.spec 27 Mar 2010 18:30:01 -0000 1.4
+++ lame.spec 25 Apr 2010 18:07:33 -0000 1.5
@@ -1,6 +1,6 @@
Name: lame
Version: 3.98.3
-Release: 1%{?dist}
+Release: 1%{?dist}.1
Summary: Free MP3 audio compressor
Group: Applications/Multimedia
@@ -122,6 +122,9 @@
%{_bindir}/mp3x
%changelog
+* Sun Apr 25 2010 Dominik Mierzejewski <rpm at greysector.net> - 3.98.3-1.1
+- bump and rebuild to try and fix ppc64 builder problem
+
* Sat Feb 27 2010 Dominik Mierzejewski <rpm at greysector.net> - 3.98.3-1
- update to 3.98.3
14 years
rpms/xtables-addons/F-13 xtables-addons.spec,1.1,1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/xtables-addons/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27913
Modified Files:
xtables-addons.spec
Log Message:
* Sun Apr 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.24-2
- rebuilt
Index: xtables-addons.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons/F-13/xtables-addons.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xtables-addons.spec 13 Apr 2010 01:08:19 -0000 1.1
+++ xtables-addons.spec 25 Apr 2010 14:51:04 -0000 1.2
@@ -1,7 +1,7 @@
Name: xtables-addons
Summary: Extensions targets and matches for iptables
Version: 1.24
-Release: 1%{?dist}
+Release: 2%{?dist}
# The entire source code is GPLv2 except ACCOUNT/libxt_ACCOUNT_cl.c which is LGPLv2
License: GPLv2 and LGPLv2
Group: System Environment/Base
@@ -105,5 +105,8 @@
%{_includedir}/*
%changelog
+* Sun Apr 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.24-2
+- rebuilt
+
* Thu Mar 18 2010 Chen Lei <supercyper(a)163.com> - 1.24-1
- initial rpm build
14 years
rpms/staging-kmod/F-13 staging-kmod.spec,1.16,1.17
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27131
Modified Files:
staging-kmod.spec
Log Message:
* Sun Apr 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-2
- enable echo
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-13/staging-kmod.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- staging-kmod.spec 25 Apr 2010 07:18:04 -0000 1.16
+++ staging-kmod.spec 25 Apr 2010 14:41:39 -0000 1.17
@@ -6,7 +6,7 @@
%define buildforkernels newest
# which drivers to built
-%global stgdrvs ASUS_OLED BATMAN_ADV EPL ET131X FB_UDL HECI HYPERV LINE6_USB RT2860 RT2870 RT3070 RT3090 RAMZSWAP R8187SE RTL8192SU RTL8192E RTL8192U SAMSUNG_LAPTOP SLICOSS W35UND PRISM2_USB VIDEO_GO7007 VT6655 VT6656
+%global stgdrvs ASUS_OLED BATMAN_ADV ECHO EPL ET131X FB_UDL HECI HYPERV LINE6_USB RT2860 RT2870 RT3070 RT3090 RAMZSWAP R8187SE RTL8192SU RTL8192E RTL8192U SAMSUNG_LAPTOP SLICOSS W35UND PRISM2_USB VIDEO_GO7007 VT6655 VT6656
# todo: VIDEO_CX25821
# makes handling for rc kernels a whole lot easier:
@@ -14,7 +14,7 @@
Name: staging-kmod
Version: 2.6.33.2
-Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.1
+Release: %{?prever:0.}2%{?prever:.%{prever}}%{?dist}
Summary: Selected kernel modules from linux-staging
Group: System Environment/Kernel
@@ -111,6 +111,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Apr 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-2
+- enable echo
+
* Sun Apr 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-1.1
- rebuild for new kernel
14 years
rpms/staging-kmod-addons/F-13 staging-kmod-addons.spec,1.4,1.5
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod-addons/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26994
Modified Files:
staging-kmod-addons.spec
Log Message:
* Sun Apr 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-2
- enable echo
Index: staging-kmod-addons.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/F-13/staging-kmod-addons.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- staging-kmod-addons.spec 16 Apr 2010 19:45:12 -0000 1.4
+++ staging-kmod-addons.spec 25 Apr 2010 14:40:11 -0000 1.5
@@ -1,12 +1,12 @@
# drivers that we ship; to be synced with staging-kmod.spec
-%global stgdrvs ASUS_OLED BATMAN_ADV EPL ET131X FB_UDL HECI HYPERV LINE6_USB RT2860 RT2870 RT3070 RT3090 RAMZSWAP R8187SE RTL8192SU RTL8192E RTL8192U SAMSUNG_LAPTOP SLICOSS W35UND PRISM2_USB VIDEO_GO7007 VT6655 VT6656
+%global stgdrvs ASUS_OLED BATMAN_ADV ECHO EPL ET131X FB_UDL HECI HYPERV LINE6_USB RT2860 RT2870 RT3070 RT3090 RAMZSWAP R8187SE RTL8192SU RTL8192E RTL8192U SAMSUNG_LAPTOP SLICOSS W35UND PRISM2_USB VIDEO_GO7007 VT6655 VT6656
# makes handling for rc kernels a whole lot easier:
#global prever rc8
Name: staging-kmod-addons
Version: 2.6.33.2
-Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}
+Release: %{?prever:0.}2%{?prever:.%{prever}}%{?dist}
Summary: Documentation and shared parts for the kmod-staging packages
Group: System Environment/Kernel
@@ -58,6 +58,9 @@
%changelog
+* Sun Apr 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-2
+- enable echo
+
* Fri Apr 16 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-1
- update to 2.6.33.2 for F13
14 years
rpms/bsnes/F-11 bsnes.spec,1.29,1.30
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/bsnes/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8099
Modified Files:
bsnes.spec
Log Message:
Applied the F-11 fix to the correct Makefile
Index: bsnes.spec
===================================================================
RCS file: /cvs/free/rpms/bsnes/F-11/bsnes.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- bsnes.spec 25 Apr 2010 09:36:21 -0000 1.29
+++ bsnes.spec 25 Apr 2010 10:09:40 -0000 1.30
@@ -96,7 +96,7 @@
#pulseaudio on fedora 11 is too old
%if 0%{?fedora} < 12
-sed -i "s(a)audio.pulseaudio @@" src/Makefile
+sed -i "s(a)audio.pulseaudio @@" src/ui_qt/Makefile
%endif
@@ -189,6 +189,7 @@
- Updated to 0.064
- Rediffed the patches
- Dropped pixelshaders subpackage since upstream did not ship it
+- Applied the F-11 fix to the correct Makefile
* Sun Mar 28 2010 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.063-1
- Updated to 0.063
14 years
rpms/bsnes/F-11 bsnes-0.064-newppcelf.patch, NONE, 1.1 bsnes-0.064-noppcelfppc64.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 bsnes.spec, 1.28, 1.29 sources, 1.23, 1.24 bsnes-0.054-noppcelfppc64.patch, 1.1, NONE libco.ppc-elf-2.diff, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/bsnes/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5181
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-11/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore 28 Mar 2010 17:55:10 -0000 1.23
+++ .cvsignore 25 Apr 2010 09:36:21 -0000 1.24
@@ -1 +1 @@
-bsnes_v063.tar.bz2
+bsnes_v064.tar.bz2
Index: bsnes.spec
===================================================================
RCS file: /cvs/free/rpms/bsnes/F-11/bsnes.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- bsnes.spec 28 Mar 2010 17:55:10 -0000 1.28
+++ bsnes.spec 25 Apr 2010 09:36:21 -0000 1.29
@@ -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-11/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 28 Mar 2010 17:55:10 -0000 1.23
+++ sources 25 Apr 2010 09:36:21 -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 ---
14 years