Author: musuruan Update of /cvs/free/rpms/osmose/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv10580 Modified Files: .cvsignore osmose.spec sources Added Files: osmose-0.9.96-usesystemlibraries.patch osmose.desktop Removed Files: osmose-0.9.2-usesystemlibraries.patch Log Message: * Wed Jun 08 2011 Andrea Musuruane <musuruan(a)gmail.com&gt; - 0.9.96-1 - New upstream release. - New upstream URL and Source. - Added desktop file to support new QT based GUI. - Upstream changed license to GPLv3+. osmose-0.9.96-usesystemlibraries.patch: Osmose-0-9-96-QT.pro | 15 +++++---------- osmose/MemoryMapper.h | 2 +- 2 files changed, 6 insertions(+), 11 deletions(-) --- NEW FILE osmose-0.9.96-usesystemlibraries.patch --- diff -durN Osmose-0-9-96-QT.orig/osmose/MemoryMapper.h Osmose-0-9-96-QT/osmose/MemoryMapper.h --- Osmose-0-9-96-QT.orig/osmose/MemoryMapper.h 2010-12-12 11:47:18.000000000 +0100 +++ Osmose-0-9-96-QT/osmose/MemoryMapper.h 2011-06-05 13:04:03.568036347 +0200 @@ -18,7 +18,7 @@ #include <fstream> #include <sstream> #include <iomanip> -#include "unzip/unzip.h" +#include <minizip/unzip.h> #include "Options.h" #include "Definitions.h" #include "DebugEventThrower.h" diff -durN Osmose-0-9-96-QT.orig/Osmose-0-9-96-QT.pro Osmose-0-9-96-QT/Osmose-0-9-96-QT.pro --- Osmose-0-9-96-QT.orig/Osmose-0-9-96-QT.pro 2011-04-30 07:23:22.000000000 +0200 +++ Osmose-0-9-96-QT/Osmose-0-9-96-QT.pro 2011-06-05 13:04:16.740123993 +0200 @@ -4,9 +4,9 @@ TEMPLATE = app TARGET = -DEPENDPATH += . cpu osmose unzip -INCLUDEPATH += . cpu osmose unzip -LIBS += -lz -lasound +DEPENDPATH += . cpu osmose +INCLUDEPATH += . cpu osmose +LIBS += -lz -lasound -lminizip QT+=opengl # Input @@ -44,10 +44,7 @@ osmose/VDP.h \ osmose/VDP_GG.h \ osmose/Version.h \ - osmose/WaveWriter.h \ - unzip/crypt.h \ - unzip/ioapi.h \ - unzip/unzip.h + osmose/WaveWriter.h FORMS += Configuration.ui LogWindow.ui SOURCES += EmulationThread.cpp \ Joystick.cpp \ @@ -83,6 +80,4 @@ osmose/SoundThread.cpp \ osmose/VDP.cpp \ osmose/VDP_GG.cpp \ - osmose/WaveWriter.cpp \ - unzip/ioapi.c \ - unzip/unzip.c + osmose/WaveWriter.cpp --- NEW FILE osmose.desktop --- [Desktop Entry] Name=Osmose Comment=A Sega Master System / Game Gear emulator Exec=osmose Icon=osmose Terminal=false Type=Application Categories=Game;Emulator; Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/osmose/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 14 Dec 2009 18:30:51 -0000 1.4 +++ .cvsignore 18 Jun 2011 16:06:48 -0000 1.5 @@ -1 +1 @@ -Osmose-0-9-2-src.zip +Osmose-0-9-96-QT.zip Index: osmose.spec =================================================================== RCS file: /cvs/free/rpms/osmose/devel/osmose.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- osmose.spec 14 Dec 2009 18:30:51 -0000 1.5 +++ osmose.spec 18 Jun 2011 16:06:48 -0000 1.6 @@ -2,52 +2,59 @@ %define pkgversion %(echo %version|sed s/\\\\\./-/g) Name: osmose -Version: 0.9.2 +Version: 0.9.96 Release: 1%{?dist} Summary: A Sega Master System / Game Gear emulator Group: Applications/Emulators -License: GPLv2+ -URL: http://bcz.emu-france.com/%{name}.htm -Source: http://bcz.emu-france.com/%{name}/%{pkgname}-%{pkgversion}-src.zip -# Andrea Musuruane -Patch0: %{name}-0.9.2-usesystemlibraries.patch +License: GPLv3+ +URL: http://bcz.asterope.fr/ +Source0: http://bcz.asterope.fr/%{name}/%{pkgname}-%{pkgversion}-QT.zip +Source1: %{name}.desktop +# Use system minizip +Patch0: %{name}-0.9.96-usesystemlibraries.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: SDL-devel +BuildRequires: qt4-devel +BuildRequires: alsa-lib-devel BuildRequires: minizip-devel -BuildRequires: mesa-libGL-devel +BuildRequires: desktop-file-utils %description Osmose is another Sega Master System / Gamegear emulator. %prep -%setup -q -n %{pkgname}-%{pkgversion} +%setup -q -n %{pkgname}-%{pkgversion}-QT %patch0 -p1 -# Make sure we don't use local zlib -rm -rf zlib - -# Fix osmose on ppc -%ifarch ppc ppc64 -sed -i 's/AUDIO_S16LSB/AUDIO_S16MSB/' OsmoseCore.cpp -%endif - # Fix end-of-line encoding -sed -i 's/\r//' *.txt *.{cpp,h} cpu/*.{cpp,h} +sed -i 's/\r//' *.{cpp,h} cpu/*.{cpp,h} # Fix spurious executable permissions -chmod 644 cpu/*.{cpp,h} +chmod 644 *.{cpp,h,txt} cpu/*.{cpp,h} osmose/*.{cpp,h} unzip/*.{c,h} + +# Make sure we don't use local minizip +rm -rf unzip + %build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -D__USE_UNIX98" +export QMAKE_CFLAGS="%{optflags}" +export QMAKE_CXXFLAGS="%{optflags}" + +qmake-qt4 +make %{?_smp_mflags} %install rm -rf %{buildroot} install -d -m 0755 %{buildroot}%{_bindir} -install -m 755 %{name} %{buildroot}%{_bindir}/%{name} +install -m 755 %{pkgname}-%{pkgversion}-QT %{buildroot}%{_bindir}/%{name} + +# Install desktop file +desktop-file-install \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + %{SOURCE1} %clean @@ -57,11 +64,17 @@ %files %defattr(-,root,root,-) %{_bindir}/%{name} -%doc changes.txt license.txt readme.txt - +%{_datadir}/applications/%{name}.desktop +%doc License.txt Readme.txt TODO.txt %changelog +* Wed Jun 08 2011 Andrea Musuruane <musuruan(a)gmail.com&gt; - 0.9.96-1 +- New upstream release. +- New upstream URL and Source. +- Added desktop file to support new QT based GUI. +- Upstream changed license to GPLv3+. + * Sat Dec 12 2009 Andrea Musuruane <musuruan(a)gmail.com&gt; - 0.9.2-1 - New upstream release. Index: sources =================================================================== RCS file: /cvs/free/rpms/osmose/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 14 Dec 2009 18:30:51 -0000 1.4 +++ sources 18 Jun 2011 16:06:48 -0000 1.5 @@ -1 +1 @@ -4b9714d87c02d862256f169cb112e293 Osmose-0-9-2-src.zip +256b393d83270620e98f39e0cfb11359 Osmose-0-9-96-QT.zip --- osmose-0.9.2-usesystemlibraries.patch DELETED ---