rpms/mythtv/devel mythtv.spec,1.103,1.104
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7464
Modified Files:
mythtv.spec
Log Message:
Bump release.
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- mythtv.spec 25 Aug 2012 16:55:34 -0000 1.103
+++ mythtv.spec 25 Aug 2012 16:57:11 -0000 1.104
@@ -81,7 +81,7 @@
Release: 0.1.git.%{_gitrev}%{?dist}
#Release: 0.1.rc1%{?dist}
%else
-Release: 1%{?dist}
+Release: 2%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
11 years, 8 months
rpms/mythtv/devel ChangeLog, 1.2, 1.3 mythtv-0.25.2-fixes.patch, 1.1, 1.2 mythtv.spec, 1.102, 1.103
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7332
Modified Files:
ChangeLog mythtv-0.25.2-fixes.patch mythtv.spec
Log Message:
* Mon Jul 16 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.2-1
- Patch HLS for adapative x264 profile.
- Make sure mythbackend starts after time has synced.
- Update to latest fixies/0.25.
Index: ChangeLog
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog 22 Jul 2012 18:42:46 -0000 1.2
+++ ChangeLog 25 Aug 2012 16:55:34 -0000 1.3
@@ -1,3 +1,73 @@
+commit 46cab93562429cd19029402a2387f63a72aeb898
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Tue Jul 31 14:21:22 2012 -0400
+
+ Correct --printexpire option in mythbackend.
+
+ This corrects logic that was accidentally inverted in 8bc8dd54, and
+ allows `mythbackend --printexpire` to be used again.
+ (cherry picked from commit a9f18c63bfb23494ee83a8ba76d82fc320617067)
+
+commit 8ab229a8bed860fb0855797c683655a7465e2ee4
+Merge: a4cdc9e 1c496c8
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Tue Jul 31 14:22:32 2012 -0400
+
+ Merge branch 'fixes/0.25' of code.mythtv.org:mythtv into fixes/0.25
+
+commit 1c496c81662eabda444452071eb18f2fd375d4d0
+Author: Kyle <klillis(a)gmail.com>
+Date: Mon Jul 30 13:34:11 2012 -0400
+
+ Fixes #10897. Clear paused when we unpause FirewireRecorder.
+
+ Signed-off-by: Daniel Thor Kristjansson <danielk(a)cuymedia.net>
+
+commit 9c199a42258f2a19dd1c8d3b934e6eb04f1757ce
+Author: Daniel Thor Kristjansson <dkristjansson(a)mythtv.org>
+Date: Tue Jul 24 12:13:16 2012 -0400
+
+ Fixes #10870. Fix Start/Stop race condition in StreamHandler.
+
+ This is a backport of [445faaa47].
+
+commit a72e341a4653a1b683b7ae5ac87bcaa3092d20fa
+Author: Stuart Morgan <smorgan(a)mythtv.org>
+Date: Sun Jul 29 12:42:41 2012 +0100
+
+ Restore setup pincode following [57adc5d120] - 'Flatten the Setup Menus in the default menu theme' which dropped util_menu.xml but failed to carry over the <password> markup.
+ (cherry picked from commit 134417fe3bf7170f3419d2388a6c26afe16c4927)
+
+commit 3256849b14cc882536a153e7fbe4724adf03260c
+Author: Jim Stichnoth <jstichnoth(a)mythtv.org>
+Date: Tue Jul 24 10:56:15 2012 -0700
+
+ Subtitles: backport some code to enable cc608 TT deprecation log message.
+
+commit 39fad46248bbcbe5ab27068e73fb7c5a91bc155b
+Author: Jim Stichnoth <jstichnoth(a)mythtv.org>
+Date: Tue Jul 24 08:23:53 2012 -0700
+
+ Subtitles: Put a "DEPRECATED_608_TELETEXT" message into the logs.
+
+ Support for CEA-608 teletext captions is to be removed. Allow users
+ to check whether they would be affected. Refs #10786.
+ (cherry picked from commit 7b1aef85ec92658acb91c1ff019aed909e5df30a)
+
+commit 9e0d839be7667056dc65b79711dda84159a1b13d
+Author: Stuart Morgan <smorgan(a)mythtv.org>
+Date: Tue Jul 24 14:11:47 2012 +0100
+
+ Set m_cdWatcher to NULL after deletion, fixes segfault on exiting frontend. Fixes #10936
+ (cherry picked from commit de851dd273eaa80689a427f915c7db40d015e0ba)
+
+commit 10a68895e1fcd5c409058d2eb61fe59e78736235
+Author: Stuart Morgan <smorgan(a)mythtv.org>
+Date: Sun Jul 22 23:24:40 2012 +0100
+
+ Fix segfault after music scan completes.
+ (cherry picked from commit b2379ae9b8d42c23c3feee26b52a1f0a2ebef394)
+
commit ed58b3a818a1796340ba0f085a53159eb1d52266
Author: Stuart Morgan <smorgan(a)mythtv.org>
Date: Sat Jul 21 23:53:41 2012 +0100
@@ -14,6 +84,13 @@
e.g. GStreamer/Source/gst-plugins-ugly/gst/synaesthesia/synaescope.c
(cherry picked from commit e331017f2d1ee9be82da9c0b64ca4435ec3efd1e)
+commit a4cdc9e01295991056cdc8c5411e70937b1a4842
+Merge: 450ed91 f0e2ad8
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Fri Jul 20 21:06:48 2012 -0400
+
+ Merge branch 'fixes/0.25' of code.mythtv.org:mythtv into fixes/0.25
+
commit f0e2ad85dbdd6dd4041a8b1e7d8b17e7b8746b63
Author: Jean-Yves Avenard <jyavenard(a)mythtv.org>
Date: Wed Jul 18 20:49:11 2012 +1000
@@ -41,3 +118,12 @@
off network access.
Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+
+commit 450ed915d3a13b84489ecdebdad6fca18fc8c312
+Author: GDragon <gdragon(a)jetcom.org>
+Date: Mon Jul 9 15:33:31 2012 -0400
+
+ Properly set job type in fromProgram and fromRecorded methods.
+
+ Signed-off-by: Raymond Wagner <rwagner(a)mythtv.org>
+ (cherry picked from commit 868a566c1d635be3e60f83438f87b6f21d9f1780)
mythtv-0.25.2-fixes.patch:
checksums/mythplugins-0.25.2.md5sum | 1
checksums/mythtv-0.25.2.md5sum | 1
mythplugins/mythmusic/mythmusic/musicplayer.cpp | 7
mythplugins/mythmusic/mythmusic/polygon.h | 4
mythtv/bindings/python/MythTV/dataheap.py | 2
mythtv/html/setup/wizard-network.qsp | 4
mythtv/libs/libmythbase/serverpool.cpp | 196 +++++++++++++++---------
mythtv/libs/libmythtv/firewirerecorder.cpp | 1
mythtv/libs/libmythtv/streamhandler.cpp | 34 +---
mythtv/libs/libmythtv/streamhandler.h | 6
mythtv/libs/libmythtv/subtitlescreen.cpp | 6
mythtv/libs/libmythtv/subtitlescreen.h | 7
mythtv/programs/mythbackend/main_helpers.cpp | 2
mythtv/themes/defaultmenu/mainmenu.xml | 1
14 files changed, 176 insertions(+), 96 deletions(-)
Index: mythtv-0.25.2-fixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv-0.25.2-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythtv-0.25.2-fixes.patch 22 Jul 2012 18:42:46 -0000 1.1
+++ mythtv-0.25.2-fixes.patch 25 Aug 2012 16:55:34 -0000 1.2
@@ -1,8 +1,58 @@
- mythplugins/mythmusic/mythmusic/polygon.h | 4 +-
- mythtv/html/setup/wizard-network.qsp | 4 +
- mythtv/libs/libmythbase/serverpool.cpp | 196 +++++++++++++++++++----------
- 3 files changed, 133 insertions(+), 71 deletions(-)
+ checksums/mythplugins-0.25.2.md5sum | 1 +
+ checksums/mythtv-0.25.2.md5sum | 1 +
+ mythplugins/mythmusic/mythmusic/musicplayer.cpp | 7 +
+ mythplugins/mythmusic/mythmusic/polygon.h | 4 +-
+ mythtv/bindings/python/MythTV/dataheap.py | 2 +
+ mythtv/html/setup/wizard-network.qsp | 4 +
+ mythtv/libs/libmythbase/serverpool.cpp | 196 +++++++++++++++--------
+ mythtv/libs/libmythtv/firewirerecorder.cpp | 1 +
+ mythtv/libs/libmythtv/streamhandler.cpp | 34 ++---
+ mythtv/libs/libmythtv/streamhandler.h | 6 +-
+ mythtv/libs/libmythtv/subtitlescreen.cpp | 6 +-
+ mythtv/libs/libmythtv/subtitlescreen.h | 7 +-
+ mythtv/programs/mythbackend/main_helpers.cpp | 2 +-
+ mythtv/themes/defaultmenu/mainmenu.xml | 1 +
+ 14 files changed, 176 insertions(+), 96 deletions(-)
+diff --git a/checksums/mythplugins-0.25.2.md5sum b/checksums/mythplugins-0.25.2.md5sum
+new file mode 100644
+index 0000000..16f5965
+--- /dev/null
++++ b/checksums/mythplugins-0.25.2.md5sum
+@@ -0,0 +1 @@
++80466458a82759d213fe69af63d6dc80 mythplugins-0.25.2.tar.bz2
+diff --git a/checksums/mythtv-0.25.2.md5sum b/checksums/mythtv-0.25.2.md5sum
+new file mode 100644
+index 0000000..f02e863
+--- /dev/null
++++ b/checksums/mythtv-0.25.2.md5sum
+@@ -0,0 +1 @@
++2bf8c0aa75e88d39747e59c27aa6072e mythtv-0.25.2.tar.bz2
+diff --git a/mythplugins/mythmusic/mythmusic/musicplayer.cpp b/mythplugins/mythmusic/mythmusic/musicplayer.cpp
+index b0cccf5..d94e08f 100644
+--- a/mythplugins/mythmusic/mythmusic/musicplayer.cpp
++++ b/mythplugins/mythmusic/mythmusic/musicplayer.cpp
+@@ -105,6 +105,7 @@ MusicPlayer::~MusicPlayer()
+ m_cdWatcher->stop();
+ m_cdWatcher->wait();
+ delete m_cdWatcher;
++ m_cdWatcher = NULL;
+ }
+
+ if (!hasClient())
+@@ -283,6 +284,12 @@ void MusicPlayer::stop(bool stopAll)
+ m_output = NULL;
+ }
+
++ if (stopAll && m_cdWatcher)
++ {
++ m_cdWatcher->stop();
++ m_cdWatcher->wait();
++ }
++
+ // because we don't actually stop the audio output we have to fake a Stopped
+ // event so any listeners can act on it
+ OutputEvent oe(OutputEvent::Stopped);
diff --git a/mythplugins/mythmusic/mythmusic/polygon.h b/mythplugins/mythmusic/mythmusic/polygon.h
index 2884d8e..d859d5d 100644
--- a/mythplugins/mythmusic/mythmusic/polygon.h
@@ -23,6 +73,26 @@
}
};
#endif
+diff --git a/mythtv/bindings/python/MythTV/dataheap.py b/mythtv/bindings/python/MythTV/dataheap.py
+index dd832ba..ae817e7 100644
+--- a/mythtv/bindings/python/MythTV/dataheap.py
++++ b/mythtv/bindings/python/MythTV/dataheap.py
+@@ -612,6 +612,7 @@ class Job( DBDataWrite, JOBTYPE, JOBCMD, JOBFLAG, JOBSTATUS ):
+ def fromRecorded(cls, rec, type, status=None, schedruntime=None,
+ hostname=None, args=None, flags=None):
+ job = cls(db=rec._db)
++ job.type = type
+ job.chanid = rec.chanid
+ job.starttime = rec.starttime
+ if status:
+@@ -632,6 +633,7 @@ class Job( DBDataWrite, JOBTYPE, JOBCMD, JOBFLAG, JOBSTATUS ):
+ if prog.rectype != prog.rsRecorded:
+ raise MythError('Invalid recording type for Job.')
+ job = cls(db=prog._db)
++ job.type = type
+ job.chanid = prog.chanid
+ job.starttime = prog.recstartts
+ if status:
diff --git a/mythtv/html/setup/wizard-network.qsp b/mythtv/html/setup/wizard-network.qsp
index 03c37ac..59b67a9 100644
--- a/mythtv/html/setup/wizard-network.qsp
@@ -289,3 +359,196 @@
}
}
+diff --git a/mythtv/libs/libmythtv/firewirerecorder.cpp b/mythtv/libs/libmythtv/firewirerecorder.cpp
+index 9caa28e..fbb5ed0 100644
+--- a/mythtv/libs/libmythtv/firewirerecorder.cpp
++++ b/mythtv/libs/libmythtv/firewirerecorder.cpp
+@@ -210,6 +210,7 @@ bool FirewireRecorder::PauseAndWait(int timeout)
+ {
+ LOG(VB_RECORD, LOG_INFO, LOC +
+ QString("PauseAndWait(%1) -- unpause").arg(timeout));
++ paused = false;
+ StartStreaming();
+ unpauseWait.wakeAll();
+ }
+diff --git a/mythtv/libs/libmythtv/streamhandler.cpp b/mythtv/libs/libmythtv/streamhandler.cpp
+index 2b0a7b6..fbe9399 100644
+--- a/mythtv/libs/libmythtv/streamhandler.cpp
++++ b/mythtv/libs/libmythtv/streamhandler.cpp
+@@ -26,9 +26,15 @@ StreamHandler::StreamHandler(const QString &device) :
+
+ StreamHandler::~StreamHandler()
+ {
+- if (!_stream_data_list.empty())
++ QMutexLocker locker(&_add_rm_lock);
++
+ {
+- LOG(VB_GENERAL, LOG_ERR, LOC + "dtor & _stream_data_list not empty");
++ QMutexLocker locker2(&_listener_lock);
++ if (!_stream_data_list.empty())
++ {
++ LOG(VB_GENERAL, LOG_ERR, LOC +
++ "dtor & _stream_data_list not empty");
++ }
+ }
+
+ // This should never be triggered.. just to be safe..
+@@ -41,6 +47,8 @@ void StreamHandler::AddListener(MPEGStreamData *data,
+ bool needs_buffering,
+ QString output_file)
+ {
++ QMutexLocker locker(&_add_rm_lock);
++
+ LOG(VB_RECORD, LOG_INFO, LOC + QString("AddListener(0x%1) -- begin")
+ .arg((uint64_t)data,0,16));
+ if (!data)
+@@ -93,6 +101,8 @@ void StreamHandler::AddListener(MPEGStreamData *data,
+
+ void StreamHandler::RemoveListener(MPEGStreamData *data)
+ {
++ QMutexLocker locker(&_add_rm_lock);
++
+ LOG(VB_RECORD, LOG_INFO, LOC + QString("RemoveListener(0x%1) -- begin")
+ .arg((uint64_t)data,0,16));
+ if (!data)
+@@ -158,12 +168,6 @@ void StreamHandler::Start(void)
+ while (!_running && !_error && _running_desired)
+ _running_state_changed.wait(&_start_stop_lock, 100);
+
+- if (!_running_desired)
+- {
+- LOG(VB_GENERAL, LOG_WARNING, LOC +
+- "Programmer Error: Stop called before Start finished");
+- }
+-
+ if (_error)
+ {
+ LOG(VB_GENERAL, LOG_WARNING, LOC + "Start failed");
+@@ -175,17 +179,9 @@ void StreamHandler::Stop(void)
+ {
+ QMutexLocker locker(&_start_stop_lock);
+
+- do
+- {
+- SetRunningDesired(false);
+- while (!_running_desired && _running)
+- _running_state_changed.wait(&_start_stop_lock, 100);
+- if (_running_desired)
+- {
+- LOG(VB_GENERAL, LOG_WARNING, LOC +
+- "Programmer Error: Start called before Stop finished");
+- }
+- } while (_running_desired);
++ SetRunningDesired(false);
++ while (_running)
++ _running_state_changed.wait(&_start_stop_lock, 100);
+
+ wait();
+ }
+diff --git a/mythtv/libs/libmythtv/streamhandler.h b/mythtv/libs/libmythtv/streamhandler.h
+index 1db0584..8f97cdb 100644
+--- a/mythtv/libs/libmythtv/streamhandler.h
++++ b/mythtv/libs/libmythtv/streamhandler.h
+@@ -45,7 +45,9 @@ class PIDInfo
+ typedef QMap<uint,PIDInfo*> PIDInfoMap;
+
+ // locking order
+-// _pid_lock -> _listener_lock -> _start_stop_lock
++// _pid_lock -> _listener_lock
++// _add_rm_lock -> _listener_lock
++// -> _start_stop_lock
+
+ class StreamHandler : protected MThread, public DeviceReaderCB
+ {
+@@ -101,6 +103,8 @@ class StreamHandler : protected MThread, public DeviceReaderCB
+ bool _needs_buffering;
+ bool _allow_section_reader;
+
++ QMutex _add_rm_lock;
++
+ mutable QMutex _start_stop_lock;
+ volatile bool _running_desired;
+ volatile bool _error;
+diff --git a/mythtv/libs/libmythtv/subtitlescreen.cpp b/mythtv/libs/libmythtv/subtitlescreen.cpp
+index 9ec70e9..43dc711 100644
+--- a/mythtv/libs/libmythtv/subtitlescreen.cpp
++++ b/mythtv/libs/libmythtv/subtitlescreen.cpp
+@@ -922,7 +922,8 @@ void FormattedTextSubtitle::InitFromCC608(vector<CC608Text*> &buffers,
+ CC708CharacterAttribute attr(isItalic, isBold, isUnderline,
+ clr[min(max(0, color), 7)],
+ useBackground);
+- FormattedTextChunk chunk(captionText, attr, parent);
++ FormattedTextChunk chunk(captionText, attr, parent,
++ cc->teletextmode);
+ line.chunks += chunk;
+ LOG(VB_VBI, LOG_INFO,
+ QString("Adding cc608 chunk (%1,%2): %3")
+@@ -1089,6 +1090,7 @@ bool FormattedTextChunk::Split(FormattedTextChunk &newChunk)
+ QString("Failed to split chunk '%1'").arg(text));
+ return false;
+ }
++ newChunk.isTeletext = isTeletext;
+ newChunk.parent = parent;
+ newChunk.format = format;
+ newChunk.text = text.mid(lastSpace + 1).trimmed() + ' ';
+@@ -1119,6 +1121,8 @@ QString FormattedTextChunk::ToLogString(void) const
+ .arg(format.boldface);
+ str += QString("font=%1 ").arg(format.font_tag);
+ str += QString(" text='%1'").arg(text);
++ if (isTeletext)
++ str += " DEPRECATED_608_TELETEXT";
+ return str;
+ }
+
+diff --git a/mythtv/libs/libmythtv/subtitlescreen.h b/mythtv/libs/libmythtv/subtitlescreen.h
+index 44b3f6a..8821dff 100644
+--- a/mythtv/libs/libmythtv/subtitlescreen.h
++++ b/mythtv/libs/libmythtv/subtitlescreen.h
+@@ -110,11 +110,11 @@ class FormattedTextChunk
+ {
+ public:
+ FormattedTextChunk(const QString &t, CC708CharacterAttribute formatting,
+- SubtitleScreen *p)
+- : text(t), format(formatting), parent(p)
++ SubtitleScreen *p, bool teletext = false)
++ : text(t), format(formatting), parent(p), isTeletext(teletext)
+ {
+ }
+- FormattedTextChunk(void) : parent(NULL) {}
++ FormattedTextChunk(void) : parent(NULL), isTeletext(false) {}
+
+ QSize CalcSize(float layoutSpacing = 0.0f) const
+ {
+@@ -130,6 +130,7 @@ class FormattedTextChunk
+ QString text;
+ CC708CharacterAttribute format;
+ SubtitleScreen *parent; // where fonts and sizes are kept
++ bool isTeletext;
+ };
+
+ class FormattedTextLine
+diff --git a/mythtv/programs/mythbackend/main_helpers.cpp b/mythtv/programs/mythbackend/main_helpers.cpp
+index 5017af4..28d5a4a 100644
+--- a/mythtv/programs/mythbackend/main_helpers.cpp
++++ b/mythtv/programs/mythbackend/main_helpers.cpp
+@@ -405,7 +405,7 @@ int handle_command(const MythBackendCommandLineParser &cmdline)
+ return (ok) ? GENERIC_EXIT_OK : GENERIC_EXIT_CONNECT_ERROR;
+ }
+
+- if (!cmdline.toBool("printexpire"))
++ if (cmdline.toBool("printexpire"))
+ {
+ expirer = new AutoExpire();
+ expirer->PrintExpireList(cmdline.toString("printexpire"));
+diff --git a/mythtv/themes/defaultmenu/mainmenu.xml b/mythtv/themes/defaultmenu/mainmenu.xml
+index 1c72a92..b747575 100644
+--- a/mythtv/themes/defaultmenu/mainmenu.xml
++++ b/mythtv/themes/defaultmenu/mainmenu.xml
+@@ -41,6 +41,7 @@
+ <text>Setup</text>
+ <description>Configure MythTV and plugins</description>
+ <action>MENU main_settings.xml</action>
++ <password>SetupPinCode</password>
+ </button>
+
+ </mythmenu>
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- mythtv.spec 22 Jul 2012 18:42:46 -0000 1.102
+++ mythtv.spec 25 Aug 2012 16:55:34 -0000 1.103
@@ -1293,7 +1293,7 @@
%{_datadir}/pixmaps/myth*.png
%{_datadir}/mythtv/metadata/
# Myth Video is now Video Gallery
-%attr(-,mythtv,mythtv) %{_localstatedir}/lib/mythvideo
+%attr(0775,mythtv,mythtv) %{_localstatedir}/lib/mythvideo
%files base-themes
%{_datadir}/mythtv/themes/
@@ -1365,7 +1365,7 @@
%doc mythplugins/mythgallery/README
%{_libdir}/mythtv/plugins/libmythgallery.so
%{_datadir}/mythtv/i18n/mythgallery_*.qm
-%attr(-,mythtv,mythtv) %{_localstatedir}/lib/pictures
+%attr(0775,mythtv,mythtv) %{_localstatedir}/lib/pictures
%endif
%if %{with_mythgame}
@@ -1387,7 +1387,7 @@
%doc mythplugins/mythmusic/COPYING
%doc mythplugins/mythmusic/README
%{_libdir}/mythtv/plugins/libmythmusic.so
-%{_localstatedir}/lib/mythmusic
+%attr(0775,mythtv,mythtv) %{_localstatedir}/lib/mythmusic
%{_datadir}/mythtv/musicmenu.xml
%{_datadir}/mythtv/music_settings.xml
%{_datadir}/mythtv/i18n/mythmusic_*.qm
11 years, 8 months
rpms/staging-kmod/F-17 staging-kmod.spec,1.50,1.51
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3948
Modified Files:
staging-kmod.spec
Log Message:
* Sat Aug 25 2012 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.5-3.1
- Fix stupid thinko to make crypto stuff for rtl8192e work
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-17/staging-kmod.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- staging-kmod.spec 22 Aug 2012 22:11:15 -0000 1.50
+++ staging-kmod.spec 25 Aug 2012 15:31:33 -0000 1.51
@@ -20,7 +20,7 @@
Name: staging-kmod
Version: 3.5
-Release: %{?prever:0.}2%{?prever:.%{prever}}%{?dist}.4
+Release: %{?prever:0.}3%{?prever:.%{prever}}%{?dist}.1
Summary: Selected kernel modules from linux-staging
Group: System Environment/Kernel
@@ -93,7 +93,7 @@
configops="${configops} CONFIG_R8712_AP=y"
;;
RTL8192E)
- configops="${configops} CONFIG_RTLLIB=m RTLLIB_CRYPTO_CCMP=m RTLLIB_CRYPTO_TKIP=m RTLLIB_CRYPTO_WEP=m "
+ configops="${configops} CONFIG_RTLLIB=m CONFIG_RTLLIB_CRYPTO_CCMP=m CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m "
;;
USBIP_CORE)
configops="${configops} CONFIG_USBIP_HOST=m CONFIG_USBIP_VHCI_HCD=m"
@@ -142,14 +142,8 @@
rm -rf $RPM_BUILD_ROOT
%changelog
-* Wed Aug 22 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.5-2.4
-- Rebuilt for updated kernel
-
-* Thu Aug 16 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.5-2.3
-- Rebuilt for updated kernel
-
-* Sat Aug 11 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.5-2.2
-- Rebuilt for updated kernel
+* Sat Aug 25 2012 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.5-3.1
+- Fix stupid thinko to make crypto stuff for rtl8192e work
* Tue Jul 31 2012 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.5-2.1
- Fix zram
11 years, 8 months
rpms/bsnes/F-16 bsnes-source-cleanup, NONE, 1.1 startscript, NONE, 1.1 .cvsignore, 1.35, 1.36 README.bsnes, 1.4, 1.5 bsnes.spec, 1.47, 1.48 sources, 1.35, 1.36 bsnes-0.086-systemwide.patch, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/bsnes/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20789
Modified Files:
.cvsignore README.bsnes bsnes.spec sources
Added Files:
bsnes-source-cleanup startscript
Removed Files:
bsnes-0.086-systemwide.patch
Log Message:
* Sat Aug 25 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.091-1
- Updated to 0.091
- Switched to Debian approach for system-wide installation
- Updated %description
- Dropped README.Fedora
- Overhauled the package dropping the debugger and accuracy profile
--- NEW FILE bsnes-source-cleanup ---
#!/bin/bash
VERSION=$1
tar -xJvf bsnes_v$VERSION-source.tar.xz
rm bsnes_v$VERSION-source/bsnes/profile/Super\ Game\ Boy.sfc/boot.rom
rm bsnes_v$VERSION-source/bsnes/profile/Game\ Boy\ Color.sys/boot.rom
rm bsnes_v$VERSION-source/bsnes/profile/Game\ Boy.sys/boot.rom
rm bsnes_v$VERSION-source/bsnes/profile/Super\ Famicom.sys/spc700.rom
tar -cJvf bsnes_v$VERSION-source-noroms.tar.xz bsnes_v$VERSION-source
--- NEW FILE startscript ---
#!/bin/bash
if test ! -d $HOME/.config/bsnes
then
mkdir -p $HOME/.config/bsnes
fi
if test ! -f $HOME/.config/bsnes/cheats.xml
then
cp /usr/share/bsnes/cheats.xml $HOME/.config/bsnes
fi
if test ! -d $HOME/.config/bsnes/shaders
then
mkdir -p $HOME/.config/bsnes/shaders
fi
for shader in $(ls /usr/share/bsnes/shaders/*.OpenGL.shader)
do
if test ! -f $HOME/.config/bsnes/shaders/${shader##*/}
then
ln -s $shader $HOME/.config/bsnes/shaders
fi
done
find /usr/share/bsnes -type d -regex ".*\.s[fy][cs]" | while read sdir
do
if test ! -d "$HOME/.config/bsnes/${sdir##*/}"
then
mkdir "$HOME/.config/bsnes/${sdir##*/}"
fi
for sfile in $(ls "$sdir")
do
if test ! -f "$HOME/.config/bsnes/${sdir##*/}/${sfile##*/}"
then
ln -s "$sdir/$sfile" "$HOME/.config/bsnes/${sdir##*/}"
fi
done
done
/usr/libexec/bsnes "$@"
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/bsnes/F-16/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore 16 Feb 2012 19:23:37 -0000 1.35
+++ .cvsignore 25 Aug 2012 10:57:57 -0000 1.36
@@ -1 +1 @@
-bsnes_v086-source.tar.bz2
+bsnes_v091-source-noroms.tar.xz
Index: README.bsnes
===================================================================
RCS file: /cvs/free/rpms/bsnes/F-16/README.bsnes,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- README.bsnes 22 Jun 2011 20:01:55 -0000 1.4
+++ README.bsnes 25 Aug 2012 10:57:57 -0000 1.5
@@ -1,12 +1,8 @@
RPM Fusion bsnes package
==============================================================================
-RPM Fusion bsnes package is patched to install cheat.xml, filters and shaders
-in system-wide location. If you run into issues using these, please don't
-complain to upstream, but use RPM Fusion bugzilla first.
-
-Moreover, due to [1] newer versions of bsnes are more strict when it comes to
-file formats accepted. The snespurify-qt utility can be used to convert the
-images. They have to be uncompressed.
-
-[1] http://byuu.org/bsnes/legacy-formats
+bsnes requires firmware/BIOS images to function properly. They need to
+be placed in ~/.config/bsnes, in the existing subfolders. The manifest.xml
+files contain the info on the correct website.
+Some of these files can be downloaded from bsnes website (they are included in
+the bsnes archive), some need to be obtained by other means.
Index: bsnes.spec
===================================================================
RCS file: /cvs/free/rpms/bsnes/F-16/bsnes.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- bsnes.spec 16 Feb 2012 19:23:37 -0000 1.47
+++ bsnes.spec 25 Aug 2012 10:57:58 -0000 1.48
@@ -1,4 +1,4 @@
-%global vernumber 086
+%global vernumber 091
Name: bsnes
Version: 0.%{vernumber}
@@ -6,10 +6,12 @@
Summary: SNES emulator focused on accuracy
License: GPLv3
-URL: http://byuu.org/bsnes/
-Source0: http://bsnes.googlecode.com/files/%{name}_v%{vernumber}-source.tar.bz2
-Source2: README.bsnes
-Patch1: bsnes-0.086-systemwide.patch
+URL: http://byuu.org/%{name}/
+#bsnes needs copyrighted firmware to work. use the bsnes-source-cleanup script to clean the tarball
+Source0: http://%{name}.googlecode.com/files/%{name}_v%{vernumber}-source-noroms.tar.xz
+Source1: startscript
+Source2: bsnes-source-cleanup
+Source3: README.bsnes
#bsnes does not use system snes_ntsc because the modified video processing
#filter algorithm calls back into bsnes specific c++ colortable code, that
@@ -28,110 +30,101 @@
Obsoletes: %{name}-supergameboy < 0.079
%description
-bsnes is an emulator that began development on 2004-10-14. The purpose of the
-emulator is a bit different from other emulators: it focuses on accuracy,
-debugging functionality, and clean code.
-The emulator does not focus on things that would hinder accuracy. This
-includes speed and game-specific hacks for compatibility. As a result, the
-minimum system requirements for bsnes are quite high.
+bsnes is a multi-system emulator that began development on 2004-10-14. It
+currently supports the following systems:
+* Nintendo
+* Super Nintendo
+* Game Boy
+* Game Boy Color
+* Game Boy Advance
+* Nintendo DS
+
+bsnes also supports the following subsystems:
+* Super Game Boy
+* BS-X Satellaview
+* Sufami Turbo
+
+bsnes focuses on accuracy and clean code above all else. It never uses speed or
+compatibilty hacks. As a result, the minimum system requirements are greater
+than with other emulators.
%prep
%setup -qn %{name}_v%{vernumber}-source
-%patch1 -p1 -b .systemwide
#fix permissions
find . -type f -not -name \*.sh -exec chmod 644 {} \;
#use system optflags
-sed -i "s/-O3/$RPM_OPT_FLAGS/" bsnes/Makefile
-sed -i "s/-O3/$RPM_OPT_FLAGS -fPIC/" snesfilter/Makefile
-sed -i "s/-O3/$RPM_OPT_FLAGS/" snespurify/cc-gtk.sh
+sed -i "s/-O3/$RPM_OPT_FLAGS/" %{name}/Makefile
+sed -i "s/-O3/$RPM_OPT_FLAGS/" purify/Makefile
#don't strip the binaries prematurely
-sed -i "s/link += -s/link +=/" bsnes/Makefile
-sed -i "s/link := -s/link :=/" snesfilter/Makefile
-sed -i "s/-s //" snespurify/cc-gtk.sh
-
-#use the proper compiler and moc commands
-sed -i "s/g++-4.5/g++/" snespurify/cc-gtk.sh
+sed -i "s/link += -s/link +=/" %{name}/Makefile
+sed -i "s/link := -s/link := -lX11/" purify/Makefile
#install fedora-specific readme
install -pm 644 %{SOURCE2} README.Fedora
-#use proper system-wide path for filters
-sed -i 's@/usr/lib@%{_libdir}@' bsnes/ui/general/main-window.cpp
-
%build
-#prepare for building compatibity and accuracy profile, as well as the debugger
-cp -pR bsnes bsnes-accuracy
-cp -pR bsnes laevateinn
-
-pushd bsnes
+pushd %{name}
make %{?_smp_mflags} compiler=gcc profile=compatibility phoenix=gtk
popd
-pushd bsnes-accuracy
-make %{?_smp_mflags} compiler=gcc profile=accuracy phoenix=gtk
-popd
-pushd laevateinn
-make %{?_smp_mflags} compiler=gcc ui=ui-debugger phoenix=gtk
-popd
-pushd snesfilter
+pushd purify
make %{?_smp_mflags} compiler=gcc
popd
-pushd snespurify
-./cc-gtk.sh
-popd
%install
rm -rf $RPM_BUILD_ROOT
-pushd bsnes
-sed -i 's/Name=bsnes/Name=bsnes (Compatibility profile)/' data/bsnes.desktop
-make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix}
-desktop-file-install --vendor=rpmfusion \
- --delete-original --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- $RPM_BUILD_ROOT%{_datadir}/applications/bsnes.desktop
-popd
-pushd bsnes-accuracy
-sed -i 's/Name=bsnes/Name=bsnes (Accuracy profile)/' data/bsnes.desktop
-sed -i 's/Exec=bsnes/Exec=bsnes-accuracy/' data/bsnes.desktop
-install -pm 755 out/bsnes $RPM_BUILD_ROOT%{_bindir}/bsnes-accuracy
-desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- data/bsnes.desktop
-popd
-pushd laevateinn
-install -pm 755 out/laevateinn $RPM_BUILD_ROOT%{_bindir}
-popd
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -pm 644 bsnes/data/cheats.xml $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/filters
-install -pm 755 snesfilter/out/*.filter $RPM_BUILD_ROOT%{_libdir}/%{name}/filters
-install -pm 755 snespurify/snespurify-gtk $RPM_BUILD_ROOT%{_bindir}
+install -Dpm 755 %{name}/out/%{name} $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}
+install -d $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --vendor=rpmfusion --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ %{name}/data/%{name}.desktop
+install -Dpm 644 %{name}/data/%{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+install -Dpm 644 %{name}/data/cheats.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/cheats.xml
+install -Dpm 755 purify/purify $RPM_BUILD_ROOT%{_bindir}
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/shaders
-install -pm 644 snesshader/*.shader $RPM_BUILD_ROOT%{_datadir}/%{name}/shaders
+install -pm 644 shaders/*.shader $RPM_BUILD_ROOT%{_datadir}/%{name}/shaders
+
+#install firmwares
+pushd %{name}/profile
+find -type f | while read sfile
+do
+ install -Dpm 644 "$sfile" "$RPM_BUILD_ROOT%{_datadir}/%{name}/$sfile"
+done
+popd
%files
%doc README.Fedora
-%{_bindir}/bsnes
-%{_bindir}/bsnes-accuracy
-%{_bindir}/laevateinn
-%{_bindir}/snespurify-gtk
-%{_libdir}/bsnes
-%{_datadir}/bsnes
-%{_datadir}/pixmaps/bsnes.png
-%{_datadir}/applications/bsnes.desktop
-%{_datadir}/applications/rpmfusion-bsnes.desktop
+%{_bindir}/%{name}
+%{_bindir}/purify
+%{_libexecdir}/%{name}
+%{_datadir}/%{name}
+%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/applications/rpmfusion-%{name}.desktop
%changelog
+* Sat Aug 25 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.091-1
+- Updated to 0.091
+- Switched to Debian approach for system-wide installation
+- Updated %%description
+- Dropped README.Fedora
+- Overhauled the package dropping the debugger and accuracy profile
+
+* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.086-2.1
+- Rebuilt for c++ ABI breakage
+
* Tue Feb 14 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.086-1
- Updated to 0.086
- Dropped obsolete Group, Buildroot, %%clean and %%defattr
- Updated the systemlibs patch
- Build Compatibility and Accuracy profiles, as well as the laevateinn debugger
+- Fixed gcc-4.7 build failure
* Tue Jan 03 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.085-1
- Updated to 0.085
Index: sources
===================================================================
RCS file: /cvs/free/rpms/bsnes/F-16/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources 16 Feb 2012 19:23:37 -0000 1.35
+++ sources 25 Aug 2012 10:57:58 -0000 1.36
@@ -1 +1 @@
-54f73b38d24405186b538e01713b0c1f bsnes_v086-source.tar.bz2
+2617c51d49c95e49f8ec6651639f5dbc bsnes_v091-source-noroms.tar.xz
--- bsnes-0.086-systemwide.patch DELETED ---
11 years, 8 months
rpms/bsnes/F-17 bsnes-source-cleanup, NONE, 1.1 startscript, NONE, 1.1 .cvsignore, 1.35, 1.36 README.bsnes, 1.4, 1.5 bsnes.spec, 1.49, 1.50 sources, 1.35, 1.36 bsnes-0.086-gcc47.patch, 1.1, NONE bsnes-0.086-systemwide.patch, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/bsnes/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20683
Modified Files:
.cvsignore README.bsnes bsnes.spec sources
Added Files:
bsnes-source-cleanup startscript
Removed Files:
bsnes-0.086-gcc47.patch bsnes-0.086-systemwide.patch
Log Message:
* Sat Aug 25 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.091-1
- Updated to 0.091
- Switched to Debian approach for system-wide installation
- Updated %description
- Dropped README.Fedora
- Overhauled the package dropping the debugger and accuracy profile
--- NEW FILE bsnes-source-cleanup ---
#!/bin/bash
VERSION=$1
tar -xJvf bsnes_v$VERSION-source.tar.xz
rm bsnes_v$VERSION-source/bsnes/profile/Super\ Game\ Boy.sfc/boot.rom
rm bsnes_v$VERSION-source/bsnes/profile/Game\ Boy\ Color.sys/boot.rom
rm bsnes_v$VERSION-source/bsnes/profile/Game\ Boy.sys/boot.rom
rm bsnes_v$VERSION-source/bsnes/profile/Super\ Famicom.sys/spc700.rom
tar -cJvf bsnes_v$VERSION-source-noroms.tar.xz bsnes_v$VERSION-source
--- NEW FILE startscript ---
#!/bin/bash
if test ! -d $HOME/.config/bsnes
then
mkdir -p $HOME/.config/bsnes
fi
if test ! -f $HOME/.config/bsnes/cheats.xml
then
cp /usr/share/bsnes/cheats.xml $HOME/.config/bsnes
fi
if test ! -d $HOME/.config/bsnes/shaders
then
mkdir -p $HOME/.config/bsnes/shaders
fi
for shader in $(ls /usr/share/bsnes/shaders/*.OpenGL.shader)
do
if test ! -f $HOME/.config/bsnes/shaders/${shader##*/}
then
ln -s $shader $HOME/.config/bsnes/shaders
fi
done
find /usr/share/bsnes -type d -regex ".*\.s[fy][cs]" | while read sdir
do
if test ! -d "$HOME/.config/bsnes/${sdir##*/}"
then
mkdir "$HOME/.config/bsnes/${sdir##*/}"
fi
for sfile in $(ls "$sdir")
do
if test ! -f "$HOME/.config/bsnes/${sdir##*/}/${sfile##*/}"
then
ln -s "$sdir/$sfile" "$HOME/.config/bsnes/${sdir##*/}"
fi
done
done
/usr/libexec/bsnes "$@"
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/bsnes/F-17/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore 17 Feb 2012 18:13:53 -0000 1.35
+++ .cvsignore 25 Aug 2012 10:57:46 -0000 1.36
@@ -1 +1 @@
-bsnes_v086-source.tar.bz2
+bsnes_v091-source-noroms.tar.xz
Index: README.bsnes
===================================================================
RCS file: /cvs/free/rpms/bsnes/F-17/README.bsnes,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- README.bsnes 22 Jun 2011 20:01:55 -0000 1.4
+++ README.bsnes 25 Aug 2012 10:57:47 -0000 1.5
@@ -1,12 +1,8 @@
RPM Fusion bsnes package
==============================================================================
-RPM Fusion bsnes package is patched to install cheat.xml, filters and shaders
-in system-wide location. If you run into issues using these, please don't
-complain to upstream, but use RPM Fusion bugzilla first.
-
-Moreover, due to [1] newer versions of bsnes are more strict when it comes to
-file formats accepted. The snespurify-qt utility can be used to convert the
-images. They have to be uncompressed.
-
-[1] http://byuu.org/bsnes/legacy-formats
+bsnes requires firmware/BIOS images to function properly. They need to
+be placed in ~/.config/bsnes, in the existing subfolders. The manifest.xml
+files contain the info on the correct website.
+Some of these files can be downloaded from bsnes website (they are included in
+the bsnes archive), some need to be obtained by other means.
Index: bsnes.spec
===================================================================
RCS file: /cvs/free/rpms/bsnes/F-17/bsnes.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- bsnes.spec 2 Mar 2012 14:37:57 -0000 1.49
+++ bsnes.spec 25 Aug 2012 10:57:48 -0000 1.50
@@ -1,16 +1,17 @@
-%global vernumber 086
+%global vernumber 091
Name: bsnes
Version: 0.%{vernumber}
-Release: 2%{?dist}.1
+Release: 1%{?dist}
Summary: SNES emulator focused on accuracy
License: GPLv3
-URL: http://byuu.org/bsnes/
-Source0: http://bsnes.googlecode.com/files/%{name}_v%{vernumber}-source.tar.bz2
-Source2: README.bsnes
-Patch0: bsnes-0.086-gcc47.patch
-Patch1: bsnes-0.086-systemwide.patch
+URL: http://byuu.org/%{name}/
+#bsnes needs copyrighted firmware to work. use the bsnes-source-cleanup script to clean the tarball
+Source0: http://%{name}.googlecode.com/files/%{name}_v%{vernumber}-source-noroms.tar.xz
+Source1: startscript
+Source2: bsnes-source-cleanup
+Source3: README.bsnes
#bsnes does not use system snes_ntsc because the modified video processing
#filter algorithm calls back into bsnes specific c++ colortable code, that
@@ -29,106 +30,92 @@
Obsoletes: %{name}-supergameboy < 0.079
%description
-bsnes is an emulator that began development on 2004-10-14. The purpose of the
-emulator is a bit different from other emulators: it focuses on accuracy,
-debugging functionality, and clean code.
-The emulator does not focus on things that would hinder accuracy. This
-includes speed and game-specific hacks for compatibility. As a result, the
-minimum system requirements for bsnes are quite high.
+bsnes is a multi-system emulator that began development on 2004-10-14. It
+currently supports the following systems:
+* Nintendo
+* Super Nintendo
+* Game Boy
+* Game Boy Color
+* Game Boy Advance
+* Nintendo DS
+
+bsnes also supports the following subsystems:
+* Super Game Boy
+* BS-X Satellaview
+* Sufami Turbo
+
+bsnes focuses on accuracy and clean code above all else. It never uses speed or
+compatibilty hacks. As a result, the minimum system requirements are greater
+than with other emulators.
%prep
%setup -qn %{name}_v%{vernumber}-source
-%patch0 -p1 -b .gcc47
-%patch1 -p1 -b .systemwide
#fix permissions
find . -type f -not -name \*.sh -exec chmod 644 {} \;
#use system optflags
-sed -i "s/-O3/$RPM_OPT_FLAGS/" bsnes/Makefile
-sed -i "s/-O3/$RPM_OPT_FLAGS -fPIC/" snesfilter/Makefile
-sed -i "s/-O3/$RPM_OPT_FLAGS/" snespurify/cc-gtk.sh
+sed -i "s/-O3/$RPM_OPT_FLAGS/" %{name}/Makefile
+sed -i "s/-O3/$RPM_OPT_FLAGS/" purify/Makefile
#don't strip the binaries prematurely
-sed -i "s/link += -s/link +=/" bsnes/Makefile
-sed -i "s/link := -s/link :=/" snesfilter/Makefile
-sed -i "s/-s //" snespurify/cc-gtk.sh
-
-#use the proper compiler and moc commands
-sed -i "s/g++-4.5/g++/" snespurify/cc-gtk.sh
+sed -i "s/link += -s/link +=/" %{name}/Makefile
+sed -i "s/link := -s/link := -lX11/" purify/Makefile
#install fedora-specific readme
install -pm 644 %{SOURCE2} README.Fedora
-#use proper system-wide path for filters
-sed -i 's@/usr/lib@%{_libdir}@' bsnes/ui/general/main-window.cpp
-
%build
-#prepare for building compatibity and accuracy profile, as well as the debugger
-cp -pR bsnes bsnes-accuracy
-cp -pR bsnes laevateinn
-
-pushd bsnes
+pushd %{name}
make %{?_smp_mflags} compiler=gcc profile=compatibility phoenix=gtk
popd
-pushd bsnes-accuracy
-make %{?_smp_mflags} compiler=gcc profile=accuracy phoenix=gtk
-popd
-pushd laevateinn
-make %{?_smp_mflags} compiler=gcc ui=ui-debugger phoenix=gtk
-popd
-pushd snesfilter
+pushd purify
make %{?_smp_mflags} compiler=gcc
popd
-pushd snespurify
-./cc-gtk.sh
-popd
%install
rm -rf $RPM_BUILD_ROOT
-pushd bsnes
-sed -i 's/Name=bsnes/Name=bsnes (Compatibility profile)/' data/bsnes.desktop
-make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix}
-desktop-file-install --vendor=rpmfusion \
- --delete-original --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- $RPM_BUILD_ROOT%{_datadir}/applications/bsnes.desktop
-popd
-pushd bsnes-accuracy
-sed -i 's/Name=bsnes/Name=bsnes (Accuracy profile)/' data/bsnes.desktop
-sed -i 's/Exec=bsnes/Exec=bsnes-accuracy/' data/bsnes.desktop
-install -pm 755 out/bsnes $RPM_BUILD_ROOT%{_bindir}/bsnes-accuracy
-desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- data/bsnes.desktop
-popd
-pushd laevateinn
-install -pm 755 out/laevateinn $RPM_BUILD_ROOT%{_bindir}
-popd
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -pm 644 bsnes/data/cheats.xml $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/filters
-install -pm 755 snesfilter/out/*.filter $RPM_BUILD_ROOT%{_libdir}/%{name}/filters
-install -pm 755 snespurify/snespurify-gtk $RPM_BUILD_ROOT%{_bindir}
+install -Dpm 755 %{name}/out/%{name} $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}
+install -d $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --vendor=rpmfusion --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ %{name}/data/%{name}.desktop
+install -Dpm 644 %{name}/data/%{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+install -Dpm 644 %{name}/data/cheats.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/cheats.xml
+install -Dpm 755 purify/purify $RPM_BUILD_ROOT%{_bindir}
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/shaders
-install -pm 644 snesshader/*.shader $RPM_BUILD_ROOT%{_datadir}/%{name}/shaders
+install -pm 644 shaders/*.shader $RPM_BUILD_ROOT%{_datadir}/%{name}/shaders
+
+#install firmwares
+pushd %{name}/profile
+find -type f | while read sfile
+do
+ install -Dpm 644 "$sfile" "$RPM_BUILD_ROOT%{_datadir}/%{name}/$sfile"
+done
+popd
%files
%doc README.Fedora
-%{_bindir}/bsnes
-%{_bindir}/bsnes-accuracy
-%{_bindir}/laevateinn
-%{_bindir}/snespurify-gtk
-%{_libdir}/bsnes
-%{_datadir}/bsnes
-%{_datadir}/pixmaps/bsnes.png
-%{_datadir}/applications/bsnes.desktop
-%{_datadir}/applications/rpmfusion-bsnes.desktop
+%{_bindir}/%{name}
+%{_bindir}/purify
+%{_libexecdir}/%{name}
+%{_datadir}/%{name}
+%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/applications/rpmfusion-%{name}.desktop
%changelog
+* Sat Aug 25 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.091-1
+- Updated to 0.091
+- Switched to Debian approach for system-wide installation
+- Updated %%description
+- Dropped README.Fedora
+- Overhauled the package dropping the debugger and accuracy profile
+
* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.086-2.1
- Rebuilt for c++ ABI breakage
Index: sources
===================================================================
RCS file: /cvs/free/rpms/bsnes/F-17/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources 17 Feb 2012 18:13:53 -0000 1.35
+++ sources 25 Aug 2012 10:57:48 -0000 1.36
@@ -1 +1 @@
-54f73b38d24405186b538e01713b0c1f bsnes_v086-source.tar.bz2
+2617c51d49c95e49f8ec6651639f5dbc bsnes_v091-source-noroms.tar.xz
--- bsnes-0.086-gcc47.patch DELETED ---
--- bsnes-0.086-systemwide.patch DELETED ---
11 years, 8 months
rpms/bsnes/F-18 bsnes-source-cleanup, NONE, 1.1 startscript, NONE, 1.1 .cvsignore, 1.35, 1.36 README.bsnes, 1.4, 1.5 bsnes.spec, 1.49, 1.50 sources, 1.35, 1.36 bsnes-0.086-gcc47.patch, 1.1, NONE bsnes-0.086-systemwide.patch, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/bsnes/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20650
Modified Files:
.cvsignore README.bsnes bsnes.spec sources
Added Files:
bsnes-source-cleanup startscript
Removed Files:
bsnes-0.086-gcc47.patch bsnes-0.086-systemwide.patch
Log Message:
* Sat Aug 25 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.091-1
- Updated to 0.091
- Switched to Debian approach for system-wide installation
- Updated %description
- Dropped README.Fedora
- Overhauled the package dropping the debugger and accuracy profile
--- NEW FILE bsnes-source-cleanup ---
#!/bin/bash
VERSION=$1
tar -xJvf bsnes_v$VERSION-source.tar.xz
rm bsnes_v$VERSION-source/bsnes/profile/Super\ Game\ Boy.sfc/boot.rom
rm bsnes_v$VERSION-source/bsnes/profile/Game\ Boy\ Color.sys/boot.rom
rm bsnes_v$VERSION-source/bsnes/profile/Game\ Boy.sys/boot.rom
rm bsnes_v$VERSION-source/bsnes/profile/Super\ Famicom.sys/spc700.rom
tar -cJvf bsnes_v$VERSION-source-noroms.tar.xz bsnes_v$VERSION-source
--- NEW FILE startscript ---
#!/bin/bash
if test ! -d $HOME/.config/bsnes
then
mkdir -p $HOME/.config/bsnes
fi
if test ! -f $HOME/.config/bsnes/cheats.xml
then
cp /usr/share/bsnes/cheats.xml $HOME/.config/bsnes
fi
if test ! -d $HOME/.config/bsnes/shaders
then
mkdir -p $HOME/.config/bsnes/shaders
fi
for shader in $(ls /usr/share/bsnes/shaders/*.OpenGL.shader)
do
if test ! -f $HOME/.config/bsnes/shaders/${shader##*/}
then
ln -s $shader $HOME/.config/bsnes/shaders
fi
done
find /usr/share/bsnes -type d -regex ".*\.s[fy][cs]" | while read sdir
do
if test ! -d "$HOME/.config/bsnes/${sdir##*/}"
then
mkdir "$HOME/.config/bsnes/${sdir##*/}"
fi
for sfile in $(ls "$sdir")
do
if test ! -f "$HOME/.config/bsnes/${sdir##*/}/${sfile##*/}"
then
ln -s "$sdir/$sfile" "$HOME/.config/bsnes/${sdir##*/}"
fi
done
done
/usr/libexec/bsnes "$@"
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/bsnes/F-18/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore 16 Feb 2012 19:21:16 -0000 1.35
+++ .cvsignore 25 Aug 2012 10:57:40 -0000 1.36
@@ -1 +1 @@
-bsnes_v086-source.tar.bz2
+bsnes_v091-source-noroms.tar.xz
Index: README.bsnes
===================================================================
RCS file: /cvs/free/rpms/bsnes/F-18/README.bsnes,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- README.bsnes 22 Jun 2011 20:01:55 -0000 1.4
+++ README.bsnes 25 Aug 2012 10:57:42 -0000 1.5
@@ -1,12 +1,8 @@
RPM Fusion bsnes package
==============================================================================
-RPM Fusion bsnes package is patched to install cheat.xml, filters and shaders
-in system-wide location. If you run into issues using these, please don't
-complain to upstream, but use RPM Fusion bugzilla first.
-
-Moreover, due to [1] newer versions of bsnes are more strict when it comes to
-file formats accepted. The snespurify-qt utility can be used to convert the
-images. They have to be uncompressed.
-
-[1] http://byuu.org/bsnes/legacy-formats
+bsnes requires firmware/BIOS images to function properly. They need to
+be placed in ~/.config/bsnes, in the existing subfolders. The manifest.xml
+files contain the info on the correct website.
+Some of these files can be downloaded from bsnes website (they are included in
+the bsnes archive), some need to be obtained by other means.
Index: bsnes.spec
===================================================================
RCS file: /cvs/free/rpms/bsnes/F-18/bsnes.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- bsnes.spec 2 Mar 2012 22:07:34 -0000 1.49
+++ bsnes.spec 25 Aug 2012 10:57:43 -0000 1.50
@@ -1,16 +1,17 @@
-%global vernumber 086
+%global vernumber 091
Name: bsnes
Version: 0.%{vernumber}
-Release: 2%{?dist}.1
+Release: 1%{?dist}
Summary: SNES emulator focused on accuracy
License: GPLv3
-URL: http://byuu.org/bsnes/
-Source0: http://bsnes.googlecode.com/files/%{name}_v%{vernumber}-source.tar.bz2
-Source2: README.bsnes
-Patch0: bsnes-0.086-gcc47.patch
-Patch1: bsnes-0.086-systemwide.patch
+URL: http://byuu.org/%{name}/
+#bsnes needs copyrighted firmware to work. use the bsnes-source-cleanup script to clean the tarball
+Source0: http://%{name}.googlecode.com/files/%{name}_v%{vernumber}-source-noroms.tar.xz
+Source1: startscript
+Source2: bsnes-source-cleanup
+Source3: README.bsnes
#bsnes does not use system snes_ntsc because the modified video processing
#filter algorithm calls back into bsnes specific c++ colortable code, that
@@ -29,106 +30,92 @@
Obsoletes: %{name}-supergameboy < 0.079
%description
-bsnes is an emulator that began development on 2004-10-14. The purpose of the
-emulator is a bit different from other emulators: it focuses on accuracy,
-debugging functionality, and clean code.
-The emulator does not focus on things that would hinder accuracy. This
-includes speed and game-specific hacks for compatibility. As a result, the
-minimum system requirements for bsnes are quite high.
+bsnes is a multi-system emulator that began development on 2004-10-14. It
+currently supports the following systems:
+* Nintendo
+* Super Nintendo
+* Game Boy
+* Game Boy Color
+* Game Boy Advance
+* Nintendo DS
+
+bsnes also supports the following subsystems:
+* Super Game Boy
+* BS-X Satellaview
+* Sufami Turbo
+
+bsnes focuses on accuracy and clean code above all else. It never uses speed or
+compatibilty hacks. As a result, the minimum system requirements are greater
+than with other emulators.
%prep
%setup -qn %{name}_v%{vernumber}-source
-%patch0 -p1 -b .gcc47
-%patch1 -p1 -b .systemwide
#fix permissions
find . -type f -not -name \*.sh -exec chmod 644 {} \;
#use system optflags
-sed -i "s/-O3/$RPM_OPT_FLAGS/" bsnes/Makefile
-sed -i "s/-O3/$RPM_OPT_FLAGS -fPIC/" snesfilter/Makefile
-sed -i "s/-O3/$RPM_OPT_FLAGS/" snespurify/cc-gtk.sh
+sed -i "s/-O3/$RPM_OPT_FLAGS/" %{name}/Makefile
+sed -i "s/-O3/$RPM_OPT_FLAGS/" purify/Makefile
#don't strip the binaries prematurely
-sed -i "s/link += -s/link +=/" bsnes/Makefile
-sed -i "s/link := -s/link :=/" snesfilter/Makefile
-sed -i "s/-s //" snespurify/cc-gtk.sh
-
-#use the proper compiler and moc commands
-sed -i "s/g++-4.5/g++/" snespurify/cc-gtk.sh
+sed -i "s/link += -s/link +=/" %{name}/Makefile
+sed -i "s/link := -s/link := -lX11/" purify/Makefile
#install fedora-specific readme
install -pm 644 %{SOURCE2} README.Fedora
-#use proper system-wide path for filters
-sed -i 's@/usr/lib@%{_libdir}@' bsnes/ui/general/main-window.cpp
-
%build
-#prepare for building compatibity and accuracy profile, as well as the debugger
-cp -pR bsnes bsnes-accuracy
-cp -pR bsnes laevateinn
-
-pushd bsnes
+pushd %{name}
make %{?_smp_mflags} compiler=gcc profile=compatibility phoenix=gtk
popd
-pushd bsnes-accuracy
-make %{?_smp_mflags} compiler=gcc profile=accuracy phoenix=gtk
-popd
-pushd laevateinn
-make %{?_smp_mflags} compiler=gcc ui=ui-debugger phoenix=gtk
-popd
-pushd snesfilter
+pushd purify
make %{?_smp_mflags} compiler=gcc
popd
-pushd snespurify
-./cc-gtk.sh
-popd
%install
rm -rf $RPM_BUILD_ROOT
-pushd bsnes
-sed -i 's/Name=bsnes/Name=bsnes (Compatibility profile)/' data/bsnes.desktop
-make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix}
-desktop-file-install --vendor=rpmfusion \
- --delete-original --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- $RPM_BUILD_ROOT%{_datadir}/applications/bsnes.desktop
-popd
-pushd bsnes-accuracy
-sed -i 's/Name=bsnes/Name=bsnes (Accuracy profile)/' data/bsnes.desktop
-sed -i 's/Exec=bsnes/Exec=bsnes-accuracy/' data/bsnes.desktop
-install -pm 755 out/bsnes $RPM_BUILD_ROOT%{_bindir}/bsnes-accuracy
-desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- data/bsnes.desktop
-popd
-pushd laevateinn
-install -pm 755 out/laevateinn $RPM_BUILD_ROOT%{_bindir}
-popd
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -pm 644 bsnes/data/cheats.xml $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/filters
-install -pm 755 snesfilter/out/*.filter $RPM_BUILD_ROOT%{_libdir}/%{name}/filters
-install -pm 755 snespurify/snespurify-gtk $RPM_BUILD_ROOT%{_bindir}
+install -Dpm 755 %{name}/out/%{name} $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}
+install -d $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --vendor=rpmfusion --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ %{name}/data/%{name}.desktop
+install -Dpm 644 %{name}/data/%{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+install -Dpm 644 %{name}/data/cheats.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/cheats.xml
+install -Dpm 755 purify/purify $RPM_BUILD_ROOT%{_bindir}
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/shaders
-install -pm 644 snesshader/*.shader $RPM_BUILD_ROOT%{_datadir}/%{name}/shaders
+install -pm 644 shaders/*.shader $RPM_BUILD_ROOT%{_datadir}/%{name}/shaders
+
+#install firmwares
+pushd %{name}/profile
+find -type f | while read sfile
+do
+ install -Dpm 644 "$sfile" "$RPM_BUILD_ROOT%{_datadir}/%{name}/$sfile"
+done
+popd
%files
%doc README.Fedora
-%{_bindir}/bsnes
-%{_bindir}/bsnes-accuracy
-%{_bindir}/laevateinn
-%{_bindir}/snespurify-gtk
-%{_libdir}/bsnes
-%{_datadir}/bsnes
-%{_datadir}/pixmaps/bsnes.png
-%{_datadir}/applications/bsnes.desktop
-%{_datadir}/applications/rpmfusion-bsnes.desktop
+%{_bindir}/%{name}
+%{_bindir}/purify
+%{_libexecdir}/%{name}
+%{_datadir}/%{name}
+%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/applications/rpmfusion-%{name}.desktop
%changelog
+* Sat Aug 25 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.091-1
+- Updated to 0.091
+- Switched to Debian approach for system-wide installation
+- Updated %%description
+- Dropped README.Fedora
+- Overhauled the package dropping the debugger and accuracy profile
+
* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.086-2.1
- Rebuilt for c++ ABI breakage
Index: sources
===================================================================
RCS file: /cvs/free/rpms/bsnes/F-18/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources 16 Feb 2012 19:21:16 -0000 1.35
+++ sources 25 Aug 2012 10:57:43 -0000 1.36
@@ -1 +1 @@
-54f73b38d24405186b538e01713b0c1f bsnes_v086-source.tar.bz2
+2617c51d49c95e49f8ec6651639f5dbc bsnes_v091-source-noroms.tar.xz
--- bsnes-0.086-gcc47.patch DELETED ---
--- bsnes-0.086-systemwide.patch DELETED ---
11 years, 8 months
rpms/bsnes/devel bsnes-source-cleanup, NONE, 1.1 startscript, NONE, 1.1 .cvsignore, 1.35, 1.36 README.bsnes, 1.4, 1.5 bsnes.spec, 1.49, 1.50 sources, 1.35, 1.36 bsnes-0.086-gcc47.patch, 1.1, NONE bsnes-0.086-systemwide.patch, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/bsnes/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20610
Modified Files:
.cvsignore README.bsnes bsnes.spec sources
Added Files:
bsnes-source-cleanup startscript
Removed Files:
bsnes-0.086-gcc47.patch bsnes-0.086-systemwide.patch
Log Message:
* Sat Aug 25 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.091-1
- Updated to 0.091
- Switched to Debian approach for system-wide installation
- Updated %description
- Dropped README.Fedora
- Overhauled the package dropping the debugger and accuracy profile
--- NEW FILE bsnes-source-cleanup ---
#!/bin/bash
VERSION=$1
tar -xJvf bsnes_v$VERSION-source.tar.xz
rm bsnes_v$VERSION-source/bsnes/profile/Super\ Game\ Boy.sfc/boot.rom
rm bsnes_v$VERSION-source/bsnes/profile/Game\ Boy\ Color.sys/boot.rom
rm bsnes_v$VERSION-source/bsnes/profile/Game\ Boy.sys/boot.rom
rm bsnes_v$VERSION-source/bsnes/profile/Super\ Famicom.sys/spc700.rom
tar -cJvf bsnes_v$VERSION-source-noroms.tar.xz bsnes_v$VERSION-source
--- NEW FILE startscript ---
#!/bin/bash
if test ! -d $HOME/.config/bsnes
then
mkdir -p $HOME/.config/bsnes
fi
if test ! -f $HOME/.config/bsnes/cheats.xml
then
cp /usr/share/bsnes/cheats.xml $HOME/.config/bsnes
fi
if test ! -d $HOME/.config/bsnes/shaders
then
mkdir -p $HOME/.config/bsnes/shaders
fi
for shader in $(ls /usr/share/bsnes/shaders/*.OpenGL.shader)
do
if test ! -f $HOME/.config/bsnes/shaders/${shader##*/}
then
ln -s $shader $HOME/.config/bsnes/shaders
fi
done
find /usr/share/bsnes -type d -regex ".*\.s[fy][cs]" | while read sdir
do
if test ! -d "$HOME/.config/bsnes/${sdir##*/}"
then
mkdir "$HOME/.config/bsnes/${sdir##*/}"
fi
for sfile in $(ls "$sdir")
do
if test ! -f "$HOME/.config/bsnes/${sdir##*/}/${sfile##*/}"
then
ln -s "$sdir/$sfile" "$HOME/.config/bsnes/${sdir##*/}"
fi
done
done
/usr/libexec/bsnes "$@"
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/bsnes/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore 16 Feb 2012 19:21:16 -0000 1.35
+++ .cvsignore 25 Aug 2012 10:57:36 -0000 1.36
@@ -1 +1 @@
-bsnes_v086-source.tar.bz2
+bsnes_v091-source-noroms.tar.xz
Index: README.bsnes
===================================================================
RCS file: /cvs/free/rpms/bsnes/devel/README.bsnes,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- README.bsnes 22 Jun 2011 20:01:55 -0000 1.4
+++ README.bsnes 25 Aug 2012 10:57:36 -0000 1.5
@@ -1,12 +1,8 @@
RPM Fusion bsnes package
==============================================================================
-RPM Fusion bsnes package is patched to install cheat.xml, filters and shaders
-in system-wide location. If you run into issues using these, please don't
-complain to upstream, but use RPM Fusion bugzilla first.
-
-Moreover, due to [1] newer versions of bsnes are more strict when it comes to
-file formats accepted. The snespurify-qt utility can be used to convert the
-images. They have to be uncompressed.
-
-[1] http://byuu.org/bsnes/legacy-formats
+bsnes requires firmware/BIOS images to function properly. They need to
+be placed in ~/.config/bsnes, in the existing subfolders. The manifest.xml
+files contain the info on the correct website.
+Some of these files can be downloaded from bsnes website (they are included in
+the bsnes archive), some need to be obtained by other means.
Index: bsnes.spec
===================================================================
RCS file: /cvs/free/rpms/bsnes/devel/bsnes.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- bsnes.spec 2 Mar 2012 22:07:34 -0000 1.49
+++ bsnes.spec 25 Aug 2012 10:57:37 -0000 1.50
@@ -1,16 +1,17 @@
-%global vernumber 086
+%global vernumber 091
Name: bsnes
Version: 0.%{vernumber}
-Release: 2%{?dist}.1
+Release: 1%{?dist}
Summary: SNES emulator focused on accuracy
License: GPLv3
-URL: http://byuu.org/bsnes/
-Source0: http://bsnes.googlecode.com/files/%{name}_v%{vernumber}-source.tar.bz2
-Source2: README.bsnes
-Patch0: bsnes-0.086-gcc47.patch
-Patch1: bsnes-0.086-systemwide.patch
+URL: http://byuu.org/%{name}/
+#bsnes needs copyrighted firmware to work. use the bsnes-source-cleanup script to clean the tarball
+Source0: http://%{name}.googlecode.com/files/%{name}_v%{vernumber}-source-noroms.tar.xz
+Source1: startscript
+Source2: bsnes-source-cleanup
+Source3: README.bsnes
#bsnes does not use system snes_ntsc because the modified video processing
#filter algorithm calls back into bsnes specific c++ colortable code, that
@@ -29,106 +30,92 @@
Obsoletes: %{name}-supergameboy < 0.079
%description
-bsnes is an emulator that began development on 2004-10-14. The purpose of the
-emulator is a bit different from other emulators: it focuses on accuracy,
-debugging functionality, and clean code.
-The emulator does not focus on things that would hinder accuracy. This
-includes speed and game-specific hacks for compatibility. As a result, the
-minimum system requirements for bsnes are quite high.
+bsnes is a multi-system emulator that began development on 2004-10-14. It
+currently supports the following systems:
+* Nintendo
+* Super Nintendo
+* Game Boy
+* Game Boy Color
+* Game Boy Advance
+* Nintendo DS
+
+bsnes also supports the following subsystems:
+* Super Game Boy
+* BS-X Satellaview
+* Sufami Turbo
+
+bsnes focuses on accuracy and clean code above all else. It never uses speed or
+compatibilty hacks. As a result, the minimum system requirements are greater
+than with other emulators.
%prep
%setup -qn %{name}_v%{vernumber}-source
-%patch0 -p1 -b .gcc47
-%patch1 -p1 -b .systemwide
#fix permissions
find . -type f -not -name \*.sh -exec chmod 644 {} \;
#use system optflags
-sed -i "s/-O3/$RPM_OPT_FLAGS/" bsnes/Makefile
-sed -i "s/-O3/$RPM_OPT_FLAGS -fPIC/" snesfilter/Makefile
-sed -i "s/-O3/$RPM_OPT_FLAGS/" snespurify/cc-gtk.sh
+sed -i "s/-O3/$RPM_OPT_FLAGS/" %{name}/Makefile
+sed -i "s/-O3/$RPM_OPT_FLAGS/" purify/Makefile
#don't strip the binaries prematurely
-sed -i "s/link += -s/link +=/" bsnes/Makefile
-sed -i "s/link := -s/link :=/" snesfilter/Makefile
-sed -i "s/-s //" snespurify/cc-gtk.sh
-
-#use the proper compiler and moc commands
-sed -i "s/g++-4.5/g++/" snespurify/cc-gtk.sh
+sed -i "s/link += -s/link +=/" %{name}/Makefile
+sed -i "s/link := -s/link := -lX11/" purify/Makefile
#install fedora-specific readme
install -pm 644 %{SOURCE2} README.Fedora
-#use proper system-wide path for filters
-sed -i 's@/usr/lib@%{_libdir}@' bsnes/ui/general/main-window.cpp
-
%build
-#prepare for building compatibity and accuracy profile, as well as the debugger
-cp -pR bsnes bsnes-accuracy
-cp -pR bsnes laevateinn
-
-pushd bsnes
+pushd %{name}
make %{?_smp_mflags} compiler=gcc profile=compatibility phoenix=gtk
popd
-pushd bsnes-accuracy
-make %{?_smp_mflags} compiler=gcc profile=accuracy phoenix=gtk
-popd
-pushd laevateinn
-make %{?_smp_mflags} compiler=gcc ui=ui-debugger phoenix=gtk
-popd
-pushd snesfilter
+pushd purify
make %{?_smp_mflags} compiler=gcc
popd
-pushd snespurify
-./cc-gtk.sh
-popd
%install
rm -rf $RPM_BUILD_ROOT
-pushd bsnes
-sed -i 's/Name=bsnes/Name=bsnes (Compatibility profile)/' data/bsnes.desktop
-make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix}
-desktop-file-install --vendor=rpmfusion \
- --delete-original --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- $RPM_BUILD_ROOT%{_datadir}/applications/bsnes.desktop
-popd
-pushd bsnes-accuracy
-sed -i 's/Name=bsnes/Name=bsnes (Accuracy profile)/' data/bsnes.desktop
-sed -i 's/Exec=bsnes/Exec=bsnes-accuracy/' data/bsnes.desktop
-install -pm 755 out/bsnes $RPM_BUILD_ROOT%{_bindir}/bsnes-accuracy
-desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- data/bsnes.desktop
-popd
-pushd laevateinn
-install -pm 755 out/laevateinn $RPM_BUILD_ROOT%{_bindir}
-popd
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -pm 644 bsnes/data/cheats.xml $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/filters
-install -pm 755 snesfilter/out/*.filter $RPM_BUILD_ROOT%{_libdir}/%{name}/filters
-install -pm 755 snespurify/snespurify-gtk $RPM_BUILD_ROOT%{_bindir}
+install -Dpm 755 %{name}/out/%{name} $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}
+install -d $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --vendor=rpmfusion --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ %{name}/data/%{name}.desktop
+install -Dpm 644 %{name}/data/%{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+install -Dpm 644 %{name}/data/cheats.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/cheats.xml
+install -Dpm 755 purify/purify $RPM_BUILD_ROOT%{_bindir}
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/shaders
-install -pm 644 snesshader/*.shader $RPM_BUILD_ROOT%{_datadir}/%{name}/shaders
+install -pm 644 shaders/*.shader $RPM_BUILD_ROOT%{_datadir}/%{name}/shaders
+
+#install firmwares
+pushd %{name}/profile
+find -type f | while read sfile
+do
+ install -Dpm 644 "$sfile" "$RPM_BUILD_ROOT%{_datadir}/%{name}/$sfile"
+done
+popd
%files
%doc README.Fedora
-%{_bindir}/bsnes
-%{_bindir}/bsnes-accuracy
-%{_bindir}/laevateinn
-%{_bindir}/snespurify-gtk
-%{_libdir}/bsnes
-%{_datadir}/bsnes
-%{_datadir}/pixmaps/bsnes.png
-%{_datadir}/applications/bsnes.desktop
-%{_datadir}/applications/rpmfusion-bsnes.desktop
+%{_bindir}/%{name}
+%{_bindir}/purify
+%{_libexecdir}/%{name}
+%{_datadir}/%{name}
+%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/applications/rpmfusion-%{name}.desktop
%changelog
+* Sat Aug 25 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.091-1
+- Updated to 0.091
+- Switched to Debian approach for system-wide installation
+- Updated %%description
+- Dropped README.Fedora
+- Overhauled the package dropping the debugger and accuracy profile
+
* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.086-2.1
- Rebuilt for c++ ABI breakage
Index: sources
===================================================================
RCS file: /cvs/free/rpms/bsnes/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources 16 Feb 2012 19:21:16 -0000 1.35
+++ sources 25 Aug 2012 10:57:37 -0000 1.36
@@ -1 +1 @@
-54f73b38d24405186b538e01713b0c1f bsnes_v086-source.tar.bz2
+2617c51d49c95e49f8ec6651639f5dbc bsnes_v091-source-noroms.tar.xz
--- bsnes-0.086-gcc47.patch DELETED ---
--- bsnes-0.086-systemwide.patch DELETED ---
11 years, 8 months
rpms/mednafen/F-16 .cvsignore, 1.11, 1.12 mednafen.spec, 1.16, 1.17 sources, 1.11, 1.12
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mednafen/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19657
Modified Files:
.cvsignore mednafen.spec sources
Log Message:
* Sat Aug 25 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.9.24-0.1
- Updated to 0.9.24-WIP
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mednafen/F-16/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 2 Jul 2012 17:35:21 -0000 1.11
+++ .cvsignore 25 Aug 2012 10:52:46 -0000 1.12
@@ -1 +1 @@
-mednafen-0.9.22-wip.tar.bz2
+mednafen-0.9.24-wip.tar.bz2
Index: mednafen.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mednafen/F-16/mednafen.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mednafen.spec 2 Jul 2012 17:35:22 -0000 1.16
+++ mednafen.spec 25 Aug 2012 10:52:46 -0000 1.17
@@ -1,5 +1,5 @@
Name: mednafen
-Version: 0.9.22
+Version: 0.9.24
Release: 0.1%{?dist}
Summary: A multi-system emulator utilizing OpenGL and SDL
#mednafen is a monstrosity build out of many emulators hence the colourful licensing
@@ -73,6 +73,9 @@
%changelog
+* Sat Aug 25 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.9.24-0.1
+- Updated to 0.9.24-WIP
+
* Mon Jul 02 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.9.22-0.1
- Updated to 0.9.22-WIP
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mednafen/F-16/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 2 Jul 2012 17:35:22 -0000 1.11
+++ sources 25 Aug 2012 10:52:46 -0000 1.12
@@ -1 +1 @@
-2ca4f4da2cc1245a6e52a2242f82b9f0 mednafen-0.9.22-wip.tar.bz2
+ca109a0c4e4ccd7ba7cda75b97272965 mednafen-0.9.24-wip.tar.bz2
11 years, 8 months
rpms/mednafen/F-17 .cvsignore, 1.11, 1.12 mednafen.spec, 1.17, 1.18 sources, 1.11, 1.12
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mednafen/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19551
Modified Files:
.cvsignore mednafen.spec sources
Log Message:
* Sat Aug 25 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.9.24-0.1
- Updated to 0.9.24-WIP
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mednafen/F-17/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 2 Jul 2012 17:35:15 -0000 1.11
+++ .cvsignore 25 Aug 2012 10:52:40 -0000 1.12
@@ -1 +1 @@
-mednafen-0.9.22-wip.tar.bz2
+mednafen-0.9.24-wip.tar.bz2
Index: mednafen.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mednafen/F-17/mednafen.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mednafen.spec 2 Jul 2012 17:35:15 -0000 1.17
+++ mednafen.spec 25 Aug 2012 10:52:40 -0000 1.18
@@ -1,5 +1,5 @@
Name: mednafen
-Version: 0.9.22
+Version: 0.9.24
Release: 0.1%{?dist}
Summary: A multi-system emulator utilizing OpenGL and SDL
#mednafen is a monstrosity build out of many emulators hence the colourful licensing
@@ -73,6 +73,9 @@
%changelog
+* Sat Aug 25 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.9.24-0.1
+- Updated to 0.9.24-WIP
+
* Mon Jul 02 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.9.22-0.1
- Updated to 0.9.22-WIP
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mednafen/F-17/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 2 Jul 2012 17:35:15 -0000 1.11
+++ sources 25 Aug 2012 10:52:40 -0000 1.12
@@ -1 +1 @@
-2ca4f4da2cc1245a6e52a2242f82b9f0 mednafen-0.9.22-wip.tar.bz2
+ca109a0c4e4ccd7ba7cda75b97272965 mednafen-0.9.24-wip.tar.bz2
11 years, 8 months
rpms/mednafen/F-18 .cvsignore, 1.11, 1.12 mednafen.spec, 1.17, 1.18 sources, 1.11, 1.12
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mednafen/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19522
Modified Files:
.cvsignore mednafen.spec sources
Log Message:
* Sat Aug 25 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.9.24-0.1
- Updated to 0.9.24-WIP
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mednafen/F-18/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 2 Jul 2012 17:35:08 -0000 1.11
+++ .cvsignore 25 Aug 2012 10:52:38 -0000 1.12
@@ -1 +1 @@
-mednafen-0.9.22-wip.tar.bz2
+mednafen-0.9.24-wip.tar.bz2
Index: mednafen.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mednafen/F-18/mednafen.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mednafen.spec 2 Jul 2012 17:35:09 -0000 1.17
+++ mednafen.spec 25 Aug 2012 10:52:38 -0000 1.18
@@ -1,5 +1,5 @@
Name: mednafen
-Version: 0.9.22
+Version: 0.9.24
Release: 0.1%{?dist}
Summary: A multi-system emulator utilizing OpenGL and SDL
#mednafen is a monstrosity build out of many emulators hence the colourful licensing
@@ -73,6 +73,9 @@
%changelog
+* Sat Aug 25 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.9.24-0.1
+- Updated to 0.9.24-WIP
+
* Mon Jul 02 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.9.22-0.1
- Updated to 0.9.22-WIP
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mednafen/F-18/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 2 Jul 2012 17:35:09 -0000 1.11
+++ sources 25 Aug 2012 10:52:38 -0000 1.12
@@ -1 +1 @@
-2ca4f4da2cc1245a6e52a2242f82b9f0 mednafen-0.9.22-wip.tar.bz2
+ca109a0c4e4ccd7ba7cda75b97272965 mednafen-0.9.24-wip.tar.bz2
11 years, 8 months