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