rpmfusion-commits
February 2012
rpmfusion-commits@lists.rpmfusion.org
- 21 participants
- 1094 discussions
rpms/sdlmame-data-samples/devel dead.package, NONE, 1.1 .cvsignore, 1.5, NONE sdlmame-data-samples.spec, 1.11, NONE sources, 1.7, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame-data-samples/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13755
Added Files:
dead.package
Removed Files:
.cvsignore sdlmame-data-samples.spec sources
Log Message:
Retired the package
--- NEW FILE dead.package ---
This package has contained all the mame samples in one big file and thus was
quite unwieldy. Samples can be acquired at:
http://samples.mameworld.info/
--- .cvsignore DELETED ---
--- sdlmame-data-samples.spec DELETED ---
--- sources DELETED ---
12 years, 9 months
- 1
- 0
rpms/miro/F-16 miro-4.0.2-change_timeout.patch, NONE, 1.1 miro-4.0.2-fix_desktop_file.patch, NONE, 1.1 miro-4.0.2-fix_itunes_path.patch, NONE, 1.1 miro-4.0.2.1-fix_screensaver_inhibit.patch, NONE, 1.1 miro-4.0.2.1-segmenter_cflags.patch, NONE, 1.1 miro.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Michel Alexandre Salim
Author: salimma
Update of /cvs/free/rpms/miro/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31862/F-16
Modified Files:
.cvsignore sources
Added Files:
miro-4.0.2-change_timeout.patch
miro-4.0.2-fix_desktop_file.patch
miro-4.0.2-fix_itunes_path.patch
miro-4.0.2.1-fix_screensaver_inhibit.patch
miro-4.0.2.1-segmenter_cflags.patch miro.spec
Log Message:
Import of miro 4.0.6 to F-15, F-16 and Rawhide branches
miro-4.0.2-change_timeout.patch:
subprocesstest.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE miro-4.0.2-change_timeout.patch ---
>From d4cb07892143a2ae1f452b46bf5111a40ef7f466 Mon Sep 17 00:00:00 2001
From: Will Kahn-Greene <will.guaraldi(a)pculture.org>
Date: Tue, 21 Jun 2011 14:59:57 -0400
Subject: [PATCH] 17817. Changes timeout from 4 to 6 seconds
We're theorizing that on the linux build box a 4 second timeout isn't
long enough because it's slow and old.
---
tv/lib/test/subprocesstest.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tv/lib/test/subprocesstest.py b/tv/lib/test/subprocesstest.py
index 529a7c1..ac7546b 100644
--- a/tv/lib/test/subprocesstest.py
+++ b/tv/lib/test/subprocesstest.py
@@ -91,7 +91,7 @@ class SubprocessManagerTest(EventLoopTest):
self.subprocess.shutdown()
EventLoopTest.tearDown(self)
- def _wait_for_subprocess_ready(self, timeout=4.0):
+ def _wait_for_subprocess_ready(self, timeout=6.0):
"""Wait for the subprocess to startup."""
start = time.time()
--
1.7.6
miro-4.0.2-fix_desktop_file.patch:
miro.desktop | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- NEW FILE miro-4.0.2-fix_desktop_file.patch ---
>From f5eeeb110c2e8344e8b097aaa159cf187ecc0124 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Thu, 14 Jul 2011 13:32:35 +0200
Subject: [PATCH] Fix desktop file for validation
- Add categories: TV depends on Video; P2P depends on Network
- MimeType listing should be semicolon-terminated
---
tv/linux/miro.desktop | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tv/linux/miro.desktop b/tv/linux/miro.desktop
index 6d3580a..e03f896 100644
--- a/tv/linux/miro.desktop
+++ b/tv/linux/miro.desktop
@@ -11,5 +11,5 @@ Icon=miro
TryExec=miro
Exec=miro %F
Terminal=false
-Categories=GTK;AudioVideo;TV;Player;P2P;News;FileTransfer;
-MimeType=application/x-miro;application/x-democracy;application/x-bittorrent;video/dv;video/mpeg;video/x-mpeg;video/msvideo;video/quicktime;video/x-anim;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-flc;video/x-fli;application/ogg;application/x-ogg;application/x-matroska;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-wav;audio/x-mpegurl;audio/x-scpls;audio/x-m4a;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;application/vnd.rn-realmedia;audio/x-real-audio;audio/x-pn-realaudio;misc/ultravox;audio/vnd.rn-realaudio;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-pn-windows-acm;image/vnd.rn-realpix;video/vnd.rn-realvideo;audio/x-pn-realaudio-plugin;video/ogg;audio/ogg
+Categories=GTK;AudioVideo;Video;TV;Player;Network;P2P;News;FileTransfer;
+MimeType=application/x-miro;application/x-democracy;application/x-bittorrent;video/dv;video/mpeg;video/x-mpeg;video/msvideo;video/quicktime;video/x-anim;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-flc;video/x-fli;application/ogg;application/x-ogg;application/x-matroska;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-wav;audio/x-mpegurl;audio/x-scpls;audio/x-m4a;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;application/vnd.rn-realmedia;audio/x-real-audio;audio/x-pn-realaudio;misc/ultravox;audio/vnd.rn-realaudio;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-pn-windows-acm;image/vnd.rn-realpix;video/vnd.rn-realvideo;audio/x-pn-realaudio-plugin;video/ogg;audio/ogg;
--
1.7.6
miro-4.0.2-fix_itunes_path.patch:
importmedia.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE miro-4.0.2-fix_itunes_path.patch ---
>From c59f055141ae8b1cec801f294a399639195241fd Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Thu, 14 Jul 2011 12:36:44 +0200
Subject: [PATCH] import_itunes_path should catch the ValueError exception
thrown when the path does not exist
---
tv/lib/importmedia.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tv/lib/importmedia.py b/tv/lib/importmedia.py
index c525bfc..45b950c 100644
--- a/tv/lib/importmedia.py
+++ b/tv/lib/importmedia.py
@@ -102,5 +102,5 @@ def import_itunes_path(path):
parser.parse(os.path.join(path, ITUNES_XML_FILE))
music_path = file_path_xlat(handler.music_path)
return music_path
- except (IOError, xml.sax.SAXParseException):
+ except (IOError, xml.sax.SAXParseException, ValueError):
pass
--
1.7.6
miro-4.0.2.1-fix_screensaver_inhibit.patch:
screensaver.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
--- NEW FILE miro-4.0.2.1-fix_screensaver_inhibit.patch ---
>From 338fefd19c9b0447dfe79a72bce51b54da9f599d Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Sun, 31 Jul 2011 21:08:42 +0200
Subject: [PATCH] Workaround for GNOME 3.0's screensaver
To: Will Kahn-Greene <will.guaraldi(a)pculture.org>
GNOME 3.0 has a screensaver that is missing the Inhibit method;
attempting to inhibit it via DBus results in a DBusException being
raised.
Until this is fixed upstream, work around this by storing the exception
as the cookie, and handle this special value when re-enabling the
screensaver.
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
---
tv/linux/plat/screensaver.py | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/tv/linux/plat/screensaver.py b/tv/linux/plat/screensaver.py
index ede19c9..afcfc30 100644
--- a/tv/linux/plat/screensaver.py
+++ b/tv/linux/plat/screensaver.py
@@ -50,11 +50,18 @@ class GnomeScreenSaverManager(object):
prog = "Miro"
reason = "Playing a video"
- self.cookie = obj.Inhibit(prog, reason)
+ try:
+ self.cookie = obj.Inhibit(prog, reason)
+ except dbus.DBusException as e:
+ # GNOME 3.0's screensaver lacks the Inhibit method
+ self.cookie = e
def enable(self):
if self.cookie is None:
raise AssertionError("disable() must be called before enable()")
+ elif type(self.cookie) is dbus.DBusException:
+ self.cookie = None
+ return
bus = dbus.SessionBus()
obj = bus.get_object('org.gnome.ScreenSaver',
'/org/gnome/ScreenSaver')
--
1.7.6
miro-4.0.2.1-segmenter_cflags.patch:
setup.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE miro-4.0.2.1-segmenter_cflags.patch ---
>From 8fe2ac644e37de31b8780f2f38499bef82821003 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Tue, 2 Aug 2011 20:04:44 +0200
Subject: [PATCH] Use provided CFLAGS when building miro-segmenter
miro_segmenter is built not as a Python extension module, but as a
normal C program, by directly invoking the system's C compiler.
As such, no compiler flag is passed to the compiler, resulting in an
unoptimized binary. This patch passes the value of the CFLAGS
environment variable, if set, to the compiler.
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
---
tv/linux/setup.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/tv/linux/setup.py b/tv/linux/setup.py
index 54ba112..923166e 100644
--- a/tv/linux/setup.py
+++ b/tv/linux/setup.py
@@ -436,7 +436,8 @@ class build(distutils.command.build.build):
cc.add_include_dir('/usr/include/ffmpeg')
output_dir = os.path.join(self.build_base, 'miro-segmenter')
segmenter_objs = cc.compile([segmenter_src],
- output_dir=output_dir)
+ output_dir=output_dir,
+ extra_preargs=(os.environ.get("CFLAGS") or "").split())
cc.link_executable(segmenter_objs, 'miro-segmenter',
output_dir=output_dir)
segmenter_exe = os.path.join(output_dir, 'miro-segmenter')
--
1.7.6
--- NEW FILE miro.spec ---
Name: miro
Version: 4.0.6
Release: 2%{?dist}
Summary: Internet TV Player
Group: Applications/Multimedia
# miro-segmenter is GPLv2 only
License: GPLv2+ and GPLv2
URL: http://www.getmiro.com/
Source0: http://ftp.osuosl.org/pub/pculture.org/miro/src/miro-%{version}.tar.gz
# explains video conversion issues
# Source1: README.Fedora
# from upstream, fixes their issue # 17817
Patch0: miro-4.0.2-change_timeout.patch
# handle non-existent iTunes path exception
# submitted: http://bugzilla.pculture.org/show_bug.cgi?id=17925
Patch1: miro-4.0.2-fix_itunes_path.patch
# fix desktop file
# submitted: http://bugzilla.pculture.org/show_bug.cgi?id=17926
Patch2: miro-4.0.2-fix_desktop_file.patch
# fix GNOME screensaver not being inhibitable
# submitted: http://bugzilla.pculture.org/show_bug.cgi?id=18018
Patch3: miro-4.0.2.1-fix_screensaver_inhibit.patch
# Use provided CFLAGS when building miro-segmenter
# submitted: https://bugzilla.pculture.org/show_bug.cgi?id=18027
Patch4: miro-4.0.2.1-segmenter_cflags.patch
BuildRequires: python-devel
BuildRequires: desktop-file-utils
BuildRequires: ffmpeg-devel
BuildRequires: gettext
BuildRequires: Pyrex
BuildRequires: pygtk2-devel
BuildRequires: webkitgtk-devel
# for testing
BuildRequires: dbus-x11
BuildRequires: dbus-python
BuildRequires: GConf2
BuildRequires: python-mutagen
BuildRequires: gnome-python2-gconf
BuildRequires: gstreamer-plugins-good
BuildRequires: gstreamer-python
BuildRequires: python-pycurl
BuildRequires: pywebkitgtk
BuildRequires: rb_libtorrent-python
BuildRequires: Xvfb xauth
Requires: avahi-compat-libdns_sd
Requires: dbus-python
Requires: dbus-x11
Requires: ffmpeg2theora
Requires: GConf2
Requires: gnome-python2-gconf
Requires: gstreamer-plugins-good
Requires: gstreamer-python
Requires: python-mutagen
Requires: python-pycurl
Requires: pywebkitgtk
Requires: rb_libtorrent-python
Provides: Miro = %{version}-%{release}
Obsoletes: Miro < 3.5.1-2
# we don't want to provide private python extension libs
# http://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering#...
%{?filter_setup:
%filter_provides_in %{python_sitearch}/miro/.*\.so$
%filter_setup
}
%description
Miro is a free HD video player. It offers over 6,000 free internet TV
shows and video podcasts, and has a simple interface designed for
fullscreen HD video. It downloads most videos, allowing users to take
their shows with them.
%prep
%setup -q
# Patches
# Intentionally not using -b .<descr> :
# Otherwise, the unpatched files get re-added into Miro
# (and '.' breaks Python imports)
%patch0 -p2
%patch1 -p2
%patch2 -p2
%patch3 -p2
%patch4 -p2
# /Patches
%build
cd linux && CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
%check
cd linux && LANG=en_US.utf8 xvfb-run -a -w 1 ./test.sh
%install
cd linux && %{__python} setup.py install -O1 --skip-build --root %{buildroot}
desktop-file-validate %{buildroot}%{_datadir}/applications/miro.desktop
# Fix permissions
find %{buildroot}%{_bindir}/miro* -exec chmod 755 '{}' \;
find %{buildroot}%{python_sitearch}/miro -name '*.so' -exec chmod 755 '{}' \;
# Swedish Chef is not a real locale; delete files rather than
# having to own the directory
rm -rf %{buildroot}%{_datadir}/locale/swch
%find_lang miro
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database %{_datadir}/applications &> /dev/null ||:
update-mime-database %{_datadir}/mime &> /dev/null || :
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-desktop-database %{_datadir}/applications &> /dev/null ||:
update-mime-database %{_datadir}/mime &> /dev/null || :
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f linux/miro.lang
%{_bindir}/*
%exclude %{_datadir}/miro/resources/testdata
%{_datadir}/miro
%{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/pixmaps/*
%{_datadir}/applications/*.desktop
%{_mandir}/man1/*
%{_datadir}/mime/packages/*.xml
%{python_sitearch}/*egg-info
%{python_sitearch}/miro/
%doc README license.txt CREDITS
%changelog
* Wed Feb 8 2012 Michel Salim <salimma(a)fedoraproject.org> - 4.0.6-2
- Add GPLv2 to license field (for miro-segmenter)
- Remove old upgrade path for Democracy package
- Use versioned Obsolete: for the previous Miro package
* Thu Feb 2 2012 Michel Salim <salimma(a)fedoraproject.org> - 4.0.6-1
- Update to 4.0.6
- Spec clean-ups
- Hide private library from "Provide:" metadata
* Tue Aug 2 2011 Michel Salim <salimma(a)fedoraproject.org> - 4.0.2.1-4
- Use provided CFLAGS when building miro-segmenter
* Sun Jul 31 2011 Michel Salim <salimma(a)fedoraproject.org> - 4.0.2.1-3
- Add missing BR for Gstreamer tests
* Sun Jul 31 2011 Michel Salim <salimma(a)fedoraproject.org> - 4.0.2.1-2
- Fix screensaver inhibition exception when enabling full-screen mode
* Sun Jul 31 2011 Michel Salim <salimma(a)fedoraproject.org> - 4.0.2.1-1
- Update to 4.0.2.1
- Fix permissions of installed executables and .so modules
- Add missing build and runtime dependencies
* Thu Jul 14 2011 Michel Salim <salimma(a)fedoraproject.org> - 4.0.2-1
- Update to 4.0.2
- Rename to miro
- Enable unit tests
- Validate desktop entry
* Sat Mar 5 2011 Michel Salim <salimma(a)fedoraproject.org> - 3.5.1-1
- Update to 3.5.1
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Sat Nov 6 2010 Michel Salim <salimma(a)fedoraproject.org> - 3.5-2
- Fix positioning of child image to use integer dimensions
- add documentation for video conversion issues
* Sat Nov 6 2010 Michel Salim <salimma(a)fedoraproject.org> - 3.5-1
- Update to 3.5
* Wed Sep 29 2010 jkeating - 3.0.3-3
- Rebuilt for gcc bug 634757
* Mon Sep 20 2010 Michel Salim <salimma(a)fedoraproject.org> - 3.0.3-2
- Catch exception when started without a valid DISPLAY (# 633999)
* Sun Aug 29 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 3.0.3-1
- Update to upstream 3.0.3. Potentially fixes a whole slew of bugs
including YouTube downloads not working
(http://bugzilla.pculture.org/show_bug.cgi?id=14084)
* Wed Jul 21 2010 David Malcolm <dmalcolm(a)redhat.com> - 3.0.2-2
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
* Thu Jun 3 2010 Michel Salim <salimma(a)fedoraproject.org> - 3.0.2-1
- Update to 3.0.2
* Wed May 5 2010 Michel Salim <salimma(a)fedoraproject.org> - 3.0.1-1
- Update to 3.0.1
* Mon Apr 12 2010 Martin Stransky <stransky(a)redhat.com> - 3.0-2
- Updated gecko dependency
* Fri Apr 9 2010 Michel Salim <salimma(a)fedoraproject.org> - 3.0-1
- Update to 3.0
- Use mimeinfo and icon cache scriptlets
- Drop unneeded dependencies
* Sat Apr 03 2010 Caolán McNamara <caolanm(a)redhat.com> - 2.5.4-4
- Rebuild against newer gecko
* Tue Mar 23 2010 Jan Horak <jhorak(a)redhat.com> - 2.5.4-3
- Rebuild against newer gecko
* Fri Jan 22 2010 Rahul Sundaram <sundaram(a)fedoraproject.org> - 2.5.4-2
- Rebuild for Boost soname bump
* Thu Dec 17 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.5.4-1
- Update to upstream 2.5.4.
- Hopefully fixes a whole slew of crashes (#540301, #540535, #540543)
(#544047, #545681, #546141, #528036, #540207, #544889, #547062)
* Wed Nov 25 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.5.3-3
- Update to new gecko-libs
* Thu Nov 05 2009 Jan Horak <jhorak(a)redhat.com> - 2.5.3-2
- Rebuild against newer gecko
* Wed Oct 28 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.5.3-1
- Update to 2.5.3
- Tarball renamed: Miro -> miro
* Tue Oct 27 2009 Jan Horak <jhorak(a)redhat.com> - 2.5.2-5
- Rebuild against newer gecko
* Fri Sep 11 2009 Jan Horak <jhorak(a)redhat.com> - 2.5.2-4
- Rebuild against newer gecko
* Thu Aug 06 2009 Jan Horak <jhorak(a)redhat.com> - 2.5.2-3
- Rebuild against newer gecko
* Tue Aug 04 2009 Jan Horak <jhorak(a)redhat.com> - 2.5.2-2
- Rebuild against newer gecko
* Tue Aug 4 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.5.2-1
- Update to latest upstream (2.5.2)
- Drop xine hack patch, now upstream
- Rebase remaining patches to 2.5.2 where necessary
- Include new icons in files list
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.0.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Sun Jul 19 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0.5-2
- Rebuild against newer gecko
* Wed Jul 1 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0.5-1
- Update to latest upstream (2.0.5), fixes #507642
* Sat Jun 13 2009 Alex Lancaster <alexlan[AT}fedoraproject org> - 2.0.4-1
- Update to upstream 2.0.4
* Sat Jun 13 2009 Alex Lancaster <alexlan[AT}fedoraproject org> - 2.0.3-3
- Rebuild against newer Python boost
* Mon Apr 27 2009 Christopher Aillon <caillon(a)redhat.com> - 2.0.3-2
- Rebuild against newer gecko
* Mon Mar 16 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0.3-1
- Update to upstream 2.0.3
- Add patch to disable xine-hack, hopefully fixes #480527
- Use internal 0.14 version of rb_libtorrent for < F-11 (#489755)
* Mon Mar 9 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0.2-1
- Update to upstream 2.0.2
- Add Requires: gstreamer-python (#489134)
- Drop patch for libtorrent 0.13, applied upstream
* Fri Feb 27 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0-5
- Combine the fhs patches into one, and fix the path to
/usr/libexec/xine_extractor (#487442)
* Fri Feb 27 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0-4
- Add another upstream patch to fix patch on x86_64 (#487442)
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Mon Feb 16 2009 Michel Salim <salimma(a)fedoraproject.org> - 2.0-2
- Use system libtorrent >= 0.13
- Do not ship testdata
- Switch default download directory to ~/Videos/Miro
* Tue Feb 10 2009 Michel Salim <salimma(a)fedoraproject.org> - 2.0-1
- Update to 2.0
* Sat Jan 17 2009 Tomas Mraz <tmraz(a)redhat.com> - 1.2.8-5
- rebuild with new openssl
* Tue Dec 23 2008 Caolán McNamara <caolanm(a)redhat.com> - 1.2.8-4
- Rebuild against newer gecko 1.9.1
* Thu Dec 18 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.8-3
- Enable patch for new boost 1.37 for F-11+
* Thu Dec 18 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.8-2
- Rebuild against new boost
* Wed Dec 3 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.8-1
- Update to latest upstream (1.2.8)
- Rebuild for Python 2.6
* Wed Nov 12 2008 Christopher Aillon <caillon(a)redhat.com> - 1.2.7-2
- Rebuild against newer gecko 1.9.0.4
* Sun Sep 28 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.7-1
- Update to 1.2.7
- Rebuild against gecko-libs 1.9.0.2 (#464205)
* Fri Aug 22 2008 Michel Alexandre Salim <salimma(a)fedoraproject.org> - 1.2.6-3
- Do not create backup files when patching; the backup files get re-added during the build process
* Fri Aug 22 2008 Michel Salim <salimma(a)fedoraproject.org> - 1.2.6-2
- Unapply boost patch; boost-1.36 has been backed out for F10
* Fri Aug 22 2008 Michel Salim <salimma(a)fedoraproject.org> - 1.2.6-1
- Update to 1.2.6
- Patch for boost API change
* Tue Aug 12 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.4-4
- Rebuild for new boost (fixes broken deps).
* Sat Jul 19 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.4-3
- Rebuild for xulrunner-1.9.0.1
- Unfortunately we probably need to make this an exact match because
Miro uses the unstable API, so a rebuild may need to be done on every
package update to be sure that it will work with new xulrunner updates
* Wed Jun 18 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.4-2
- Rebuild for xulrunner-1.9 final.
* Sun Jun 15 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.4-1
- Update to latest upstream (1.2.4)
* Mon Apr 28 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.3-2
- Update and re-enable xulrunner patch from Martin Stransky (#393521)
* Mon Apr 28 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.3-1
- Update to official 1.2.3 upstream release (includes the previous
xulrunner fixes in test release).
* Sat Mar 29 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.2-0.1.test
- Update to test snapshot which is supposed to fix xulrunner 1.9 support
(http://bugzilla.pculture.org/show_bug.cgi?id=9692)
- Drop xulrunner patch.
* Fri Mar 28 2008 Christopher Aillon <caillon(a)redhat.com> - 1.2-2
- Prune spurious (Build)Requires
* Mon Mar 24 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2-1
- Update to latest upstream (1.2)
- Remove much of xulrunner patch, keep modifications to setup.py to look
for libxul rather than xulrunner-xpcom
* Tue Mar 11 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.1.2-4
- Update GCC 4.3 patch by Christopher Aillon (#434480)
* Wed Feb 20 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 1.1.2-3
- Autorebuild for GCC 4.3
* Fri Feb 15 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.1.2-2
- Patch to build against GCC 4.3.0
* Fri Feb 15 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.1.2-1
- Update to 1.1.2
* Sat Feb 9 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.1-3
- rebuilt for GCC 4.3 as requested by Fedora Release Engineering
* Fri Jan 25 2008 Michel Salim <michel.sylvan(a)gmail.com> - 1.1-2
- Fix charset mismatch in download window
- Remove shebangs from scripts
- Sanitize end-of-line markers
* Thu Jan 17 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.1-1
- Update to upstream 1.1 release
- BuildRequires: gecko-devel-unstable, openssl-devel
* Tue Jan 8 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.0-5
- Update xulrunner patch to use upstream .pc files
* Sun Dec 23 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 1.0-4
- Add support for python eggs for F9+
* Sun Dec 23 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 1.0-3
- Re-enable gecko-libs 1.9, as 1.8.1.10 has now gone away as a BR.
- Add first-cut patch from Martin Stransky from #393521 that attempts to
patch Miro to work against xulrunner. Likely incomplete.
* Tue Dec 4 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 1.0-2
- Back to building against 1.8.1.10 (firefox) until #393521 is fixed.
* Fri Nov 16 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 1.0-1
- Update to latest upstream (1.0).
* Wed Nov 14 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.9-2
- Build against gecko-libs 1.9 (new xulrunner)
* Fri Nov 09 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.9-1
- Update to latest upstream (0.9.9.9)
- Build against gecko-libs 1.8.1.9 (firefox 2.0.0.9)
- Include xine_extractor in package (thanks to Jason Farrell)
- Drop Miro-setup.py.patch
* Thu Nov 01 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.1-6
- Update patch with workaround suggested on:
http://bugzilla.pculture.org/show_bug.cgi?id=8579
* Wed Oct 31 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.1-5
- Add setup.py patch to ignore call to svn.
* Tue Oct 30 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.1-3
- Add BuildRequires: libXv-devel
- Drop dbus patch
* Sun Oct 28 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.1-1
- Update to latest upstream (0.9.9.1)
* Fri Oct 26 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.8.1-8
- Replace Requires and BuildRequires for firefox with gecko to
smooth eventual xulrunner transition
* Thu Oct 25 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.8.1-7
- Rebuild for new Firefox (2.0.0.8)
- License: GPLv2+ to conform with Fedora licensing guidelines
* Thu Sep 20 2007 Thorsten Scherf <tscherf(a)redhat.com> 0.9.8.1-3
- new Firefox dep
* Wed Aug 15 2007 Thorsten Scherf <tscherf(a)redhat.com> 0.9.8.1-2
- made Democracy obsolte with this release
* Tue Aug 14 2007 Thorsten Scherf <tscherf(a)redhat.com> 0.9.8.1-1
- new upstream version and new naming
- fix to solve the python/dbus problem
* Fri Jun 22 2007 Thorsten Scherf <tscherf(a)redhat.com> 0.9.6-2
- new upstream version
* Fri Jun 22 2007 Thorsten Scherf <tscherf(a)redhat.com> 0.9.6-1
- new upstream version
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/miro/F-16/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 12 Feb 2012 19:57:43 -0000 1.1
+++ .cvsignore 13 Feb 2012 10:56:03 -0000 1.2
@@ -0,0 +1 @@
+miro-4.0.6.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/miro/F-16/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 12 Feb 2012 19:57:43 -0000 1.1
+++ sources 13 Feb 2012 10:56:03 -0000 1.2
@@ -0,0 +1 @@
+5a574ebfc27f46fa3be36f1513d6dc87 miro-4.0.6.tar.gz
12 years, 9 months
- 1
- 0
rpms/miro/F-15 miro-4.0.2-change_timeout.patch, NONE, 1.1 miro-4.0.2-fix_desktop_file.patch, NONE, 1.1 miro-4.0.2-fix_itunes_path.patch, NONE, 1.1 miro-4.0.2.1-fix_screensaver_inhibit.patch, NONE, 1.1 miro-4.0.2.1-segmenter_cflags.patch, NONE, 1.1 miro.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Michel Alexandre Salim
Author: salimma
Update of /cvs/free/rpms/miro/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31862/F-15
Modified Files:
.cvsignore sources
Added Files:
miro-4.0.2-change_timeout.patch
miro-4.0.2-fix_desktop_file.patch
miro-4.0.2-fix_itunes_path.patch
miro-4.0.2.1-fix_screensaver_inhibit.patch
miro-4.0.2.1-segmenter_cflags.patch miro.spec
Log Message:
Import of miro 4.0.6 to F-15, F-16 and Rawhide branches
miro-4.0.2-change_timeout.patch:
subprocesstest.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE miro-4.0.2-change_timeout.patch ---
>From d4cb07892143a2ae1f452b46bf5111a40ef7f466 Mon Sep 17 00:00:00 2001
From: Will Kahn-Greene <will.guaraldi(a)pculture.org>
Date: Tue, 21 Jun 2011 14:59:57 -0400
Subject: [PATCH] 17817. Changes timeout from 4 to 6 seconds
We're theorizing that on the linux build box a 4 second timeout isn't
long enough because it's slow and old.
---
tv/lib/test/subprocesstest.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tv/lib/test/subprocesstest.py b/tv/lib/test/subprocesstest.py
index 529a7c1..ac7546b 100644
--- a/tv/lib/test/subprocesstest.py
+++ b/tv/lib/test/subprocesstest.py
@@ -91,7 +91,7 @@ class SubprocessManagerTest(EventLoopTest):
self.subprocess.shutdown()
EventLoopTest.tearDown(self)
- def _wait_for_subprocess_ready(self, timeout=4.0):
+ def _wait_for_subprocess_ready(self, timeout=6.0):
"""Wait for the subprocess to startup."""
start = time.time()
--
1.7.6
miro-4.0.2-fix_desktop_file.patch:
miro.desktop | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- NEW FILE miro-4.0.2-fix_desktop_file.patch ---
>From f5eeeb110c2e8344e8b097aaa159cf187ecc0124 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Thu, 14 Jul 2011 13:32:35 +0200
Subject: [PATCH] Fix desktop file for validation
- Add categories: TV depends on Video; P2P depends on Network
- MimeType listing should be semicolon-terminated
---
tv/linux/miro.desktop | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tv/linux/miro.desktop b/tv/linux/miro.desktop
index 6d3580a..e03f896 100644
--- a/tv/linux/miro.desktop
+++ b/tv/linux/miro.desktop
@@ -11,5 +11,5 @@ Icon=miro
TryExec=miro
Exec=miro %F
Terminal=false
-Categories=GTK;AudioVideo;TV;Player;P2P;News;FileTransfer;
-MimeType=application/x-miro;application/x-democracy;application/x-bittorrent;video/dv;video/mpeg;video/x-mpeg;video/msvideo;video/quicktime;video/x-anim;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-flc;video/x-fli;application/ogg;application/x-ogg;application/x-matroska;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-wav;audio/x-mpegurl;audio/x-scpls;audio/x-m4a;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;application/vnd.rn-realmedia;audio/x-real-audio;audio/x-pn-realaudio;misc/ultravox;audio/vnd.rn-realaudio;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-pn-windows-acm;image/vnd.rn-realpix;video/vnd.rn-realvideo;audio/x-pn-realaudio-plugin;video/ogg;audio/ogg
+Categories=GTK;AudioVideo;Video;TV;Player;Network;P2P;News;FileTransfer;
+MimeType=application/x-miro;application/x-democracy;application/x-bittorrent;video/dv;video/mpeg;video/x-mpeg;video/msvideo;video/quicktime;video/x-anim;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-flc;video/x-fli;application/ogg;application/x-ogg;application/x-matroska;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-wav;audio/x-mpegurl;audio/x-scpls;audio/x-m4a;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;application/vnd.rn-realmedia;audio/x-real-audio;audio/x-pn-realaudio;misc/ultravox;audio/vnd.rn-realaudio;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-pn-windows-acm;image/vnd.rn-realpix;video/vnd.rn-realvideo;audio/x-pn-realaudio-plugin;video/ogg;audio/ogg;
--
1.7.6
miro-4.0.2-fix_itunes_path.patch:
importmedia.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE miro-4.0.2-fix_itunes_path.patch ---
>From c59f055141ae8b1cec801f294a399639195241fd Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Thu, 14 Jul 2011 12:36:44 +0200
Subject: [PATCH] import_itunes_path should catch the ValueError exception
thrown when the path does not exist
---
tv/lib/importmedia.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tv/lib/importmedia.py b/tv/lib/importmedia.py
index c525bfc..45b950c 100644
--- a/tv/lib/importmedia.py
+++ b/tv/lib/importmedia.py
@@ -102,5 +102,5 @@ def import_itunes_path(path):
parser.parse(os.path.join(path, ITUNES_XML_FILE))
music_path = file_path_xlat(handler.music_path)
return music_path
- except (IOError, xml.sax.SAXParseException):
+ except (IOError, xml.sax.SAXParseException, ValueError):
pass
--
1.7.6
miro-4.0.2.1-fix_screensaver_inhibit.patch:
screensaver.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
--- NEW FILE miro-4.0.2.1-fix_screensaver_inhibit.patch ---
>From 338fefd19c9b0447dfe79a72bce51b54da9f599d Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Sun, 31 Jul 2011 21:08:42 +0200
Subject: [PATCH] Workaround for GNOME 3.0's screensaver
To: Will Kahn-Greene <will.guaraldi(a)pculture.org>
GNOME 3.0 has a screensaver that is missing the Inhibit method;
attempting to inhibit it via DBus results in a DBusException being
raised.
Until this is fixed upstream, work around this by storing the exception
as the cookie, and handle this special value when re-enabling the
screensaver.
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
---
tv/linux/plat/screensaver.py | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/tv/linux/plat/screensaver.py b/tv/linux/plat/screensaver.py
index ede19c9..afcfc30 100644
--- a/tv/linux/plat/screensaver.py
+++ b/tv/linux/plat/screensaver.py
@@ -50,11 +50,18 @@ class GnomeScreenSaverManager(object):
prog = "Miro"
reason = "Playing a video"
- self.cookie = obj.Inhibit(prog, reason)
+ try:
+ self.cookie = obj.Inhibit(prog, reason)
+ except dbus.DBusException as e:
+ # GNOME 3.0's screensaver lacks the Inhibit method
+ self.cookie = e
def enable(self):
if self.cookie is None:
raise AssertionError("disable() must be called before enable()")
+ elif type(self.cookie) is dbus.DBusException:
+ self.cookie = None
+ return
bus = dbus.SessionBus()
obj = bus.get_object('org.gnome.ScreenSaver',
'/org/gnome/ScreenSaver')
--
1.7.6
miro-4.0.2.1-segmenter_cflags.patch:
setup.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE miro-4.0.2.1-segmenter_cflags.patch ---
>From 8fe2ac644e37de31b8780f2f38499bef82821003 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Tue, 2 Aug 2011 20:04:44 +0200
Subject: [PATCH] Use provided CFLAGS when building miro-segmenter
miro_segmenter is built not as a Python extension module, but as a
normal C program, by directly invoking the system's C compiler.
As such, no compiler flag is passed to the compiler, resulting in an
unoptimized binary. This patch passes the value of the CFLAGS
environment variable, if set, to the compiler.
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
---
tv/linux/setup.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/tv/linux/setup.py b/tv/linux/setup.py
index 54ba112..923166e 100644
--- a/tv/linux/setup.py
+++ b/tv/linux/setup.py
@@ -436,7 +436,8 @@ class build(distutils.command.build.build):
cc.add_include_dir('/usr/include/ffmpeg')
output_dir = os.path.join(self.build_base, 'miro-segmenter')
segmenter_objs = cc.compile([segmenter_src],
- output_dir=output_dir)
+ output_dir=output_dir,
+ extra_preargs=(os.environ.get("CFLAGS") or "").split())
cc.link_executable(segmenter_objs, 'miro-segmenter',
output_dir=output_dir)
segmenter_exe = os.path.join(output_dir, 'miro-segmenter')
--
1.7.6
--- NEW FILE miro.spec ---
Name: miro
Version: 4.0.6
Release: 2%{?dist}
Summary: Internet TV Player
Group: Applications/Multimedia
# miro-segmenter is GPLv2 only
License: GPLv2+ and GPLv2
URL: http://www.getmiro.com/
Source0: http://ftp.osuosl.org/pub/pculture.org/miro/src/miro-%{version}.tar.gz
# explains video conversion issues
# Source1: README.Fedora
# from upstream, fixes their issue # 17817
Patch0: miro-4.0.2-change_timeout.patch
# handle non-existent iTunes path exception
# submitted: http://bugzilla.pculture.org/show_bug.cgi?id=17925
Patch1: miro-4.0.2-fix_itunes_path.patch
# fix desktop file
# submitted: http://bugzilla.pculture.org/show_bug.cgi?id=17926
Patch2: miro-4.0.2-fix_desktop_file.patch
# fix GNOME screensaver not being inhibitable
# submitted: http://bugzilla.pculture.org/show_bug.cgi?id=18018
Patch3: miro-4.0.2.1-fix_screensaver_inhibit.patch
# Use provided CFLAGS when building miro-segmenter
# submitted: https://bugzilla.pculture.org/show_bug.cgi?id=18027
Patch4: miro-4.0.2.1-segmenter_cflags.patch
BuildRequires: python-devel
BuildRequires: desktop-file-utils
BuildRequires: ffmpeg-devel
BuildRequires: gettext
BuildRequires: Pyrex
BuildRequires: pygtk2-devel
BuildRequires: webkitgtk-devel
# for testing
BuildRequires: dbus-x11
BuildRequires: dbus-python
BuildRequires: GConf2
BuildRequires: python-mutagen
BuildRequires: gnome-python2-gconf
BuildRequires: gstreamer-plugins-good
BuildRequires: gstreamer-python
BuildRequires: python-pycurl
BuildRequires: pywebkitgtk
BuildRequires: rb_libtorrent-python
BuildRequires: Xvfb xauth
Requires: avahi-compat-libdns_sd
Requires: dbus-python
Requires: dbus-x11
Requires: ffmpeg2theora
Requires: GConf2
Requires: gnome-python2-gconf
Requires: gstreamer-plugins-good
Requires: gstreamer-python
Requires: python-mutagen
Requires: python-pycurl
Requires: pywebkitgtk
Requires: rb_libtorrent-python
Provides: Miro = %{version}-%{release}
Obsoletes: Miro < 3.5.1-2
# we don't want to provide private python extension libs
# http://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering#...
%{?filter_setup:
%filter_provides_in %{python_sitearch}/miro/.*\.so$
%filter_setup
}
%description
Miro is a free HD video player. It offers over 6,000 free internet TV
shows and video podcasts, and has a simple interface designed for
fullscreen HD video. It downloads most videos, allowing users to take
their shows with them.
%prep
%setup -q
# Patches
# Intentionally not using -b .<descr> :
# Otherwise, the unpatched files get re-added into Miro
# (and '.' breaks Python imports)
%patch0 -p2
%patch1 -p2
%patch2 -p2
%patch3 -p2
%patch4 -p2
# /Patches
%build
cd linux && CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
%check
cd linux && LANG=en_US.utf8 xvfb-run -a -w 1 ./test.sh
%install
cd linux && %{__python} setup.py install -O1 --skip-build --root %{buildroot}
desktop-file-validate %{buildroot}%{_datadir}/applications/miro.desktop
# Fix permissions
find %{buildroot}%{_bindir}/miro* -exec chmod 755 '{}' \;
find %{buildroot}%{python_sitearch}/miro -name '*.so' -exec chmod 755 '{}' \;
# Swedish Chef is not a real locale; delete files rather than
# having to own the directory
rm -rf %{buildroot}%{_datadir}/locale/swch
%find_lang miro
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database %{_datadir}/applications &> /dev/null ||:
update-mime-database %{_datadir}/mime &> /dev/null || :
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-desktop-database %{_datadir}/applications &> /dev/null ||:
update-mime-database %{_datadir}/mime &> /dev/null || :
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f linux/miro.lang
%{_bindir}/*
%exclude %{_datadir}/miro/resources/testdata
%{_datadir}/miro
%{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/pixmaps/*
%{_datadir}/applications/*.desktop
%{_mandir}/man1/*
%{_datadir}/mime/packages/*.xml
%{python_sitearch}/*egg-info
%{python_sitearch}/miro/
%doc README license.txt CREDITS
%changelog
* Wed Feb 8 2012 Michel Salim <salimma(a)fedoraproject.org> - 4.0.6-2
- Add GPLv2 to license field (for miro-segmenter)
- Remove old upgrade path for Democracy package
- Use versioned Obsolete: for the previous Miro package
* Thu Feb 2 2012 Michel Salim <salimma(a)fedoraproject.org> - 4.0.6-1
- Update to 4.0.6
- Spec clean-ups
- Hide private library from "Provide:" metadata
* Tue Aug 2 2011 Michel Salim <salimma(a)fedoraproject.org> - 4.0.2.1-4
- Use provided CFLAGS when building miro-segmenter
* Sun Jul 31 2011 Michel Salim <salimma(a)fedoraproject.org> - 4.0.2.1-3
- Add missing BR for Gstreamer tests
* Sun Jul 31 2011 Michel Salim <salimma(a)fedoraproject.org> - 4.0.2.1-2
- Fix screensaver inhibition exception when enabling full-screen mode
* Sun Jul 31 2011 Michel Salim <salimma(a)fedoraproject.org> - 4.0.2.1-1
- Update to 4.0.2.1
- Fix permissions of installed executables and .so modules
- Add missing build and runtime dependencies
* Thu Jul 14 2011 Michel Salim <salimma(a)fedoraproject.org> - 4.0.2-1
- Update to 4.0.2
- Rename to miro
- Enable unit tests
- Validate desktop entry
* Sat Mar 5 2011 Michel Salim <salimma(a)fedoraproject.org> - 3.5.1-1
- Update to 3.5.1
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Sat Nov 6 2010 Michel Salim <salimma(a)fedoraproject.org> - 3.5-2
- Fix positioning of child image to use integer dimensions
- add documentation for video conversion issues
* Sat Nov 6 2010 Michel Salim <salimma(a)fedoraproject.org> - 3.5-1
- Update to 3.5
* Wed Sep 29 2010 jkeating - 3.0.3-3
- Rebuilt for gcc bug 634757
* Mon Sep 20 2010 Michel Salim <salimma(a)fedoraproject.org> - 3.0.3-2
- Catch exception when started without a valid DISPLAY (# 633999)
* Sun Aug 29 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 3.0.3-1
- Update to upstream 3.0.3. Potentially fixes a whole slew of bugs
including YouTube downloads not working
(http://bugzilla.pculture.org/show_bug.cgi?id=14084)
* Wed Jul 21 2010 David Malcolm <dmalcolm(a)redhat.com> - 3.0.2-2
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
* Thu Jun 3 2010 Michel Salim <salimma(a)fedoraproject.org> - 3.0.2-1
- Update to 3.0.2
* Wed May 5 2010 Michel Salim <salimma(a)fedoraproject.org> - 3.0.1-1
- Update to 3.0.1
* Mon Apr 12 2010 Martin Stransky <stransky(a)redhat.com> - 3.0-2
- Updated gecko dependency
* Fri Apr 9 2010 Michel Salim <salimma(a)fedoraproject.org> - 3.0-1
- Update to 3.0
- Use mimeinfo and icon cache scriptlets
- Drop unneeded dependencies
* Sat Apr 03 2010 Caolán McNamara <caolanm(a)redhat.com> - 2.5.4-4
- Rebuild against newer gecko
* Tue Mar 23 2010 Jan Horak <jhorak(a)redhat.com> - 2.5.4-3
- Rebuild against newer gecko
* Fri Jan 22 2010 Rahul Sundaram <sundaram(a)fedoraproject.org> - 2.5.4-2
- Rebuild for Boost soname bump
* Thu Dec 17 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.5.4-1
- Update to upstream 2.5.4.
- Hopefully fixes a whole slew of crashes (#540301, #540535, #540543)
(#544047, #545681, #546141, #528036, #540207, #544889, #547062)
* Wed Nov 25 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.5.3-3
- Update to new gecko-libs
* Thu Nov 05 2009 Jan Horak <jhorak(a)redhat.com> - 2.5.3-2
- Rebuild against newer gecko
* Wed Oct 28 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.5.3-1
- Update to 2.5.3
- Tarball renamed: Miro -> miro
* Tue Oct 27 2009 Jan Horak <jhorak(a)redhat.com> - 2.5.2-5
- Rebuild against newer gecko
* Fri Sep 11 2009 Jan Horak <jhorak(a)redhat.com> - 2.5.2-4
- Rebuild against newer gecko
* Thu Aug 06 2009 Jan Horak <jhorak(a)redhat.com> - 2.5.2-3
- Rebuild against newer gecko
* Tue Aug 04 2009 Jan Horak <jhorak(a)redhat.com> - 2.5.2-2
- Rebuild against newer gecko
* Tue Aug 4 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.5.2-1
- Update to latest upstream (2.5.2)
- Drop xine hack patch, now upstream
- Rebase remaining patches to 2.5.2 where necessary
- Include new icons in files list
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.0.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Sun Jul 19 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0.5-2
- Rebuild against newer gecko
* Wed Jul 1 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0.5-1
- Update to latest upstream (2.0.5), fixes #507642
* Sat Jun 13 2009 Alex Lancaster <alexlan[AT}fedoraproject org> - 2.0.4-1
- Update to upstream 2.0.4
* Sat Jun 13 2009 Alex Lancaster <alexlan[AT}fedoraproject org> - 2.0.3-3
- Rebuild against newer Python boost
* Mon Apr 27 2009 Christopher Aillon <caillon(a)redhat.com> - 2.0.3-2
- Rebuild against newer gecko
* Mon Mar 16 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0.3-1
- Update to upstream 2.0.3
- Add patch to disable xine-hack, hopefully fixes #480527
- Use internal 0.14 version of rb_libtorrent for < F-11 (#489755)
* Mon Mar 9 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0.2-1
- Update to upstream 2.0.2
- Add Requires: gstreamer-python (#489134)
- Drop patch for libtorrent 0.13, applied upstream
* Fri Feb 27 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0-5
- Combine the fhs patches into one, and fix the path to
/usr/libexec/xine_extractor (#487442)
* Fri Feb 27 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0-4
- Add another upstream patch to fix patch on x86_64 (#487442)
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Mon Feb 16 2009 Michel Salim <salimma(a)fedoraproject.org> - 2.0-2
- Use system libtorrent >= 0.13
- Do not ship testdata
- Switch default download directory to ~/Videos/Miro
* Tue Feb 10 2009 Michel Salim <salimma(a)fedoraproject.org> - 2.0-1
- Update to 2.0
* Sat Jan 17 2009 Tomas Mraz <tmraz(a)redhat.com> - 1.2.8-5
- rebuild with new openssl
* Tue Dec 23 2008 Caolán McNamara <caolanm(a)redhat.com> - 1.2.8-4
- Rebuild against newer gecko 1.9.1
* Thu Dec 18 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.8-3
- Enable patch for new boost 1.37 for F-11+
* Thu Dec 18 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.8-2
- Rebuild against new boost
* Wed Dec 3 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.8-1
- Update to latest upstream (1.2.8)
- Rebuild for Python 2.6
* Wed Nov 12 2008 Christopher Aillon <caillon(a)redhat.com> - 1.2.7-2
- Rebuild against newer gecko 1.9.0.4
* Sun Sep 28 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.7-1
- Update to 1.2.7
- Rebuild against gecko-libs 1.9.0.2 (#464205)
* Fri Aug 22 2008 Michel Alexandre Salim <salimma(a)fedoraproject.org> - 1.2.6-3
- Do not create backup files when patching; the backup files get re-added during the build process
* Fri Aug 22 2008 Michel Salim <salimma(a)fedoraproject.org> - 1.2.6-2
- Unapply boost patch; boost-1.36 has been backed out for F10
* Fri Aug 22 2008 Michel Salim <salimma(a)fedoraproject.org> - 1.2.6-1
- Update to 1.2.6
- Patch for boost API change
* Tue Aug 12 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.4-4
- Rebuild for new boost (fixes broken deps).
* Sat Jul 19 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.4-3
- Rebuild for xulrunner-1.9.0.1
- Unfortunately we probably need to make this an exact match because
Miro uses the unstable API, so a rebuild may need to be done on every
package update to be sure that it will work with new xulrunner updates
* Wed Jun 18 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.4-2
- Rebuild for xulrunner-1.9 final.
* Sun Jun 15 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.4-1
- Update to latest upstream (1.2.4)
* Mon Apr 28 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.3-2
- Update and re-enable xulrunner patch from Martin Stransky (#393521)
* Mon Apr 28 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.3-1
- Update to official 1.2.3 upstream release (includes the previous
xulrunner fixes in test release).
* Sat Mar 29 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.2-0.1.test
- Update to test snapshot which is supposed to fix xulrunner 1.9 support
(http://bugzilla.pculture.org/show_bug.cgi?id=9692)
- Drop xulrunner patch.
* Fri Mar 28 2008 Christopher Aillon <caillon(a)redhat.com> - 1.2-2
- Prune spurious (Build)Requires
* Mon Mar 24 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2-1
- Update to latest upstream (1.2)
- Remove much of xulrunner patch, keep modifications to setup.py to look
for libxul rather than xulrunner-xpcom
* Tue Mar 11 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.1.2-4
- Update GCC 4.3 patch by Christopher Aillon (#434480)
* Wed Feb 20 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 1.1.2-3
- Autorebuild for GCC 4.3
* Fri Feb 15 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.1.2-2
- Patch to build against GCC 4.3.0
* Fri Feb 15 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.1.2-1
- Update to 1.1.2
* Sat Feb 9 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.1-3
- rebuilt for GCC 4.3 as requested by Fedora Release Engineering
* Fri Jan 25 2008 Michel Salim <michel.sylvan(a)gmail.com> - 1.1-2
- Fix charset mismatch in download window
- Remove shebangs from scripts
- Sanitize end-of-line markers
* Thu Jan 17 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.1-1
- Update to upstream 1.1 release
- BuildRequires: gecko-devel-unstable, openssl-devel
* Tue Jan 8 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.0-5
- Update xulrunner patch to use upstream .pc files
* Sun Dec 23 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 1.0-4
- Add support for python eggs for F9+
* Sun Dec 23 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 1.0-3
- Re-enable gecko-libs 1.9, as 1.8.1.10 has now gone away as a BR.
- Add first-cut patch from Martin Stransky from #393521 that attempts to
patch Miro to work against xulrunner. Likely incomplete.
* Tue Dec 4 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 1.0-2
- Back to building against 1.8.1.10 (firefox) until #393521 is fixed.
* Fri Nov 16 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 1.0-1
- Update to latest upstream (1.0).
* Wed Nov 14 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.9-2
- Build against gecko-libs 1.9 (new xulrunner)
* Fri Nov 09 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.9-1
- Update to latest upstream (0.9.9.9)
- Build against gecko-libs 1.8.1.9 (firefox 2.0.0.9)
- Include xine_extractor in package (thanks to Jason Farrell)
- Drop Miro-setup.py.patch
* Thu Nov 01 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.1-6
- Update patch with workaround suggested on:
http://bugzilla.pculture.org/show_bug.cgi?id=8579
* Wed Oct 31 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.1-5
- Add setup.py patch to ignore call to svn.
* Tue Oct 30 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.1-3
- Add BuildRequires: libXv-devel
- Drop dbus patch
* Sun Oct 28 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.1-1
- Update to latest upstream (0.9.9.1)
* Fri Oct 26 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.8.1-8
- Replace Requires and BuildRequires for firefox with gecko to
smooth eventual xulrunner transition
* Thu Oct 25 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.8.1-7
- Rebuild for new Firefox (2.0.0.8)
- License: GPLv2+ to conform with Fedora licensing guidelines
* Thu Sep 20 2007 Thorsten Scherf <tscherf(a)redhat.com> 0.9.8.1-3
- new Firefox dep
* Wed Aug 15 2007 Thorsten Scherf <tscherf(a)redhat.com> 0.9.8.1-2
- made Democracy obsolte with this release
* Tue Aug 14 2007 Thorsten Scherf <tscherf(a)redhat.com> 0.9.8.1-1
- new upstream version and new naming
- fix to solve the python/dbus problem
* Fri Jun 22 2007 Thorsten Scherf <tscherf(a)redhat.com> 0.9.6-2
- new upstream version
* Fri Jun 22 2007 Thorsten Scherf <tscherf(a)redhat.com> 0.9.6-1
- new upstream version
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/miro/F-15/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 12 Feb 2012 19:57:43 -0000 1.1
+++ .cvsignore 13 Feb 2012 10:56:03 -0000 1.2
@@ -0,0 +1 @@
+miro-4.0.6.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/miro/F-15/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 12 Feb 2012 19:57:43 -0000 1.1
+++ sources 13 Feb 2012 10:56:03 -0000 1.2
@@ -0,0 +1 @@
+5a574ebfc27f46fa3be36f1513d6dc87 miro-4.0.6.tar.gz
12 years, 9 months
- 1
- 0
rpms/miro/devel miro-4.0.2-change_timeout.patch, NONE, 1.1 miro-4.0.2-fix_desktop_file.patch, NONE, 1.1 miro-4.0.2-fix_itunes_path.patch, NONE, 1.1 miro-4.0.2.1-fix_screensaver_inhibit.patch, NONE, 1.1 miro-4.0.2.1-segmenter_cflags.patch, NONE, 1.1 miro.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Michel Alexandre Salim
Author: salimma
Update of /cvs/free/rpms/miro/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31862/devel
Modified Files:
.cvsignore sources
Added Files:
miro-4.0.2-change_timeout.patch
miro-4.0.2-fix_desktop_file.patch
miro-4.0.2-fix_itunes_path.patch
miro-4.0.2.1-fix_screensaver_inhibit.patch
miro-4.0.2.1-segmenter_cflags.patch miro.spec
Log Message:
Import of miro 4.0.6 to F-15, F-16 and Rawhide branches
miro-4.0.2-change_timeout.patch:
subprocesstest.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE miro-4.0.2-change_timeout.patch ---
>From d4cb07892143a2ae1f452b46bf5111a40ef7f466 Mon Sep 17 00:00:00 2001
From: Will Kahn-Greene <will.guaraldi(a)pculture.org>
Date: Tue, 21 Jun 2011 14:59:57 -0400
Subject: [PATCH] 17817. Changes timeout from 4 to 6 seconds
We're theorizing that on the linux build box a 4 second timeout isn't
long enough because it's slow and old.
---
tv/lib/test/subprocesstest.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tv/lib/test/subprocesstest.py b/tv/lib/test/subprocesstest.py
index 529a7c1..ac7546b 100644
--- a/tv/lib/test/subprocesstest.py
+++ b/tv/lib/test/subprocesstest.py
@@ -91,7 +91,7 @@ class SubprocessManagerTest(EventLoopTest):
self.subprocess.shutdown()
EventLoopTest.tearDown(self)
- def _wait_for_subprocess_ready(self, timeout=4.0):
+ def _wait_for_subprocess_ready(self, timeout=6.0):
"""Wait for the subprocess to startup."""
start = time.time()
--
1.7.6
miro-4.0.2-fix_desktop_file.patch:
miro.desktop | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- NEW FILE miro-4.0.2-fix_desktop_file.patch ---
>From f5eeeb110c2e8344e8b097aaa159cf187ecc0124 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Thu, 14 Jul 2011 13:32:35 +0200
Subject: [PATCH] Fix desktop file for validation
- Add categories: TV depends on Video; P2P depends on Network
- MimeType listing should be semicolon-terminated
---
tv/linux/miro.desktop | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tv/linux/miro.desktop b/tv/linux/miro.desktop
index 6d3580a..e03f896 100644
--- a/tv/linux/miro.desktop
+++ b/tv/linux/miro.desktop
@@ -11,5 +11,5 @@ Icon=miro
TryExec=miro
Exec=miro %F
Terminal=false
-Categories=GTK;AudioVideo;TV;Player;P2P;News;FileTransfer;
-MimeType=application/x-miro;application/x-democracy;application/x-bittorrent;video/dv;video/mpeg;video/x-mpeg;video/msvideo;video/quicktime;video/x-anim;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-flc;video/x-fli;application/ogg;application/x-ogg;application/x-matroska;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-wav;audio/x-mpegurl;audio/x-scpls;audio/x-m4a;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;application/vnd.rn-realmedia;audio/x-real-audio;audio/x-pn-realaudio;misc/ultravox;audio/vnd.rn-realaudio;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-pn-windows-acm;image/vnd.rn-realpix;video/vnd.rn-realvideo;audio/x-pn-realaudio-plugin;video/ogg;audio/ogg
+Categories=GTK;AudioVideo;Video;TV;Player;Network;P2P;News;FileTransfer;
+MimeType=application/x-miro;application/x-democracy;application/x-bittorrent;video/dv;video/mpeg;video/x-mpeg;video/msvideo;video/quicktime;video/x-anim;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-flc;video/x-fli;application/ogg;application/x-ogg;application/x-matroska;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-wav;audio/x-mpegurl;audio/x-scpls;audio/x-m4a;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;application/vnd.rn-realmedia;audio/x-real-audio;audio/x-pn-realaudio;misc/ultravox;audio/vnd.rn-realaudio;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-pn-windows-acm;image/vnd.rn-realpix;video/vnd.rn-realvideo;audio/x-pn-realaudio-plugin;video/ogg;audio/ogg;
--
1.7.6
miro-4.0.2-fix_itunes_path.patch:
importmedia.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE miro-4.0.2-fix_itunes_path.patch ---
>From c59f055141ae8b1cec801f294a399639195241fd Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Thu, 14 Jul 2011 12:36:44 +0200
Subject: [PATCH] import_itunes_path should catch the ValueError exception
thrown when the path does not exist
---
tv/lib/importmedia.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tv/lib/importmedia.py b/tv/lib/importmedia.py
index c525bfc..45b950c 100644
--- a/tv/lib/importmedia.py
+++ b/tv/lib/importmedia.py
@@ -102,5 +102,5 @@ def import_itunes_path(path):
parser.parse(os.path.join(path, ITUNES_XML_FILE))
music_path = file_path_xlat(handler.music_path)
return music_path
- except (IOError, xml.sax.SAXParseException):
+ except (IOError, xml.sax.SAXParseException, ValueError):
pass
--
1.7.6
miro-4.0.2.1-fix_screensaver_inhibit.patch:
screensaver.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
--- NEW FILE miro-4.0.2.1-fix_screensaver_inhibit.patch ---
>From 338fefd19c9b0447dfe79a72bce51b54da9f599d Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Sun, 31 Jul 2011 21:08:42 +0200
Subject: [PATCH] Workaround for GNOME 3.0's screensaver
To: Will Kahn-Greene <will.guaraldi(a)pculture.org>
GNOME 3.0 has a screensaver that is missing the Inhibit method;
attempting to inhibit it via DBus results in a DBusException being
raised.
Until this is fixed upstream, work around this by storing the exception
as the cookie, and handle this special value when re-enabling the
screensaver.
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
---
tv/linux/plat/screensaver.py | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/tv/linux/plat/screensaver.py b/tv/linux/plat/screensaver.py
index ede19c9..afcfc30 100644
--- a/tv/linux/plat/screensaver.py
+++ b/tv/linux/plat/screensaver.py
@@ -50,11 +50,18 @@ class GnomeScreenSaverManager(object):
prog = "Miro"
reason = "Playing a video"
- self.cookie = obj.Inhibit(prog, reason)
+ try:
+ self.cookie = obj.Inhibit(prog, reason)
+ except dbus.DBusException as e:
+ # GNOME 3.0's screensaver lacks the Inhibit method
+ self.cookie = e
def enable(self):
if self.cookie is None:
raise AssertionError("disable() must be called before enable()")
+ elif type(self.cookie) is dbus.DBusException:
+ self.cookie = None
+ return
bus = dbus.SessionBus()
obj = bus.get_object('org.gnome.ScreenSaver',
'/org/gnome/ScreenSaver')
--
1.7.6
miro-4.0.2.1-segmenter_cflags.patch:
setup.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE miro-4.0.2.1-segmenter_cflags.patch ---
>From 8fe2ac644e37de31b8780f2f38499bef82821003 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Tue, 2 Aug 2011 20:04:44 +0200
Subject: [PATCH] Use provided CFLAGS when building miro-segmenter
miro_segmenter is built not as a Python extension module, but as a
normal C program, by directly invoking the system's C compiler.
As such, no compiler flag is passed to the compiler, resulting in an
unoptimized binary. This patch passes the value of the CFLAGS
environment variable, if set, to the compiler.
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
---
tv/linux/setup.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/tv/linux/setup.py b/tv/linux/setup.py
index 54ba112..923166e 100644
--- a/tv/linux/setup.py
+++ b/tv/linux/setup.py
@@ -436,7 +436,8 @@ class build(distutils.command.build.build):
cc.add_include_dir('/usr/include/ffmpeg')
output_dir = os.path.join(self.build_base, 'miro-segmenter')
segmenter_objs = cc.compile([segmenter_src],
- output_dir=output_dir)
+ output_dir=output_dir,
+ extra_preargs=(os.environ.get("CFLAGS") or "").split())
cc.link_executable(segmenter_objs, 'miro-segmenter',
output_dir=output_dir)
segmenter_exe = os.path.join(output_dir, 'miro-segmenter')
--
1.7.6
--- NEW FILE miro.spec ---
Name: miro
Version: 4.0.6
Release: 2%{?dist}
Summary: Internet TV Player
Group: Applications/Multimedia
# miro-segmenter is GPLv2 only
License: GPLv2+ and GPLv2
URL: http://www.getmiro.com/
Source0: http://ftp.osuosl.org/pub/pculture.org/miro/src/miro-%{version}.tar.gz
# explains video conversion issues
# Source1: README.Fedora
# from upstream, fixes their issue # 17817
Patch0: miro-4.0.2-change_timeout.patch
# handle non-existent iTunes path exception
# submitted: http://bugzilla.pculture.org/show_bug.cgi?id=17925
Patch1: miro-4.0.2-fix_itunes_path.patch
# fix desktop file
# submitted: http://bugzilla.pculture.org/show_bug.cgi?id=17926
Patch2: miro-4.0.2-fix_desktop_file.patch
# fix GNOME screensaver not being inhibitable
# submitted: http://bugzilla.pculture.org/show_bug.cgi?id=18018
Patch3: miro-4.0.2.1-fix_screensaver_inhibit.patch
# Use provided CFLAGS when building miro-segmenter
# submitted: https://bugzilla.pculture.org/show_bug.cgi?id=18027
Patch4: miro-4.0.2.1-segmenter_cflags.patch
BuildRequires: python-devel
BuildRequires: desktop-file-utils
BuildRequires: ffmpeg-devel
BuildRequires: gettext
BuildRequires: Pyrex
BuildRequires: pygtk2-devel
BuildRequires: webkitgtk-devel
# for testing
BuildRequires: dbus-x11
BuildRequires: dbus-python
BuildRequires: GConf2
BuildRequires: python-mutagen
BuildRequires: gnome-python2-gconf
BuildRequires: gstreamer-plugins-good
BuildRequires: gstreamer-python
BuildRequires: python-pycurl
BuildRequires: pywebkitgtk
BuildRequires: rb_libtorrent-python
BuildRequires: Xvfb xauth
Requires: avahi-compat-libdns_sd
Requires: dbus-python
Requires: dbus-x11
Requires: ffmpeg2theora
Requires: GConf2
Requires: gnome-python2-gconf
Requires: gstreamer-plugins-good
Requires: gstreamer-python
Requires: python-mutagen
Requires: python-pycurl
Requires: pywebkitgtk
Requires: rb_libtorrent-python
Provides: Miro = %{version}-%{release}
Obsoletes: Miro < 3.5.1-2
# we don't want to provide private python extension libs
# http://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering#...
%{?filter_setup:
%filter_provides_in %{python_sitearch}/miro/.*\.so$
%filter_setup
}
%description
Miro is a free HD video player. It offers over 6,000 free internet TV
shows and video podcasts, and has a simple interface designed for
fullscreen HD video. It downloads most videos, allowing users to take
their shows with them.
%prep
%setup -q
# Patches
# Intentionally not using -b .<descr> :
# Otherwise, the unpatched files get re-added into Miro
# (and '.' breaks Python imports)
%patch0 -p2
%patch1 -p2
%patch2 -p2
%patch3 -p2
%patch4 -p2
# /Patches
%build
cd linux && CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
%check
cd linux && LANG=en_US.utf8 xvfb-run -a -w 1 ./test.sh
%install
cd linux && %{__python} setup.py install -O1 --skip-build --root %{buildroot}
desktop-file-validate %{buildroot}%{_datadir}/applications/miro.desktop
# Fix permissions
find %{buildroot}%{_bindir}/miro* -exec chmod 755 '{}' \;
find %{buildroot}%{python_sitearch}/miro -name '*.so' -exec chmod 755 '{}' \;
# Swedish Chef is not a real locale; delete files rather than
# having to own the directory
rm -rf %{buildroot}%{_datadir}/locale/swch
%find_lang miro
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database %{_datadir}/applications &> /dev/null ||:
update-mime-database %{_datadir}/mime &> /dev/null || :
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-desktop-database %{_datadir}/applications &> /dev/null ||:
update-mime-database %{_datadir}/mime &> /dev/null || :
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f linux/miro.lang
%{_bindir}/*
%exclude %{_datadir}/miro/resources/testdata
%{_datadir}/miro
%{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/pixmaps/*
%{_datadir}/applications/*.desktop
%{_mandir}/man1/*
%{_datadir}/mime/packages/*.xml
%{python_sitearch}/*egg-info
%{python_sitearch}/miro/
%doc README license.txt CREDITS
%changelog
* Wed Feb 8 2012 Michel Salim <salimma(a)fedoraproject.org> - 4.0.6-2
- Add GPLv2 to license field (for miro-segmenter)
- Remove old upgrade path for Democracy package
- Use versioned Obsolete: for the previous Miro package
* Thu Feb 2 2012 Michel Salim <salimma(a)fedoraproject.org> - 4.0.6-1
- Update to 4.0.6
- Spec clean-ups
- Hide private library from "Provide:" metadata
* Tue Aug 2 2011 Michel Salim <salimma(a)fedoraproject.org> - 4.0.2.1-4
- Use provided CFLAGS when building miro-segmenter
* Sun Jul 31 2011 Michel Salim <salimma(a)fedoraproject.org> - 4.0.2.1-3
- Add missing BR for Gstreamer tests
* Sun Jul 31 2011 Michel Salim <salimma(a)fedoraproject.org> - 4.0.2.1-2
- Fix screensaver inhibition exception when enabling full-screen mode
* Sun Jul 31 2011 Michel Salim <salimma(a)fedoraproject.org> - 4.0.2.1-1
- Update to 4.0.2.1
- Fix permissions of installed executables and .so modules
- Add missing build and runtime dependencies
* Thu Jul 14 2011 Michel Salim <salimma(a)fedoraproject.org> - 4.0.2-1
- Update to 4.0.2
- Rename to miro
- Enable unit tests
- Validate desktop entry
* Sat Mar 5 2011 Michel Salim <salimma(a)fedoraproject.org> - 3.5.1-1
- Update to 3.5.1
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Sat Nov 6 2010 Michel Salim <salimma(a)fedoraproject.org> - 3.5-2
- Fix positioning of child image to use integer dimensions
- add documentation for video conversion issues
* Sat Nov 6 2010 Michel Salim <salimma(a)fedoraproject.org> - 3.5-1
- Update to 3.5
* Wed Sep 29 2010 jkeating - 3.0.3-3
- Rebuilt for gcc bug 634757
* Mon Sep 20 2010 Michel Salim <salimma(a)fedoraproject.org> - 3.0.3-2
- Catch exception when started without a valid DISPLAY (# 633999)
* Sun Aug 29 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 3.0.3-1
- Update to upstream 3.0.3. Potentially fixes a whole slew of bugs
including YouTube downloads not working
(http://bugzilla.pculture.org/show_bug.cgi?id=14084)
* Wed Jul 21 2010 David Malcolm <dmalcolm(a)redhat.com> - 3.0.2-2
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
* Thu Jun 3 2010 Michel Salim <salimma(a)fedoraproject.org> - 3.0.2-1
- Update to 3.0.2
* Wed May 5 2010 Michel Salim <salimma(a)fedoraproject.org> - 3.0.1-1
- Update to 3.0.1
* Mon Apr 12 2010 Martin Stransky <stransky(a)redhat.com> - 3.0-2
- Updated gecko dependency
* Fri Apr 9 2010 Michel Salim <salimma(a)fedoraproject.org> - 3.0-1
- Update to 3.0
- Use mimeinfo and icon cache scriptlets
- Drop unneeded dependencies
* Sat Apr 03 2010 Caolán McNamara <caolanm(a)redhat.com> - 2.5.4-4
- Rebuild against newer gecko
* Tue Mar 23 2010 Jan Horak <jhorak(a)redhat.com> - 2.5.4-3
- Rebuild against newer gecko
* Fri Jan 22 2010 Rahul Sundaram <sundaram(a)fedoraproject.org> - 2.5.4-2
- Rebuild for Boost soname bump
* Thu Dec 17 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.5.4-1
- Update to upstream 2.5.4.
- Hopefully fixes a whole slew of crashes (#540301, #540535, #540543)
(#544047, #545681, #546141, #528036, #540207, #544889, #547062)
* Wed Nov 25 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.5.3-3
- Update to new gecko-libs
* Thu Nov 05 2009 Jan Horak <jhorak(a)redhat.com> - 2.5.3-2
- Rebuild against newer gecko
* Wed Oct 28 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.5.3-1
- Update to 2.5.3
- Tarball renamed: Miro -> miro
* Tue Oct 27 2009 Jan Horak <jhorak(a)redhat.com> - 2.5.2-5
- Rebuild against newer gecko
* Fri Sep 11 2009 Jan Horak <jhorak(a)redhat.com> - 2.5.2-4
- Rebuild against newer gecko
* Thu Aug 06 2009 Jan Horak <jhorak(a)redhat.com> - 2.5.2-3
- Rebuild against newer gecko
* Tue Aug 04 2009 Jan Horak <jhorak(a)redhat.com> - 2.5.2-2
- Rebuild against newer gecko
* Tue Aug 4 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.5.2-1
- Update to latest upstream (2.5.2)
- Drop xine hack patch, now upstream
- Rebase remaining patches to 2.5.2 where necessary
- Include new icons in files list
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.0.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Sun Jul 19 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0.5-2
- Rebuild against newer gecko
* Wed Jul 1 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0.5-1
- Update to latest upstream (2.0.5), fixes #507642
* Sat Jun 13 2009 Alex Lancaster <alexlan[AT}fedoraproject org> - 2.0.4-1
- Update to upstream 2.0.4
* Sat Jun 13 2009 Alex Lancaster <alexlan[AT}fedoraproject org> - 2.0.3-3
- Rebuild against newer Python boost
* Mon Apr 27 2009 Christopher Aillon <caillon(a)redhat.com> - 2.0.3-2
- Rebuild against newer gecko
* Mon Mar 16 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0.3-1
- Update to upstream 2.0.3
- Add patch to disable xine-hack, hopefully fixes #480527
- Use internal 0.14 version of rb_libtorrent for < F-11 (#489755)
* Mon Mar 9 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0.2-1
- Update to upstream 2.0.2
- Add Requires: gstreamer-python (#489134)
- Drop patch for libtorrent 0.13, applied upstream
* Fri Feb 27 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0-5
- Combine the fhs patches into one, and fix the path to
/usr/libexec/xine_extractor (#487442)
* Fri Feb 27 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0-4
- Add another upstream patch to fix patch on x86_64 (#487442)
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Mon Feb 16 2009 Michel Salim <salimma(a)fedoraproject.org> - 2.0-2
- Use system libtorrent >= 0.13
- Do not ship testdata
- Switch default download directory to ~/Videos/Miro
* Tue Feb 10 2009 Michel Salim <salimma(a)fedoraproject.org> - 2.0-1
- Update to 2.0
* Sat Jan 17 2009 Tomas Mraz <tmraz(a)redhat.com> - 1.2.8-5
- rebuild with new openssl
* Tue Dec 23 2008 Caolán McNamara <caolanm(a)redhat.com> - 1.2.8-4
- Rebuild against newer gecko 1.9.1
* Thu Dec 18 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.8-3
- Enable patch for new boost 1.37 for F-11+
* Thu Dec 18 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.8-2
- Rebuild against new boost
* Wed Dec 3 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.8-1
- Update to latest upstream (1.2.8)
- Rebuild for Python 2.6
* Wed Nov 12 2008 Christopher Aillon <caillon(a)redhat.com> - 1.2.7-2
- Rebuild against newer gecko 1.9.0.4
* Sun Sep 28 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.7-1
- Update to 1.2.7
- Rebuild against gecko-libs 1.9.0.2 (#464205)
* Fri Aug 22 2008 Michel Alexandre Salim <salimma(a)fedoraproject.org> - 1.2.6-3
- Do not create backup files when patching; the backup files get re-added during the build process
* Fri Aug 22 2008 Michel Salim <salimma(a)fedoraproject.org> - 1.2.6-2
- Unapply boost patch; boost-1.36 has been backed out for F10
* Fri Aug 22 2008 Michel Salim <salimma(a)fedoraproject.org> - 1.2.6-1
- Update to 1.2.6
- Patch for boost API change
* Tue Aug 12 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.4-4
- Rebuild for new boost (fixes broken deps).
* Sat Jul 19 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.4-3
- Rebuild for xulrunner-1.9.0.1
- Unfortunately we probably need to make this an exact match because
Miro uses the unstable API, so a rebuild may need to be done on every
package update to be sure that it will work with new xulrunner updates
* Wed Jun 18 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.4-2
- Rebuild for xulrunner-1.9 final.
* Sun Jun 15 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.4-1
- Update to latest upstream (1.2.4)
* Mon Apr 28 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.3-2
- Update and re-enable xulrunner patch from Martin Stransky (#393521)
* Mon Apr 28 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.3-1
- Update to official 1.2.3 upstream release (includes the previous
xulrunner fixes in test release).
* Sat Mar 29 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.2-0.1.test
- Update to test snapshot which is supposed to fix xulrunner 1.9 support
(http://bugzilla.pculture.org/show_bug.cgi?id=9692)
- Drop xulrunner patch.
* Fri Mar 28 2008 Christopher Aillon <caillon(a)redhat.com> - 1.2-2
- Prune spurious (Build)Requires
* Mon Mar 24 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2-1
- Update to latest upstream (1.2)
- Remove much of xulrunner patch, keep modifications to setup.py to look
for libxul rather than xulrunner-xpcom
* Tue Mar 11 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.1.2-4
- Update GCC 4.3 patch by Christopher Aillon (#434480)
* Wed Feb 20 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 1.1.2-3
- Autorebuild for GCC 4.3
* Fri Feb 15 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.1.2-2
- Patch to build against GCC 4.3.0
* Fri Feb 15 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.1.2-1
- Update to 1.1.2
* Sat Feb 9 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.1-3
- rebuilt for GCC 4.3 as requested by Fedora Release Engineering
* Fri Jan 25 2008 Michel Salim <michel.sylvan(a)gmail.com> - 1.1-2
- Fix charset mismatch in download window
- Remove shebangs from scripts
- Sanitize end-of-line markers
* Thu Jan 17 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.1-1
- Update to upstream 1.1 release
- BuildRequires: gecko-devel-unstable, openssl-devel
* Tue Jan 8 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.0-5
- Update xulrunner patch to use upstream .pc files
* Sun Dec 23 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 1.0-4
- Add support for python eggs for F9+
* Sun Dec 23 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 1.0-3
- Re-enable gecko-libs 1.9, as 1.8.1.10 has now gone away as a BR.
- Add first-cut patch from Martin Stransky from #393521 that attempts to
patch Miro to work against xulrunner. Likely incomplete.
* Tue Dec 4 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 1.0-2
- Back to building against 1.8.1.10 (firefox) until #393521 is fixed.
* Fri Nov 16 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 1.0-1
- Update to latest upstream (1.0).
* Wed Nov 14 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.9-2
- Build against gecko-libs 1.9 (new xulrunner)
* Fri Nov 09 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.9-1
- Update to latest upstream (0.9.9.9)
- Build against gecko-libs 1.8.1.9 (firefox 2.0.0.9)
- Include xine_extractor in package (thanks to Jason Farrell)
- Drop Miro-setup.py.patch
* Thu Nov 01 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.1-6
- Update patch with workaround suggested on:
http://bugzilla.pculture.org/show_bug.cgi?id=8579
* Wed Oct 31 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.1-5
- Add setup.py patch to ignore call to svn.
* Tue Oct 30 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.1-3
- Add BuildRequires: libXv-devel
- Drop dbus patch
* Sun Oct 28 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.1-1
- Update to latest upstream (0.9.9.1)
* Fri Oct 26 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.8.1-8
- Replace Requires and BuildRequires for firefox with gecko to
smooth eventual xulrunner transition
* Thu Oct 25 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.8.1-7
- Rebuild for new Firefox (2.0.0.8)
- License: GPLv2+ to conform with Fedora licensing guidelines
* Thu Sep 20 2007 Thorsten Scherf <tscherf(a)redhat.com> 0.9.8.1-3
- new Firefox dep
* Wed Aug 15 2007 Thorsten Scherf <tscherf(a)redhat.com> 0.9.8.1-2
- made Democracy obsolte with this release
* Tue Aug 14 2007 Thorsten Scherf <tscherf(a)redhat.com> 0.9.8.1-1
- new upstream version and new naming
- fix to solve the python/dbus problem
* Fri Jun 22 2007 Thorsten Scherf <tscherf(a)redhat.com> 0.9.6-2
- new upstream version
* Fri Jun 22 2007 Thorsten Scherf <tscherf(a)redhat.com> 0.9.6-1
- new upstream version
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/miro/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 12 Feb 2012 19:57:43 -0000 1.1
+++ .cvsignore 13 Feb 2012 10:56:03 -0000 1.2
@@ -0,0 +1 @@
+miro-4.0.6.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/miro/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 12 Feb 2012 19:57:43 -0000 1.1
+++ sources 13 Feb 2012 10:56:03 -0000 1.2
@@ -0,0 +1 @@
+5a574ebfc27f46fa3be36f1513d6dc87 miro-4.0.6.tar.gz
12 years, 9 months
- 1
- 0
rpms/miro/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/miro/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsoG6026/rpms/miro/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module miro
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: miro
# $Id: Makefile,v 1.1 2012/02/12 19:57:43 kwizart Exp $
NAME := miro
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
12 years, 9 months
- 1
- 0
rpms/miro Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/miro
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsoG6026/rpms/miro
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module miro
--- NEW FILE Makefile ---
# Top level Makefile for module miro
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
12 years, 9 months
- 1
- 0
rpms/miro/devel - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/miro/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsoG6026/rpms/miro/devel
Log Message:
Directory /cvs/free/rpms/miro/devel added to the repository
12 years, 9 months
- 1
- 0
rpms/miro - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/miro
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsoG6026/rpms/miro
Log Message:
Directory /cvs/free/rpms/miro added to the repository
12 years, 9 months
- 1
- 0
rpms/pgplot/devel README.fedora, NONE, 1.1 pgplot.pc, 1.1, 1.2 pgplot.spec, 1.7, 1.8
by Sergio Pascual
Author: sergiopr
Update of /cvs/nonfree/rpms/pgplot/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1579
Modified Files:
pgplot.pc pgplot.spec
Added Files:
README.fedora
Log Message:
* Sun Feb 12 2012 Sergio Pascual <sergio.pasra(a)gmail.com> - 5.2.2-33
- Disabled png support
- Added README.fedora listing the enabled drivers
--- NEW FILE README.fedora ---
The following drivers are enabled:
PS, TCL/TK, X, GIF and PPM
PNG is disabled due to the incompatibility between the supported version (1.2.x)
and the library in Fedora (1.5.x). Patches are welcomed to overcome this problem
Index: pgplot.pc
===================================================================
RCS file: /cvs/nonfree/rpms/pgplot/devel/pgplot.pc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pgplot.pc 13 Nov 2008 10:30:54 -0000 1.1
+++ pgplot.pc 12 Feb 2012 14:43:46 -0000 1.2
@@ -6,5 +6,5 @@
Name: pgplot
Description: Graphic library for making simple scientific graphs
Version: 5.2.2
-Libs: -L${libdir} -lpgplot -lgfortran -lm -lX11 -lpng
+Libs: -L${libdir} -lpgplot -lgfortran -lm -lX11
#Cflags: -I${includedir}
Index: pgplot.spec
===================================================================
RCS file: /cvs/nonfree/rpms/pgplot/devel/pgplot.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pgplot.spec 8 Feb 2012 23:47:01 -0000 1.7
+++ pgplot.spec 12 Feb 2012 14:43:46 -0000 1.8
@@ -3,7 +3,7 @@
Name: pgplot
%define lvmajor 5
Version: 5.2.2
-Release: 32%{?dist}
+Release: 33%{?dist}
Summary: Graphic library for making simple scientific graphs
Group: Development/Libraries
@@ -15,6 +15,7 @@
Source2: cpgplot.pc
Source3: tk-pgplot.pc
Source4: pgplot-pkgIndex.tcl
+Source5: README.fedora
# Make pgplot find files in standard locations such as
# /usr/libexec/pgplot and /usr/share/pgplot
@@ -23,15 +24,13 @@
Patch1: pgplot5.2-makefile.patch
# make the compiler script accept FFLAGS and FC
Patch2: pgplot5.2-g77_gcc_conf.patch
-# Needed by the png driver
+# Needed by the (disabled) png driver
Patch3: pgplot5.2-pngdriver.patch
# Needed to have a loadable tcl package
Patch4: pgplot5.2-tclpackage.patch
-Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
-BuildRequires: libpng-devel tk-devel libX11-devel gcc-gfortran
-BuildRequires: perl glibc-common
+BuildRequires: tk-devel libX11-devel gcc-gfortran
+BuildRequires: perl
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
@@ -48,7 +47,7 @@
Summary: Libraries, includes, etc. used to develop an application with %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: libX11-devel libpng-devel pkgconfig
+Requires: libX11-devel pkgconfig
%description devel
These are the header files and static libraries needed to develop a %{name}
@@ -90,18 +89,19 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
+# PNG disabled
+#%patch3 -p1
%patch4 -p1
-%{__cp} %{SOURCE1} .
-%{__cp} %{SOURCE2} .
-%{__cp} %{SOURCE3} .
-%{__cp} %{SOURCE4} pkgIndex.tcl
+cp %{SOURCE1} .
+cp %{SOURCE2} .
+cp %{SOURCE3} .
+cp %{SOURCE4} pkgIndex.tcl
+cp %{SOURCE5} .
# Enabling the following drivers:
-# PNG, PS, TCL/TK and X
+# PS, TCL/TK and X
%{__sed} \
--e 's/! PNDRIV/ PNDRIV/g' \
-e 's/! PSDRIV/ PSDRIV/g' \
-e 's/! XWDRIV/ XWDRIV/g' \
-e 's/! TKDRIV/ TKDRIV/g' -i drivers.list
@@ -127,7 +127,7 @@
./makemake . linux g77_gcc
# Parallel make not supported
%{__make} FC="f95" CC="%{__cc}" CFLAGS="%{optflags}" FFLAGS="%{optflags}" \
- NLIBS="-lgfortran -lm -lX11 -lpng"
+ NLIBS="-lgfortran -lm -lX11 -lz"
# Creating dynamic library for C
%{__make} %{?_smp_mflags} \
@@ -135,7 +135,7 @@
%{__ar} x libcpgplot.a
%{__cc} %{optflags} -shared -o libc%{name}.so.%{version} \
-Wl,-soname,libc%{name}.so.%{lvmajor} \
- cpg*.o -L . -l%{name} -lgfortran -lm -lX11 -lpng
+ cpg*.o -L . -l%{name} -lgfortran -lm -lX11 -lz
# Creating dynamic library for TK
%{__ar} x libtkpgplot.a
@@ -175,9 +175,6 @@
%{__install} -p -m 644 *.pc %{buildroot}/%{_libdir}/pkgconfig
%{__install} -p -m 644 pkgIndex.tcl %{buildroot}/%{tcl_sitearch}/%{name}
-%clean
-%{__rm} -rf %{buildroot}
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@ -187,15 +184,13 @@
%postun -n tcl-%{name} -p /sbin/ldconfig
%files
-%defattr(-,root,root,-)
-%doc copyright.notice ChangeLog
+%doc copyright.notice ChangeLog README.fedora
%{_libdir}/lib%{name}.so.*
%{_libdir}/libc%{name}.so.*
%{_datadir}/%{name}
%{_libexecdir}/%{name}
%files devel
-%defattr (-,root,root,-)
%doc aaaread.me pgplot-routines.tex pgplot.html copyright.notice
%{_libdir}/lib%{name}.so
%{_libdir}/libc%{name}.so
@@ -204,24 +199,25 @@
%{_libdir}/pkgconfig/cpgplot.pc
%files -n tcl-%{name}
-%defattr (-,root,root,-)
%doc copyright.notice
%{_libdir}/libtk%{name}.so.*
%{tcl_sitearch}/%{name}
%files -n tcl-%{name}-devel
-%defattr (-,root,root,-)
%doc copyright.notice
%{_libdir}/libtk%{name}.so
%{_includedir}/tkpgplot.h
%{_libdir}/pkgconfig/tk-pgplot.pc
%files demos
-%defattr (-,root,root,-)
%doc copyright.notice
%{_bindir}/*
%changelog
+* Sun Feb 12 2012 Sergio Pascual <sergio.pasra(a)gmail.com> - 5.2.2-33
+- Disabled png support
+- Added README.fedora listing the enabled drivers
+
* Thu Feb 09 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.2.2-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
12 years, 9 months
- 1
- 0
rpms/vbam/devel vbam.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Jeremy Newton
Author: jem256
Update of /cvs/free/rpms/vbam/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25686/devel
Modified Files:
.cvsignore sources
Added Files:
vbam.spec
Log Message:
Initial vbam Package
--- NEW FILE vbam.spec ---
Name: vbam
#Pre-release version 1.8.0.1054 is a snapshot of svn 1054
Version: 1.8.0.1054
Release: 3%{?dist}
#Will not create a binary vbam package, only vbam-gtk and vbam-sdl subpackages
Summary: High compatibility Gameboy Advance Emulator combining VBA developments
License: GPLv2
Url: http://www.vba-m.com
Source: https://downloads.sourceforge.net/project/%{name}/VBA-M%20svn%20r1054/%{n...
BuildRequires: SDL-devel
BuildRequires: ImageMagick
BuildRequires: cmake
BuildRequires: zlib-devel
BuildRequires: libXv-devel
BuildRequires: nasm
BuildRequires: libpng-devel
BuildRequires: mesa-libGL-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: gtkglext-devel
BuildRequires: gtkglextmm-devel
BuildRequires: gtkmm24-devel
BuildRequires: cairo-devel
BuildRequires: ffmpeg-devel
BuildRequires: wxGTK-devel
BuildRequires: SFML-devel
BuildRequires: openal-soft-devel
%package gtk
Summary: GTK GUI for VBA-M, a high compatibility Gameboy Advance Emulator
Requires: vbam-common
Requires: vbam-gui-common
%package wx
Summary: WX GUI for VBA-M, a high compatibility Gameboy Advance Emulator
Requires: vbam-common
Requires: vbam-gui-common
%package sdl
Summary: SDL version (no GUI) for VBA-M, a high compatibility Gameboy Advance Emulator
Requires: vbam-common
%package common
Summary: Common configuration for VBA-M, a high compatibility Gameboy Advance Emulator
BuildArch: noarch
%package gui-common
Summary: Common icons files for VBA-M, a high compatibility Gameboy Advance Emulator
BuildArch: noarch
%description
#Using info from here: http://vba-m.com/about.html and debian files
VisualBoyAdvance-M is a Nintendo Game Boy Emulator with high compatibility with
commercial games. It emulates the Nintendo Game Boy Advance hand held console,
in addition to the original Game Boy hand held systems and its Super and Color
variants. VBA-M is a continued development of the now inactive VisualBoy
Advance project, with many improvements from various developments of VBA.
%description gtk
This package provides the GTK GUI version of VisualBoyAdvance-M.
VisualBoyAdvance-M is a Nintendo Game Boy Emulator with high compatibility with
commercial games. It emulates the Nintendo Game Boy Advance hand held console,
in addition to the original Game Boy hand held systems and its Super and Color
variants. VBA-M is a continued development of the now inactive VisualBoy
Advance project, with many improvements from various developments of VBA.
%description wx
This package provides the experimental WX GUI version of VisualBoyAdvance-M.
VisualBoyAdvance-M is a Nintendo Game Boy Emulator with high compatibility with
commercial games. It emulates the Nintendo Game Boy Advance hand held console,
in addition to the original Game Boy hand held systems and its Super and Color
variants. VBA-M is a continued development of the now inactive VisualBoy
Advance project, with many improvements from various developments of VBA.
%description sdl
This package provides the non GUI SDL version of VisualBoyAdvance-M.
VisualBoyAdvance-M is a Nintendo Game Boy Emulator with high compatibility with
commercial games. It emulates the Nintendo Game Boy Advance hand held console,
in addition to the original Game Boy hand held systems and its Super and Color
variants. VBA-M is a continued development of the now inactive VisualBoy
Advance project, with many improvements from various developments of VBA.
%description common
This package provides common configurations for both GUI and SDL versions.
VisualBoyAdvance-M is a Nintendo Game Boy Emulator with high compatibility with
commercial games. It emulates the Nintendo Game Boy Advance hand held console,
in addition to the original Game Boy hand held systems and its Super and Color
variants. VBA-M is a continued development of the now inactive VisualBoy
Advance project, with many improvements from various developments of VBA.
%description gui-common
This package provides common icon files for either GUI versions.
VisualBoyAdvance-M is a Nintendo Game Boy Emulator with high compatibility with
commercial games. It emulates the Nintendo Game Boy Advance hand held console,
in addition to the original Game Boy hand held systems and its Super and Color
variants. VBA-M is a continued development of the now inactive VisualBoy
Advance project, with many improvements from various developments of VBA.
%prep
%setup -q
sed -i '/CMAKE_C.*_FLAGS/d' CMakeLists.txt
#To avoid confusion of the two .desktops:
sed -i '/Name=VBA-M/cName=VBA-M (WX)' src/wx/wx%{name}.desktop
%build
#Required for ffmpeg header to build
export CPATH='/usr/include/ffmpeg'
%cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DVERSION=%{version} -DCMAKE_SKIP_RPATH=ON -DENABLE_LINK=ON
make %{?_smp_mflags}
%install
make install DESTDIR=%{buildroot}
desktop-file-install \
--remove-category Application \
--remove-key=Encoding \
--dir %{buildroot}%{_datadir}/applications \
src/gtk/g%{name}.desktop
desktop-file-install \
--remove-category Application \
--remove-key=Encoding \
--dir %{buildroot}%{_datadir}/applications \
src/wx/wx%{name}.desktop
install -p -D -m 0644 debian/%{name}.1 %{buildroot}/%{_mandir}/man1/%{name}.1
%find_lang g%{name}
%find_lang wx%{name}
%files gtk -f g%{name}.lang
#excluded doc/ReadMe.MFC.txt, as it's not utf8 and seems very windows oriented
%doc doc/ips.htm
%{_datadir}/%{name}
%{_bindir}/g%{name}
%{_datadir}/applications/g%{name}.desktop
%files wx -f wx%{name}.lang
#excluded doc/ReadMe.MFC.txt, as it's not utf8 and seems very windows oriented
%doc doc/ips.htm
%{_bindir}/wx%{name}
%{_datadir}/applications/wx%{name}.desktop
%files sdl
%doc doc/ips.htm doc/ReadMe.SDL.txt
%{_mandir}/man1/%{name}.1*
%{_bindir}/%{name}
%files common
%doc doc/gpl.txt doc/License.txt
%config(noreplace) /etc/%{name}.cfg
%files gui-common
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%post gtk
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun gtk
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans gtk
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%post wx
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun wx
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans wx
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
* Thu Jan 29 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1054-3
- Added missing Build Requirement: openal-soft-devel
- Removed redundant license files
* Thu Jan 27 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1054-2
- Added DCMAKE_SKIP_RPATH=ON to cmake (fixes rpath error)
- Added more relevant package summaries
- Fixed up the descriptions a bit
- Enabled Linking Support
- Various tweaks
* Thu Jan 26 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1054-1
- Updated new upstream version
- Added new WX subpackage for new GUI
- Adding WX requires gui common subpackage to avoid conflicts
- Added DVERSION cmake tag for aesthetic reasons
* Sun Jan 22 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1001-4
- Added vbam-common package to avoid conflicts with common files
- Added ImageMagick build dep, as cmake checks for it
- Building now uses cmake macro
- Turned off building shared libs
- Removed unnecessary lines
- Fixed debuginfo-without-sources issue
* Sun Jan 22 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1001-3
- Fixed SPM summary
- Cleaned up SPEC for easier reading
* Sun Jan 8 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1001-2
- Fixed up spec file
- Split into two packages: sdl, gtk
* Sun Dec 18 2011 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1001-1
- Initial package SPEC created
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vbam/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 11 Feb 2012 15:38:11 -0000 1.1
+++ .cvsignore 11 Feb 2012 23:32:38 -0000 1.2
@@ -0,0 +1 @@
+vbam-1.8.0.1054-src.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vbam/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 11 Feb 2012 15:38:11 -0000 1.1
+++ sources 11 Feb 2012 23:32:38 -0000 1.2
@@ -0,0 +1 @@
+f9a67e65dd6df4d5190321f6fc758c24 vbam-1.8.0.1054-src.tar.gz
12 years, 9 months
- 1
- 0