rpms/plus4emu/F-9 README_plus4emu.Fedora, NONE, 1.1 p4fliconv.desktop, NONE, 1.1 p4makecfg.desktop, NONE, 1.1 plus4emu-1.2.9-SConstruct.patch, NONE, 1.1 plus4emu.desktop, NONE, 1.1 .cvsignore, 1.4, 1.5 plus4emu.spec, 1.3, 1.4 sources, 1.4, 1.5 README_plus4emu.dribble, 1.1, NONE plus4emu-1.2.7-userpmopts.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/nonfree/rpms/plus4emu/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15486
Modified Files:
.cvsignore plus4emu.spec sources
Added Files:
README_plus4emu.Fedora p4fliconv.desktop p4makecfg.desktop
plus4emu-1.2.9-SConstruct.patch plus4emu.desktop
Removed Files:
README_plus4emu.dribble plus4emu-1.2.7-userpmopts.patch
Log Message:
* Thu Dec 25 2008 Andrea Musuruane <musuruan(a)gmail.com> 1.2.9.2-1
- Updated to upstream 1.2.9.2
- Moved to RPM Fusion nonfree
- ROM images are now shippend in the source and therefore packaged
- Fixed sources to read ROM images from datadir
- Desktop files are no longer generated in the spec file
- Renamed README.dribble in README.Fedora
--- NEW FILE README_plus4emu.Fedora ---
README for plus4emu
===================
Starting with version 1.2.9, ROMS are distributed with the RPM. The are
installed in the /usr/share/plus4emu/roms directory.
When you run the p4makecfg utility to install or reinstall plus4emu
configuration files, the ROM image directory will be set to the aforementioned
directory.
--- NEW FILE p4fliconv.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Plus4emu FLI Converter
Comment=High resolution interlaced FLI converter utility
Exec=p4fliconv
Icon=plus4emu
Terminal=false
Type=Application
Categories=Graphics;2DGraphics;
--- NEW FILE p4makecfg.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Plus4emu config
Comment=Reinstall Plus4emu configuration files
Exec=p4makecfg
Icon=plus4emu
Terminal=false
Type=Application
Categories=Game;Emulator;
plus4emu-1.2.9-SConstruct.patch:
--- NEW FILE plus4emu-1.2.9-SConstruct.patch ---
diff -dur plus4emu-1.2.9.orig/SConstruct plus4emu-1.2.9/SConstruct
--- plus4emu-1.2.9.orig/SConstruct 2008-08-27 15:32:45.000000000 +0200
+++ plus4emu-1.2.9/SConstruct 2008-08-28 05:37:35.000000000 +0200
@@ -1,5 +1,6 @@
# vim: syntax=python
+import os
import sys
win32CrossCompile = 0
@@ -10,17 +11,7 @@
enableDebug = 0
buildRelease = 1
-compilerFlags = ''
-if buildRelease:
- if linux32CrossCompile or win32CrossCompile:
- compilerFlags = ' -march=pentium2 -mtune=generic '
-if enableDebug and not buildRelease:
- compilerFlags = ' -Wno-long-long -Wshadow -g -O2 ' + compilerFlags
- compilerFlags = ' -Wall -W -ansi -pedantic ' + compilerFlags
-else:
- compilerFlags = ' -Wall -O3 ' + compilerFlags
- compilerFlags = compilerFlags + ' -fno-inline-functions '
- compilerFlags = compilerFlags + ' -fomit-frame-pointer -ffast-math '
+compilerFlags = os.environ['CXXFLAGS']
fltkConfig = 'fltk-config'
--- NEW FILE plus4emu.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Plus4emu
GenericName=Commodore 264 series emulator
Comment=Portable emulator of the Commodore 264 family of computers
Exec=plus4emu
Icon=plus4emu
Terminal=false
Type=Application
Categories=Game;Emulator;
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/plus4emu/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 24 Jul 2008 17:47:48 -0000 1.4
+++ .cvsignore 26 Dec 2008 18:35:28 -0000 1.5
@@ -1,2 +1 @@
-plus4emu-1.2.8.tar.bz2
-plus4emu-1.2.8.1.tar.bz2
+plus4emu-1.2.9.2.tar.bz2
Index: plus4emu.spec
===================================================================
RCS file: /cvs/nonfree/rpms/plus4emu/F-9/plus4emu.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plus4emu.spec 24 Jul 2008 17:47:48 -0000 1.3
+++ plus4emu.spec 26 Dec 2008 18:35:28 -0000 1.4
@@ -1,5 +1,7 @@
+%define binprefix p4
+
Name: plus4emu
-Version: 1.2.8.1
+Version: 1.2.9.2
Release: 1%{?dist}
Summary: Portable emulator of the Commodore 264 family of computers
Group: Applications/Emulators
@@ -7,8 +9,11 @@
URL: http://plus4emu.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Source1: %{name}.png
-Source2: README_%{name}.dribble
-Patch0: %{name}-1.2.7-userpmopts.patch
+Source2: README_%{name}.Fedora
+Source3: %{name}.desktop
+Source4: p4fliconv.desktop
+Source5: %{binprefix}makecfg.desktop
+Patch0: %{name}-1.2.9-SConstruct.patch
Patch1: %{name}-1.2.5-fixpathissue.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -28,51 +33,52 @@
%prep
%setup -q
-%patch0 -p0
+%patch0 -p1
%patch1 -p1
-# Insert the compiler optflags
-sed -i 's|insertrpmflags|%{optflags}|' SConstruct
-
# Fix EOL chars
sed -i 's/\r//' README NEWS
# Rename makecfg to a less generic name to avoid possible conflicts
-sed -i 's|makecfg|%{name}-makecfg|' gui/main.cpp README
+sed -i 's|makecfg|%{binprefix}makecfg|' gui/main.cpp README
+
+# Rename compress to a less generic name to avoid possible conflicts
+sed -i 's|compress -|%{binprefix}compress -|' README
+
+# ROM images are in datadir
+sed -i 's|installDirectory + "roms"|"%{_datadir}/%{name}/roms"|' installer/makecfg.cpp
%build
+export CXXFLAGS="%{optflags}"
scons %{?_smp_mflags}
-# Build desktop icon
-cat >%{name}.desktop <<EOF
-[Desktop Entry]
-Encoding=UTF-8
-Name=Plus4emu
-GenericName=Commodore 264 series emulator
-Comment=%{summary}
-Exec=%{name}
-Icon=%{name}
-Terminal=false
-Type=Application
-StartupNotify=false
-Categories=Game;Emulator;
-EOF
-
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
install -pm0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
-install -pm0644 %{SOURCE2} README.dribble
-install -pm0755 plus4emu tapconv %{buildroot}%{_bindir}
-install -pm0755 makecfg %{buildroot}%{_bindir}/%{name}-makecfg
+install -pm0644 %{SOURCE2} README.Fedora
+install -pm0755 p4fliconv p4sconv plus4emu tapconv %{buildroot}%{_bindir}
+install -pm0755 makecfg %{buildroot}%{_bindir}/%{binprefix}makecfg
+install -pm0755 compress %{buildroot}%{_bindir}/%{binprefix}compress
desktop-file-install --vendor dribble \
--dir %{buildroot}%{_datadir}/applications \
- %{name}.desktop
+ %{SOURCE3}
+desktop-file-install --vendor '' \
+ --dir %{buildroot}%{_datadir}/applications \
+ %{SOURCE4}
+
+desktop-file-install --vendor '' \
+ --dir %{buildroot}%{_datadir}/applications \
+ %{SOURCE5}
+
+# install ROM images
+mkdir -p %{buildroot}%{_datadir}/%{name}/roms
+install -pm0644 roms/* %{buildroot}%{_datadir}/%{name}/roms
%clean
rm -rf %{buildroot}
@@ -95,12 +101,23 @@
%files
%defattr(-,root,root,-)
%{_bindir}/*
+%{_datadir}/%{name}
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%{_datadir}/applications/dribble-%{name}.desktop
-%doc README COPYING NEWS README.dribble
+%{_datadir}/applications/p4fliconv.desktop
+%{_datadir}/applications/%{binprefix}makecfg.desktop
+%doc README COPYING NEWS README.Fedora
%changelog
+* Thu Dec 25 2008 Andrea Musuruane <musuruan(a)gmail.com> 1.2.9.2-1
+- Updated to upstream 1.2.9.2
+- Moved to RPM Fusion nonfree
+- ROM images are now shippend in the source and therefore packaged
+- Fixed sources to read ROM images from datadir
+- Desktop files are no longer generated in the spec file
+- Renamed README.dribble in README.Fedora
+
* Thu Jul 24 2008 Andrea Musuruane <musuruan(a)gmail.com> 1.2.8.1-1
- Updated to upstream 1.2.8.1
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/plus4emu/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 24 Jul 2008 17:47:48 -0000 1.4
+++ sources 26 Dec 2008 18:35:28 -0000 1.5
@@ -1,2 +1 @@
-0a49767a02346bc5f21e28ae2359e231 plus4emu-1.2.8.tar.bz2
-d620079cf7422a1370489ac26fd7fc8c plus4emu-1.2.8.1.tar.bz2
+3b71aed343a341f62e688dd5bc5b9d1f plus4emu-1.2.9.2.tar.bz2
--- README_plus4emu.dribble DELETED ---
--- plus4emu-1.2.7-userpmopts.patch DELETED ---
15 years, 11 months
rpms/plus4emu/F-10 README_plus4emu.Fedora, NONE, 1.1 p4fliconv.desktop, NONE, 1.1 p4makecfg.desktop, NONE, 1.1 plus4emu-1.2.9-SConstruct.patch, NONE, 1.1 plus4emu.desktop, NONE, 1.1 .cvsignore, 1.4, 1.5 plus4emu.spec, 1.4, 1.5 sources, 1.4, 1.5 README_plus4emu.dribble, 1.1, NONE plus4emu-1.2.7-userpmopts.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/nonfree/rpms/plus4emu/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13855
Modified Files:
.cvsignore plus4emu.spec sources
Added Files:
README_plus4emu.Fedora p4fliconv.desktop p4makecfg.desktop
plus4emu-1.2.9-SConstruct.patch plus4emu.desktop
Removed Files:
README_plus4emu.dribble plus4emu-1.2.7-userpmopts.patch
Log Message:
* Thu Dec 25 2008 Andrea Musuruane <musuruan(a)gmail.com> 1.2.9.2-1
- Updated to upstream 1.2.9.2
- Moved to RPM Fusion nonfree
- ROM images are now shippend in the source and therefore packaged
- Fixed sources to read ROM images from datadir
- Desktop files are no longer generated in the spec file
- Renamed README.dribble in README.Fedora
--- NEW FILE README_plus4emu.Fedora ---
README for plus4emu
===================
Starting with version 1.2.9, ROMS are distributed with the RPM. The are
installed in the /usr/share/plus4emu/roms directory.
When you run the p4makecfg utility to install or reinstall plus4emu
configuration files, the ROM image directory will be set to the aforementioned
directory.
--- NEW FILE p4fliconv.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Plus4emu FLI Converter
Comment=High resolution interlaced FLI converter utility
Exec=p4fliconv
Icon=plus4emu
Terminal=false
Type=Application
Categories=Graphics;2DGraphics;
--- NEW FILE p4makecfg.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Plus4emu config
Comment=Reinstall Plus4emu configuration files
Exec=p4makecfg
Icon=plus4emu
Terminal=false
Type=Application
Categories=Game;Emulator;
plus4emu-1.2.9-SConstruct.patch:
--- NEW FILE plus4emu-1.2.9-SConstruct.patch ---
diff -dur plus4emu-1.2.9.orig/SConstruct plus4emu-1.2.9/SConstruct
--- plus4emu-1.2.9.orig/SConstruct 2008-08-27 15:32:45.000000000 +0200
+++ plus4emu-1.2.9/SConstruct 2008-08-28 05:37:35.000000000 +0200
@@ -1,5 +1,6 @@
# vim: syntax=python
+import os
import sys
win32CrossCompile = 0
@@ -10,17 +11,7 @@
enableDebug = 0
buildRelease = 1
-compilerFlags = ''
-if buildRelease:
- if linux32CrossCompile or win32CrossCompile:
- compilerFlags = ' -march=pentium2 -mtune=generic '
-if enableDebug and not buildRelease:
- compilerFlags = ' -Wno-long-long -Wshadow -g -O2 ' + compilerFlags
- compilerFlags = ' -Wall -W -ansi -pedantic ' + compilerFlags
-else:
- compilerFlags = ' -Wall -O3 ' + compilerFlags
- compilerFlags = compilerFlags + ' -fno-inline-functions '
- compilerFlags = compilerFlags + ' -fomit-frame-pointer -ffast-math '
+compilerFlags = os.environ['CXXFLAGS']
fltkConfig = 'fltk-config'
--- NEW FILE plus4emu.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Plus4emu
GenericName=Commodore 264 series emulator
Comment=Portable emulator of the Commodore 264 family of computers
Exec=plus4emu
Icon=plus4emu
Terminal=false
Type=Application
Categories=Game;Emulator;
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/plus4emu/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 24 Jul 2008 17:44:07 -0000 1.4
+++ .cvsignore 26 Dec 2008 18:07:47 -0000 1.5
@@ -1 +1 @@
-plus4emu-1.2.8.1.tar.bz2
+plus4emu-1.2.9.2.tar.bz2
Index: plus4emu.spec
===================================================================
RCS file: /cvs/nonfree/rpms/plus4emu/F-10/plus4emu.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plus4emu.spec 24 Jul 2008 17:44:07 -0000 1.4
+++ plus4emu.spec 26 Dec 2008 18:07:48 -0000 1.5
@@ -1,5 +1,7 @@
+%define binprefix p4
+
Name: plus4emu
-Version: 1.2.8.1
+Version: 1.2.9.2
Release: 1%{?dist}
Summary: Portable emulator of the Commodore 264 family of computers
Group: Applications/Emulators
@@ -7,8 +9,11 @@
URL: http://plus4emu.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Source1: %{name}.png
-Source2: README_%{name}.dribble
-Patch0: %{name}-1.2.7-userpmopts.patch
+Source2: README_%{name}.Fedora
+Source3: %{name}.desktop
+Source4: p4fliconv.desktop
+Source5: %{binprefix}makecfg.desktop
+Patch0: %{name}-1.2.9-SConstruct.patch
Patch1: %{name}-1.2.5-fixpathissue.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -28,51 +33,52 @@
%prep
%setup -q
-%patch0 -p0
+%patch0 -p1
%patch1 -p1
-# Insert the compiler optflags
-sed -i 's|insertrpmflags|%{optflags}|' SConstruct
-
# Fix EOL chars
sed -i 's/\r//' README NEWS
# Rename makecfg to a less generic name to avoid possible conflicts
-sed -i 's|makecfg|%{name}-makecfg|' gui/main.cpp README
+sed -i 's|makecfg|%{binprefix}makecfg|' gui/main.cpp README
+
+# Rename compress to a less generic name to avoid possible conflicts
+sed -i 's|compress -|%{binprefix}compress -|' README
+
+# ROM images are in datadir
+sed -i 's|installDirectory + "roms"|"%{_datadir}/%{name}/roms"|' installer/makecfg.cpp
%build
+export CXXFLAGS="%{optflags}"
scons %{?_smp_mflags}
-# Build desktop icon
-cat >%{name}.desktop <<EOF
-[Desktop Entry]
-Encoding=UTF-8
-Name=Plus4emu
-GenericName=Commodore 264 series emulator
-Comment=%{summary}
-Exec=%{name}
-Icon=%{name}
-Terminal=false
-Type=Application
-StartupNotify=false
-Categories=Game;Emulator;
-EOF
-
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
install -pm0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
-install -pm0644 %{SOURCE2} README.dribble
-install -pm0755 plus4emu tapconv %{buildroot}%{_bindir}
-install -pm0755 makecfg %{buildroot}%{_bindir}/%{name}-makecfg
+install -pm0644 %{SOURCE2} README.Fedora
+install -pm0755 p4fliconv p4sconv plus4emu tapconv %{buildroot}%{_bindir}
+install -pm0755 makecfg %{buildroot}%{_bindir}/%{binprefix}makecfg
+install -pm0755 compress %{buildroot}%{_bindir}/%{binprefix}compress
desktop-file-install --vendor dribble \
--dir %{buildroot}%{_datadir}/applications \
- %{name}.desktop
+ %{SOURCE3}
+desktop-file-install --vendor '' \
+ --dir %{buildroot}%{_datadir}/applications \
+ %{SOURCE4}
+
+desktop-file-install --vendor '' \
+ --dir %{buildroot}%{_datadir}/applications \
+ %{SOURCE5}
+
+# install ROM images
+mkdir -p %{buildroot}%{_datadir}/%{name}/roms
+install -pm0644 roms/* %{buildroot}%{_datadir}/%{name}/roms
%clean
rm -rf %{buildroot}
@@ -95,12 +101,23 @@
%files
%defattr(-,root,root,-)
%{_bindir}/*
+%{_datadir}/%{name}
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%{_datadir}/applications/dribble-%{name}.desktop
-%doc README COPYING NEWS README.dribble
+%{_datadir}/applications/p4fliconv.desktop
+%{_datadir}/applications/%{binprefix}makecfg.desktop
+%doc README COPYING NEWS README.Fedora
%changelog
+* Thu Dec 25 2008 Andrea Musuruane <musuruan(a)gmail.com> 1.2.9.2-1
+- Updated to upstream 1.2.9.2
+- Moved to RPM Fusion nonfree
+- ROM images are now shippend in the source and therefore packaged
+- Fixed sources to read ROM images from datadir
+- Desktop files are no longer generated in the spec file
+- Renamed README.dribble in README.Fedora
+
* Thu Jul 24 2008 Andrea Musuruane <musuruan(a)gmail.com> 1.2.8.1-1
- Updated to upstream 1.2.8.1
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/plus4emu/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 24 Jul 2008 17:44:07 -0000 1.4
+++ sources 26 Dec 2008 18:07:48 -0000 1.5
@@ -1 +1 @@
-d620079cf7422a1370489ac26fd7fc8c plus4emu-1.2.8.1.tar.bz2
+3b71aed343a341f62e688dd5bc5b9d1f plus4emu-1.2.9.2.tar.bz2
--- README_plus4emu.dribble DELETED ---
--- plus4emu-1.2.7-userpmopts.patch DELETED ---
15 years, 11 months
rpms/zsnes/F-9 zsnes-1.51-pulseaudio.patch, NONE, 1.1 zsnes.spec, 1.3, 1.4
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/zsnes/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31258
Modified Files:
zsnes.spec
Added Files:
zsnes-1.51-pulseaudio.patch
Log Message:
* Wed Dec 24 2008 Andrea Musuruane <musuruan(a)gmail.com> 1.51-5
- used an upstream patch to fix pulseaudio
zsnes-1.51-pulseaudio.patch:
--- NEW FILE zsnes-1.51-pulseaudio.patch ---
diff -dur zsnes_1_51/src/linux/audio.c zsnes_1_51.pulse/src/linux/audio.c
--- zsnes_1_51/src/linux/audio.c 2007-01-10 02:19:12.000000000 +0100
+++ zsnes_1_51.pulse/src/linux/audio.c 2008-12-24 16:58:39.000000000 +0100
@@ -33,8 +33,8 @@
#ifdef __LIBAO__
static pthread_t audio_thread;
-static pthread_mutex_t audio_mutex;
-static pthread_cond_t audio_wait;
+static pthread_mutex_t audio_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t audio_wait = PTHREAD_COND_INITIALIZER;
static ao_device *audio_device = 0;
static volatile unsigned int samples_waiting = 0;
#endif
@@ -181,14 +181,6 @@
{
puts("pthread_create() failed.");
}
- else if (pthread_mutex_init(&audio_mutex, 0))
- {
- puts("pthread_mutex_init() failed.");
- }
- else if (pthread_cond_init(&audio_wait, 0))
- {
- puts("pthread_cond_init() failed.");
- }
InitSampleControl();
}
Index: zsnes.spec
===================================================================
RCS file: /cvs/free/rpms/zsnes/F-9/zsnes.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zsnes.spec 30 Jul 2008 05:24:24 -0000 1.3
+++ zsnes.spec 26 Dec 2008 14:01:35 -0000 1.4
@@ -4,7 +4,7 @@
Summary: ZSNES is a Super Nintendo emulator
Name: zsnes
Version: 1.51
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2
Group: Applications/Emulators
URL: http://www.zsnes.com/
@@ -15,6 +15,8 @@
Patch2: zsnes-1.51-FORTIFY_SOURCE.patch
# Paul Bender (minimyth)
Patch3: zsnes-1.51-gcc43.patch
+# Upstream CVS
+Patch4: zsnes-1.51-pulseaudio.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# This is to build only for i386 on plague
#ExclusiveArch: %{ix86}
@@ -42,6 +44,7 @@
%patch1 -p2
%patch2 -p2
%patch3 -p2
+%patch4 -p2
# Remove hardcoded CFLAGS and LDFLAGS
sed -i \
@@ -120,6 +123,9 @@
%doc ../docs/readme.htm/ ../docs/readme.txt/
%changelog
+* Wed Dec 24 2008 Andrea Musuruane <musuruan(a)gmail.com> 1.51-5
+- used an upstream patch to fix pulseaudio
+
* Wed Jul 30 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.51-4
- rebuild for buildsys cflags issue
15 years, 11 months
rpms/zsnes/F-10 zsnes-1.51-pulseaudio.patch, NONE, 1.1 zsnes.spec, 1.3, 1.4
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/zsnes/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31112
Modified Files:
zsnes.spec
Added Files:
zsnes-1.51-pulseaudio.patch
Log Message:
* Wed Dec 24 2008 Andrea Musuruane <musuruan(a)gmail.com> 1.51-5
- used an upstream patch to fix pulseaudio
zsnes-1.51-pulseaudio.patch:
--- NEW FILE zsnes-1.51-pulseaudio.patch ---
diff -dur zsnes_1_51/src/linux/audio.c zsnes_1_51.pulse/src/linux/audio.c
--- zsnes_1_51/src/linux/audio.c 2007-01-10 02:19:12.000000000 +0100
+++ zsnes_1_51.pulse/src/linux/audio.c 2008-12-24 16:58:39.000000000 +0100
@@ -33,8 +33,8 @@
#ifdef __LIBAO__
static pthread_t audio_thread;
-static pthread_mutex_t audio_mutex;
-static pthread_cond_t audio_wait;
+static pthread_mutex_t audio_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t audio_wait = PTHREAD_COND_INITIALIZER;
static ao_device *audio_device = 0;
static volatile unsigned int samples_waiting = 0;
#endif
@@ -181,14 +181,6 @@
{
puts("pthread_create() failed.");
}
- else if (pthread_mutex_init(&audio_mutex, 0))
- {
- puts("pthread_mutex_init() failed.");
- }
- else if (pthread_cond_init(&audio_wait, 0))
- {
- puts("pthread_cond_init() failed.");
- }
InitSampleControl();
}
Index: zsnes.spec
===================================================================
RCS file: /cvs/free/rpms/zsnes/F-10/zsnes.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zsnes.spec 30 Jul 2008 05:23:49 -0000 1.3
+++ zsnes.spec 26 Dec 2008 14:00:34 -0000 1.4
@@ -4,7 +4,7 @@
Summary: ZSNES is a Super Nintendo emulator
Name: zsnes
Version: 1.51
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2
Group: Applications/Emulators
URL: http://www.zsnes.com/
@@ -15,6 +15,8 @@
Patch2: zsnes-1.51-FORTIFY_SOURCE.patch
# Paul Bender (minimyth)
Patch3: zsnes-1.51-gcc43.patch
+# Upstream CVS
+Patch4: zsnes-1.51-pulseaudio.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# This is to build only for i386 on plague
#ExclusiveArch: %{ix86}
@@ -42,6 +44,7 @@
%patch1 -p2
%patch2 -p2
%patch3 -p2
+%patch4 -p2
# Remove hardcoded CFLAGS and LDFLAGS
sed -i \
@@ -120,6 +123,9 @@
%doc ../docs/readme.htm/ ../docs/readme.txt/
%changelog
+* Wed Dec 24 2008 Andrea Musuruane <musuruan(a)gmail.com> 1.51-5
+- used an upstream patch to fix pulseaudio
+
* Wed Jul 30 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.51-4
- rebuild for buildsys cflags issue
15 years, 11 months
rpms/zsnes/devel zsnes-1.51-pulseaudio.patch, NONE, 1.1 zsnes.spec, 1.3, 1.4
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/zsnes/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30956
Modified Files:
zsnes.spec
Added Files:
zsnes-1.51-pulseaudio.patch
Log Message:
* Wed Dec 24 2008 Andrea Musuruane <musuruan(a)gmail.com> 1.51-5
- used an upstream patch to fix pulseaudio
zsnes-1.51-pulseaudio.patch:
--- NEW FILE zsnes-1.51-pulseaudio.patch ---
diff -dur zsnes_1_51/src/linux/audio.c zsnes_1_51.pulse/src/linux/audio.c
--- zsnes_1_51/src/linux/audio.c 2007-01-10 02:19:12.000000000 +0100
+++ zsnes_1_51.pulse/src/linux/audio.c 2008-12-24 16:58:39.000000000 +0100
@@ -33,8 +33,8 @@
#ifdef __LIBAO__
static pthread_t audio_thread;
-static pthread_mutex_t audio_mutex;
-static pthread_cond_t audio_wait;
+static pthread_mutex_t audio_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t audio_wait = PTHREAD_COND_INITIALIZER;
static ao_device *audio_device = 0;
static volatile unsigned int samples_waiting = 0;
#endif
@@ -181,14 +181,6 @@
{
puts("pthread_create() failed.");
}
- else if (pthread_mutex_init(&audio_mutex, 0))
- {
- puts("pthread_mutex_init() failed.");
- }
- else if (pthread_cond_init(&audio_wait, 0))
- {
- puts("pthread_cond_init() failed.");
- }
InitSampleControl();
}
Index: zsnes.spec
===================================================================
RCS file: /cvs/free/rpms/zsnes/devel/zsnes.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zsnes.spec 30 Jul 2008 05:23:49 -0000 1.3
+++ zsnes.spec 26 Dec 2008 13:59:07 -0000 1.4
@@ -4,7 +4,7 @@
Summary: ZSNES is a Super Nintendo emulator
Name: zsnes
Version: 1.51
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2
Group: Applications/Emulators
URL: http://www.zsnes.com/
@@ -15,6 +15,8 @@
Patch2: zsnes-1.51-FORTIFY_SOURCE.patch
# Paul Bender (minimyth)
Patch3: zsnes-1.51-gcc43.patch
+# Upstream CVS
+Patch4: zsnes-1.51-pulseaudio.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# This is to build only for i386 on plague
#ExclusiveArch: %{ix86}
@@ -42,6 +44,7 @@
%patch1 -p2
%patch2 -p2
%patch3 -p2
+%patch4 -p2
# Remove hardcoded CFLAGS and LDFLAGS
sed -i \
@@ -120,6 +123,9 @@
%doc ../docs/readme.htm/ ../docs/readme.txt/
%changelog
+* Wed Dec 24 2008 Andrea Musuruane <musuruan(a)gmail.com> 1.51-5
+- used an upstream patch to fix pulseaudio
+
* Wed Jul 30 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.51-4
- rebuild for buildsys cflags issue
15 years, 11 months
rpms/rpmfusion-free-package-config-smart/F-8 rpmfusion-free-package-config-smart.spec, 1.3, 1.4
by Stewart Adam
Author: firewing
Update of /cvs/free/rpms/rpmfusion-free-package-config-smart/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28231/F-8
Modified Files:
rpmfusion-free-package-config-smart.spec
Log Message:
* Fri Dec 26 2008 Stewart Adam <s.adam at diffingo.com> 10-5
- Add "sleep 3m" to workaround buildsys bug
Index: rpmfusion-free-package-config-smart.spec
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-package-config-smart/F-8/rpmfusion-free-package-config-smart.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpmfusion-free-package-config-smart.spec 22 Dec 2008 21:29:44 -0000 1.3
+++ rpmfusion-free-package-config-smart.spec 26 Dec 2008 13:17:39 -0000 1.4
@@ -3,7 +3,7 @@
Summary: RPM Fusion (free) configuration files for the Smart package manager
Name: rpmfusion-free-package-config-smart
Version: 8
-Release: 4
+Release: 5
License: GPLv2+
Group: System Environment/Base
URL: http://rpmfusion.org/
@@ -24,6 +24,7 @@
%prep
%setup -cT
cp %{SOURCE0} .
+sleep 3m
%build
@@ -47,6 +48,9 @@
%config(noreplace) %{_sysconfdir}/smart/channels/*.channel
%changelog
+* Fri Dec 26 2008 Stewart Adam <s.adam at diffingo.com> 8-5
+- Add "sleep 3m" to workaround buildsys bug
+
* Mon Dec 22 2008 Stewart Adam <s.adam at diffingo.com> 8-4
- Another workaround since buildsys doesn't seem to like ||:
15 years, 11 months
rpms/rpmfusion-free-package-config-smart/F-10 rpmfusion-free-package-config-smart.spec, 1.3, 1.4
by Stewart Adam
Author: firewing
Update of /cvs/free/rpms/rpmfusion-free-package-config-smart/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28231/F-10
Modified Files:
rpmfusion-free-package-config-smart.spec
Log Message:
* Fri Dec 26 2008 Stewart Adam <s.adam at diffingo.com> 10-5
- Add "sleep 3m" to workaround buildsys bug
Index: rpmfusion-free-package-config-smart.spec
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-package-config-smart/F-10/rpmfusion-free-package-config-smart.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpmfusion-free-package-config-smart.spec 22 Dec 2008 21:29:44 -0000 1.3
+++ rpmfusion-free-package-config-smart.spec 26 Dec 2008 13:17:39 -0000 1.4
@@ -3,7 +3,7 @@
Summary: RPM Fusion (free) configuration files for the Smart package manager
Name: rpmfusion-free-package-config-smart
Version: 10
-Release: 4
+Release: 5
License: GPLv2+
Group: System Environment/Base
URL: http://rpmfusion.org/
@@ -24,6 +24,7 @@
%prep
%setup -cT
cp %{SOURCE0} .
+sleep 3m
%build
@@ -47,6 +48,9 @@
%config(noreplace) %{_sysconfdir}/smart/channels/*.channel
%changelog
+* Fri Dec 26 2008 Stewart Adam <s.adam at diffingo.com> 10-5
+- Add "sleep 3m" to workaround buildsys bug
+
* Mon Dec 22 2008 Stewart Adam <s.adam at diffingo.com> 10-4
- Another workaround since buildsys doesn't seem to like ||:
15 years, 11 months
rpms/rpmfusion-free-package-config-smart/F-9 rpmfusion-free-package-config-smart.spec, 1.2, 1.3
by Stewart Adam
Author: firewing
Update of /cvs/free/rpms/rpmfusion-free-package-config-smart/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28231/F-9
Modified Files:
rpmfusion-free-package-config-smart.spec
Log Message:
* Fri Dec 26 2008 Stewart Adam <s.adam at diffingo.com> 10-5
- Add "sleep 3m" to workaround buildsys bug
Index: rpmfusion-free-package-config-smart.spec
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-package-config-smart/F-9/rpmfusion-free-package-config-smart.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rpmfusion-free-package-config-smart.spec 22 Dec 2008 21:29:45 -0000 1.2
+++ rpmfusion-free-package-config-smart.spec 26 Dec 2008 13:17:40 -0000 1.3
@@ -3,7 +3,7 @@
Summary: RPM Fusion (free) configuration files for the Smart package manager
Name: rpmfusion-free-package-config-smart
Version: 9
-Release: 4
+Release: 5
License: GPLv2+
Group: System Environment/Base
URL: http://rpmfusion.org/
@@ -24,6 +24,7 @@
%prep
%setup -cT
cp %{SOURCE0} .
+sleep 3m
%build
@@ -47,6 +48,9 @@
%config(noreplace) %{_sysconfdir}/smart/channels/*.channel
%changelog
+* Fri Dec 26 2008 Stewart Adam <s.adam at diffingo.com> 9-5
+- Add "sleep 3m" to workaround buildsys bug
+
* Mon Dec 22 2008 Stewart Adam <s.adam at diffingo.com> 9-4
- Another workaround since buildsys doesn't seem to like ||:
15 years, 11 months
rpms/xorg-x11-drv-fglrx/F-10 udev-fglrx, NONE, 1.1 xorg-x11-drv-fglrx.spec, 1.11, 1.12
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30559/F-10
Modified Files:
xorg-x11-drv-fglrx.spec
Added Files:
udev-fglrx
Log Message:
Forgot the extra file, remove SOURCE12 (blacklist file)
--- NEW FILE udev-fglrx ---
dri/card0
dri/card1
dri/card2
dri/card3
Index: xorg-x11-drv-fglrx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10/xorg-x11-drv-fglrx.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-fglrx.spec 26 Dec 2008 03:39:46 -0000 1.11
+++ xorg-x11-drv-fglrx.spec 26 Dec 2008 03:41:58 -0000 1.12
@@ -25,8 +25,7 @@
Source9: fglrx-a-lid-aticonfig
Source10: fglrx.sh
Source11: fglrx.csh
-Source12: blacklist-radeon
-Source13: udev-fglrx
+Source12: udev-fglrx
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -232,7 +231,7 @@
#Udev dri nodes for fglrx
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d
-install -pm 0644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/40-fglrx-dri.nodes
+install -pm 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/40-fglrx-dri.nodes
%clean
rm -rf $RPM_BUILD_ROOT
15 years, 11 months
rpms/xorg-x11-drv-fglrx/F-10 fglrx-config-display, 1.1, 1.2 xorg-x11-drv-fglrx.spec, 1.10, 1.11
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30474/F-10
Modified Files:
fglrx-config-display xorg-x11-drv-fglrx.spec
Log Message:
* Thu Dec 25 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-3.8.12
- Remove blacklist, generate via fglrx-config-display instead
- Add extra bits to create Screen section in xorg.conf
Index: fglrx-config-display
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10/fglrx-config-display,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fglrx-config-display 16 Oct 2008 16:20:01 -0000 1.1
+++ fglrx-config-display 26 Dec 2008 03:39:46 -0000 1.2
@@ -58,6 +58,27 @@
if currentDriver == self.majorVendor:
print _('Driver already enabled.')
return
+
+ # Annoying bit because newer fglrx drivers require a Screen section
+ if len(self.xconfig.layout) == 0: # no layouts
+ layout = xf86config.XF86ConfLayout()
+ self.xconfig.layout.insert(layout)
+ layout.identifier = "Default Layout"
+ else:
+ layout = self.xconfig.layout[0]
+ if len(layout.adjacencies) == 0: # no layout adjacencies
+ layout.adjacencies.insert(xf86config.XF86ConfAdjacency())
+ layout.adjacencies[0].screen = "Screen0"
+ if len(self.xconfig.screen) == 0: # no screens
+ screen = xf86config.XF86ConfScreen()
+ self.xconfig.screen.insert(screen)
+ else:
+ screen = self.xconfig.screen[0]
+ screen.device = "Videocard0"
+ screen.defaultdepth = 24
+ screen.identifier = "Screen0"
+ self.xconfig.device[0].identifier = 'Videocard0'
+
# fglrx modules
self.addModulePath("/extensions/fglrx", self.TOP_MOD_DIR)
# 'remembering' magic's in here.
@@ -80,14 +101,14 @@
Utils.writeFile(self.ldconf,"/usr/lib/fglrx\n")
print _('Running ldconfig, this could take some time...')
Utils.runLdconfig()
+ # Requires for F10
+ blacklistContent = "#blacklist required for proprietary fglrx driver\nblacklist radeon\nblacklist radeonfb\nblacklist drm\n"
+ Utils.writeFile('/etc/modprobe.d/blacklist-radeon', blacklistContent)
+ print _('Please reboot to finish driver configuration.')
# Haven't heard of this in a while either.
#if not self.checkForModuleAndRemove("radeon") or not self.checkForModuleAndRemove("drm"):
# print WARNING_DRI_NOT_AVAILABLE
Utils.writeXorgConf(self.xconfig, self.xconfigpath)
- # 20071023: AIGLX now supported by fglrx 8.42.3!
- ## Disable AIGLX by default, it's not compatible
- #self.setComposite(False)
- #self.setAiglxFlag(False)
self.restoreconf()
def disable(self, isAutoConfigure=True):
@@ -112,6 +133,7 @@
Utils.removeFile(self.ldconf)
print _('Running ldconfig, this could take some time...')
Utils.runLdconfig()
+ Utils.removeFile('/etc/modprobe.d/blacklist-radeon')
Utils.writeXorgConf(self.xconfig, self.xconfigpath)
# And return to the Fedora default.
self.enableAiglx()
Index: xorg-x11-drv-fglrx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10/xorg-x11-drv-fglrx.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-fglrx.spec 16 Dec 2008 17:43:43 -0000 1.10
+++ xorg-x11-drv-fglrx.spec 26 Dec 2008 03:39:46 -0000 1.11
@@ -9,7 +9,7 @@
Name: xorg-x11-drv-fglrx
Version: 8.561
-Release: 1.%{ativersion}%{?dist}
+Release: 3.%{ativersion}%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: BSD/Commercial/GPL/QPL
@@ -25,6 +25,8 @@
Source9: fglrx-a-lid-aticonfig
Source10: fglrx.sh
Source11: fglrx.csh
+Source12: blacklist-radeon
+Source13: udev-fglrx
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -228,6 +230,10 @@
chmod 644 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.xbm.example
chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.sh
+#Udev dri nodes for fglrx
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d
+install -pm 0644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/40-fglrx-dri.nodes
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -260,6 +266,7 @@
%files
%defattr(-,root,root,-)
%doc fglrxpkg/usr/share/doc/fglrx/*
+%{_sysconfdir}/udev/makedev.d/40-fglrx-dri.nodes
%dir %{_sysconfdir}/ati/
%{_sysconfdir}/ati/authatieventsd.sh
%{_sysconfdir}/ati/signature
@@ -302,6 +309,13 @@
%{_includedir}/X11/extensions/*.h
%changelog
+* Thu Dec 25 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-3.8.12
+- Remove blacklist, generate via fglrx-config-display instead
+- Add extra bits to create Screen section in xorg.conf
+
+* Tue Dec 16 2008 kwizart < kwizart at gmail.com > - 8.561-2.8.12
+- Add blacklist-radeon and 40-fglrx-dri.nodes
+
* Wed Dec 10 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-1.8.12
- Update to 8.12
- Add Conflicts: for new nvidia packages
15 years, 11 months