3:36 p.m.
Author: musuruan
Update of /cvs/free/rpms/plus4emu/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32232/devel
Modified Files:
.cvsignore sources
Added Files:
README_plus4emu.dribble plus4emu-1.2.5-fixpathissue.patch
plus4emu-1.2.7-userpmopts.patch plus4emu.png plus4emu.spec
Log Message:
First import
--- NEW FILE README_plus4emu.dribble ---
README for plus4emu
===================
1. The ROMs are not distributed with the rpm, however as stated in the plus4emu
documentation, the ROMs can be obtained from:
http://www.sharemation.com/IstvanV/roms/plus4emu_roms.zip
2. Unless you have configured plus4emu to look elsewhere, then the roms should
be installed into the "$HOME/.plus4emu/roms" directory. You may also need to
run the "plus4emu-makecfg" command after the rom installation in order to
plus4emu to recognise them.
plus4emu-1.2.5-fixpathissue.patch:
--- NEW FILE plus4emu-1.2.5-fixpathissue.patch ---
--- plus4emu-1.2.5/gui/main.cpp.orig 2007-12-09 16:10:19.000000000 +0000
+++ plus4emu-1.2.5/gui/main.cpp 2008-01-11 16:20:15.000000000 +0000
@@ -203,6 +203,10 @@
#ifdef __APPLE__
cmdLine += " -f";
#endif
+
+ if (cmdLine[0] != '"')
+ cmdLine = "\"" + cmdLine;
+
std::system(cmdLine.c_str());
f = new Plus4Emu::File(cfgFileName, true);
}
plus4emu-1.2.7-userpmopts.patch:
--- NEW FILE plus4emu-1.2.7-userpmopts.patch ---
--- SConstruct.orig 2008-07-13 15:57:39.000000000 +0200
+++ SConstruct 2008-07-13 15:58:02.000000000 +0200
@@ -10,17 +10,7 @@
enableDebug = 0
buildRelease = 1
-compilerFlags = ''
-if buildRelease:
- if linux32CrossCompile or win32CrossCompile:
- compilerFlags = ' -march=pentium2 -mtune=generic '
-if enableDebug and not buildRelease:
- compilerFlags = ' -Wno-long-long -Wshadow -g -O2 ' + compilerFlags
- compilerFlags = ' -Wall -W -ansi -pedantic ' + compilerFlags
-else:
- compilerFlags = ' -Wall -O3 ' + compilerFlags
- compilerFlags = compilerFlags + ' -fno-inline-functions '
- compilerFlags = compilerFlags + ' -fomit-frame-pointer -ffast-math '
+compilerFlags = 'insertrpmflags'
fltkConfig = 'fltk-config'
--- NEW FILE plus4emu.spec ---
Name: plus4emu
Version: 1.2.7
Release: 1%{?dist}
Summary: Portable emulator of the Commodore 264 family of computers
Group: Applications/Emulators
License: GPLv2+
URL: http://plus4emu.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1: %{name}.png
Source2: README_%{name}.dribble
Patch0: %{name}-1.2.7-userpmopts.patch
Patch1: %{name}-1.2.5-fixpathissue.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
BuildRequires: fltk-fluid >= 1.1.0
BuildRequires: libsndfile-devel
BuildRequires: lua-devel
BuildRequires: portaudio-devel >= 18
BuildRequires: scons
BuildRequires: SDL-devel
Requires: hicolor-icon-theme
%description
Plus4emu is an open source, portable emulator of the Commodore 264 family of
computers (C16, C116, and Plus/4), written in C++. It implements accurate, high
quality hardware emulation.
%prep
%setup -q
%patch0 -p0
%patch1 -p1
# Insert the compiler optflags
sed -i 's|insertrpmflags|%{optflags}|' SConstruct
# Fix EOL chars
sed -i 's/\r//' README NEWS
# Rename makecfg to a less generic name to avoid possible conflicts
sed -i 's|makecfg|%{name}-makecfg|' gui/main.cpp README
%build
scons %{?_smp_mflags}
# Build desktop icon
cat >%{name}.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=Plus4emu
GenericName=Commodore 264 series emulator
Comment=%{summary}
Exec=%{name}
Icon=%{name}
Terminal=false
Type=Application
StartupNotify=false
Categories=Game;Emulator;
EOF
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
install -pm0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
install -pm0644 %{SOURCE2} README.dribble
install -pm0755 plus4emu tapconv %{buildroot}%{_bindir}
install -pm0755 makecfg %{buildroot}%{_bindir}/%{name}-makecfg
desktop-file-install --vendor dribble \
--dir %{buildroot}%{_datadir}/applications \
%{name}.desktop
%clean
rm -rf %{buildroot}
%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%files
%defattr(-,root,root,-)
%{_bindir}/*
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%{_datadir}/applications/dribble-%{name}.desktop
%doc README COPYING NEWS README.dribble
%changelog
* Sun Jul 13 2008 Andrea Musuruane <musuruan(a)gmail.com> 1.2.7-1
- Updated to upstream 1.2.7
* Sat Jun 14 2008 Andrea Musuruane <musuruan(a)gmail.com> 1.2.6.1-1
- Updated to upstream 1.2.6.1
- Made a new patch to compile with GCC 4.3 (SF #1977560)
- Added a patch from upstream SVN not to require libpng-devel and
libjpeg-devel (SF #1977554)
- Minor clean-up
* Sun Feb 03 2008 Ian Chapman <packages[AT]amiga-hardware.com> 1.2.5-3
- GCC 4.3 fixes
* Sun Jan 21 2008 Ian Chapman <packages[AT]amiga-hardware.com> 1.2.5-2
- Dropped fltk-devel BR, fltk-fluid pulls it in anyway
- Minor cleanups
* Fri Jan 11 2008 Ian Chapman <packages[AT]amiga-hardware.com> 1.2.5-1
- Initial release
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/plus4emu/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jun 2008 12:26:10 -0000 1.1
+++ .cvsignore 16 Jul 2008 15:36:27 -0000 1.2
@@ -0,0 +1 @@
+plus4emu-1.2.7.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/plus4emu/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jun 2008 12:26:10 -0000 1.1
+++ sources 16 Jul 2008 15:36:27 -0000 1.2
@@ -0,0 +1 @@
+ff5fd596f5ea5c31e110b44cb5ca7f16 plus4emu-1.2.7.tar.gz
