rpms/audacious-plugins-freeworld/devel audacious-plugins-freeworld.spec, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/audacious-plugins-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17365
Modified Files:
audacious-plugins-freeworld.spec
Log Message:
* Sun Oct 19 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.4.5-2
- obsolete nonfree -plugins from livna
- add metapackage that requires all the plugins and obsoletes the
-extras package from freshrpms
Index: audacious-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/devel/audacious-plugins-freeworld.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audacious-plugins-freeworld.spec 10 Aug 2008 10:54:05 -0000 1.1
+++ audacious-plugins-freeworld.spec 19 Oct 2008 11:41:32 -0000 1.2
@@ -1,9 +1,9 @@
%define aud_ver 1.4.0
-Name: audacious-plugins-nonfree
+Name: audacious-plugins-freeworld
Version: 1.4.5
-Release: 1%{?dist}
-Summary: Nonfree plugins for the Audacious media player
+Release: 2%{?dist}
+Summary: Additional plugins for the Audacious media player
Group: Applications/Multimedia
License: GPLv2
@@ -23,6 +23,18 @@
BuildRequires: gettext, libbinio-devel
BuildRequires: dbus-devel >= 0.60, dbus-glib-devel >= 0.60
+# require all the plugins
+Requires: %{name}-mp3 = %{version}-%{release}
+Requires: %{name}-aac = %{version}-%{release}
+Requires: %{name}-wma = %{version}-%{release}
+Requires: %{name}-alac = %{version}-%{release}
+Requires: %{name}-tta = %{version}-%{release}
+Requires: %{name}-mms = %{version}-%{release}
+
+# obsolete old freshrpms package
+Provides: audacious-plugins-extras = %{version}-%{release}
+Obsoletes: audacious-plugins-extras < %{version}-%{release}
+
%description
Audacious is a media player that currently uses a skinned
user interface based on Winamp 2.x skins. It is based on ("forked off")
@@ -39,6 +51,10 @@
Provides: bmp-mp3 = 0.9.7.1
Obsoletes: bmp-mp3 <= 0.9.7.1
+# obsolete old livna package
+Provides: audacious-plugins-nonfree-mp3 = %{version}-%{release}
+Obsoletes: audacious-plugins-nonfree-mp3 < %{version}-%{release}
+
%description mp3
Audacious is a media player that currently uses a skinned
user interface based on Winamp 2.x skins. It is based on ("forked off")
@@ -55,6 +71,10 @@
Requires(post): desktop-file-utils >= 0.9
Requires(postun): desktop-file-utils >= 0.9
+# obsolete old livna package
+Provides: audacious-plugins-nonfree-aac = %{version}-%{release}
+Obsoletes: audacious-plugins-nonfree-aac < %{version}-%{release}
+
%description aac
Audacious is a media player that currently uses a skinned
user interface based on Winamp 2.x skins. It is based on ("forked off")
@@ -71,6 +91,10 @@
Requires(post): desktop-file-utils >= 0.9
Requires(postun): desktop-file-utils >= 0.9
+# obsolete old livna package
+Provides: audacious-plugins-nonfree-wma = %{version}-%{release}
+Obsoletes: audacious-plugins-nonfree-wma < %{version}-%{release}
+
%description wma
Audacious is a media player that currently uses a skinned
user interface based on Winamp 2.x skins. It is based on ("forked off")
@@ -87,6 +111,10 @@
Requires(post): desktop-file-utils >= 0.9
Requires(postun): desktop-file-utils >= 0.9
+# obsolete old livna package
+Provides: audacious-plugins-nonfree-alac = %{version}-%{release}
+Obsoletes: audacious-plugins-nonfree-alac < %{version}-%{release}
+
%description alac
Audacious is a media player that currently uses a skinned
user interface based on Winamp 2.x skins. It is based on ("forked off")
@@ -100,6 +128,10 @@
Group: Applications/Multimedia
Requires: audacious-plugins >= %{aud_ver}
+# obsolete old livna package
+Provides: audacious-plugins-nonfree-tta = %{version}-%{release}
+Obsoletes: audacious-plugins-nonfree-tta < %{version}-%{release}
+
%description tta
Audacious is a media player that currently uses a skinned
user interface based on Winamp 2.x skins. It is based on ("forked off")
@@ -112,6 +144,10 @@
Group: Applications/Multimedia
Requires: audacious-plugins >= %{aud_ver}
+# obsolete old livna package
+Provides: audacious-plugins-nonfree-mms = %{version}-%{release}
+Obsoletes: audacious-plugins-nonfree-mms < %{version}-%{release}
+
%description mms
Audacious is a media player that currently uses a skinned
user interface based on Winamp 2.x skins. It is based on ("forked off")
@@ -215,6 +251,10 @@
update-desktop-database %{_datadir}/applications
+%files
+%defattr(-,root,root,-)
+%doc COPYING
+
%files mp3
%defattr(-,root,root,-)
%{_libdir}/audacious/Input/madplug.so
@@ -244,6 +284,11 @@
%{_libdir}/audacious/Transport/mms.so
%changelog
+* Sun Oct 19 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.4.5-2
+- obsolete nonfree -plugins from livna
+- add metapackage that requires all the plugins and obsoletes the
+ -extras package from freshrpms
+
* Tue Feb 12 2008 Ralf Ertzinger <ralf(a)skytale.net> 1.4.5-1
- Update to 1.4.5
15 years, 7 months
rpms/em8300-kmod/devel em8300-kmod.spec,1.6,1.7
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/em8300-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17029
Modified Files:
em8300-kmod.spec
Log Message:
ppc still broken, disable it again
Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- em8300-kmod.spec 19 Oct 2008 11:21:28 -0000 1.6
+++ em8300-kmod.spec 19 Oct 2008 11:38:22 -0000 1.7
@@ -21,7 +21,9 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
-ExclusiveArch: i586 i686 x86_64 ppc ppc64
+ExclusiveArch: i586 i686 x86_64 ppc64
+# ppc disabled by knurd on 20081019 as it is known to fail:
+# https://bugzilla.redhat.com/show_bug.cgi?id=465486
# get the needed BuildRequires (in parts depending on what we build for)
BuildRequires: %{_bindir}/kmodtool
@@ -68,7 +70,7 @@
%changelog
* Sun Oct 19 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.17.2-0.1.rc1.1
- rebuild for latest rawhide kernel
-- enable ppc and ppc64 again
+- enable ppc64 again
* Wed Oct 15 2008 Felix Kaechele <felix at fetzig dot org> - 0.17.2-0.1.rc1
- update to new upstream prerelease due to kernel incompatibilities
15 years, 7 months
rpms/em8300-kmod/devel em8300-kmod.spec,1.5,1.6
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/em8300-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14753
Modified Files:
em8300-kmod.spec
Log Message:
* Sun Oct 19 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.17.2-0.1.rc1.1
- rebuild for latest rawhide kernel
- enable ppc and ppc64 again
Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- em8300-kmod.spec 15 Oct 2008 19:10:13 -0000 1.5
+++ em8300-kmod.spec 19 Oct 2008 11:21:28 -0000 1.6
@@ -10,7 +10,7 @@
Name: em8300-kmod
Summary: Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
Version: 0.17.2
-Release: 0%{?prever:.1.%{prever}}%{?dist}
+Release: 0%{?prever:.1.%{prever}}%{?dist}.1
Group: System Environment/Kernel
License: GPLv2+
@@ -21,9 +21,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
-ExclusiveArch: i586 i686 x86_64
-# ppc and ppc64 disabled by knurd on 20081003 as it is known to fail on 2.6.26:
-# https://bugzilla.redhat.com/show_bug.cgi?id=465486
+ExclusiveArch: i586 i686 x86_64 ppc ppc64
# get the needed BuildRequires (in parts depending on what we build for)
BuildRequires: %{_bindir}/kmodtool
@@ -68,6 +66,10 @@
%changelog
+* Sun Oct 19 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.17.2-0.1.rc1.1
+- rebuild for latest rawhide kernel
+- enable ppc and ppc64 again
+
* Wed Oct 15 2008 Felix Kaechele <felix at fetzig dot org> - 0.17.2-0.1.rc1
- update to new upstream prerelease due to kernel incompatibilities
15 years, 7 months
rpms/vobcopy/F-9 vobcopy-1.0.1-Makefile.patch, NONE, 1.1 vobcopy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/vobcopy/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12798
Modified Files:
.cvsignore sources
Added Files:
vobcopy-1.0.1-Makefile.patch vobcopy.spec
Log Message:
sync with devel (after importing from freshrpms there)
vobcopy-1.0.1-Makefile.patch:
--- NEW FILE vobcopy-1.0.1-Makefile.patch ---
diff -Naupr vobcopy-1.0.1.orig/Makefile vobcopy-1.0.1/Makefile
--- vobcopy-1.0.1.orig/Makefile 2006-11-13 22:55:51.000000000 +0100
+++ vobcopy-1.0.1/Makefile 2006-11-27 11:12:57.000000000 +0100
@@ -7,11 +7,10 @@ CC = gcc
#BINDIR = ${PREFIX}/bin
#MANDIR = ${PREFIX}/man
PREFIX += /usr/local
-BINDIR = ${PREFIX}/bin
-MANDIR = ${PREFIX}/man
+BINDIR ?= ${PREFIX}/bin
+MANDIR ?= ${PREFIX}/man
LFS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-CFLAGS += -I/usr//include
-LDFLAGS += -ldvdread -L/usr//lib
+LDFLAGS += -ldvdread
#This specifies the conversion from .c to .o
.c.o:
--- NEW FILE vobcopy.spec ---
Summary: Utility to copy DVD .vob files to disk
Name: vobcopy
Version: 1.1.2
Release: 2%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://vobcopy.org/projects/c/c.shtml
Source: http://vobcopy.org/download/vobcopy-%{version}.tar.bz2
Patch0: vobcopy-1.0.1-Makefile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: libdvdread-devel
%description
Vobcopy copies DVD .vob files to disk, decrypting them on the way (thanks to
libdvdread and libdvdcss) and merges them into file(s) with the name extracted
from the DVD. There is one drawback though: at the moment vobcopy doesn't deal
with multi-angle-dvd's. But since these are rather sparse this shouldn't
matter much.
%prep
%setup -q
%patch0 -p1 -b .Makefile
%build
%{__make} \
CFLAGS="%{optflags}" \
BINDIR="%{_bindir}" \
MANDIR="%{_mandir}"
%install
%{__rm} -rf %{buildroot}
%{__make} install \
BINDIR="%{buildroot}%{_bindir}" \
MANDIR="%{buildroot}%{_mandir}"
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc Changelog README Release-Notes TODO
%doc alternative_programs.txt
%{_bindir}/vobcopy
%{_mandir}/man1/vobcopy.1*
%lang(de) %{_mandir}/de/man1/vobcopy.1*
%changelog
* Sun Oct 19 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.1.2-1
- Update to 1.1.2
- drop vobcopy-1.1.1-gcc43.patch
* Sat Oct 18 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.1.1-2
- rebuild for RPM Fusion
* Tue May 13 2008 Matthias Saou <http://freshrpms.net/> 1.1.1-1
- Update to 1.1.1.
- Include gcc 4.3 patch.
* Mon Jan 14 2008 Matthias Saou <http://freshrpms.net/> 1.1.0-1
- Update to 1.1.0.
* Sun Jun 24 2007 Dag Wieers <dag(a)wieers.com> - 1.0.2-1
- Updated to release 1.0.2.
* Mon Nov 27 2006 Matthias Saou <http://freshrpms.net/> 1.0.1-1
- Update to 1.0.1.
- Remove no longer needed gcc change in the Makefile patch.
* Tue Apr 18 2006 Matthias Saou <http://freshrpms.net/> 1.0.0-1
- Update to 1.0.0.
- Add s/gcc-3.4/gcc/ to the Makefile patch.
* Mon Mar 27 2006 Matthias Saou <http://freshrpms.net/> 0.5.16-1
- Major spec file cleanup.
* Fri Jan 6 2006 Robos <robos(a)muon.de>
- 0.5.16: -see changelog
* Fri Jul 29 2005 Robos <robos(a)muon.de>
- 0.5.15: -option to skip already present files with -m.
copying of dvd's with files ending in ";?" should work now.
* Sun Oct 24 2004 Robos <robos(a)muon.de>
- 0.5.14-rc1: - misc *bsd fixes and first straight OSX support
* Mon Mar 7 2004 Robos <robos(a)muon.de>
- 0.5.12-1: -m off-by-one error fixed
* Mon Jan 19 2004 Robos <robos(a)muon.de>
- 0.5.10-1: -O now works
cleanup
* Wed Nov 13 2003 Robos <robos(a)muon.de>
- 0.5.9-1: -F now accepts factor number
cleanups and small bugfix
new vobcopy.spec
* Sun Nov 09 2003 Florin Andrei <florin(a)andrei.myip.org>
- 0.5.8-2: libdvdread is now a pre-requisite
* Sun Nov 09 2003 Florin Andrei <florin(a)andrei.myip.org>
- first package, 0.5.8-1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vobcopy/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 18 Oct 2008 13:45:14 -0000 1.1
+++ .cvsignore 19 Oct 2008 10:56:55 -0000 1.2
@@ -0,0 +1 @@
+vobcopy-1.1.2.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vobcopy/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 18 Oct 2008 13:45:14 -0000 1.1
+++ sources 19 Oct 2008 10:56:55 -0000 1.2
@@ -0,0 +1 @@
+7f4bc2ba19d567339e4d854636aafa24 vobcopy-1.1.2.tar.bz2
15 years, 7 months
rpms/vobcopy/F-8 vobcopy-1.0.1-Makefile.patch, NONE, 1.1 vobcopy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/vobcopy/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12674
Modified Files:
.cvsignore sources
Added Files:
vobcopy-1.0.1-Makefile.patch vobcopy.spec
Log Message:
sync with devel (after importing from freshrpms there)
vobcopy-1.0.1-Makefile.patch:
--- NEW FILE vobcopy-1.0.1-Makefile.patch ---
diff -Naupr vobcopy-1.0.1.orig/Makefile vobcopy-1.0.1/Makefile
--- vobcopy-1.0.1.orig/Makefile 2006-11-13 22:55:51.000000000 +0100
+++ vobcopy-1.0.1/Makefile 2006-11-27 11:12:57.000000000 +0100
@@ -7,11 +7,10 @@ CC = gcc
#BINDIR = ${PREFIX}/bin
#MANDIR = ${PREFIX}/man
PREFIX += /usr/local
-BINDIR = ${PREFIX}/bin
-MANDIR = ${PREFIX}/man
+BINDIR ?= ${PREFIX}/bin
+MANDIR ?= ${PREFIX}/man
LFS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-CFLAGS += -I/usr//include
-LDFLAGS += -ldvdread -L/usr//lib
+LDFLAGS += -ldvdread
#This specifies the conversion from .c to .o
.c.o:
--- NEW FILE vobcopy.spec ---
Summary: Utility to copy DVD .vob files to disk
Name: vobcopy
Version: 1.1.2
Release: 2%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://vobcopy.org/projects/c/c.shtml
Source: http://vobcopy.org/download/vobcopy-%{version}.tar.bz2
Patch0: vobcopy-1.0.1-Makefile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: libdvdread-devel
%description
Vobcopy copies DVD .vob files to disk, decrypting them on the way (thanks to
libdvdread and libdvdcss) and merges them into file(s) with the name extracted
from the DVD. There is one drawback though: at the moment vobcopy doesn't deal
with multi-angle-dvd's. But since these are rather sparse this shouldn't
matter much.
%prep
%setup -q
%patch0 -p1 -b .Makefile
%build
%{__make} \
CFLAGS="%{optflags}" \
BINDIR="%{_bindir}" \
MANDIR="%{_mandir}"
%install
%{__rm} -rf %{buildroot}
%{__make} install \
BINDIR="%{buildroot}%{_bindir}" \
MANDIR="%{buildroot}%{_mandir}"
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc Changelog README Release-Notes TODO
%doc alternative_programs.txt
%{_bindir}/vobcopy
%{_mandir}/man1/vobcopy.1*
%lang(de) %{_mandir}/de/man1/vobcopy.1*
%changelog
* Sun Oct 19 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.1.2-1
- Update to 1.1.2
- drop vobcopy-1.1.1-gcc43.patch
* Sat Oct 18 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.1.1-2
- rebuild for RPM Fusion
* Tue May 13 2008 Matthias Saou <http://freshrpms.net/> 1.1.1-1
- Update to 1.1.1.
- Include gcc 4.3 patch.
* Mon Jan 14 2008 Matthias Saou <http://freshrpms.net/> 1.1.0-1
- Update to 1.1.0.
* Sun Jun 24 2007 Dag Wieers <dag(a)wieers.com> - 1.0.2-1
- Updated to release 1.0.2.
* Mon Nov 27 2006 Matthias Saou <http://freshrpms.net/> 1.0.1-1
- Update to 1.0.1.
- Remove no longer needed gcc change in the Makefile patch.
* Tue Apr 18 2006 Matthias Saou <http://freshrpms.net/> 1.0.0-1
- Update to 1.0.0.
- Add s/gcc-3.4/gcc/ to the Makefile patch.
* Mon Mar 27 2006 Matthias Saou <http://freshrpms.net/> 0.5.16-1
- Major spec file cleanup.
* Fri Jan 6 2006 Robos <robos(a)muon.de>
- 0.5.16: -see changelog
* Fri Jul 29 2005 Robos <robos(a)muon.de>
- 0.5.15: -option to skip already present files with -m.
copying of dvd's with files ending in ";?" should work now.
* Sun Oct 24 2004 Robos <robos(a)muon.de>
- 0.5.14-rc1: - misc *bsd fixes and first straight OSX support
* Mon Mar 7 2004 Robos <robos(a)muon.de>
- 0.5.12-1: -m off-by-one error fixed
* Mon Jan 19 2004 Robos <robos(a)muon.de>
- 0.5.10-1: -O now works
cleanup
* Wed Nov 13 2003 Robos <robos(a)muon.de>
- 0.5.9-1: -F now accepts factor number
cleanups and small bugfix
new vobcopy.spec
* Sun Nov 09 2003 Florin Andrei <florin(a)andrei.myip.org>
- 0.5.8-2: libdvdread is now a pre-requisite
* Sun Nov 09 2003 Florin Andrei <florin(a)andrei.myip.org>
- first package, 0.5.8-1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vobcopy/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 18 Oct 2008 13:45:14 -0000 1.1
+++ .cvsignore 19 Oct 2008 10:56:37 -0000 1.2
@@ -0,0 +1 @@
+vobcopy-1.1.2.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vobcopy/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 18 Oct 2008 13:45:14 -0000 1.1
+++ sources 19 Oct 2008 10:56:37 -0000 1.2
@@ -0,0 +1 @@
+7f4bc2ba19d567339e4d854636aafa24 vobcopy-1.1.2.tar.bz2
15 years, 7 months
rpms/buildsys-build-rpmfusion/devel update-to-latest-kernels.sh, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/buildsys-build-rpmfusion/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12621
Added Files:
update-to-latest-kernels.sh
Log Message:
add update helper script
--- NEW FILE update-to-latest-kernels.sh ---
#! /bin/bash
print_kernellist()
{
echo ${1}
echo ${1}smp
echo ${1}PAE
}
if [[ ! "${1}" ]] ; then
echo "Please call with verrel of latest standard kernel version" >&2
exit 1
fi
if [[ ! "${RPM_PACKAGER}" ]] ; then
echo "Please set RPM_PACKAGER for rpmdev-bumpspec" >&2
exit 1
fi
# update spec file
rpmdev-bumpspec -c "- rebuild for kernel ${1}" *.spec
# update buildsys-build-rpmfusion-kerneldevpkgs-current
print_kernellist ${1} > buildsys-build-rpmfusion-kerneldevpkgs-current
cvs diff -u
read
make clog; cvs commit -F clog
rm clog
make tag build
15 years, 7 months
rpms/buildsys-build-rpmfusion/devel buildsys-build-rpmfusion-kerneldevpkgs-current, 1.2, 1.3 buildsys-build-rpmfusion.spec, 1.5, 1.6
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/buildsys-build-rpmfusion/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12167
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Sun Oct 19 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 10:10-0.4
- rebuild for kernel 2.6.27.3-27.rc1.fc10
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/devel/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- buildsys-build-rpmfusion-kerneldevpkgs-current 2 Oct 2008 21:11:16 -0000 1.2
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 19 Oct 2008 10:51:59 -0000 1.3
@@ -1,3 +1,3 @@
-2.6.27-0.352.rc7.git1.fc10
-2.6.27-0.352.rc7.git1.fc10smp
-2.6.27-0.352.rc7.git1.fc10PAE
+2.6.27.3-27.rc1.fc10
+2.6.27.3-27.rc1.fc10smp
+2.6.27.3-27.rc1.fc10PAE
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/devel/buildsys-build-rpmfusion.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- buildsys-build-rpmfusion.spec 2 Oct 2008 21:18:08 -0000 1.5
+++ buildsys-build-rpmfusion.spec 19 Oct 2008 10:51:59 -0000 1.6
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 10
-Release: 0.3
+Release: 0.4
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -100,6 +100,9 @@
%changelog
+* Sun Oct 19 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 10:10-0.4
+- rebuild for kernel 2.6.27.3-27.rc1.fc10
+
* Thu Oct 02 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 10:10-0.3
- install filterfile for ppc64
15 years, 7 months
rpms/vobcopy/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 vobcopy.spec, 1.1, 1.2 vobcopy-1.1.1-gcc43.patch, 1.1, NONE
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/vobcopy/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10282
Modified Files:
.cvsignore sources vobcopy.spec
Removed Files:
vobcopy-1.1.1-gcc43.patch
Log Message:
* Sun Oct 19 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.1.2-1
- Update to 1.1.2
- drop vobcopy-1.1.1-gcc43.patch
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vobcopy/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 18 Oct 2008 14:06:10 -0000 1.2
+++ .cvsignore 19 Oct 2008 10:20:15 -0000 1.3
@@ -1 +1 @@
-vobcopy-1.1.1.tar.bz2
+vobcopy-1.1.2.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vobcopy/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 18 Oct 2008 14:06:10 -0000 1.2
+++ sources 19 Oct 2008 10:20:15 -0000 1.3
@@ -1 +1 @@
-f3331ff362c8f271731944b1a9dea108 vobcopy-1.1.1.tar.bz2
+7f4bc2ba19d567339e4d854636aafa24 vobcopy-1.1.2.tar.bz2
Index: vobcopy.spec
===================================================================
RCS file: /cvs/free/rpms/vobcopy/devel/vobcopy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vobcopy.spec 18 Oct 2008 14:06:10 -0000 1.1
+++ vobcopy.spec 19 Oct 2008 10:20:15 -0000 1.2
@@ -1,13 +1,12 @@
Summary: Utility to copy DVD .vob files to disk
Name: vobcopy
-Version: 1.1.1
+Version: 1.1.2
Release: 2%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://vobcopy.org/projects/c/c.shtml
Source: http://vobcopy.org/download/vobcopy-%{version}.tar.bz2
Patch0: vobcopy-1.0.1-Makefile.patch
-Patch1: vobcopy-1.1.1-gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: libdvdread-devel
@@ -22,7 +21,6 @@
%prep
%setup -q
%patch0 -p1 -b .Makefile
-%patch1 -p1 -b .gcc43
%build
@@ -45,7 +43,7 @@
%files
%defattr(-,root,root,-)
-%doc Changelog FAQ README THANKS TODO
+%doc Changelog README Release-Notes TODO
%doc alternative_programs.txt
%{_bindir}/vobcopy
%{_mandir}/man1/vobcopy.1*
@@ -53,6 +51,10 @@
%changelog
+* Sun Oct 19 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.1.2-1
+- Update to 1.1.2
+- drop vobcopy-1.1.1-gcc43.patch
+
* Sat Oct 18 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.1.1-2
- rebuild for RPM Fusion
--- vobcopy-1.1.1-gcc43.patch DELETED ---
15 years, 7 months
rpms/SheepShaver/F-8 SheepShaver-2.2-nostrip.patch, NONE, 1.1 SheepShaver-2.3-gcc43.patch, NONE, 1.1 SheepShaver.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/SheepShaver/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9823
Modified Files:
.cvsignore sources
Added Files:
SheepShaver-2.2-nostrip.patch SheepShaver-2.3-gcc43.patch
SheepShaver.spec
Log Message:
sync with devel (after importing from freshrpms there)
SheepShaver-2.2-nostrip.patch:
--- NEW FILE SheepShaver-2.2-nostrip.patch ---
diff -up SheepShaver-2.3/src/Unix/Makefile.in.nostrip SheepShaver-2.3/src/Unix/Makefile.in
--- SheepShaver-2.3/src/Unix/Makefile.in.nostrip 2006-05-08 19:19:45.000000000 +0200
+++ SheepShaver-2.3/src/Unix/Makefile.in 2008-10-18 21:37:07.000000000 +0200
@@ -35,7 +35,7 @@ BLESS = @BLESS@
EXEEXT = @EXEEXT@
KEYCODES = @KEYCODES@
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
SLIRP_CFLAGS = @SLIRP_CFLAGS@
SheepShaver-2.3-gcc43.patch:
--- NEW FILE SheepShaver-2.3-gcc43.patch ---
diff -up SheepShaver-2.3/src/Unix/sys_unix.cpp~ SheepShaver-2.3/src/Unix/sys_unix.cpp
--- SheepShaver-2.3/src/Unix/sys_unix.cpp~ 2008-10-18 21:38:50.000000000 +0200
+++ SheepShaver-2.3/src/Unix/sys_unix.cpp 2008-10-18 21:38:50.000000000 +0200
@@ -23,6 +23,7 @@
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <errno.h>
+#include <limits.h>
#ifdef HAVE_AVAILABILITYMACROS_H
#include <AvailabilityMacros.h>
diff -up SheepShaver-2.3/src/Unix/sigsegv.cpp~ SheepShaver-2.3/src/Unix/sigsegv.cpp
--- SheepShaver-2.3/src/Unix/sigsegv.cpp~ 2008-10-18 23:10:53.000000000 +0200
+++ SheepShaver-2.3/src/Unix/sigsegv.cpp 2008-10-18 23:10:53.000000000 +0200
@@ -2293,7 +2293,8 @@ int main(void)
#define TEST_SKIP_INSTRUCTION(TYPE) do { \
const unsigned long TAG = 0x12345678 | \
(sizeof(long) == 8 ? 0x9abcdef0UL << 31 : 0); \
- TYPE data = *((TYPE *)(page + sizeof(TYPE))); \
+ volatile TYPE data = 0; \
+ data = *((TYPE *)(page + sizeof(TYPE))); \
volatile unsigned long effect = data + TAG; \
if (effect != TAG) \
return 9; \
diff -up SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-cpu.cpp~ SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-cpu.cpp
--- SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-cpu.cpp~ 2008-10-18 21:57:15.000000000 +0200
+++ SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-cpu.cpp 2008-10-18 21:57:15.000000000 +0200
@@ -256,7 +256,7 @@ void powerpc_cpu::initialize()
// Initialize block lookup table
#if PPC_DECODE_CACHE || PPC_ENABLE_JIT
- block_cache.initialize();
+ blockcache.initialize();
#endif
// Init cache range invalidate recorder
@@ -540,7 +540,7 @@ void *powerpc_cpu::compile_chain_block(b
const uint32 bpc = sbi->pc;
const uint32 tpc = sbi->li[n].jmp_pc;
- block_info *tbi = block_cache.find(tpc);
+ block_info *tbi = blockcache.find(tpc);
if (tbi == NULL)
tbi = compile_block(tpc);
assert(tbi && tbi->pc == tpc);
@@ -562,7 +562,7 @@ void powerpc_cpu::execute(uint32 entry)
if (execute_depth == 1 || (PPC_ENABLE_JIT && PPC_REENTRANT_JIT)) {
#if PPC_ENABLE_JIT
if (use_jit) {
- block_info *bi = block_cache.find(pc());
+ block_info *bi = blockcache.find(pc());
if (bi == NULL)
bi = compile_block(pc());
for (;;) {
@@ -585,7 +585,7 @@ void powerpc_cpu::execute(uint32 entry)
// Don't check for backward branches here as this
// is now done by generated code. Besides, we will
// get here if the fast cache lookup failed too.
- if ((bi = block_cache.find(pc())) == NULL)
+ if ((bi = blockcache.find(pc())) == NULL)
break;
}
@@ -596,7 +596,7 @@ void powerpc_cpu::execute(uint32 entry)
}
#endif
#if PPC_DECODE_CACHE
- block_info *bi = block_cache.find(pc());
+ block_info *bi = blockcache.find(pc());
if (bi != NULL)
goto pdi_execute;
for (;;) {
@@ -606,7 +606,7 @@ void powerpc_cpu::execute(uint32 entry)
clock_t start_time;
start_time = clock();
#endif
- bi = block_cache.new_blockinfo();
+ bi = blockcache.new_blockinfo();
bi->init(pc());
// Predecode a new block
@@ -656,8 +656,8 @@ void powerpc_cpu::execute(uint32 entry)
bi->min_pc = dpc;
bi->max_pc = entry;
bi->size = di - bi->di;
- block_cache.add_to_cl_list(bi);
- block_cache.add_to_active_list(bi);
+ blockcache.add_to_cl_list(bi);
+ blockcache.add_to_active_list(bi);
decode_cache_p += bi->size;
#if PPC_PROFILE_COMPILE_TIME
compile_time += (clock() - start_time);
@@ -691,7 +691,7 @@ void powerpc_cpu::execute(uint32 entry)
}
}
- if ((bi->pc != pc()) && ((bi = block_cache.find(pc())) == NULL))
+ if ((bi->pc != pc()) && ((bi = blockcache.find(pc())) == NULL))
break;
}
}
@@ -767,8 +767,8 @@ void powerpc_cpu::invalidate_cache()
{
D(bug("Invalidate all cache blocks\n"));
#if PPC_DECODE_CACHE || PPC_ENABLE_JIT
- block_cache.clear();
- block_cache.initialize();
+ blockcache.clear();
+ blockcache.initialize();
spcflags().set(SPCFLAG_JIT_EXEC_RETURN);
#endif
#if PPC_ENABLE_JIT
@@ -811,6 +811,6 @@ void powerpc_cpu::invalidate_cache_range
}
#endif
spcflags().set(SPCFLAG_JIT_EXEC_RETURN);
- block_cache.clear_range(start, end);
+ blockcache.clear_range(start, end);
#endif
}
diff -up SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-cpu.hpp~ SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-cpu.hpp
--- SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-cpu.hpp~ 2008-10-18 21:57:24.000000000 +0200
+++ SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-cpu.hpp 2008-10-18 21:57:24.000000000 +0200
@@ -360,7 +360,7 @@ private:
// Block lookup table
typedef powerpc_block_info block_info;
- block_cache< block_info, lazy_allocator > block_cache;
+ block_cache< block_info, lazy_allocator > blockcache;
#if PPC_DECODE_CACHE
// Decode Cache
diff -up SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-dyngen-ops.cpp~ SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-dyngen-ops.cpp
--- SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-dyngen-ops.cpp~ 2008-10-18 21:58:04.000000000 +0200
+++ SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-dyngen-ops.cpp 2008-10-18 21:59:27.000000000 +0200
@@ -96,7 +96,7 @@ struct powerpc_dyngen_helper {
static uint64 & fp_result_dw() { return CPU->fp_result_dw(); }
static inline void set_cr(int crfd, int v) { CPU->cr().set(crfd, v); }
- static inline powerpc_block_info *find_block(uint32 pc) { return CPU->block_cache.fast_find(pc); }
+ static inline powerpc_block_info *find_block(uint32 pc) { return CPU->blockcache.fast_find(pc); }
};
// Semantic action templates
@@ -1268,13 +1268,13 @@ static inline void do_lmw(void)
}
template<>
-static inline void do_lmw<31>(void)
+inline void do_lmw<31>(void)
{
CPU->gpr(31) = vm_read_memory_4(T0);
}
template<>
-static inline void do_lmw<32>(void)
+inline void do_lmw<32>(void)
{
for (uint32 r = PARAM1, ad = T0; r <= 31; r++, ad += 4)
CPU->gpr(r) = vm_read_memory_4(ad);
@@ -1290,13 +1290,13 @@ static inline void do_stmw(void)
}
template<>
-static inline void do_stmw<31>(void)
+inline void do_stmw<31>(void)
{
vm_write_memory_4(T0, CPU->gpr(31));
}
template<>
-static inline void do_stmw<32>(void)
+inline void do_stmw<32>(void)
{
for (uint32 r = PARAM1, ad = T0; r <= 31; r++, ad += 4)
vm_write_memory_4(ad, CPU->gpr(r));
diff -up SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-translate.cpp~ SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-translate.cpp
--- SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-translate.cpp~ 2008-10-18 22:00:22.000000000 +0200
+++ SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-translate.cpp 2008-10-18 22:00:22.000000000 +0200
@@ -143,7 +143,7 @@ powerpc_cpu::compile_block(uint32 entry_
codegen_context_t cg_context(dg);
cg_context.entry_point = entry_point;
again:
- block_info *bi = block_cache.new_blockinfo();
+ block_info *bi = blockcache.new_blockinfo();
bi->init(entry_point);
bi->entry_point = dg.gen_start();
@@ -1570,11 +1570,11 @@ powerpc_cpu::compile_block(uint32 entry_
#endif
dg.gen_end();
- block_cache.add_to_cl_list(bi);
+ blockcache.add_to_cl_list(bi);
if (is_read_only_memory(bi->pc))
- block_cache.add_to_dormant_list(bi);
+ blockcache.add_to_dormant_list(bi);
else
- block_cache.add_to_active_list(bi);
+ blockcache.add_to_active_list(bi);
#if PPC_PROFILE_COMPILE_TIME
compile_time += (clock() - start_time);
#endif
--- NEW FILE SheepShaver.spec ---
%define date 20060514
%define mon_version 3.2
%define desktop_vendor rpmforge
Summary: Power Macintosh emulator
Name: SheepShaver
Version: 2.3
Release: 0.6.%{date}%{?dist}
License: GPLv2+
Group: Applications/Emulators
URL: http://www.gibix.net/projects/sheepshaver/
Source0: http://www.gibix.net/projects/sheepshaver/files/SheepShaver-%{version}-0....
Source1: http://cxmon.cebix.net/downloads/cxmon-%{mon_version}.tar.gz
Source2: SheepShaver.png
Patch0: SheepShaver-2.2-nostrip.patch
Patch1: SheepShaver-2.3-gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: gcc-c++, gtk2-devel, esound-devel >= 0.2.8
BuildRequires: desktop-file-utils, readline-devel
%{?_with_sdl:BuildRequires: SDL-devel}
BuildRequires: libXt-devel, libXxf86dga-devel, libXxf86vm-devel
# Other archs need an instruction skipper on well-known invalid
# memory references (e.g. illegal writes to ROM).
ExclusiveArch: i386 ppc x86_64
%description
SheepShaver is a MacOS run-time environment that allows you to run classic
MacOS applications. This means that both Linux and MacOS applications can
run at the same time (usually in a window on the Linux desktop).
If you are using a PowerPC-based system, applications will run at native
speed (i.e. with no emulation involved). There is also a built-in PowerPC
G4 emulator, without MMU support, for non-PowerPC systems.
Available rebuild options :
--without : mon
--with : sdl
%prep
%setup -q -a 1
%patch0 -p1 -b .nostrip
%patch1 -p1 -b .gcc43
%build
pushd src/Unix
%configure \
--datadir=%{_sysconfdir} --enable-ppc-emulator=yes \
%{!?_without_mon: --with-mon=../../cxmon-%{mon_version}/src} \
%{?_with_sdl: --enable-sdl-video --enable-sdl-audio}
%{__mkdir} obj
%{__make} %{?_smp_mflags}
popd
%install
%{__rm} -rf %{buildroot}
%makeinstall -C src/Unix \
datadir="%{buildroot}%{_sysconfdir}"
chmod +x %{buildroot}%{_sysconfdir}/%{name}/tunconfig
# Create the system menu entry
%{__cat} > %{name}.desktop << EOF
[Desktop Entry]
Name=Sheep Shaver
Comment=Power Macintosh Emulator
Exec=SheepShaver
Icon=SheepShaver.png
Terminal=false
Type=Application
Categories=Game;Emulator;
EOF
%{__mkdir_p} %{buildroot}%{_datadir}/applications
desktop-file-install --vendor %{desktop_vendor} \
--dir %{buildroot}%{_datadir}/applications \
%{name}.desktop
%{__install} -D -p -m 0644 %{SOURCE2} \
%{buildroot}%{_datadir}/pixmaps/SheepShaver.png
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-, root, root, 0755)
%doc COPYING NEWS doc/Linux/*
%dir %{_sysconfdir}/SheepShaver/
%config(noreplace) %{_sysconfdir}/SheepShaver/keycodes
%{_sysconfdir}/SheepShaver/tunconfig
%{_bindir}/SheepShaver
%{_datadir}/pixmaps/SheepShaver.png
%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
%{_mandir}/man1/SheepShaver.1*
%changelog
* Sun Oct 19 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 2.3-0.6.20060514
- Use ppc cpu emulator even when running on ppc, as using the native cpu
requires a private implementation of pthreads from:
src/Unix/Linux/sheepthreads.c
which depends on glibc pthread internals which are no longer exposed by
glibc and quite possibly changed
* Sat Oct 18 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 2.3-0.5.20060514
- Updated release of cxmon to 3.2
- Fix compilation with gcc-4.3 (tricky, esp. on x86_64)
- Regenerate Patch0, nuke _default_patch_fuzz 2
- Fixup desktop file Categories, so that we show up under the Emulators menu
- Make rpmlint like this package
- Add missing libXxf86dga-devel, libXxf86vm-devel BuildRequires
* Sat Oct 18 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 2.3-0.4.20060514
- rebuild for RPM Fusion
- define _default_patch_fuzz 2
- ExclusiveArch: i386 instead of ix86 to prevent plague building this for
athlon and other ix86 archs
- always build for x.org
* Sun Jun 25 2006 Matthias Saou <http://freshrpms.net/> 2.3-0.3.20060514
- Update to 2.3-0.20060514.1.
- Remove no longer needed stats patch.
* Fri Jan 13 2006 Matthias Saou <http://freshrpms.net/> 2.3-0.2.20051130
- Add modular xorg build conditional.
* Thu Dec 1 2005 Matthias Saou <http://freshrpms.net/> 2.3-0.1.20051130
- Update to 2.3 20051130 snapshot.
- Update URLs to gibix.net.
- Drop no longer relevant misc patch (NET_IF_SHEEPNET change).
- Add --with sdl rebuild option.
- Switch from gtk1 to new gtk2 GUI.
* Sat Apr 21 2005 Matthias Saou <http://freshrpms.net/> 2.2-0.20050315
- Spec file cleanup, based on the .src.rpm from the SheepShaver website.
- Make cxmon support optionnal with --without mon.
- Add menu entry.
- Disable binary stripping on make install to get a useful debuginfo package.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/SheepShaver/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 18 Oct 2008 13:44:50 -0000 1.1
+++ .cvsignore 19 Oct 2008 10:13:00 -0000 1.2
@@ -0,0 +1,3 @@
+cxmon-3.2.tar.gz
+SheepShaver-2.3-0.20060514.1.tar.bz2
+SheepShaver.png
Index: sources
===================================================================
RCS file: /cvs/free/rpms/SheepShaver/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 18 Oct 2008 13:44:50 -0000 1.1
+++ sources 19 Oct 2008 10:13:00 -0000 1.2
@@ -0,0 +1,3 @@
+8fb95c58f6c04eace6ae84d0c7b79ca1 cxmon-3.2.tar.gz
+81904c06340fb8101800df864eacedcd SheepShaver-2.3-0.20060514.1.tar.bz2
+22e17876d74a37e1a9f19d2150170cee SheepShaver.png
15 years, 7 months
rpms/SheepShaver/F-9 SheepShaver-2.2-nostrip.patch, NONE, 1.1 SheepShaver-2.3-gcc43.patch, NONE, 1.1 SheepShaver.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/SheepShaver/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9692
Modified Files:
.cvsignore sources
Added Files:
SheepShaver-2.2-nostrip.patch SheepShaver-2.3-gcc43.patch
SheepShaver.spec
Log Message:
sync with devel (after importing from freshrpms there)
SheepShaver-2.2-nostrip.patch:
--- NEW FILE SheepShaver-2.2-nostrip.patch ---
diff -up SheepShaver-2.3/src/Unix/Makefile.in.nostrip SheepShaver-2.3/src/Unix/Makefile.in
--- SheepShaver-2.3/src/Unix/Makefile.in.nostrip 2006-05-08 19:19:45.000000000 +0200
+++ SheepShaver-2.3/src/Unix/Makefile.in 2008-10-18 21:37:07.000000000 +0200
@@ -35,7 +35,7 @@ BLESS = @BLESS@
EXEEXT = @EXEEXT@
KEYCODES = @KEYCODES@
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
SLIRP_CFLAGS = @SLIRP_CFLAGS@
SheepShaver-2.3-gcc43.patch:
--- NEW FILE SheepShaver-2.3-gcc43.patch ---
diff -up SheepShaver-2.3/src/Unix/sys_unix.cpp~ SheepShaver-2.3/src/Unix/sys_unix.cpp
--- SheepShaver-2.3/src/Unix/sys_unix.cpp~ 2008-10-18 21:38:50.000000000 +0200
+++ SheepShaver-2.3/src/Unix/sys_unix.cpp 2008-10-18 21:38:50.000000000 +0200
@@ -23,6 +23,7 @@
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <errno.h>
+#include <limits.h>
#ifdef HAVE_AVAILABILITYMACROS_H
#include <AvailabilityMacros.h>
diff -up SheepShaver-2.3/src/Unix/sigsegv.cpp~ SheepShaver-2.3/src/Unix/sigsegv.cpp
--- SheepShaver-2.3/src/Unix/sigsegv.cpp~ 2008-10-18 23:10:53.000000000 +0200
+++ SheepShaver-2.3/src/Unix/sigsegv.cpp 2008-10-18 23:10:53.000000000 +0200
@@ -2293,7 +2293,8 @@ int main(void)
#define TEST_SKIP_INSTRUCTION(TYPE) do { \
const unsigned long TAG = 0x12345678 | \
(sizeof(long) == 8 ? 0x9abcdef0UL << 31 : 0); \
- TYPE data = *((TYPE *)(page + sizeof(TYPE))); \
+ volatile TYPE data = 0; \
+ data = *((TYPE *)(page + sizeof(TYPE))); \
volatile unsigned long effect = data + TAG; \
if (effect != TAG) \
return 9; \
diff -up SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-cpu.cpp~ SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-cpu.cpp
--- SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-cpu.cpp~ 2008-10-18 21:57:15.000000000 +0200
+++ SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-cpu.cpp 2008-10-18 21:57:15.000000000 +0200
@@ -256,7 +256,7 @@ void powerpc_cpu::initialize()
// Initialize block lookup table
#if PPC_DECODE_CACHE || PPC_ENABLE_JIT
- block_cache.initialize();
+ blockcache.initialize();
#endif
// Init cache range invalidate recorder
@@ -540,7 +540,7 @@ void *powerpc_cpu::compile_chain_block(b
const uint32 bpc = sbi->pc;
const uint32 tpc = sbi->li[n].jmp_pc;
- block_info *tbi = block_cache.find(tpc);
+ block_info *tbi = blockcache.find(tpc);
if (tbi == NULL)
tbi = compile_block(tpc);
assert(tbi && tbi->pc == tpc);
@@ -562,7 +562,7 @@ void powerpc_cpu::execute(uint32 entry)
if (execute_depth == 1 || (PPC_ENABLE_JIT && PPC_REENTRANT_JIT)) {
#if PPC_ENABLE_JIT
if (use_jit) {
- block_info *bi = block_cache.find(pc());
+ block_info *bi = blockcache.find(pc());
if (bi == NULL)
bi = compile_block(pc());
for (;;) {
@@ -585,7 +585,7 @@ void powerpc_cpu::execute(uint32 entry)
// Don't check for backward branches here as this
// is now done by generated code. Besides, we will
// get here if the fast cache lookup failed too.
- if ((bi = block_cache.find(pc())) == NULL)
+ if ((bi = blockcache.find(pc())) == NULL)
break;
}
@@ -596,7 +596,7 @@ void powerpc_cpu::execute(uint32 entry)
}
#endif
#if PPC_DECODE_CACHE
- block_info *bi = block_cache.find(pc());
+ block_info *bi = blockcache.find(pc());
if (bi != NULL)
goto pdi_execute;
for (;;) {
@@ -606,7 +606,7 @@ void powerpc_cpu::execute(uint32 entry)
clock_t start_time;
start_time = clock();
#endif
- bi = block_cache.new_blockinfo();
+ bi = blockcache.new_blockinfo();
bi->init(pc());
// Predecode a new block
@@ -656,8 +656,8 @@ void powerpc_cpu::execute(uint32 entry)
bi->min_pc = dpc;
bi->max_pc = entry;
bi->size = di - bi->di;
- block_cache.add_to_cl_list(bi);
- block_cache.add_to_active_list(bi);
+ blockcache.add_to_cl_list(bi);
+ blockcache.add_to_active_list(bi);
decode_cache_p += bi->size;
#if PPC_PROFILE_COMPILE_TIME
compile_time += (clock() - start_time);
@@ -691,7 +691,7 @@ void powerpc_cpu::execute(uint32 entry)
}
}
- if ((bi->pc != pc()) && ((bi = block_cache.find(pc())) == NULL))
+ if ((bi->pc != pc()) && ((bi = blockcache.find(pc())) == NULL))
break;
}
}
@@ -767,8 +767,8 @@ void powerpc_cpu::invalidate_cache()
{
D(bug("Invalidate all cache blocks\n"));
#if PPC_DECODE_CACHE || PPC_ENABLE_JIT
- block_cache.clear();
- block_cache.initialize();
+ blockcache.clear();
+ blockcache.initialize();
spcflags().set(SPCFLAG_JIT_EXEC_RETURN);
#endif
#if PPC_ENABLE_JIT
@@ -811,6 +811,6 @@ void powerpc_cpu::invalidate_cache_range
}
#endif
spcflags().set(SPCFLAG_JIT_EXEC_RETURN);
- block_cache.clear_range(start, end);
+ blockcache.clear_range(start, end);
#endif
}
diff -up SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-cpu.hpp~ SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-cpu.hpp
--- SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-cpu.hpp~ 2008-10-18 21:57:24.000000000 +0200
+++ SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-cpu.hpp 2008-10-18 21:57:24.000000000 +0200
@@ -360,7 +360,7 @@ private:
// Block lookup table
typedef powerpc_block_info block_info;
- block_cache< block_info, lazy_allocator > block_cache;
+ block_cache< block_info, lazy_allocator > blockcache;
#if PPC_DECODE_CACHE
// Decode Cache
diff -up SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-dyngen-ops.cpp~ SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-dyngen-ops.cpp
--- SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-dyngen-ops.cpp~ 2008-10-18 21:58:04.000000000 +0200
+++ SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-dyngen-ops.cpp 2008-10-18 21:59:27.000000000 +0200
@@ -96,7 +96,7 @@ struct powerpc_dyngen_helper {
static uint64 & fp_result_dw() { return CPU->fp_result_dw(); }
static inline void set_cr(int crfd, int v) { CPU->cr().set(crfd, v); }
- static inline powerpc_block_info *find_block(uint32 pc) { return CPU->block_cache.fast_find(pc); }
+ static inline powerpc_block_info *find_block(uint32 pc) { return CPU->blockcache.fast_find(pc); }
};
// Semantic action templates
@@ -1268,13 +1268,13 @@ static inline void do_lmw(void)
}
template<>
-static inline void do_lmw<31>(void)
+inline void do_lmw<31>(void)
{
CPU->gpr(31) = vm_read_memory_4(T0);
}
template<>
-static inline void do_lmw<32>(void)
+inline void do_lmw<32>(void)
{
for (uint32 r = PARAM1, ad = T0; r <= 31; r++, ad += 4)
CPU->gpr(r) = vm_read_memory_4(ad);
@@ -1290,13 +1290,13 @@ static inline void do_stmw(void)
}
template<>
-static inline void do_stmw<31>(void)
+inline void do_stmw<31>(void)
{
vm_write_memory_4(T0, CPU->gpr(31));
}
template<>
-static inline void do_stmw<32>(void)
+inline void do_stmw<32>(void)
{
for (uint32 r = PARAM1, ad = T0; r <= 31; r++, ad += 4)
vm_write_memory_4(ad, CPU->gpr(r));
diff -up SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-translate.cpp~ SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-translate.cpp
--- SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-translate.cpp~ 2008-10-18 22:00:22.000000000 +0200
+++ SheepShaver-2.3/src/kpx_cpu/src/cpu/ppc/ppc-translate.cpp 2008-10-18 22:00:22.000000000 +0200
@@ -143,7 +143,7 @@ powerpc_cpu::compile_block(uint32 entry_
codegen_context_t cg_context(dg);
cg_context.entry_point = entry_point;
again:
- block_info *bi = block_cache.new_blockinfo();
+ block_info *bi = blockcache.new_blockinfo();
bi->init(entry_point);
bi->entry_point = dg.gen_start();
@@ -1570,11 +1570,11 @@ powerpc_cpu::compile_block(uint32 entry_
#endif
dg.gen_end();
- block_cache.add_to_cl_list(bi);
+ blockcache.add_to_cl_list(bi);
if (is_read_only_memory(bi->pc))
- block_cache.add_to_dormant_list(bi);
+ blockcache.add_to_dormant_list(bi);
else
- block_cache.add_to_active_list(bi);
+ blockcache.add_to_active_list(bi);
#if PPC_PROFILE_COMPILE_TIME
compile_time += (clock() - start_time);
#endif
--- NEW FILE SheepShaver.spec ---
%define date 20060514
%define mon_version 3.2
%define desktop_vendor rpmforge
Summary: Power Macintosh emulator
Name: SheepShaver
Version: 2.3
Release: 0.6.%{date}%{?dist}
License: GPLv2+
Group: Applications/Emulators
URL: http://www.gibix.net/projects/sheepshaver/
Source0: http://www.gibix.net/projects/sheepshaver/files/SheepShaver-%{version}-0....
Source1: http://cxmon.cebix.net/downloads/cxmon-%{mon_version}.tar.gz
Source2: SheepShaver.png
Patch0: SheepShaver-2.2-nostrip.patch
Patch1: SheepShaver-2.3-gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: gcc-c++, gtk2-devel, esound-devel >= 0.2.8
BuildRequires: desktop-file-utils, readline-devel
%{?_with_sdl:BuildRequires: SDL-devel}
BuildRequires: libXt-devel, libXxf86dga-devel, libXxf86vm-devel
# Other archs need an instruction skipper on well-known invalid
# memory references (e.g. illegal writes to ROM).
ExclusiveArch: i386 ppc x86_64
%description
SheepShaver is a MacOS run-time environment that allows you to run classic
MacOS applications. This means that both Linux and MacOS applications can
run at the same time (usually in a window on the Linux desktop).
If you are using a PowerPC-based system, applications will run at native
speed (i.e. with no emulation involved). There is also a built-in PowerPC
G4 emulator, without MMU support, for non-PowerPC systems.
Available rebuild options :
--without : mon
--with : sdl
%prep
%setup -q -a 1
%patch0 -p1 -b .nostrip
%patch1 -p1 -b .gcc43
%build
pushd src/Unix
%configure \
--datadir=%{_sysconfdir} --enable-ppc-emulator=yes \
%{!?_without_mon: --with-mon=../../cxmon-%{mon_version}/src} \
%{?_with_sdl: --enable-sdl-video --enable-sdl-audio}
%{__mkdir} obj
%{__make} %{?_smp_mflags}
popd
%install
%{__rm} -rf %{buildroot}
%makeinstall -C src/Unix \
datadir="%{buildroot}%{_sysconfdir}"
chmod +x %{buildroot}%{_sysconfdir}/%{name}/tunconfig
# Create the system menu entry
%{__cat} > %{name}.desktop << EOF
[Desktop Entry]
Name=Sheep Shaver
Comment=Power Macintosh Emulator
Exec=SheepShaver
Icon=SheepShaver.png
Terminal=false
Type=Application
Categories=Game;Emulator;
EOF
%{__mkdir_p} %{buildroot}%{_datadir}/applications
desktop-file-install --vendor %{desktop_vendor} \
--dir %{buildroot}%{_datadir}/applications \
%{name}.desktop
%{__install} -D -p -m 0644 %{SOURCE2} \
%{buildroot}%{_datadir}/pixmaps/SheepShaver.png
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-, root, root, 0755)
%doc COPYING NEWS doc/Linux/*
%dir %{_sysconfdir}/SheepShaver/
%config(noreplace) %{_sysconfdir}/SheepShaver/keycodes
%{_sysconfdir}/SheepShaver/tunconfig
%{_bindir}/SheepShaver
%{_datadir}/pixmaps/SheepShaver.png
%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
%{_mandir}/man1/SheepShaver.1*
%changelog
* Sun Oct 19 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 2.3-0.6.20060514
- Use ppc cpu emulator even when running on ppc, as using the native cpu
requires a private implementation of pthreads from:
src/Unix/Linux/sheepthreads.c
which depends on glibc pthread internals which are no longer exposed by
glibc and quite possibly changed
* Sat Oct 18 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 2.3-0.5.20060514
- Updated release of cxmon to 3.2
- Fix compilation with gcc-4.3 (tricky, esp. on x86_64)
- Regenerate Patch0, nuke _default_patch_fuzz 2
- Fixup desktop file Categories, so that we show up under the Emulators menu
- Make rpmlint like this package
- Add missing libXxf86dga-devel, libXxf86vm-devel BuildRequires
* Sat Oct 18 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 2.3-0.4.20060514
- rebuild for RPM Fusion
- define _default_patch_fuzz 2
- ExclusiveArch: i386 instead of ix86 to prevent plague building this for
athlon and other ix86 archs
- always build for x.org
* Sun Jun 25 2006 Matthias Saou <http://freshrpms.net/> 2.3-0.3.20060514
- Update to 2.3-0.20060514.1.
- Remove no longer needed stats patch.
* Fri Jan 13 2006 Matthias Saou <http://freshrpms.net/> 2.3-0.2.20051130
- Add modular xorg build conditional.
* Thu Dec 1 2005 Matthias Saou <http://freshrpms.net/> 2.3-0.1.20051130
- Update to 2.3 20051130 snapshot.
- Update URLs to gibix.net.
- Drop no longer relevant misc patch (NET_IF_SHEEPNET change).
- Add --with sdl rebuild option.
- Switch from gtk1 to new gtk2 GUI.
* Sat Apr 21 2005 Matthias Saou <http://freshrpms.net/> 2.2-0.20050315
- Spec file cleanup, based on the .src.rpm from the SheepShaver website.
- Make cxmon support optionnal with --without mon.
- Add menu entry.
- Disable binary stripping on make install to get a useful debuginfo package.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/SheepShaver/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 18 Oct 2008 13:44:50 -0000 1.1
+++ .cvsignore 19 Oct 2008 10:12:46 -0000 1.2
@@ -0,0 +1,3 @@
+cxmon-3.2.tar.gz
+SheepShaver-2.3-0.20060514.1.tar.bz2
+SheepShaver.png
Index: sources
===================================================================
RCS file: /cvs/free/rpms/SheepShaver/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 18 Oct 2008 13:44:50 -0000 1.1
+++ sources 19 Oct 2008 10:12:46 -0000 1.2
@@ -0,0 +1,3 @@
+8fb95c58f6c04eace6ae84d0c7b79ca1 cxmon-3.2.tar.gz
+81904c06340fb8101800df864eacedcd SheepShaver-2.3-0.20060514.1.tar.bz2
+22e17876d74a37e1a9f19d2150170cee SheepShaver.png
15 years, 7 months