rpms/zsnes/devel zsnes-1.51-FORTIFY_SOURCE.patch, NONE, 1.1 zsnes-1.51-Makefile.in.FIX.BROKENESS.patch, NONE, 1.1 zsnes-1.51-gcc43.patch, NONE, 1.1 zsnes.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/zsnes/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4771/devel
Modified Files:
.cvsignore sources
Added Files:
zsnes-1.51-FORTIFY_SOURCE.patch
zsnes-1.51-Makefile.in.FIX.BROKENESS.patch
zsnes-1.51-gcc43.patch zsnes.spec
Log Message:
First import
zsnes-1.51-FORTIFY_SOURCE.patch:
--- NEW FILE zsnes-1.51-FORTIFY_SOURCE.patch ---
--- zsnes_1_51/src/initc.c.fortify 2007-01-20 01:02:24.000000000 +0100
+++ zsnes_1_51/src/initc.c 2007-02-26 12:10:19.000000000 +0100
@@ -1464,8 +1464,8 @@
clearmem2();
}
-extern unsigned char BRRBuffer[32];
-extern unsigned char echoon0;
+extern unsigned char BRRBuffer[];
+extern unsigned char echoon0[];
extern unsigned int PHdspsave;
extern unsigned int PHdspsave2;
unsigned char echobuf[90000];
@@ -1479,7 +1479,7 @@
memset(vidmemch4, 0, 4096);
memset(vidmemch8, 0, 4096);
memset(BRRBuffer, 0, PHdspsave);
- memset(&echoon0, 0, PHdspsave2);
+ memset(echoon0, 0, PHdspsave2);
memset(echobuf, 0, 90000);
memset(spcBuffera, 0, 65536*4+4096);
memset(DSPMem, 0, 256);
@@ -1822,7 +1822,7 @@
extern unsigned int nmiprevaddrl, nmiprevaddrh, nmirept, nmiprevline, nmistatus;
extern unsigned char spcnumread, yesoutofmemory;
-extern unsigned char NextLineCache, sramsavedis, sndrot, regsbackup[3019];
+extern unsigned char NextLineCache, sramsavedis, sndrot[], regsbackup[3019];
extern unsigned int Voice0Freq, Voice1Freq, Voice2Freq, Voice3Freq;
extern unsigned int Voice4Freq, Voice5Freq, Voice6Freq, Voice7Freq;
extern unsigned int dspPAdj;
@@ -2621,7 +2621,7 @@
}
sramsavedis = 0;
- memcpy(&sndrot, regsbackup, 3019);
+ memcpy(sndrot, regsbackup, 3019);
if (yesoutofmemory) { asm_call(outofmemfix); }
asm_call(GUIDoReset);
--- zsnes_1_51/src/zstate.c.fortify 2007-02-26 12:14:30.000000000 +0100
+++ zsnes_1_51/src/zstate.c 2007-02-26 12:17:22.000000000 +0100
@@ -99,15 +99,15 @@
copy_func(buffer, &cycpbl, 4);
copy_func(buffer, &cycpblt, 4);
//SNES PPU Register status
- copy_func(buffer, &sndrot, 3019);
+ copy_func(buffer, sndrot, 3019);
}
static void copy_spc_data(unsigned char **buffer, void (*copy_func)(unsigned char **, void *, size_t))
{
//SPC stuff, DSP stuff
copy_func(buffer, SPCRAM, PHspcsave);
- copy_func(buffer, &BRRBuffer, PHdspsave);
- copy_func(buffer, &DSPMem, sizeof(DSPMem));
+ copy_func(buffer, BRRBuffer, PHdspsave);
+ copy_func(buffer, DSPMem, sizeof(DSPMem));
}
static void copy_extra_data(unsigned char **buffer, void (*copy_func)(unsigned char **, void *, size_t))
@@ -156,7 +156,7 @@
/*
if (buffer) //Rewind stuff
{
- copy_func(&buffer, &echoon0, PHdspsave2);
+ copy_func(&buffer, echoon0, PHdspsave2);
}
*/
}
--- zsnes_1_51/src/gblvars.h.fortify 2007-02-26 12:12:33.000000000 +0100
+++ zsnes_1_51/src/gblvars.h 2007-02-26 12:12:36.000000000 +0100
@@ -33,9 +33,9 @@
extern unsigned int SfxR0, *setaramdata, ramsize, *sram, nmiprevaddrh;
extern unsigned int tempesi, tempedi, tempedx, tempebp;
extern unsigned int SPCMultA, PHnum2writespc7110reg, PHdspsave2;
-extern unsigned char sndrot, SPCRAM[65472], DSPMem[256], SA1Status, *SA1RAMArea;
-extern unsigned char DSP1Enable, DSP1COp, prevoamptr, BRRBuffer[32], *romdata;
-extern unsigned char curcyc, echoon0, spcnumread, NextLineCache, HIRQNextExe;
+extern unsigned char sndrot[], SPCRAM[65472], DSPMem[256], SA1Status, *SA1RAMArea;
+extern unsigned char DSP1Enable, DSP1COp, prevoamptr, BRRBuffer[], *romdata;
+extern unsigned char curcyc, echoon0[], spcnumread, NextLineCache, HIRQNextExe;
extern unsigned char vidmemch4[4096], vidmemch8[4096], vidmemch2[4096];
extern bool C4Enable, SFXEnable, SA1Enable, SPC7110Enable, SETAEnable, DSP4Enable, spcon;
zsnes-1.51-Makefile.in.FIX.BROKENESS.patch:
--- NEW FILE zsnes-1.51-Makefile.in.FIX.BROKENESS.patch ---
diff -dur zsnes_1_51.orig/src/Makefile.in zsnes_1_51/src/Makefile.in
--- zsnes_1_51.orig/src/Makefile.in 2007-02-03 17:10:13.000000000 +0100
+++ zsnes_1_51/src/Makefile.in 2007-02-03 17:18:00.000000000 +0100
@@ -142,10 +142,10 @@
./autogen.sh --recheck
install:
- @INSTALL@ -d -m 0755 $(DESTDIR)/@prefix@/bin
- @INSTALL@ -m 0755 @ZSNESEXE@ $(DESTDIR)/@prefix@/bin
- @INSTALL@ -d -m 0755 $(DESTDIR)/@prefix@/man/man1
- @INSTALL@ -m 0644 linux/zsnes.1 $(DESTDIR)/@prefix@/man/man1
+ @INSTALL@ -d -m 0755 ${DESTDIR}/@bindir@
+ @INSTALL@ -m 0755 @ZSNESEXE@ ${DESTDIR}/@bindir@
+ @INSTALL@ -d -m 0755 ${DESTDIR}/@mandir@/man1
+ @INSTALL@ -m 0644 linux/zsnes.1 ${DESTDIR}/@mandir@/man1
uninstall:
rm -f @prefix@/bin/$(notdir @ZSNESEXE@) @prefix(a)/man/man1/zsnes.1
zsnes-1.51-gcc43.patch:
--- NEW FILE zsnes-1.51-gcc43.patch ---
diff -durN zsnes_1_51/src/parsegen.cpp zsnes_1_51_gcc43/src/parsegen.cpp
--- zsnes_1_51/src/parsegen.cpp 2007-01-16 00:58:43.000000000 +0100
+++ zsnes_1_51_gcc43/src/parsegen.cpp 2008-03-21 20:17:44.000000000 +0100
@@ -25,6 +25,7 @@
#include <iostream>
#include <fstream>
+#include <cstring>
#include <string>
#include <vector>
#include <algorithm>
@@ -1828,7 +1829,7 @@
}
}
-int main(size_t argc, const char **argv)
+int main(int argc, const char *const *const argv)
{
const char *cheader_file = 0;
bool compile = false;
diff -durN zsnes_1_51/src/tools/depbuild.cpp zsnes_1_51_gcc43/src/tools/depbuild.cpp
--- zsnes_1_51/src/tools/depbuild.cpp 2006-12-27 12:04:05.000000000 +0100
+++ zsnes_1_51_gcc43/src/tools/depbuild.cpp 2008-03-21 20:16:07.000000000 +0100
@@ -23,6 +23,7 @@
#include <iostream>
#include <string>
+#include <cstdlib>
#include <cstdio>
using namespace std;
@@ -183,7 +184,7 @@
}
}
-int main(size_t argc, const char *const *const argv)
+int main(int argc, const char *const *const argv)
{
if (argc < 5)
{
diff -durN zsnes_1_51/src/tools/strutil.h zsnes_1_51_gcc43/src/tools/strutil.h
--- zsnes_1_51/src/tools/strutil.h 2006-12-27 12:04:05.000000000 +0100
+++ zsnes_1_51_gcc43/src/tools/strutil.h 2008-03-21 20:16:07.000000000 +0100
@@ -25,6 +25,7 @@
#include <string>
#include <vector>
#include <cctype>
+#include <cstring>
struct ci_char_traits : public std::char_traits<char>
{
--- NEW FILE zsnes.spec ---
%define pkgversion %(echo %version|sed s/\\\\\.//)
%define pkgsubdir %(echo %version|sed s/\\\\\./_/)
Summary: ZSNES is a Super Nintendo emulator
Name: zsnes
Version: 1.51
Release: 2%{?dist}
License: GPLv2
Group: Applications/Emulators
URL: http://www.zsnes.com/
Source: http://dl.sf.net/%{name}/%{name}%{pkgversion}src.tar.bz2
# Source Mage
Patch1: zsnes-1.51-Makefile.in.FIX.BROKENESS.patch
# Hans de Goede
Patch2: zsnes-1.51-FORTIFY_SOURCE.patch
# Paul Bender (minimyth)
Patch3: zsnes-1.51-gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch: %{ix86}
BuildRequires: automake
BuildRequires: nasm
BuildRequires: SDL-devel >= 1.2.0
BuildRequires: zlib-devel >= 1.2.3
BuildRequires: libpng-devel >= 1.2.0
BuildRequires: libGL-devel
BuildRequires: ncurses-devel
BuildRequires: libao-devel
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
%description
This is an emulator for Nintendo's 16 bit console, called Super Nintendo
Entertainment System or Super Famicom. It features a pretty accurate emulation
of that system's graphic and sound capabilities.
The GUI enables the user to select games, change options, enable cheat codes
and to save the game state, even network play is possible.
%prep
%setup -q -n %{name}_%{pkgsubdir}/src
%patch1 -p2
%patch2 -p2
%patch3 -p2
# Remove hardcoded CFLAGS and LDFLAGS
sed -i \
-e 's:^\s*CFLAGS=.* -D__RELEASE__.*$:CFLAGS="$CFLAGS -D__RELEASE__":' \
-e 's:^\s*CFLAGS=.* -I\/usr\/local\/include .*$:CFLAGS="${CFLAGS} -I.":' \
-e '/^\s*LDFLAGS=.* -L\/usr\/local\/lib /d' \
configure.in
# Fix line encodings in docs/readme.txt/*
sed -i 's/\r//' ../docs/readme.txt/*.txt
# Fix char encondigs
iconv --from=ISO-8859-1 --to=UTF-8 ../docs/readme.txt/games.txt > ../docs/readme.txt/games.txt.utf8
mv ../docs/readme.txt/games.txt.utf8 ../docs/readme.txt/games.txt
iconv --from=ISO-8859-1 --to=UTF-8 ../docs/readme.txt/support.txt > ../docs/readme.txt/support.txt.utf8
mv ../docs/readme.txt/support.txt.utf8 ../docs/readme.txt/support.txt
# Remove icon extension from desktop file
sed -i -e 's/^Icon=%{name}.png$/Icon=%{name}/g' \
linux/%{name}.desktop
%build
aclocal
autoconf
%configure \
--enable-libao \
--enable-release \
--disable-cpucheck force_arch="%{_arch}"
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
# install desktop file
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install \
--vendor dribble \
--remove-category Application \
--dir %{buildroot}%{_datadir}/applications \
linux/%{name}.desktop
# install icons
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps
install -m 644 icons/16x16x32.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/zsnes.png
install -m 644 icons/32x32x32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/zsnes.png
install -m 644 icons/48x48x32.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/zsnes.png
install -m 644 icons/64x64x32.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/zsnes.png
%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}/zsnes
%{_mandir}/man1/zsnes.1*
%{_datadir}/applications/dribble-%{name}.desktop
%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
%doc ../docs/authors.txt ../docs/license.txt ../docs/README.LINUX
%doc ../docs/support.txt ../docs/thanks.txt ../docs/todo.txt
%doc ../docs/readme.htm/ ../docs/readme.txt/
%changelog
* Fri Mar 21 2008 Andrea Musuruane <musuruan(a)gmail.com> 1.51-2
- enabled libao
- changed license due to new guidelines
- added a patch by Paul Bender to compile with gcc 4.3
- removed icon extension from desktop file to match Icon Theme Specification
- removed %%{?dist} tag from changelog
- updated icon cache scriptlets to be compliant to new guidelines
- fixed char encodings in docs
- cosmetic changes
* Thu Mar 01 2007 Andrea Musuruane <musuruan(a)gmail.com> 1.51-1
- updated to 1.51
- distfile is now a .tar.bz2 instead of a .tar.gz
- added zlib 1.2.3 or greater to BR, now required by ZSNES
- added missing libGL-devel to BR
- added missing hicolor-icon-theme to Requires
- now using new desktop file supplied by upstream (but patched)
- dropped --add-category X-Fedora from desktop-file-install
- fixed line encodings in docs/readme.txt/*
- updated doc files
- removed no longer needed patches
- removed hardcoded CFLAGS and LDFLAGS in %%prep (taken from Gentoo)
- added a new patch from Hans de Goede to compile with -DFORTIFY_SOURCE used
in %%configure
* Mon Nov 13 2006 Andrea Musuruane <musuruan(a)gmail.com> 1.42-2
- added missing desktop-file-utils to BuildRequires
* Sun Nov 12 2006 Andrea Musuruane <musuruan(a)gmail.com> 1.42-1
- initial package
- used a patch from Source Mage to handle @bindir@ and @mandir@ in Makefile
- used a patch from Hans de Goede to compile with -DFORTIFY_SOURCE used
in %%configure
- used a patch from Erik Musick via Gentoo #117771 to fix a QA notice on
executable stack (otherwise running with SELinux enabled breaks)
- used a patch from Leonardo Boshell via Gentoo #125861 to fix a memory
corruption bug
- used a patch from Gentoo to fix configure
- used a patch from Terran Melconian via Debian #199461 to fix loading and
saving of state files (integrated into Hans' patch otherwise they would
conflict)
- used a patch from upstream CVS to fix 100% CPU problem while in GUI
(see Debian #319299)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/zsnes/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jun 2008 15:07:27 -0000 1.1
+++ .cvsignore 19 Jul 2008 19:21:26 -0000 1.2
@@ -0,0 +1 @@
+zsnes151src.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/zsnes/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jun 2008 15:07:27 -0000 1.1
+++ sources 19 Jul 2008 19:21:26 -0000 1.2
@@ -0,0 +1 @@
+328071775f88f7c3b9fdb94176e5e417 zsnes151src.tar.bz2
16 years, 4 months
- 1
- 0
rpms/osmose/F-8 osmose-0.8.2-fixppcaudio.patch, NONE, 1.1 osmose-0.8.2-gcc43fix.patch, NONE, 1.1 osmose-0.8.2-newtimer.patch, NONE, 1.1 osmose-0.8.2-usesystemlibraries.patch, NONE, 1.1 osmose.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/osmose/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3724/F-8
Modified Files:
.cvsignore sources
Added Files:
osmose-0.8.2-fixppcaudio.patch osmose-0.8.2-gcc43fix.patch
osmose-0.8.2-newtimer.patch
osmose-0.8.2-usesystemlibraries.patch osmose.spec
Log Message:
First import
osmose-0.8.2-fixppcaudio.patch:
--- NEW FILE osmose-0.8.2-fixppcaudio.patch ---
--- Osmose/OsmoseCore.cpp.orig 2007-06-08 08:38:34.000000000 +0100
+++ Osmose/OsmoseCore.cpp 2008-01-29 20:11:31.000000000 +0000
@@ -598,7 +598,7 @@
void OsmoseCore::setupAudioFormat()
{
format.freq = 22050;
- format.format = AUDIO_S16LSB;
+ format.format = AUDIO_S16MSB;
format.channels = 1;
format.samples = SAMPLE_SIZE;
format.callback = sndCallback;
osmose-0.8.2-gcc43fix.patch:
--- NEW FILE osmose-0.8.2-gcc43fix.patch ---
--- Osmose/MemoryMapper.cpp.orig 2006-11-27 17:56:30.000000000 +0000
+++ Osmose/MemoryMapper.cpp 2008-02-01 21:31:34.000000000 +0000
@@ -16,6 +16,8 @@
#include "Options.h"
#include "RomSpecificOption.h"
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
extern Options opt;
--- Osmose/Options.cpp.orig 2006-11-24 10:35:30.000000000 +0000
+++ Osmose/Options.cpp 2008-02-01 21:30:20.000000000 +0000
@@ -14,6 +14,7 @@
*****************************************************************************/
#include "Options.h"
#include "MemoryMapper.h"
+#include <string.h>
void Options::reset()
{
--- Osmose/WaveWriter.cpp.orig 2006-11-06 11:08:38.000000000 +0000
+++ Osmose/WaveWriter.cpp 2008-02-01 21:42:32.000000000 +0000
@@ -13,6 +13,7 @@
* URL: http://bcz.emu-france.com/
*****************************************************************************/
#include "WaveWriter.h"
+#include <stdlib.h>
/*----------------------------------------------------------------------*/
/* Constructor: Initialise structures ChunkFormat, Data Format, and */
osmose-0.8.2-newtimer.patch:
--- NEW FILE osmose-0.8.2-newtimer.patch ---
--- Osmose/PrecisionTimer.cpp.orig 2006-11-06 11:08:38.000000000 +0000
+++ Osmose/PrecisionTimer.cpp 2008-02-01 21:39:17.000000000 +0000
@@ -12,8 +12,45 @@
* URL: http://bcz.emu-france.com/
*****************************************************************************/
#include "PrecisionTimer.h"
+#include <stdlib.h>
-#define rdtsc(val) __asm__ __volatile__ ("rdtsc" : "=A" (val))
+#if defined(__i386__)
+static __inline__ unsigned long long rdtsc(void)
+{
+ unsigned long long int x;
+ __asm__ volatile (".byte 0x0f, 0x31" : "=A" (x));
+ return x;
+}
+
+#elif defined(__x86_64__)
+static __inline__ unsigned long long rdtsc(void)
+{
+ unsigned hi, lo;
+ __asm__ __volatile__ ("rdtsc" : "=a"(lo), "=d"(hi));
+ return ( (unsigned long long)lo)|( ((unsigned long long)hi)<<32 );
+}
+
+#elif defined(__powerpc__)
+static __inline__ unsigned long long rdtsc(void)
+{
+ unsigned long long int result=0;
+ unsigned long int upper, lower,tmp;
+ __asm__ volatile(
+ "0: \n"
+ "\tmftbu %0 \n"
+ "\tmftb %1 \n"
+ "\tmftbu %2 \n"
+ "\tcmpw %2,%0 \n"
+ "\tbne 0b \n"
+ : "=r"(upper),"=r"(lower),"=r"(tmp)
+ );
+ result = upper;
+ result = result<<32;
+ result = result|lower;
+
+ return(result);
+}
+#endif
/*--------------------------------------------------------------------*/
/* Default Constructor initialise values to -1; */
@@ -43,9 +80,9 @@
{
cout << "Calibrating:" << dec<< s << " seconds." << endl;
}
- rdtsc(start);
+ start=rdtsc();
PORTABLE_SLEEP_FUNC;
- rdtsc(stop);
+ stop=rdtsc();
tick_per_second = (unsigned long long) ( stop - start );
tick_per_second = (tick_per_second / s);
if (verbose)
@@ -60,7 +97,7 @@
/*--------------------------------------------------------------------*/
void PrecisionTimer::start()
{
- rdtsc(T0);
+ T0=rdtsc();
}
/*--------------------------------------------------------------------*/
@@ -74,7 +111,7 @@
{
bool ret = false;
- rdtsc(T1);
+ T1=rdtsc();
if (mode == CUMULATIVE)
{
cumulative_buffer[cumul_buffer_index] = getOneShotDuration();
osmose-0.8.2-usesystemlibraries.patch:
--- NEW FILE osmose-0.8.2-usesystemlibraries.patch ---
diff -durN Osmose.orig/Makefile Osmose/Makefile
--- Osmose.orig/Makefile 2006-11-29 16:18:08.000000000 +0100
+++ Osmose/Makefile 2008-01-19 14:14:44.000000000 +0100
@@ -1,11 +1,3 @@
-#Zlib
-Z_LIB_DIR= ./zlib/
-Z_LIB = $(Z_LIB_DIR)libz.a
-
-#unzip based on zlib.
-UNZIP_DIR= ./unzip/
-UNZIP_LIB= $(UNZIP_DIR)unzip.a
-
DISASM_DIR = ./z80_disasm
# Uncomment these lines before builting with internal debugger.
@@ -54,7 +46,7 @@
# Compiler/Linker Flags
# add -O3 to CFLAGS for speedup -pg on LFLAGS and CFLAGS for gprof
CFLAGS = -Wall -D__USE_UNIX98 -O3
-LFLAGS = -lSDL
+LFLAGS = -lz -lminizip -lSDL
AFLAGS = -f elf
CC = g++
C_COMP = gcc
@@ -64,10 +56,10 @@
.cpp.o:
$(CC) $(CFLAGS) -c $*.cpp -o $*.o
-all: libs disasm osmose stripexe
+all: disasm osmose
osmose: $(z80_lib) $(OSM_OBJS) $(OPT_OBJS)
- $(CC) $(CFLAGS) $(OSM_OBJS) $(Z80_LIB) $(OPT_OBJS) $(UNZIP_LIB) $(Z_LIB) -o $(OSM_EXE) $(LFLAGS)
+ $(CC) $(CFLAGS) $(OSM_OBJS) $(Z80_LIB) $(OPT_OBJS) -o $(OSM_EXE) $(LFLAGS)
disasm: $(DISASM_OBJS)
@@ -78,19 +70,12 @@
rm -f $(DISASM_DIR)/*.o
rm -f ./cpu/*.o
rm -f *.o core $(OSM_EXE)
- rm -f $(Z_LIB_DIR)*.o $(Z_LIB_DIR)*.a
- rm -f $(UNZIP_DIR)*.o $(UNZIP_DIR)*.a
-# Clear all objects except ./cpu and zlib.
+# Clear all objects except ./cpu.
# This is done because compilation of CPU is long.
miniclean:
rm -f *.o core $(OSM_EXE)
-libs:
- cd $(Z_LIB_DIR) && make libz.a
- cd $(UNZIP_DIR) && make unzip.a
-
-
diff -durN Osmose.orig/MemoryMapper.h Osmose/MemoryMapper.h
--- Osmose.orig/MemoryMapper.h 2006-11-27 18:52:42.000000000 +0100
+++ Osmose/MemoryMapper.h 2008-01-19 12:21:57.000000000 +0100
@@ -17,7 +17,7 @@
#include <iostream>
#include <fstream>
#include <iomanip>
-#include "unzip/unzip.h"
+#include <minizip/unzip.h>
#include "Options.h"
#include "Definitions.h"
#include "DebugEventThrower.h"
--- NEW FILE osmose.spec ---
%define pkgversion %(echo %version|sed s/\\\\\./-/g)
Name: osmose
Version: 0.8.2
Release: 3%{?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}/%{name}-%{pkgversion}-src.zip
# Andrea Musuruane
Patch0: %{name}-0.8.2-usesystemlibraries.patch
# Ian Chapman
Patch1: %{name}-0.8.2-newtimer.patch
Patch2: %{name}-0.8.2-fixppcaudio.patch
Patch3: %{name}-0.8.2-gcc43fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
BuildRequires: minizip-devel
%description
Osmose is another Sega Master System / Gamegear emulator.
%prep
%setup -q -n Osmose
%patch0 -p1
%patch1 -p1
%ifarch ppc ppc64
%patch2 -p1
%endif
%patch3 -p1
# Fix end-of-line encoding
sed -i 's/\r//' *.txt *.{cpp,h} cpu/*.{cpp,h}
# Fix spurious executable permissions
chmod 644 cpu/*.{cpp,h}
%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
%install
rm -rf %{buildroot}
install -d -m 0755 %{buildroot}%{_bindir}
install -m 755 %{name} %{buildroot}%{_bindir}/%{name}
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%{_bindir}/%{name}
%doc changes.txt license.txt readme.txt
%changelog
* Sat Feb 02 2008 Andrea Musuruane <musuruan(a)gmail.com> - 0.8.2-3
- Added a patch by Ian Chapman to compile with gcc 4.3.
- Timer timer patch has been updated by Ian to compile with gcc 4.3.
* Wed Jan 30 2008 Andrea Musuruane <musuruan(a)gmail.com> - 0.8.2-2
- Improved macro usage.
- Corrected License tag to reflect statement in main.cpp.
- Added patches by Ian Chapman to make osmose work on ppc.
* Sat Jan 19 2008 Andrea Musuruane <musuruan(a)gmail.com> - 0.8.2-1
- First release for Dribble/RPM Fusion.
- Made a patch to use system libraries and not to strip binary file.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/osmose/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jun 2008 12:19:01 -0000 1.1
+++ .cvsignore 19 Jul 2008 19:07:38 -0000 1.2
@@ -0,0 +1 @@
+osmose-0-8-2-src.zip
Index: sources
===================================================================
RCS file: /cvs/free/rpms/osmose/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jun 2008 12:19:01 -0000 1.1
+++ sources 19 Jul 2008 19:07:38 -0000 1.2
@@ -0,0 +1 @@
+f1b3ba02f1641eb88e15b16b0caabbe6 osmose-0-8-2-src.zip
16 years, 4 months
- 1
- 0
rpms/osmose/F-9 osmose-0.8.2-fixppcaudio.patch, NONE, 1.1 osmose-0.8.2-gcc43fix.patch, NONE, 1.1 osmose-0.8.2-newtimer.patch, NONE, 1.1 osmose-0.8.2-usesystemlibraries.patch, NONE, 1.1 osmose.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/osmose/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3443/F-9
Modified Files:
.cvsignore sources
Added Files:
osmose-0.8.2-fixppcaudio.patch osmose-0.8.2-gcc43fix.patch
osmose-0.8.2-newtimer.patch
osmose-0.8.2-usesystemlibraries.patch osmose.spec
Log Message:
First import
osmose-0.8.2-fixppcaudio.patch:
--- NEW FILE osmose-0.8.2-fixppcaudio.patch ---
--- Osmose/OsmoseCore.cpp.orig 2007-06-08 08:38:34.000000000 +0100
+++ Osmose/OsmoseCore.cpp 2008-01-29 20:11:31.000000000 +0000
@@ -598,7 +598,7 @@
void OsmoseCore::setupAudioFormat()
{
format.freq = 22050;
- format.format = AUDIO_S16LSB;
+ format.format = AUDIO_S16MSB;
format.channels = 1;
format.samples = SAMPLE_SIZE;
format.callback = sndCallback;
osmose-0.8.2-gcc43fix.patch:
--- NEW FILE osmose-0.8.2-gcc43fix.patch ---
--- Osmose/MemoryMapper.cpp.orig 2006-11-27 17:56:30.000000000 +0000
+++ Osmose/MemoryMapper.cpp 2008-02-01 21:31:34.000000000 +0000
@@ -16,6 +16,8 @@
#include "Options.h"
#include "RomSpecificOption.h"
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
extern Options opt;
--- Osmose/Options.cpp.orig 2006-11-24 10:35:30.000000000 +0000
+++ Osmose/Options.cpp 2008-02-01 21:30:20.000000000 +0000
@@ -14,6 +14,7 @@
*****************************************************************************/
#include "Options.h"
#include "MemoryMapper.h"
+#include <string.h>
void Options::reset()
{
--- Osmose/WaveWriter.cpp.orig 2006-11-06 11:08:38.000000000 +0000
+++ Osmose/WaveWriter.cpp 2008-02-01 21:42:32.000000000 +0000
@@ -13,6 +13,7 @@
* URL: http://bcz.emu-france.com/
*****************************************************************************/
#include "WaveWriter.h"
+#include <stdlib.h>
/*----------------------------------------------------------------------*/
/* Constructor: Initialise structures ChunkFormat, Data Format, and */
osmose-0.8.2-newtimer.patch:
--- NEW FILE osmose-0.8.2-newtimer.patch ---
--- Osmose/PrecisionTimer.cpp.orig 2006-11-06 11:08:38.000000000 +0000
+++ Osmose/PrecisionTimer.cpp 2008-02-01 21:39:17.000000000 +0000
@@ -12,8 +12,45 @@
* URL: http://bcz.emu-france.com/
*****************************************************************************/
#include "PrecisionTimer.h"
+#include <stdlib.h>
-#define rdtsc(val) __asm__ __volatile__ ("rdtsc" : "=A" (val))
+#if defined(__i386__)
+static __inline__ unsigned long long rdtsc(void)
+{
+ unsigned long long int x;
+ __asm__ volatile (".byte 0x0f, 0x31" : "=A" (x));
+ return x;
+}
+
+#elif defined(__x86_64__)
+static __inline__ unsigned long long rdtsc(void)
+{
+ unsigned hi, lo;
+ __asm__ __volatile__ ("rdtsc" : "=a"(lo), "=d"(hi));
+ return ( (unsigned long long)lo)|( ((unsigned long long)hi)<<32 );
+}
+
+#elif defined(__powerpc__)
+static __inline__ unsigned long long rdtsc(void)
+{
+ unsigned long long int result=0;
+ unsigned long int upper, lower,tmp;
+ __asm__ volatile(
+ "0: \n"
+ "\tmftbu %0 \n"
+ "\tmftb %1 \n"
+ "\tmftbu %2 \n"
+ "\tcmpw %2,%0 \n"
+ "\tbne 0b \n"
+ : "=r"(upper),"=r"(lower),"=r"(tmp)
+ );
+ result = upper;
+ result = result<<32;
+ result = result|lower;
+
+ return(result);
+}
+#endif
/*--------------------------------------------------------------------*/
/* Default Constructor initialise values to -1; */
@@ -43,9 +80,9 @@
{
cout << "Calibrating:" << dec<< s << " seconds." << endl;
}
- rdtsc(start);
+ start=rdtsc();
PORTABLE_SLEEP_FUNC;
- rdtsc(stop);
+ stop=rdtsc();
tick_per_second = (unsigned long long) ( stop - start );
tick_per_second = (tick_per_second / s);
if (verbose)
@@ -60,7 +97,7 @@
/*--------------------------------------------------------------------*/
void PrecisionTimer::start()
{
- rdtsc(T0);
+ T0=rdtsc();
}
/*--------------------------------------------------------------------*/
@@ -74,7 +111,7 @@
{
bool ret = false;
- rdtsc(T1);
+ T1=rdtsc();
if (mode == CUMULATIVE)
{
cumulative_buffer[cumul_buffer_index] = getOneShotDuration();
osmose-0.8.2-usesystemlibraries.patch:
--- NEW FILE osmose-0.8.2-usesystemlibraries.patch ---
diff -durN Osmose.orig/Makefile Osmose/Makefile
--- Osmose.orig/Makefile 2006-11-29 16:18:08.000000000 +0100
+++ Osmose/Makefile 2008-01-19 14:14:44.000000000 +0100
@@ -1,11 +1,3 @@
-#Zlib
-Z_LIB_DIR= ./zlib/
-Z_LIB = $(Z_LIB_DIR)libz.a
-
-#unzip based on zlib.
-UNZIP_DIR= ./unzip/
-UNZIP_LIB= $(UNZIP_DIR)unzip.a
-
DISASM_DIR = ./z80_disasm
# Uncomment these lines before builting with internal debugger.
@@ -54,7 +46,7 @@
# Compiler/Linker Flags
# add -O3 to CFLAGS for speedup -pg on LFLAGS and CFLAGS for gprof
CFLAGS = -Wall -D__USE_UNIX98 -O3
-LFLAGS = -lSDL
+LFLAGS = -lz -lminizip -lSDL
AFLAGS = -f elf
CC = g++
C_COMP = gcc
@@ -64,10 +56,10 @@
.cpp.o:
$(CC) $(CFLAGS) -c $*.cpp -o $*.o
-all: libs disasm osmose stripexe
+all: disasm osmose
osmose: $(z80_lib) $(OSM_OBJS) $(OPT_OBJS)
- $(CC) $(CFLAGS) $(OSM_OBJS) $(Z80_LIB) $(OPT_OBJS) $(UNZIP_LIB) $(Z_LIB) -o $(OSM_EXE) $(LFLAGS)
+ $(CC) $(CFLAGS) $(OSM_OBJS) $(Z80_LIB) $(OPT_OBJS) -o $(OSM_EXE) $(LFLAGS)
disasm: $(DISASM_OBJS)
@@ -78,19 +70,12 @@
rm -f $(DISASM_DIR)/*.o
rm -f ./cpu/*.o
rm -f *.o core $(OSM_EXE)
- rm -f $(Z_LIB_DIR)*.o $(Z_LIB_DIR)*.a
- rm -f $(UNZIP_DIR)*.o $(UNZIP_DIR)*.a
-# Clear all objects except ./cpu and zlib.
+# Clear all objects except ./cpu.
# This is done because compilation of CPU is long.
miniclean:
rm -f *.o core $(OSM_EXE)
-libs:
- cd $(Z_LIB_DIR) && make libz.a
- cd $(UNZIP_DIR) && make unzip.a
-
-
diff -durN Osmose.orig/MemoryMapper.h Osmose/MemoryMapper.h
--- Osmose.orig/MemoryMapper.h 2006-11-27 18:52:42.000000000 +0100
+++ Osmose/MemoryMapper.h 2008-01-19 12:21:57.000000000 +0100
@@ -17,7 +17,7 @@
#include <iostream>
#include <fstream>
#include <iomanip>
-#include "unzip/unzip.h"
+#include <minizip/unzip.h>
#include "Options.h"
#include "Definitions.h"
#include "DebugEventThrower.h"
--- NEW FILE osmose.spec ---
%define pkgversion %(echo %version|sed s/\\\\\./-/g)
Name: osmose
Version: 0.8.2
Release: 3%{?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}/%{name}-%{pkgversion}-src.zip
# Andrea Musuruane
Patch0: %{name}-0.8.2-usesystemlibraries.patch
# Ian Chapman
Patch1: %{name}-0.8.2-newtimer.patch
Patch2: %{name}-0.8.2-fixppcaudio.patch
Patch3: %{name}-0.8.2-gcc43fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
BuildRequires: minizip-devel
%description
Osmose is another Sega Master System / Gamegear emulator.
%prep
%setup -q -n Osmose
%patch0 -p1
%patch1 -p1
%ifarch ppc ppc64
%patch2 -p1
%endif
%patch3 -p1
# Fix end-of-line encoding
sed -i 's/\r//' *.txt *.{cpp,h} cpu/*.{cpp,h}
# Fix spurious executable permissions
chmod 644 cpu/*.{cpp,h}
%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
%install
rm -rf %{buildroot}
install -d -m 0755 %{buildroot}%{_bindir}
install -m 755 %{name} %{buildroot}%{_bindir}/%{name}
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%{_bindir}/%{name}
%doc changes.txt license.txt readme.txt
%changelog
* Sat Feb 02 2008 Andrea Musuruane <musuruan(a)gmail.com> - 0.8.2-3
- Added a patch by Ian Chapman to compile with gcc 4.3.
- Timer timer patch has been updated by Ian to compile with gcc 4.3.
* Wed Jan 30 2008 Andrea Musuruane <musuruan(a)gmail.com> - 0.8.2-2
- Improved macro usage.
- Corrected License tag to reflect statement in main.cpp.
- Added patches by Ian Chapman to make osmose work on ppc.
* Sat Jan 19 2008 Andrea Musuruane <musuruan(a)gmail.com> - 0.8.2-1
- First release for Dribble/RPM Fusion.
- Made a patch to use system libraries and not to strip binary file.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/osmose/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jun 2008 12:19:01 -0000 1.1
+++ .cvsignore 19 Jul 2008 19:06:26 -0000 1.2
@@ -0,0 +1 @@
+osmose-0-8-2-src.zip
Index: sources
===================================================================
RCS file: /cvs/free/rpms/osmose/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jun 2008 12:19:01 -0000 1.1
+++ sources 19 Jul 2008 19:06:26 -0000 1.2
@@ -0,0 +1 @@
+f1b3ba02f1641eb88e15b16b0caabbe6 osmose-0-8-2-src.zip
16 years, 4 months
- 1
- 0
rpms/osmose/devel osmose-0.8.2-fixppcaudio.patch, NONE, 1.1 osmose-0.8.2-gcc43fix.patch, NONE, 1.1 osmose-0.8.2-newtimer.patch, NONE, 1.1 osmose-0.8.2-usesystemlibraries.patch, NONE, 1.1 osmose.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/osmose/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3164/devel
Modified Files:
.cvsignore sources
Added Files:
osmose-0.8.2-fixppcaudio.patch osmose-0.8.2-gcc43fix.patch
osmose-0.8.2-newtimer.patch
osmose-0.8.2-usesystemlibraries.patch osmose.spec
Log Message:
First import
osmose-0.8.2-fixppcaudio.patch:
--- NEW FILE osmose-0.8.2-fixppcaudio.patch ---
--- Osmose/OsmoseCore.cpp.orig 2007-06-08 08:38:34.000000000 +0100
+++ Osmose/OsmoseCore.cpp 2008-01-29 20:11:31.000000000 +0000
@@ -598,7 +598,7 @@
void OsmoseCore::setupAudioFormat()
{
format.freq = 22050;
- format.format = AUDIO_S16LSB;
+ format.format = AUDIO_S16MSB;
format.channels = 1;
format.samples = SAMPLE_SIZE;
format.callback = sndCallback;
osmose-0.8.2-gcc43fix.patch:
--- NEW FILE osmose-0.8.2-gcc43fix.patch ---
--- Osmose/MemoryMapper.cpp.orig 2006-11-27 17:56:30.000000000 +0000
+++ Osmose/MemoryMapper.cpp 2008-02-01 21:31:34.000000000 +0000
@@ -16,6 +16,8 @@
#include "Options.h"
#include "RomSpecificOption.h"
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
extern Options opt;
--- Osmose/Options.cpp.orig 2006-11-24 10:35:30.000000000 +0000
+++ Osmose/Options.cpp 2008-02-01 21:30:20.000000000 +0000
@@ -14,6 +14,7 @@
*****************************************************************************/
#include "Options.h"
#include "MemoryMapper.h"
+#include <string.h>
void Options::reset()
{
--- Osmose/WaveWriter.cpp.orig 2006-11-06 11:08:38.000000000 +0000
+++ Osmose/WaveWriter.cpp 2008-02-01 21:42:32.000000000 +0000
@@ -13,6 +13,7 @@
* URL: http://bcz.emu-france.com/
*****************************************************************************/
#include "WaveWriter.h"
+#include <stdlib.h>
/*----------------------------------------------------------------------*/
/* Constructor: Initialise structures ChunkFormat, Data Format, and */
osmose-0.8.2-newtimer.patch:
--- NEW FILE osmose-0.8.2-newtimer.patch ---
--- Osmose/PrecisionTimer.cpp.orig 2006-11-06 11:08:38.000000000 +0000
+++ Osmose/PrecisionTimer.cpp 2008-02-01 21:39:17.000000000 +0000
@@ -12,8 +12,45 @@
* URL: http://bcz.emu-france.com/
*****************************************************************************/
#include "PrecisionTimer.h"
+#include <stdlib.h>
-#define rdtsc(val) __asm__ __volatile__ ("rdtsc" : "=A" (val))
+#if defined(__i386__)
+static __inline__ unsigned long long rdtsc(void)
+{
+ unsigned long long int x;
+ __asm__ volatile (".byte 0x0f, 0x31" : "=A" (x));
+ return x;
+}
+
+#elif defined(__x86_64__)
+static __inline__ unsigned long long rdtsc(void)
+{
+ unsigned hi, lo;
+ __asm__ __volatile__ ("rdtsc" : "=a"(lo), "=d"(hi));
+ return ( (unsigned long long)lo)|( ((unsigned long long)hi)<<32 );
+}
+
+#elif defined(__powerpc__)
+static __inline__ unsigned long long rdtsc(void)
+{
+ unsigned long long int result=0;
+ unsigned long int upper, lower,tmp;
+ __asm__ volatile(
+ "0: \n"
+ "\tmftbu %0 \n"
+ "\tmftb %1 \n"
+ "\tmftbu %2 \n"
+ "\tcmpw %2,%0 \n"
+ "\tbne 0b \n"
+ : "=r"(upper),"=r"(lower),"=r"(tmp)
+ );
+ result = upper;
+ result = result<<32;
+ result = result|lower;
+
+ return(result);
+}
+#endif
/*--------------------------------------------------------------------*/
/* Default Constructor initialise values to -1; */
@@ -43,9 +80,9 @@
{
cout << "Calibrating:" << dec<< s << " seconds." << endl;
}
- rdtsc(start);
+ start=rdtsc();
PORTABLE_SLEEP_FUNC;
- rdtsc(stop);
+ stop=rdtsc();
tick_per_second = (unsigned long long) ( stop - start );
tick_per_second = (tick_per_second / s);
if (verbose)
@@ -60,7 +97,7 @@
/*--------------------------------------------------------------------*/
void PrecisionTimer::start()
{
- rdtsc(T0);
+ T0=rdtsc();
}
/*--------------------------------------------------------------------*/
@@ -74,7 +111,7 @@
{
bool ret = false;
- rdtsc(T1);
+ T1=rdtsc();
if (mode == CUMULATIVE)
{
cumulative_buffer[cumul_buffer_index] = getOneShotDuration();
osmose-0.8.2-usesystemlibraries.patch:
--- NEW FILE osmose-0.8.2-usesystemlibraries.patch ---
diff -durN Osmose.orig/Makefile Osmose/Makefile
--- Osmose.orig/Makefile 2006-11-29 16:18:08.000000000 +0100
+++ Osmose/Makefile 2008-01-19 14:14:44.000000000 +0100
@@ -1,11 +1,3 @@
-#Zlib
-Z_LIB_DIR= ./zlib/
-Z_LIB = $(Z_LIB_DIR)libz.a
-
-#unzip based on zlib.
-UNZIP_DIR= ./unzip/
-UNZIP_LIB= $(UNZIP_DIR)unzip.a
-
DISASM_DIR = ./z80_disasm
# Uncomment these lines before builting with internal debugger.
@@ -54,7 +46,7 @@
# Compiler/Linker Flags
# add -O3 to CFLAGS for speedup -pg on LFLAGS and CFLAGS for gprof
CFLAGS = -Wall -D__USE_UNIX98 -O3
-LFLAGS = -lSDL
+LFLAGS = -lz -lminizip -lSDL
AFLAGS = -f elf
CC = g++
C_COMP = gcc
@@ -64,10 +56,10 @@
.cpp.o:
$(CC) $(CFLAGS) -c $*.cpp -o $*.o
-all: libs disasm osmose stripexe
+all: disasm osmose
osmose: $(z80_lib) $(OSM_OBJS) $(OPT_OBJS)
- $(CC) $(CFLAGS) $(OSM_OBJS) $(Z80_LIB) $(OPT_OBJS) $(UNZIP_LIB) $(Z_LIB) -o $(OSM_EXE) $(LFLAGS)
+ $(CC) $(CFLAGS) $(OSM_OBJS) $(Z80_LIB) $(OPT_OBJS) -o $(OSM_EXE) $(LFLAGS)
disasm: $(DISASM_OBJS)
@@ -78,19 +70,12 @@
rm -f $(DISASM_DIR)/*.o
rm -f ./cpu/*.o
rm -f *.o core $(OSM_EXE)
- rm -f $(Z_LIB_DIR)*.o $(Z_LIB_DIR)*.a
- rm -f $(UNZIP_DIR)*.o $(UNZIP_DIR)*.a
-# Clear all objects except ./cpu and zlib.
+# Clear all objects except ./cpu.
# This is done because compilation of CPU is long.
miniclean:
rm -f *.o core $(OSM_EXE)
-libs:
- cd $(Z_LIB_DIR) && make libz.a
- cd $(UNZIP_DIR) && make unzip.a
-
-
diff -durN Osmose.orig/MemoryMapper.h Osmose/MemoryMapper.h
--- Osmose.orig/MemoryMapper.h 2006-11-27 18:52:42.000000000 +0100
+++ Osmose/MemoryMapper.h 2008-01-19 12:21:57.000000000 +0100
@@ -17,7 +17,7 @@
#include <iostream>
#include <fstream>
#include <iomanip>
-#include "unzip/unzip.h"
+#include <minizip/unzip.h>
#include "Options.h"
#include "Definitions.h"
#include "DebugEventThrower.h"
--- NEW FILE osmose.spec ---
%define pkgversion %(echo %version|sed s/\\\\\./-/g)
Name: osmose
Version: 0.8.2
Release: 3%{?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}/%{name}-%{pkgversion}-src.zip
# Andrea Musuruane
Patch0: %{name}-0.8.2-usesystemlibraries.patch
# Ian Chapman
Patch1: %{name}-0.8.2-newtimer.patch
Patch2: %{name}-0.8.2-fixppcaudio.patch
Patch3: %{name}-0.8.2-gcc43fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
BuildRequires: minizip-devel
%description
Osmose is another Sega Master System / Gamegear emulator.
%prep
%setup -q -n Osmose
%patch0 -p1
%patch1 -p1
%ifarch ppc ppc64
%patch2 -p1
%endif
%patch3 -p1
# Fix end-of-line encoding
sed -i 's/\r//' *.txt *.{cpp,h} cpu/*.{cpp,h}
# Fix spurious executable permissions
chmod 644 cpu/*.{cpp,h}
%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
%install
rm -rf %{buildroot}
install -d -m 0755 %{buildroot}%{_bindir}
install -m 755 %{name} %{buildroot}%{_bindir}/%{name}
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%{_bindir}/%{name}
%doc changes.txt license.txt readme.txt
%changelog
* Sat Feb 02 2008 Andrea Musuruane <musuruan(a)gmail.com> - 0.8.2-3
- Added a patch by Ian Chapman to compile with gcc 4.3.
- Timer timer patch has been updated by Ian to compile with gcc 4.3.
* Wed Jan 30 2008 Andrea Musuruane <musuruan(a)gmail.com> - 0.8.2-2
- Improved macro usage.
- Corrected License tag to reflect statement in main.cpp.
- Added patches by Ian Chapman to make osmose work on ppc.
* Sat Jan 19 2008 Andrea Musuruane <musuruan(a)gmail.com> - 0.8.2-1
- First release for Dribble/RPM Fusion.
- Made a patch to use system libraries and not to strip binary file.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/osmose/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jun 2008 12:19:01 -0000 1.1
+++ .cvsignore 19 Jul 2008 19:04:43 -0000 1.2
@@ -0,0 +1 @@
+osmose-0-8-2-src.zip
Index: sources
===================================================================
RCS file: /cvs/free/rpms/osmose/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jun 2008 12:19:01 -0000 1.1
+++ sources 19 Jul 2008 19:04:43 -0000 1.2
@@ -0,0 +1 @@
+f1b3ba02f1641eb88e15b16b0caabbe6 osmose-0-8-2-src.zip
16 years, 4 months
- 1
- 0
rpms/gfceu/F-8 gfceu.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/gfceu/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2542/F-8
Modified Files:
.cvsignore sources
Added Files:
gfceu.spec
Log Message:
First import
--- NEW FILE gfceu.spec ---
Summary: GFCE Ultra Nintendo Emulator frontend
Name: gfceu
Version: 0.6.0
Release: 2%{?dist}
License: GPLv2+
Group: Applications/Emulators
URL: http://dietschnitzel.com/gfceu/
Source: http://dietschnitzel.com/gfceu/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: desktop-file-utils
Requires: pygtk2-libglade
Requires: alsa-oss
Requires: fceultra
Requires: hicolor-icon-theme
%description
GFCE Ultra is an intuitive interface for the popular Nintendo Emulator,
FCE Ultra. It is designed for the GNOME desktop, and allows the user to
easily play NES ROM images. Gfceu sports a number of features, including:
* Network play
* Custom input configuration
* Fullscreen support
* OpenGL support
* Sound support
* High compatibility, accurate emulation, and all the power of FCE Ultra!
GNOME FCE Ultra is developed and maintained by Lukas Sabota.
%prep
%setup -q
# Fix .desktop file Categories
sed -i 's/GNOME;GTK;Game;/Game;Emulator;/' %{name}.desktop
# Patch to run fceultra instead of fceu
sed -i 's/'\''fceu'\''/'\''fceultra'\''/' gfceu
%build
%install
rm -rf %{buildroot}
install -d %{buildroot}%{_bindir}
install -m 755 gfceu %{buildroot}%{_bindir}
install -d %{buildroot}%{_datadir}/%{name}
install -m 644 {gfceu.glade,gfceu.png,gfceu_big.png} %{buildroot}%{_datadir}/%{name}
install -d %{buildroot}%{_mandir}/man1
install -m 644 gfceu.1 %{buildroot}%{_mandir}/man1
# install desktop file and icon
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor dribble \
--dir %{buildroot}%{_datadir}/applications \
%{name}.desktop
install -d %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
install -p %{name}.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
%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}/gfceu
%{_datadir}/%{name}/*
%{_mandir}/man1/*
%{_datadir}/applications/dribble-%{name}.desktop
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%doc ChangeLog COPYING TODO
%changelog
* Fri Nov 02 2007 Andrea Musuruane <musuruan(a)gmail.com> 0.6.0-2
- Changed license due to new guidelines
- Removed %%{?dist} tag from changelog
- Updated icon cache scriptlets to be compliant to new guidelines
* Thu Mar 01 2007 Andrea Musuruane <musuruan(a)gmail.com> 0.6.0-1
- Updated to latest 0.6.0.
- Added now required alsa-oss to BR
- Updated URL and Source tag.
- Dropped dribble-menus Requires.
- Dropped --add-category X-Fedora from desktop-file-install.
- Dropped .desktop file patch. Now using sed.
- fceu has been renamed to fceultra to avoid conflicts (Dribble #77).
* Mon Oct 23 2006 Andrea Musuruane <musuruan(a)gmail.com> 0.5.2-2
- Added hicolor-icon-theme to Requires.
- Package fceu has been renamed fceultra. Changed the Requires tag accorgingly.
* Sat Oct 21 2006 Andrea Musuruane <musuruan(a)gmail.com> 0.5.2-1
- First release for Dribble based on mde RPM
- Updated to 0.5.2
* Mon Aug 28 2006 Torbjorn Turpeinen <tobbe(a)nyvalls.se> 0.5-1
- Rebuild for mde
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gfceu/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jun 2008 11:49:59 -0000 1.1
+++ .cvsignore 19 Jul 2008 18:59:22 -0000 1.2
@@ -0,0 +1 @@
+gfceu-0.6.0.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gfceu/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jun 2008 11:49:59 -0000 1.1
+++ sources 19 Jul 2008 18:59:22 -0000 1.2
@@ -0,0 +1 @@
+365364fb0811dff3207a0f63a2730983 gfceu-0.6.0.tar.gz
16 years, 4 months
- 1
- 0
rpms/gfceu/F-9 gfceu.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/gfceu/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2103/F-9
Modified Files:
.cvsignore sources
Added Files:
gfceu.spec
Log Message:
First import
--- NEW FILE gfceu.spec ---
Summary: GFCE Ultra Nintendo Emulator frontend
Name: gfceu
Version: 0.6.0
Release: 2%{?dist}
License: GPLv2+
Group: Applications/Emulators
URL: http://dietschnitzel.com/gfceu/
Source: http://dietschnitzel.com/gfceu/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: desktop-file-utils
Requires: pygtk2-libglade
Requires: alsa-oss
Requires: fceultra
Requires: hicolor-icon-theme
%description
GFCE Ultra is an intuitive interface for the popular Nintendo Emulator,
FCE Ultra. It is designed for the GNOME desktop, and allows the user to
easily play NES ROM images. Gfceu sports a number of features, including:
* Network play
* Custom input configuration
* Fullscreen support
* OpenGL support
* Sound support
* High compatibility, accurate emulation, and all the power of FCE Ultra!
GNOME FCE Ultra is developed and maintained by Lukas Sabota.
%prep
%setup -q
# Fix .desktop file Categories
sed -i 's/GNOME;GTK;Game;/Game;Emulator;/' %{name}.desktop
# Patch to run fceultra instead of fceu
sed -i 's/'\''fceu'\''/'\''fceultra'\''/' gfceu
%build
%install
rm -rf %{buildroot}
install -d %{buildroot}%{_bindir}
install -m 755 gfceu %{buildroot}%{_bindir}
install -d %{buildroot}%{_datadir}/%{name}
install -m 644 {gfceu.glade,gfceu.png,gfceu_big.png} %{buildroot}%{_datadir}/%{name}
install -d %{buildroot}%{_mandir}/man1
install -m 644 gfceu.1 %{buildroot}%{_mandir}/man1
# install desktop file and icon
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor dribble \
--dir %{buildroot}%{_datadir}/applications \
%{name}.desktop
install -d %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
install -p %{name}.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
%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}/gfceu
%{_datadir}/%{name}/*
%{_mandir}/man1/*
%{_datadir}/applications/dribble-%{name}.desktop
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%doc ChangeLog COPYING TODO
%changelog
* Fri Nov 02 2007 Andrea Musuruane <musuruan(a)gmail.com> 0.6.0-2
- Changed license due to new guidelines
- Removed %%{?dist} tag from changelog
- Updated icon cache scriptlets to be compliant to new guidelines
* Thu Mar 01 2007 Andrea Musuruane <musuruan(a)gmail.com> 0.6.0-1
- Updated to latest 0.6.0.
- Added now required alsa-oss to BR
- Updated URL and Source tag.
- Dropped dribble-menus Requires.
- Dropped --add-category X-Fedora from desktop-file-install.
- Dropped .desktop file patch. Now using sed.
- fceu has been renamed to fceultra to avoid conflicts (Dribble #77).
* Mon Oct 23 2006 Andrea Musuruane <musuruan(a)gmail.com> 0.5.2-2
- Added hicolor-icon-theme to Requires.
- Package fceu has been renamed fceultra. Changed the Requires tag accorgingly.
* Sat Oct 21 2006 Andrea Musuruane <musuruan(a)gmail.com> 0.5.2-1
- First release for Dribble based on mde RPM
- Updated to 0.5.2
* Mon Aug 28 2006 Torbjorn Turpeinen <tobbe(a)nyvalls.se> 0.5-1
- Rebuild for mde
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gfceu/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jun 2008 11:49:59 -0000 1.1
+++ .cvsignore 19 Jul 2008 18:58:44 -0000 1.2
@@ -0,0 +1 @@
+gfceu-0.6.0.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gfceu/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jun 2008 11:49:59 -0000 1.1
+++ sources 19 Jul 2008 18:58:44 -0000 1.2
@@ -0,0 +1 @@
+365364fb0811dff3207a0f63a2730983 gfceu-0.6.0.tar.gz
16 years, 4 months
- 1
- 0
rpms/gfceu/devel gfceu.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/gfceu/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1807/devel
Modified Files:
.cvsignore sources
Added Files:
gfceu.spec
Log Message:
First import
--- NEW FILE gfceu.spec ---
Summary: GFCE Ultra Nintendo Emulator frontend
Name: gfceu
Version: 0.6.0
Release: 2%{?dist}
License: GPLv2+
Group: Applications/Emulators
URL: http://dietschnitzel.com/gfceu/
Source: http://dietschnitzel.com/gfceu/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: desktop-file-utils
Requires: pygtk2-libglade
Requires: alsa-oss
Requires: fceultra
Requires: hicolor-icon-theme
%description
GFCE Ultra is an intuitive interface for the popular Nintendo Emulator,
FCE Ultra. It is designed for the GNOME desktop, and allows the user to
easily play NES ROM images. Gfceu sports a number of features, including:
* Network play
* Custom input configuration
* Fullscreen support
* OpenGL support
* Sound support
* High compatibility, accurate emulation, and all the power of FCE Ultra!
GNOME FCE Ultra is developed and maintained by Lukas Sabota.
%prep
%setup -q
# Fix .desktop file Categories
sed -i 's/GNOME;GTK;Game;/Game;Emulator;/' %{name}.desktop
# Patch to run fceultra instead of fceu
sed -i 's/'\''fceu'\''/'\''fceultra'\''/' gfceu
%build
%install
rm -rf %{buildroot}
install -d %{buildroot}%{_bindir}
install -m 755 gfceu %{buildroot}%{_bindir}
install -d %{buildroot}%{_datadir}/%{name}
install -m 644 {gfceu.glade,gfceu.png,gfceu_big.png} %{buildroot}%{_datadir}/%{name}
install -d %{buildroot}%{_mandir}/man1
install -m 644 gfceu.1 %{buildroot}%{_mandir}/man1
# install desktop file and icon
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor dribble \
--dir %{buildroot}%{_datadir}/applications \
%{name}.desktop
install -d %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
install -p %{name}.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
%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}/gfceu
%{_datadir}/%{name}/*
%{_mandir}/man1/*
%{_datadir}/applications/dribble-%{name}.desktop
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%doc ChangeLog COPYING TODO
%changelog
* Fri Nov 02 2007 Andrea Musuruane <musuruan(a)gmail.com> 0.6.0-2
- Changed license due to new guidelines
- Removed %%{?dist} tag from changelog
- Updated icon cache scriptlets to be compliant to new guidelines
* Thu Mar 01 2007 Andrea Musuruane <musuruan(a)gmail.com> 0.6.0-1
- Updated to latest 0.6.0.
- Added now required alsa-oss to BR
- Updated URL and Source tag.
- Dropped dribble-menus Requires.
- Dropped --add-category X-Fedora from desktop-file-install.
- Dropped .desktop file patch. Now using sed.
- fceu has been renamed to fceultra to avoid conflicts (Dribble #77).
* Mon Oct 23 2006 Andrea Musuruane <musuruan(a)gmail.com> 0.5.2-2
- Added hicolor-icon-theme to Requires.
- Package fceu has been renamed fceultra. Changed the Requires tag accorgingly.
* Sat Oct 21 2006 Andrea Musuruane <musuruan(a)gmail.com> 0.5.2-1
- First release for Dribble based on mde RPM
- Updated to 0.5.2
* Mon Aug 28 2006 Torbjorn Turpeinen <tobbe(a)nyvalls.se> 0.5-1
- Rebuild for mde
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gfceu/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jun 2008 11:49:59 -0000 1.1
+++ .cvsignore 19 Jul 2008 18:58:09 -0000 1.2
@@ -0,0 +1 @@
+gfceu-0.6.0.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gfceu/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jun 2008 11:49:59 -0000 1.1
+++ sources 19 Jul 2008 18:58:09 -0000 1.2
@@ -0,0 +1 @@
+365364fb0811dff3207a0f63a2730983 gfceu-0.6.0.tar.gz
16 years, 4 months
- 1
- 0
rpms/gnuboy/F-8 gnuboy-1.0.3-manpages.patch, NONE, 1.1 gnuboy-1.0.3-s64.patch, NONE, 1.1 gnuboy-1.0.3-xgnuboy.patch, NONE, 1.1 gnuboy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/gnuboy/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1617/F-8
Modified Files:
.cvsignore sources
Added Files:
gnuboy-1.0.3-manpages.patch gnuboy-1.0.3-s64.patch
gnuboy-1.0.3-xgnuboy.patch gnuboy.spec
Log Message:
First import
gnuboy-1.0.3-manpages.patch:
--- NEW FILE gnuboy-1.0.3-manpages.patch ---
--- gnuboy-1.0.3.orig/sdlgnuboy.1
+++ gnuboy-1.0.3/sdlgnuboy.1
@@ -0,0 +1,41 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
+.TH SDLGNUBOY "1" "July 2001"
+.SH NAME
+sdlgnuboy \- gnuboy Game Boy Emulator.
+.SH SYNOPSIS
+.B sdlgnuboy
+[\fIoptions\fR] \fIromfile\fR
+.SH DESCRIPTION
+.TP
+\fB\-\-source\fR FILE
+read rc commands from FILE
+.TP
+\fB\-\-bind\fR KEY COMMAND
+bind KEY to perform COMMAND
+.TP
+\fB\-\-VAR\fR=\fIVALUE\fR
+set rc variable VAR to VALUE
+.TP
+\fB\-\-VAR\fR
+set VAR to 1 (turn on boolean options)
+.TP
+\fB\-\-no\-VAR\fR
+set VAR to 0 (turn off boolean options)
+.TP
+\fB\-\-showvars\fR
+list all available rc variables
+.TP
+\fB\-\-help\fR
+display this help and exit
+.TP
+\fB\-\-version\fR
+output version information and exit
+.TP
+\fB\-\-copying\fR
+show copying permissions
+.SH AUTHOR
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+This manual page was written by Davide Puricelli <evo(a)debian.org>,
+for the Debian GNU/Linux system (but may be used by others).
--- gnuboy-1.0.3.orig/sgnuboy.1
+++ gnuboy-1.0.3/sgnuboy.1
@@ -0,0 +1,41 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
+.TH SGNUBOY "1" "July 2001"
+.SH NAME
+sgnuboy \- gnuboy Game Boy Emulator.
+.SH SYNOPSIS
+.B sgnuboy
+[\fIoptions\fR] \fIromfile\fR
+.SH DESCRIPTION
+.TP
+\fB\-\-source\fR FILE
+read rc commands from FILE
+.TP
+\fB\-\-bind\fR KEY COMMAND
+bind KEY to perform COMMAND
+.TP
+\fB\-\-VAR\fR=\fIVALUE\fR
+set rc variable VAR to VALUE
+.TP
+\fB\-\-VAR\fR
+set VAR to 1 (turn on boolean options)
+.TP
+\fB\-\-no\-VAR\fR
+set VAR to 0 (turn off boolean options)
+.TP
+\fB\-\-showvars\fR
+list all available rc variables
+.TP
+\fB\-\-help\fR
+display this help and exit
+.TP
+\fB\-\-version\fR
+output version information and exit
+.TP
+\fB\-\-copying\fR
+show copying permissions
+.SH AUTHOR
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+This manual page was written by Davide Puricelli <evo(a)debian.org>,
+for the Debian GNU/Linux system (but may be used by others).
--- gnuboy-1.0.3.orig/xgnuboy.1
+++ gnuboy-1.0.3/xgnuboy.1
@@ -0,0 +1,41 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
+.TH XGNUBOY "1" "July 2001"
+.SH NAME
+xgnuboy \- gnuboy Game Boy Emulator.
+.SH SYNOPSIS
+.B xgnuboy
+[\fIoptions\fR] \fIromfile\fR
+.SH DESCRIPTION
+.TP
+\fB\-\-source\fR FILE
+read rc commands from FILE
+.TP
+\fB\-\-bind\fR KEY COMMAND
+bind KEY to perform COMMAND
+.TP
+\fB\-\-VAR\fR=\fIVALUE\fR
+set rc variable VAR to VALUE
+.TP
+\fB\-\-VAR\fR
+set VAR to 1 (turn on boolean options)
+.TP
+\fB\-\-no\-VAR\fR
+set VAR to 0 (turn off boolean options)
+.TP
+\fB\-\-showvars\fR
+list all available rc variables
+.TP
+\fB\-\-help\fR
+display this help and exit
+.TP
+\fB\-\-version\fR
+output version information and exit
+.TP
+\fB\-\-copying\fR
+show copying permissions
+.SH AUTHOR
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+This manual page was written by Davide Puricelli <evo(a)debian.org>,
+for the Debian GNU/Linux system (but may be used by others).
gnuboy-1.0.3-s64.patch:
--- NEW FILE gnuboy-1.0.3-s64.patch ---
diff -Naupr gnuboy-1.0.3.orig/sys/linux/joy.c gnuboy-1.0.3/sys/linux/joy.c
--- gnuboy-1.0.3.orig/sys/linux/joy.c 2001-09-23 20:01:18.000000000 +0200
+++ gnuboy-1.0.3/sys/linux/joy.c 2006-10-17 16:13:53.000000000 +0200
@@ -3,6 +3,8 @@
#include <stdlib.h>
#include <string.h>
char *strdup();
+typedef __signed__ long long __s64;
+typedef unsigned long long __u64;
#include <linux/joystick.h>
#include <sys/types.h>
#include <sys/stat.h>
gnuboy-1.0.3-xgnuboy.patch:
--- NEW FILE gnuboy-1.0.3-xgnuboy.patch ---
--- gnuboy-1.0.3/sys/x11/xlib.c Sun Sep 23 21:01:10 2001
+++ gnuboy-1.0.3-nk/sys/x11/xlib.c Tue Oct 26 12:09:27 2004
@@ -60,24 +60,8 @@ static char *x_displayname;
static Display *x_display;
static int x_screen;
-static struct
-{
- int bits;
- int vc;
- int bytes;
-} x_vissup[] =
-{
- { 8, PseudoColor, 1 },
- { 15, TrueColor, 2 },
- { 16, TrueColor, 2 },
- { 32, TrueColor, 4 },
- { 24, TrueColor, 3 },
- { 0, 0, 0 }
-};
-
static int x_bits, x_bytes;
static Visual *x_vis;
-static XVisualInfo x_visinfo;
static int x_pseudo;
static Colormap x_cmap;
static XColor x_ctable[256];
@@ -94,7 +78,7 @@ static GC x_gc;
static XSizeHints x_size;
static XWMHints x_wmhints;
-/*static XClassHint x_class;*/
+static XClassHint x_class;
#ifdef USE_XSHM
static XShmSegmentInfo x_shm;
@@ -247,25 +231,19 @@ void vid_init()
die("failed to connect to X display\n");
x_screen = DefaultScreen(x_display);
- for (i = 0; x_vissup[i].bits; i++)
- {
- if (XMatchVisualInfo(
- x_display, x_screen,
- x_vissup[i].bits, x_vissup[i].vc, &x_visinfo))
- {
- if (x_vissup[i].vc == PseudoColor)
- x_pseudo = 1;
- else
- x_pseudo = 0;
- x_bits = x_vissup[i].bits;
- x_bytes = x_vissup[i].bytes;
- break;
- }
- }
- if (!x_bits) die("no suitable X visuals\n");
- x_vis = x_visinfo.visual;
+ x_vis = DefaultVisual(x_display, x_screen);
if (!x_vis) die("X visual is NULL");
+ x_cmap = DefaultColormap(x_display, x_screen);
+ x_bits = DefaultDepth(x_display, x_screen);
+ x_bytes = x_bits >> 3;
+
+ /* NOTE: This code assumes that all 8-bit color displays are PseudoColor.
+ * This assumption is correct almost everywhere. */
+
+ if (x_bytes == 1)
+ x_pseudo = 1;
+
if (x_pseudo)
{
x_cmap = XCreateColormap(
@@ -324,8 +302,10 @@ void vid_init()
x_wmhints.flags = StateHint | InputHint;
XSetWMHints(x_display, x_win, &x_wmhints);
- /* FIXME - set X class info stuff (with XSetClassHint)... */
-
+ x_class.res_name = "xgnuboy";
+ x_class.res_class = "xgnuboy";
+ XSetClassHint(x_display, x_win, &x_class);
+
XMapWindow(x_display, x_win);
for(;;)
--- NEW FILE gnuboy.spec ---
Summary: Nintendo GameBoy Color emulator
Name: gnuboy
Version: 1.0.3
Release: 12%{?dist}
License: GPLv2
Group: Applications/Emulators
URL: http://brightrain.aerifal.cx/~laguna/
Source: http://brightrain.aerifal.cx/~laguna/src/%{name}-%{version}.tar.gz
Patch0: gnuboy-1.0.3-s64.patch
Patch1: gnuboy-1.0.3-xgnuboy.patch
Patch2: gnuboy-1.0.3-manpages.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: SDL-devel >= 1.2.0
BuildRequires: libXt-devel
%ifarch %{ix86} x86_64
BuildRequires: svgalib-devel
%endif
%package sdl
Summary: Nintendo GameBoy Color emulator (SDL version)
Group: Applications/Emulators
Obsoletes: gnuboy < 1.0.3-12
Provides: gnuboy = %{version}-%{release}
%package x
Summary: Nintendo GameBoy Color emulator (X version)
Group: Applications/Emulators
%package fb
Summary: Nintendo GameBoy Color emulator (frame buffer version)
Group: Applications/Emulators
%package svgalib
Summary: Nintendo GameBoy Color emulator (svgalib version)
Group: Applications/Emulators
%description
gnuboy (all lowercase) is a portable program for emulating the Nintendo
GameBoy Color software platform. gnuboy is Free Software, distributed
under the terms of the GNU General Public License. Our goal is to provide
a great emulator that runs on many platforms and is accessible for
everyone's enjoyment.
%description sdl
gnuboy (all lowercase) is a portable program for emulating the Nintendo
GameBoy Color software platform. gnuboy is Free Software, distributed
under the terms of the GNU General Public License. Our goal is to provide
a great emulator that runs on many platforms and is accessible for
everyone's enjoyment.
This is the SDL version.
%description x
gnuboy (all lowercase) is a portable program for emulating the Nintendo
GameBoy Color software platform. gnuboy is Free Software, distributed
under the terms of the GNU General Public License. Our goal is to provide
a great emulator that runs on many platforms and is accessible for
everyone's enjoyment.
This is the X version.
%description fb
gnuboy (all lowercase) is a portable program for emulating the Nintendo
GameBoy Color software platform. gnuboy is Free Software, distributed
under the terms of the GNU General Public License. Our goal is to provide
a great emulator that runs on many platforms and is accessible for
everyone's enjoyment.
This is the frame buffer version.
%description svgalib
gnuboy (all lowercase) is a portable program for emulating the Nintendo
GameBoy Color software platform. gnuboy is Free Software, distributed
under the terms of the GNU General Public License. Our goal is to provide
a great emulator that runs on many platforms and is accessible for
everyone's enjoyment.
This is the svgalib version.
%prep
%setup -q
%ifarch %{ix86} ppc
%patch0 -p1
%endif
%patch1 -p1
%patch2 -p1
%build
%ifarch %{ix86} x86_64
%configure --disable-arch --disable-optimize --disable-asm \
--with-sdl --with-x --with-fb --with-svgalib
%else
%configure --disable-arch --disable-optimize --disable-asm \
--with-sdl --with-x --with-fb
%endif
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
%makeinstall
#install man pages
install -d %{buildroot}%_mandir/man1
install -m 644 sdlgnuboy.1 %{buildroot}%{_mandir}/man1
install -m 644 xgnuboy.1 %{buildroot}%{_mandir}/man1
%ifarch %{ix86} x86_64
install -m 644 sgnuboy.1 %{buildroot}%{_mandir}/man1
%endif
%clean
rm -rf %{buildroot}
%files sdl
%defattr(-, root, root)
%{_bindir}/sdlgnuboy
%{_mandir}/man1/sdlgnuboy.1*
%doc COPYING README
%doc docs/{CHANGES,CONFIG,CREDITS,FAQ,LIBERTY,README.old,WHATSNEW}
%doc etc/*.rc
%files x
%defattr(-, root, root)
%{_bindir}/xgnuboy
%{_mandir}/man1/xgnuboy.1*
%doc COPYING README
%doc docs/{CHANGES,CONFIG,CREDITS,FAQ,LIBERTY,README.old,WHATSNEW}
%doc etc/*.rc
%files fb
%defattr(-, root, root)
%{_bindir}/fbgnuboy
%doc COPYING README
%doc docs/{CHANGES,CONFIG,CREDITS,FAQ,LIBERTY,README.old,WHATSNEW}
%doc etc/*.rc
%ifarch %{ix86} x86_64
%files svgalib
%defattr(-, root, root)
%{_bindir}/sgnuboy
%{_mandir}/man1/sgnuboy.1*
%doc COPYING README
%doc docs/{CHANGES,CONFIG,CREDITS,FAQ,LIBERTY,README.old,WHATSNEW}
%doc etc/*.rc
%endif
%changelog
* Fri Oct 05 2007 Andrea Musuruane <musuruan(a)gmail.com> 1.0.3-12
- bumping release to be higher than freshrpms (RPM Fusion merge)
- changed license due to new Fedora guidelines
- removed %%{?dist} tag from changelog
* Mon Apr 30 2007 Andrea Musuruane <musuruan(a)gmail.com> 1.0.3-5
- patch to force the definition of __s64 does not apply to x86_64
* Sat Apr 28 2007 Andrea Musuruane <musuruan(a)gmail.com> 1.0.3-4
- svgalib is only available to x86 and x64_64 archs.
* Wed Apr 25 2007 Andrea Musuruane <musuruan(a)gmail.com> 1.0.3-3
- added missing libXt-devel to BR
* Fri Apr 20 2007 Andrea Musuruane <musuruan(a)gmail.com> 1.0.3-2
- enabled X, fb and svgalib versions
- split versions into different subpackages
- added a patch by Nicholas J. Kain to run xgnuboy
- added man pages from Debian
- added patch to force definition of __s64 since when using -ansi on i386 it
doesn't get defined anymore (from freshrpms.net package)
* Fri Oct 20 2006 Andrea Musuruane <musuruan(a)gmail.com> 1.0.3-1
- initial package
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gnuboy/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jun 2008 11:51:44 -0000 1.1
+++ .cvsignore 19 Jul 2008 18:54:46 -0000 1.2
@@ -0,0 +1 @@
+gnuboy-1.0.3.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gnuboy/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jun 2008 11:51:44 -0000 1.1
+++ sources 19 Jul 2008 18:54:46 -0000 1.2
@@ -0,0 +1 @@
+9947162a208ebfe699a1bfe98c437ac3 gnuboy-1.0.3.tar.gz
16 years, 4 months
- 1
- 0
rpms/gnuboy/F-9 gnuboy-1.0.3-manpages.patch, NONE, 1.1 gnuboy-1.0.3-s64.patch, NONE, 1.1 gnuboy-1.0.3-xgnuboy.patch, NONE, 1.1 gnuboy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/gnuboy/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1099/F-9
Modified Files:
.cvsignore sources
Added Files:
gnuboy-1.0.3-manpages.patch gnuboy-1.0.3-s64.patch
gnuboy-1.0.3-xgnuboy.patch gnuboy.spec
Log Message:
First import
gnuboy-1.0.3-manpages.patch:
--- NEW FILE gnuboy-1.0.3-manpages.patch ---
--- gnuboy-1.0.3.orig/sdlgnuboy.1
+++ gnuboy-1.0.3/sdlgnuboy.1
@@ -0,0 +1,41 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
+.TH SDLGNUBOY "1" "July 2001"
+.SH NAME
+sdlgnuboy \- gnuboy Game Boy Emulator.
+.SH SYNOPSIS
+.B sdlgnuboy
+[\fIoptions\fR] \fIromfile\fR
+.SH DESCRIPTION
+.TP
+\fB\-\-source\fR FILE
+read rc commands from FILE
+.TP
+\fB\-\-bind\fR KEY COMMAND
+bind KEY to perform COMMAND
+.TP
+\fB\-\-VAR\fR=\fIVALUE\fR
+set rc variable VAR to VALUE
+.TP
+\fB\-\-VAR\fR
+set VAR to 1 (turn on boolean options)
+.TP
+\fB\-\-no\-VAR\fR
+set VAR to 0 (turn off boolean options)
+.TP
+\fB\-\-showvars\fR
+list all available rc variables
+.TP
+\fB\-\-help\fR
+display this help and exit
+.TP
+\fB\-\-version\fR
+output version information and exit
+.TP
+\fB\-\-copying\fR
+show copying permissions
+.SH AUTHOR
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+This manual page was written by Davide Puricelli <evo(a)debian.org>,
+for the Debian GNU/Linux system (but may be used by others).
--- gnuboy-1.0.3.orig/sgnuboy.1
+++ gnuboy-1.0.3/sgnuboy.1
@@ -0,0 +1,41 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
+.TH SGNUBOY "1" "July 2001"
+.SH NAME
+sgnuboy \- gnuboy Game Boy Emulator.
+.SH SYNOPSIS
+.B sgnuboy
+[\fIoptions\fR] \fIromfile\fR
+.SH DESCRIPTION
+.TP
+\fB\-\-source\fR FILE
+read rc commands from FILE
+.TP
+\fB\-\-bind\fR KEY COMMAND
+bind KEY to perform COMMAND
+.TP
+\fB\-\-VAR\fR=\fIVALUE\fR
+set rc variable VAR to VALUE
+.TP
+\fB\-\-VAR\fR
+set VAR to 1 (turn on boolean options)
+.TP
+\fB\-\-no\-VAR\fR
+set VAR to 0 (turn off boolean options)
+.TP
+\fB\-\-showvars\fR
+list all available rc variables
+.TP
+\fB\-\-help\fR
+display this help and exit
+.TP
+\fB\-\-version\fR
+output version information and exit
+.TP
+\fB\-\-copying\fR
+show copying permissions
+.SH AUTHOR
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+This manual page was written by Davide Puricelli <evo(a)debian.org>,
+for the Debian GNU/Linux system (but may be used by others).
--- gnuboy-1.0.3.orig/xgnuboy.1
+++ gnuboy-1.0.3/xgnuboy.1
@@ -0,0 +1,41 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
+.TH XGNUBOY "1" "July 2001"
+.SH NAME
+xgnuboy \- gnuboy Game Boy Emulator.
+.SH SYNOPSIS
+.B xgnuboy
+[\fIoptions\fR] \fIromfile\fR
+.SH DESCRIPTION
+.TP
+\fB\-\-source\fR FILE
+read rc commands from FILE
+.TP
+\fB\-\-bind\fR KEY COMMAND
+bind KEY to perform COMMAND
+.TP
+\fB\-\-VAR\fR=\fIVALUE\fR
+set rc variable VAR to VALUE
+.TP
+\fB\-\-VAR\fR
+set VAR to 1 (turn on boolean options)
+.TP
+\fB\-\-no\-VAR\fR
+set VAR to 0 (turn off boolean options)
+.TP
+\fB\-\-showvars\fR
+list all available rc variables
+.TP
+\fB\-\-help\fR
+display this help and exit
+.TP
+\fB\-\-version\fR
+output version information and exit
+.TP
+\fB\-\-copying\fR
+show copying permissions
+.SH AUTHOR
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+This manual page was written by Davide Puricelli <evo(a)debian.org>,
+for the Debian GNU/Linux system (but may be used by others).
gnuboy-1.0.3-s64.patch:
--- NEW FILE gnuboy-1.0.3-s64.patch ---
diff -Naupr gnuboy-1.0.3.orig/sys/linux/joy.c gnuboy-1.0.3/sys/linux/joy.c
--- gnuboy-1.0.3.orig/sys/linux/joy.c 2001-09-23 20:01:18.000000000 +0200
+++ gnuboy-1.0.3/sys/linux/joy.c 2006-10-17 16:13:53.000000000 +0200
@@ -3,6 +3,8 @@
#include <stdlib.h>
#include <string.h>
char *strdup();
+typedef __signed__ long long __s64;
+typedef unsigned long long __u64;
#include <linux/joystick.h>
#include <sys/types.h>
#include <sys/stat.h>
gnuboy-1.0.3-xgnuboy.patch:
--- NEW FILE gnuboy-1.0.3-xgnuboy.patch ---
--- gnuboy-1.0.3/sys/x11/xlib.c Sun Sep 23 21:01:10 2001
+++ gnuboy-1.0.3-nk/sys/x11/xlib.c Tue Oct 26 12:09:27 2004
@@ -60,24 +60,8 @@ static char *x_displayname;
static Display *x_display;
static int x_screen;
-static struct
-{
- int bits;
- int vc;
- int bytes;
-} x_vissup[] =
-{
- { 8, PseudoColor, 1 },
- { 15, TrueColor, 2 },
- { 16, TrueColor, 2 },
- { 32, TrueColor, 4 },
- { 24, TrueColor, 3 },
- { 0, 0, 0 }
-};
-
static int x_bits, x_bytes;
static Visual *x_vis;
-static XVisualInfo x_visinfo;
static int x_pseudo;
static Colormap x_cmap;
static XColor x_ctable[256];
@@ -94,7 +78,7 @@ static GC x_gc;
static XSizeHints x_size;
static XWMHints x_wmhints;
-/*static XClassHint x_class;*/
+static XClassHint x_class;
#ifdef USE_XSHM
static XShmSegmentInfo x_shm;
@@ -247,25 +231,19 @@ void vid_init()
die("failed to connect to X display\n");
x_screen = DefaultScreen(x_display);
- for (i = 0; x_vissup[i].bits; i++)
- {
- if (XMatchVisualInfo(
- x_display, x_screen,
- x_vissup[i].bits, x_vissup[i].vc, &x_visinfo))
- {
- if (x_vissup[i].vc == PseudoColor)
- x_pseudo = 1;
- else
- x_pseudo = 0;
- x_bits = x_vissup[i].bits;
- x_bytes = x_vissup[i].bytes;
- break;
- }
- }
- if (!x_bits) die("no suitable X visuals\n");
- x_vis = x_visinfo.visual;
+ x_vis = DefaultVisual(x_display, x_screen);
if (!x_vis) die("X visual is NULL");
+ x_cmap = DefaultColormap(x_display, x_screen);
+ x_bits = DefaultDepth(x_display, x_screen);
+ x_bytes = x_bits >> 3;
+
+ /* NOTE: This code assumes that all 8-bit color displays are PseudoColor.
+ * This assumption is correct almost everywhere. */
+
+ if (x_bytes == 1)
+ x_pseudo = 1;
+
if (x_pseudo)
{
x_cmap = XCreateColormap(
@@ -324,8 +302,10 @@ void vid_init()
x_wmhints.flags = StateHint | InputHint;
XSetWMHints(x_display, x_win, &x_wmhints);
- /* FIXME - set X class info stuff (with XSetClassHint)... */
-
+ x_class.res_name = "xgnuboy";
+ x_class.res_class = "xgnuboy";
+ XSetClassHint(x_display, x_win, &x_class);
+
XMapWindow(x_display, x_win);
for(;;)
--- NEW FILE gnuboy.spec ---
Summary: Nintendo GameBoy Color emulator
Name: gnuboy
Version: 1.0.3
Release: 12%{?dist}
License: GPLv2
Group: Applications/Emulators
URL: http://brightrain.aerifal.cx/~laguna/
Source: http://brightrain.aerifal.cx/~laguna/src/%{name}-%{version}.tar.gz
Patch0: gnuboy-1.0.3-s64.patch
Patch1: gnuboy-1.0.3-xgnuboy.patch
Patch2: gnuboy-1.0.3-manpages.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: SDL-devel >= 1.2.0
BuildRequires: libXt-devel
%ifarch %{ix86} x86_64
BuildRequires: svgalib-devel
%endif
%package sdl
Summary: Nintendo GameBoy Color emulator (SDL version)
Group: Applications/Emulators
Obsoletes: gnuboy < 1.0.3-12
Provides: gnuboy = %{version}-%{release}
%package x
Summary: Nintendo GameBoy Color emulator (X version)
Group: Applications/Emulators
%package fb
Summary: Nintendo GameBoy Color emulator (frame buffer version)
Group: Applications/Emulators
%package svgalib
Summary: Nintendo GameBoy Color emulator (svgalib version)
Group: Applications/Emulators
%description
gnuboy (all lowercase) is a portable program for emulating the Nintendo
GameBoy Color software platform. gnuboy is Free Software, distributed
under the terms of the GNU General Public License. Our goal is to provide
a great emulator that runs on many platforms and is accessible for
everyone's enjoyment.
%description sdl
gnuboy (all lowercase) is a portable program for emulating the Nintendo
GameBoy Color software platform. gnuboy is Free Software, distributed
under the terms of the GNU General Public License. Our goal is to provide
a great emulator that runs on many platforms and is accessible for
everyone's enjoyment.
This is the SDL version.
%description x
gnuboy (all lowercase) is a portable program for emulating the Nintendo
GameBoy Color software platform. gnuboy is Free Software, distributed
under the terms of the GNU General Public License. Our goal is to provide
a great emulator that runs on many platforms and is accessible for
everyone's enjoyment.
This is the X version.
%description fb
gnuboy (all lowercase) is a portable program for emulating the Nintendo
GameBoy Color software platform. gnuboy is Free Software, distributed
under the terms of the GNU General Public License. Our goal is to provide
a great emulator that runs on many platforms and is accessible for
everyone's enjoyment.
This is the frame buffer version.
%description svgalib
gnuboy (all lowercase) is a portable program for emulating the Nintendo
GameBoy Color software platform. gnuboy is Free Software, distributed
under the terms of the GNU General Public License. Our goal is to provide
a great emulator that runs on many platforms and is accessible for
everyone's enjoyment.
This is the svgalib version.
%prep
%setup -q
%ifarch %{ix86} ppc
%patch0 -p1
%endif
%patch1 -p1
%patch2 -p1
%build
%ifarch %{ix86} x86_64
%configure --disable-arch --disable-optimize --disable-asm \
--with-sdl --with-x --with-fb --with-svgalib
%else
%configure --disable-arch --disable-optimize --disable-asm \
--with-sdl --with-x --with-fb
%endif
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
%makeinstall
#install man pages
install -d %{buildroot}%_mandir/man1
install -m 644 sdlgnuboy.1 %{buildroot}%{_mandir}/man1
install -m 644 xgnuboy.1 %{buildroot}%{_mandir}/man1
%ifarch %{ix86} x86_64
install -m 644 sgnuboy.1 %{buildroot}%{_mandir}/man1
%endif
%clean
rm -rf %{buildroot}
%files sdl
%defattr(-, root, root)
%{_bindir}/sdlgnuboy
%{_mandir}/man1/sdlgnuboy.1*
%doc COPYING README
%doc docs/{CHANGES,CONFIG,CREDITS,FAQ,LIBERTY,README.old,WHATSNEW}
%doc etc/*.rc
%files x
%defattr(-, root, root)
%{_bindir}/xgnuboy
%{_mandir}/man1/xgnuboy.1*
%doc COPYING README
%doc docs/{CHANGES,CONFIG,CREDITS,FAQ,LIBERTY,README.old,WHATSNEW}
%doc etc/*.rc
%files fb
%defattr(-, root, root)
%{_bindir}/fbgnuboy
%doc COPYING README
%doc docs/{CHANGES,CONFIG,CREDITS,FAQ,LIBERTY,README.old,WHATSNEW}
%doc etc/*.rc
%ifarch %{ix86} x86_64
%files svgalib
%defattr(-, root, root)
%{_bindir}/sgnuboy
%{_mandir}/man1/sgnuboy.1*
%doc COPYING README
%doc docs/{CHANGES,CONFIG,CREDITS,FAQ,LIBERTY,README.old,WHATSNEW}
%doc etc/*.rc
%endif
%changelog
* Fri Oct 05 2007 Andrea Musuruane <musuruan(a)gmail.com> 1.0.3-12
- bumping release to be higher than freshrpms (RPM Fusion merge)
- changed license due to new Fedora guidelines
- removed %%{?dist} tag from changelog
* Mon Apr 30 2007 Andrea Musuruane <musuruan(a)gmail.com> 1.0.3-5
- patch to force the definition of __s64 does not apply to x86_64
* Sat Apr 28 2007 Andrea Musuruane <musuruan(a)gmail.com> 1.0.3-4
- svgalib is only available to x86 and x64_64 archs.
* Wed Apr 25 2007 Andrea Musuruane <musuruan(a)gmail.com> 1.0.3-3
- added missing libXt-devel to BR
* Fri Apr 20 2007 Andrea Musuruane <musuruan(a)gmail.com> 1.0.3-2
- enabled X, fb and svgalib versions
- split versions into different subpackages
- added a patch by Nicholas J. Kain to run xgnuboy
- added man pages from Debian
- added patch to force definition of __s64 since when using -ansi on i386 it
doesn't get defined anymore (from freshrpms.net package)
* Fri Oct 20 2006 Andrea Musuruane <musuruan(a)gmail.com> 1.0.3-1
- initial package
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gnuboy/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jun 2008 11:51:44 -0000 1.1
+++ .cvsignore 19 Jul 2008 18:53:52 -0000 1.2
@@ -0,0 +1 @@
+gnuboy-1.0.3.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gnuboy/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jun 2008 11:51:44 -0000 1.1
+++ sources 19 Jul 2008 18:53:52 -0000 1.2
@@ -0,0 +1 @@
+9947162a208ebfe699a1bfe98c437ac3 gnuboy-1.0.3.tar.gz
16 years, 4 months
- 1
- 0
rpms/gnuboy/devel gnuboy-1.0.3-manpages.patch, NONE, 1.1 gnuboy-1.0.3-s64.patch, NONE, 1.1 gnuboy-1.0.3-xgnuboy.patch, NONE, 1.1 gnuboy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/gnuboy/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv844/devel
Modified Files:
.cvsignore sources
Added Files:
gnuboy-1.0.3-manpages.patch gnuboy-1.0.3-s64.patch
gnuboy-1.0.3-xgnuboy.patch gnuboy.spec
Log Message:
First import
gnuboy-1.0.3-manpages.patch:
--- NEW FILE gnuboy-1.0.3-manpages.patch ---
--- gnuboy-1.0.3.orig/sdlgnuboy.1
+++ gnuboy-1.0.3/sdlgnuboy.1
@@ -0,0 +1,41 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
+.TH SDLGNUBOY "1" "July 2001"
+.SH NAME
+sdlgnuboy \- gnuboy Game Boy Emulator.
+.SH SYNOPSIS
+.B sdlgnuboy
+[\fIoptions\fR] \fIromfile\fR
+.SH DESCRIPTION
+.TP
+\fB\-\-source\fR FILE
+read rc commands from FILE
+.TP
+\fB\-\-bind\fR KEY COMMAND
+bind KEY to perform COMMAND
+.TP
+\fB\-\-VAR\fR=\fIVALUE\fR
+set rc variable VAR to VALUE
+.TP
+\fB\-\-VAR\fR
+set VAR to 1 (turn on boolean options)
+.TP
+\fB\-\-no\-VAR\fR
+set VAR to 0 (turn off boolean options)
+.TP
+\fB\-\-showvars\fR
+list all available rc variables
+.TP
+\fB\-\-help\fR
+display this help and exit
+.TP
+\fB\-\-version\fR
+output version information and exit
+.TP
+\fB\-\-copying\fR
+show copying permissions
+.SH AUTHOR
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+This manual page was written by Davide Puricelli <evo(a)debian.org>,
+for the Debian GNU/Linux system (but may be used by others).
--- gnuboy-1.0.3.orig/sgnuboy.1
+++ gnuboy-1.0.3/sgnuboy.1
@@ -0,0 +1,41 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
+.TH SGNUBOY "1" "July 2001"
+.SH NAME
+sgnuboy \- gnuboy Game Boy Emulator.
+.SH SYNOPSIS
+.B sgnuboy
+[\fIoptions\fR] \fIromfile\fR
+.SH DESCRIPTION
+.TP
+\fB\-\-source\fR FILE
+read rc commands from FILE
+.TP
+\fB\-\-bind\fR KEY COMMAND
+bind KEY to perform COMMAND
+.TP
+\fB\-\-VAR\fR=\fIVALUE\fR
+set rc variable VAR to VALUE
+.TP
+\fB\-\-VAR\fR
+set VAR to 1 (turn on boolean options)
+.TP
+\fB\-\-no\-VAR\fR
+set VAR to 0 (turn off boolean options)
+.TP
+\fB\-\-showvars\fR
+list all available rc variables
+.TP
+\fB\-\-help\fR
+display this help and exit
+.TP
+\fB\-\-version\fR
+output version information and exit
+.TP
+\fB\-\-copying\fR
+show copying permissions
+.SH AUTHOR
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+This manual page was written by Davide Puricelli <evo(a)debian.org>,
+for the Debian GNU/Linux system (but may be used by others).
--- gnuboy-1.0.3.orig/xgnuboy.1
+++ gnuboy-1.0.3/xgnuboy.1
@@ -0,0 +1,41 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
+.TH XGNUBOY "1" "July 2001"
+.SH NAME
+xgnuboy \- gnuboy Game Boy Emulator.
+.SH SYNOPSIS
+.B xgnuboy
+[\fIoptions\fR] \fIromfile\fR
+.SH DESCRIPTION
+.TP
+\fB\-\-source\fR FILE
+read rc commands from FILE
+.TP
+\fB\-\-bind\fR KEY COMMAND
+bind KEY to perform COMMAND
+.TP
+\fB\-\-VAR\fR=\fIVALUE\fR
+set rc variable VAR to VALUE
+.TP
+\fB\-\-VAR\fR
+set VAR to 1 (turn on boolean options)
+.TP
+\fB\-\-no\-VAR\fR
+set VAR to 0 (turn off boolean options)
+.TP
+\fB\-\-showvars\fR
+list all available rc variables
+.TP
+\fB\-\-help\fR
+display this help and exit
+.TP
+\fB\-\-version\fR
+output version information and exit
+.TP
+\fB\-\-copying\fR
+show copying permissions
+.SH AUTHOR
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+This manual page was written by Davide Puricelli <evo(a)debian.org>,
+for the Debian GNU/Linux system (but may be used by others).
gnuboy-1.0.3-s64.patch:
--- NEW FILE gnuboy-1.0.3-s64.patch ---
diff -Naupr gnuboy-1.0.3.orig/sys/linux/joy.c gnuboy-1.0.3/sys/linux/joy.c
--- gnuboy-1.0.3.orig/sys/linux/joy.c 2001-09-23 20:01:18.000000000 +0200
+++ gnuboy-1.0.3/sys/linux/joy.c 2006-10-17 16:13:53.000000000 +0200
@@ -3,6 +3,8 @@
#include <stdlib.h>
#include <string.h>
char *strdup();
+typedef __signed__ long long __s64;
+typedef unsigned long long __u64;
#include <linux/joystick.h>
#include <sys/types.h>
#include <sys/stat.h>
gnuboy-1.0.3-xgnuboy.patch:
--- NEW FILE gnuboy-1.0.3-xgnuboy.patch ---
--- gnuboy-1.0.3/sys/x11/xlib.c Sun Sep 23 21:01:10 2001
+++ gnuboy-1.0.3-nk/sys/x11/xlib.c Tue Oct 26 12:09:27 2004
@@ -60,24 +60,8 @@ static char *x_displayname;
static Display *x_display;
static int x_screen;
-static struct
-{
- int bits;
- int vc;
- int bytes;
-} x_vissup[] =
-{
- { 8, PseudoColor, 1 },
- { 15, TrueColor, 2 },
- { 16, TrueColor, 2 },
- { 32, TrueColor, 4 },
- { 24, TrueColor, 3 },
- { 0, 0, 0 }
-};
-
static int x_bits, x_bytes;
static Visual *x_vis;
-static XVisualInfo x_visinfo;
static int x_pseudo;
static Colormap x_cmap;
static XColor x_ctable[256];
@@ -94,7 +78,7 @@ static GC x_gc;
static XSizeHints x_size;
static XWMHints x_wmhints;
-/*static XClassHint x_class;*/
+static XClassHint x_class;
#ifdef USE_XSHM
static XShmSegmentInfo x_shm;
@@ -247,25 +231,19 @@ void vid_init()
die("failed to connect to X display\n");
x_screen = DefaultScreen(x_display);
- for (i = 0; x_vissup[i].bits; i++)
- {
- if (XMatchVisualInfo(
- x_display, x_screen,
- x_vissup[i].bits, x_vissup[i].vc, &x_visinfo))
- {
- if (x_vissup[i].vc == PseudoColor)
- x_pseudo = 1;
- else
- x_pseudo = 0;
- x_bits = x_vissup[i].bits;
- x_bytes = x_vissup[i].bytes;
- break;
- }
- }
- if (!x_bits) die("no suitable X visuals\n");
- x_vis = x_visinfo.visual;
+ x_vis = DefaultVisual(x_display, x_screen);
if (!x_vis) die("X visual is NULL");
+ x_cmap = DefaultColormap(x_display, x_screen);
+ x_bits = DefaultDepth(x_display, x_screen);
+ x_bytes = x_bits >> 3;
+
+ /* NOTE: This code assumes that all 8-bit color displays are PseudoColor.
+ * This assumption is correct almost everywhere. */
+
+ if (x_bytes == 1)
+ x_pseudo = 1;
+
if (x_pseudo)
{
x_cmap = XCreateColormap(
@@ -324,8 +302,10 @@ void vid_init()
x_wmhints.flags = StateHint | InputHint;
XSetWMHints(x_display, x_win, &x_wmhints);
- /* FIXME - set X class info stuff (with XSetClassHint)... */
-
+ x_class.res_name = "xgnuboy";
+ x_class.res_class = "xgnuboy";
+ XSetClassHint(x_display, x_win, &x_class);
+
XMapWindow(x_display, x_win);
for(;;)
--- NEW FILE gnuboy.spec ---
Summary: Nintendo GameBoy Color emulator
Name: gnuboy
Version: 1.0.3
Release: 12%{?dist}
License: GPLv2
Group: Applications/Emulators
URL: http://brightrain.aerifal.cx/~laguna/
Source: http://brightrain.aerifal.cx/~laguna/src/%{name}-%{version}.tar.gz
Patch0: gnuboy-1.0.3-s64.patch
Patch1: gnuboy-1.0.3-xgnuboy.patch
Patch2: gnuboy-1.0.3-manpages.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: SDL-devel >= 1.2.0
BuildRequires: libXt-devel
%ifarch %{ix86} x86_64
BuildRequires: svgalib-devel
%endif
%package sdl
Summary: Nintendo GameBoy Color emulator (SDL version)
Group: Applications/Emulators
Obsoletes: gnuboy < 1.0.3-12
Provides: gnuboy = %{version}-%{release}
%package x
Summary: Nintendo GameBoy Color emulator (X version)
Group: Applications/Emulators
%package fb
Summary: Nintendo GameBoy Color emulator (frame buffer version)
Group: Applications/Emulators
%package svgalib
Summary: Nintendo GameBoy Color emulator (svgalib version)
Group: Applications/Emulators
%description
gnuboy (all lowercase) is a portable program for emulating the Nintendo
GameBoy Color software platform. gnuboy is Free Software, distributed
under the terms of the GNU General Public License. Our goal is to provide
a great emulator that runs on many platforms and is accessible for
everyone's enjoyment.
%description sdl
gnuboy (all lowercase) is a portable program for emulating the Nintendo
GameBoy Color software platform. gnuboy is Free Software, distributed
under the terms of the GNU General Public License. Our goal is to provide
a great emulator that runs on many platforms and is accessible for
everyone's enjoyment.
This is the SDL version.
%description x
gnuboy (all lowercase) is a portable program for emulating the Nintendo
GameBoy Color software platform. gnuboy is Free Software, distributed
under the terms of the GNU General Public License. Our goal is to provide
a great emulator that runs on many platforms and is accessible for
everyone's enjoyment.
This is the X version.
%description fb
gnuboy (all lowercase) is a portable program for emulating the Nintendo
GameBoy Color software platform. gnuboy is Free Software, distributed
under the terms of the GNU General Public License. Our goal is to provide
a great emulator that runs on many platforms and is accessible for
everyone's enjoyment.
This is the frame buffer version.
%description svgalib
gnuboy (all lowercase) is a portable program for emulating the Nintendo
GameBoy Color software platform. gnuboy is Free Software, distributed
under the terms of the GNU General Public License. Our goal is to provide
a great emulator that runs on many platforms and is accessible for
everyone's enjoyment.
This is the svgalib version.
%prep
%setup -q
%ifarch %{ix86} ppc
%patch0 -p1
%endif
%patch1 -p1
%patch2 -p1
%build
%ifarch %{ix86} x86_64
%configure --disable-arch --disable-optimize --disable-asm \
--with-sdl --with-x --with-fb --with-svgalib
%else
%configure --disable-arch --disable-optimize --disable-asm \
--with-sdl --with-x --with-fb
%endif
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
%makeinstall
#install man pages
install -d %{buildroot}%_mandir/man1
install -m 644 sdlgnuboy.1 %{buildroot}%{_mandir}/man1
install -m 644 xgnuboy.1 %{buildroot}%{_mandir}/man1
%ifarch %{ix86} x86_64
install -m 644 sgnuboy.1 %{buildroot}%{_mandir}/man1
%endif
%clean
rm -rf %{buildroot}
%files sdl
%defattr(-, root, root)
%{_bindir}/sdlgnuboy
%{_mandir}/man1/sdlgnuboy.1*
%doc COPYING README
%doc docs/{CHANGES,CONFIG,CREDITS,FAQ,LIBERTY,README.old,WHATSNEW}
%doc etc/*.rc
%files x
%defattr(-, root, root)
%{_bindir}/xgnuboy
%{_mandir}/man1/xgnuboy.1*
%doc COPYING README
%doc docs/{CHANGES,CONFIG,CREDITS,FAQ,LIBERTY,README.old,WHATSNEW}
%doc etc/*.rc
%files fb
%defattr(-, root, root)
%{_bindir}/fbgnuboy
%doc COPYING README
%doc docs/{CHANGES,CONFIG,CREDITS,FAQ,LIBERTY,README.old,WHATSNEW}
%doc etc/*.rc
%ifarch %{ix86} x86_64
%files svgalib
%defattr(-, root, root)
%{_bindir}/sgnuboy
%{_mandir}/man1/sgnuboy.1*
%doc COPYING README
%doc docs/{CHANGES,CONFIG,CREDITS,FAQ,LIBERTY,README.old,WHATSNEW}
%doc etc/*.rc
%endif
%changelog
* Fri Oct 05 2007 Andrea Musuruane <musuruan(a)gmail.com> 1.0.3-12
- bumping release to be higher than freshrpms (RPM Fusion merge)
- changed license due to new Fedora guidelines
- removed %%{?dist} tag from changelog
* Mon Apr 30 2007 Andrea Musuruane <musuruan(a)gmail.com> 1.0.3-5
- patch to force the definition of __s64 does not apply to x86_64
* Sat Apr 28 2007 Andrea Musuruane <musuruan(a)gmail.com> 1.0.3-4
- svgalib is only available to x86 and x64_64 archs.
* Wed Apr 25 2007 Andrea Musuruane <musuruan(a)gmail.com> 1.0.3-3
- added missing libXt-devel to BR
* Fri Apr 20 2007 Andrea Musuruane <musuruan(a)gmail.com> 1.0.3-2
- enabled X, fb and svgalib versions
- split versions into different subpackages
- added a patch by Nicholas J. Kain to run xgnuboy
- added man pages from Debian
- added patch to force definition of __s64 since when using -ansi on i386 it
doesn't get defined anymore (from freshrpms.net package)
* Fri Oct 20 2006 Andrea Musuruane <musuruan(a)gmail.com> 1.0.3-1
- initial package
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gnuboy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jun 2008 11:51:44 -0000 1.1
+++ .cvsignore 19 Jul 2008 18:52:48 -0000 1.2
@@ -0,0 +1 @@
+gnuboy-1.0.3.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gnuboy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jun 2008 11:51:44 -0000 1.1
+++ sources 19 Jul 2008 18:52:48 -0000 1.2
@@ -0,0 +1 @@
+9947162a208ebfe699a1bfe98c437ac3 gnuboy-1.0.3.tar.gz
16 years, 4 months
- 1
- 0