rpms/a52dec/F-8 a52dec.spec,1.1,1.2
by David Juran
Author: juran
Update of /cvs/free/rpms/a52dec/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8379
Modified Files:
a52dec.spec
Log Message:
Bump release for RpmFusion
Index: a52dec.spec
===================================================================
RCS file: /cvs/free/rpms/a52dec/F-8/a52dec.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- a52dec.spec 24 Jul 2008 11:38:31 -0000 1.1
+++ a52dec.spec 24 Jul 2008 11:41:48 -0000 1.2
@@ -1,7 +1,7 @@
Summary: A free ATSC A/52 stream decoder
Name: a52dec
Version: 0.7.4
-Release: 11%{?dist}
+Release: 12%{?dist}
License: GPLv2
Group: System Environment/Libraries
URL: http://liba52.sourceforge.net/
@@ -81,6 +81,9 @@
#---------------------------------------------------------------------
%changelog
+* Thu Jul 24 2008 David Juran <david(a)juran.se> - 0.7.4-12
+- Bump Release for RpmFusion
+
* Mon Oct 1 2007 David Juran <david(a)juran.se> - 0.7.4-11
- Fix Licence tag to be GPLv2
- Drop %makeinstall macro
16 years, 4 months
- 1
- 0
rpms/fakenes/devel fakenes.spec,1.1,1.2
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/fakenes/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8268
Modified Files:
fakenes.spec
Log Message:
* Thu Jul 24 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5.8-5
- Release bump for rpmfusion
Index: fakenes.spec
===================================================================
RCS file: /cvs/free/rpms/fakenes/devel/fakenes.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fakenes.spec 24 Jul 2008 11:29:16 -0000 1.1
+++ fakenes.spec 24 Jul 2008 11:41:13 -0000 1.2
@@ -1,6 +1,6 @@
Name: fakenes
Version: 0.5.8
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Nintendo Entertainment System emulator
Group: Amusements/Games
License: Artistic
@@ -72,6 +72,9 @@
%changelog
+* Thu Jul 24 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5.8-5
+- Release bump for rpmfusion
+
* Sat Mar 10 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5.8-4%{?dist}
- Fixup .desktop file categories for games-menus usage
16 years, 4 months
- 1
- 0
rpms/bubbros/F-8 bubbros-1.5-fixes.patch, NONE, 1.1 bubbros.desktop, NONE, 1.1 bubbros.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/bubbros/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8155
Modified Files:
.cvsignore sources
Added Files:
bubbros-1.5-fixes.patch bubbros.desktop bubbros.spec
Log Message:
* Thu Jul 24 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.6-2
- Release bump for rpmfusion
bubbros-1.5-fixes.patch:
--- NEW FILE bubbros-1.5-fixes.patch ---
diff -up bubbros-1.6/BubBob.py.foo bubbros-1.6/BubBob.py
--- bubbros-1.6/BubBob.py.foo 2007-09-08 17:03:41.000000000 +0200
+++ bubbros-1.6/BubBob.py 2008-07-24 13:44:29.000000000 +0200
@@ -27,16 +27,11 @@ import socket, tempfile
sys.path.insert(0, LOCALDIR)
os.chdir(LOCALDIR)
-try:
- username = '-'+os.getlogin()
-except:
- try:
- import pwd
- username = '-'+pwd.getpwuid(os.getuid())[0]
- except:
- username = ''
-TAGFILENAME = 'BubBob-%s%s.url' % (socket.gethostname(), username)
-TAGFILENAME = os.path.join(tempfile.gettempdir(), TAGFILENAME)
+rcdir = os.path.join(os.environ.get("HOME", "."), ".bubbros")
+if not os.path.isdir(rcdir):
+ os.makedirs(rcdir)
+TAGFILENAME = 'BubBob-%s.url' % (socket.gethostname())
+TAGFILENAME = os.path.join(rcdir, TAGFILENAME)
def load_url_file():
@@ -138,7 +133,7 @@ try:
browser = webbrowser.get()
name = getattr(browser, 'name', browser.__class__.__name__)
print "Trying to open '%s' with '%s'..." % (url, name)
- browser.open(url)
+ webbrowser.open(url)
except:
exc, val, tb = sys.exc_info()
print '-'*60
diff -up bubbros-1.6/bubbob/bb.py.foo bubbros-1.6/bubbob/bb.py
--- bubbros-1.6/bubbob/bb.py.foo 2007-09-08 17:03:41.000000000 +0200
+++ bubbros-1.6/bubbob/bb.py 2008-07-24 13:44:29.000000000 +0200
@@ -14,6 +14,10 @@ except:
pass
LOCALDIR = os.path.dirname(os.path.abspath(LOCALDIR))
# ----------
+rcdir = os.path.join(os.environ.get("HOME", "."), ".bubbros")
+if not os.path.isdir(rcdir):
+ os.makedirs(rcdir)
+# ----------
import random, time
diff -up bubbros-1.6/bubbob/bonuses.py.foo bubbros-1.6/bubbob/bonuses.py
--- bubbros-1.6/bubbob/bonuses.py.foo 2007-09-08 17:03:41.000000000 +0200
+++ bubbros-1.6/bubbob/bonuses.py 2008-07-24 13:44:29.000000000 +0200
@@ -1703,6 +1703,10 @@ class Chestnut(RandomBonus):
try:
+ if sys.path[1][0:10] == '/usr/lib64':
+ sys.path.append('/usr/lib64/bubbros')
+ else:
+ sys.path.append('/usr/lib/bubbros')
import statesaver
except ImportError:
print "'statesaver' module not compiled, no clock bonus"
diff -up bubbros-1.6/bubbob/statesaver.c.foo bubbros-1.6/bubbob/statesaver.c
--- bubbros-1.6/bubbob/statesaver.c.foo 2007-09-08 17:03:41.000000000 +0200
+++ bubbros-1.6/bubbob/statesaver.c 2008-07-24 13:44:29.000000000 +0200
@@ -75,10 +75,6 @@ static PyObject* genbuild(PyObject* g)
Py_INCREF(g); /* exhausted -- can return 'g' itself */
return g;
}
- if (f->f_nfreevars || f->f_ncells) {
- PyErr_SetString(PyExc_ValueError, "generator has cell or free vars");
- goto error;
- }
if (co->co_argcount == 0)
dummy = NULL;
@@ -143,11 +139,6 @@ static int gencopy(PyObject* g2, PyObjec
}
f2 = (PyFrameObject*) x;
- if (f2->f_stacksize != f->f_stacksize) {
- PyErr_SetString(PyExc_TypeError, "stack size mismatch");
- goto error;
- }
-
if (f2->f_stacktop != NULL)
while (f2->f_stacktop != f2->f_localsplus)
{
diff -up bubbros-1.6/common/stdlog.py.foo bubbros-1.6/common/stdlog.py
--- bubbros-1.6/common/stdlog.py.foo 2007-09-08 17:03:41.000000000 +0200
+++ bubbros-1.6/common/stdlog.py 2008-07-24 13:44:29.000000000 +0200
@@ -6,7 +6,8 @@ class LogFile:
def __init__(self, filename=None, limitsize=32768):
if filename is None:
- filename = sys.argv[0]
+ filename = os.path.join(os.environ.get('HOME', '.'), '.bubbros',
+ os.path.basename(sys.argv[0]))
if filename.endswith('.py'):
filename = filename[:-3]
filename += '.log'
diff -up bubbros-1.6/display/dpy_pygame.py.foo bubbros-1.6/display/dpy_pygame.py
--- bubbros-1.6/display/dpy_pygame.py.foo 2007-09-08 17:03:41.000000000 +0200
+++ bubbros-1.6/display/dpy_pygame.py 2008-07-24 13:44:29.000000000 +0200
@@ -13,7 +13,7 @@ class Display:
musthidemouse = 0
mousevisible = 1
- def __init__(self, width, height, title, transparency='yes', fullscreen='no'):
+ def __init__(self, width, height, title, transparency='yes', fullscreen='yes'):
self.use_transparency = not transparency.startswith('n')
self.use_fullscreen = fullscreen.startswith('y')
@@ -200,7 +200,7 @@ def htmloptionstext(nameval):
return '''
<%s> Full Screen (Esc key to exit)</input><%s><br>
<%s> Draw slightly transparent bubbles</input><%s><br>
-''' % (nameval("checkbox", "fullscreen", "yes", default="no"),
+''' % (nameval("checkbox", "fullscreen", "yes", default="yes"),
nameval("hidden", "fullscreen", "no"),
nameval("checkbox", "transparency", "yes", default="yes"),
nameval("hidden", "transparency", "no"))
diff -up bubbros-1.6/display/modes.py.foo bubbros-1.6/display/modes.py
--- bubbros-1.6/display/modes.py.foo 2007-09-08 17:03:41.000000000 +0200
+++ bubbros-1.6/display/modes.py 2008-07-24 13:44:29.000000000 +0200
@@ -29,6 +29,10 @@ class Mode:
self.extraoptsdescr = extraoptsdescr
self.options = options.copy()
self.url = url
+ if sys.path[1][0:10] == '/usr/lib64':
+ sys.path.append('/usr/lib64/bubbros')
+ else:
+ sys.path.append('/usr/lib/bubbros')
def getmodule(self):
return __import__(self.prefix + self.name.lower(), globals(),
@@ -94,18 +98,18 @@ class SoundMode(Mode):
def graphicmodeslist():
return [
+ GraphicMode('pygame', 'PyGame library (all platforms)',
+ ['--fullscreen=yes go full screen (Esc key to exit, default)',
+ '--fullscreen=no run in windowed mode',
+ '--transparency=yes slightly transparent bubbles (default)',
+ '--transparency=no disable it (a bit faster)'],
+ {'transparency': 'yes', 'fullscreen': 'yes'},
+ url='http://www.pygame.org'),
GraphicMode('X', 'XWindow (Linux/Unix)',
['--shm=yes use the Shared Memory extension (default)',
'--shm=no disable it (for remote connections or old X servers)',
],
{'shm': 'yes'}),
- GraphicMode('windows', 'MS Windows', []),
- GraphicMode('pygame', 'PyGame library (all platforms)',
- ['--fullscreen=yes go full screen (Esc key to exit)',
- '--transparency=yes slightly transparent bubbles (default)',
- '--transparency=no disable it (a bit faster)'],
- {'transparency': 'yes', 'fullscreen': 'no'},
- url='http://www.pygame.org'),
GraphicMode('gtk', 'PyGTK (Gnome)',
['--zoom=xxx% scale image by xxx %'],
{'zoom': '100'},
@@ -120,10 +124,6 @@ def soundmodeslist():
['--freq=# mixer frequency (default 44100)',
'--fmt=# data format (default S16_NE, --fmt=list for a list)'],
{'freq': '44100', 'fmt': 'S16_NE'}),
- SoundMode('windows', 'audio mixer for Windows',
- ['--freq=# mixer frequency (default 44100)',
- '--bits=# bits per sample (8 or default 16)'],
- {'freq': '44100', 'bits': '16'}),
SoundMode('off', 'no sounds', []),
]
diff -up bubbros-1.6/display/pclient.py.foo bubbros-1.6/display/pclient.py
--- bubbros-1.6/display/pclient.py.foo 2007-09-08 17:03:41.000000000 +0200
+++ bubbros-1.6/display/pclient.py 2008-07-24 13:44:29.000000000 +0200
@@ -162,8 +162,8 @@ class Playfield:
if mode[-1].has_key('cfgfile'):
self.trackcfgfile = mode[-1]['cfgfile']
else:
- self.trackcfgfile = os.path.join(DataChunk.SOURCEDIR,
- 'http2', 'config.txt')
+ self.trackcfgfile = os.path.join(os.environ.get('HOME', '.'),
+ '.bubbros', 'config.txt')
self.udpsock = None
self.udpsock_low = None
self.udpsock2 = None
diff -up bubbros-1.6/doc/BubBob.py.1.foo bubbros-1.6/doc/BubBob.py.1
--- bubbros-1.6/doc/BubBob.py.1.foo 2007-09-08 17:03:41.000000000 +0200
+++ bubbros-1.6/doc/BubBob.py.1 2008-07-24 13:44:29.000000000 +0200
@@ -1,23 +1,21 @@
-.\" $Id: BubBob.py.1,v 1.2 2005/04/13 18:24:17 opqdonut Exp $
+.\" $Id: bubbros.6,v 1.2 2005/04/13 18:24:17 opqdonut Exp $
.\"
.\" Process this file with
-.\" groff -man -Tascii BubBob.py.1
+.\" groff -man -Tascii bubbros.6
.\"
-.TH BubBob.py 1 "APRIL 2005" Linux "User Manuals"
+.TH bubbros 6 "APRIL 2005" Linux "User Manuals"
.SH NAME
-BubBob.py \- Generic startup script for bub-n-bros
+bubbros \- Generic startup script for bub-n-bros
.SH SYNOPSIS
-.B BubBob.py
-.br
-.B python BubBob.py
+.B bubbros
.SH DESCRIPTION
-.B BubBob.py
+.B bubbros
runs
-.BR bb.py (1)
+.BR bubbros-server (6)
(the bub-n-bros server) and then tries to open the url of its control
panel in your webbrowser.
@@ -26,7 +24,7 @@ The environment variable BROWSER affects
on Unix systems.
.SH SEE ALSO
-.BR bb.py (1)
-.BR Client.py (1)
+.BR bubbros-server (6)
+.BR bubbros-client (6)
.BR python (1)
diff -up bubbros-1.6/doc/Client.py.1.foo bubbros-1.6/doc/Client.py.1
--- bubbros-1.6/doc/Client.py.1.foo 2007-09-08 17:03:41.000000000 +0200
+++ bubbros-1.6/doc/Client.py.1 2008-07-24 13:44:29.000000000 +0200
@@ -1,27 +1,23 @@
-.\" $Id: Client.py.1,v 1.3 2005/05/06 21:32:38 arigo Exp $
+.\" $Id: bubbros-client.6,v 1.3 2005/05/06 21:32:38 arigo Exp $
.\"
.\" Process this file with
-.\" groff -man -Tascii Client.py.1
+.\" groff -man -Tascii bubbros-client.6
.\"
-.TH Client.py 1 "APRIL 2005" Linux "User Manuals"
+.TH bubbros-client 6 "APRIL 2005" Linux "User Manuals"
.SH NAME
-Client.py \- the bub-n-bros client
+bubbros-client \- the bub-n-bros client
.SH SYNOPSIS
-.B python Client.py [
+.B bubbros-client [
.I options
.BI "] [" host [: port ]]
-.PP
-Note that this script is in the
-.B display/
-subdirectory of the original directory layout.
.SH DESCRIPTION
This is the bub-n-bros client that connects to bub-n-bros servers
started with
-.BR bb.py "(1) or " BubBob.py (1) .
+.BR bubbros-server "(6) or " bubbros (6) .
It supports many different audio and video drivers and is very
multi-platform.
@@ -38,12 +34,6 @@ Connect to server running on given port
defined, search for servers on the local network.
.TP
-.BI --bits= N
-This option concerns only the
-.B windows
-audio driver. Set bits per sample. Valid values are 8 and 16 (default).
-
-.TP
.BI "-d " DRIVER ", --display=" DRIVER
Use video driver
.IR DRIVER .
@@ -57,9 +47,6 @@ running. See the
.B --shm
option.
.TP
-.B windows
-MS Windows driver.
-.TP
.B pygame
PyGame gaming library for python (if installed) has video output. Use
it if this is specified. See
@@ -86,21 +73,21 @@ You can get a list of supported formats
.TP
.BI --freq= N
This option concerns only the
-.BR linux " and " windows
-audio drivers. Set mixing frequency to
+.BR linux
+audio driver. Set mixing frequency to
.I N
(in Hz). Defaults to 44100.
.TP
.B -m, --metaserver
Connect with the help of the Metaserver (see
-.BR bb.py (1)
+.BR bubbros-server (6)
for more info). Run
-.I Client.py -m
+.I bubbros-client -m
to print a table of currently running servers, pick the
the exact IP address and port of the server of your choice
from the table, and run again
-.I Client.py -m
+.I bubbros-client -m
.BR host:port .
.TP
@@ -145,11 +132,6 @@ Use the linux audio mixer. See the
.BR --freq " and " --fmt " options."
.TP
-.B windows
-Use the Windows audio mixer. See the
-.BR --freq " and " --bits "options."
-
-.TP
.B off
No sounds.
.RE
@@ -195,6 +177,6 @@ display driver. Scale output by
.IR N %.
.SH SEE ALSO
-.BR bb.py (1)
-.BR Client.py (1)
+.BR bubbros (6)
+.BR bubbros-server (6)
.BR python (1)
\ No newline at end of file
diff -up bubbros-1.6/doc/bb.py.1.foo bubbros-1.6/doc/bb.py.1
--- bubbros-1.6/doc/bb.py.1.foo 2007-09-08 17:03:41.000000000 +0200
+++ bubbros-1.6/doc/bb.py.1 2008-07-24 13:44:29.000000000 +0200
@@ -1,29 +1,21 @@
-.\" $Id: bb.py.1,v 1.3 2005/04/17 17:19:32 opqdonut Exp $
+.\" $Id: bubbros-server.6,v 1.3 2005/04/17 17:19:32 opqdonut Exp $
.\"
.\" Process this file with
-.\" groff -man -Tascii bb.py.1
+.\" groff -man -Tascii bubbros-server.6
.\"
-.TH bb.py 1 "APRIL 2005" Linux "User Manuals"
+.TH bubbros-server 6 "APRIL 2005" Linux "User Manuals"
.SH NAME
-bb.py \- the bub-n-bros server.
+bubbros-server \- the bub-n-bros server.
.SH SYNOPSIS
-.B bb.py [
+.B bubbros-server [
.I level-file.bin
.BI "] [" options ]
-.br
-.B python bb.py [
-.I level-file.bin
-.BI "] [" options ]
-.PP
-Note that this script is in the
-.B bubbob/
-subdirectory of the original directory layout.
.SH DESCRIPTION
-.B bb.py
+.B bubbros-server
starts an http server that acts as a control panel for the server. The
server listens on port
.B 8000
@@ -124,6 +116,6 @@ The server outputs helpful debug informa
game servers.
.SH SEE ALSO
-.BR BubBob.py (1)
-.BR Client.py (1)
+.BR bubbros (6)
+.BR bubbros-client (6)
.BR python (1)
diff -up bubbros-1.6/http2/httppages.py.foo bubbros-1.6/http2/httppages.py
--- bubbros-1.6/http2/httppages.py.foo 2007-09-08 17:03:41.000000000 +0200
+++ bubbros-1.6/http2/httppages.py 2008-07-24 13:44:29.000000000 +0200
@@ -38,7 +38,8 @@ class Options:
class PageServer:
- CONFIGFILE = 'config.txt'
+ CONFIGFILE = os.path.join(os.environ.get('HOME', '.'), '.bubbros',
+ 'config.txt')
localservers = None
def __init__(self, Game):
diff -up bubbros-1.6/java/Makefile.foo bubbros-1.6/java/Makefile
--- bubbros-1.6/java/Makefile.foo 2007-09-08 17:03:41.000000000 +0200
+++ bubbros-1.6/java/Makefile 2008-07-24 13:44:29.000000000 +0200
@@ -1,2 +1,2 @@
pclient.class: pclient.java
- javac -target 1.1 pclient.java
+ javac -target 1.1 -source 1.3 pclient.java
--- NEW FILE bubbros.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=BubBros
Comment=Bub and Brothers game inspired by the classic Bubble and Bobble
Exec=bubbros
Icon=bubbros
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;ArcadeGame;
--- NEW FILE bubbros.spec ---
Name: bubbros
Version: 1.6
Release: 2%{?dist}
Summary: Bub and Brothers game inspired by the classic Bubble and Bobble
Group: Amusements/Games
License: MIT and Artistic Licenses
URL: http://bub-n-bros.sourceforge.net/
Source0: http://downloads.sourceforge.net/bub-n-bros/%{name}-%{version}.tar.bz2
Source1: bubbros.desktop
Patch0: bubbros-1.5-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel ImageMagick desktop-file-utils libX11-devel
BuildRequires: libXext-devel xorg-x11-proto-devel java-1.4.2-gcj-compat-devel
Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
Requires: pygame pygtk2 htmlview hicolor-icon-theme
%description
This is a direct clone of the MacOS game Bub & Bob of McSebi. Thanks Sebi for
all the cool graphics and sounds!
Features:
* 1 to 10 players -- the best fun is with at least 3 players!
* Same gameplay as the famous McSebi's Bub & Bob.
* Over-the-network game and/or up to 3 players on the same computer.
* Completely original crazy bonuses!
* Capture other players in a bubble!
* New levels, including a random level generator!
%prep
%setup -q
#no backups for this patch, otherwise they end up getting installed!
%patch0 -p1
sed -i 's:#! /usr/bin/env python:#!%{__python}:' BubBob.py bubbob/bb.py \
display/Client.py
chmod +x display/Client.py
# for %doc
mv bubbob/levels/README.txt levels.txt
%build
make %{?_smp_mflags}
pushd bubbob/images
python buildcolors.py
popd
pushd java
rm *.class
make
popd
convert bubbob/images/dragon_0.ppm -transparent '#010101' -crop 32x32+0+0 \
%{name}.png
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
# copying the complete dirs and then removing the unwanted bits is easier :)
cp -a BubBob.py bubbob common display http2 java metaserver \
$RPM_BUILD_ROOT%{_datadir}/%{name}
rm -fr $RPM_BUILD_ROOT%{_datadir}/%{name}/bubbob/build
rm -fr $RPM_BUILD_ROOT%{_datadir}/%{name}/bubbob/doc
rm -fr $RPM_BUILD_ROOT%{_datadir}/%{name}/display/build
rm -fr $RPM_BUILD_ROOT%{_datadir}/%{name}/display/windows
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/display/*_windows.py
rm -fr $RPM_BUILD_ROOT%{_datadir}/%{name}/http2/sf
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/http2/header.png
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/java/pclient.java
rm `find $RPM_BUILD_ROOT%{_datadir}/%{name} -name '*.c'`
rm `find $RPM_BUILD_ROOT%{_datadir}/%{name} -name 'Makefile'`
rm `find $RPM_BUILD_ROOT%{_datadir}/%{name} -name 'setup.py'`
# put the .so files in %{libdir}
mv `find $RPM_BUILD_ROOT%{_datadir}/%{name} -name '*.so'` \
$RPM_BUILD_ROOT%{_libdir}/%{name}
# create the symlinks in /usr/bin, these must be absolute links!
ln -s %{_datadir}/%{name}/BubBob.py $RPM_BUILD_ROOT%{_bindir}/bubbros
ln -s %{_datadir}/%{name}/bubbob/bb.py $RPM_BUILD_ROOT%{_bindir}/bubbros-server
ln -s %{_datadir}/%{name}/display/Client.py \
$RPM_BUILD_ROOT%{_bindir}/bubbros-client
# install the manpages
install -m 644 doc/BubBob.py.1 $RPM_BUILD_ROOT%{_mandir}/man6/bubbros.6
install -m 644 doc/bb.py.1 $RPM_BUILD_ROOT%{_mandir}/man6/bubbros-server.6
install -m 644 doc/Client.py.1 $RPM_BUILD_ROOT%{_mandir}/man6/bubbros-client.6
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor dribble \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{name}.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
%clean
rm -rf $RPM_BUILD_ROOT
%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,-)
%doc LICENSE.txt artistic.txt levels.txt
%{_bindir}/bubbros*
%{_libdir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/dribble-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%{_mandir}/man6/bubbros*.6.gz
%changelog
* Thu Jul 24 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.6-2
- Release bump for rpmfusion
* Mon Sep 10 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.6-1
- New upstream release 1.6
* Mon Jan 15 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.5-3
- Rebuild (with compile and run fixes) for new python2.5
* Tue Aug 1 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.5-2
- Add missing BuildRequires: libX11-devel libXext-devel xorg-x11-proto-devel
- Add Requires: htmlview
- Recompile java code instead of using precompiled .class files
- Don't install java source code, only class files
* Fri Jul 28 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.5-1
- initial Dribble package
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/bubbros/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 31 May 2008 14:07:17 -0000 1.1
+++ .cvsignore 24 Jul 2008 11:40:35 -0000 1.2
@@ -0,0 +1 @@
+bubbros-1.6.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/bubbros/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 31 May 2008 14:07:17 -0000 1.1
+++ sources 24 Jul 2008 11:40:35 -0000 1.2
@@ -0,0 +1 @@
+00aa5e26f5f0ed4c10765e4b33b28a09 bubbros-1.6.tar.bz2
16 years, 4 months
- 1
- 0
rpms/bubbros/F-9 bubbros-1.5-fixes.patch, NONE, 1.1 bubbros.desktop, NONE, 1.1 bubbros.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/bubbros/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8031
Modified Files:
.cvsignore sources
Added Files:
bubbros-1.5-fixes.patch bubbros.desktop bubbros.spec
Log Message:
* Thu Jul 24 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.6-2
- Release bump for rpmfusion
bubbros-1.5-fixes.patch:
--- NEW FILE bubbros-1.5-fixes.patch ---
diff -up bubbros-1.6/BubBob.py.foo bubbros-1.6/BubBob.py
--- bubbros-1.6/BubBob.py.foo 2007-09-08 17:03:41.000000000 +0200
+++ bubbros-1.6/BubBob.py 2008-07-24 13:44:29.000000000 +0200
@@ -27,16 +27,11 @@ import socket, tempfile
sys.path.insert(0, LOCALDIR)
os.chdir(LOCALDIR)
-try:
- username = '-'+os.getlogin()
-except:
- try:
- import pwd
- username = '-'+pwd.getpwuid(os.getuid())[0]
- except:
- username = ''
-TAGFILENAME = 'BubBob-%s%s.url' % (socket.gethostname(), username)
-TAGFILENAME = os.path.join(tempfile.gettempdir(), TAGFILENAME)
+rcdir = os.path.join(os.environ.get("HOME", "."), ".bubbros")
+if not os.path.isdir(rcdir):
+ os.makedirs(rcdir)
+TAGFILENAME = 'BubBob-%s.url' % (socket.gethostname())
+TAGFILENAME = os.path.join(rcdir, TAGFILENAME)
def load_url_file():
@@ -138,7 +133,7 @@ try:
browser = webbrowser.get()
name = getattr(browser, 'name', browser.__class__.__name__)
print "Trying to open '%s' with '%s'..." % (url, name)
- browser.open(url)
+ webbrowser.open(url)
except:
exc, val, tb = sys.exc_info()
print '-'*60
diff -up bubbros-1.6/bubbob/bb.py.foo bubbros-1.6/bubbob/bb.py
--- bubbros-1.6/bubbob/bb.py.foo 2007-09-08 17:03:41.000000000 +0200
+++ bubbros-1.6/bubbob/bb.py 2008-07-24 13:44:29.000000000 +0200
@@ -14,6 +14,10 @@ except:
pass
LOCALDIR = os.path.dirname(os.path.abspath(LOCALDIR))
# ----------
+rcdir = os.path.join(os.environ.get("HOME", "."), ".bubbros")
+if not os.path.isdir(rcdir):
+ os.makedirs(rcdir)
+# ----------
import random, time
diff -up bubbros-1.6/bubbob/bonuses.py.foo bubbros-1.6/bubbob/bonuses.py
--- bubbros-1.6/bubbob/bonuses.py.foo 2007-09-08 17:03:41.000000000 +0200
+++ bubbros-1.6/bubbob/bonuses.py 2008-07-24 13:44:29.000000000 +0200
@@ -1703,6 +1703,10 @@ class Chestnut(RandomBonus):
try:
+ if sys.path[1][0:10] == '/usr/lib64':
+ sys.path.append('/usr/lib64/bubbros')
+ else:
+ sys.path.append('/usr/lib/bubbros')
import statesaver
except ImportError:
print "'statesaver' module not compiled, no clock bonus"
diff -up bubbros-1.6/bubbob/statesaver.c.foo bubbros-1.6/bubbob/statesaver.c
--- bubbros-1.6/bubbob/statesaver.c.foo 2007-09-08 17:03:41.000000000 +0200
+++ bubbros-1.6/bubbob/statesaver.c 2008-07-24 13:44:29.000000000 +0200
@@ -75,10 +75,6 @@ static PyObject* genbuild(PyObject* g)
Py_INCREF(g); /* exhausted -- can return 'g' itself */
return g;
}
- if (f->f_nfreevars || f->f_ncells) {
- PyErr_SetString(PyExc_ValueError, "generator has cell or free vars");
- goto error;
- }
if (co->co_argcount == 0)
dummy = NULL;
@@ -143,11 +139,6 @@ static int gencopy(PyObject* g2, PyObjec
}
f2 = (PyFrameObject*) x;
- if (f2->f_stacksize != f->f_stacksize) {
- PyErr_SetString(PyExc_TypeError, "stack size mismatch");
- goto error;
- }
-
if (f2->f_stacktop != NULL)
while (f2->f_stacktop != f2->f_localsplus)
{
diff -up bubbros-1.6/common/stdlog.py.foo bubbros-1.6/common/stdlog.py
--- bubbros-1.6/common/stdlog.py.foo 2007-09-08 17:03:41.000000000 +0200
+++ bubbros-1.6/common/stdlog.py 2008-07-24 13:44:29.000000000 +0200
@@ -6,7 +6,8 @@ class LogFile:
def __init__(self, filename=None, limitsize=32768):
if filename is None:
- filename = sys.argv[0]
+ filename = os.path.join(os.environ.get('HOME', '.'), '.bubbros',
+ os.path.basename(sys.argv[0]))
if filename.endswith('.py'):
filename = filename[:-3]
filename += '.log'
diff -up bubbros-1.6/display/dpy_pygame.py.foo bubbros-1.6/display/dpy_pygame.py
--- bubbros-1.6/display/dpy_pygame.py.foo 2007-09-08 17:03:41.000000000 +0200
+++ bubbros-1.6/display/dpy_pygame.py 2008-07-24 13:44:29.000000000 +0200
@@ -13,7 +13,7 @@ class Display:
musthidemouse = 0
mousevisible = 1
- def __init__(self, width, height, title, transparency='yes', fullscreen='no'):
+ def __init__(self, width, height, title, transparency='yes', fullscreen='yes'):
self.use_transparency = not transparency.startswith('n')
self.use_fullscreen = fullscreen.startswith('y')
@@ -200,7 +200,7 @@ def htmloptionstext(nameval):
return '''
<%s> Full Screen (Esc key to exit)</input><%s><br>
<%s> Draw slightly transparent bubbles</input><%s><br>
-''' % (nameval("checkbox", "fullscreen", "yes", default="no"),
+''' % (nameval("checkbox", "fullscreen", "yes", default="yes"),
nameval("hidden", "fullscreen", "no"),
nameval("checkbox", "transparency", "yes", default="yes"),
nameval("hidden", "transparency", "no"))
diff -up bubbros-1.6/display/modes.py.foo bubbros-1.6/display/modes.py
--- bubbros-1.6/display/modes.py.foo 2007-09-08 17:03:41.000000000 +0200
+++ bubbros-1.6/display/modes.py 2008-07-24 13:44:29.000000000 +0200
@@ -29,6 +29,10 @@ class Mode:
self.extraoptsdescr = extraoptsdescr
self.options = options.copy()
self.url = url
+ if sys.path[1][0:10] == '/usr/lib64':
+ sys.path.append('/usr/lib64/bubbros')
+ else:
+ sys.path.append('/usr/lib/bubbros')
def getmodule(self):
return __import__(self.prefix + self.name.lower(), globals(),
@@ -94,18 +98,18 @@ class SoundMode(Mode):
def graphicmodeslist():
return [
+ GraphicMode('pygame', 'PyGame library (all platforms)',
+ ['--fullscreen=yes go full screen (Esc key to exit, default)',
+ '--fullscreen=no run in windowed mode',
+ '--transparency=yes slightly transparent bubbles (default)',
+ '--transparency=no disable it (a bit faster)'],
+ {'transparency': 'yes', 'fullscreen': 'yes'},
+ url='http://www.pygame.org'),
GraphicMode('X', 'XWindow (Linux/Unix)',
['--shm=yes use the Shared Memory extension (default)',
'--shm=no disable it (for remote connections or old X servers)',
],
{'shm': 'yes'}),
- GraphicMode('windows', 'MS Windows', []),
- GraphicMode('pygame', 'PyGame library (all platforms)',
- ['--fullscreen=yes go full screen (Esc key to exit)',
- '--transparency=yes slightly transparent bubbles (default)',
- '--transparency=no disable it (a bit faster)'],
- {'transparency': 'yes', 'fullscreen': 'no'},
- url='http://www.pygame.org'),
GraphicMode('gtk', 'PyGTK (Gnome)',
['--zoom=xxx% scale image by xxx %'],
{'zoom': '100'},
@@ -120,10 +124,6 @@ def soundmodeslist():
['--freq=# mixer frequency (default 44100)',
'--fmt=# data format (default S16_NE, --fmt=list for a list)'],
{'freq': '44100', 'fmt': 'S16_NE'}),
- SoundMode('windows', 'audio mixer for Windows',
- ['--freq=# mixer frequency (default 44100)',
- '--bits=# bits per sample (8 or default 16)'],
- {'freq': '44100', 'bits': '16'}),
SoundMode('off', 'no sounds', []),
]
diff -up bubbros-1.6/display/pclient.py.foo bubbros-1.6/display/pclient.py
--- bubbros-1.6/display/pclient.py.foo 2007-09-08 17:03:41.000000000 +0200
+++ bubbros-1.6/display/pclient.py 2008-07-24 13:44:29.000000000 +0200
@@ -162,8 +162,8 @@ class Playfield:
if mode[-1].has_key('cfgfile'):
self.trackcfgfile = mode[-1]['cfgfile']
else:
- self.trackcfgfile = os.path.join(DataChunk.SOURCEDIR,
- 'http2', 'config.txt')
+ self.trackcfgfile = os.path.join(os.environ.get('HOME', '.'),
+ '.bubbros', 'config.txt')
self.udpsock = None
self.udpsock_low = None
self.udpsock2 = None
diff -up bubbros-1.6/doc/BubBob.py.1.foo bubbros-1.6/doc/BubBob.py.1
--- bubbros-1.6/doc/BubBob.py.1.foo 2007-09-08 17:03:41.000000000 +0200
+++ bubbros-1.6/doc/BubBob.py.1 2008-07-24 13:44:29.000000000 +0200
@@ -1,23 +1,21 @@
-.\" $Id: BubBob.py.1,v 1.2 2005/04/13 18:24:17 opqdonut Exp $
+.\" $Id: bubbros.6,v 1.2 2005/04/13 18:24:17 opqdonut Exp $
.\"
.\" Process this file with
-.\" groff -man -Tascii BubBob.py.1
+.\" groff -man -Tascii bubbros.6
.\"
-.TH BubBob.py 1 "APRIL 2005" Linux "User Manuals"
+.TH bubbros 6 "APRIL 2005" Linux "User Manuals"
.SH NAME
-BubBob.py \- Generic startup script for bub-n-bros
+bubbros \- Generic startup script for bub-n-bros
.SH SYNOPSIS
-.B BubBob.py
-.br
-.B python BubBob.py
+.B bubbros
.SH DESCRIPTION
-.B BubBob.py
+.B bubbros
runs
-.BR bb.py (1)
+.BR bubbros-server (6)
(the bub-n-bros server) and then tries to open the url of its control
panel in your webbrowser.
@@ -26,7 +24,7 @@ The environment variable BROWSER affects
on Unix systems.
.SH SEE ALSO
-.BR bb.py (1)
-.BR Client.py (1)
+.BR bubbros-server (6)
+.BR bubbros-client (6)
.BR python (1)
diff -up bubbros-1.6/doc/Client.py.1.foo bubbros-1.6/doc/Client.py.1
--- bubbros-1.6/doc/Client.py.1.foo 2007-09-08 17:03:41.000000000 +0200
+++ bubbros-1.6/doc/Client.py.1 2008-07-24 13:44:29.000000000 +0200
@@ -1,27 +1,23 @@
-.\" $Id: Client.py.1,v 1.3 2005/05/06 21:32:38 arigo Exp $
+.\" $Id: bubbros-client.6,v 1.3 2005/05/06 21:32:38 arigo Exp $
.\"
.\" Process this file with
-.\" groff -man -Tascii Client.py.1
+.\" groff -man -Tascii bubbros-client.6
.\"
-.TH Client.py 1 "APRIL 2005" Linux "User Manuals"
+.TH bubbros-client 6 "APRIL 2005" Linux "User Manuals"
.SH NAME
-Client.py \- the bub-n-bros client
+bubbros-client \- the bub-n-bros client
.SH SYNOPSIS
-.B python Client.py [
+.B bubbros-client [
.I options
.BI "] [" host [: port ]]
-.PP
-Note that this script is in the
-.B display/
-subdirectory of the original directory layout.
.SH DESCRIPTION
This is the bub-n-bros client that connects to bub-n-bros servers
started with
-.BR bb.py "(1) or " BubBob.py (1) .
+.BR bubbros-server "(6) or " bubbros (6) .
It supports many different audio and video drivers and is very
multi-platform.
@@ -38,12 +34,6 @@ Connect to server running on given port
defined, search for servers on the local network.
.TP
-.BI --bits= N
-This option concerns only the
-.B windows
-audio driver. Set bits per sample. Valid values are 8 and 16 (default).
-
-.TP
.BI "-d " DRIVER ", --display=" DRIVER
Use video driver
.IR DRIVER .
@@ -57,9 +47,6 @@ running. See the
.B --shm
option.
.TP
-.B windows
-MS Windows driver.
-.TP
.B pygame
PyGame gaming library for python (if installed) has video output. Use
it if this is specified. See
@@ -86,21 +73,21 @@ You can get a list of supported formats
.TP
.BI --freq= N
This option concerns only the
-.BR linux " and " windows
-audio drivers. Set mixing frequency to
+.BR linux
+audio driver. Set mixing frequency to
.I N
(in Hz). Defaults to 44100.
.TP
.B -m, --metaserver
Connect with the help of the Metaserver (see
-.BR bb.py (1)
+.BR bubbros-server (6)
for more info). Run
-.I Client.py -m
+.I bubbros-client -m
to print a table of currently running servers, pick the
the exact IP address and port of the server of your choice
from the table, and run again
-.I Client.py -m
+.I bubbros-client -m
.BR host:port .
.TP
@@ -145,11 +132,6 @@ Use the linux audio mixer. See the
.BR --freq " and " --fmt " options."
.TP
-.B windows
-Use the Windows audio mixer. See the
-.BR --freq " and " --bits "options."
-
-.TP
.B off
No sounds.
.RE
@@ -195,6 +177,6 @@ display driver. Scale output by
.IR N %.
.SH SEE ALSO
-.BR bb.py (1)
-.BR Client.py (1)
+.BR bubbros (6)
+.BR bubbros-server (6)
.BR python (1)
\ No newline at end of file
diff -up bubbros-1.6/doc/bb.py.1.foo bubbros-1.6/doc/bb.py.1
--- bubbros-1.6/doc/bb.py.1.foo 2007-09-08 17:03:41.000000000 +0200
+++ bubbros-1.6/doc/bb.py.1 2008-07-24 13:44:29.000000000 +0200
@@ -1,29 +1,21 @@
-.\" $Id: bb.py.1,v 1.3 2005/04/17 17:19:32 opqdonut Exp $
+.\" $Id: bubbros-server.6,v 1.3 2005/04/17 17:19:32 opqdonut Exp $
.\"
.\" Process this file with
-.\" groff -man -Tascii bb.py.1
+.\" groff -man -Tascii bubbros-server.6
.\"
-.TH bb.py 1 "APRIL 2005" Linux "User Manuals"
+.TH bubbros-server 6 "APRIL 2005" Linux "User Manuals"
.SH NAME
-bb.py \- the bub-n-bros server.
+bubbros-server \- the bub-n-bros server.
.SH SYNOPSIS
-.B bb.py [
+.B bubbros-server [
.I level-file.bin
.BI "] [" options ]
-.br
-.B python bb.py [
-.I level-file.bin
-.BI "] [" options ]
-.PP
-Note that this script is in the
-.B bubbob/
-subdirectory of the original directory layout.
.SH DESCRIPTION
-.B bb.py
+.B bubbros-server
starts an http server that acts as a control panel for the server. The
server listens on port
.B 8000
@@ -124,6 +116,6 @@ The server outputs helpful debug informa
game servers.
.SH SEE ALSO
-.BR BubBob.py (1)
-.BR Client.py (1)
+.BR bubbros (6)
+.BR bubbros-client (6)
.BR python (1)
diff -up bubbros-1.6/http2/httppages.py.foo bubbros-1.6/http2/httppages.py
--- bubbros-1.6/http2/httppages.py.foo 2007-09-08 17:03:41.000000000 +0200
+++ bubbros-1.6/http2/httppages.py 2008-07-24 13:44:29.000000000 +0200
@@ -38,7 +38,8 @@ class Options:
class PageServer:
- CONFIGFILE = 'config.txt'
+ CONFIGFILE = os.path.join(os.environ.get('HOME', '.'), '.bubbros',
+ 'config.txt')
localservers = None
def __init__(self, Game):
diff -up bubbros-1.6/java/Makefile.foo bubbros-1.6/java/Makefile
--- bubbros-1.6/java/Makefile.foo 2007-09-08 17:03:41.000000000 +0200
+++ bubbros-1.6/java/Makefile 2008-07-24 13:44:29.000000000 +0200
@@ -1,2 +1,2 @@
pclient.class: pclient.java
- javac -target 1.1 pclient.java
+ javac -target 1.1 -source 1.3 pclient.java
--- NEW FILE bubbros.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=BubBros
Comment=Bub and Brothers game inspired by the classic Bubble and Bobble
Exec=bubbros
Icon=bubbros
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;ArcadeGame;
--- NEW FILE bubbros.spec ---
Name: bubbros
Version: 1.6
Release: 2%{?dist}
Summary: Bub and Brothers game inspired by the classic Bubble and Bobble
Group: Amusements/Games
License: MIT and Artistic Licenses
URL: http://bub-n-bros.sourceforge.net/
Source0: http://downloads.sourceforge.net/bub-n-bros/%{name}-%{version}.tar.bz2
Source1: bubbros.desktop
Patch0: bubbros-1.5-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel ImageMagick desktop-file-utils libX11-devel
BuildRequires: libXext-devel xorg-x11-proto-devel java-1.4.2-gcj-compat-devel
Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
Requires: pygame pygtk2 htmlview hicolor-icon-theme
%description
This is a direct clone of the MacOS game Bub & Bob of McSebi. Thanks Sebi for
all the cool graphics and sounds!
Features:
* 1 to 10 players -- the best fun is with at least 3 players!
* Same gameplay as the famous McSebi's Bub & Bob.
* Over-the-network game and/or up to 3 players on the same computer.
* Completely original crazy bonuses!
* Capture other players in a bubble!
* New levels, including a random level generator!
%prep
%setup -q
#no backups for this patch, otherwise they end up getting installed!
%patch0 -p1
sed -i 's:#! /usr/bin/env python:#!%{__python}:' BubBob.py bubbob/bb.py \
display/Client.py
chmod +x display/Client.py
# for %doc
mv bubbob/levels/README.txt levels.txt
%build
make %{?_smp_mflags}
pushd bubbob/images
python buildcolors.py
popd
pushd java
rm *.class
make
popd
convert bubbob/images/dragon_0.ppm -transparent '#010101' -crop 32x32+0+0 \
%{name}.png
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
# copying the complete dirs and then removing the unwanted bits is easier :)
cp -a BubBob.py bubbob common display http2 java metaserver \
$RPM_BUILD_ROOT%{_datadir}/%{name}
rm -fr $RPM_BUILD_ROOT%{_datadir}/%{name}/bubbob/build
rm -fr $RPM_BUILD_ROOT%{_datadir}/%{name}/bubbob/doc
rm -fr $RPM_BUILD_ROOT%{_datadir}/%{name}/display/build
rm -fr $RPM_BUILD_ROOT%{_datadir}/%{name}/display/windows
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/display/*_windows.py
rm -fr $RPM_BUILD_ROOT%{_datadir}/%{name}/http2/sf
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/http2/header.png
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/java/pclient.java
rm `find $RPM_BUILD_ROOT%{_datadir}/%{name} -name '*.c'`
rm `find $RPM_BUILD_ROOT%{_datadir}/%{name} -name 'Makefile'`
rm `find $RPM_BUILD_ROOT%{_datadir}/%{name} -name 'setup.py'`
# put the .so files in %{libdir}
mv `find $RPM_BUILD_ROOT%{_datadir}/%{name} -name '*.so'` \
$RPM_BUILD_ROOT%{_libdir}/%{name}
# create the symlinks in /usr/bin, these must be absolute links!
ln -s %{_datadir}/%{name}/BubBob.py $RPM_BUILD_ROOT%{_bindir}/bubbros
ln -s %{_datadir}/%{name}/bubbob/bb.py $RPM_BUILD_ROOT%{_bindir}/bubbros-server
ln -s %{_datadir}/%{name}/display/Client.py \
$RPM_BUILD_ROOT%{_bindir}/bubbros-client
# install the manpages
install -m 644 doc/BubBob.py.1 $RPM_BUILD_ROOT%{_mandir}/man6/bubbros.6
install -m 644 doc/bb.py.1 $RPM_BUILD_ROOT%{_mandir}/man6/bubbros-server.6
install -m 644 doc/Client.py.1 $RPM_BUILD_ROOT%{_mandir}/man6/bubbros-client.6
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor dribble \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{name}.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
%clean
rm -rf $RPM_BUILD_ROOT
%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,-)
%doc LICENSE.txt artistic.txt levels.txt
%{_bindir}/bubbros*
%{_libdir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/dribble-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%{_mandir}/man6/bubbros*.6.gz
%changelog
* Thu Jul 24 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.6-2
- Release bump for rpmfusion
* Mon Sep 10 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.6-1
- New upstream release 1.6
* Mon Jan 15 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.5-3
- Rebuild (with compile and run fixes) for new python2.5
* Tue Aug 1 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.5-2
- Add missing BuildRequires: libX11-devel libXext-devel xorg-x11-proto-devel
- Add Requires: htmlview
- Recompile java code instead of using precompiled .class files
- Don't install java source code, only class files
* Fri Jul 28 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.5-1
- initial Dribble package
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/bubbros/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 31 May 2008 14:07:17 -0000 1.1
+++ .cvsignore 24 Jul 2008 11:40:17 -0000 1.2
@@ -0,0 +1 @@
+bubbros-1.6.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/bubbros/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 31 May 2008 14:07:17 -0000 1.1
+++ sources 24 Jul 2008 11:40:17 -0000 1.2
@@ -0,0 +1 @@
+00aa5e26f5f0ed4c10765e4b33b28a09 bubbros-1.6.tar.bz2
16 years, 4 months
- 1
- 0
rpms/bubbros/devel bubbros-1.5-fixes.patch,1.1,1.2
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/bubbros/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7861
Modified Files:
bubbros-1.5-fixes.patch
Log Message:
* Thu Jul 24 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.6-2
- Release bump for rpmfusion
bubbros-1.5-fixes.patch:
Index: bubbros-1.5-fixes.patch
===================================================================
RCS file: /cvs/free/rpms/bubbros/devel/bubbros-1.5-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bubbros-1.5-fixes.patch 24 Jul 2008 11:29:04 -0000 1.1
+++ bubbros-1.5-fixes.patch 24 Jul 2008 11:38:42 -0000 1.2
@@ -1,19 +1,8 @@
---- bubbros-1.5/http2/httppages.py.fixes 2006-02-04 19:56:31.000000000 +0100
-+++ bubbros-1.5/http2/httppages.py 2006-07-28 22:22:51.000000000 +0200
-@@ -38,7 +38,8 @@
-
-
- class PageServer:
-- CONFIGFILE = 'config.txt'
-+ CONFIGFILE = os.path.join(os.environ.get('HOME', '.'), '.bubbros',
-+ 'config.txt')
- localservers = None
-
- def __init__(self, Game):
---- bubbros-1.5/BubBob.py.fixes 2006-02-04 19:56:31.000000000 +0100
-+++ bubbros-1.5/BubBob.py 2006-07-28 22:22:51.000000000 +0200
-@@ -26,16 +26,11 @@
- sys.path.append(LOCALDIR)
+diff -up bubbros-1.6/BubBob.py.foo bubbros-1.6/BubBob.py
+--- bubbros-1.6/BubBob.py.foo 2007-09-08 17:03:41.000000000 +0200
++++ bubbros-1.6/BubBob.py 2008-07-24 13:44:29.000000000 +0200
+@@ -27,16 +27,11 @@ import socket, tempfile
+ sys.path.insert(0, LOCALDIR)
os.chdir(LOCALDIR)
-try:
@@ -34,7 +23,7 @@
def load_url_file():
-@@ -129,7 +129,7 @@
+@@ -138,7 +133,7 @@ try:
browser = webbrowser.get()
name = getattr(browser, 'name', browser.__class__.__name__)
print "Trying to open '%s' with '%s'..." % (url, name)
@@ -43,9 +32,24 @@
except:
exc, val, tb = sys.exc_info()
print '-'*60
---- bubbros-1.5/bubbob/bonuses.py.fixes 2006-02-04 19:56:12.000000000 +0100
-+++ bubbros-1.5/bubbob/bonuses.py 2006-07-28 22:22:51.000000000 +0200
-@@ -1387,6 +1387,10 @@
+diff -up bubbros-1.6/bubbob/bb.py.foo bubbros-1.6/bubbob/bb.py
+--- bubbros-1.6/bubbob/bb.py.foo 2007-09-08 17:03:41.000000000 +0200
++++ bubbros-1.6/bubbob/bb.py 2008-07-24 13:44:29.000000000 +0200
+@@ -14,6 +14,10 @@ except:
+ pass
+ LOCALDIR = os.path.dirname(os.path.abspath(LOCALDIR))
+ # ----------
++rcdir = os.path.join(os.environ.get("HOME", "."), ".bubbros")
++if not os.path.isdir(rcdir):
++ os.makedirs(rcdir)
++# ----------
+
+ import random, time
+
+diff -up bubbros-1.6/bubbob/bonuses.py.foo bubbros-1.6/bubbob/bonuses.py
+--- bubbros-1.6/bubbob/bonuses.py.foo 2007-09-08 17:03:41.000000000 +0200
++++ bubbros-1.6/bubbob/bonuses.py 2008-07-24 13:44:29.000000000 +0200
+@@ -1703,6 +1703,10 @@ class Chestnut(RandomBonus):
try:
@@ -56,21 +60,178 @@
import statesaver
except ImportError:
print "'statesaver' module not compiled, no clock bonus"
---- bubbros-1.5/bubbob/bb.py.fixes 2006-02-04 19:56:12.000000000 +0100
-+++ bubbros-1.5/bubbob/bb.py 2006-07-28 22:22:51.000000000 +0200
-@@ -14,6 +14,10 @@
- pass
- LOCALDIR = os.path.dirname(os.path.abspath(LOCALDIR))
- # ----------
-+rcdir = os.path.join(os.environ.get("HOME", "."), ".bubbros")
-+if not os.path.isdir(rcdir):
-+ os.makedirs(rcdir)
-+# ----------
+diff -up bubbros-1.6/bubbob/statesaver.c.foo bubbros-1.6/bubbob/statesaver.c
+--- bubbros-1.6/bubbob/statesaver.c.foo 2007-09-08 17:03:41.000000000 +0200
++++ bubbros-1.6/bubbob/statesaver.c 2008-07-24 13:44:29.000000000 +0200
+@@ -75,10 +75,6 @@ static PyObject* genbuild(PyObject* g)
+ Py_INCREF(g); /* exhausted -- can return 'g' itself */
+ return g;
+ }
+- if (f->f_nfreevars || f->f_ncells) {
+- PyErr_SetString(PyExc_ValueError, "generator has cell or free vars");
+- goto error;
+- }
- import random, time
+ if (co->co_argcount == 0)
+ dummy = NULL;
+@@ -143,11 +139,6 @@ static int gencopy(PyObject* g2, PyObjec
+ }
+ f2 = (PyFrameObject*) x;
+
+- if (f2->f_stacksize != f->f_stacksize) {
+- PyErr_SetString(PyExc_TypeError, "stack size mismatch");
+- goto error;
+- }
+-
+ if (f2->f_stacktop != NULL)
+ while (f2->f_stacktop != f2->f_localsplus)
+ {
+diff -up bubbros-1.6/common/stdlog.py.foo bubbros-1.6/common/stdlog.py
+--- bubbros-1.6/common/stdlog.py.foo 2007-09-08 17:03:41.000000000 +0200
++++ bubbros-1.6/common/stdlog.py 2008-07-24 13:44:29.000000000 +0200
+@@ -6,7 +6,8 @@ class LogFile:
+
+ def __init__(self, filename=None, limitsize=32768):
+ if filename is None:
+- filename = sys.argv[0]
++ filename = os.path.join(os.environ.get('HOME', '.'), '.bubbros',
++ os.path.basename(sys.argv[0]))
+ if filename.endswith('.py'):
+ filename = filename[:-3]
+ filename += '.log'
+diff -up bubbros-1.6/display/dpy_pygame.py.foo bubbros-1.6/display/dpy_pygame.py
+--- bubbros-1.6/display/dpy_pygame.py.foo 2007-09-08 17:03:41.000000000 +0200
++++ bubbros-1.6/display/dpy_pygame.py 2008-07-24 13:44:29.000000000 +0200
+@@ -13,7 +13,7 @@ class Display:
+ musthidemouse = 0
+ mousevisible = 1
+
+- def __init__(self, width, height, title, transparency='yes', fullscreen='no'):
++ def __init__(self, width, height, title, transparency='yes', fullscreen='yes'):
+ self.use_transparency = not transparency.startswith('n')
+ self.use_fullscreen = fullscreen.startswith('y')
+
+@@ -200,7 +200,7 @@ def htmloptionstext(nameval):
+ return '''
+ <%s> Full Screen (Esc key to exit)</input><%s><br>
+ <%s> Draw slightly transparent bubbles</input><%s><br>
+-''' % (nameval("checkbox", "fullscreen", "yes", default="no"),
++''' % (nameval("checkbox", "fullscreen", "yes", default="yes"),
+ nameval("hidden", "fullscreen", "no"),
+ nameval("checkbox", "transparency", "yes", default="yes"),
+ nameval("hidden", "transparency", "no"))
+diff -up bubbros-1.6/display/modes.py.foo bubbros-1.6/display/modes.py
+--- bubbros-1.6/display/modes.py.foo 2007-09-08 17:03:41.000000000 +0200
++++ bubbros-1.6/display/modes.py 2008-07-24 13:44:29.000000000 +0200
+@@ -29,6 +29,10 @@ class Mode:
+ self.extraoptsdescr = extraoptsdescr
+ self.options = options.copy()
+ self.url = url
++ if sys.path[1][0:10] == '/usr/lib64':
++ sys.path.append('/usr/lib64/bubbros')
++ else:
++ sys.path.append('/usr/lib/bubbros')
+
+ def getmodule(self):
+ return __import__(self.prefix + self.name.lower(), globals(),
+@@ -94,18 +98,18 @@ class SoundMode(Mode):
+
+ def graphicmodeslist():
+ return [
++ GraphicMode('pygame', 'PyGame library (all platforms)',
++ ['--fullscreen=yes go full screen (Esc key to exit, default)',
++ '--fullscreen=no run in windowed mode',
++ '--transparency=yes slightly transparent bubbles (default)',
++ '--transparency=no disable it (a bit faster)'],
++ {'transparency': 'yes', 'fullscreen': 'yes'},
++ url='http://www.pygame.org'),
+ GraphicMode('X', 'XWindow (Linux/Unix)',
+ ['--shm=yes use the Shared Memory extension (default)',
+ '--shm=no disable it (for remote connections or old X servers)',
+ ],
+ {'shm': 'yes'}),
+- GraphicMode('windows', 'MS Windows', []),
+- GraphicMode('pygame', 'PyGame library (all platforms)',
+- ['--fullscreen=yes go full screen (Esc key to exit)',
+- '--transparency=yes slightly transparent bubbles (default)',
+- '--transparency=no disable it (a bit faster)'],
+- {'transparency': 'yes', 'fullscreen': 'no'},
+- url='http://www.pygame.org'),
+ GraphicMode('gtk', 'PyGTK (Gnome)',
+ ['--zoom=xxx% scale image by xxx %'],
+ {'zoom': '100'},
+@@ -120,10 +124,6 @@ def soundmodeslist():
+ ['--freq=# mixer frequency (default 44100)',
+ '--fmt=# data format (default S16_NE, --fmt=list for a list)'],
+ {'freq': '44100', 'fmt': 'S16_NE'}),
+- SoundMode('windows', 'audio mixer for Windows',
+- ['--freq=# mixer frequency (default 44100)',
+- '--bits=# bits per sample (8 or default 16)'],
+- {'freq': '44100', 'bits': '16'}),
+ SoundMode('off', 'no sounds', []),
+ ]
+
+diff -up bubbros-1.6/display/pclient.py.foo bubbros-1.6/display/pclient.py
+--- bubbros-1.6/display/pclient.py.foo 2007-09-08 17:03:41.000000000 +0200
++++ bubbros-1.6/display/pclient.py 2008-07-24 13:44:29.000000000 +0200
+@@ -162,8 +162,8 @@ class Playfield:
+ if mode[-1].has_key('cfgfile'):
+ self.trackcfgfile = mode[-1]['cfgfile']
+ else:
+- self.trackcfgfile = os.path.join(DataChunk.SOURCEDIR,
+- 'http2', 'config.txt')
++ self.trackcfgfile = os.path.join(os.environ.get('HOME', '.'),
++ '.bubbros', 'config.txt')
+ self.udpsock = None
+ self.udpsock_low = None
+ self.udpsock2 = None
+diff -up bubbros-1.6/doc/BubBob.py.1.foo bubbros-1.6/doc/BubBob.py.1
+--- bubbros-1.6/doc/BubBob.py.1.foo 2007-09-08 17:03:41.000000000 +0200
++++ bubbros-1.6/doc/BubBob.py.1 2008-07-24 13:44:29.000000000 +0200
+@@ -1,23 +1,21 @@
+-.\" $Id$
++.\" $Id$
+ .\"
+ .\" Process this file with
+-.\" groff -man -Tascii BubBob.py.1
++.\" groff -man -Tascii bubbros.6
+ .\"
+
+-.TH BubBob.py 1 "APRIL 2005" Linux "User Manuals"
++.TH bubbros 6 "APRIL 2005" Linux "User Manuals"
+
+ .SH NAME
+-BubBob.py \- Generic startup script for bub-n-bros
++bubbros \- Generic startup script for bub-n-bros
+
+ .SH SYNOPSIS
+-.B BubBob.py
+-.br
+-.B python BubBob.py
++.B bubbros
+
+ .SH DESCRIPTION
+-.B BubBob.py
++.B bubbros
+ runs
+-.BR bb.py (1)
++.BR bubbros-server (6)
+ (the bub-n-bros server) and then tries to open the url of its control
+ panel in your webbrowser.
+
+@@ -26,7 +24,7 @@ The environment variable BROWSER affects
+ on Unix systems.
+
+ .SH SEE ALSO
+-.BR bb.py (1)
+-.BR Client.py (1)
++.BR bubbros-server (6)
++.BR bubbros-client (6)
+ .BR python (1)
---- bubbros-1.5/doc/Client.py.1.fixes 2006-02-04 19:56:31.000000000 +0100
-+++ bubbros-1.5/doc/Client.py.1 2006-07-28 22:22:51.000000000 +0200
+diff -up bubbros-1.6/doc/Client.py.1.foo bubbros-1.6/doc/Client.py.1
+--- bubbros-1.6/doc/Client.py.1.foo 2007-09-08 17:03:41.000000000 +0200
++++ bubbros-1.6/doc/Client.py.1 2008-07-24 13:44:29.000000000 +0200
@@ -1,27 +1,23 @@
-.\" $Id$
+.\" $Id$
@@ -105,7 +266,7 @@
It supports many different audio and video drivers and is very
multi-platform.
-@@ -38,12 +34,6 @@
+@@ -38,12 +34,6 @@ Connect to server running on given port
defined, search for servers on the local network.
.TP
@@ -118,7 +279,7 @@
.BI "-d " DRIVER ", --display=" DRIVER
Use video driver
.IR DRIVER .
-@@ -57,9 +47,6 @@
+@@ -57,9 +47,6 @@ running. See the
.B --shm
option.
.TP
@@ -128,7 +289,7 @@
.B pygame
PyGame gaming library for python (if installed) has video output. Use
it if this is specified. See
-@@ -86,21 +73,21 @@
+@@ -86,21 +73,21 @@ You can get a list of supported formats
.TP
.BI --freq= N
This option concerns only the
@@ -155,7 +316,7 @@
.BR host:port .
.TP
-@@ -145,11 +132,6 @@
+@@ -145,11 +132,6 @@ Use the linux audio mixer. See the
.BR --freq " and " --fmt " options."
.TP
@@ -167,7 +328,7 @@
.B off
No sounds.
.RE
-@@ -195,6 +177,6 @@
+@@ -195,6 +177,6 @@ display driver. Scale output by
.IR N %.
.SH SEE ALSO
@@ -177,51 +338,9 @@
+.BR bubbros-server (6)
.BR python (1)
\ No newline at end of file
---- bubbros-1.5/doc/BubBob.py.1.fixes 2006-02-04 19:56:31.000000000 +0100
-+++ bubbros-1.5/doc/BubBob.py.1 2006-07-28 22:22:51.000000000 +0200
-@@ -1,23 +1,21 @@
--.\" $Id$
-+.\" $Id$
- .\"
- .\" Process this file with
--.\" groff -man -Tascii BubBob.py.1
-+.\" groff -man -Tascii bubbros.6
- .\"
-
--.TH BubBob.py 1 "APRIL 2005" Linux "User Manuals"
-+.TH bubbros 6 "APRIL 2005" Linux "User Manuals"
-
- .SH NAME
--BubBob.py \- Generic startup script for bub-n-bros
-+bubbros \- Generic startup script for bub-n-bros
-
- .SH SYNOPSIS
--.B BubBob.py
--.br
--.B python BubBob.py
-+.B bubbros
-
- .SH DESCRIPTION
--.B BubBob.py
-+.B bubbros
- runs
--.BR bb.py (1)
-+.BR bubbros-server (6)
- (the bub-n-bros server) and then tries to open the url of its control
- panel in your webbrowser.
-
-@@ -26,7 +24,7 @@
- on Unix systems.
-
- .SH SEE ALSO
--.BR bb.py (1)
--.BR Client.py (1)
-+.BR bubbros-server (6)
-+.BR bubbros-client (6)
- .BR python (1)
-
---- bubbros-1.5/doc/bb.py.1.fixes 2006-02-04 19:56:31.000000000 +0100
-+++ bubbros-1.5/doc/bb.py.1 2006-07-28 22:22:51.000000000 +0200
+diff -up bubbros-1.6/doc/bb.py.1.foo bubbros-1.6/doc/bb.py.1
+--- bubbros-1.6/doc/bb.py.1.foo 2007-09-08 17:03:41.000000000 +0200
++++ bubbros-1.6/doc/bb.py.1 2008-07-24 13:44:29.000000000 +0200
@@ -1,29 +1,21 @@
-.\" $Id$
+.\" $Id$
@@ -258,7 +377,7 @@
starts an http server that acts as a control panel for the server. The
server listens on port
.B 8000
-@@ -124,6 +116,6 @@
+@@ -124,6 +116,6 @@ The server outputs helpful debug informa
game servers.
.SH SEE ALSO
@@ -267,130 +386,22 @@
+.BR bubbros (6)
+.BR bubbros-client (6)
.BR python (1)
---- bubbros-1.5/display/modes.py.fixes 2006-02-04 19:56:31.000000000 +0100
-+++ bubbros-1.5/display/modes.py 2006-07-28 22:22:51.000000000 +0200
-@@ -29,6 +29,10 @@
- self.extraoptsdescr = extraoptsdescr
- self.options = options.copy()
- self.url = url
-+ if sys.path[1][0:10] == '/usr/lib64':
-+ sys.path.append('/usr/lib64/bubbros')
-+ else:
-+ sys.path.append('/usr/lib/bubbros')
+diff -up bubbros-1.6/http2/httppages.py.foo bubbros-1.6/http2/httppages.py
+--- bubbros-1.6/http2/httppages.py.foo 2007-09-08 17:03:41.000000000 +0200
++++ bubbros-1.6/http2/httppages.py 2008-07-24 13:44:29.000000000 +0200
+@@ -38,7 +38,8 @@ class Options:
- def getmodule(self):
- return __import__(self.prefix + self.name.lower(), globals(),
-@@ -94,18 +98,18 @@
- def graphicmodeslist():
- return [
-+ GraphicMode('pygame', 'PyGame library (all platforms)',
-+ ['--fullscreen=yes go full screen (Esc key to exit, default)',
-+ '--fullscreen=no run in windowed mode',
-+ '--transparency=yes slightly transparent bubbles (default)',
-+ '--transparency=no disable it (a bit faster)'],
-+ {'transparency': 'yes', 'fullscreen': 'yes'},
-+ url='http://www.pygame.org'),
- GraphicMode('X', 'XWindow (Linux/Unix)',
- ['--shm=yes use the Shared Memory extension (default)',
- '--shm=no disable it (for remote connections or old X servers)',
- ],
- {'shm': 'yes'}),
-- GraphicMode('windows', 'MS Windows', []),
-- GraphicMode('pygame', 'PyGame library (all platforms)',
-- ['--fullscreen=yes go full screen (Esc key to exit)',
-- '--transparency=yes slightly transparent bubbles (default)',
-- '--transparency=no disable it (a bit faster)'],
-- {'transparency': 'yes', 'fullscreen': 'no'},
-- url='http://www.pygame.org'),
- GraphicMode('gtk', 'PyGTK (Gnome)',
- ['--zoom=xxx% scale image by xxx %'],
- {'zoom': '100'},
-@@ -120,10 +124,6 @@
- ['--freq=# mixer frequency (default 44100)',
- '--fmt=# data format (default S16_NE, --fmt=list for a list)'],
- {'freq': '44100', 'fmt': 'S16_NE'}),
-- SoundMode('windows', 'audio mixer for Windows',
-- ['--freq=# mixer frequency (default 44100)',
-- '--bits=# bits per sample (8 or default 16)'],
-- {'freq': '44100', 'bits': '16'}),
- SoundMode('off', 'no sounds', []),
- ]
-
---- bubbros-1.5/display/dpy_pygame.py.fixes 2006-02-04 19:56:31.000000000 +0100
-+++ bubbros-1.5/display/dpy_pygame.py 2006-07-28 22:23:54.000000000 +0200
-@@ -13,7 +13,7 @@
- musthidemouse = 0
- mousevisible = 1
-
-- def __init__(self, width, height, title, transparency='yes', fullscreen='no'):
-+ def __init__(self, width, height, title, transparency='yes', fullscreen='yes'):
- self.use_transparency = not transparency.startswith('n')
- self.use_fullscreen = fullscreen.startswith('y')
-
-@@ -200,7 +200,7 @@
- return '''
- <%s> Full Screen (Esc key to exit)</input><%s><br>
- <%s> Draw slightly transparent bubbles</input><%s><br>
--''' % (nameval("checkbox", "fullscreen", "yes", default="no"),
-+''' % (nameval("checkbox", "fullscreen", "yes", default="yes"),
- nameval("hidden", "fullscreen", "no"),
- nameval("checkbox", "transparency", "yes", default="yes"),
- nameval("hidden", "transparency", "no"))
---- bubbros-1.5/display/pclient.py.fixes 2006-02-04 19:56:31.000000000 +0100
-+++ bubbros-1.5/display/pclient.py 2006-07-28 22:22:51.000000000 +0200
-@@ -155,8 +155,8 @@
- if mode[-1].has_key('cfgfile'):
- self.trackcfgfile = mode[-1]['cfgfile']
- else:
-- self.trackcfgfile = os.path.join(DataChunk.SOURCEDIR,
-- 'http2', 'config.txt')
-+ self.trackcfgfile = os.path.join(os.environ.get('HOME', '.'),
-+ '.bubbros', 'config.txt')
- self.udpsock = None
- self.udpsock_low = None
- self.udpsock2 = None
---- bubbros-1.5/common/stdlog.py.fixes 2006-02-04 19:56:31.000000000 +0100
-+++ bubbros-1.5/common/stdlog.py 2006-07-28 22:22:51.000000000 +0200
-@@ -6,7 +6,8 @@
-
- def __init__(self, filename=None, limitsize=32768):
- if filename is None:
-- filename = sys.argv[0]
-+ filename = os.path.join(os.environ.get('HOME', '.'), '.bubbros',
-+ os.path.basename(sys.argv[0]))
- if filename.endswith('.py'):
- filename = filename[:-3]
- filename += '.log'
-diff -up bubbros-1.6/bubbob/statesaver.c~ bubbros-1.6/bubbob/statesaver.c
---- bubbros-1.6/bubbob/statesaver.c~ 2007-09-10 11:50:46.000000000 +0200
-+++ bubbros-1.6/bubbob/statesaver.c 2007-09-10 11:50:46.000000000 +0200
-@@ -75,10 +75,6 @@ static PyObject* genbuild(PyObject* g)
- Py_INCREF(g); /* exhausted -- can return 'g' itself */
- return g;
- }
-- if (f->f_nfreevars || f->f_ncells) {
-- PyErr_SetString(PyExc_ValueError, "generator has cell or free vars");
-- goto error;
-- }
-
- if (co->co_argcount == 0)
- dummy = NULL;
-@@ -143,11 +139,6 @@ static int gencopy(PyObject* g2, PyObjec
- }
- f2 = (PyFrameObject*) x;
+ class PageServer:
+- CONFIGFILE = 'config.txt'
++ CONFIGFILE = os.path.join(os.environ.get('HOME', '.'), '.bubbros',
++ 'config.txt')
+ localservers = None
-- if (f2->f_stacksize != f->f_stacksize) {
-- PyErr_SetString(PyExc_TypeError, "stack size mismatch");
-- goto error;
-- }
--
- if (f2->f_stacktop != NULL)
- while (f2->f_stacktop != f2->f_localsplus)
- {
-diff -up bubbros-1.6/java/Makefile~ bubbros-1.6/java/Makefile
---- bubbros-1.6/java/Makefile~ 2007-09-10 11:53:35.000000000 +0200
-+++ bubbros-1.6/java/Makefile 2007-09-10 11:53:35.000000000 +0200
+ def __init__(self, Game):
+diff -up bubbros-1.6/java/Makefile.foo bubbros-1.6/java/Makefile
+--- bubbros-1.6/java/Makefile.foo 2007-09-08 17:03:41.000000000 +0200
++++ bubbros-1.6/java/Makefile 2008-07-24 13:44:29.000000000 +0200
@@ -1,2 +1,2 @@
pclient.class: pclient.java
- javac -target 1.1 pclient.java
16 years, 4 months
- 1
- 0
rpms/a52dec/F-8 a52dec-0.7.4-rpath64.patch, NONE, 1.1 a52dec-configure-optflags.patch, NONE, 1.1 a52dec.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by David Juran
Author: juran
Update of /cvs/free/rpms/a52dec/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7778/F-8
Modified Files:
.cvsignore sources
Added Files:
a52dec-0.7.4-rpath64.patch a52dec-configure-optflags.patch
a52dec.spec
Log Message:
Initial import
a52dec-0.7.4-rpath64.patch:
--- NEW FILE a52dec-0.7.4-rpath64.patch ---
--- a52dec-0.7.4/configure~ 2002-07-28 06:50:42.000000000 +0300
+++ a52dec-0.7.4/configure 2006-02-16 23:03:07.000000000 +0200
@@ -5839,7 +5839,7 @@
shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
case $host_os in
--- a52dec-0.7.4/aclocal.m4~ 2002-07-28 06:50:38.000000000 +0300
+++ a52dec-0.7.4/aclocal.m4 2006-02-16 23:02:38.000000000 +0200
@@ -2141,7 +2141,7 @@
shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
case $host_os in
a52dec-configure-optflags.patch:
--- NEW FILE a52dec-configure-optflags.patch ---
--- configure~ 2002-07-28 06:50:42.000000000 +0300
+++ configure 2003-04-13 17:20:53.000000000 +0300
@@ -2857,13 +2857,13 @@
case "$host" in
i?86-* | k?-*)
- case "$host" in
- i386-*) OPT_CFLAGS="$CFLAGS -mcpu=i386";;
- i486-*) OPT_CFLAGS="$CFLAGS -mcpu=i486";;
- i586-*) OPT_CFLAGS="$CFLAGS -mcpu=pentium";;
- i686-*) OPT_CFLAGS="$CFLAGS -mcpu=pentiumpro";;
- k6-*) OPT_CFLAGS="$CFLAGS -mcpu=k6";;
- esac
+# case "$host" in
+# i386-*) OPT_CFLAGS="$CFLAGS -mcpu=i386";;
+# i486-*) OPT_CFLAGS="$CFLAGS -mcpu=i486";;
+# i586-*) OPT_CFLAGS="$CFLAGS -mcpu=pentium";;
+# i686-*) OPT_CFLAGS="$CFLAGS -mcpu=pentiumpro";;
+# k6-*) OPT_CFLAGS="$CFLAGS -mcpu=k6";;
+# esac
echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
SAVE_CFLAGS="$CFLAGS"
--- NEW FILE a52dec.spec ---
Summary: A free ATSC A/52 stream decoder
Name: a52dec
Version: 0.7.4
Release: 11%{?dist}
License: GPLv2
Group: System Environment/Libraries
URL: http://liba52.sourceforge.net/
Source0: http://liba52.sourceforge.net/files/%{name}-%{version}.tar.gz
Patch0: a52dec-configure-optflags.patch
Patch1: a52dec-0.7.4-rpath64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: %{__perl}
%package devel
Summary: Development files needed for a52dec
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: djbfft-devel
#---------------------------------------------------------------------
%description
liba52 is a free library for decoding ATSC A/52 streams. The A/52
standard is used in a variety of applications, including digital
television and DVD. It is also known as AC-3. The package also
includes a52dec, a small test program for liba52.
%description devel
liba52 is a free library for decoding ATSC A/52 streams. The A/52
standard is used in a variety of applications, including digital
television and DVD. It is also known as AC-3.
This package contains development files for a52dec.
#---------------------------------------------------------------------
%prep
%setup -q
%patch0
%patch1 -p1
%{__perl} -pi -e 's/-prefer-non-pic\b/-prefer-pic/' \
configure liba52/configure.incl
#---------------------------------------------------------------------
%build
%configure --enable-shared --disable-static
make %{?_smp_mflags}
#---------------------------------------------------------------------
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=%{buildroot}
#---------------------------------------------------------------------
%clean
rm -rf $RPM_BUILD_ROOT
#---------------------------------------------------------------------
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%exclude %{_libdir}/liba52.la
%doc AUTHORS COPYING ChangeLog HISTORY NEWS TODO
%{_libdir}/liba52.so.*
%{_bindir}/a52dec
%{_bindir}/extract_a52
%{_mandir}/man1/a52dec.1*
%{_mandir}/man1/extract_a52.1*
%files devel
%defattr(-,root,root,-)
%doc doc/liba52.txt
%{_includedir}/a52dec
%{_libdir}/liba52.so
#---------------------------------------------------------------------
%changelog
* Mon Oct 1 2007 David Juran <david(a)juran.se> - 0.7.4-11
- Fix Licence tag to be GPLv2
- Drop %makeinstall macro
- Drop static archive
- Drop djbfft
* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.7.4-10
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
* Mon Mar 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.7.4-9
- Drop epoch in devel dep, too
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
- drop epoch
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Thu Feb 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.4-0.lvn.8
- Avoid standard rpaths on lib64 archs.
* Tue Jul 27 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.4-0.lvn.7
- Prefer PIC.
- (Build)Require djbfft-devel.
- Include more docs.
* Sun Sep 28 2003 Dams <anvil[AT]livna.org> 0:0.7.4-0.fdr.6
- Removed comment after scriptlets
- buildroot -> RPM_BUILD_ROOT
* Mon Apr 14 2003 Dams <anvil[AT]livna.org> 0:0.7.4-0.fdr.5
- devel package require djbfft (not djbfft-devel)
* Sun Apr 13 2003 Dams <anvil[AT]livna.org> 0:0.7.4-0.fdr.4
- Enabled support for djbfft
* Sun Apr 13 2003 Dams <anvil[AT]livna.org> 0:0.7.4-0.fdr.3
- Added post and postun scriplet
- moved man pages from devel to main package
* Sun Apr 13 2003 Dams <anvil[AT]livna.org> 0:0.7.4-0.fdr.2
- make configure honor optflags
- devel package
- shared library added
* Thu Apr 10 2003 Dams <anvil[AT]livna.org>
- Initial build.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/a52dec/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 20 Jul 2008 10:30:49 -0000 1.1
+++ .cvsignore 24 Jul 2008 11:38:31 -0000 1.2
@@ -0,0 +1 @@
+a52dec-0.7.4.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/a52dec/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 20 Jul 2008 10:30:49 -0000 1.1
+++ sources 24 Jul 2008 11:38:31 -0000 1.2
@@ -0,0 +1 @@
+caa9f5bc44232dc8aeea773fea56be80 a52dec-0.7.4.tar.gz
16 years, 4 months
- 1
- 0
rpms/lha/devel lha-1.14i-sec2.patch,1.1,1.2 lha.spec,1.2,1.3
by jwrdegoede
Author: jwrdegoede
Update of /cvs/nonfree/rpms/lha/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7222
Modified Files:
lha-1.14i-sec2.patch lha.spec
Log Message:
* Wed Jul 23 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.14i-21
- Release bump for rpmfusion build
lha-1.14i-sec2.patch:
Index: lha-1.14i-sec2.patch
===================================================================
RCS file: /cvs/nonfree/rpms/lha/devel/lha-1.14i-sec2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lha-1.14i-sec2.patch 24 Jul 2008 09:47:12 -0000 1.1
+++ lha-1.14i-sec2.patch 24 Jul 2008 11:34:30 -0000 1.2
@@ -1,6 +1,6 @@
-diff -urNp lha-114i.orig/src/lha_macro.h lha-114i/src/lha_macro.h
---- lha-114i.orig/src/lha_macro.h 2004-08-03 15:53:56.000000000 -0500
-+++ lha-114i/src/lha_macro.h 2004-08-03 15:54:05.000000000 -0500
+diff -up lha-114i/src/lha_macro.h.foo lha-114i/src/lha_macro.h
+--- lha-114i/src/lha_macro.h.foo 2000-10-04 16:57:38.000000000 +0200
++++ lha-114i/src/lha_macro.h 2008-07-24 13:41:58.000000000 +0200
@@ -53,7 +53,7 @@
#define SEEK_SET 0
#define SEEK_CUR 1
@@ -10,9 +10,9 @@
/* non-integral functions */
-diff -urNp lha-114i.orig/src/lharc.c lha-114i/src/lharc.c
---- lha-114i.orig/src/lharc.c 2004-08-03 15:53:56.000000000 -0500
-+++ lha-114i/src/lharc.c 2004-08-03 15:54:05.000000000 -0500
+diff -up lha-114i/src/lharc.c.foo lha-114i/src/lharc.c
+--- lha-114i/src/lharc.c.foo 2000-10-05 19:33:34.000000000 +0200
++++ lha-114i/src/lharc.c 2008-07-24 13:41:58.000000000 +0200
@@ -830,9 +830,10 @@ find_files(name, v_filec, v_filev)
DIRENTRY *dp;
struct stat tmp_stbuf, arc_stbuf, fil_stbuf;
@@ -86,9 +86,9 @@
if (open_old_archive_1(expanded_archive_name, &fp)) {
archive_name = expanded_archive_name;
return fp;
-diff -urNp lha-114i.orig/src/lhext.c lha-114i/src/lhext.c
---- lha-114i.orig/src/lhext.c 2004-08-03 15:53:56.000000000 -0500
-+++ lha-114i/src/lhext.c 2004-08-03 15:55:40.000000000 -0500
+diff -up lha-114i/src/lhext.c.foo lha-114i/src/lhext.c
+--- lha-114i/src/lhext.c.foo 2008-07-24 13:41:35.000000000 +0200
++++ lha-114i/src/lhext.c 2008-07-24 13:41:58.000000000 +0200
@@ -82,7 +82,8 @@ make_parent_path(name)
register char *p;
@@ -113,7 +113,7 @@
+ }
- /* LZHDIRS_METHODￜￜￜￜￜĥإåￜￜￜￜￜￜￜￜåￜￜￜￜￜ */
+ /* LZHDIRS_METHOD€ò»ý€Ä¥Ø¥Ã¥À€ò¥Á¥§¥Ã¥¯€¹€ë */
@@ -335,7 +338,8 @@ extract_one(afp, hdr)
if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) == UNIX_FILE_SYMLINK) {
char buf[256], *bb1, *bb2;
@@ -137,9 +137,9 @@
warning("Can't make Symbolic Link", buf);
return;
#endif
-diff -urNp lha-114i.orig/src/lhlist.c lha-114i/src/lhlist.c
---- lha-114i.orig/src/lhlist.c 2004-08-03 15:53:56.000000000 -0500
-+++ lha-114i/src/lhlist.c 2004-08-03 15:54:05.000000000 -0500
+diff -up lha-114i/src/lhlist.c.foo lha-114i/src/lhlist.c
+--- lha-114i/src/lhlist.c.foo 2000-10-04 16:57:38.000000000 +0200
++++ lha-114i/src/lhlist.c 2008-07-24 13:41:58.000000000 +0200
@@ -250,7 +250,8 @@ list_one(hdr)
printf(" %s", hdr->name);
else {
@@ -150,9 +150,9 @@
b1 = strtok(buf, "|");
b2 = strtok(NULL, "|");
printf(" %s -> %s", b1, b2);
-diff -urNp lha-114i.orig/src/util.c lha-114i/src/util.c
---- lha-114i.orig/src/util.c 2004-08-03 15:53:56.000000000 -0500
-+++ lha-114i/src/util.c 2004-08-03 15:54:05.000000000 -0500
+diff -up lha-114i/src/util.c.foo lha-114i/src/util.c
+--- lha-114i/src/util.c.foo 2000-10-04 16:57:38.000000000 +0200
++++ lha-114i/src/util.c 2008-07-24 13:41:58.000000000 +0200
@@ -276,21 +276,27 @@ rmdir(path)
char *path;
{
Index: lha.spec
===================================================================
RCS file: /cvs/nonfree/rpms/lha/devel/lha.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lha.spec 24 Jul 2008 11:22:52 -0000 1.2
+++ lha.spec 24 Jul 2008 11:34:30 -0000 1.3
@@ -25,6 +25,7 @@
# security fixes
%patch2 -p1 -b .sec
%patch3 -p1 -b .sec
+exit 1
%patch4 -p1 -b .sec
# Rename doc files to better represent encoding which is EUC (jp)
16 years, 4 months
- 1
- 0
rpms/lha/F-8 .cvsignore,1.1,1.2 sources,1.1,1.2
by jwrdegoede
Author: jwrdegoede
Update of /cvs/nonfree/rpms/lha/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6819
Modified Files:
.cvsignore sources
Log Message:
* Wed Jul 23 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.14i-21
- Release bump for rpmfusion build
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/lha/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jun 2008 15:44:11 -0000 1.1
+++ .cvsignore 24 Jul 2008 11:32:29 -0000 1.2
@@ -0,0 +1 @@
+lha-114i.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/lha/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jun 2008 15:44:11 -0000 1.1
+++ sources 24 Jul 2008 11:32:29 -0000 1.2
@@ -0,0 +1 @@
+5225884d557b91f04124693e2c5c9e94 lha-114i.tar.gz
16 years, 4 months
- 1
- 0
rpms/bubbros/devel bubbros.spec,1.1,1.2
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/bubbros/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6698
Modified Files:
bubbros.spec
Log Message:
* Thu Jul 24 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.6-2
- Release bump for rpmfusion
Index: bubbros.spec
===================================================================
RCS file: /cvs/free/rpms/bubbros/devel/bubbros.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bubbros.spec 24 Jul 2008 11:29:04 -0000 1.1
+++ bubbros.spec 24 Jul 2008 11:30:40 -0000 1.2
@@ -1,6 +1,6 @@
Name: bubbros
Version: 1.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Bub and Brothers game inspired by the classic Bubble and Bobble
Group: Amusements/Games
License: MIT and Artistic Licenses
@@ -123,6 +123,9 @@
%changelog
+* Thu Jul 24 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.6-2
+- Release bump for rpmfusion
+
* Mon Sep 10 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.6-1
- New upstream release 1.6
16 years, 4 months
- 1
- 0
rpms/fakenes/devel fakenes-0.5.8-alutinit.patch, NONE, 1.1 fakenes-0.5.8-driver-switch.patch, NONE, 1.1 fakenes-0.5.8-menu-exit.patch, NONE, 1.1 fakenes.desktop, NONE, 1.1 fakenes.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/fakenes/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6576/devel
Modified Files:
.cvsignore sources
Added Files:
fakenes-0.5.8-alutinit.patch fakenes-0.5.8-driver-switch.patch
fakenes-0.5.8-menu-exit.patch fakenes.desktop fakenes.spec
Log Message:
initial fakenes import
fakenes-0.5.8-alutinit.patch:
--- NEW FILE fakenes-0.5.8-alutinit.patch ---
--- fakenes-0.5.8/src/audiolib.c.alutinit 2006-04-24 23:21:22.000000000 +0200
+++ fakenes-0.5.8/src/audiolib.c 2006-08-13 00:41:18.000000000 +0200
@@ -415,8 +415,13 @@
/* Interpolation is not supported. */
audio_interpolation = FALSE;
- alutInit (&saved_argc, saved_argv);
- AL_CHECK();
+ if(!alutInit (&saved_argc, saved_argv))
+ {
+ /* make sure other openal functions don't get called as that causes
+ crashes */
+ audiolib_driver = NULL;
+ return (1);
+ }
/* Autodetect settings. */
fakenes-0.5.8-driver-switch.patch:
--- NEW FILE fakenes-0.5.8-driver-switch.patch ---
--- fakenes-0.5.8/src/gui.c.driver 2006-04-26 15:20:24.000000000 +0200
+++ fakenes-0.5.8/src/gui.c 2006-08-11 22:30:57.000000000 +0200
@@ -237,55 +237,58 @@
TOGGLE_MENU_ITEM(audio_channels_menu_extended_2, dsp_get_channel_enabled (APU_CHANNEL_EXTRA_2));
TOGGLE_MENU_ITEM(audio_channels_menu_extended_3, dsp_get_channel_enabled (APU_CHANNEL_EXTRA_3));
+ TOGGLE_MENU_ITEM(video_driver_menu_automatic, (menu_video_driver == GFX_AUTODETECT));
+
#ifdef ALLEGRO_DOS
- TOGGLE_MENU_ITEM(video_driver_dos_menu_vga, (gfx_driver->id == GFX_VGA));
- TOGGLE_MENU_ITEM(video_driver_dos_menu_vga_mode_x, (gfx_driver->id == GFX_MODEX));
- TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa, (gfx_driver->id == GFX_VESA1));
- TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa_2_banked, (gfx_driver->id == GFX_VESA2B));
- TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa_2_linear, (gfx_driver->id == GFX_VESA2L));
- TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa_3, (gfx_driver->id == GFX_VESA3));
- TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa_vbe_af, (gfx_driver->id == GFX_VBEAF));
+ TOGGLE_MENU_ITEM(video_driver_dos_menu_vga, (menu_video_driver == GFX_VGA));
+ TOGGLE_MENU_ITEM(video_driver_dos_menu_vga_mode_x, (menu_video_driver == GFX_MODEX));
+ TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa, (menu_video_driver == GFX_VESA1));
+ TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa_2_banked, (menu_video_driver == GFX_VESA2B));
+ TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa_2_linear, (menu_video_driver == GFX_VESA2L));
+ TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa_3, (menu_video_driver == GFX_VESA3));
+ TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa_vbe_af, (menu_video_driver == GFX_VBEAF));
#endif /* ALLEGRO_DOS */
#ifdef ALLEGRO_WINDOWS
- TOGGLE_MENU_ITEM(video_driver_windows_menu_directx, (gfx_driver->id == GFX_DIRECTX));
- TOGGLE_MENU_ITEM(video_driver_windows_menu_directx_window, (gfx_driver->id == GFX_DIRECTX_WIN));
- TOGGLE_MENU_ITEM(video_driver_windows_menu_directx_overlay, (gfx_driver->id == GFX_DIRECTX_OVL));
- TOGGLE_MENU_ITEM(video_driver_windows_menu_gdi, (gfx_driver->id == GFX_GDI));
+ TOGGLE_MENU_ITEM(video_driver_windows_menu_directx, (menu_video_driver == GFX_DIRECTX));
+ TOGGLE_MENU_ITEM(video_driver_windows_menu_directx_window, (menu_video_driver == GFX_DIRECTX_WIN));
+ TOGGLE_MENU_ITEM(video_driver_windows_menu_directx_overlay, (menu_video_driver == GFX_DIRECTX_OVL));
+ TOGGLE_MENU_ITEM(video_driver_windows_menu_gdi, (menu_video_driver == GFX_GDI));
#endif /* ALLEGRO_WINDOWS */
#ifdef ALLEGRO_LINUX
- TOGGLE_MENU_ITEM(video_driver_linux_menu_vga, (gfx_driver->id == GFX_VGA));
- TOGGLE_MENU_ITEM(video_driver_linux_menu_vga_mode_x, (gfx_driver->id == GFX_MODEX));
- TOGGLE_MENU_ITEM(video_driver_linux_menu_vesa_vbe_af, (gfx_driver->id == GFX_VBEAF));
+ TOGGLE_MENU_ITEM(video_driver_linux_menu_vga, (menu_video_driver == GFX_VGA));
+ TOGGLE_MENU_ITEM(video_driver_linux_menu_vga_mode_x, (menu_video_driver == GFX_MODEX));
+ TOGGLE_MENU_ITEM(video_driver_linux_menu_vesa_vbe_af, (menu_video_driver == GFX_VBEAF));
#ifdef GFX_FBCON
- TOGGLE_MENU_ITEM(video_driver_linux_menu_framebuffer, (gfx_driver->id == GFX_FBCON));
+ TOGGLE_MENU_ITEM(video_driver_linux_menu_framebuffer, (menu_video_driver == GFX_FBCON));
#endif
#ifdef GFX_SVGALIB
- TOGGLE_MENU_ITEM(video_driver_linux_menu_svgalib, (gfx_driver->id == GFX_SVGALIB));
+ TOGGLE_MENU_ITEM(video_driver_linux_menu_svgalib, (menu_video_driver == GFX_SVGALIB));
#endif
#endif /* ALLEGRO_LINUX */
#ifdef ALLEGRO_UNIX
- TOGGLE_MENU_ITEM(video_driver_unix_menu_x_windows, (gfx_driver->id == GFX_XWINDOWS));
- TOGGLE_MENU_ITEM(video_driver_unix_menu_x_windows_full, (gfx_driver->id == GFX_XWINDOWS_FULLSCREEN));
- TOGGLE_MENU_ITEM(video_driver_unix_menu_x_dga, (gfx_driver->id == GFX_XDGA));
- TOGGLE_MENU_ITEM(video_driver_unix_menu_x_dga_full, (gfx_driver->id == GFX_XDGA_FULLSCREEN));
- TOGGLE_MENU_ITEM(video_driver_unix_menu_x_dga_2, (gfx_driver->id == GFX_XDGA2));
+ TOGGLE_MENU_ITEM(video_driver_unix_menu_x_windows, (menu_video_driver == GFX_XWINDOWS));
+ TOGGLE_MENU_ITEM(video_driver_unix_menu_x_windows_full, (menu_video_driver == GFX_XWINDOWS_FULLSCREEN));
+ TOGGLE_MENU_ITEM(video_driver_unix_menu_x_dga, (menu_video_driver == GFX_XDGA));
+ TOGGLE_MENU_ITEM(video_driver_unix_menu_x_dga_full, (menu_video_driver == GFX_XDGA_FULLSCREEN));
+ TOGGLE_MENU_ITEM(video_driver_unix_menu_x_dga_2, (menu_video_driver == GFX_XDGA2));
#endif /* ALLEGRO_UNIX */
#ifdef USE_ALLEGROGL
- TOGGLE_MENU_ITEM(video_driver_menu_opengl_full, (gfx_driver->id == GFX_OPENGL_FULLSCREEN));
- TOGGLE_MENU_ITEM(video_driver_menu_opengl_win, (gfx_driver->id == GFX_OPENGL_WINDOWED));
+ TOGGLE_MENU_ITEM(video_driver_menu_opengl, (menu_video_driver == GFX_OPENGL));
+ TOGGLE_MENU_ITEM(video_driver_menu_opengl_full, (menu_video_driver == GFX_OPENGL_FULLSCREEN));
+ TOGGLE_MENU_ITEM(video_driver_menu_opengl_win, (menu_video_driver == GFX_OPENGL_WINDOWED));
#endif /* USE_ALLEGROGL */
--- fakenes-0.5.8/src/video.c.driver 2006-04-24 22:27:32.000000000 +0200
+++ fakenes-0.5.8/src/video.c 2006-08-11 22:29:11.000000000 +0200
@@ -62,7 +62,13 @@
BOOL video_force_fullscreen = FALSE;
int video_cached_color_depth = 0; /* Read only. */
-int video_driver = 0;
+/* 2 versions of video driver "video_driver" contains the one actually used,
+ "menu_video_driver" contains the one configured by the user from the
+ menu, this can be different from the one actually used, because hot
+ switching between regular allegro drivers and alleggl drivers is not
+ supported. */
+static int video_driver = 0;
+int menu_video_driver = 0;
BITMAP *base_video_buffer = NULL;
BITMAP *video_buffer = NULL;
@@ -139,6 +145,7 @@
int width, height;
int result;
const CHAR *font_file;
+ static BOOL firsttime = TRUE;
log_printf ("VIDEO: Entering video_init().");
@@ -152,7 +159,15 @@
log_printf ("VIDEO: Loading configuration.");
- video_driver = get_config_id ("video", "driver", video_driver);
+ /* only load the video driver once, after the first time the config setting
+ will reflect menu_video_driver, and we will want to continue using the
+ real thing. */
+ if (firsttime)
+ {
+ video_driver = get_config_id ("video", "driver", video_driver);
+ menu_video_driver = video_driver;
+ firsttime = FALSE;
+ }
screen_width = get_config_int ("video", "screen_width", screen_width);
screen_height = get_config_int ("video", "screen_height", screen_height);
color_depth = get_config_int ("video", "color_depth", color_depth);
@@ -576,7 +591,7 @@
log_printf ("VIDEO: Saving configuration.");
- set_config_id ("video", "driver", video_driver);
+ set_config_id ("video", "driver", menu_video_driver);
set_config_int ("video", "screen_width", screen_width);
set_config_int ("video", "screen_height", screen_height);
set_config_int ("video", "color_depth", color_depth);
@@ -1639,13 +1654,29 @@
void video_set_driver (int driver)
{
int old_driver;
+#ifdef USE_ALLEGROGL
+ BOOL driver_is_opengl = (driver == GFX_OPENGL) ||
+ (driver == GFX_OPENGL_FULLSCREEN) ||
+ (driver == GFX_OPENGL_WINDOWED);
+#endif
-
- if (gfx_driver -> id == driver)
+ if (menu_video_driver == driver)
{
return;
}
+#ifdef USE_ALLEGROGL
+ if ((driver_is_opengl && !video_is_opengl_mode()) ||
+ (!driver_is_opengl && video_is_opengl_mode()))
+ {
+ gui_alert ("Notification",
+ "In order for the new driver",
+ "you've choisen to come into effect.",
+ "You must exit and restart fakenes.", "&OK", 0, 0, 0);
+ menu_video_driver = driver;
+ return;
+ }
+#endif /* USE_ALLEGROGL */
old_driver = gfx_driver -> id;
@@ -1673,6 +1704,11 @@
preserve_video_buffer = FALSE;
preserve_palette = FALSE;
+
+ if (video_driver == GFX_AUTODETECT)
+ menu_video_driver = GFX_AUTODETECT;
+ else
+ menu_video_driver = gfx_driver -> id;
}
--- fakenes-0.5.8/src/include/video.h.driver 2006-04-24 02:54:48.000000000 +0200
+++ fakenes-0.5.8/src/include/video.h 2006-08-11 22:29:11.000000000 +0200
@@ -49,7 +49,7 @@
BOOL video_force_fullscreen;
int video_cached_color_depth; /* Read only. */
-int video_driver;
+int menu_video_driver;
BITMAP *base_video_buffer;
BITMAP *video_buffer;
fakenes-0.5.8-menu-exit.patch:
--- NEW FILE fakenes-0.5.8-menu-exit.patch ---
--- fakenes-0.5.8/src/main.c.fixes 2006-08-11 11:25:48.000000000 +0200
+++ fakenes-0.5.8/src/main.c 2006-08-11 11:27:49.000000000 +0200
@@ -652,6 +649,8 @@
rest (0);
}
}
+ else /* If no rom was loaded and the menu exited, exit the emulator */
+ want_exit = TRUE;
}
--- NEW FILE fakenes.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Fakenes
Comment=Nintendo Entertainment System emulator
Exec=fakenes
Icon=fakenes.png
Terminal=false
Type=Application
Categories=Game;Emulator;
--- NEW FILE fakenes.spec ---
Name: fakenes
Version: 0.5.8
Release: 4%{?dist}
Summary: Nintendo Entertainment System emulator
Group: Amusements/Games
License: Artistic
URL: http://fakenes.sourceforge.net/
Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
Source1: %{name}.desktop
Patch0: fakenes-0.5.8-menu-exit.patch
Patch1: fakenes-0.5.8-driver-switch.patch
Patch2: fakenes-0.5.8-alutinit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: allegro-devel alleggl-devel zlib-devel openal-devel
BuildRequires: libGLU-devel freealut-devel desktop-file-utils
Requires: hicolor-icon-theme
%description
FakeNES is an Open Source NES emulator. It uses the excellent Allegro
multimedia library for input, graphics, and sound effects/music across
various platforms. It is written in 100% C, and was originally designed to
run on DOS and Microsoft Windows, but now features a POSIX build system as
well. There are also official builds available for Mac OS X.
%prep
%setup -q
%patch0 -p1 -z .menu
%patch1 -p1 -z .driver
%patch2 -p1 -z .alutinit
sed -i 's/\r//' docs/faq.html
%build
export CFLAGS="$RPM_OPT_FLAGS -ffast-math"
make cbuild
./cbuild --verbose
%install
rm -rf $RPM_BUILD_ROOT
install -D -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor dribble \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 support/icon-32x32.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%files
%defattr(-, root, root)
%doc docs/CHANGES docs/LICENSE docs/README docs/faq.html
%{_bindir}/%{name}
%{_datadir}/applications/dribble-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%changelog
* Sat Mar 10 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5.8-4%{?dist}
- Fixup .desktop file categories for games-menus usage
* Sat Aug 12 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5.8-3%{?dist}
- Fix crash when using openAL sound and openAL couldn't open the audiodevice
* Fri Aug 11 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5.8-2%{?dist}
- Fix emulator hanging when pressing ESC in the main menu without a rom loaded
- Fix emulator crashing when switching between normal and opengl video modes
- Use %%{_bindir} instead of /usr/bin in %%install
* Thu Aug 3 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5.8-1%{?dist}
- Initial Fedora Extras package
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/fakenes/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jun 2008 11:39:09 -0000 1.1
+++ .cvsignore 24 Jul 2008 11:29:16 -0000 1.2
@@ -0,0 +1 @@
+fakenes-0.5.8.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/fakenes/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jun 2008 11:39:09 -0000 1.1
+++ sources 24 Jul 2008 11:29:16 -0000 1.2
@@ -0,0 +1 @@
+bc2650c42c63f18326d03e932245a787 fakenes-0.5.8.tar.bz2
16 years, 4 months
- 1
- 0