November 2013 - rpmfusion-commits

rpms/mythtv/F-19 mythtv-0.27-fixes.patch, NONE, 1.1 mythtv-0.27-libcec2.patch, NONE, 1.1

by Richard Shaw

Author: hobbes1069 Update of /cvs/free/rpms/mythtv/F-19 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14695 Added Files: mythtv-0.27-fixes.patch mythtv-0.27-libcec2.patch Log Message: Add updated patches to cvs. mythtv-0.27-fixes.patch: b/mythplugins/mytharchive/i18n/mytharchive_sv.qm |binary b/mythplugins/mytharchive/i18n/mytharchive_sv.ts | 1197 b/mythplugins/mytharchive/mytharchive/archiveutil.cpp | 4 b/mythplugins/mytharchive/mytharchive/mythburn.cpp | 4 b/mythplugins/mythbrowser/i18n/mythbrowser_sv.qm |binary b/mythplugins/mythbrowser/i18n/mythbrowser_sv.ts | 126 b/mythplugins/mythgallery/i18n/mythgallery_sv.qm |binary b/mythplugins/mythgallery/i18n/mythgallery_sv.ts | 965 b/mythplugins/mythgame/i18n/mythgame_sv.qm |binary b/mythplugins/mythgame/i18n/mythgame_sv.ts | 136 b/mythplugins/mythmusic/i18n/mythmusic_sv.qm |binary b/mythplugins/mythmusic/i18n/mythmusic_sv.ts | 1902 b/mythplugins/mythmusic/mythmusic/avfdecoder.cpp | 4 b/mythplugins/mythnetvision/i18n/mythnetvision_sv.qm |binary b/mythplugins/mythnetvision/i18n/mythnetvision_sv.ts | 279 b/mythplugins/mythnews/i18n/mythnews_sv.qm |binary b/mythplugins/mythnews/i18n/mythnews_sv.ts | 76 b/mythplugins/mythweather/i18n/mythweather_sv.qm |binary b/mythplugins/mythweather/i18n/mythweather_sv.ts | 62 b/mythplugins/mythzoneminder/i18n/mythzoneminder_sv.qm |binary b/mythplugins/mythzoneminder/i18n/mythzoneminder_sv.ts | 183 b/mythplugins/mythzoneminder/mythzmserver/main.cpp | 14 b/mythplugins/mythzoneminder/mythzmserver/zmserver.cpp | 25 b/mythplugins/mythzoneminder/mythzmserver/zmserver.h | 3 b/mythplugins/mythzoneminder/mythzoneminder/zmclient.cpp | 2 b/mythplugins/mythzoneminder/mythzoneminder/zmliveplayer.cpp | 21 b/mythtv/bindings/python/MythTV/system.py | 11 b/mythtv/bindings/python/setup.py | 6 b/mythtv/external/FFmpeg/libavcodec/mpeg12.c | 8 b/mythtv/i18n/mythfrontend_sv.qm |binary b/mythtv/i18n/mythfrontend_sv.ts |28897 ++++++----- b/mythtv/libs/libmyth/programinfo.cpp | 272 b/mythtv/libs/libmyth/programinfo.h | 17 b/mythtv/libs/libmythbase/housekeeper.cpp | 19 b/mythtv/libs/libmythbase/housekeeper.h | 2 b/mythtv/libs/libmythbase/mythcommandlineparser.cpp | 3 b/mythtv/libs/libmythbase/mythsocket.cpp | 12 b/mythtv/libs/libmythbase/mythsystemlegacy.cpp | 8 b/mythtv/libs/libmythbase/mythversion.h | 2 b/mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp | 14 b/mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp | 3 b/mythtv/libs/libmythtv/cardutil.cpp | 22 b/mythtv/libs/libmythtv/cardutil.h | 1 b/mythtv/libs/libmythtv/mythplayer.cpp | 19 b/mythtv/libs/libmythtv/mythplayer.h | 4 b/mythtv/libs/libmythtv/previewgenerator.cpp | 6 b/mythtv/libs/libmythtv/previewgeneratorqueue.cpp | 2 b/mythtv/libs/libmythtv/recorders/importrecorder.cpp | 2 b/mythtv/libs/libmythtv/recordinginfo.cpp | 143 b/mythtv/libs/libmythtv/tv_play.cpp | 8 b/mythtv/libs/libmythtv/tvremoteutil.cpp | 2 b/mythtv/libs/libmythtv/videosource.cpp | 2 b/mythtv/libs/libmythupnp/httprequest.cpp | 3 b/mythtv/programs/mythbackend/backendhousekeeper.cpp | 50 b/mythtv/programs/mythbackend/backendhousekeeper.h | 1 b/mythtv/programs/mythbackend/mainserver.cpp | 30 b/mythtv/programs/mythbackend/mainserver.h | 2 b/mythtv/programs/mythbackend/playbacksock.cpp | 6 b/mythtv/programs/mythbackend/playbacksock.h | 3 b/mythtv/programs/mythbackend/scheduler.cpp | 73 b/mythtv/programs/mythbackend/services/guide.cpp | 36 b/mythtv/programs/mythcommflag/main.cpp | 6 b/mythtv/programs/mythfilldatabase/filldata.cpp | 81 b/mythtv/programs/mythfilldatabase/filldata.h | 7 b/mythtv/programs/mythfilldatabase/main.cpp | 12 b/mythtv/programs/mythutil/commandlineparser.cpp | 35 b/mythtv/programs/mythutil/markuputils.cpp | 157 b/mythtv/programs/mythutil/mythutil.cpp | 6 b/mythtv/themes/MythCenter-wide/notification-ui.xml | 2 b/mythtv/themes/MythCenter/notification-ui.xml | 2 mythtv/bindings/python/MythTV/tmdb/XSLT/tmdbQuery.xsl | 99 mythtv/bindings/python/MythTV/tmdb/XSLT/tmdbVideo.xsl | 157 mythtv/bindings/python/MythTV/tmdb/tmdb_api.py | 1317 mythtv/bindings/python/MythTV/tmdb/tmdb_exceptions.py | 45 mythtv/bindings/python/MythTV/tmdb/tmdb_ui.py | 266 mythtv/programs/scripts/metadata/Movie/tmdb.py | 647 76 files changed, 19550 insertions(+), 17981 deletions(-) --- NEW FILE mythtv-0.27-fixes.patch --- mythplugins/mytharchive/i18n/mytharchive_sv.qm | Bin 34033 -> 35218 bytes mythplugins/mytharchive/i18n/mytharchive_sv.ts | 1197 +- .../mytharchive/mytharchive/archiveutil.cpp | 4 +- mythplugins/mytharchive/mytharchive/mythburn.cpp | 4 +- mythplugins/mythbrowser/i18n/mythbrowser_sv.qm | Bin 7139 -> 7616 bytes mythplugins/mythbrowser/i18n/mythbrowser_sv.ts | 126 +- mythplugins/mythgallery/i18n/mythgallery_sv.qm | Bin 18827 -> 24405 bytes mythplugins/mythgallery/i18n/mythgallery_sv.ts | 965 +- mythplugins/mythgame/i18n/mythgame_sv.qm | Bin 16378 -> 16696 bytes mythplugins/mythgame/i18n/mythgame_sv.ts | 136 +- mythplugins/mythmusic/i18n/mythmusic_sv.qm | Bin 60650 -> 61545 bytes mythplugins/mythmusic/i18n/mythmusic_sv.ts | 1902 +- mythplugins/mythmusic/mythmusic/avfdecoder.cpp | 4 +- mythplugins/mythnetvision/i18n/mythnetvision_sv.qm | Bin 11838 -> 14109 bytes mythplugins/mythnetvision/i18n/mythnetvision_sv.ts | 279 +- mythplugins/mythnews/i18n/mythnews_sv.qm | Bin 4604 -> 4965 bytes mythplugins/mythnews/i18n/mythnews_sv.ts | 76 +- mythplugins/mythweather/i18n/mythweather_sv.qm | Bin 22243 -> 23197 bytes mythplugins/mythweather/i18n/mythweather_sv.ts | 62 +- .../mythzoneminder/i18n/mythzoneminder_sv.qm | Bin 7032 -> 7267 bytes .../mythzoneminder/i18n/mythzoneminder_sv.ts | 183 +- mythplugins/mythzoneminder/mythzmserver/main.cpp | 14 +- .../mythzoneminder/mythzmserver/zmserver.cpp | 25 +- mythplugins/mythzoneminder/mythzmserver/zmserver.h | 3 +- .../mythzoneminder/mythzoneminder/zmclient.cpp | 2 +- .../mythzoneminder/mythzoneminder/zmliveplayer.cpp | 21 +- mythtv/bindings/python/MythTV/system.py | 11 +- .../bindings/python/MythTV/tmdb/XSLT/tmdbQuery.xsl | 99 - .../bindings/python/MythTV/tmdb/XSLT/tmdbVideo.xsl | 157 - mythtv/bindings/python/MythTV/tmdb/__init__.py | 0 mythtv/bindings/python/MythTV/tmdb/tmdb_api.py | 1317 - .../bindings/python/MythTV/tmdb/tmdb_exceptions.py | 45 - mythtv/bindings/python/MythTV/tmdb/tmdb_ui.py | 266 - mythtv/bindings/python/setup.py | 6 +- mythtv/external/FFmpeg/libavcodec/mpeg12.c | 8 +- mythtv/i18n/mythfrontend_sv.qm | Bin 630266 -> 670910 bytes mythtv/i18n/mythfrontend_sv.ts | 28897 ++++++++++--------- mythtv/libs/libmyth/programinfo.cpp | 272 +- mythtv/libs/libmyth/programinfo.h | 17 + mythtv/libs/libmythbase/housekeeper.cpp | 19 +- mythtv/libs/libmythbase/housekeeper.h | 2 + mythtv/libs/libmythbase/mythcommandlineparser.cpp | 3 +- mythtv/libs/libmythbase/mythsocket.cpp | 12 + mythtv/libs/libmythbase/mythsystemlegacy.cpp | 8 +- mythtv/libs/libmythbase/mythversion.h | 2 +- .../libs/libmythtv/AirPlay/mythairplayserver.cpp | 14 +- mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp | 3 +- mythtv/libs/libmythtv/cardutil.cpp | 22 + mythtv/libs/libmythtv/cardutil.h | 1 + mythtv/libs/libmythtv/mythplayer.cpp | 19 +- mythtv/libs/libmythtv/mythplayer.h | 4 + mythtv/libs/libmythtv/previewgenerator.cpp | 6 +- mythtv/libs/libmythtv/previewgeneratorqueue.cpp | 2 +- mythtv/libs/libmythtv/recorders/importrecorder.cpp | 2 +- mythtv/libs/libmythtv/recordinginfo.cpp | 143 +- mythtv/libs/libmythtv/tv_play.cpp | 8 +- mythtv/libs/libmythtv/tvremoteutil.cpp | 2 +- mythtv/libs/libmythtv/videosource.cpp | 2 +- mythtv/libs/libmythupnp/httprequest.cpp | 3 +- mythtv/programs/mythbackend/backendhousekeeper.cpp | 50 +- mythtv/programs/mythbackend/backendhousekeeper.h | 1 + mythtv/programs/mythbackend/mainserver.cpp | 30 +- mythtv/programs/mythbackend/mainserver.h | 2 +- mythtv/programs/mythbackend/playbacksock.cpp | 6 +- mythtv/programs/mythbackend/playbacksock.h | 3 - mythtv/programs/mythbackend/scheduler.cpp | 73 +- mythtv/programs/mythbackend/services/guide.cpp | 36 +- mythtv/programs/mythcommflag/main.cpp | 6 +- mythtv/programs/mythfilldatabase/filldata.cpp | 81 +- mythtv/programs/mythfilldatabase/filldata.h | 7 +- mythtv/programs/mythfilldatabase/main.cpp | 12 +- mythtv/programs/mythutil/commandlineparser.cpp | 35 +- mythtv/programs/mythutil/markuputils.cpp | 157 +- mythtv/programs/mythutil/mythutil.cpp | 6 + mythtv/programs/scripts/metadata/Movie/tmdb.py | 647 - mythtv/themes/MythCenter-wide/notification-ui.xml | 2 +- mythtv/themes/MythCenter/notification-ui.xml | 2 +- 77 files changed, 19550 insertions(+), 17981 deletions(-) diff --git a/mythplugins/mytharchive/i18n/mytharchive_sv.qm b/mythplugins/mytharchive/i18n/mytharchive_sv.qm index fd29269..a6c7157 100644 Binary files a/mythplugins/mytharchive/i18n/mytharchive_sv.qm and b/mythplugins/mytharchive/i18n/mytharchive_sv.qm differ diff --git a/mythplugins/mytharchive/i18n/mytharchive_sv.ts b/mythplugins/mytharchive/i18n/mytharchive_sv.ts index c3c042c..b551fa0 100644 --- a/mythplugins/mytharchive/i18n/mytharchive_sv.ts +++ b/mythplugins/mytharchive/i18n/mytharchive_sv.ts @@ -2,6 +2,36 @@ <!DOCTYPE TS> <TS version="2.0" language="sv_SE"> <context> + <name>(ArchiveUtils)</name> + <message> + <location filename="../mytharchive/archiveutil.cpp" line="80"/> + <source>Cannot find the MythArchive work directory. +Have you set the correct path in the settings?</source> + <translation>Kan inte hitta arbetskatalog för MythArchive. +Har du ställt in rätt sökväg i inställningarna?</translation> + </message> +</context> +<context> + <name>(MythArchiveMain)</name> + <message> + <location filename="../mytharchive/main.cpp" line="93"/> + <source>Found a lock file but the owning process isn't running! +Removing stale lock file.</source> + <translation>Hittade en låsfil, men processen som äger den körs inte! +Tar bort föråldrad låsfil.</translation> + </message> + <message> + <location filename="../mytharchive/main.cpp" line="212"/> + <source>Last run did not create a playable DVD.</source> + <translation>Senaste körningen skapade inte en spelbar DVD.</translation> + </message> + <message> + <location filename="../mytharchive/main.cpp" line="219"/> + <source>Last run failed to create a DVD.</source> + <translation>Senaste körningen misslyckades att skapa en DVD.</translation> + </message> +</context> +<context> <name>ArchiveFileSelector</name> <message> <location filename="../mytharchive/importnative.cpp" line="212"/> @@ -15,705 +45,729 @@ </message> </context> <context> - <name>BurnThemeUI</name> - <message> - <location filename="../mythburn/themes/burnthemestrings.h" line="5"/> - <source>Has an intro and contains a main menu with 4 recordings per page. Does not have a chapter selection submenu.</source> - <translation>Har ett intro och innehåller en huvudmeny med fyra inspelningar per sida. Har ingen undermeny för val av kapitel.</translation> - </message> + <name>ArchiveSettings</name> <message> - <location filename="../mythburn/themes/burnthemestrings.h" line="6"/> - <source>Has an intro and contains a summary main menu with 10 recordings per page. Does not have a chapter selection submenu, recording titles, dates or category.</source> - <translation>Har ett intro och innehåller en huvudmeny med tio inspelningr per sida. Har ingen undermeny för val av kapitel, inspelningstitel, datum eller kategori.</translation> + <location filename="../mytharchive/archivesettings.cpp" line="20"/> + <source>MythArchive Temp Directory</source> + <translation>Tillfällig katalog för MythArchive</translation> </message> <message> - <location filename="../mythburn/themes/burnthemestrings.h" line="7"/> - <source>Has an intro and contains a main menu with 6 recordings per page. Does not have a scene selection submenu.</source> - <translation>Har ett intro och innehåller en huvdmeny med sex inspelningar per sida. Har inte någon undermeny för val scener.</translation> + <location filename="../mytharchive/archivesettings.cpp" line="23"/> + <source>Location where MythArchive should create its temporary work files. LOTS of free space required here.</source> + <translation>Plats där MythArchive ska skapa tillfälliga arbetsfiler. MYCKET ledigt utrymme krävs här.</translation> </message> <message> - <location filename="../mythburn/themes/burnthemestrings.h" line="8"/> - <source>Has an intro and contains a main menu with 3 recordings per page and a scene selection submenu with 8 chapters points. Shows a program details page before each recording.</source> - <translation>Har ett intro och innehåller en huvudmeny med tre inspelningar per sida samt en undermeny för val av scener med åtta kapitelval. Visar en sida med programdetaljer innan varje inspelning.</translation> + <location filename="../mytharchive/archivesettings.cpp" line="33"/> + <source>MythArchive Share Directory</source> + <translation>Delad katalog för MythArchive</translation> </message> <message> - <location filename="../mythburn/themes/burnthemestrings.h" line="9"/> - <source>Has an intro and contains a main menu with 3 recordings per page and a scene selection submenu with 8 chapters points. Shows a program details page before each recording. Uses animated thumb images.</source> - <translation>Har ett intro och innehåller en huvudmeny med tre inspelningar per sida samt en undermeny för val av scener med åtta kapitelval. Visar en sida med programdetaljer innan varje inspelning. Använder animerade miniatyrbilder.</translation> + <location filename="../mytharchive/archivesettings.cpp" line="36"/> + <source>Location where MythArchive stores its scripts, intro movies and theme files</source> + <translation>Platsen där MythArchive lagrar sina skript, intro-filmer och temafiler</translation> </message> <message> - <location filename="../mythburn/themes/burnthemestrings.h" line="10"/> - <source>Has an intro and contains a main menu with 3 recordings per page and a scene selection submenu with 8 chapters points.</source> - <translation>Har ett intro och innehåller en huvudmeny med tre inspelningar per sida samt en undermeny för val av scener med åtta kapitelval.</translation> + <location filename="../mytharchive/archivesettings.cpp" line="46"/> + <source>Video format</source> + <translation>Videoformat</translation> </message> <message> - <location filename="../mythburn/themes/burnthemestrings.h" line="11"/> - <source>Has an intro and contains a main menu with 3 recordings per page and a scene selection submenu with 8 chapters points. All the thumb images are animated.</source> - <translation>Har ett intro och innehåller en huvudmeny med tre inspelningar per sida samt en undermeny för val av scener med åtta kapitelval. Alla miniatyrbilder är animerade.</translation> + <location filename="../mytharchive/archivesettings.cpp" line="51"/> + <source>Video format for DVD recordings, PAL or NTSC.</source> + <translation>Videoformat för DVD-inspelningar, PAL eller NTSC.</translation> </message> <message> - <location filename="../mythburn/themes/burnthemestrings.h" line="12"/> - <source>Creates an auto play DVD with no menus. Shows an intro movie then for each title shows a details page followed by the video in sequence.</source> - <translation>Skapar en DVD utan menyer som startar automatiskt. Visar en introfilm och därefter visas för varje titel en sida med detaljer följt av filmen.</translation> + <location filename="../mytharchive/archivesettings.cpp" line="60"/> + <source>File Selector Filter</source> + <translation>Filvalsfilter</translation> </message> <message> - <location filename="../mythburn/themes/burnthemestrings.h" line="13"/> - <source>Creates an auto play DVD with no menus and no intro.</source> - <translation>Skapar en DVD som startar automatiskt och är utan menyer och introfilm.</translation> + <location filename="../mytharchive/archivesettings.cpp" line="63"/> + <source>The file name filter to use in the file selector.</source> + <translation>Filnamnsfilter att använda i filväljaren.</translation> </message> -</context> [...54169 lines suppressed...] - return - sys.stdout.write(u'%s:%s\n' % (u'Name', data[u'name'])) - keys = sorted(data.keys()) - images = {} - for key in keys: - if key == u'name': - continue - if key in ['also_known_as', 'filmography', 'images' ]: - if key == 'images': - images = {} - for k in data[key].keys(): - images[k] = u'' - if key == 'also_known_as': - alias = u'' - for k in data[key]: - alias+=u'%s|' % k.replace(u'|', u' ') - if alias: - sys.stdout.write(u'%s:%s\n' % (self.camelcase(key), alias[:-1])) - continue - for k in data[key]: - if key == 'filmography': - kys = sorted(k.keys()) - filmography = u'' - for c in kys: - if c == u'name': - continue - filmography+=u'%s:%s|' % (self.camelcase(c.replace(u'|', u' ')), k[c].replace(u'|', u' ')) - if filmography: - sys.stdout.write(u'%s:%s|%s\n' % (self.camelcase(key), k[u'name'].replace(u'|', u' '), filmography[:-1])) - elif key == 'images': - sys.stdout.write(u'%s:%s\n' % (self.camelcase(k), data[key][k])) - else: - sys.stdout.write(u'%s:%s\n' % (self.camelcase(key), data[key])) - # end peopleData() - - def hashData(self, hash_value): - '''Get Movie data by Hash value and display "key:value" pairs to stdout - ''' - try: - self.displayMovieData(self.config['moviedb'].searchHash(hash_value)) - except TmdbMovieOrPersonNotFound, msg: - #sys.stderr.write(u"%s\n" % msg) - return - except TmdHttpError, msg: - sys.stderr.write(self.error_messages['TmdHttpError'] % msg) - sys.exit(1) - except TmdXmlError, msg: - sys.stderr.write(self.error_messages['TmdXmlError'] % msg) - sys.exit(1) - except TmdBaseError, msg: - sys.stderr.write(self.error_messages['TmdBaseError'] % msg) - sys.exit(1) - except TmdbUiAbort, msg: - sys.stderr.write(self.error_messages['TmdbUiAbort'] % msg) - sys.exit(1) - except Exception, e: - sys.stderr.write(u"! Error: Unknown error during a Hash value Movie information display for (%s)\nError(%s)\n" % (hash_value, e)) - sys.exit(1) - # end hashData() - -# end Class moviedbQueries() - - -def main(): - """Gets movie details using an IMDB# and a TMDB# OR get People information using a name - """ - # themoviedb.org api key given by Travis Bell for Mythtv - apikey = "c27cb71cff5bd76e1a7a009380562c62" - - parser = OptionParser(usage=u"%prog usage: tmdb -hdruviomMPFBDS [parameters]\n <series name or 'series and season number' or 'series and season number and episode number'>\n\nFor details on using tmdb with Mythvideo see the tmdb wiki page at:\nhttp://www.mythtv.org/wiki/tmdb.py") - - parser.add_option( "-d", "--debug", action="store_true", default=False, dest="debug", - help=u"Show debugging info") - parser.add_option( "-r", "--raw", action="store_true",default=False, dest="raw", - help=u"Dump raw data only") - parser.add_option( "-u", "--usage", action="store_true", default=False, dest="usage", - help=u"Display examples for executing the tmdb script") - parser.add_option( "-v", "--version", action="store_true", default=False, dest="version", - help=u"Display version and author") - parser.add_option( "-i", "--interactive", action="store_true", default=False, dest="interactive", - help=u"Interaction mode (allows selection of a specific Movie or Person)") - parser.add_option( "-l", "--language", metavar="LANGUAGE", default=u'en', dest="language", - help=u"Select data that matches the specified language fall back to english if nothing found (e.g. 'es' Español, 'de' Deutsch ... etc)") - parser.add_option( "-a", "--area", metavar="COUNTRY", default=False, dest="country", - help=u"Select certificate data that matches the specified country (e.g. 'de' Germany, 'gb' UK ... etc)") - parser.add_option( "-M", "--movielist", action="store_true", default=False, dest="movielist", - help=u"Get matching Movie list") - parser.add_option( "-D", "--moviedata", action="store_true", default=False, dest="moviedata", - help=u"Get Movie metadata including graphic URLs") - parser.add_option( "-H", "--moviehash", action="store_true", default=False, dest="moviehash", - help=u"Get Movie metadata including graphic URLs using a Hash value.\nSee: http://api.themoviedb.org/2.1/methods/Hash.getInfo") - parser.add_option( "-P", "--peoplelist", action="store_true", default=False, dest="peoplelist", - help=u"Get matching People list") - parser.add_option( "-I", "--peopleinfo", action="store_true", default=False, dest="peopleinfo", - help=u"Get A Person's metadata including graphic URLs") - parser.add_option( "-t", action="store_true", default=False, dest="test", - help=u"Test for the availability of runtime dependencies") - - opts, args = parser.parse_args() - - # Test mode, if we've made it here, everything is ok - if opts.test: - print "Everything appears to be in order" - sys.exit(0) - - # Make all command line arguments unicode utf8 - for index in range(len(args)): - args[index] = unicode(args[index], 'utf8') - - if opts.debug: - sys.stdout.write("\nopts: %s\n" % opts) - sys.stdout.write("\nargs: %s\n\n" % args) - - # Process version command line requests - if opts.version: - version = etree.XML(u'<grabber></grabber>') - etree.SubElement(version, "name").text = __title__ - etree.SubElement(version, "author").text = __author__ - etree.SubElement(version, "thumbnail").text = 'tmdb.png' - etree.SubElement(version, "command").text = 'tmdb.py' - etree.SubElement(version, "type").text = 'movie' - etree.SubElement(version, "description").text = 'Search and metadata downloads for themoviedb.org' - etree.SubElement(version, "version").text = __version__ - sys.stdout.write(etree.tostring(version, encoding='UTF-8', pretty_print=True)) - sys.exit(0) - - # Process usage command line requests - if opts.usage: - sys.stdout.write(__usage_examples__) - sys.exit(0) - - if not len(args) == 1: - sys.stderr.write("! Error: There must be one value for any option. Your options are (%s)\n" % (args)) - sys.exit(1) - - if args[0] == u'': - sys.stderr.write("! Error: There must be a non-empty argument, yours is empty.\n") - sys.exit(1) - - - passedLanguage = opts.language - if (opts.language and opts.country): - passedLanguage = opts.language + "-" + opts.country - - Queries = moviedbQueries(apikey, - mythtv = True, - interactive = opts.interactive, - select_first = False, - debug = opts.debug, - custom_ui = None, - language = passedLanguage, - search_all_languages = False,) - - # Display in XML format - # See: http://www.mythtv.org/wiki/MythTV_Universal_Metadata_Format - Queries.config['moviedb'].xml = True - - # Process requested option - if opts.movielist: # Movie Search -M - Queries.movieSearch(args[0]) - elif opts.moviedata: # Movie metadata -D - Queries.movieData(args[0]) - elif opts.peoplelist: # People Search -P - Queries.peopleSearch(args[0]) - elif opts.peopleinfo: # Person metadata -I - Queries.peopleData(args[0]) - elif opts.moviehash: # Movie metadata using a hash value -H - Queries.hashData(args[0]) - - sys.exit(0) -# end main() - -if __name__ == '__main__': - main() diff --git a/mythtv/themes/MythCenter-wide/notification-ui.xml b/mythtv/themes/MythCenter-wide/notification-ui.xml index 5afeab6..49b60af 100644 --- a/mythtv/themes/MythCenter-wide/notification-ui.xml +++ b/mythtv/themes/MythCenter-wide/notification-ui.xml @@ -262,7 +262,7 @@ <preserveaspect>true</preserveaspect> </imagetype> - <shape name="textbackground"> + <shape name="textbackground" depends="description|description_noprogress|extra|title|origin"> <area>85,100%-260,-85,-55</area> <fill color="#000000" alpha="100" /> </shape> diff --git a/mythtv/themes/MythCenter/notification-ui.xml b/mythtv/themes/MythCenter/notification-ui.xml index 95699af..a92c5ad 100644 --- a/mythtv/themes/MythCenter/notification-ui.xml +++ b/mythtv/themes/MythCenter/notification-ui.xml @@ -262,7 +262,7 @@ <preserveaspect>true</preserveaspect> </imagetype> - <shape name="textbackground"> + <shape name="textbackground" depends="description|description_noprogress|extra|title|origin"> <area>85,100%-260,-85,-55</area> <fill color="#000000" alpha="100" /> </shape> mythtv-0.27-libcec2.patch: configure | 4 configure.orig | 6500 ++++++++++++++++++++++++++++++++++++++++++ libs/libmythui/cecadapter.cpp | 265 + libs/libmythui/cecadapter.h | 1 4 files changed, 6704 insertions(+), 66 deletions(-) --- NEW FILE mythtv-0.27-libcec2.patch --- diff -Naur mythtv-0.27.orig/mythtv/configure mythtv-0.27/mythtv/configure --- mythtv-0.27.orig/mythtv/configure 2013-10-30 14:48:35.095484881 -0500 +++ mythtv-0.27/mythtv/configure 2013-10-30 14:48:50.182157901 -0500 @@ -5472,10 +5472,12 @@ using namespace CEC; #include <libcec/cecloader.h> int main(void) { + if (CEC_LIB_VERSION_MAJOR == 2) + return 1; if (CEC_LIB_VERSION_MAJOR < 1 || (CEC_LIB_VERSION_MAJOR == 1 && CEC_LIB_VERSION_MINOR < 5)) return 0; - return (long) LibCecInit; + return 1; } EOF fi diff -Naur mythtv-0.27.orig/mythtv/configure.orig mythtv-0.27/mythtv/configure.orig --- mythtv-0.27.orig/mythtv/configure.orig 1969-12-31 18:00:00.000000000 -0600 +++ mythtv-0.27/mythtv/configure.orig 2013-10-30 14:48:35.095484881 -0500 @@ -0,0 +1,6500 @@ +#!/bin/sh +# +# MythTV configure script, based on the FFmpeg configure script +# +# Copyright (c) 2000-2002 Fabrice Bellard +# Copyright (c) 2005-2008 Diego Biurrun +# Copyright (c) 2005-2008 Mans Rullgard +# + +# Prevent locale nonsense from breaking basic text processing. +LC_ALL=C +export LC_ALL + +# make sure we are running under a compatible shell +# try to make this part work with most shells + +try_exec(){ + echo "Trying shell $1" + type "$1" > /dev/null 2>&1 && exec "$@" +} + +unset foo +(: ${foo%%bar}) 2> /dev/null +E1="$?" + +(: ${foo?}) 2> /dev/null +E2="$?" + +if test "$E1" != 0 || test "$E2" = 0; then + echo "Broken shell detected. Trying alternatives." + export FF_CONF_EXEC + if test "0$FF_CONF_EXEC" -lt 1; then + FF_CONF_EXEC=1 + try_exec bash "$0" "$@" + fi + if test "0$FF_CONF_EXEC" -lt 2; then + FF_CONF_EXEC=2 + try_exec ksh "$0" "$@" + fi + if test "0$FF_CONF_EXEC" -lt 3; then + FF_CONF_EXEC=3 + try_exec /usr/xpg4/bin/sh "$0" "$@" + fi + echo "No compatible shell script interpreter found." + echo "This configure script requires a POSIX-compatible shell" + echo "such as bash or ksh." + echo "THIS IS NOT A BUG IN FFMPEG, DO NOT REPORT IT AS SUCH." + echo "Instead, install a working POSIX-compatible shell." + echo "Disabling this configure test will create a broken MythTV." + if test "$BASH_VERSION" = '2.04.0(1)-release'; then + echo "This bash version ($BASH_VERSION) is broken on your platform." + echo "Upgrade to a later version if available." + fi + exit 1 +fi + +test -d /usr/xpg4/bin && PATH=/usr/xpg4/bin:$PATH + +show_help(){ + cat <<EOF +Usage: configure [options] +Options: [defaults in brackets after descriptions] + +Standard options: + --help print this message + --previous use previous configure parameters if possible + --compile-type=CTYPE one of release, profile, debug [$compile_type] + NOTE: profile is for sampling profilers + --prefix=PREFIX install in PREFIX [$prefix] + --runprefix=PREFIX prefix to be used at runtime (e.g. .. or /myth/latest) + --libdir-name=LIBNAME search/install libraries in PREFIX/LIBNAME [$libdir_name] + --disable-ccache disable compiler cache (ccache) + --disable-distcc disable distributed compilation (distcc) + +Advanced options (experts only): + --cross-prefix=PREFIX use PREFIX for compilation tools [$cross_prefix] + --enable-cross-compile assume a cross-compiler is used + --sysroot=PATH root of cross-build tree + --sysinclude=PATH location of cross-build system headers + --cc=CC use C compiler CC [$cc_default] + --cxx=CXX use C++ compiler CXX [$cxx_default] + --ld=LD use linker LD + --qmake=QMAKE use specified qmake [$qmake_default] + --qmakespecs=PATH use specified mkspecs + --extra-cflags=ECFLAGS add ECFLAGS to CFLAGS [$CFLAGS] + --extra-cxxflags=ECXFLAGS add ECXXFLAGS to list of flags for C++ compile + --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS [$LDFLAGS] + --disable-symbol-visibility disables symbol visibility options + --arch=ARCH select architecture [$arch] + --tune=CPU tune instruction usage for a particular CPU [$tune] + --cpu=CPU select the minimum required CPU (affects + instruction selection, may crash on older CPUs) + --disable-altivec disable AltiVec optimizations + --disable-amd3dnow disable 3DNow! optimizations + --disable-amd3dnowext disable 3DNow! extended optimizations + --disable-mmx disable MMX optimizations + --disable-mmx2 disable MMX2 optimizations + --disable-sse disable SSE optimizations + --disable-ssse3 disable SSSE3 optimizations + --disable-avx disable AVX optimizations + --disable-yasm disable use of yasm assembler + --enable-pic build position-independent code + --enable-proc-opt enable processor specific compilation + + --disable-audio-oss disable OSS audio support + --disable-audio-alsa disable ALSA audio support + --disable-audio-jack disable JACK audio support + --disable-audio-pulseoutput disable PulseAudio audio output support + --enable-valgrind disables timeouts for valgrind memory debugging + --disable-lirc disable lirc support (Infrared Remotes) + --disable-joystick-menu disable joystick menu + --disable-libcec disable libCEC device support + --libcec-path=HDRLOC location of directory containing + 'libcec/cec.h', not the directory + with 'cec.h' [$libcec_path_default] + --firewire-sdk specify location for mac FireWire SDK [mac only] + --disable-firewire disable support for FireWire cable boxes + --disable-hdhomerun disable support for HDHomeRun boxes + --disable-ceton disable support for Ceton cards + --disable-v4l2 disable Video4Linux support + --disable-ivtv disable ivtv support (PVR-x50) req. v4l2 support + --disable-hdpvr disable HD-PVR support + --disable-dvb disable DVB support + --dvb-path=HDRLOC location of directory containing + 'linux/dvb/frontend.h', not the + directory with frontend.h [$dvb_path_default] + --disable-asi disable support for ASI recorder + --disable-x11 disable X11 support + --x11-path=X11LOC location of X11 include files [$x11_path_default] + --disable-xrandr disable X11 resolution switching + --disable-xv disable XVideo (X11 video output accel.) + --disable-vdpau disable NVidia VDPAU hardware acceleration. + --disable-crystalhd disable Broadcom CrystalHD hardware decoder support + --disable-vaapi disable VAAPI hardware accelerated video decoding + --disable-dxva2 disable hardware accelerated decoding on windows + --disable-opengl-video disable OpenGL based video display + --disable-quartz-video disable Mac OS X CoreVideo based video display + --disable-libass disable libass SSA/ASS subtitle support + + --enable-mac-bundle produce standalone OS X apps (e.g. mythfrontend.app) + + --disable-libxml2 disable libxml2 support (disc metadata) + --libxml2-path=HDRLOC location of directory containing + 'libxml/parser.h', not the + directory with parser.h [$libxml2_path_default] + --disable-libdns-sd disable DNS Service Discovery (Bonjour/Zeroconf/Avahi) + --disable-libcrypto disable use of the OpenSSL cryptographic library + + --with-bindings=LIST install the bindings specified in the + comma-separated list + Supported bindings: perl, python, php + comma-separated list + --python=PATH Force a specific python executable to use [$python_default] + --perl-config-opts=OPTS Additional options to pass when generating + Makefile.perl for building Perl bindings. + --disable-mythlogserver Do not use mythlogserver logging daemon facility + +External codec library options (used for mythffmpeg and streaming transcode): + --enable-libmp3lame enable MP3 encoding via libmp3lame [no] + --enable-libfaac enable AAC encoding via libfaac [no] + --enable-libx264 enable H.264 encoding via x264 [no] + --enable-libvpx enable VP8 encoding via libvpx [no] + --enable-libxvid enable Xvid encoding via xvidcore, + native MPEG-4/Xvid encoder exists [no] + --enable-sdl enable Simple DirectMedia Layer (required for ffplay) +EOF + +#following is ffmpeg's configure help text +<<EOF +Help options: + --help print this message + --list-decoders show all available decoders + --list-encoders show all available encoders + --list-hwaccels show all available hardware accelerators + --list-demuxers show all available demuxers + --list-muxers show all available muxers + --list-parsers show all available parsers + --list-protocols show all available protocols [...6562 lines suppressed...] adapter->Close(); - LogMessages(); UnloadLibCec(adapter); LOG(VB_GENERAL, LOG_INFO, LOC + "Closing down CEC."); @@ -219,14 +314,12 @@ adapter = NULL; } - void LogMessages(void) + #if CEC_LIB_VERSION_MAJOR < 2 + static int LogMessages(void *, const cec_log_message &message) + #else + static int LogMessages(void *, const cec_log_message message) + #endif { - if (!adapter || !valid) - return; - - cec_log_message message; - while (adapter->GetNextLogMessage(&message)) - { QString msg(message.message); int lvl = LOG_UNKNOWN; switch (message.level) @@ -237,19 +330,15 @@ case CEC_LOG_DEBUG: lvl = LOG_DEBUG; break; } LOG(VB_GENERAL, lvl, LOC + QString("%1").arg(msg)); - } + return 0; } - void HandleCommands(void) + #if CEC_LIB_VERSION_MAJOR < 2 + static int HandleCommands(void * /*cbParam*/, const cec_command &command) + #else + static int HandleCommands(void * /*cbParam*/, const cec_command command) + #endif { - if (!adapter || !valid) - return; - - LogMessages(); - - cec_command command; - while (adapter->GetNextCommand(&command)) - { LOG(VB_GENERAL, LOG_DEBUG, LOC + QString("Command %1 from '%2' (%3) - destination '%4' (%5)") .arg(command.opcode) @@ -260,27 +349,76 @@ switch (command.opcode) { - // TODO + // TODO handle CEC commands. default: break; } + return 0; + } + + #if CEC_LIB_VERSION_MAJOR < 2 + static int HandleConfigurationChanged(void * /*cbParam*/, const libcec_configuration &config) + #else + static int HandleConfigurationChanged(void * /*cbParam*/, const libcec_configuration config) + #endif + { + LOG(VB_GENERAL, LOG_INFO, LOC + "Adapter configuration changed."); + return 1; + } + + #if CEC_LIB_VERSION_MAJOR < 2 + static int HandleAlerts(void * /*cbParam*/, const libcec_alert type, const libcec_parameter & /*param*/) + #else + static int HandleAlerts(void * /*cbParam*/, const libcec_alert type, const libcec_parameter /*param*/) + #endif + { + switch (type) // TODO Handle alerts. + { + case CEC_ALERT_CONNECTION_LOST: + LOG(VB_GENERAL, LOG_ERR, LOC + "Connection lost - TODO: need to handle this!"); + break; + default: + LOG(VB_GENERAL, LOG_ERR, LOC + "Received unknown alert."); + break; } + return 0; + } - LogMessages(); + #if CEC_LIB_VERSION_MAJOR < 2 + static int HandleMenuStateChanged(void * /*cbParam*/, const cec_menu_state &state) + #else + static int HandleMenuStateChanged(void * /*cbParam*/, const cec_menu_state state) + #endif + { + LOG(VB_GENERAL, LOG_INFO, LOC + QString("CEC menu state %1") + .arg(state == CEC_MENU_STATE_ACTIVATED ? "Activated" : "Deactivated")); + return 1; } - void HandleKeyPresses(void) + #if CEC_LIB_VERSION_MAJOR < 2 + static void HandleSourceActivated(void * /*cbParam*/, const cec_logical_address &address, const &uint8_t activated) + #else + static void HandleSourceActivated(void * /*cbParam*/, const cec_logical_address address, const uint8_t activated) + #endif { - if (!adapter || !valid) - return; + LOG(VB_GENERAL, LOG_INFO, LOC + QString("Source %1 %2") + .arg(address).arg(activated ? "Activated" : "Deactivated")); - cec_keypress key; - if (!adapter->GetNextKeypress(&key)) - return; + if (activated && resetSafe) + GetMythUI()->ResetScreensaver(); + else + resetSafe = true; + } + #if CEC_LIB_VERSION_MAJOR < 2 + static int HandleKeyPresses(void * /*cbParam*/, const cec_keypress &key) + #else + static int HandleKeyPresses(void * /*cbParam*/, const cec_keypress key) + #endif + { // Ignore key down events and wait for the key 'up' if (key.duration < 1) - return; + return 0; QString code; int action = 0; @@ -595,13 +733,12 @@ .arg(code).arg(0 == action ? "(Not actioned)" : "")); if (0 == action) - return; + return 0; GetMythUI()->ResetScreensaver(); QKeyEvent* ke = new QKeyEvent(QEvent::KeyPress, action, Qt::NoModifier); qApp->postEvent(GetMythMainWindow(), (QEvent*)ke); - - LogMessages(); + return 0; } void HandleActions(void) @@ -629,7 +766,7 @@ // HDMI input if (switchInput && switchInputAllowed) { - if (adapter->SetActiveView()) + if (adapter->SetActiveSource()) LOG(VB_GENERAL, LOG_INFO, LOC + "Asked TV to switch to this input."); else LOG(VB_GENERAL, LOG_ERR, LOC + "Failed to switch to this input."); @@ -638,14 +775,14 @@ powerOffTV = false; powerOnTV = false; switchInput = false; - - LogMessages(); } ICECAdapter *adapter; + ICECCallbacks callbacks; QString defaultDevice; int defaultHDMIPort; - cec_logical_address defaultDeviceID; + cec_device_type defaultDeviceID; + cec_logical_address base_device; QTimer *timer; bool valid; bool powerOffTV; @@ -728,8 +865,6 @@ void CECAdapter::Process(void) { gLock->lock(); - m_priv->HandleCommands(); - m_priv->HandleKeyPresses(); m_priv->HandleActions(); gLock->unlock(); } diff -Naur mythtv-0.27.orig/mythtv/libs/libmythui/cecadapter.h mythtv-0.27/mythtv/libs/libmythui/cecadapter.h --- mythtv-0.27.orig/mythtv/libs/libmythui/cecadapter.h 2013-09-18 15:06:08.000000000 -0500 +++ mythtv-0.27/mythtv/libs/libmythui/cecadapter.h 2013-10-30 14:48:50.184157885 -0500 @@ -7,6 +7,7 @@ #define LIBCEC_ENABLED QString("libCECEnabled") #define LIBCEC_DEVICE QString("libCECDevice") #define LIBCEC_PORT QString("libCECPort") +#define LIBCEC_BASE QString("libCECBase") #define LIBCEC_DEVICEID QString("libCECDeviceID") #define POWEROFFTV_ALLOWED QString("PowerOffTVAllowed") #define POWEROFFTV_ONEXIT QString("PowerOffTVOnExit")

11 years

1
0
0 / 0

rpms/mythtv/F-19 ChangeLog, 1.10, 1.11 mythtv.spec, 1.124, 1.125 sources, 1.57, 1.58 mythlogserver-segv.patch, 1.1, NONE mythtv-0.26-libcec2.patch, 1.1, NONE mythtv-0.26.1-libva_121.patch, 1.1, NONE

by Richard Shaw

Author: hobbes1069 Update of /cvs/free/rpms/mythtv/F-19 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14640 Modified Files: ChangeLog mythtv.spec sources Removed Files: mythlogserver-segv.patch mythtv-0.26-libcec2.patch mythtv-0.26.1-libva_121.patch Log Message: * Wed Oct 30 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.27-1 - Update to release 0.27. Index: ChangeLog =================================================================== RCS file: /cvs/free/rpms/mythtv/F-19/ChangeLog,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ChangeLog 3 Oct 2013 12:05:01 -0000 1.10 +++ ChangeLog 3 Nov 2013 20:31:50 -0000 1.11 @@ -1,36 +1,561 @@ -commit 33f0177459ded1ed3ca63c319bb825e3ee3a6d56 -Author: Martin Bene <myth(a)bene.priv.at> -Date: Sat Sep 14 16:27:22 2013 -0400 +commit 29eab516202aa76aeb769ed636c183ba3ed0efcf +Author: John Poet <jpoet(a)mythtv.org> +Date: Wed Oct 23 12:20:57 2013 -0600 - Fix MythWeb's date/time handling + Any V4L card may need to preset the tuner. - The code in question has partially changed so I am applying part of Martin's patch - (the section that clears to session variables) to fix the problem. + Refs [a3cdcf573] - Thank you Martin! + (cherry picked from commit c649ee2c2d01ad2dbb95646ec75b78294a4f3709) + +commit 6ecb83e8454e54eb7bf521c8b3eb111e99e35e4a +Author: dev-team <dev-team(a)tikinou.com> +Date: Wed Oct 23 10:18:22 2013 -0400 + + Fixes #11905 - HttpRequest parsing fails on parameters containing encoded & character + +commit ccf877d318a9d976fababe32628d8de765ccfc29 +Author: Jim Stichnoth <jstichnoth(a)mythtv.org> +Date: Mon Oct 21 06:58:31 2013 -0700 + + Bump ABI version after 9ecf7a69ffc00d3f03dbb4c7a611a02d1f19f702. + +commit 9ecf7a69ffc00d3f03dbb4c7a611a02d1f19f702 +Author: Jim Stichnoth <jstichnoth(a)mythtv.org> +Date: Sun Oct 20 15:50:31 2013 -0700 + + Use Live TV order for the card list. + + In many cases, the list of available cards was being returned in card + ID order, when it would be more appropriate (and correct) to use the + Live TV order. + + This fixes a regression introduced in + dc6a18af542c9de80f06cc22485d6ac8b932dfeb. + + (cherry picked from commit 2bb4d08dd087646f7c88557d6d822f98e4e1933a) + +commit c160ce21b9c493eaa7c911e3e2ca031b823678b2 +Author: Jim Stichnoth <jstichnoth(a)mythtv.org> +Date: Sun Oct 20 16:20:31 2013 -0700 + + Revert "Use Live TV order for the card list." + + This reverts commit 7ed0e9dc03ccd542567dee8b27724438166aa3b7. + +commit 83fb4079e92079db83c7d2a622c210610d688012 +Author: Jim Stichnoth <jstichnoth(a)mythtv.org> +Date: Sun Oct 20 16:20:18 2013 -0700 + + Revert "Allow Live TV to be entered from the top-level Program Guide." + + This reverts commit 7555b69babe1e600a33978ecf0d60756bf391e40. + +commit 7555b69babe1e600a33978ecf0d60756bf391e40 +Author: Jim Stichnoth <jstichnoth(a)mythtv.org> +Date: Sun Oct 20 15:58:50 2013 -0700 + + Allow Live TV to be entered from the top-level Program Guide. + + This allows the user to start Live TV on a specific channel from the + Program Guide grid. Otherwise, the user needs to wait for Live TV to + start and tune the initial channel, then find the channel actually + wanted, and wait for it to be tuned. This also provides a workaround + when the default initial channel is untunable for some reason. + + Currently, if the desired channel is not tunable (e.g., all capable + recorders are already busy), it will fail. + + Refs #11913. + +commit 7ed0e9dc03ccd542567dee8b27724438166aa3b7 +Author: Jim Stichnoth <jstichnoth(a)mythtv.org> +Date: Sun Oct 20 15:50:31 2013 -0700 + + Use Live TV order for the card list. + + In many cases, the list of available cards was being returned in card + ID order, when it would be more appropriate (and correct) to use the + Live TV order. + +commit 7323c328dea2094edb369433092696a06cd3b243 +Author: Jim Stichnoth <jstichnoth(a)mythtv.org> +Date: Wed Oct 16 14:59:07 2013 -0700 + + Fix some cc608 field number handling. Refs #11899. + + More accurately decodes CEA-608 captions encoded in SCTE-20 user data. + * Field number 3 is merged with field number 1 instead of 2. + * Data in field number 3 is not rejected. + * Field numbers 1 and 2 are then swapped if top_field_first is false. + These changes are based on the SCTE 20 handling code from ccextractor. + (cherry picked from commit e20a6310b1a2716ce601950a7278726c6d41b538) + +commit 1e5d2479f50f584a3235dea5e2633709dc9ba82b +Author: Stuart Morgan <smorgan(a)mythtv.org> +Date: Fri Oct 18 15:13:35 2013 +0100 + + Fix services GetChannelIcon() when height or width are specified + (cherry picked from commit 15b82903a101eb2111889fb2c9600181f122dcce) + +commit 1c8602a167c465610182edd95cf47adc60b982c8 +Author: Stuart Morgan <smorgan(a)mythtv.org> +Date: Thu Oct 17 22:57:03 2013 +0100 + + Revert "Add ChannelIcons to the list of "special" storage groups." + + This reverts commit 88f380d100ca3e85c3ae26156eae8eb8b24400f6. + + See 3d95e17 + +commit 93ada424fc4c307f6408b47aef1912d9d4c07ec9 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Thu Oct 17 15:24:32 2013 +1100 + + decode URL before attempting to open them. + + Thanks to Chris Pinkham for finding the root cause. + + Fixes #11909 + + (cherry picked from commit cba3bc592f837b4680c2ec8075502b9323bdd3fe) + +commit 88f380d100ca3e85c3ae26156eae8eb8b24400f6 +Author: skd5aner <skd5aner(a)gmail.com> +Date: Wed Oct 16 21:01:48 2013 -0400 + + Add ChannelIcons to the list of "special" storage groups. + + Signed-off-by: Raymond Wagner <rwagner(a)mythtv.org> + (cherry picked from commit d2316b47974f27dc333dd2924e8beb0aca92a73e) + + Conflicts: + + mythtv/libs/libmythbase/storagegroup.cpp + +commit 85462fbc670eb3efc4d3d66cf4708541a51199f1 +Author: Stuart Morgan <smorgan(a)mythtv.org> +Date: Wed Oct 16 16:02:54 2013 +0100 + + Use the ChannelIcon storage group in the services API Guide/GetChannelIcon() + (cherry picked from commit d21c685f62c58e596ce1ece86e85040285eb0ccd) + +commit 23131d313097cdd6bec8ea65633afb453248ef9c +Author: Stuart Morgan <smorgan(a)mythtv.org> +Date: Sun Oct 6 16:40:40 2013 +0100 + + Disable MHEG/ITV when generating previews or flagging commercials + (cherry picked from commit bc62d105d6cd594e18c8d0674902916d3b00d37b) + +commit 1224f055aa7960ffe2d6bfcd71300ff90d7e6b93 +Author: Stuart Morgan <smorgan(a)mythtv.org> +Date: Thu Sep 19 12:31:15 2013 +0100 + + Make sure callbacks are disabled when the slave backend ANNounces. + + Refs #11867 + (cherry picked from commit 84fa3fe02d6731d06b4d64573253710405767923) + +commit 0095fd137188545ec18faa4116861fd524cbe81b +Author: Stuart Morgan <smorgan(a)mythtv.org> +Date: Wed Sep 18 14:50:27 2013 +0100 + + Prevent the use of SendReceiveStringList() on a socket with callbacks. Fixes #11777 + (cherry picked from commit 836eb11d96abfaa5986e7382103db69769b0ae47) + +commit 1a3639a3f0851d3d124d1904e029739499f5685f +Author: Jim Stichnoth <jstichnoth(a)mythtv.org> +Date: Fri Oct 11 06:53:53 2013 -0700 + + Update binary version after [aaa418e]. + +commit aaa418ef1dcd6973ec2db564f6c3c78fe7ad4096 +Author: Jim Stichnoth <jstichnoth(a)mythtv.org> +Date: Sun Oct 6 11:21:50 2013 -0700 + + Add mythutil --getmarkup and mythutil --setmarkup commands. + + This extracts the contents of the recordedmarkup, recordedseek, and + filemarkup tables to or from a local xml file. The primary reason is + to allow users to extract recorder seektable information as needed and + attach it to a ticket, for a developer to use for debugging. Example: + + mythutil --chanid xxx --starttime yyy --getmarkup /tmp/markup.xml + mythutil --video zzz.mpg --setmarkup /tmp/markup.xml + + An added benefit is to be able to copy metadata (e.g. seektable, + commskiplist, cutlist) between isolated MythTV instances. + (cherry picked from commit dafb81abcf8955112037d2e7e230ebb8eb068886) + +commit db1b1c87bea4555fe51786e6b2c16fafdd030fea +Author: Jim Stichnoth <jstichnoth(a)mythtv.org> +Date: Fri Sep 20 06:12:33 2013 -0700 + + Mythutil: Allow --video instead of --chanid/--starttime. + + This applies to the markup utils. Refs #10804 + (cherry picked from commit 97a309a04f017fcfbdb2004a12008e1f563b141c) + +commit 95d94e291c3113b93e705c0fc72c8f087704d991 +Author: Jim Stichnoth <jstichnoth(a)mythtv.org> +Date: Fri Oct 11 06:10:22 2013 -0700 + + Add missing toUTC() conversions in the preview generator. + + Without these conversions, modification timestamps on + backend-generated preview files are reported in local time, but + interpreted by the frontend as UTC. The frontend then converts this + to local time and uses that to set the modification timestamp of the + locally cached preview, effectively back-dating the cached file in + most time zones. This messes up date comparison logic for determining + whether to regenerate or reload the preview image. + (cherry picked from commit ad18e3d69c19ab6e197e15d285844ccb49e16795) + +commit 42be114b97c095bcd0f9a35a9419dbe31538c086 +Author: Raymond Wagner <rwagner(a)mythtv.org> +Date: Thu Oct 10 19:18:53 2013 -0400 + + Bump binary version. + +commit 9bfed2b0989f92dc4f98401c968a59ae9238da5d +Author: Raymond Wagner <rwagner(a)mythtv.org> +Date: Thu Oct 10 18:56:34 2013 -0400 + + Add back ArtworkTask enable check... properly. + + This adds the check for DailyArtworkUpdates back to ArtworkTask, + following its reversion in ca3a79bf407, but properly runs the + PeriodicHouseKeeperTask check so it does not requeue once per minute. + + Refs #11902 + (cherry picked from commit 7905afdd4fc7d9ee2eb1bf97bffe0f6e003cc1e9) + +commit e72f3375f4176d3ed12eb91ce7732143860fdf19 +Author: Raymond Wagner <rwagner(a)mythtv.org> +Date: Thu Oct 10 18:47:16 2013 -0400 + + Add secondary check to prevent housekeeper task from running twice. + + This adds an extra check to prevent a HouseKeeperTask from running + more than once simultaneously. This prevents an issue seen in a + misconfigured child task that was queued in concurrent passes. One + instance had not yet finished when the second one started a minute + later, and overwrote a shared pointer, eventually resulting in a + segmentation fault. + + Cause spotted by Jonatan Lindblad. + + Refs #11902 + (cherry picked from commit c712ed04255fe416d95a674ed50e045d864759e8) + +commit cd6df2c8007913680bdb90f544d5a6b81f560ffa +Author: Stuart Morgan <smorgan(a)mythtv.org> +Date: Thu Oct 10 22:18:25 2013 +0100 + + Revert "Have backendhousekeeper check for artwork update boolean." + + This reverts commit 3798a07098272be9f04902ec71874b0d2fb1308d. + +commit d05c10e9fd105bc8ed6caccd0f132b8ec64767d2 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Thu Oct 10 17:47:45 2013 +1100 + + Improve AirPlay device visibility in iOS 7 - Refs #9833 + For some reasons, my iPhone doesn’t always show mythtv as an AirPlay device, and more often than not only show it as an audio device. + After playing a lot with the various bonjour advertising data, what I can gather is: + - If AirPlay video reports a version >= 120.x; the iPhone will attempt to use FairPlay DRM no matter what RAOP reports (even if it reports no support for encryption) + - If there’s a mismatch of version between AirPlay video and RAOP: the iPhone 5 won’t show the video service + - If reporting a version < 110 in AirPlay video, then photo sharing doesn’t reliably work + - If bit 10 in features bitmask is cleared, it doesn’t reliably show up + So I set the AirPlay video version to 115.3 (made up value) that allows photo sharing, and RAOP also to 115.3 and it all seem to work nicely now - Signed-off-by: Nicolas Riendeau <nriendeau(a)mythtv.org> + (cherry picked from commit 7e2f21c8a3614fe059abed3801aafd6dbc1ed07a) -commit 7326d7ef70fb86037d9c30ca7e0762d0cb01b7ff -Author: Scott Shawcroft <scott.shawcroft(a)gmail.com> -Date: Tue Aug 27 22:34:55 2013 -0400 +commit aa362d70accb74cf3fe6bfdfd85e9a7b421aaf46 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Thu Oct 10 13:34:31 2013 +1100 - Fix the problem of MythWeb failing to load translations + Do not display background shape in fullscreen notification if there’s nothing in it - Refs #11513 + So nothing cover a photo when using AirPlay photo sharing - Signed-off-by: Nicolas Riendeau <nriendeau(a)mythtv.org> + (cherry picked from commit 92f02ac76c7011420b3e2981210826f651dc65da) -commit 5d8ffe109286269ada87390a2b74e142ec36e364 -Author: Karl Dietz <dekarl(a)mythtv.org> -Date: Mon Aug 26 22:39:35 2013 +0200 +commit e59e5f63de5f5c3fda1b58b2cf8e370c96c6337c +Author: Raymond Wagner <rwagner(a)mythtv.org> +Date: Wed Oct 9 01:08:53 2013 -0400 - fix merge in schedule templates added in f97529656 + Perform run checks for housekeeper tasks set to run on startup. - if (!$this->$name) ends up as if(!0)... + This may need some rethinking if we want a way to bypass the checks and + force something to run on startup. + (cherry picked from commit 4d07f2804c64f1f045480fa1f882050b2fcb3111) + +commit 3798a07098272be9f04902ec71874b0d2fb1308d +Author: Raymond Wagner <rwagner(a)mythtv.org> +Date: Wed Oct 9 01:08:10 2013 -0400 + + Have backendhousekeeper check for artwork update boolean. + (cherry picked from commit f4669d6c1b752b943b2b2f04c7382445b88a3d70) + +commit 756d95d85f9d2049b667edeb269668b502839418 +Author: David Engel <dengel(a)mythtv.org> +Date: Mon Oct 7 13:25:14 2013 -0500 + + Always use current time when entering EPG from live TV. + + Backported from master. + + Refs #11891 + +commit 77db95785de9b80f87b96a46220124a1fcc50bf8 +Author: Stuart Morgan <smorgan(a)mythtv.org> +Date: Sat Oct 5 21:30:45 2013 +0100 + + Use MythDate::fromString() instead of QDateTime::fromString() + +commit a8e3b71249d7871ae5f2f62d9944e588c20843b1 +Author: Stuart Morgan <smorgan(a)mythtv.org> +Date: Sat Oct 5 00:26:29 2013 +0100 + + Ensure the date we pulled as a string from the database is actually valid + +commit 46d8c2392429113e40be9a7dcc3dd392c625b8d7 +Author: Jim Stichnoth <jstichnoth(a)mythtv.org> +Date: Fri Oct 4 06:59:05 2013 -0700 + + Bump the ABI version after 990757a. Refs #11415. + +commit 990757a60e43c7054876eee5de4cc25a5a301022 +Author: Jim Stichnoth <jstichnoth(a)mythtv.org> +Date: Sat Sep 28 07:43:12 2013 -0700 + + Provide better seeking and position display for some videos. + + Specifically, there are examples of poorly-encoded avi files that + report a video frame rate of 30fps but the video stream is actually + 24fps. Because frame intervals are actually encoded as 30fps, every + 4th frame has to be repeated. Without an adjustment to framesPlayed, + translations between MythPlayer's frame-based seeking/display and + ffmpeg's timecode-based seeking drift out of sync. + + Note: Similar adjustments may be necessary if frames have to be + dropped due to a frame rate mismatch. + + Refs #11415. + (cherry picked from commit e7a8dfc62226f3b192559828e43f3396640c7c0e) + +commit c6f2e2f8f63ba113889db43327f30e4b834f4363 +Author: Stuart Morgan <smorgan(a)mythtv.org> +Date: Fri Oct 4 14:33:39 2013 +0100 + + Add some logging to show what is happening with the startup shutdown block. + +commit b3a827da3bc425581d9ea17e136dd704eb70bc6b +Author: Stuart Morgan <smorgan(a)mythtv.org> +Date: Fri Oct 4 14:13:20 2013 +0100 + + Fix startup 'wait for client' check that assumed the client would be non-blocking. It's possible for a frontend to connect to the backend, then go idle before we re-checked for it's presence, which would have prevented the backend shutting down. If _any_ client is connected, then release the block on shutdown. + (cherry picked from commit 7e0fa3f28320ca658ef2e1945e3f1919bb6e2022) + +commit 0536d476d9d2e2f5468022d784f4bf17742b7e78 +Author: Stuart Morgan <smorgan(a)mythtv.org> +Date: Fri Oct 4 13:27:53 2013 +0100 + + More robust checks before blocking shutdown for a mfdb run in the near future + (cherry picked from commit a269f9538763c426414e7dc9dd6d93d3329e2156) + +commit 4a7ea0f469e64a85d42e6c9c88944f5be11ca193 +Author: Stuart Morgan <smorgan(a)mythtv.org> +Date: Fri Oct 4 13:17:36 2013 +0100 + + Add more logging HandleIdleShutdown() to give a clearer picture of what's happening + (cherry picked from commit be074d181b21b4107d7084d1dd6648820ed5aaed) + +commit c8e45cbde2f4fc628364b0ea0c4989cbf3a56f70 +Author: Stuart Morgan <smorgan(a)mythtv.org> +Date: Thu Oct 3 23:04:38 2013 +0100 + + Fix compilation on Windows + +commit 7ed4e40da216e96c615a22d9d7879fb16b26f16a +Author: Stuart Morgan <smorgan(a)mythtv.org> +Date: Thu Oct 3 22:48:22 2013 +0100 + + More robust check before using mfdb run time as wakeup time + (cherry picked from commit d9f5a172d3024216b5c7b6d3e8b8ccc8e40ed3e2) + +commit 89fb9d45b6584ce948c26eece0494ac6614becd9 +Author: Stuart Morgan <smorgan(a)mythtv.org> +Date: Thu Oct 3 13:35:37 2013 +0100 + + Wakeup the backend to run mythfilldatabase + + This uses MythFillSuggestedRunTime, for xmltv sources (+24 hours), for + datadirect whatever time was suggested by TMS to ensure that we always + wake up the backend to collect guide data (xmltv, DD only, EIT is not + yet supported). Using MythFillSuggestedRunTime is a bit of a hack, but + it's already set for Schedules Direct so this was the simplest + solution. + + For now the "Run guide data program at time suggested by the grabber" + setting MUST be enabled for this to work as intended. + + Without this fix the backend won't wake up to grab guide data from + xmltv/SD sources and that may result in it eventually running out of data + entirely. + (cherry picked from commit b27bba2921b6aed801173de8ae2707dd958b75f3) + +commit 6ff9ea0dc2d977c013e6fbdafc5ba2ad24d68248 +Author: Stuart Morgan <smorgan(a)mythtv.org> +Date: Wed Oct 2 19:37:29 2013 +0100 + + Replace usage of direct queries on the settings table with SaveSetting() in MythFillDatabase + (cherry picked from commit 4629d336e30a62945a557fc8aa1602634aa09f24) + +commit 7ae9f17e658f37cd46ef5c44d1ce579369dc34ca +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Wed Oct 2 03:20:26 2013 +1000 + + Revert "Properly propagate quiet log option" + + This reverts commit a74baed2bbf3a72f2af58fe684398d3fdd01f256. + + (cherry picked from commit 445a73793de9f21a512232a8a82c34372aac379b) + +commit 74356081e9271845f7b212cddfde29c229b33bc3 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Wed Oct 2 03:20:01 2013 +1000 + + Remove unnecessary command option, all we are doing is adding —nologserver twice + + (cherry picked from commit 996f652f0f143513bdbe9e5510714f776c9cd44f) + +commit 79208f2c937a7211a19d9985154ad0ce280dde92 +Author: Jim Stichnoth <jstichnoth(a)mythtv.org> +Date: Tue Oct 1 06:34:54 2013 -0700 + + Fix an apparent copy&paste error. Refs #11885 + (cherry picked from commit ba7d683767140a2ddf31664454da40ea4e63d6d3) + +commit a179aae608c7aa0ee80620267df7773c5fa4b75f +Author: Paul Harrison <pharrison(a)mythtv.org> +Date: Wed Sep 25 10:58:21 2013 +0100 + + MythZoneMinder: fix the grabbing of the live stream images + + * Add a missing field to the ShareData struct added it later ZM versions + * Change the minimum supported ZM version to 1.24.0. + * Remove the v4l2 hack + + Note: this bumps the MythZoneMinder protocol version so both the FE plugin + and mythzmserver need to be updated. + + Refs #8182 + + (cherry picked from commit b1867bd45765157432f5598aa26377fb922ed116) + +commit d9561055abeec11fba234c9bdfbde5e79e695803 +Author: Jim Stichnoth <jstichnoth(a)mythtv.org> +Date: Tue Sep 24 06:38:25 2013 -0700 + + Clear duration and framecount flags with mythutil --clearseektable. + + Otherwise those flags are hard to get rid of when mythcommflag + --rebuild doesn't produce a correct seektable for some reason. + (cherry picked from commit c4f0c0c57c87c4bfe2e9d143648df2a02c44d578) + +commit b6a657478df796c810c788922a545d84f36e7129 +Author: David Engel <dengel(a)mythtv.org> +Date: Mon Sep 23 13:26:45 2013 -0500 + + Fix startts copy & paste error in previous ForgetHistory() change. + + Also, do use subtitle & description semantics when the original + information is no longer available, but do it in a way that can be + easily detected and works in all code paths. + + (cherry picked from commit d2231e90b3f581c69e12cd376324a6b8cdf9ac65) + +commit 2ccd08f72b3d445b9a768bf72da25749326821d9 +Author: David Engel <dengel(a)mythtv.org> +Date: Mon Sep 23 12:29:09 2013 -0500 + + Change RI::ForgetHistory() to use dupmethod when available. + + Previously, ForgetHistory() implicily used subtitle and description as + the duplicate check method. Consequently, it doesn't always match + correctly when other methods are used and there are guide changes in + data that should be ignored. In addition, don't assume any dupmethod + in the Previously Recorded screen to avoid being to overzealous when + called from there. + + (cherry picked from commit 567cba3184db0e5801dc1ae7736d5d778ec2d96c) + +commit 4ae99828b0b82a8498eb0af986dfbceb626f739c +Author: Paul Harrison <pharrison(a)mythtv.org> +Date: Sun Sep 22 23:45:54 2013 +0100 + + MythMusic: fix playback of ogg radio streams + + Peek the probe data from the stream buffer rather than read the data otherwise + ffmpeg fails to open the stream because the magic it is looking for has already + been read from the stream. + + Also increase the probe buffer to 16K this seems to be required for some ogg + streams to be probed properly. + + (cherry picked from commit 6b09d7c629e4efac81276eee9f4b7cbe3bc661ef) + +commit b2486bae6d57bdd8aa78301da7f43982ae5dba73 +Author: Raymond Wagner <rwagner(a)mythtv.org> +Date: Sat Sep 21 17:43:51 2013 -0400 + + Update Python bindings version. + +commit 3d7ac5c2d71f91990bdf73eab2299bc4caf5f278 +Author: Raymond Wagner <rwagner(a)mythtv.org> +Date: Sat Sep 21 17:42:35 2013 -0400 + + Remove more tmdb bits. + (cherry picked from commit a5d54217962a706c4cedc33012e9e7049d4877f6) + +commit 6d4572a88c1c785cf5b6e6a38256b82d6fded148 +Author: Raymond Wagner <rwagner(a)mythtv.org> +Date: Sat Sep 21 17:38:33 2013 -0400 + + Remove tmdb library from python installer script. + (cherry picked from commit 9c0dfbc9f6b753a5b3d6f2e294baaf9577519a91) + +commit db4167ec3d1396c81d00d3fe71b6ca104880136d +Author: Raymond Wagner <rwagner(a)mythtv.org> +Date: Sat Sep 21 17:23:05 2013 -0400 + + Remove tmdb.py and associated library. + (cherry picked from commit 53c272dc4ffe2f5392ff54fb3e446801395274fb) + +commit adcda83028125dd6a26f69513ee99da2e7302be3 +Author: Raymond Wagner <rwagner(a)mythtv.org> +Date: Sat Sep 21 16:59:06 2013 -0400 + + Allow system calls to pull global settings from the database. + + This adjusts the System() class to first try local settings of the + supplied value, fall back to global settings, and then the supplied + default, before finally erroring. This corrects an issue where the + VideoGrabber() child class did not properly pull the global settings for + TelevisionGrabber and MovieGrabber, and thus just used the internal + defaults. + (cherry picked from commit 4e072b2de29c32c4d00fe62849feadd80d2c0c02) + +commit 5b917e8d6548c40f3c6df0dcd18a090d90995306 +Author: Jonatan Lindblad <jlindblad(a)mythtv.org> +Date: Wed Sep 18 23:24:45 2013 +0200 + + Update the Swedish translation. - Fixes #11775 + Update of the Swedish translation for mythfrontend and all plugins made + by me and Roger Mårtensson (thank you!). - (cherry picked from commit 08b94cea6346ebeb94edf98ecb5d7b7dd8555560) + (cherry picked from commit 246b2e6a2e496aa8f56c32d38d3997cbf5ff2b1c) Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/F-19/mythtv.spec,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- mythtv.spec 3 Oct 2013 12:05:01 -0000 1.124 +++ mythtv.spec 3 Nov 2013 20:31:50 -0000 1.125 @@ -59,9 +59,12 @@ # The vendor name we should attribute the aforementioned entries to %define desktop_vendor RPMFusion +# MythTV Version string -- preferably the output from git --describe +%define vers_string v0.27-56-g29eab51 + # Git revision and branch ID -%define _gitrev v0.26.1-24-g9fd7c61 -%define branch fixes/0.26 +%define _gitrev v0.27-1-g5b917e8 +%define branch fixes/0.27 # # Basic descriptive tags for this package: @@ -72,11 +75,11 @@ Group: Applications/Multimedia # Version/Release info -Version: 0.26.1 +Version: 0.27 %if "%{branch}" == "master" Release: 0.1.git.%{_gitrev}%{?dist} %else -Release: 4%{?dist} +Release: 1%{?dist} %endif # The primary license is GPLv2+, but bits are borrowed from a number of @@ -102,12 +105,10 @@ %if 0%{?rhel} %define with_crystalhd %{?_without_crystalhd: 1} %{?!_without_crystalhd: 0} %define with_systemd %{?_without_systemd: 1} %{?!_without_systemd: 0} -%define with_vpx %{?_without_vpx: 1} %{?!_without_vpx: 0} %else %define with_crystalhd %{?_without_crystalhd: 0} %{?!_without_crystalhd: 1} %define with_systemd %{?_without_systemd: 0} %{?!_without_systemd: 1} -%define with_vpx %{?_without_vpx: 0} %{?!_without_vpx: 1} %endif %define with_perl %{?_without_perl: 0} %{!?_without_perl: 1} @@ -137,12 +138,11 @@ # From the mythtv git repository with the appropriate branch checked out: # git diff -p --stat v0.26.0 > mythtv-0.26-fixes.patch -Patch0: mythtv-0.26-fixes.patch -Patch1: mythlogserver-segv.patch -Patch2: mythtv-0.26.0-types_h.patch -Patch3: mythtv-0.26.1-libva_121.patch +Patch0: mythtv-0.27-fixes.patch +Patch1: mythtv-0.26.0-types_h.patch # http://code.mythtv.org/trac/ticket/11338 -Patch4: mythtv-0.26-libcec2.patch +# Offset required for 0.27, patch was for 0.26.1 +Patch2: mythtv-0.27-libcec2.patch Source10: PACKAGE-LICENSING Source11: ChangeLog @@ -187,8 +187,8 @@ BuildRequires: libuuid-devel %if 0%{?fedora} BuildRequires: libcec-devel -BuildRequires: libvpx-devel %endif +BuildRequires: libvpx-devel BuildRequires: lm_sensors-devel BuildRequires: lirc-devel @@ -832,7 +832,7 @@ ################################################################################ %prep -%setup -q +%setup -q -n %{name}-%{version} # Replace static lib paths with %{_lib} so we build properly on x86_64 # systems, where the libs are actually in lib64. @@ -841,16 +841,20 @@ fi %patch0 -p1 -b .mythtv -%patch1 -p1 -b .mythlogserver -%patch2 -p1 -b .types_h -%patch3 -p1 -b .libva -%patch4 -p1 -b .libcec +%patch1 -p1 -b .types_h +%patch2 -p1 -b .libcec2 # Install ChangeLog install -m 0644 %{SOURCE11} . pushd mythtv +# Set the mythtv --version string +cat > VERSION <<EOF +SOURCE_VERSION=%{vers_string} +BRANCH=%{branch} +EOF + # Drop execute permissions on contrib bits, since they'll be %doc find contrib/ -type f -exec chmod -x "{}" \; # And drop execute bit on theme html files @@ -894,7 +898,6 @@ --libdir=%{_libdir} \ --libdir-name=%{_lib} \ --mandir=%{_mandir} \ - --enable-iptv \ --enable-pthreads \ --enable-ffmpeg-pthreads \ --enable-joystick-menu \ @@ -910,16 +913,14 @@ --enable-ivtv \ --enable-firewire \ --enable-dvb \ -%if %{with_faac} - --enable-libfaac --enable-nonfree \ -%endif --enable-libmp3lame \ - --enable-libx264 \ --enable-libtheora --enable-libvorbis \ + --enable-libx264 \ --enable-libxvid \ -%if %{with_vpx} - --enable-libvpx \ +%if %{with_faac} + --enable-libfaac --enable-nonfree \ %endif + --enable-libvpx \ %if %{with_vdpau} --enable-vdpau \ %endif @@ -958,12 +959,6 @@ %endif --enable-debug -# Set the mythtv --version string - cat > VERSION <<EOF -SOURCE_VERSION=%{_gitrev} -BRANCH=%{branch} -EOF - # Make make %{?_smp_mflags} @@ -1180,7 +1175,6 @@ usermod -a -G audio,video mythtv exit 0 -%if %{with_mythmusic} %pre -n mythmusic # Add the "mythtv" user, with membership in the audio and video group getent group mythtv >/dev/null || groupadd -r mythtv @@ -1191,7 +1185,6 @@ # or new installs. usermod -a -G audio,video mythtv exit 0 -%endif %post backend %if %{with_systemd} @@ -1252,12 +1245,12 @@ %dir %{_datadir}/mythtv %{_bindir}/mythccextractor %{_bindir}/mythcommflag -%{_bindir}/mythmetadatalookup -%{_bindir}/mythutil -%{_bindir}/mythlogserver %{_bindir}/mythpreviewgen %{_bindir}/mythtranscode %{_bindir}/mythwikiscripts +%{_bindir}/mythmetadatalookup +%{_bindir}/mythutil +%{_bindir}/mythlogserver %{_datadir}/mythtv/mythconverg*.pl %{_datadir}/mythtv/locales/ %{_datadir}/mythtv/metadata/ @@ -1272,6 +1265,7 @@ %{_bindir}/mythjobqueue %{_bindir}/mythmediaserver %{_bindir}/mythreplex +%{_bindir}/mythhdhomerun_config %{_datadir}/mythtv/MXML_scpd.xml %{_datadir}/mythtv/backend-config/ %attr(-,mythtv,mythtv) %dir %{_localstatedir}/lib/mythtv @@ -1304,8 +1298,8 @@ %{_datadir}/mythtv/setup.xml %{_bindir}/mythavtest %{_bindir}/mythfrontend -#%%{_bindir}/mythmessage %{_bindir}/mythlcdserver +%{_bindir}/mythscreenwizard %{_bindir}/mythshutdown %{_bindir}/mythwelcome %dir %{_libdir}/mythtv @@ -1338,6 +1332,8 @@ %files -n mythffmpeg %{_bindir}/mythffmpeg +%{_bindir}/mythffprobe +%{_bindir}/mythffserver %if %{with_perl} %files -n perl-MythTV @@ -1473,15 +1469,13 @@ %changelog -* Tue Oct 1 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.1-4 -- Update to latest bugfix release. -- Add patch for libcec 2. +* Wed Oct 30 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.27-1 +- Update to release 0.27. + +* Mon Aug 26 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.1-2 - Update to latest bugfix release. - Add udisks as a requirement as it is required for ejecting cd/dvds. -* Mon Sep 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.26.1-2 -- Rebuilt - * Thu Aug 22 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.1-1 - Update to latest bugfix release. - Add patch for new libva 1.2.1 version in rawhide. Index: sources =================================================================== RCS file: /cvs/free/rpms/mythtv/F-19/sources,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- sources 23 Aug 2013 18:25:31 -0000 1.57 +++ sources 3 Nov 2013 20:31:50 -0000 1.58 @@ -1 +1 @@ -07aeba952c7adb7fdc553d82fe739deb mythtv-0.26.1.tar.gz +f6d82e5938cc79476353c2c108e73aba mythtv-0.27.tar.gz --- mythlogserver-segv.patch DELETED --- --- mythtv-0.26-libcec2.patch DELETED --- --- mythtv-0.26.1-libva_121.patch DELETED ---

11 years

1
0
0 / 0

rpms/ffmpeg/devel .cvsignore, 1.48, 1.49 ffmpeg.spec, 1.98, 1.99 sources, 1.48, 1.49

by Julian Sikorski

Author: belegdol Update of /cvs/free/rpms/ffmpeg/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4155 Modified Files: .cvsignore ffmpeg.spec sources Log Message: * Tue Oct 29 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 2.1-1 - Updated to 2.1 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- .cvsignore 9 Oct 2013 05:44:34 -0000 1.48 +++ .cvsignore 2 Nov 2013 19:00:26 -0000 1.49 @@ -1 +1 @@ -ffmpeg-2.0.2.tar.bz2 +ffmpeg-2.1.tar.bz2 Index: ffmpeg.spec =================================================================== RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- ffmpeg.spec 22 Oct 2013 18:37:05 -0000 1.98 +++ ffmpeg.spec 2 Nov 2013 19:00:27 -0000 1.99 @@ -13,8 +13,8 @@ Summary: Digital VCR and streaming server Name: ffmpeg -Version: 2.0.2 -Release: 2%{?date}%{?date:git}%{?rel}%{?dist} +Version: 2.1 +Release: 1%{?date}%{?date:git}%{?rel}%{?dist} %if 0%{?_with_amr:1} License: GPLv3+ %else @@ -282,6 +282,9 @@ %changelog +* Tue Oct 29 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 2.1-1 +- Updated to 2.1 + * Tue Oct 22 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.2-2 - Rebuilt for x264 Index: sources =================================================================== RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- sources 9 Oct 2013 05:44:34 -0000 1.48 +++ sources 2 Nov 2013 19:00:27 -0000 1.49 @@ -1 +1 @@ -6c5cfed204d8a108325d1fc439ab734a ffmpeg-2.0.2.tar.bz2 +4ec1cedd4c7753512462f70b347c338a ffmpeg-2.1.tar.bz2

11 years

1
0
0 / 0

rpms/VirtualBox-kmod/F-19 VirtualBox-kmod.spec,1.42,1.43

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/VirtualBox-kmod/F-19 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22724 Modified Files: VirtualBox-kmod.spec Log Message: * Sat Nov 02 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.2-1 - New upstream release. Index: VirtualBox-kmod.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox-kmod/F-19/VirtualBox-kmod.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- VirtualBox-kmod.spec 30 Oct 2013 07:02:49 -0000 1.42 +++ VirtualBox-kmod.spec 2 Nov 2013 14:05:10 -0000 1.43 @@ -19,8 +19,8 @@ %bcond_with hardening Name: VirtualBox-kmod -Version: 4.3.0 -Release: 2%{?prerel:.%{prerel}}%{?dist} +Version: 4.3.2 +Release: 1%{?prerel:.%{prerel}}%{?dist} Summary: Kernel module for VirtualBox Group: System Environment/Kernel @@ -98,6 +98,9 @@ %changelog +* Sat Nov 02 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.2-1 +- New upstream release. + * Wed Oct 30 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.0-2 - don't disable hardening which create /dev/vboxdrvu . - fix release number number and now we really build akmods.

11 years

1
0
0 / 0

rpms/VirtualBox-kmod/devel VirtualBox-kmod.spec,1.21,1.22

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/VirtualBox-kmod/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22565 Modified Files: VirtualBox-kmod.spec Log Message: * Sat Nov 02 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.2-1 - New upstream release. Index: VirtualBox-kmod.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox-kmod/devel/VirtualBox-kmod.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- VirtualBox-kmod.spec 30 Oct 2013 07:05:29 -0000 1.21 +++ VirtualBox-kmod.spec 2 Nov 2013 13:59:51 -0000 1.22 @@ -19,8 +19,8 @@ %bcond_with hardening Name: VirtualBox-kmod -Version: 4.3.0 -Release: 2%{?prerel:.%{prerel}}%{?dist} +Version: 4.3.2 +Release: 1%{?prerel:.%{prerel}}%{?dist} Summary: Kernel module for VirtualBox Group: System Environment/Kernel @@ -98,6 +98,9 @@ %changelog +* Sat Nov 02 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.2-1 +- New upstream release. + * Wed Oct 30 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.0-2 - Don't disable hardening which create /dev/vboxdrvu .

11 years

1
0
0 / 0

rpms/VirtualBox/F-19 .cvsignore, 1.49, 1.50 VirtualBox-4.3.0-libcxx.patch, 1.1, 1.2 VirtualBox.spec, 1.50, 1.51 sources, 1.49, 1.50

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/VirtualBox/F-19 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18195 Modified Files: .cvsignore VirtualBox-4.3.0-libcxx.patch VirtualBox.spec sources Log Message: * Sat Nov 02 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.2-1 - New upstream release, bugfix release. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-19/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 29 Oct 2013 18:59:42 -0000 1.49 +++ .cvsignore 2 Nov 2013 12:01:57 -0000 1.50 @@ -1 +1 @@ -VirtualBox-4.3.0.tar.bz2 +VirtualBox-4.3.2.tar.bz2 VirtualBox-4.3.0-libcxx.patch: ./src/VBox/Runtime/Makefile.kmk | 2 +- ./src/VBox/Storage/testcase/Makefile.kmk | 4 ++-- ./src/libs/kStuff/Makefile.kmk | 2 +- Config.kmk | 4 ++-- b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk | 2 +- b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 4 +--- b/src/VBox/HostDrivers/Support/Makefile.kmk | 2 +- b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------ b/src/VBox/HostDrivers/win/Makefile.kmk | 2 +- b/src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +- b/src/VBox/Installer/win/Resources/Makefile.kmk | 2 +- configure | 2 +- src/VBox/Installer/win/Stub/Makefile.kmk | 2 +- src/libs/liblzf-3.4/Makefile.kmk | 2 +- 14 files changed, 21 insertions(+), 23 deletions(-) Index: VirtualBox-4.3.0-libcxx.patch =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-19/VirtualBox-4.3.0-libcxx.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- VirtualBox-4.3.0-libcxx.patch 29 Oct 2013 04:10:28 -0000 1.1 +++ VirtualBox-4.3.0-libcxx.patch 2 Nov 2013 12:01:57 -0000 1.2 @@ -12,28 +12,6 @@ Redo for VirtualBox-4.2.x and updated for VirtualBox-4.3.x Sérgio Basto <sergio(a)serjux.com> ---- ./src/VBox/Disassembler/testcase/tstAsm.mac.orig 2013-10-27 22:49:12.971665505 +0000 -+++ ./src/VBox/Disassembler/testcase/tstAsm.mac 2013-10-27 22:49:17.290716021 +0000 -@@ -52,7 +52,4 @@ - %error "TEST_BITS is missing or wrong." - %endif - --%if __YASM_MAJOR__ > 1 || (__YASM_MAJOR__ == 1 && __YASM_MINOR__ >= 2) -- %define pmulhrwa pmulhrw --%endif - ---- ./src/VBox/Disassembler/testcase/tstDisasm-1A.asm 2013-10-15 12:12:36.000000000 +0100 -+++ ./src/VBox/Disassembler/testcase/tstDisasm-1A.asm 2013-10-27 22:36:35.204829647 +0000 -@@ -26,9 +26,6 @@ - - BITS 32 - --%if __YASM_MAJOR__ > 1 || (__YASM_MAJOR__ == 1 && __YASM_MINOR__ >= 2) -- %define pmulhrwa pmulhrw --%endif - - - BEGINCODE --- a/Config.kmk +++ b/Config.kmk @@ -2588,7 +2588,7 @@ else Index: VirtualBox.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-19/VirtualBox.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- VirtualBox.spec 29 Oct 2013 04:10:28 -0000 1.50 +++ VirtualBox.spec 2 Nov 2013 12:01:57 -0000 1.51 @@ -26,7 +26,7 @@ #endif Name: VirtualBox -Version: 4.3.0 +Version: 4.3.2 Release: 1%{?prerel:.%{prerel}}%{?dist} Summary: A general-purpose full virtualizer for PC hardware @@ -627,6 +627,9 @@ %changelog +* Sat Nov 02 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.2-1 +- New upstream release, bugfix release. + * Mon Oct 28 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.0-1 - New upstream release. - Refactor patches VirtualBox-4.3.0-32bit.patch, VirtualBox-4.3.0-libcxx.patch, VirtualBox-4.3.0-mesa.patch, Index: sources =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-19/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 29 Oct 2013 18:59:42 -0000 1.49 +++ sources 2 Nov 2013 12:01:57 -0000 1.50 @@ -1 +1 @@ -1f49237686d095859f3dbea0941f8b12 VirtualBox-4.3.0.tar.bz2 +bf986354bf7ee3b2e0251af821b33d7c VirtualBox-4.3.2.tar.bz2

11 years

1
0
0 / 0

rpms/VirtualBox/devel .cvsignore, 1.49, 1.50 VirtualBox-4.3.0-libcxx.patch, 1.1, 1.2 VirtualBox.spec, 1.51, 1.52 sources, 1.49, 1.50

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/VirtualBox/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17203 Modified Files: .cvsignore VirtualBox-4.3.0-libcxx.patch VirtualBox.spec sources Log Message: * Sat Nov 02 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.2-1 - New upstream release, bugfix release. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 28 Oct 2013 19:10:12 -0000 1.49 +++ .cvsignore 2 Nov 2013 11:32:26 -0000 1.50 @@ -1 +1 @@ -VirtualBox-4.3.0.tar.bz2 +VirtualBox-4.3.2.tar.bz2 VirtualBox-4.3.0-libcxx.patch: ./src/VBox/Runtime/Makefile.kmk | 2 +- ./src/VBox/Storage/testcase/Makefile.kmk | 4 ++-- ./src/libs/kStuff/Makefile.kmk | 2 +- Config.kmk | 4 ++-- b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk | 2 +- b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 4 +--- b/src/VBox/HostDrivers/Support/Makefile.kmk | 2 +- b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------ b/src/VBox/HostDrivers/win/Makefile.kmk | 2 +- b/src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +- b/src/VBox/Installer/win/Resources/Makefile.kmk | 2 +- configure | 2 +- src/VBox/Installer/win/Stub/Makefile.kmk | 2 +- src/libs/liblzf-3.4/Makefile.kmk | 2 +- 14 files changed, 21 insertions(+), 23 deletions(-) Index: VirtualBox-4.3.0-libcxx.patch =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-4.3.0-libcxx.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- VirtualBox-4.3.0-libcxx.patch 28 Oct 2013 19:10:12 -0000 1.1 +++ VirtualBox-4.3.0-libcxx.patch 2 Nov 2013 11:32:26 -0000 1.2 @@ -12,28 +12,6 @@ Redo for VirtualBox-4.2.x and updated for VirtualBox-4.3.x Sérgio Basto <sergio(a)serjux.com> ---- ./src/VBox/Disassembler/testcase/tstAsm.mac.orig 2013-10-27 22:49:12.971665505 +0000 -+++ ./src/VBox/Disassembler/testcase/tstAsm.mac 2013-10-27 22:49:17.290716021 +0000 -@@ -52,7 +52,4 @@ - %error "TEST_BITS is missing or wrong." - %endif - --%if __YASM_MAJOR__ > 1 || (__YASM_MAJOR__ == 1 && __YASM_MINOR__ >= 2) -- %define pmulhrwa pmulhrw --%endif - ---- ./src/VBox/Disassembler/testcase/tstDisasm-1A.asm 2013-10-15 12:12:36.000000000 +0100 -+++ ./src/VBox/Disassembler/testcase/tstDisasm-1A.asm 2013-10-27 22:36:35.204829647 +0000 -@@ -26,9 +26,6 @@ - - BITS 32 - --%if __YASM_MAJOR__ > 1 || (__YASM_MAJOR__ == 1 && __YASM_MINOR__ >= 2) -- %define pmulhrwa pmulhrw --%endif - - - BEGINCODE --- a/Config.kmk +++ b/Config.kmk @@ -2588,7 +2588,7 @@ else Index: VirtualBox.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- VirtualBox.spec 28 Oct 2013 19:10:12 -0000 1.51 +++ VirtualBox.spec 2 Nov 2013 11:32:26 -0000 1.52 @@ -26,7 +26,7 @@ #endif Name: VirtualBox -Version: 4.3.0 +Version: 4.3.2 Release: 1%{?prerel:.%{prerel}}%{?dist} Summary: A general-purpose full virtualizer for PC hardware @@ -627,6 +627,9 @@ %changelog +* Sat Nov 02 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.2-1 +- New upstream release, bugfix release. + * Mon Oct 28 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.0-1 - New upstream release. - Refactor patches VirtualBox-4.3.0-32bit.patch, VirtualBox-4.3.0-libcxx.patch, VirtualBox-4.3.0-mesa.patch, Index: sources =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 28 Oct 2013 19:10:12 -0000 1.49 +++ sources 2 Nov 2013 11:32:26 -0000 1.50 @@ -1 +1 @@ -1f49237686d095859f3dbea0941f8b12 VirtualBox-4.3.0.tar.bz2 +bf986354bf7ee3b2e0251af821b33d7c VirtualBox-4.3.2.tar.bz2

11 years

1
0
0 / 0

rpms/x264/devel .cvsignore, 1.30, 1.31 sources, 1.30, 1.31 x264.spec, 1.61, 1.62 x264-gf_malloc.patch, 1.1, NONE

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/x264/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10648 Modified Files: .cvsignore sources x264.spec Removed Files: x264-gf_malloc.patch Log Message: * Sat Nov 02 2013 Sérgio Basto <sergio(a)serjux.com> - 0.138-20131030-c628e3b - Update to 0.138 git c628e3b (stable branch) and bootstrap for new ffmpeg. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/x264/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 18 Oct 2013 22:44:43 -0000 1.30 +++ .cvsignore 2 Nov 2013 01:36:19 -0000 1.31 @@ -1 +1 @@ -x264-0.136-20131005-3361d59.tar.bz2 +x264-0.138-20131030-c628e3b.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/x264/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 18 Oct 2013 22:44:43 -0000 1.30 +++ sources 2 Nov 2013 01:36:19 -0000 1.31 @@ -1 +1 @@ -eb391d91d364f24c06bef27329ca3de1 x264-0.136-20131005-3361d59.tar.bz2 +3949edd82cd13e020112bb04a23646da x264-0.138-20131030-c628e3b.tar.bz2 Index: x264.spec =================================================================== RCS file: /cvs/free/rpms/x264/devel/x264.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- x264.spec 18 Oct 2013 22:44:43 -0000 1.61 +++ x264.spec 2 Nov 2013 01:36:19 -0000 1.62 @@ -1,11 +1,11 @@ -%global api 136 -%global gitdate 20131005 -%global gitversion 3361d59 +%global api 138 +%global gitdate 20131030 +%global gitversion c628e3b %global snapshot %{gitdate}-%{gitversion} %global gver .%{gitdate}git%{gitversion} %global branch stable -#global _with_bootstrap 1 +%global _with_bootstrap 1 %{?_with_bootstrap: %global _without_gpac 1 @@ -191,6 +191,9 @@ %{_libdir}/libx26410b.so %changelog +* Sat Nov 02 2013 Sérgio Basto <sergio(a)serjux.com> - 0.138-20131030-c628e3b +- Update to 0.138 git c628e3b (stable branch) and bootstrap for new ffmpeg. + * Fri Oct 18 2013 Sérgio Basto <sergio(a)serjux.com> - 0.136-1.20131005git3361d59 - Update to 0.136 git 3361d59 (stable branch). --- x264-gf_malloc.patch DELETED ---

11 years

1
0
0 / 0

rpms/k3b-extras-freeworld/F-19 0330-CMake-checks-for-FFmpeg-API-changes.patch, NONE, 1.1 0331-Introduce-a-macro-for-referencing-the-ffmpeg-codec.patch, NONE, 1.1 k3b-ffmpeg-review-113295-1.patch, NONE, 1.1 k3b-extras-freeworld.spec, 1.35, 1.36

by Rex Dieter

Author: rdieter Update of /cvs/free/rpms/k3b-extras-freeworld/F-19 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11123 Modified Files: k3b-extras-freeworld.spec Added Files: 0330-CMake-checks-for-FFmpeg-API-changes.patch 0331-Introduce-a-macro-for-referencing-the-ffmpeg-codec.patch k3b-ffmpeg-review-113295-1.patch Log Message: sync w/devel branch 0330-CMake-checks-for-FFmpeg-API-changes.patch: CMakeLists.txt | 47 +++++++++++++++++++++ config-k3b.h.cmake | 11 +++++ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp | 61 +++++++++++++++------------- 3 files changed, 91 insertions(+), 28 deletions(-) --- NEW FILE 0330-CMake-checks-for-FFmpeg-API-changes.patch --- diff -up k3b-2.0.2/CMakeLists.txt.0330 k3b-2.0.2/CMakeLists.txt --- k3b-2.0.2/CMakeLists.txt.0330 2011-01-15 14:52:01.000000000 -0600 +++ k3b-2.0.2/CMakeLists.txt 2013-11-01 08:15:37.219798696 -0500 @@ -100,6 +100,53 @@ if(K3B_BUILD_FFMPEG_DECODER_PLUGIN) "Needed for the K3b FFmpeg decoder plugin which can decode virtually all audio types." "http://ffmpeg.org/" FALSE "" "") + if(FFMPEG_FOUND) + include(CMakePushCheckState) + cmake_push_check_state() + + if(CMAKE_COMPILER_IS_GNUCC) + # FindKDE4Internal.cmake screws things up + set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} -std=c99) + endif(CMAKE_COMPILER_IS_GNUCC) + + if(FFMPEG_INCLUDE_DIR_OLD_STYLE) + set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${FFMPEG_INCLUDE_DIR_OLD_STYLE}) + set(FFMPEG_HEADERS ffmpeg/avcodec.h ffmpeg/avformat.h) + else(FFMPEG_INCLUDE_DIR_OLD_STYLE) + set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${FFMPEG_INCLUDE_DIR} ${FFMPEG_INCLUDE_DIRS}) + set(FFMPEG_HEADERS libavcodec/avcodec.h libavformat/avformat.h) + set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -DNEWFFMPEGAVCODECPATH) + endif(FFMPEG_INCLUDE_DIR_OLD_STYLE) + set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${FFMPEG_LIBRARIES}) + + check_symbol_exists(avformat_open_input "${FFMPEG_HEADERS}" HAVE_FFMPEG_AVFORMAT_OPEN_INPUT) + check_symbol_exists(av_dump_format "${FFMPEG_HEADERS}" HAVE_FFMPEG_AV_DUMP_FORMAT) + check_symbol_exists(avformat_find_stream_info "${FFMPEG_HEADERS}" HAVE_FFMPEG_AVFORMAT_FIND_STREAM_INFO) + check_symbol_exists(avformat_close_input "${FFMPEG_HEADERS}" HAVE_FFMPEG_AVFORMAT_CLOSE_INPUT) + check_symbol_exists(avcodec_open2 "${FFMPEG_HEADERS}" HAVE_FFMPEG_AVCODEC_OPEN2) + check_symbol_exists(avcodec_decode_audio2 "${FFMPEG_HEADERS}" HAVE_FFMPEG_AVCODEC_DECODE_AUDIO2) + check_symbol_exists(avcodec_decode_audio3 "${FFMPEG_HEADERS}" HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3) + check_symbol_exists(avcodec_decode_audio4 "${FFMPEG_HEADERS}" HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4) + include(CheckCSourceCompiles) + check_c_source_compiles(" + #ifdef NEWFFMPEGAVCODECPATH + #include <libavcodec/avcodec.h> + #else + #include <ffmpeg/avcodec.h> + #endif + int main() { enum AVMediaType t = AVMEDIA_TYPE_UNKNOWN; return 0; } + " HAVE_FFMPEG_AVMEDIA_TYPE) + check_c_source_compiles(" + #ifdef NEWFFMPEGAVCODECPATH + #include <libavcodec/avcodec.h> + #else + #include <ffmpeg/avcodec.h> + #endif + int main() { enum CodecID t = CODEC_ID_MP3; return 0; } + " HAVE_FFMPEG_CODEC_MP3) + + cmake_pop_check_state() + endif(FFMPEG_FOUND) endif(K3B_BUILD_FFMPEG_DECODER_PLUGIN) if(K3B_BUILD_FLAC_DECODER_PLUGIN) diff -up k3b-2.0.2/config-k3b.h.cmake.0330 k3b-2.0.2/config-k3b.h.cmake --- k3b-2.0.2/config-k3b.h.cmake.0330 2013-11-01 08:15:37.219798696 -0500 +++ k3b-2.0.2/config-k3b.h.cmake 2013-11-01 08:16:20.375033275 -0500 @@ -22,3 +22,14 @@ #cmakedefine HAVE_BYTESWAP_H 1 #cmakedefine WORDS_BIGENDIAN 1 + +#cmakedefine HAVE_FFMPEG_AVFORMAT_OPEN_INPUT +#cmakedefine HAVE_FFMPEG_AV_DUMP_FORMAT +#cmakedefine HAVE_FFMPEG_AVFORMAT_FIND_STREAM_INFO +#cmakedefine HAVE_FFMPEG_AVFORMAT_CLOSE_INPUT +#cmakedefine HAVE_FFMPEG_AVCODEC_OPEN2 +#cmakedefine HAVE_FFMPEG_AVCODEC_DECODE_AUDIO2 +#cmakedefine HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3 +#cmakedefine HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4 +#cmakedefine HAVE_FFMPEG_AVMEDIA_TYPE +#cmakedefine HAVE_FFMPEG_CODEC_MP3 diff -up k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.0330 k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp --- k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.0330 2013-11-01 08:15:37.215798767 -0500 +++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2013-11-01 08:15:37.219798696 -0500 @@ -42,6 +42,28 @@ extern "C" { #define FFMPEG_BUILD_PRE_4629 #endif +#ifndef HAVE_FFMPEG_AVFORMAT_OPEN_INPUT +// this works because the parameters/options are not used +# define avformat_open_input(c,s,f,o) av_open_input_file(c,s,f,0,o) +#endif +#ifndef HAVE_FFMPEG_AV_DUMP_FORMAT +# define av_dump_format(c,x,f,y) dump_format(c,x,f,y) +#endif +#ifndef HAVE_FFMPEG_AVFORMAT_FIND_STREAM_INFO +# define avformat_find_stream_info(c,o) av_find_stream_info(c) +#endif +#ifndef HAVE_FFMPEG_AVFORMAT_CLOSE_INPUT +# define avformat_close_input(c) av_close_input_file(*c) +#endif +#ifndef HAVE_FFMPEG_AVCODEC_OPEN2 +# define avcodec_open2(a,c,o) avcodec_open(a,c) +#endif +#ifndef HAVE_FFMPEG_AVMEDIA_TYPE +# define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO +#endif +#ifndef HAVE_FFMPEG_CODEC_MP3 +# define CODEC_ID_MP3 CODEC_ID_MP3LAME +#endif K3bFFMpegWrapper* K3bFFMpegWrapper::s_instance = 0; @@ -88,18 +110,14 @@ bool K3bFFMpegFile::open() close(); // open the file -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,2,0) int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, 0 ); -#else - int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 ); -#endif if( err < 0 ) { kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err; return false; } // analyze the streams - ::av_find_stream_info( d->formatContext ); + ::avformat_find_stream_info( d->formatContext, 0 ); // we only handle files containing one audio stream if( d->formatContext->nb_streams != 1 ) { @@ -113,12 +131,7 @@ bool K3bFFMpegFile::open() #else ::AVCodecContext* codecContext = d->formatContext->streams[0]->codec; #endif - if( codecContext->codec_type != -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) - AVMEDIA_TYPE_AUDIO) -#else - CODEC_TYPE_AUDIO) -#endif + if( codecContext->codec_type != AVMEDIA_TYPE_AUDIO) { kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename; return false; @@ -133,7 +146,7 @@ bool K3bFFMpegFile::open() // open the codec on our context kDebug() << "(K3bFFMpegFile) found codec for " << m_filename; - if( ::avcodec_open( codecContext, d->codec ) < 0 ) { + if( ::avcodec_open2( codecContext, d->codec, 0 ) < 0 ) { kDebug() << "(K3bFFMpegDecoderFactory) could not open codec."; return false; } @@ -147,11 +160,7 @@ bool K3bFFMpegFile::open() } // dump some debugging info -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,2,0) ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 ); -#else - ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 ); -#endif return true; } @@ -173,7 +182,7 @@ void K3bFFMpegFile::close() } if( d->formatContext ) { - ::av_close_input_file( d->formatContext ); + ::avformat_close_input( &d->formatContext ); d->formatContext = 0; } } @@ -222,11 +231,7 @@ QString K3bFFMpegFile::typeComment() con return i18n("Windows Media v1"); case CODEC_ID_WMAV2: return i18n("Windows Media v2"); -#if LIBAVCODEC_VERSION_MAJOR < 52 - case CODEC_ID_MP3LAME: -#else case CODEC_ID_MP3: -#endif return i18n("MPEG 1 Layer III"); case CODEC_ID_AAC: return i18n("Advanced Audio Coding (AAC)"); @@ -329,14 +334,14 @@ int K3bFFMpegFile::fillOutputBuffer() d->outputBufferPos = d->alignedOutputBuffer; d->outputBufferSize = AVCODEC_MAX_AUDIO_FRAME_SIZE; -#if LIBAVCODEC_VERSION_MAJOR < 52 - int len = ::avcodec_decode_audio( -#else - #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) +#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3 int len = ::avcodec_decode_audio3( - #else +#else +# ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO2 int len = ::avcodec_decode_audio2( - #endif +# else + int len = ::avcodec_decode_audio( +# endif #endif #ifdef FFMPEG_BUILD_PRE_4629 @@ -346,7 +351,7 @@ int K3bFFMpegFile::fillOutputBuffer() #endif (short*)d->alignedOutputBuffer, &d->outputBufferSize, -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) +#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3 &d->packet ); #else d->packetData, d->packetSize ); 0331-Introduce-a-macro-for-referencing-the-ffmpeg-codec.patch: k3bffmpegwrapper.cpp | 41 +++++++++-------------------------------- 1 file changed, 9 insertions(+), 32 deletions(-) --- NEW FILE 0331-Introduce-a-macro-for-referencing-the-ffmpeg-codec.patch --- >From d27648fc8946735913176dff0c497c806f63dc8a Mon Sep 17 00:00:00 2001 From: Alex Merry <kde(a)randomguy3.me.uk> Date: Fri, 24 Aug 2012 03:07:15 +0100 Subject: [PATCH 331/351] Introduce a macro for referencing the ffmpeg codec This simplifies the code somewhat. REVIEW: 106153 --- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp | 40 +++++++---------------------- 1 file changed, 9 insertions(+), 31 deletions(-) diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp index 0a8fabc..a5ef087 100644 --- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp @@ -39,7 +39,9 @@ extern "C" { #if LIBAVFORMAT_BUILD < 4629 -#define FFMPEG_BUILD_PRE_4629 +#define FFMPEG_CODEC(s) (&s->codec) +#else +#define FFMPEG_CODEC(s) (s->codec) #endif #ifndef HAVE_FFMPEG_AVFORMAT_OPEN_INPUT @@ -126,11 +128,7 @@ bool K3bFFMpegFile::open() } // urgh... ugly -#ifdef FFMPEG_BUILD_PRE_4629 - ::AVCodecContext* codecContext = &d->formatContext->streams[0]->codec; -#else - ::AVCodecContext* codecContext = d->formatContext->streams[0]->codec; -#endif + ::AVCodecContext* codecContext = FFMPEG_CODEC(d->formatContext->streams[0]); if( codecContext->codec_type != AVMEDIA_TYPE_AUDIO) { kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename; @@ -173,11 +171,7 @@ void K3bFFMpegFile::close() d->packetData = 0; if( d->codec ) { -#ifdef FFMPEG_BUILD_PRE_4629 - ::avcodec_close( &d->formatContext->streams[0]->codec ); -#else - ::avcodec_close( d->formatContext->streams[0]->codec ); -#endif + ::avcodec_close( FFMPEG_CODEC(d->formatContext->streams[0]) ); d->codec = 0; } @@ -196,31 +190,19 @@ K3b::Msf K3bFFMpegFile::length() const int K3bFFMpegFile::sampleRate() const { -#ifdef FFMPEG_BUILD_PRE_4629 - return d->formatContext->streams[0]->codec.sample_rate; -#else - return d->formatContext->streams[0]->codec->sample_rate; -#endif + return FFMPEG_CODEC(d->formatContext->streams[0])->sample_rate; } int K3bFFMpegFile::channels() const { -#ifdef FFMPEG_BUILD_PRE_4629 - return d->formatContext->streams[0]->codec.channels; -#else - return d->formatContext->streams[0]->codec->channels; -#endif + return FFMPEG_CODEC(d->formatContext->streams[0])->channels; } int K3bFFMpegFile::type() const { -#ifdef FFMPEG_BUILD_PRE_4629 - return d->formatContext->streams[0]->codec.codec_id; -#else - return d->formatContext->streams[0]->codec->codec_id; -#endif + return FFMPEG_CODEC(d->formatContext->streams[0])->codec_id; } @@ -344,11 +326,7 @@ int K3bFFMpegFile::fillOutputBuffer() # endif #endif -#ifdef FFMPEG_BUILD_PRE_4629 - &d->formatContext->streams[0]->codec, -#else - d->formatContext->streams[0]->codec, -#endif + FFMPEG_CODEC(d->formatContext->streams[0]), (short*)d->alignedOutputBuffer, &d->outputBufferSize, #ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3 -- 1.8.4.2 k3b-ffmpeg-review-113295-1.patch: CMakeLists.txt | 9 ++++++++- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp | 18 ++++++++++++++++++ plugins/decoder/ffmpeg/k3bffmpegwrapper.h | 1 + 3 files changed, 27 insertions(+), 1 deletion(-) --- NEW FILE k3b-ffmpeg-review-113295-1.patch --- diff --git a/CMakeLists.txt b/CMakeLists.txt index ca1531d8e601e423002f6ffa490f2d5bb8dbf5d8..eaf116d14a7de5b330db3823e93477653319177c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -142,12 +142,19 @@ if(K3B_BUILD_FFMPEG_DECODER_PLUGIN) int main() { enum AVMediaType t = AVMEDIA_TYPE_UNKNOWN; return 0; } " HAVE_FFMPEG_AVMEDIA_TYPE) check_c_source_compiles(" + #define CALC_FFMPEG_VERSION(a,b,c) ( a<<16 | b<<8 | c ) #ifdef NEWFFMPEGAVCODECPATH #include <libavcodec/avcodec.h> #else #include <ffmpeg/avcodec.h> #endif - int main() { enum CodecID t = CODEC_ID_MP3; return 0; } + int main() { + #if LIBAVCODEC_BUILD >= CALC_FFMPEG_VERSION(54,25,0) + # Not needed here. AV_CODEC_ID_MP3 exists. return 0; + #else + enum CodecID t = CODEC_ID_MP3; return 0; + #endif + } " HAVE_FFMPEG_CODEC_MP3) cmake_pop_check_state() diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.h b/plugins/decoder/ffmpeg/k3bffmpegwrapper.h index 1ec36b6e465a08f7fe42c80b926e98683be75a5e..88c44f3ec484be4ce0aaa719e219e4a61ec4ac25 100644 --- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.h +++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.h @@ -18,6 +18,7 @@ #include "k3bmsf.h" +#define CALC_FFMPEG_VERSION(a,b,c) ( a<<16 | b<<8 | c ) /** diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp index a5ef087a5ac3a2dc8b7d385b9c3a2e16bf6622bb..5e97cbd7e8b0790f355e6d8b29b8dc55ea099617 100644 --- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp @@ -67,6 +67,13 @@ extern "C" { # define CODEC_ID_MP3 CODEC_ID_MP3LAME #endif +// Has been deprecated for ages. Now removed. For now do what ffmpeg does +// http://ffmpeg.org/pipermail/ffmpeg-cvslog/2012-August/053785.html +// 192000 = 1 second of 48khz 32bit audio +#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE +#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 +#endif + K3bFFMpegWrapper* K3bFFMpegWrapper::s_instance = 0; @@ -209,6 +216,16 @@ int K3bFFMpegFile::type() const QString K3bFFMpegFile::typeComment() const { switch( type() ) { +#if LIBAVCODEC_BUILD >= CALC_FFMPEG_VERSION(54,25,0) + case AV_CODEC_ID_WMAV1: + return i18n("Windows Media v1"); + case AV_CODEC_ID_WMAV2: + return i18n("Windows Media v2"); + case AV_CODEC_ID_MP3: + return i18n("MPEG 1 Layer III"); + case AV_CODEC_ID_AAC: + return i18n("Advanced Audio Coding (AAC)"); +#else case CODEC_ID_WMAV1: return i18n("Windows Media v1"); case CODEC_ID_WMAV2: @@ -217,6 +234,7 @@ QString K3bFFMpegFile::typeComment() const return i18n("MPEG 1 Layer III"); case CODEC_ID_AAC: return i18n("Advanced Audio Coding (AAC)"); +#endif default: return QString::fromLocal8Bit( d->codec->name ); } Index: k3b-extras-freeworld.spec =================================================================== RCS file: /cvs/free/rpms/k3b-extras-freeworld/F-19/k3b-extras-freeworld.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- k3b-extras-freeworld.spec 26 May 2013 21:47:47 -0000 1.35 +++ k3b-extras-freeworld.spec 1 Nov 2013 14:13:33 -0000 1.36 @@ -1,15 +1,19 @@ +# undefine these to disable +%define ffmpeg_decoder 1 +%define lame_encoder 1 +%define mad_decoder 1 + Name: k3b-extras-freeworld Summary: Additional codec plugins for the k3b CD/DVD burning application Epoch: 1 Version: 2.0.2 -Release: 11%{?dist} +Release: 14%{?dist} -Group: Applications/Archiving License: GPLv2+ URL: http://www.k3b.org/ Source0: http://downloads.sourceforge.net/sourceforge/k3b/k3b-%{version}%{?pre}.ta... -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + # TODO: bugzilla/document ExcludeArch: s390 s390x @@ -17,85 +21,111 @@ Patch244: 0244-Fixed-compilation-with-new-FFMPEG.patch Patch290: 0290-fix-for-newer-kde-4.7-FindFFMPEG.cmake.patch Patch312: 0312-Fix-K3B-to-build-with-recent-FFMPEG-versions.patch +# rebased 0330 to apply to 2.0 branch +Patch330: 0330-CMake-checks-for-FFmpeg-API-changes.patch +Patch331: 0331-Introduce-a-macro-for-referencing-the-ffmpeg-codec.patch + +# https://git.reviewboard.kde.org/r/113295/ +# see also http://bugs.kde.org/325486 +Patch500: k3b-ffmpeg-review-113295-1.patch -BuildRequires: cmake -BuildRequires: flac-devel +BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: kdelibs4-devel +BuildRequires: kdelibs4-devel phonon-backend-gstreamer +%if 0%{?fedora} > 16 || 0%{?rhel} > 6 +BuildRequires: libkcddb-devel +%else BuildRequires: kdemultimedia-devel -BuildRequires: libdvdread-devel +%endif BuildRequires: libmpcdec-devel -BuildRequires: libmusicbrainz-devel -BuildRequires: libsamplerate-devel -BuildRequires: libsndfile-devel -BuildRequires: libvorbis-devel +BuildRequires: pkgconfig(dvdread) +BuildRequires: pkgconfig(flac++) +BuildRequires: pkgconfig(libmusicbrainz) # needed by k3bsetup -#BuildRequires: polkit-qt-devel -BuildRequires: taglib-devel - -BuildRequires: ffmpeg-devel -BuildRequires: lame-devel -BuildRequires: libdvdread-devel -BuildRequires: libmad-devel - -Requires: k3b >= %{epoch}:%{version} +#BuildRequires: pkgconfig(polkit-qt-1) +BuildRequires: pkgconfig(samplerate) +BuildRequires: pkgconfig(sndfile) +BuildRequires: pkgconfig(taglib) +BuildRequires: pkgconfig(vorbisenc) pkgconfig(vorbisfile) +BuildRequires: pkgconfig(taglib) + +%if 0%{?ffmpeg_decoder} +BuildRequires: pkgconfig(libavcodec) pkgconfig(libavformat) +%endif +%if 0%{?mad_decoder} +BuildRequires: pkgconfig(mad) +%endif +%if 0%{?lame_encoder} +BuildRequires: lame-devel +%endif +Requires: k3b >= %{epoch}:%{version} %description Additional decoder/encoder plugins for k3b, a feature-rich and easy to handle CD/DVD burning application. - %prep %setup -q -n k3b-%{version} %patch244 -p1 -b .0244 %patch290 -p1 -b .0290 %patch312 -p1 -b .0313 +%patch330 -p1 -b .0330 +%patch331 -p1 -b .0331 +%patch500 -p1 -b .ffmpeg-review-113295-1 -%build +%build mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake_kde4} \ + -DK3B_BUILD_FFMPEG_DECODER_PLUGIN:BOOL=%{?ffmpeg_decoder:ON}%{!?ffmpeg_decoder:OFF} \ + -DK3B_BUILD_LAME_ENCODER_PLUGIN:BOOL=%{?lame_encoder:ON}%{!?lame_encoder:OFF} \ + -DK3B_BUILD_MAD_DECODER_PLUGIN:BOOL=%{?mad_decoder:ON}%{!?mad_decoder:OFF} \ .. popd -#make %{?_smp_mflags} -C %{_target_platform}/libk3bdevice -#make %{?_smp_mflags} -C %{_target_platform}/libk3b -make %{?_smp_mflags} -C %{_target_platform}/plugins/decoder/ffmpeg -make %{?_smp_mflags} -C %{_target_platform}/plugins/decoder/mp3 -make %{?_smp_mflags} -C %{_target_platform}/plugins/encoder/lame - +%{?ffmpeg_decoder:make %{?_smp_mflags} -C %{_target_platform}/plugins/decoder/ffmpeg} +%{?mad_decoder:make %{?_smp_mflags} -C %{_target_platform}/plugins/decoder/mp3} +%{?lame_encoder:make %{?_smp_mflags} -C %{_target_platform}/plugins/encoder/lame} %install -rm -rf %{buildroot} - -make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/plugins/decoder/ffmpeg -make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/plugins/decoder/mp3 -make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/plugins/encoder/lame - - -%clean -rm -rf %{buildroot} +%{?ffmpeg_decoder:make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/plugins/decoder/ffmpeg} +%{?mad_decoder:make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/plugins/decoder/mp3} +%{?lame_encoder:make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/plugins/encoder/lame} %files -%defattr(-,root,root,-) +%if 0%{?ffmpeg_decoder} %{_kde4_libdir}/kde4/k3bffmpegdecoder.so +%{_kde4_datadir}/kde4/services/k3bffmpegdecoder.desktop +%endif +%if 0%{?lame_encoder} %{_kde4_libdir}/kde4/k3blameencoder.so -%{_kde4_libdir}/kde4/k3bmaddecoder.so %{_kde4_libdir}/kde4/kcm_k3blameencoder.so -%{_kde4_datadir}/kde4/services/k3bffmpegdecoder.desktop %{_kde4_datadir}/kde4/services/k3blameencoder.desktop -%{_kde4_datadir}/kde4/services/k3bmaddecoder.desktop %{_kde4_datadir}/kde4/services/kcm_k3blameencoder.desktop +%endif +%if 0%{?mad_decoder} +%{_kde4_libdir}/kde4/k3bmaddecoder.so +%{_kde4_datadir}/kde4/services/k3bmaddecoder.desktop +%endif %changelog +* Fri Nov 01 2013 Rex Dieter <rdieter(a)fedoraproject.org> 1:2.0.2-14 +- re-enable ffmpeg support (kde-bug#325486,kde-review#113295) + +* Tue Oct 01 2013 Rex Dieter <rdieter(a)fedoraproject.org> 1:2.0.2-13 +- cleanup/rebuild + +* Thu Aug 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:2.0.2-12 +- Rebuilt for FFmpeg 2.0.x + * Sun May 26 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:2.0.2-11 - Rebuilt for x264/FFmpeg

11 years

1
0
0 / 0

rpms/k3b-extras-freeworld/devel 0330-CMake-checks-for-FFmpeg-API-changes.patch, NONE, 1.1 0331-Introduce-a-macro-for-referencing-the-ffmpeg-codec.patch, NONE, 1.1 k3b-ffmpeg-review-113295-1.patch, NONE, 1.1 k3b-extras-freeworld.spec, 1.40, 1.41

by Rex Dieter

Author: rdieter Update of /cvs/free/rpms/k3b-extras-freeworld/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9099 Modified Files: k3b-extras-freeworld.spec Added Files: 0330-CMake-checks-for-FFmpeg-API-changes.patch 0331-Introduce-a-macro-for-referencing-the-ffmpeg-codec.patch k3b-ffmpeg-review-113295-1.patch Log Message: * Fri Nov 01 2013 Rex Dieter <rdieter(a)fedoraproject.org> 1:2.0.2-14 - re-enable ffmpeg support (kde-bug#325486,kde-review#113295) 0330-CMake-checks-for-FFmpeg-API-changes.patch: CMakeLists.txt | 47 +++++++++++++++++++++ config-k3b.h.cmake | 11 +++++ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp | 61 +++++++++++++++------------- 3 files changed, 91 insertions(+), 28 deletions(-) --- NEW FILE 0330-CMake-checks-for-FFmpeg-API-changes.patch --- diff -up k3b-2.0.2/CMakeLists.txt.0330 k3b-2.0.2/CMakeLists.txt --- k3b-2.0.2/CMakeLists.txt.0330 2011-01-15 14:52:01.000000000 -0600 +++ k3b-2.0.2/CMakeLists.txt 2013-11-01 08:15:37.219798696 -0500 @@ -100,6 +100,53 @@ if(K3B_BUILD_FFMPEG_DECODER_PLUGIN) "Needed for the K3b FFmpeg decoder plugin which can decode virtually all audio types." "http://ffmpeg.org/" FALSE "" "") + if(FFMPEG_FOUND) + include(CMakePushCheckState) + cmake_push_check_state() + + if(CMAKE_COMPILER_IS_GNUCC) + # FindKDE4Internal.cmake screws things up + set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} -std=c99) + endif(CMAKE_COMPILER_IS_GNUCC) + + if(FFMPEG_INCLUDE_DIR_OLD_STYLE) + set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${FFMPEG_INCLUDE_DIR_OLD_STYLE}) + set(FFMPEG_HEADERS ffmpeg/avcodec.h ffmpeg/avformat.h) + else(FFMPEG_INCLUDE_DIR_OLD_STYLE) + set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${FFMPEG_INCLUDE_DIR} ${FFMPEG_INCLUDE_DIRS}) + set(FFMPEG_HEADERS libavcodec/avcodec.h libavformat/avformat.h) + set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -DNEWFFMPEGAVCODECPATH) + endif(FFMPEG_INCLUDE_DIR_OLD_STYLE) + set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${FFMPEG_LIBRARIES}) + + check_symbol_exists(avformat_open_input "${FFMPEG_HEADERS}" HAVE_FFMPEG_AVFORMAT_OPEN_INPUT) + check_symbol_exists(av_dump_format "${FFMPEG_HEADERS}" HAVE_FFMPEG_AV_DUMP_FORMAT) + check_symbol_exists(avformat_find_stream_info "${FFMPEG_HEADERS}" HAVE_FFMPEG_AVFORMAT_FIND_STREAM_INFO) + check_symbol_exists(avformat_close_input "${FFMPEG_HEADERS}" HAVE_FFMPEG_AVFORMAT_CLOSE_INPUT) + check_symbol_exists(avcodec_open2 "${FFMPEG_HEADERS}" HAVE_FFMPEG_AVCODEC_OPEN2) + check_symbol_exists(avcodec_decode_audio2 "${FFMPEG_HEADERS}" HAVE_FFMPEG_AVCODEC_DECODE_AUDIO2) + check_symbol_exists(avcodec_decode_audio3 "${FFMPEG_HEADERS}" HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3) + check_symbol_exists(avcodec_decode_audio4 "${FFMPEG_HEADERS}" HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4) + include(CheckCSourceCompiles) + check_c_source_compiles(" + #ifdef NEWFFMPEGAVCODECPATH + #include <libavcodec/avcodec.h> + #else + #include <ffmpeg/avcodec.h> + #endif + int main() { enum AVMediaType t = AVMEDIA_TYPE_UNKNOWN; return 0; } + " HAVE_FFMPEG_AVMEDIA_TYPE) + check_c_source_compiles(" + #ifdef NEWFFMPEGAVCODECPATH + #include <libavcodec/avcodec.h> + #else + #include <ffmpeg/avcodec.h> + #endif + int main() { enum CodecID t = CODEC_ID_MP3; return 0; } + " HAVE_FFMPEG_CODEC_MP3) + + cmake_pop_check_state() + endif(FFMPEG_FOUND) endif(K3B_BUILD_FFMPEG_DECODER_PLUGIN) if(K3B_BUILD_FLAC_DECODER_PLUGIN) diff -up k3b-2.0.2/config-k3b.h.cmake.0330 k3b-2.0.2/config-k3b.h.cmake --- k3b-2.0.2/config-k3b.h.cmake.0330 2013-11-01 08:15:37.219798696 -0500 +++ k3b-2.0.2/config-k3b.h.cmake 2013-11-01 08:16:20.375033275 -0500 @@ -22,3 +22,14 @@ #cmakedefine HAVE_BYTESWAP_H 1 #cmakedefine WORDS_BIGENDIAN 1 + +#cmakedefine HAVE_FFMPEG_AVFORMAT_OPEN_INPUT +#cmakedefine HAVE_FFMPEG_AV_DUMP_FORMAT +#cmakedefine HAVE_FFMPEG_AVFORMAT_FIND_STREAM_INFO +#cmakedefine HAVE_FFMPEG_AVFORMAT_CLOSE_INPUT +#cmakedefine HAVE_FFMPEG_AVCODEC_OPEN2 +#cmakedefine HAVE_FFMPEG_AVCODEC_DECODE_AUDIO2 +#cmakedefine HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3 +#cmakedefine HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4 +#cmakedefine HAVE_FFMPEG_AVMEDIA_TYPE +#cmakedefine HAVE_FFMPEG_CODEC_MP3 diff -up k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.0330 k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp --- k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.0330 2013-11-01 08:15:37.215798767 -0500 +++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2013-11-01 08:15:37.219798696 -0500 @@ -42,6 +42,28 @@ extern "C" { #define FFMPEG_BUILD_PRE_4629 #endif +#ifndef HAVE_FFMPEG_AVFORMAT_OPEN_INPUT +// this works because the parameters/options are not used +# define avformat_open_input(c,s,f,o) av_open_input_file(c,s,f,0,o) +#endif +#ifndef HAVE_FFMPEG_AV_DUMP_FORMAT +# define av_dump_format(c,x,f,y) dump_format(c,x,f,y) +#endif +#ifndef HAVE_FFMPEG_AVFORMAT_FIND_STREAM_INFO +# define avformat_find_stream_info(c,o) av_find_stream_info(c) +#endif +#ifndef HAVE_FFMPEG_AVFORMAT_CLOSE_INPUT +# define avformat_close_input(c) av_close_input_file(*c) +#endif +#ifndef HAVE_FFMPEG_AVCODEC_OPEN2 +# define avcodec_open2(a,c,o) avcodec_open(a,c) +#endif +#ifndef HAVE_FFMPEG_AVMEDIA_TYPE +# define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO +#endif +#ifndef HAVE_FFMPEG_CODEC_MP3 +# define CODEC_ID_MP3 CODEC_ID_MP3LAME +#endif K3bFFMpegWrapper* K3bFFMpegWrapper::s_instance = 0; @@ -88,18 +110,14 @@ bool K3bFFMpegFile::open() close(); // open the file -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,2,0) int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, 0 ); -#else - int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 ); -#endif if( err < 0 ) { kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err; return false; } // analyze the streams - ::av_find_stream_info( d->formatContext ); + ::avformat_find_stream_info( d->formatContext, 0 ); // we only handle files containing one audio stream if( d->formatContext->nb_streams != 1 ) { @@ -113,12 +131,7 @@ bool K3bFFMpegFile::open() #else ::AVCodecContext* codecContext = d->formatContext->streams[0]->codec; #endif - if( codecContext->codec_type != -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) - AVMEDIA_TYPE_AUDIO) -#else - CODEC_TYPE_AUDIO) -#endif + if( codecContext->codec_type != AVMEDIA_TYPE_AUDIO) { kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename; return false; @@ -133,7 +146,7 @@ bool K3bFFMpegFile::open() // open the codec on our context kDebug() << "(K3bFFMpegFile) found codec for " << m_filename; - if( ::avcodec_open( codecContext, d->codec ) < 0 ) { + if( ::avcodec_open2( codecContext, d->codec, 0 ) < 0 ) { kDebug() << "(K3bFFMpegDecoderFactory) could not open codec."; return false; } @@ -147,11 +160,7 @@ bool K3bFFMpegFile::open() } // dump some debugging info -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,2,0) ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 ); -#else - ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 ); -#endif return true; } @@ -173,7 +182,7 @@ void K3bFFMpegFile::close() } if( d->formatContext ) { - ::av_close_input_file( d->formatContext ); + ::avformat_close_input( &d->formatContext ); d->formatContext = 0; } } @@ -222,11 +231,7 @@ QString K3bFFMpegFile::typeComment() con return i18n("Windows Media v1"); case CODEC_ID_WMAV2: return i18n("Windows Media v2"); -#if LIBAVCODEC_VERSION_MAJOR < 52 - case CODEC_ID_MP3LAME: -#else case CODEC_ID_MP3: -#endif return i18n("MPEG 1 Layer III"); case CODEC_ID_AAC: return i18n("Advanced Audio Coding (AAC)"); @@ -329,14 +334,14 @@ int K3bFFMpegFile::fillOutputBuffer() d->outputBufferPos = d->alignedOutputBuffer; d->outputBufferSize = AVCODEC_MAX_AUDIO_FRAME_SIZE; -#if LIBAVCODEC_VERSION_MAJOR < 52 - int len = ::avcodec_decode_audio( -#else - #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) +#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3 int len = ::avcodec_decode_audio3( - #else +#else +# ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO2 int len = ::avcodec_decode_audio2( - #endif +# else + int len = ::avcodec_decode_audio( +# endif #endif #ifdef FFMPEG_BUILD_PRE_4629 @@ -346,7 +351,7 @@ int K3bFFMpegFile::fillOutputBuffer() #endif (short*)d->alignedOutputBuffer, &d->outputBufferSize, -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) +#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3 &d->packet ); #else d->packetData, d->packetSize ); 0331-Introduce-a-macro-for-referencing-the-ffmpeg-codec.patch: k3bffmpegwrapper.cpp | 41 +++++++++-------------------------------- 1 file changed, 9 insertions(+), 32 deletions(-) --- NEW FILE 0331-Introduce-a-macro-for-referencing-the-ffmpeg-codec.patch --- >From d27648fc8946735913176dff0c497c806f63dc8a Mon Sep 17 00:00:00 2001 From: Alex Merry <kde(a)randomguy3.me.uk> Date: Fri, 24 Aug 2012 03:07:15 +0100 Subject: [PATCH 331/351] Introduce a macro for referencing the ffmpeg codec This simplifies the code somewhat. REVIEW: 106153 --- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp | 40 +++++++---------------------- 1 file changed, 9 insertions(+), 31 deletions(-) diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp index 0a8fabc..a5ef087 100644 --- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp @@ -39,7 +39,9 @@ extern "C" { #if LIBAVFORMAT_BUILD < 4629 -#define FFMPEG_BUILD_PRE_4629 +#define FFMPEG_CODEC(s) (&s->codec) +#else +#define FFMPEG_CODEC(s) (s->codec) #endif #ifndef HAVE_FFMPEG_AVFORMAT_OPEN_INPUT @@ -126,11 +128,7 @@ bool K3bFFMpegFile::open() } // urgh... ugly -#ifdef FFMPEG_BUILD_PRE_4629 - ::AVCodecContext* codecContext = &d->formatContext->streams[0]->codec; -#else - ::AVCodecContext* codecContext = d->formatContext->streams[0]->codec; -#endif + ::AVCodecContext* codecContext = FFMPEG_CODEC(d->formatContext->streams[0]); if( codecContext->codec_type != AVMEDIA_TYPE_AUDIO) { kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename; @@ -173,11 +171,7 @@ void K3bFFMpegFile::close() d->packetData = 0; if( d->codec ) { -#ifdef FFMPEG_BUILD_PRE_4629 - ::avcodec_close( &d->formatContext->streams[0]->codec ); -#else - ::avcodec_close( d->formatContext->streams[0]->codec ); -#endif + ::avcodec_close( FFMPEG_CODEC(d->formatContext->streams[0]) ); d->codec = 0; } @@ -196,31 +190,19 @@ K3b::Msf K3bFFMpegFile::length() const int K3bFFMpegFile::sampleRate() const { -#ifdef FFMPEG_BUILD_PRE_4629 - return d->formatContext->streams[0]->codec.sample_rate; -#else - return d->formatContext->streams[0]->codec->sample_rate; -#endif + return FFMPEG_CODEC(d->formatContext->streams[0])->sample_rate; } int K3bFFMpegFile::channels() const { -#ifdef FFMPEG_BUILD_PRE_4629 - return d->formatContext->streams[0]->codec.channels; -#else - return d->formatContext->streams[0]->codec->channels; -#endif + return FFMPEG_CODEC(d->formatContext->streams[0])->channels; } int K3bFFMpegFile::type() const { -#ifdef FFMPEG_BUILD_PRE_4629 - return d->formatContext->streams[0]->codec.codec_id; -#else - return d->formatContext->streams[0]->codec->codec_id; -#endif + return FFMPEG_CODEC(d->formatContext->streams[0])->codec_id; } @@ -344,11 +326,7 @@ int K3bFFMpegFile::fillOutputBuffer() # endif #endif -#ifdef FFMPEG_BUILD_PRE_4629 - &d->formatContext->streams[0]->codec, -#else - d->formatContext->streams[0]->codec, -#endif + FFMPEG_CODEC(d->formatContext->streams[0]), (short*)d->alignedOutputBuffer, &d->outputBufferSize, #ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3 -- 1.8.4.2 k3b-ffmpeg-review-113295-1.patch: CMakeLists.txt | 9 ++++++++- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp | 18 ++++++++++++++++++ plugins/decoder/ffmpeg/k3bffmpegwrapper.h | 1 + 3 files changed, 27 insertions(+), 1 deletion(-) --- NEW FILE k3b-ffmpeg-review-113295-1.patch --- diff --git a/CMakeLists.txt b/CMakeLists.txt index ca1531d8e601e423002f6ffa490f2d5bb8dbf5d8..eaf116d14a7de5b330db3823e93477653319177c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -142,12 +142,19 @@ if(K3B_BUILD_FFMPEG_DECODER_PLUGIN) int main() { enum AVMediaType t = AVMEDIA_TYPE_UNKNOWN; return 0; } " HAVE_FFMPEG_AVMEDIA_TYPE) check_c_source_compiles(" + #define CALC_FFMPEG_VERSION(a,b,c) ( a<<16 | b<<8 | c ) #ifdef NEWFFMPEGAVCODECPATH #include <libavcodec/avcodec.h> #else #include <ffmpeg/avcodec.h> #endif - int main() { enum CodecID t = CODEC_ID_MP3; return 0; } + int main() { + #if LIBAVCODEC_BUILD >= CALC_FFMPEG_VERSION(54,25,0) + # Not needed here. AV_CODEC_ID_MP3 exists. return 0; + #else + enum CodecID t = CODEC_ID_MP3; return 0; + #endif + } " HAVE_FFMPEG_CODEC_MP3) cmake_pop_check_state() diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.h b/plugins/decoder/ffmpeg/k3bffmpegwrapper.h index 1ec36b6e465a08f7fe42c80b926e98683be75a5e..88c44f3ec484be4ce0aaa719e219e4a61ec4ac25 100644 --- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.h +++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.h @@ -18,6 +18,7 @@ #include "k3bmsf.h" +#define CALC_FFMPEG_VERSION(a,b,c) ( a<<16 | b<<8 | c ) /** diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp index a5ef087a5ac3a2dc8b7d385b9c3a2e16bf6622bb..5e97cbd7e8b0790f355e6d8b29b8dc55ea099617 100644 --- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp @@ -67,6 +67,13 @@ extern "C" { # define CODEC_ID_MP3 CODEC_ID_MP3LAME #endif +// Has been deprecated for ages. Now removed. For now do what ffmpeg does +// http://ffmpeg.org/pipermail/ffmpeg-cvslog/2012-August/053785.html +// 192000 = 1 second of 48khz 32bit audio +#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE +#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 +#endif + K3bFFMpegWrapper* K3bFFMpegWrapper::s_instance = 0; @@ -209,6 +216,16 @@ int K3bFFMpegFile::type() const QString K3bFFMpegFile::typeComment() const { switch( type() ) { +#if LIBAVCODEC_BUILD >= CALC_FFMPEG_VERSION(54,25,0) + case AV_CODEC_ID_WMAV1: + return i18n("Windows Media v1"); + case AV_CODEC_ID_WMAV2: + return i18n("Windows Media v2"); + case AV_CODEC_ID_MP3: + return i18n("MPEG 1 Layer III"); + case AV_CODEC_ID_AAC: + return i18n("Advanced Audio Coding (AAC)"); +#else case CODEC_ID_WMAV1: return i18n("Windows Media v1"); case CODEC_ID_WMAV2: @@ -217,6 +234,7 @@ QString K3bFFMpegFile::typeComment() const return i18n("MPEG 1 Layer III"); case CODEC_ID_AAC: return i18n("Advanced Audio Coding (AAC)"); +#endif default: return QString::fromLocal8Bit( d->codec->name ); } Index: k3b-extras-freeworld.spec =================================================================== RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/k3b-extras-freeworld.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- k3b-extras-freeworld.spec 4 Oct 2013 16:30:20 -0000 1.40 +++ k3b-extras-freeworld.spec 1 Nov 2013 13:29:12 -0000 1.41 @@ -1,9 +1,6 @@ # undefine these to disable -# upstream bug (with patch) fix for ffmpeg-2.x, http://bugs.kde.org/325486 -%if 0%{?fedora} < 20 %define ffmpeg_decoder 1 -%endif %define lame_encoder 1 %define mad_decoder 1 @@ -11,7 +8,7 @@ Summary: Additional codec plugins for the k3b CD/DVD burning application Epoch: 1 Version: 2.0.2 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2+ URL: http://www.k3b.org/ @@ -24,6 +21,13 @@ Patch244: 0244-Fixed-compilation-with-new-FFMPEG.patch Patch290: 0290-fix-for-newer-kde-4.7-FindFFMPEG.cmake.patch Patch312: 0312-Fix-K3B-to-build-with-recent-FFMPEG-versions.patch +# rebased 0330 to apply to 2.0 branch +Patch330: 0330-CMake-checks-for-FFmpeg-API-changes.patch +Patch331: 0331-Introduce-a-macro-for-referencing-the-ffmpeg-codec.patch + +# https://git.reviewboard.kde.org/r/113295/ +# see also http://bugs.kde.org/325486 +Patch500: k3b-ffmpeg-review-113295-1.patch BuildRequires: desktop-file-utils BuildRequires: gettext @@ -68,6 +72,10 @@ %patch244 -p1 -b .0244 %patch290 -p1 -b .0290 %patch312 -p1 -b .0313 +%patch330 -p1 -b .0330 +%patch331 -p1 -b .0331 + +%patch500 -p1 -b .ffmpeg-review-113295-1 %build @@ -109,6 +117,9 @@ %changelog +* Fri Nov 01 2013 Rex Dieter <rdieter(a)fedoraproject.org> 1:2.0.2-14 +- re-enable ffmpeg support (kde-bug#325486,kde-review#113295) + * Tue Oct 01 2013 Rex Dieter <rdieter(a)fedoraproject.org> 1:2.0.2-13 - cleanup/rebuild

11 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits November 2013