debian/0000775000000000000000000000000012243527166007200 5ustar debian/README.Debian0000664000000000000000000000226211700424022011223 0ustar Miro for Debian --------------- * The default Miro movies directory in Debian is ~/.miro/Movies instead of ~/Videos/Miro. * Also, the non-video directory in Debian is ~/.miro/Nonvideo instead of ~/Desktop. * In order to enable the 'Miro Sharing' feature (stream and download files to and from other Miros on the local network and to the Miro iPad app) you must install 'libavahi-compat-libdnssd1' (and restart Miro), if it's not already installed: $ aptitude install libavahi-compat-libdnssd1 * You can install 'python-psyco' which will likely speed up Miro a bit. * For even further audio/video support you can also install the following: $ aptitude install gstreamer0.10-plugins-ugly * If you experience Miro crashes/segfaults, please install 'gdb' and then run 'miro --debug' (which runs Miro in gdb) and try to reproduce the bug. If that worked, please report the bug upstream and attach the gdb output (type e.g. "bt" on the gdb prompt after the crash). If needed, please also install additional -dbg packages, e.g. python2.6-dbg, python-gtk2-dbg, or libwebkit-1.0-2-dbg. -- Uwe Hermann , Tue, 07 Jun 2011 21:26:41 +0200 debian/source/0000775000000000000000000000000011700424357010473 5ustar debian/source/format0000664000000000000000000000001411700424022011666 0ustar 3.0 (quilt) debian/copyright0000664000000000000000000001102511700424176011124 0ustar This work was packaged for Debian by: Uwe Hermann on Mon, 12 Jun 2006 13:34:47 +0200 It was downloaded from: http://www.getmiro.com Upstream Authors: Nick Nassar Geoff Schmidt Luc Heinrich Ben Dean-Kawamura Nick Reville Matt Bret Chris Lahey Paul Swartz Will Guaraldi Chris Webber ------------------------------------------------------------------------------- Files: * Copyright: © 2005-2010 Participatory Culture Foundation License: GPL-2+ | other In addition, as a special exception, the copyright holders give permission to link the code of portions of this program with the OpenSSL library. You must obey the GNU General Public License in all respects for all of the code used other than OpenSSL. If you modify file(s) with this exception, you may extend this exception to your version of the file(s), but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. If you delete this exception statement from all source files in the program, then also delete it here. On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. ------------------------------------------------------------------------------- Files: portable/clock.py Copyright: © 2002 John Hoffman © 2006-2010 Participatory Culture Foundation License: Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. The Software is provided "AS IS", without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the Software or the use or other dealings in the Software. ------------------------------------------------------------------------------- Files: portable/feedparser.py Copyright: © 2002-2006 Mark Pilgrim License: other Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------------------------------------------------------------------------------- Files: notes/vlc-packages.mak Copyright: © 2003, 2004 VideoLAN License: GPL-2+ ------------------------------------------------------------------------------ Files: debian/* Copyright: © 2006 - 2012 Uwe Hermann License: PD The packaging done by Uwe Hermann is hereby released as public domain. debian/miro.install0000664000000000000000000000015511700424022011517 0ustar usr/bin/ usr/lib/ usr/share/applications/ usr/share/man/ usr/share/mime/ usr/share/pixmaps/ usr/share/icons/ debian/changelog0000664000000000000000000010633312243527166011060 0ustar miro (4.0.4-1.1ubuntu1) trusty; urgency=low * Drop gstreamer0.10-ffmpeg to recommends. -- Dmitrijs Ledkovs Fri, 22 Nov 2013 01:07:51 +0000 miro (4.0.4-1.1build1) trusty; urgency=low * No change rebuild against libav 9. -- Dmitrijs Ledkovs Sun, 10 Nov 2013 00:07:00 +0000 miro (4.0.4-1.1) unstable; urgency=low * Non-maintainer upload. * debian/patches: - 130_libav9.patch: Fix building with libav 9. (Closes: #720810) - 140_use_avconv.patch: Use avconv instead of ffmpeg which is no longer built by libav. * debian/control: Change Suggests on ffmpeg to libav-tools. -- Sebastian Ramacher Tue, 24 Sep 2013 03:51:11 +0200 miro (4.0.4-1) unstable; urgency=low * New upstream release. * debian/patches/110_libav_api_changes.patch: Drop, merged upstream. * debian/patches/120_miro.desktop.patch: Add file. The "Name" entry should not repeat the "GenericName" description. Add DE translation for the "GenericName" field (Closes: #640986). Thanks to Ronny Standtke for the patch. -- Uwe Hermann Mon, 02 Jan 2012 23:09:28 +0100 miro (4.0.3-2) unstable; urgency=low * Add debian/patches/110_libav_api_changes.patch. This updates miro to work with the new ffmpeg/libav API (Closes: #638550). -- Uwe Hermann Wed, 07 Sep 2011 00:38:16 +0200 miro (4.0.3-1) unstable; urgency=low * New upstream release. + Fixes YouTube download issues. + Fixed upstream: Scary exception: ImportError: No module named xinerenderer (Closes: #577397). + Fixed upstream: problem with french local (Closes: #632706). + No longer occurs: segfaults on startup (Closes: #630119). * Change build-dep on libwebkit-dev to libwebkitgtk-dev (Closes: #635421). -- Uwe Hermann Tue, 16 Aug 2011 23:04:11 +0200 miro (4.0.2-1) unstable; urgency=low * New upstream release. * debian/patches: + 110_miro_segmenter.patch: Drop, fixed upstream. + 120_disable_ipv6.patch: Drop, fixed upstream. IPv6 usage is disabled for local connections per default, but can be enabled (gconf-editor). + 50_miro_debug_fix.patch: Update. * debian/rules: Update and simplify the file. -- Uwe Hermann Sun, 03 Jul 2011 20:30:52 +0200 miro (4.0.1.1-1.1) unstable; urgency=low [ Stefano Rivera ] * Non-maintainer upload. * Build for Python >= 2.6 (closes: #629087): - Drop deprecated pycompat. - Replace pyversions with XS-Python-Version >= 2.6. - Build-depend on python-all-dev instead of python2.6-dev. - Un-version shebangs. -- Julien Cristau Wed, 29 Jun 2011 16:45:37 +0200 miro (4.0.1.1-1) unstable; urgency=low * New upstream release (Closes: #627800). + Fixes "miro does not see/recognize .webm files" (Closes: #611594). + I cannot reproduce "increases sound volume on play (and doesn't reset it)" in this release (Closes: #581436). Please re-open the bug in case it still happens. * debian/patches/*: Update outdated patches. + 110_miro_segmenter.patch: Add, fixes upstream bug. + 120_disable_ipv6.patch: Add, disables IPv6 usage for local connections for now, there seem to be issues (miro hangs upon startup). * debian/rules: + Add Build-Depends on libavformat-dev (miro doesn't build otherwise). + Add Depends entry on python-mutagen (for audio metadata editing). + Add Suggests entry on ffmpeg, ffmpeg2theora (for video conversion). + Add Suggests entry on libavahi-compat-libdnssd1 (for "Miro Sharing"). + Update 'clean' rules. + Make some upstream files non-executable to silence lintian. * debian/README.Debian: Add some hints for the "Miro Sharing" feature. * debian/*.docs: Drop ADOPTERS file, merged into CREDITS upstream. -- Uwe Hermann Thu, 09 Jun 2011 21:35:59 +0200 miro (3.5.1-2) unstable; urgency=low * Upload to unstable. * Fix small version issue to simplify backports (Closes: #606856). Thanks Daniel Baumann . * Standards-Version: 3.9.2 (no changes required). -- Uwe Hermann Tue, 12 Apr 2011 00:11:36 +0200 miro (3.5.1-1) experimental; urgency=low * New upstream release (Closes: #601903). + Fixes "mousewheel does not change loudness" (Closes: #583690). + Add new dependency: python-pycurl. + Add new build-dependency: libwebkit-dev. * Close bugs that cannot be reproduced in this release. Please feel free to re-open if there are still issues. + "Segfault when moving volume slider during playback" (Closes: #579860). + "Fails to generate thumbnails" (Closes: #580962). * Drop no longer needed patches, update others: + 20_no_autoupdate.patch: Drop, no longer needed. + 101_player_undefined_elapsed_time.patch: Drop, fixed upstream. + 100_catch_keyerror_in_update_items.patch: Update. + 10_movies_dir.patch: Update. + 50_miro_debug_fix.patch: Update. -- Uwe Hermann Sat, 11 Dec 2010 17:45:51 +0100 miro (3.0.3-1) unstable; urgency=low * New upstream release (Closes: #588299). + Upstream now uses webkit instead of xulrunner (Closes: 499652). + Fixes broken Youtube downloads. * debian/copyright: Various updates, drop obsolete entries. * README.Debian: Mention libwebkit-1.0-2-dbg as useful for debugging. * Standards-Version: 3.9.1 (no changes required). * debian/patches/: + 10_movies_dir.patch: Update. + 50_miro_debug_fix.patch: Update. + 102_xulrunner_bug_workaround.patch: Drop, obsolete. + Make all patches work with -p1 and add descriptions for all of them. * Use new '3.0 (quilt)' source format. * No longer use deprecated cdbs 'simple-patchsys.mk'. * Drop no longer needed build-dependencies: + python-libtorrent (>= 0.14.10-2) + libtorrent-rasterbar-dev (>= 0.14.10-2) + python-gnome2-extras-dev (>= 2.19.1) + xulrunner-dev (>= 1.9.1) + libxv-dev + libssl-dev + libffi-dev * Drop no longer needed dependencies: + python-gtkmozembed (>= 2.19.1) | python-gnome2-extras (>= 2.19.1) + xulrunner-1.9.1 * Drop democracyplayer, democracyplayer-data transitional packages. * Use versioned python-dbus (>= 0.83.1) dependency (Closes: #587963). * Use versioned python-gst0.10 (>= 0.10.18-2) dependency (Closes: #580609). -- Uwe Hermann Sat, 31 Jul 2010 20:00:43 +0200 miro (3.0.1-2) unstable; urgency=low * Make xulrunner-dev build-dependency versioned (>= 1.9.1), as we use xulrunner-1.9.1 as (runtime) dependency. * README.Debian: Change left-over Python 2.5 text to 2.6 (Closes: #579904). * Fix FTBFS: s/python2.6/python2.6-dev/ (Closes: #580008). -- Uwe Hermann Mon, 03 May 2010 19:29:22 +0200 miro (3.0.1-1) unstable; urgency=low * New upstream release. * Switch to Python 2.6 (Closes: #574753). + Build-depend on python-libtorrent (>= 0.14.10-2) as this is the first version of the package built with Python 2.6 support. * Include some more bugfix patches from Ubuntu: + 100_catch_keyerror_in_update_items.patch + 101_player_undefined_elapsed_time.patch + 102_xulrunner_bug_workaround.patch -- Uwe Hermann Sat, 01 May 2010 14:07:05 +0200 miro (3.0-1) unstable; urgency=low * New upstream release (Closes: #575463). + The xine backend was removed upstream, we use gstreamer only now. + Drop (build-)dependency on all Boost packages, no longer used upstream. + debian/patches/20_no_autoupdate.patch: Update. + debian/patches/30_disable_xine_hack.patch: Drop, obsolete. + debian/patches/40_boost_python.patch: Drop, obsolete. + debian/patches/80_xine_default_renderer.patch: Drop, obsolete. * Closing non-reproducible bugs with this release. Please reopen if needed. + "No sound when playing videos" (Closes: #527261). + "Two internal errors on startup" (Closes: #557347). + "Miro "internal error" and odd behavior" (Closes: #574822). + "Miro crashes after starts playing a video" (Closes: #522102). * Standards-Version: 3.8.4 (no changes required). * debian/miro.docs: Add ADOPTERS file. * debian/README.Debian: Drop xine related sections. * debian/rules: Simplified clean target. * debian/copyright: Updates (Boost and libtorrent stuff is gone). -- Uwe Hermann Sun, 28 Mar 2010 01:02:12 +0200 miro (2.5.4-1) unstable; urgency=low * New upstream release. * debian/control: Change xulrunner-1.9 to xulrunner-1.9.1 (Closes: #557726). -- Uwe Hermann Sun, 13 Dec 2009 17:59:01 +0100 miro (2.5.3-1) unstable; urgency=low * New upstream release. * Standards-Version: 3.8.3 (no changes required). * Depend on python-gconf instead of python-gnome2. The latter will be deprecated and miro only uses the gconf part anyway (Closes: #541576). * Fix "FTBFS: ld: cannot find -lboost_python-mt" (Closes: #551220). * Update debian/watch to also catch new upstream tarball names. -- Uwe Hermann Sat, 24 Oct 2009 02:30:13 +0200 miro (2.5.2-1) unstable; urgency=low * New upstream release. -- Uwe Hermann Sat, 01 Aug 2009 15:23:08 +0200 miro (2.5.1-1) unstable; urgency=low * New upstream release. + debian/patches/90_handle_charref.patch: Drop, merged upstream. + debian/patches/95_esc.patch: Drop, merged upstream. + debian/patches/30_disable_xine_hack.patch: Update. + debian/patches/80_xine_default_renderer.patch: Update. * Add usr/share/icons/ to miro.install so the new icons get installed. -- Uwe Hermann Fri, 24 Jul 2009 15:44:13 +0200 miro (2.0.5-1) unstable; urgency=low * New upstream release. + This should fix Youtube download errors in miro. + debian/patches/40_mozsetup_fix.patch: Drop, no longer required. + debian/patches/60_boost_mt.patch: Drop, no longer required. + debian/patches/70_gst_extractor_fix.patch: Drop, no longer required. + debian/patches/85_pysqlite.patch: Drop, no longer required. * Standards-Version: 3.8.2 (no changes required). * debian/rules: Drop dh_desktop call (lintian). -- Uwe Hermann Fri, 26 Jun 2009 21:29:54 +0200 miro (2.0.4-3) unstable; urgency=low * debian/patches/85_pysqlite.patch: Add (Closes: #528212). This fixes the "Miro was unable to save its database: Disk Full" problems. * debian/rules: Move some Makefile rule around again so all unneeded test* files get deleted. -- Uwe Hermann Mon, 22 Jun 2009 18:43:54 +0200 miro (2.0.4-2) unstable; urgency=low * Add upstream patch debian/patches/40_mozsetup_fix.patch in order to fix the "Miro Guide is not displayed" bug (Closes: #524712). * This also fixes a crash when trying to access any item in the "Sites" section (Closes: #523620, #533355). * debian/miro.lintian-overrides: Adapt, feedparser.py moved location. -- Uwe Hermann Thu, 18 Jun 2009 21:38:04 +0200 miro (2.0.4-1) unstable; urgency=low * New upstream release. + Fixes "English characters missed in zh_TW.UTF8 locale" (Closes: #523428). * Add python-libtorrent (>= 0.14.2) to Build-Depends (not only Depends). * debian/patches/70_gst_extractor_fix.patch: Add file, a backported upstream patch (changeset 9373) to fix an issue where the gstreamer extractor was not launched correctly to generate thumbnails. Thanks to Will Kahn-Greene for creating and pointing out the patch. * Build-depend on unversioned Boost packages again (Closes: #531115). * Add a workaround for cdbs so the package builds successfully. * debian/patches/90_handle_charref.patch: Add (Closes: #526641). -- Uwe Hermann Sun, 14 Jun 2009 13:45:57 +0200 miro (2.0.3-1) unstable; urgency=low * New upstream release. * Standards-Version: 3.8.1 (no changes required). -- Uwe Hermann Mon, 16 Mar 2009 15:29:35 +0100 miro (2.0.2-1) unstable; urgency=low * New upstream release. * debian/patches: + 40_feedparser.patch: Drop, merged upstream. + 50_miro_debug_fix.patch: Update. + 60_xine_driver.patch: Drop, fixed upstream in different form. + 90_manpage_fixes.patch: Drop, merged upstream. + debian/miro.xpm: Drop, merged upstream. * Build-depend/depend on libtorrent-rasterbar-dev/python-libtorrent (the Python bindings of libtorrent-rasterbar) instead of using the version shipped with Miro. * Switch to the new boost 1.37 packages as build-dependencies (needed for the Debian package of libtorrent-rasterbar anyway). * debian/60_boost_mt.patch: Add file, boost 1.37 only provides -mt variant. * Use common-install-prehook-arch target to remove the unneeded 'test' directory from the 'miro' package (Closes: #516308). * Use LDFLAGS += "-Wl,--as-needed" to eliminate some unneeded dependencies. -- Uwe Hermann Mon, 09 Mar 2009 12:46:19 +0100 miro (2.0.1-1) unstable; urgency=low * New upstream release. * debian/patches: + 70_python_exec_fix.patch: Drop, merged upstream. * Explicit dependency on python-pyrex (>= 0.9.6.4), as per upstream. * Depends 'python-gtkmozembed (>= 2.19.1) | python-gnome2-extras (>= 2.19.1)' to make migration of the package to Ubuntu easier (Closes: #514934). * Closing random resolved bugs (Closes: #514956, #514797). -- Uwe Hermann Sat, 14 Feb 2009 18:01:53 +0100 miro (2.0-1) unstable; urgency=low * New upstream release. + Fixed: Java browser plugin problems upon upgrade (Closes: #461990). + Now deactivates (GNOME) screensaver during playback (Closes: #441411). + Youtube downloads work fine again (Closes: #506723). + The Miro icon cache is a lot smaller now (Closes: #493943). * debian/patches: + 10_movies_dir.patch: Updated. + 20_no_autoupdate.patch: Updated. + 30_disable_xine_hack.patch: Updated. + 50_xine_extractor_path.patch: Drop, merged upstream. + 70_rdfa_silence_lintian.patch: Drop, no longer needed. + 80_gcc-4.3_headers.patch: Drop, merged upstream. + 90_disable_iheartmiro_nag.patch: Drop, obsolete. + 70_python_exec_fix.patch: Add file. + 80_xine_default_renderer.patch: Add file. Keep xine as default renderer. + 90_manpage_fixes.patch: Add file. + 95_esc.patch: Add file. ESC in non-fullscreen mode stops video playback. * Closing unreproducible bugs. Please reopen if you can reproduce the problem with the latest version. + Crash on startup (Closes: #502337). + sqlitedb appears to have been corrupted (Closes: #497504). * debian/control: + Don't use duplicate package descriptions (lintian). + Add ${misc:Depends} to all binary packages (lintian). + Drop no longer needed dependencies on imagemagick and chrpath. + Make 'python-psyco' a Recommends instead of Suggests as it allows for potential application speed-ups. + Suggests: python-notify (optional). + Add Conflicts with miro-data (<< 1.2.1) (see Ubuntu LP #296175), as the miro.desktop file moved from miro-data to the miro package there. + Turn all gstreamer-related dependencies into Suggests for now, in order to make a smaller Miro install possible (e.g. on netbooks, where disk space is often a scarce resource). Xine is still the default renderer in the Debian package, so the xine libs are a requirement. If you want to use gstreamer instead, you have to install the Suggests packages. There's documentation in README.Debian for that. + While we're at it, add gstreamer0.10-plugins-bad and also gstreamer0.10-plugins-ugly as Suggests. * debian/rules: + Invoke dh_desktop as we install a *.dektop file (lintian). + Clear DEB_PYTHON_CLEAN_ARGS, as Miro's setup.py doesn't know about the default argument '-a', which cdbs tries to use upon 'clean'. + Update list of files to remove in the 'clean' target. + Install README.gtk-x11 and README.cli documentation files. * debian/README.Debian: + Add hints on how to use gdb with 'miro --debug' for debugging. + Add HOWTO for installing gstreamer stuff if you want to switch the renderer from xine to gstreamer. + Drop obsolete items. -- Uwe Hermann Wed, 11 Feb 2009 01:32:44 +0100 miro (1.2.8-2) unstable; urgency=low * Add build dependencies on a base set of gstreamer plugins, so that users who want to use gstreamer instead of xine can safely do so: gstreamer0.10-plugins-base, gstreamer0.10-plugins-good, gstreamer0.10-x, gstreamer0.10-ffmpeg. * Disable the "xine hack" in Miro. This has been identified to fix a reproducible segfault after a video ends (Closes: #512719). Please report if disabling the "xine hack" causes any problems. An alternative fix seems to be to switch to gstreamer as backend in Miro's options dialog (and restart Miro). * Closing unreproducible bugs. Please reopen if you can reproduce the problem with the latest version. + miro: freezes after startup (Closes: #498682). -- Uwe Hermann Wed, 04 Feb 2009 02:38:52 +0100 miro (1.2.8-1) unstable; urgency=low * New upstream release (Closes: #496874). + Youtube video downloads should work again, see upstream bug http://bugzilla.pculture.org/show_bug.cgi?id=10656. + Closing unreproducible (with the latest release) bugs: + MIRO NOT WORKING (Closes: #502194). Both the feed mentioned and video search is working fine. + NBC News podcast corrupted if download is resumed (Closes: #496233). Works fine with both, Miro 1.2.8, and mplayer. Must have been some oddness with the feed itself. + miro (version 1.2.3-2) segmentation fault (Closes: #489891). No longer occuring according to the BTS, never reproducible by me. + miro: If the XVideo extension is missing, video has wrong colors and extremly low framerate (Closes: #459069, #473310). This problem goes away if you use 'miro --xine-driver=xhsm' and will not be relevant soon anymore, as Miro switches to gstreamer upstream with the next major release. Added a note to README.Debian. + [miro] Crash on startup (Closes: #500061). Unreproducible by me, reporter says the problem was not Miro-related. * debian/miro.lintian-overrides: Added file. Silence lintian warning about an embedded version of 'feedparser'. We cannot use the Debian package of 'feedparser' as Miro uses a highly modified version of it. * debian/rules: Remove more files in the 'clean' target. -- Uwe Hermann Fri, 31 Oct 2008 13:02:38 +0100 miro (1.2.3-2) unstable; urgency=low * Acknowledge NMU, thanks Mike Hommey (Closes: #480808). * Standards-Version: 3.8.0 (no changes required). * Depend on python-gtkmozembed instead of python-gnome2-extras as we only use the gtkmozembed module (Closes: #485295). * Close bugs which are no longer relevant: + Miro does not really depends on libxine 1.1.12 (Closes: #480867). + Miro doesn't work since recent upgrade of python (Closes: #481574). This has been likely fixed in Python >= 2.5.2-6, so bump dependencies. * Add explicit build-dependency on pkg-config. -- Uwe Hermann Mon, 30 Jun 2008 12:02:56 +0200 miro (1.2.3-1.1) unstable; urgency=low * Non-maintainer upload. * debian/control: + Build-depend on xulrunner-dev instead of libxul-dev, and newer releases of python-gnome2-extras-dev that use xulrunner-1.9. + Depend on xulrunner-1.9 instead of xulrunner, and newer releases of python-gnome2-extras. (Closes: #480808) -- Mike Hommey Mon, 09 Jun 2008 19:32:57 +0200 miro (1.2.3-1) unstable; urgency=low * New upstream release. * debian/rules: + Simplify the file a bit, drop obsolete stuff. + Update 'clean' rule to drop useless stuff (to make the debdiff smaller). * debian/README.Debian: + Add note about the iHeartMiro Firefox plugin. + Document how to use 'esddsp' with Miro. * debian/copyright: Update. + Drop platform/gtk-x11/coverage.py section, file has been removed. * debian/control: + Drop 'Recommends: libxine1-ffmpeg', we depend on it via libxine1-plugins. + Move from 'optional' to 'extra' as we depend on libxine1-plugins which is also 'extra'. + Make python-dbus a dependency, no build-dependency. + Force xulrunner to be >= 1.8.1.14 to get the latest security fixes. * Not reproducible in the current release, thus closing: + "esddsp democracyplayer" causes "Bus error" (Closes: #413681). I verified that this works fine now, addeds docs to README.Debian. + Crash playing an audio podcast (Closes: #462016). -- Uwe Hermann Sat, 26 Apr 2008 21:14:56 +0200 miro (1.2.1-1) unstable; urgency=low * New upstream release (Closes: #473139). + There's a default autodownload setting option now (Closes: #439076). + Torrents have a download speed limit options now (Closes: #387716). + debian/patches/10_movies_dir.patch: Update. + debian/patches/20_no_autoupdate.patch: Update. + debian/patches/30_de_po_typo.patch: Drop, merged upstream. + debian/patches/50_xine_extractor_path.patch: Update. * Switch to building for Python 2.5, as Python 2.4 has been removed from the archive (Closes: #476159, #476486, #445249). * Build-depend on libffi-dev which is an extra package now (Closes: #472158). * debian/patches/80_gcc-4.3_headers.patch: Add file, which fixes compile errors with gcc 4.3 (Closes: #466757). Thanks Arthur Loiret for the patch! * debian/menu: Add xpm icon for displaying in the Debian menu. * Closing a bunch of bugs which I cannot reproduce in the latest release: + miro: DbusException when starting (Closes: #466011). + miro: Segfault when switching to Library during video playback (Closes: #472327). Please reopen if you can reproduce this multiple times in a row with the latest version. + Insufficient version dependency for python-gtk2 (Closes: #443101). + miro: UI freezes on keyboard input (Closes: #459039). * Add python-gst0.10 dependency as Miro now supports switching the renderer from xine to gstreamer via the Options menu (Closes: #466337). * debian/patches/90_disable_iheartmiro_nag.patch: Added. This disables the annoying nag screen to download and install the iHeartMiro Firefox plugin. For a manual installation see http://www.iheartmiro.org/. * Force xine to be >= 1.1.12 to get all the latest security fixes. * Force xulrunner to be >= 1.8.1.13 to get all the latest security fixes. * Add dependency on libxine1-plugins (thus also on libxine1-ffmpeg), as we really want to be able to play all formats. * Install xine_extractor into /usr/lib/miro, not /usr/libexec. -- Uwe Hermann Fri, 18 Apr 2008 16:56:11 +0200 miro (1.1.2-3) unstable; urgency=low * Provide "real" transitional packages for democracyplayer -> miro upgrades. * Enforce dependency on xulrunner >= 1.8.1.12-2 so we get all the recent security fixes in xulrunner, plus GNU/Hurd and GNU/kFreeBSD support. * Closing some more bugs I cannot reproduce in this version, in order to allow miro to transition to testing. If you still see the same problems in the latest release, please reopen as non-RC bugs. Having a version in testing which works for most people is better than no version at all. + miro crashes when done playing a video (Closes: #464862). + miro crashes on playing a video or audio podcast (Closes: #462706). * Finish transition of debian/copyright to machine-readable format. * debian/patches/70_rdfa_silence_lintian.patch: Silence lintian. -- Uwe Hermann Fri, 07 Mar 2008 23:45:20 +0100 miro (1.1.2-2) unstable; urgency=low * Add missing build-dependencies on ssl-dev, libboost-filesystem-dev, libboost-thread-dev, libboost-serialization-dev, and libboost-date-time-dev (Closes: #465670). * Add missing dependency: imagemagick. * Closing some more bugs I cannot reproduce in this version. Please reopen if the problem persists. + Doesn't start anymore, unless some KDE app is running (Closes: #399097). + Solarization effect when playing videos the second time. This looks like a driver or xine bug, not a Miro bug (Closes: #375911). + Eats up all CPU time (Closes: #453647). * debian/copyright: + Start to convert the file to the machine-readable format described at http://wiki.debian.org/Proposals/CopyrightFormat (not yet finished). Based on the work done in the Ubuntu package (thanks!). + Further updates, add missing items. -- Uwe Hermann Fri, 15 Feb 2008 02:39:06 +0100 miro (1.1.2-1) unstable; urgency=low * New upstream release (Closes: #460442). * debian/copyright: Update various entries. + Miro now has a special exception which allows linking against OpenSSL. + portable/BitTorrent/ is gone, portable/libtorrent/ is here. * Close some bugs which I cannot reproduce in the latest Miro release. Please reopen if the problem persists. + Democracyplayer does not run at all (Closes: #441894). + Crashes on start gecko/bug-buddy pthread_join() (Closes: #447090). + Can't close: gives various error messages (Closes: #439398). * Recommend 'ttf-dejavu' instead of 'ttf-bitstream-vera' which is going to be removed (Closes: #461253, 461287). * Channel guide links are no longer opened in a browser (Closes: #442078). -- Uwe Hermann Tue, 12 Feb 2008 01:15:49 +0100 miro (1.0-2) unstable; urgency=low * Fix problem with multiple "crash report" windows popping up without a real crash happening (Closes: #451980, #452708, #454603, #452486). * Honor --xine-driver option (Closes: #453406). * debian/control: Add Homepage field. * Standards-Version: 3.7.3 (no changes required). * xine-lib transition: Add explicit dependency on libxine1-x. * Small fixes to reduce the diff to the Ubuntu package: + Use $(DEB_PYTHON_COMPILE_VERSION) instead or hard-coding the version number (but still use 2.4 in Debian for now). + debian/control: Split long lines for better readability. + Add watch file. -- Uwe Hermann Thu, 20 Dec 2007 13:15:20 +0100 miro (1.0-1) unstable; urgency=low * New upstream release (Closes: #449131, #451207). + Fixed malformed miro.xml file (Closes: #445871, #443510). + Drop several patches which were applied upstream. * Add missing libxv-dev build-dependency (Closes: #442832, #443006, #443045). * Miro shipped with a menu file since the beginning (Closes: #443211). It's currently in the 'Applications/Network/Web News' category. * Fix small typo in German translation (Closes: #451333). * Cannot reproduce the following bugs with this release. Please reopen if you still experience problems: + Miro crashes on play (Closes: #443266). + Used to work; now segfaults on startup (Closes: #444484). Please try removing the ~/.miro directory if the problem persists. + Segfault on startup (quicktime related?) (Closes: #444051). + Cannot install Miro (Closes: #443045). Unlikely to be a real bug, probably stems from mixing packages from stable/unstable. * New 'Recommends: libxine1-ffmpeg'. -- Uwe Hermann Fri, 16 Nov 2007 02:11:55 +0100 miro (0.9.9.1-1) unstable; urgency=low * New upstream release (Closes: #433752). + Democracy Player was renamed to Miro upstream, so we now use Provides/Conflicts/Replaces to transition existing installs. + Update the package description (and improve it a bit). + Now supports proxy settings (Closes: #426992). Miro uses the default GNOME proxy, which you can set/enable using gconf-editor. * Update debian/copyright. * Several improvements inspired by the Ubuntu version of the package: + Remove unneeded RPATH from MozillaBrowser.so (using chrpath). + debian/menu: Move package into 'Applications/Network/Web News'. + Drop shebang from feedparser.py, not needed (and silences lintian). + Only suggest python-psyco on [i386 hurd-i386 netbsd-i386 kfreebsd-i386]. * miro.desktop improvements: + Drop 'Encoding=UTF-8', no longer necessary (lintian). + Change categories to 'AudioVideo;FileTransfer;News;P2P;TV;Player;'. * Cannot reproduce the following bugs using this release of Miro. Please feel free to reopen if it's still a problem. + "Crashes on stop playback" (Closes: #399098). According to http://bugzilla.pculture.org/show_bug.cgi?id=5197 this is indeed fixed in Miro 0.9.9.1. + "Still crashes". Cannot reproduce with Miro (Closes: #438946). + "Crashes on end of video podcast" (Closes: 419207). Doesn't seem to happen with latest Miro anymore (I did see it before). + Installation error. Can't reproduce, no further infos from submitter, so I'm closing this. (Closes: #387248). + "Crash after pressing play". Cannot reproduce (Closes: #402264). + "Position slider doesn't respond to mouse click-and-drag sometimes". Cannot reproduce with latest Miro (Closes: #405248). + "Freezes On Start". Cannot reproduce with last Miro (Closes: #408032). Also, running two instances seems to work fine for me, but it's not really useful or recommended. + Problem with xine plugin. Doesn't look like a Democracy Player / Miro issue, but please reopen if it still happens (Closes: #420144). -- Uwe Hermann Tue, 11 Sep 2007 21:14:06 +0200 democracyplayer (0.9.6-2) unstable; urgency=low * The "Night of the Living Dead" release. * Fix critical python/dbus errors (Closes: #429881, #418722). Thanks Krzysztof Sobiecki for the patch! * Build-depend on libboost-python-dev (>= 1.34.1-2), as that version is now built with Python 2.4 again, which is currently needed to make Democracy Player work at all (Closes: #430659, #429407). Note that we _have_ to build democracyplayer with Python 2.4 at this point in time, as several of its dependencies are not yet available as Python 2.5 versions in Debian. * Build-depend on libxine-dev (>= 1.1.6-2), as starting with that version xine plays sound/music in *.flv flash files (Closes: #396898, #387726). * Drop 30_libboost_python.patch, no longer needed. * Add new required dependency: python-pysqlite2. -- Uwe Hermann Fri, 17 Aug 2007 15:53:17 +0200 democracyplayer (0.9.6-1) unstable; urgency=low * New upstream release. + This fixes a critical dbus-python related bug (Closes: #422899). * Link against libboost-python1.34.0 now, as the old libboost-python1.33.1 is lo longer in the archive (Closes: #428124). * Fix a libboost-related FTBFS (Closes: #427912). * Fix FTBFS: /bin/sh: python2.5: command not found (Closes: #423754). -- Uwe Hermann Tue, 05 Jun 2007 12:57:36 +0200 democracyplayer (0.9.5.3-1) unstable; urgency=low * New upstream release. + Bigger channel descriptions if you click on a channel (Closes: #381454). + Cannot reproduce search error in this release (Closes: #400555). + Preferences are saved correctly now (Closes: #404188). * Acknowledge NMU, thanks Margarita Manterola (Closes: #401569). Upstream integrated the translation updates and fixes AFAIK, but if not please re-open (but please submit further fixes upstream: https://launchpad.net/democracy/trunk/+pots/democracyplayer). * Re-introduce the changelog entry from 0.9.1-1 which somehow got lost (don't ask me how _that_ happened!). See #402262. Thanks Margarita Manterola . * Build-Depends: python-support (>= 0.6), as we use 'Python-Depends' now. * Build-Depends: python-dbus (instead of python2.4-dbus). * Suggests: python-psyco (improves speed a bit). * Simplified packaging a bit. -- Uwe Hermann Sun, 15 Apr 2007 16:58:06 +0200 democracyplayer (0.9.2.1-2.1) unstable; urgency=low * Non-maintainer upload with the agreement of the Maintainer. * Really fix incorrect plurar form for Romanian (Closes: #401569) -- Margarita Manterola Wed, 3 Jan 2007 13:29:17 -0300 democracyplayer (0.9.2.1-2) unstable; urgency=low * Fix incorrect versioned dependency on democracyplayer-data by depending on >= 0.9.2.1-1 instead of >= 0.9.1-1 (Closes: #402263). Thanks Fabio Pugliese Ornellas and Margarita Manterola . * Fix incorrect plural form for Romanian (Closes: #401569). Thanks Eddy Petrișor . * Correct typos and also update both, the Brazilian Portuguese and the Spanish translations (Closes: #402262). Thanks Margarita Manterola . -- Uwe Hermann Sat, 9 Dec 2006 23:55:19 +0100 democracyplayer (0.9.2.1-1) unstable; urgency=low * New upstream release. * According to upstream this release should now consume a lot less memory (Closes: 396869). -- Uwe Hermann Tue, 28 Nov 2006 12:31:11 +0100 democracyplayer (0.9.1-1) unstable; urgency=low * New upstream release. * Updated debian/copyright to reflect recent upstream changes. -- Uwe Hermann Thu, 19 Oct 2006 20:46:30 +0200 democracyplayer (0.9.0.2-1) unstable; urgency=low * New upstream release. -- Uwe Hermann Fri, 22 Sep 2006 19:36:29 +0200 democracyplayer (0.9.0-1) unstable; urgency=low * New upstream release. * Added dependency on python2.4-dbus to prevent trouble when someone tries to start multiple instances of democracyplayer. * Changed python2.4-pyrex build-dependency to python-pyrex. -- Uwe Hermann Mon, 11 Sep 2006 19:45:23 +0200 democracyplayer (0.8.5-3) unstable; urgency=low * Fix broken XML file (Closes: #383854, #383294). * Added missing build-dependency on python-support (>= 0.3). -- Uwe Hermann Fri, 25 Aug 2006 05:53:34 +0200 democracyplayer (0.8.5-2) unstable; urgency=low * Switch to debhelper v5 (+ cdbs). * Python transition (Closes: #380769). + Changed lots of depends from python2.4-* to python-* (see #376979). + Versioned build-deps: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2) + Use pysupport. * Add proper license to manpage (+ cosmetic fixes). -- Uwe Hermann Wed, 2 Aug 2006 00:41:42 +0200 democracyplayer (0.8.5-1) unstable; urgency=low * New upstream release. + Fixes GTK+/mozembed breakage (Closes: #376979). + Move package to xulrunner: Replace mozilla-dev build dependency with xulrunner-dev, and replace mozilla-browser and mozilla-psm dependencies with xulrunner (Closes: #376360). * Suggest: ttf-bitstream-vera (for nicer looking fonts). * Do not install /usr/share/democracy/resources/testdata and /usr/share/democracy/resources/templates/unittest. They're not needed in the installed package, so we can save some space here. * Updated debian/copyright (cosmetic changes). -- Uwe Hermann Fri, 21 Jul 2006 12:50:51 +0200 democracyplayer (0.8.4.1-1) unstable; urgency=low * New upstream release. + Remove patch which applies 'gzip -9' to the manpage, it's now included upstream. -- Uwe Hermann Tue, 27 Jun 2006 11:50:10 +0200 democracyplayer (0.8.3+0.8.4rc0-1) unstable; urgency=low * Initial release (Closes: #338808, #365303). -- Uwe Hermann Mon, 12 Jun 2006 17:53:30 +0200 debian/control0000664000000000000000000000412312243527136010600 0ustar Source: miro Section: net Priority: extra Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Uwe Hermann Build-Depends: cdbs (>= 0.4.43), debhelper (>= 7.0.50~), python-all-dev, python-support (>= 0.6), python-pyrex (>= 0.9.6.4), python-gtk2-dev, libwebkitgtk-dev, libavformat-dev, pkg-config, Standards-Version: 3.9.2 Homepage: http://www.getmiro.com XS-Python-Version: >= 2.6 Package: miro Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-dbus (>= 0.83.1), python-gtk2, python-gconf, python-glade2, python-pysqlite2, python-libtorrent (>= 0.14.10-2), python-gst0.10 (>= 0.10.18-2), gstreamer0.10-x (>= 0.10.0), gstreamer0.10-plugins-base (>= 0.10.0), gstreamer0.10-plugins-good (>= 0.10.0), gstreamer0.10-plugins-bad (>= 0.10.0), python-webkit, python-pycurl, python-mutagen, miro-data (>= 4.0.4) Recommends: python-psyco [i386 hurd-i386 netbsd-i386 kfreebsd-i386], gstreamer0.10-ffmpeg (>= 0.10.0), Suggests: ttf-dejavu, python-notify, gstreamer0.10-plugins-ugly (>= 0.10.0), libavahi-compat-libdnssd1, libav-tools, ffmpeg2theora Conflicts: miro-data (<< 1.2.1) Description: GTK+ based RSS video aggregator Miro (previously known as Democracy Player) is a platform for Internet television and video. It allows you to download and watch videos from RSS feeds (including podcasts, video blogs, and BitTorrent feeds). Package: miro-data Architecture: all Depends: ${misc:Depends} Description: GTK+ based RSS video aggregator data files Miro (previously known as Democracy Player) is a platform for Internet television and video. It allows you to download and watch videos from RSS feeds (including podcasts, video blogs, and BitTorrent feeds). . This package contains the data files for Miro. debian/menu0000664000000000000000000000022311700424022010044 0ustar ?package(miro):needs="X11" section="Applications/Network/Web News" \ title="Miro" command="/usr/bin/miro" \ icon="/usr/share/pixmaps/miro.xpm" debian/rules0000775000000000000000000000336411700424022010246 0ustar #!/usr/bin/make -f DEB_PYTHON_SYSTEM = pysupport # Must be included before python-distutils.mk to use dh_python/dh_pysupport. include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/utils.mk # Use Python distutils to install the package. include /usr/share/cdbs/1/class/python-distutils.mk # Must come after python-distutils.mk. DEB_PYTHON_SETUP_CMD := linux/setup.py # The default argument is '-a', which Miro's setup.py doesn't seem to support. DEB_PYTHON_CLEAN_ARGS := # Install everything into debian/tmp, as we have a multi-binary package. DEB_DH_INSTALL_SOURCEDIR := debian/tmp # Reduce the number of unneeded dependencies with --as-needed. LDFLAGS += "-Wl,--as-needed" # Workaround for a cdbs issue/bug, see #525436. common-binary-arch common-binary-indep:: miro-fixup miro-fixup: install/miro binary-post-install/miro:: @# Add a few more READMEs. cp linux/README debian/miro/usr/share/doc/miro/README.linux cp lib/frontends/cli/README debian/miro/usr/share/doc/miro/README.cli binary-post-install/miro:: @# Remove unneeded files from the miro deb. rm -rf debian/miro/usr/share/pyshared/miro/test binary-install/miro:: @# Fixup shebangs. sed -i -e '1 s,#!.*python.*,#! /usr/bin/python,' debian/miro/usr/bin/* binary-post-install/miro-data:: @# Remove unneeded files from the miro-data deb. rm -rf debian/miro-data/usr/share/miro/resources/testdata clean:: cd linux && make clean rm -f lib/frontends/widgets/infolist/infolist.c rm -f lib/frontends/widgets/gtk/webkitgtkhacks.c rm -f lib/frontends/widgets/gtk/pygtkhacks.c rm -f linux/plat/xlibhelper.c rm -f linux/miro.1.gz rm -f linux/miro.real.1.gz rm -f linux/clean # For /usr/share/cdbs/1/rules/utils.mk sanity check. common-binary-post-install-arch:: list-missing debian/watch0000664000000000000000000000012011700424022010202 0ustar version=3 http://ftp.osuosl.org/pub/pculture.org/miro/src/[mM]iro-(.*)\.tar\.gz debian/miro-data.install0000664000000000000000000000004211700424022012421 0ustar usr/share/miro/ usr/share/locale/ debian/miro.lintian-overrides0000664000000000000000000000011111700424022013477 0ustar miro: embedded-feedparser-library usr/share/pyshared/miro/feedparser.py debian/patches/0000775000000000000000000000000012220170006010605 5ustar debian/patches/50_miro_debug_fix.patch0000664000000000000000000000106311700424022015116 0ustar Fix non-working gdb invokation. --- a/linux/miro.orig 2011-07-03 18:55:22.000000000 +0200 +++ b/linux/miro 2011-07-03 18:56:39.000000000 +0200 @@ -38,9 +38,9 @@ esac done -if [ -e "./miro.real" ] +if [ -e "/usr/bin/miro.real" ] then - MIROREAL=./miro.real + MIROREAL=/usr/bin/miro.real else MIROREAL=`which gdb` fi @@ -60,7 +60,7 @@ fi $GDB -ex 'set breakpoint pending on' \ - -ex 'run' --args $PYTHON ./miro.real --sync "$@" + -ex 'run' --args $PYTHON /usr/bin/miro.real --sync "$@" else miro.real "$@" fi debian/patches/10_movies_dir.patch0000664000000000000000000000151511700424022014272 0ustar Change some default directories. Index: a/linux/plat/config.py =================================================================== --- a/linux/plat/config.py 2011-06-07 23:47:12.000000000 +0200 +++ b/linux/plat/config.py 2011-06-07 23:47:28.000000000 +0200 @@ -164,10 +164,10 @@ if descriptor == prefs.MOVIES_DIRECTORY: value = os.path.expanduser(os.path.join(options.user_home, - 'Videos/Miro')) + '.miro/Movies')) elif descriptor == prefs.NON_VIDEO_DIRECTORY: - value = os.path.expanduser(os.path.join(options.user_home, 'Desktop')) + value = os.path.expanduser(os.path.join(options.user_home, '.miro/Nonvideo')) elif descriptor == prefs.GETTEXT_PATHNAME: value = resources.path("../../locale") debian/patches/130_libav9.patch0000664000000000000000000000633312220154107013410 0ustar Description: Port to libav 9 API Author: Sebastian Ramacher Bug-Debian: http://bugs.debian.org/720810 Last-Update: 2013-09-24 --- a/linux/miro-segmenter.c +++ b/linux/miro-segmenter.c @@ -40,7 +40,11 @@ AVCodecContext *output_codec_context; AVStream *output_stream; +#if LIBAVFORMAT_VERSION_MAJOR >= 54 + output_stream = avformat_new_stream(output_format_context, 0); +#else output_stream = av_new_stream(output_format_context, 0); +#endif if (!output_stream) { fprintf(stderr, "Could not allocate stream\n"); exit(1); @@ -156,13 +160,21 @@ exit(1); } +#if LIBAVFORMAT_VERSION_MAJOR >= 54 + ret = avformat_open_input(&ic, input, ifmt, NULL); +#else ret = av_open_input_file(&ic, input, ifmt, 0, NULL); +#endif if (ret != 0) { fprintf(stderr, "Could not open input file, make sure it is an mpegts file: %d\n", ret); exit(1); } +#if LIBAVFORMAT_VERSION_MAJOR >= 54 + if (avformat_find_stream_info(ic, NULL) < 0) { +#else if (av_find_stream_info(ic) < 0) { +#endif fprintf(stderr, "Could not read stream information\n"); exit(1); } @@ -215,12 +227,16 @@ } } +#if LIBAVFORMAT_VERSION_MAJOR >= 54 + av_dump_format(oc, 0, input, 1); +#else if (av_set_parameters(oc, NULL) < 0) { fprintf(stderr, "Invalid output format parameters\n"); exit(1); } dump_format(oc, 0, input, 1); +#endif if (video_st) { codec = avcodec_find_decoder(video_st->codec->codec_id); @@ -228,17 +244,29 @@ fprintf(stderr, "Could not find video decoder, key frames will not be honored\n"); } +#if LIBAVCODEC_VERSION_MAJOR >= 54 + if (avcodec_open2(video_st->codec, codec, NULL) < 0) { +#else if (avcodec_open(video_st->codec, codec) < 0) { +#endif fprintf(stderr, "Could not open video decoder, key frames will not be honored\n"); } } +#if LIBAVFORMAT_VERSION_MAJOR >= 54 + if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) { +#else if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) { +#endif fprintf(stderr, "Could not open '%s'\n", output_filename); exit(1); } +#if LIBAVFORMAT_VERSION_MAJOR >= 54 + if (avformat_write_header(oc, NULL)) { +#else if (av_write_header(oc)) { +#endif fprintf(stderr, "Could not write mpegts header to first output file\n"); exit(1); @@ -274,10 +302,17 @@ } if (segment_time - prev_segment_time >= segment_duration) { +#if LIBAVFORMAT_VERSION_MAJOR >= 54 + avio_flush(oc->pb); + avio_close(oc->pb); + + if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) { +#else put_flush_packet(oc->pb); url_fclose(oc->pb); if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) { +#endif fprintf(stderr, "Could not open '%s'\n", output_filename); break; } @@ -307,7 +342,11 @@ av_freep(&oc->streams[i]); } +#if LIBAVFORMAT_VERSION_MAJOR >= 54 + avio_close(oc->pb); +#else url_fclose(oc->pb); +#endif av_free(oc); /* End-of-transcode marker. */ debian/patches/120_miro.desktop.patch0000664000000000000000000000075511700427321014644 0ustar http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=640986 --- a/linux/miro.desktop.orig 2011-08-10 17:53:51.000000000 +0000 +++ b/linux/miro.desktop 2011-09-09 08:15:00.000000000 +0000 @@ -1,7 +1,8 @@ [Desktop Entry] Type=Application -Name=Miro music and video player +Name=Miro GenericName=Media player +GenericName[de]=Medienwiedergabe Comment=Fully featured video and music player, podcast client, and bittorrent client Comment[de]=Multimedia Player Comment[es]=Reproductor multimedia debian/patches/100_catch_keyerror_in_update_items.patch0000664000000000000000000000147411700424022020453 0ustar Fix for crash in update_items() when trying to delete an item that isn't in the dict. (LP: #413387) Index: a/lib/frontends/widgets/itemlist.py =================================================================== --- a/lib/frontends/widgets/itemlist.py 2011-06-05 23:42:53.000000000 +0200 +++ b/lib/frontends/widgets/itemlist.py 2011-06-05 23:43:49.000000000 +0200 @@ -504,7 +504,10 @@ # Item not already displayed if should_show: to_add.append(info) - del self._hidden_items[info.id] + try: + del self._hidden_items[info.id] + except KeyError: + pass # Item already gone else: self._hidden_items[info.id] = info else: debian/patches/140_use_avconv.patch0000664000000000000000000000503412220170006014364 0ustar Description: Use avconv instead of ffmpeg Author: Sebastian Ramacher Last-Update: 2013-09-24 --- a/linux/plat/options.py +++ b/linux/plat/options.py @@ -51,7 +51,7 @@ FFMPEG_BINARY = LinuxPref( key="ffmpegBinary", - default="/usr/bin/ffmpeg", + default="/usr/bin/avconv", alias="ffmpeg", helptext="Absolute path for ffmpeg binary.") --- a/resources/conversions/android.conv +++ b/resources/conversions/android.conv @@ -2,7 +2,7 @@ name: Android Devices executable: ffmpeg extension: mp4 -parameters: -i {input} -y -acodec aac -ab 160k -s {ssize} -vcodec libx264 -vpre slow -vpre ipod640 -f mp4 -threads 0 {output} +parameters: -i {input} -y -strict experimental -acodec aac -b:a 160k -s {ssize} -vcodec libx264 -pre:v slow -pre:v ipod640 -f mp4 -threads 0 {output} mediatype: video [G2] --- a/resources/conversions/apple.conv +++ b/resources/conversions/apple.conv @@ -3,7 +3,7 @@ executable: ffmpeg extension: mp4 ssize: 480x320 -parameters: -i {input} -acodec aac -ab 160k -s {ssize} -vcodec libx264 -vpre slow -vpre ipod640 -b 1200k -f mp4 -threads 0 {output} +parameters: -i {input} -strict experimental -acodec aac -b:a 160k -s {ssize} -vcodec libx264 -pre:v slow -pre:v ipod640 -b:v 1200k -f mp4 -threads 0 {output} mediatype: video [iPhone] --- a/resources/conversions/others.conv +++ b/resources/conversions/others.conv @@ -4,7 +4,7 @@ [Playstation Portable (PSP)] executable: ffmpeg extension: mp4 -parameters: -i {input} -s 320x240 -b 512000 -ar 24000 -ab 64000 -f psp -r 29.97 {output} +parameters: -i {input} -s 320x240 -b:v 512000 -ar 24000 -b:a 64000 -f psp -r 29.97 {output} mediatype: video [Kindle Fire] @@ -12,7 +12,7 @@ executable: ffmpeg extension: mp4 bitrate: 700000 -parameters: -i {input} -acodec aac -ab 96k -vcodec libx264 -vpre slow -f mp4 -crf 22 {output} +parameters: -i {input} -strict experimental -acodec aac -b:a 96k -vcodec libx264 -pre:v slow -f mp4 -crf 22 {output} mediatype: video ssize: 1024x600 @@ -20,14 +20,14 @@ only_on: osx executable: ffmpeg extension: webm -parameters: -i {input} -f webm -vcodec libvpx -acodec libvorbis -ab 160000 -sameq {output} +parameters: -i {input} -f webm -vcodec libvpx -acodec libvorbis -b:a 160000 -sameq {output} mediatype: video [MP4] extension: mp4 executable: ffmpeg extension: mp4 -parameters: -i {input} -acodec aac -ab 96k -vcodec libx264 -vpre slow -f mp4 -crf 22 {output} +parameters: -i {input} -strict experimental -acodec aac -b:a 96k -vcodec libx264 -pre:v slow -f mp4 -crf 22 {output} mediatype: video [MP3] debian/patches/series0000664000000000000000000000022212220163763012032 0ustar 10_movies_dir.patch 50_miro_debug_fix.patch 100_catch_keyerror_in_update_items.patch 120_miro.desktop.patch 130_libav9.patch 140_use_avconv.patch debian/compat0000664000000000000000000000000211700424022010356 0ustar 7 debian/miro.docs0000664000000000000000000000001711700424022010776 0ustar README CREDITS