October 2014 - rpmfusion-commits

rpms/mythtv/F-20 mythtv-sd_fix.patch, NONE, 1.1 mythtv-0.27-fixes.patch, 1.6, 1.7 mythtv.spec, 1.139, 1.140

by Richard Shaw

Author: hobbes1069 Update of /cvs/free/rpms/mythtv/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10792 Modified Files: mythtv-0.27-fixes.patch mythtv.spec Added Files: mythtv-sd_fix.patch Log Message: * Mon Oct 13 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.27.3-2 - Update to latest fixes. - Add patch for schedules direct service change. mythtv-sd_fix.patch: datadirect.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE mythtv-sd_fix.patch --- Index: mythtv/libs/libmythtv/datadirect.cpp =================================================================== --- mythtv/libs/libmythtv/datadirect.cpp (revision 299141e0a69b706239beb35b096df9ed2cea8a7b) +++ mythtv/libs/libmythtv/datadirect.cpp (revision 4cb10e52b7e9c2ffec9111f76556a64c8fc7aba7) @@ -545,5 +545,5 @@ DataDirectURLs urls1( "Schedules Direct", - "http://webservices.schedulesdirect.tmsdatadirect.com" + "http://dd.schedulesdirect.org" "/schedulesdirect/tvlistings/xtvdService", "http://schedulesdirect.org", mythtv-0.27-fixes.patch: mythplugins/mythmusic/mythmusic/importmusic.cpp | 2 mythplugins/mythmusic/mythmusic/musicplayer.cpp | 6 mythplugins/mythmusic/mythmusic/smartplaylist.cpp | 13 mythtv/external/FFmpeg/README.sync | 3 mythtv/external/FFmpeg/RELEASE | 2 mythtv/external/FFmpeg/VERSION | 2 mythtv/external/FFmpeg/doc/Doxyfile | 2 mythtv/external/FFmpeg/ffmpeg_filter.c | 9 mythtv/external/FFmpeg/libavcodec/aac.h | 2 mythtv/external/FFmpeg/libavcodec/adpcmenc.c | 3 mythtv/external/FFmpeg/libavcodec/alsdec.c | 2 mythtv/external/FFmpeg/libavcodec/dirac_arith.h | 3 mythtv/external/FFmpeg/libavcodec/diracdec.c | 49 mythtv/external/FFmpeg/libavcodec/g723_1.c | 3 mythtv/external/FFmpeg/libavcodec/golomb-test.c | 2 mythtv/external/FFmpeg/libavcodec/h264_mp4toannexb_bsf.c | 2 mythtv/external/FFmpeg/libavcodec/libvorbisenc.c | 3 mythtv/external/FFmpeg/libavcodec/libx264.c | 26 mythtv/external/FFmpeg/libavcodec/mjpegdec.c | 2 mythtv/external/FFmpeg/libavcodec/mjpegenc.c | 2 mythtv/external/FFmpeg/libavcodec/mjpegenc.h | 2 mythtv/external/FFmpeg/libavcodec/mlpdec.c | 2 mythtv/external/FFmpeg/libavcodec/msrle.c | 3 mythtv/external/FFmpeg/libavcodec/mss34dsp.c | 4 mythtv/external/FFmpeg/libavcodec/mss4.c | 2 mythtv/external/FFmpeg/libavcodec/utvideodec.c | 2 mythtv/external/FFmpeg/libavcodec/vc1dec.c | 3 mythtv/external/FFmpeg/libavcodec/wma.c | 6 mythtv/external/FFmpeg/libavcodec/x86/idct_sse2_xvid.c | 2 mythtv/external/FFmpeg/libavcodec/x86/mpegvideoenc_template.c | 2 mythtv/external/FFmpeg/libavfilter/filtfmts.c | 10 mythtv/external/FFmpeg/libavfilter/graphdump.c | 3 mythtv/external/FFmpeg/libavfilter/vf_deshake.c | 4 mythtv/external/FFmpeg/libavformat/aiffdec.c | 2 mythtv/external/FFmpeg/libavformat/asfdec.c | 5 mythtv/external/FFmpeg/libavformat/avidec.c | 2 mythtv/external/FFmpeg/libavformat/flvenc.c | 12 mythtv/external/FFmpeg/libavformat/h263dec.c | 2 mythtv/external/FFmpeg/libavformat/id3v2.c | 17 mythtv/external/FFmpeg/libavformat/id3v2.h | 4 mythtv/external/FFmpeg/libavformat/mpc.c | 2 mythtv/external/FFmpeg/libavformat/mpegts.c | 2 mythtv/external/FFmpeg/libavformat/mux.c | 6 mythtv/external/FFmpeg/libavformat/omadec.c | 2 mythtv/external/FFmpeg/libavformat/utils.c | 2 mythtv/external/FFmpeg/libavutil/cpu.c | 18 mythtv/external/FFmpeg/libavutil/lzo.c | 13 mythtv/external/FFmpeg/libavutil/opt.c | 6 mythtv/external/FFmpeg/libswresample/dither.c | 2 mythtv/external/FFmpeg/libswresample/rematrix.c | 5 mythtv/external/FFmpeg/libswresample/resample.c | 7 mythtv/external/FFmpeg/libswscale/swscale.c | 7 mythtv/external/FFmpeg/libswscale/x86/swscale_template.c | 78 mythtv/external/FFmpeg/tests/ref/fate/vc1_sa10143 | 28 mythtv/libs/libmyth/audio/audiooutputbase.cpp | 9 mythtv/libs/libmyth/mediamonitor-darwin.cpp | 10 mythtv/libs/libmythbase/mythcorecontext.cpp | 3 mythtv/libs/libmythbase/mythversion.h | 2 mythtv/libs/libmythdvdnav/dvdnav/dvdnav.c | 2 mythtv/libs/libmythdvdnav/dvdnav/dvdnav.h | 2 mythtv/libs/libmythdvdnav/dvdnav/remap.c | 1 mythtv/libs/libmythdvdnav/dvdnav/searching.c | 32 mythtv/libs/libmythdvdnav/dvdnav/vm/vm.c | 6 mythtv/libs/libmythdvdnav/dvdread/dvd_input.c | 44 mythtv/libs/libmythdvdnav/dvdread/dvd_reader.c | 1 mythtv/libs/libmythdvdnav/dvdread/dvd_udf.c | 5 mythtv/libs/libmythdvdnav/dvdread/ifo_print.c | 4 mythtv/libs/libmythdvdnav/dvdread/ifo_read.c | 23 mythtv/libs/libmythmetadata/libmythmetadata.pro | 4 mythtv/libs/libmythmetadata/metadatacommon.cpp | 95 mythtv/libs/libmythmetadata/metadatacommon.h | 52 mythtv/libs/libmythmetadata/metadatadownload.cpp | 339 mythtv/libs/libmythmetadata/metadatafactory.cpp | 69 mythtv/libs/libmythmetadata/metadatafactory.h | 2 mythtv/libs/libmythmetadata/metadatagrabber.cpp | 595 + mythtv/libs/libmythmetadata/metadatagrabber.h | 100 mythtv/libs/libmythmetadata/metadataimagedownload.cpp | 150 mythtv/libs/libmythmetadata/metadataimagedownload.h | 1 mythtv/libs/libmythmetadata/videometadata.cpp | 17 mythtv/libs/libmythprotoserver/requesthandler/fileserverhandler.cpp | 3 mythtv/libs/libmythtv/avformatdecoder.cpp | 48 mythtv/libs/libmythtv/cc608decoder.cpp | 2 mythtv/libs/libmythtv/cc708reader.cpp | 2 mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp | 19 mythtv/libs/libmythtv/channelscan/channelscan_sm.h | 2 mythtv/libs/libmythtv/eitcache.cpp | 4 mythtv/libs/libmythtv/eitfixup.cpp | 4 mythtv/libs/libmythtv/lzoconf.h | 219 mythtv/libs/libmythtv/lzodefs.h | 2527 ++++-- mythtv/libs/libmythtv/metadataimagehelper.cpp | 3 mythtv/libs/libmythtv/minilzo.cpp | 4191 +++++++--- mythtv/libs/libmythtv/minilzo.h | 20 mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp | 8 mythtv/libs/libmythtv/mythplayer.cpp | 141 mythtv/libs/libmythtv/openglvideo.cpp | 2 mythtv/libs/libmythtv/programdata.cpp | 41 mythtv/libs/libmythtv/ringbuffer.cpp | 19 mythtv/libs/libmythtv/subtitlescreen.cpp | 58 mythtv/libs/libmythtv/tv_play.cpp | 8 mythtv/libs/libmythtv/videobuffers.cpp | 6 mythtv/libs/libmythtv/videoout_nullvdpau.cpp | 4 mythtv/libs/libmythtv/videoout_opengl.cpp | 6 mythtv/libs/libmythui/mythuiwebbrowser.cpp | 2 mythtv/libs/libmythupnp/upnpcds.h | 2 mythtv/libs/libmythupnp/upnpcmgr.h | 2 mythtv/programs/mythbackend/main_helpers.cpp | 9 mythtv/programs/mythbackend/mainserver.cpp | 20 mythtv/programs/mythbackend/upnpcdstv.cpp | 27 mythtv/programs/mythbackend/upnpcdsvideo.cpp | 2 mythtv/programs/mythfrontend/editvideometadata.cpp | 10 mythtv/programs/mythfrontend/grabbersettings.cpp | 125 mythtv/programs/mythfrontend/grabbersettings.h | 7 mythtv/programs/mythfrontend/playbackbox.cpp | 158 mythtv/programs/mythfrontend/playbackbox.h | 13 mythtv/programs/mythfrontend/scheduleeditor.cpp | 76 mythtv/programs/mythfrontend/scheduleeditor.h | 1 mythtv/programs/mythmetadatalookup/lookup.cpp | 12 mythtv/programs/mythmetadatalookup/main.cpp | 12 mythtv/programs/mythtranscode/mpeg2fix.cpp | 23 mythtv/programs/mythtranscode/mpeg2fix.h | 4 mythtv/programs/mythtranscode/videodecodebuffer.cpp | 36 mythtv/programs/mythtranscode/videodecodebuffer.h | 25 mythtv/themes/classic/tv_schedule.xml | 2 123 files changed, 7006 insertions(+), 2872 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.6 -r 1.7 mythtv-0.27-fixes.patch Index: mythtv-0.27-fixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/F-20/mythtv-0.27-fixes.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mythtv-0.27-fixes.patch 28 Jul 2014 12:38:03 -0000 1.6 +++ mythtv-0.27-fixes.patch 14 Oct 2014 00:50:29 -0000 1.7 @@ -1,5 +1,6 @@ mythplugins/mythmusic/mythmusic/importmusic.cpp | 2 +- mythplugins/mythmusic/mythmusic/musicplayer.cpp | 6 + + mythplugins/mythmusic/mythmusic/smartplaylist.cpp | 13 +- mythtv/external/FFmpeg/README.sync | 3 +- mythtv/external/FFmpeg/RELEASE | 2 +- mythtv/external/FFmpeg/VERSION | 2 +- @@ -55,27 +56,47 @@ mythtv/libs/libmyth/mediamonitor-darwin.cpp | 10 + mythtv/libs/libmythbase/mythcorecontext.cpp | 3 +- mythtv/libs/libmythbase/mythversion.h | 2 +- + mythtv/libs/libmythdvdnav/dvdnav/dvdnav.c | 2 +- + mythtv/libs/libmythdvdnav/dvdnav/dvdnav.h | 2 +- + mythtv/libs/libmythdvdnav/dvdnav/remap.c | 1 + + mythtv/libs/libmythdvdnav/dvdnav/searching.c | 32 +- + mythtv/libs/libmythdvdnav/dvdnav/vm/vm.c | 6 +- + mythtv/libs/libmythdvdnav/dvdread/dvd_input.c | 44 +- + mythtv/libs/libmythdvdnav/dvdread/dvd_reader.c | 1 + + mythtv/libs/libmythdvdnav/dvdread/dvd_udf.c | 5 +- + mythtv/libs/libmythdvdnav/dvdread/ifo_print.c | 4 +- + mythtv/libs/libmythdvdnav/dvdread/ifo_read.c | 23 +- mythtv/libs/libmythmetadata/libmythmetadata.pro | 4 +- mythtv/libs/libmythmetadata/metadatacommon.cpp | 95 +- - mythtv/libs/libmythmetadata/metadatacommon.h | 51 +- - mythtv/libs/libmythmetadata/metadatadownload.cpp | 211 +- - mythtv/libs/libmythmetadata/metadatafactory.cpp | 2 +- - mythtv/libs/libmythmetadata/metadatagrabber.cpp | 584 +++ + mythtv/libs/libmythmetadata/metadatacommon.h | 52 +- + mythtv/libs/libmythmetadata/metadatadownload.cpp | 339 +- + mythtv/libs/libmythmetadata/metadatafactory.cpp | 69 +- + mythtv/libs/libmythmetadata/metadatafactory.h | 2 + + mythtv/libs/libmythmetadata/metadatagrabber.cpp | 595 +++ mythtv/libs/libmythmetadata/metadatagrabber.h | 100 + - .../libs/libmythmetadata/metadataimagedownload.cpp | 148 +- + .../libs/libmythmetadata/metadataimagedownload.cpp | 150 +- .../libs/libmythmetadata/metadataimagedownload.h | 1 + mythtv/libs/libmythmetadata/videometadata.cpp | 17 +- .../requesthandler/fileserverhandler.cpp | 3 +- - mythtv/libs/libmythtv/avformatdecoder.cpp | 12 + + mythtv/libs/libmythtv/avformatdecoder.cpp | 48 +- mythtv/libs/libmythtv/cc608decoder.cpp | 2 +- + mythtv/libs/libmythtv/cc708reader.cpp | 2 +- + .../libs/libmythtv/channelscan/channelscan_sm.cpp | 19 +- + mythtv/libs/libmythtv/channelscan/channelscan_sm.h | 2 + + mythtv/libs/libmythtv/eitcache.cpp | 4 +- + mythtv/libs/libmythtv/eitfixup.cpp | 4 +- mythtv/libs/libmythtv/lzoconf.h | 219 +- mythtv/libs/libmythtv/lzodefs.h | 2527 ++++++++---- + mythtv/libs/libmythtv/metadataimagehelper.cpp | 3 + mythtv/libs/libmythtv/minilzo.cpp | 4191 ++++++++++++++------ mythtv/libs/libmythtv/minilzo.h | 20 +- - mythtv/libs/libmythtv/mythplayer.cpp | 10 +- + mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp | 8 + + mythtv/libs/libmythtv/mythplayer.cpp | 141 +- mythtv/libs/libmythtv/openglvideo.cpp | 2 +- - mythtv/libs/libmythtv/ringbuffer.cpp | 7 +- + mythtv/libs/libmythtv/programdata.cpp | 41 +- + mythtv/libs/libmythtv/ringbuffer.cpp | 19 +- mythtv/libs/libmythtv/subtitlescreen.cpp | 58 +- + mythtv/libs/libmythtv/tv_play.cpp | 8 +- mythtv/libs/libmythtv/videobuffers.cpp | 6 + mythtv/libs/libmythtv/videoout_nullvdpau.cpp | 4 +- mythtv/libs/libmythtv/videoout_opengl.cpp | 6 +- @@ -84,13 +105,23 @@ mythtv/libs/libmythupnp/upnpcmgr.h | 2 +- mythtv/programs/mythbackend/main_helpers.cpp | 9 +- mythtv/programs/mythbackend/mainserver.cpp | 20 +- + mythtv/programs/mythbackend/upnpcdstv.cpp | 27 +- + mythtv/programs/mythbackend/upnpcdsvideo.cpp | 2 +- + mythtv/programs/mythfrontend/editvideometadata.cpp | 10 +- mythtv/programs/mythfrontend/grabbersettings.cpp | 125 +- mythtv/programs/mythfrontend/grabbersettings.h | 7 +- + mythtv/programs/mythfrontend/playbackbox.cpp | 158 +- + mythtv/programs/mythfrontend/playbackbox.h | 13 +- + mythtv/programs/mythfrontend/scheduleeditor.cpp | 76 +- + mythtv/programs/mythfrontend/scheduleeditor.h | 1 + + mythtv/programs/mythmetadatalookup/lookup.cpp | 12 +- mythtv/programs/mythmetadatalookup/main.cpp | 12 + - mythtv/programs/mythtranscode/mpeg2fix.cpp | 17 +- + mythtv/programs/mythtranscode/mpeg2fix.cpp | 23 +- mythtv/programs/mythtranscode/mpeg2fix.h | 4 + + .../programs/mythtranscode/videodecodebuffer.cpp | 36 +- + mythtv/programs/mythtranscode/videodecodebuffer.h | 25 +- mythtv/themes/classic/tv_schedule.xml | 2 +- - 92 files changed, 6321 insertions(+), 2577 deletions(-) + 123 files changed, 7006 insertions(+), 2872 deletions(-) diff --git a/mythplugins/mythmusic/mythmusic/importmusic.cpp b/mythplugins/mythmusic/mythmusic/importmusic.cpp index d0faf12..31a89da 100644 @@ -122,6 +153,51 @@ m_isPlaying = false; if (stopAll && getDecoder()) +diff --git a/mythplugins/mythmusic/mythmusic/smartplaylist.cpp b/mythplugins/mythmusic/mythmusic/smartplaylist.cpp +index de952e8..0fc546d 100644 +--- a/mythplugins/mythmusic/mythmusic/smartplaylist.cpp ++++ b/mythplugins/mythmusic/mythmusic/smartplaylist.cpp +@@ -52,10 +52,8 @@ static SmartPLField SmartPLFields[] = + { "Play Count", "music_songs.numplays", ftNumeric, 0, 9999, 0 }, + { "Compilation", "music_albums.compilation", ftBoolean, 0, 0, 0 }, + { "Comp. Artist", "music_comp_artists.artist_name", ftString, 0, 0, 0 }, +- { "Last Play", "FROM_DAYS(TO_DAYS(music_songs.lastplay))", +- ftDate, 0, 0, 0 }, +- { "Date Imported", "FROM_DAYS(TO_DAYS(music_songs.date_entered))", +- ftDate, 0, 0, 0 }, ++ { "Last Play", "music_songs.lastplay", ftDate, 0, 0, 0 }, ++ { "Date Imported", "music_songs.date_entered", ftDate, 0, 0, 0 }, + }; + + struct SmartPLOperator +@@ -334,7 +332,7 @@ bool SmartPLCriteriaRow::saveToDatabase(int smartPlaylistID) + query.bindValue(":FIELD", Field); + query.bindValue(":OPERATOR", Operator); + query.bindValue(":VALUE1", Value1); +- query.bindValue(":VALUE2", Value2); ++ query.bindValue(":VALUE2", Value2.isNull() ? "" : Value2); + + if (!query.exec()) + { +@@ -750,7 +748,7 @@ void SmartPlaylistEditor::updateMatches(void) + + m_matchesText->SetText(QString::number(m_matchesCount)); + +- m_playlistIsValid = (m_matchesCount > 0); ++ m_playlistIsValid = (m_criteriaRows.size() > 0); + m_showResultsButton->SetEnabled((m_matchesCount > 0)); + titleChanged(); + } +@@ -1015,6 +1013,9 @@ QString SmartPlaylistEditor::getOrderByClause(void) + + QString SmartPlaylistEditor::getWhereClause(void) + { ++ if (m_criteriaRows.size() == 0) ++ return QString(); ++ + bool bFirst = true; + QString sql = "WHERE "; + diff --git a/mythtv/external/FFmpeg/README.sync b/mythtv/external/FFmpeg/README.sync index a91b793..2bf19c5 100644 --- a/mythtv/external/FFmpeg/README.sync @@ -1537,7 +1613,7 @@ bool MythCoreContext::IsFrontendOnly(void) diff --git a/mythtv/libs/libmythbase/mythversion.h b/mythtv/libs/libmythbase/mythversion.h -index c189c40..85d6ecd 100644 +index c189c40..b097b21 100644 --- a/mythtv/libs/libmythbase/mythversion.h +++ b/mythtv/libs/libmythbase/mythversion.h @@ -12,7 +12,7 @@ @@ -1545,10 +1621,369 @@ /// Including changes in the libmythbase, libmyth, libmythtv, libmythav* and /// libmythui class methods in exported headers. -#define MYTH_BINARY_VERSION "0.27.20140702-1" -+#define MYTH_BINARY_VERSION "0.27.20140718-1" ++#define MYTH_BINARY_VERSION "0.27.20140719-1" /** \brief Increment this whenever the MythTV network protocol changes. * +diff --git a/mythtv/libs/libmythdvdnav/dvdnav/dvdnav.c b/mythtv/libs/libmythdvdnav/dvdnav/dvdnav.c +index 3a7952e..f4b5ecb 100644 +--- a/mythtv/libs/libmythdvdnav/dvdnav/dvdnav.c ++++ b/mythtv/libs/libmythdvdnav/dvdnav/dvdnav.c +@@ -203,7 +203,7 @@ int64_t dvdnav_convert_time(dvd_time_t *time) { + int64_t result; + int64_t frames; + +- result = (time->hour >> 4 ) * 10 * 60 * 60 * 90000; ++ result = (time->hour >> 4 ) * 10 * 60 * 60 * 90000ull; + result += (time->hour & 0x0f) * 60 * 60 * 90000; + result += (time->minute >> 4 ) * 10 * 60 * 90000; + result += (time->minute & 0x0f) * 60 * 90000; +diff --git a/mythtv/libs/libmythdvdnav/dvdnav/dvdnav.h b/mythtv/libs/libmythdvdnav/dvdnav/dvdnav.h +index 1e7fa08..a5a76de 100644 +--- a/mythtv/libs/libmythdvdnav/dvdnav/dvdnav.h ++++ b/mythtv/libs/libmythdvdnav/dvdnav/dvdnav.h +@@ -29,7 +29,7 @@ + #define MP_DVDNAV 1 + + // Change this only when syncing to mplayer dvdnav trunk +-#define DVDNAV_SVN_REV "svnR1251" ++#define DVDNAV_SVN_REV "svnR1294" + + #ifdef __cplusplus + extern "C" { +diff --git a/mythtv/libs/libmythdvdnav/dvdnav/remap.c b/mythtv/libs/libmythdvdnav/dvdnav/remap.c +index f1dea93..4632a49 100644 +--- a/mythtv/libs/libmythdvdnav/dvdnav/remap.c ++++ b/mythtv/libs/libmythdvdnav/dvdnav/remap.c +@@ -22,6 +22,7 @@ + + #include <stdlib.h> [...2607 lines suppressed...] diff --git a/mythtv/programs/mythmetadatalookup/main.cpp b/mythtv/programs/mythmetadatalookup/main.cpp index 0878925..1da7dfa 100644 --- a/mythtv/programs/mythmetadatalookup/main.cpp @@ -13021,7 +15003,7 @@ if ((retval = cmdline.ConfigureLogging()) != GENERIC_EXIT_OK) return retval; diff --git a/mythtv/programs/mythtranscode/mpeg2fix.cpp b/mythtv/programs/mythtranscode/mpeg2fix.cpp -index 8ba085c..3cf92b9 100644 +index 8ba085c..c7214d3 100644 --- a/mythtv/programs/mythtranscode/mpeg2fix.cpp +++ b/mythtv/programs/mythtranscode/mpeg2fix.cpp @@ -576,18 +576,21 @@ void MPEG2fixup::InitReplex() @@ -13050,7 +15032,22 @@ { case AV_CODEC_ID_MP2: case AV_CODEC_ID_MP3: -@@ -1376,6 +1379,7 @@ int MPEG2fixup::GetFrame(AVPacket *pkt) +@@ -803,10 +806,12 @@ bool MPEG2fixup::InitAV(QString inputfile, const char *type, int64_t offset) + break; + + case AVMEDIA_TYPE_AUDIO: +- if (!allaudio && inputFC->streams[i]->codec->channels == 0) ++ if (!allaudio && ext_count > 0 && ++ inputFC->streams[i]->codec->channels < 2 && ++ inputFC->streams[i]->codec->sample_rate < 100000) + { + LOG(VB_GENERAL, LOG_ERR, +- QString("Skipping invalid audio stream: %1").arg(i)); ++ QString("Skipping audio stream: %1").arg(i)); + break; + } + if (inputFC->streams[i]->codec->codec_id == AV_CODEC_ID_AC3 || +@@ -1376,6 +1381,7 @@ int MPEG2fixup::GetFrame(AVPacket *pkt) { LOG(VB_GENERAL, LOG_DEBUG, QString("Invalid stream ID %1, ignoring").arg(pkt->stream_index)); @@ -13058,7 +15055,7 @@ } av_free_packet(pkt); return 0; -@@ -2398,6 +2402,11 @@ int MPEG2fixup::Start() +@@ -2398,6 +2404,11 @@ int MPEG2fixup::Start() while (af->count()) { @@ -13089,6 +15086,154 @@ return inputFC->streams[id]->parser; } +diff --git a/mythtv/programs/mythtranscode/videodecodebuffer.cpp b/mythtv/programs/mythtranscode/videodecodebuffer.cpp +index 73d23e0..b6bbdf9 100644 +--- a/mythtv/programs/mythtranscode/videodecodebuffer.cpp ++++ b/mythtv/programs/mythtranscode/videodecodebuffer.cpp +@@ -1,11 +1,14 @@ + #include "videodecodebuffer.h" + ++#include "mythplayer.h" ++#include "videooutbase.h" ++ + VideoDecodeBuffer::VideoDecodeBuffer(MythPlayer *player, VideoOutput *videoout, + bool cutlist, int size) + : m_player(player), m_videoOutput(videoout), +- m_honorCutlist(cutlist), +- m_eof(false), m_maxFrames(size), +- m_runThread(true), m_isRunning(false) ++ m_honorCutlist(cutlist), m_maxFrames(size), ++ m_runThread(true), m_isRunning(false), ++ m_eof(false) + { + + } +@@ -35,8 +38,12 @@ void VideoDecodeBuffer::run() + m_isRunning = true; + while (m_runThread) + { ++ QMutexLocker locker(&m_queueLock); ++ + if (m_frameList.size() < m_maxFrames && !m_eof) + { ++ locker.unlock(); ++ + DecodedFrameInfo tfInfo; + tfInfo.frame = NULL; + tfInfo.didFF = 0; +@@ -47,21 +54,22 @@ void VideoDecodeBuffer::run() + { + tfInfo.frame = m_videoOutput->GetLastDecodedFrame(); + +- QMutexLocker locker(&m_queueLock); ++ locker.relock(); + m_frameList.append(tfInfo); + } +- else ++ else if (m_player->GetEof() != kEofStateNone) + { ++ locker.relock(); + m_eof = true; + } ++ else ++ continue; + + m_frameWaitCond.wakeAll(); + } + else + { +- m_frameWaitLock.lock(); +- m_frameWaitCond.wait(&m_frameWaitLock); +- m_frameWaitLock.unlock(); ++ m_frameWaitCond.wait(locker.mutex()); + } + } + m_isRunning = false; +@@ -69,27 +77,21 @@ void VideoDecodeBuffer::run() + + VideoFrame *VideoDecodeBuffer::GetFrame(int &didFF, bool &isKey) + { +- m_queueLock.lock(); ++ QMutexLocker locker(&m_queueLock); + + if (m_frameList.isEmpty()) + { +- m_queueLock.unlock(); +- + if (m_eof) + return NULL; + +- m_frameWaitLock.lock(); +- m_frameWaitCond.wait(&m_frameWaitLock); +- m_frameWaitLock.unlock(); ++ m_frameWaitCond.wait(locker.mutex()); + + if (m_frameList.isEmpty()) + return NULL; +- +- m_queueLock.lock(); + } + + DecodedFrameInfo tfInfo = m_frameList.takeFirst(); +- m_queueLock.unlock(); ++ locker.unlock(); + m_frameWaitCond.wakeAll(); + + didFF = tfInfo.didFF; +diff --git a/mythtv/programs/mythtranscode/videodecodebuffer.h b/mythtv/programs/mythtranscode/videodecodebuffer.h +index 50c33d0..b4e241a 100644 +--- a/mythtv/programs/mythtranscode/videodecodebuffer.h ++++ b/mythtv/programs/mythtranscode/videodecodebuffer.h +@@ -6,18 +6,20 @@ + #include <QMutex> + #include <QRunnable> + +-#include "mythplayer.h" + #include "videooutbase.h" + ++class MythPlayer; ++class VideoOutput; ++ + class VideoDecodeBuffer : public QRunnable + { + public: + VideoDecodeBuffer(MythPlayer *player, VideoOutput *videoout, + bool cutlist, int size = 5); +- ~VideoDecodeBuffer(); ++ virtual ~VideoDecodeBuffer(); + +- void stop(void); +- void run(); ++ void stop(void); ++ virtual void run(); + VideoFrame *GetFrame(int &didFF, bool &isKey); + + private: +@@ -28,17 +30,16 @@ class VideoDecodeBuffer : public QRunnable + bool isKey; + } DecodedFrameInfo; + +- MythPlayer *m_player; +- VideoOutput *m_videoOutput; +- bool m_honorCutlist; ++ MythPlayer * const m_player; ++ VideoOutput * const m_videoOutput; ++ bool const m_honorCutlist; ++ int const m_maxFrames; ++ bool volatile m_runThread; ++ bool volatile m_isRunning; ++ QMutex mutable m_queueLock; // Guards the following... + bool m_eof; +- int m_maxFrames; +- bool m_runThread; +- bool m_isRunning; +- QMutex m_queueLock; + QList<DecodedFrameInfo> m_frameList; + QWaitCondition m_frameWaitCond; +- QMutex m_frameWaitLock; + }; + + #endif diff --git a/mythtv/themes/classic/tv_schedule.xml b/mythtv/themes/classic/tv_schedule.xml index c517e3a..6559d45 100644 --- a/mythtv/themes/classic/tv_schedule.xml Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/F-20/mythtv.spec,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- mythtv.spec 28 Jul 2014 12:38:03 -0000 1.139 +++ mythtv.spec 14 Oct 2014 00:50:29 -0000 1.140 @@ -60,7 +60,7 @@ %define desktop_vendor RPMFusion # MythTV Version string -- preferably the output from git --describe -%define vers_string v0.27.3-109-g0dd5ab3 +%define vers_string v0.27.3-164-g629f711 %define branch fixes/0.27 # Git revision and branch ID @@ -78,7 +78,7 @@ %if "%{branch}" == "master" Release: 0.1.git.%{_gitrev}%{?dist} %else -Release: 1%{?dist} +Release: 2%{?dist} %endif # The primary license is GPLv2+, but bits are borrowed from a number of @@ -101,7 +101,7 @@ %define with_vdpau %{?_without_vdpau: 0} %{?!_without_vdpau: 1} %define with_vaapi %{?_without_vaapi: 0} %{?!_without_vaapi: 1} -%if 0%{?rhel} +%if 0%{?rhel} < 7 %define with_crystalhd %{?_without_crystalhd: 1} %{?!_without_crystalhd: 0} %define with_systemd %{?_without_systemd: 1} %{?!_without_systemd: 0} @@ -142,6 +142,7 @@ # http://code.mythtv.org/trac/ticket/11338 # Offset required for 0.27, patch was for 0.26.1 Patch2: mythtv-0.27-libcec2.patch +Patch3: mythtv-sd_fix.patch Source10: PACKAGE-LICENSING Source11: ChangeLog @@ -176,7 +177,7 @@ BuildRequires: freetype-devel >= 2 BuildRequires: libpng-devel BuildRequires: gcc-c++ -%if 0%{?fedora} >= 19 +%if ! 0%{?rhel} <= 6 BuildRequires: mariadb-devel >= 5 %else BuildRequires: mysql-devel >= 5 @@ -359,13 +360,17 @@ Requires: mythplugins = %{version}-%{release} Requires: mythweb = %{version} Requires: mythffmpeg = %{version}-%{release} -%if 0%{?fedora} >= 19 +%if ! 0%{?rhel} <= 6 Requires: mariadb-server >= 5, mariadb >= 5 %else Requires: mysql-server >= 5, mysql >= 5 %endif Requires: xmltv +%if 0%{?rhel} >= 7 +Requires: udisks2 +%else Requires: udisks +%endif # Generate the required mythtv-frontend-api version string here so we only # have to do it once. @@ -685,7 +690,7 @@ Requires: mkisofs >= 2.01 Requires: python >= 2.3.5 Requires: python-imaging -Requires: transcode >= 1.0.2 +#Requires: transcode >= 1.0.2 Requires: pmount %description -n mytharchive @@ -819,6 +824,7 @@ #patch0 -p1 -b .mythtv %patch1 -p1 -b .types_h %patch2 -p1 -b .libcec2 +%patch3 -p0 -b .sd_fix # Install ChangeLog install -m 0644 %{SOURCE11} . @@ -875,10 +881,8 @@ --libdir=%{_libdir} \ --libdir-name=%{_lib} \ --mandir=%{_mandir} \ - --disable-mythlogserver \ - --enable-ffmpeg-pthreads \ - --enable-joystick-menu \ --x11-path=%{_includedir} \ + --disable-mythlogserver \ --enable-libmp3lame \ --enable-libtheora --enable-libvorbis \ --enable-libx264 \ @@ -893,8 +897,8 @@ %if %{with_vaapi} --enable-vaapi \ %endif -%if %{with_crystalhd} - --enable-crystalhd \ +%if !%{with_crystalhd} + --disable-crystalhd \ %endif %if !%{with_perl} --without-bindings=perl \ @@ -1435,6 +1439,10 @@ %changelog +* Mon Oct 13 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.27.3-2 +- Update to latest fixes. +- Add patch for schedules direct service change. + * Sun Jul 27 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.27.3-1 - Update to new upstream release.

9 years, 7 months

1
0
0 / 0

rpms/mythtv/devel mythtv-0.27-fixes.patch,1.6,1.7

by Richard Shaw

Author: hobbes1069 Update of /cvs/free/rpms/mythtv/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv576 Modified Files: mythtv-0.27-fixes.patch Log Message: Add updated fixes patch. mythtv-0.27-fixes.patch: mythplugins/mythmusic/mythmusic/importmusic.cpp | 2 mythplugins/mythmusic/mythmusic/musicplayer.cpp | 6 mythplugins/mythmusic/mythmusic/smartplaylist.cpp | 13 mythtv/external/FFmpeg/README.sync | 3 mythtv/external/FFmpeg/RELEASE | 2 mythtv/external/FFmpeg/VERSION | 2 mythtv/external/FFmpeg/doc/Doxyfile | 2 mythtv/external/FFmpeg/ffmpeg_filter.c | 9 mythtv/external/FFmpeg/libavcodec/aac.h | 2 mythtv/external/FFmpeg/libavcodec/adpcmenc.c | 3 mythtv/external/FFmpeg/libavcodec/alsdec.c | 2 mythtv/external/FFmpeg/libavcodec/dirac_arith.h | 3 mythtv/external/FFmpeg/libavcodec/diracdec.c | 49 mythtv/external/FFmpeg/libavcodec/g723_1.c | 3 mythtv/external/FFmpeg/libavcodec/golomb-test.c | 2 mythtv/external/FFmpeg/libavcodec/h264_mp4toannexb_bsf.c | 2 mythtv/external/FFmpeg/libavcodec/libvorbisenc.c | 3 mythtv/external/FFmpeg/libavcodec/libx264.c | 26 mythtv/external/FFmpeg/libavcodec/mjpegdec.c | 2 mythtv/external/FFmpeg/libavcodec/mjpegenc.c | 2 mythtv/external/FFmpeg/libavcodec/mjpegenc.h | 2 mythtv/external/FFmpeg/libavcodec/mlpdec.c | 2 mythtv/external/FFmpeg/libavcodec/msrle.c | 3 mythtv/external/FFmpeg/libavcodec/mss34dsp.c | 4 mythtv/external/FFmpeg/libavcodec/mss4.c | 2 mythtv/external/FFmpeg/libavcodec/utvideodec.c | 2 mythtv/external/FFmpeg/libavcodec/vc1dec.c | 3 mythtv/external/FFmpeg/libavcodec/wma.c | 6 mythtv/external/FFmpeg/libavcodec/x86/idct_sse2_xvid.c | 2 mythtv/external/FFmpeg/libavcodec/x86/mpegvideoenc_template.c | 2 mythtv/external/FFmpeg/libavfilter/filtfmts.c | 10 mythtv/external/FFmpeg/libavfilter/graphdump.c | 3 mythtv/external/FFmpeg/libavfilter/vf_deshake.c | 4 mythtv/external/FFmpeg/libavformat/aiffdec.c | 2 mythtv/external/FFmpeg/libavformat/asfdec.c | 5 mythtv/external/FFmpeg/libavformat/avidec.c | 2 mythtv/external/FFmpeg/libavformat/flvenc.c | 12 mythtv/external/FFmpeg/libavformat/h263dec.c | 2 mythtv/external/FFmpeg/libavformat/id3v2.c | 17 mythtv/external/FFmpeg/libavformat/id3v2.h | 4 mythtv/external/FFmpeg/libavformat/mpc.c | 2 mythtv/external/FFmpeg/libavformat/mpegts.c | 2 mythtv/external/FFmpeg/libavformat/mux.c | 6 mythtv/external/FFmpeg/libavformat/omadec.c | 2 mythtv/external/FFmpeg/libavformat/utils.c | 2 mythtv/external/FFmpeg/libavutil/cpu.c | 18 mythtv/external/FFmpeg/libavutil/lzo.c | 13 mythtv/external/FFmpeg/libavutil/opt.c | 6 mythtv/external/FFmpeg/libswresample/dither.c | 2 mythtv/external/FFmpeg/libswresample/rematrix.c | 5 mythtv/external/FFmpeg/libswresample/resample.c | 7 mythtv/external/FFmpeg/libswscale/swscale.c | 7 mythtv/external/FFmpeg/libswscale/x86/swscale_template.c | 78 mythtv/external/FFmpeg/tests/ref/fate/vc1_sa10143 | 28 mythtv/libs/libmyth/audio/audiooutputbase.cpp | 9 mythtv/libs/libmyth/mediamonitor-darwin.cpp | 10 mythtv/libs/libmythbase/mythcorecontext.cpp | 3 mythtv/libs/libmythbase/mythversion.h | 2 mythtv/libs/libmythdvdnav/dvdnav/dvdnav.c | 2 mythtv/libs/libmythdvdnav/dvdnav/dvdnav.h | 2 mythtv/libs/libmythdvdnav/dvdnav/remap.c | 1 mythtv/libs/libmythdvdnav/dvdnav/searching.c | 32 mythtv/libs/libmythdvdnav/dvdnav/vm/vm.c | 6 mythtv/libs/libmythdvdnav/dvdread/dvd_input.c | 44 mythtv/libs/libmythdvdnav/dvdread/dvd_reader.c | 1 mythtv/libs/libmythdvdnav/dvdread/dvd_udf.c | 5 mythtv/libs/libmythdvdnav/dvdread/ifo_print.c | 4 mythtv/libs/libmythdvdnav/dvdread/ifo_read.c | 23 mythtv/libs/libmythmetadata/libmythmetadata.pro | 4 mythtv/libs/libmythmetadata/metadatacommon.cpp | 95 mythtv/libs/libmythmetadata/metadatacommon.h | 52 mythtv/libs/libmythmetadata/metadatadownload.cpp | 339 mythtv/libs/libmythmetadata/metadatafactory.cpp | 69 mythtv/libs/libmythmetadata/metadatafactory.h | 2 mythtv/libs/libmythmetadata/metadatagrabber.cpp | 595 + mythtv/libs/libmythmetadata/metadatagrabber.h | 100 mythtv/libs/libmythmetadata/metadataimagedownload.cpp | 150 mythtv/libs/libmythmetadata/metadataimagedownload.h | 1 mythtv/libs/libmythmetadata/videometadata.cpp | 17 mythtv/libs/libmythprotoserver/requesthandler/fileserverhandler.cpp | 3 mythtv/libs/libmythtv/avformatdecoder.cpp | 48 mythtv/libs/libmythtv/cc608decoder.cpp | 2 mythtv/libs/libmythtv/cc708reader.cpp | 2 mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp | 19 mythtv/libs/libmythtv/channelscan/channelscan_sm.h | 2 mythtv/libs/libmythtv/eitcache.cpp | 4 mythtv/libs/libmythtv/eitfixup.cpp | 4 mythtv/libs/libmythtv/lzoconf.h | 219 mythtv/libs/libmythtv/lzodefs.h | 2527 ++++-- mythtv/libs/libmythtv/metadataimagehelper.cpp | 3 mythtv/libs/libmythtv/minilzo.cpp | 4191 +++++++--- mythtv/libs/libmythtv/minilzo.h | 20 mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp | 8 mythtv/libs/libmythtv/mythplayer.cpp | 141 mythtv/libs/libmythtv/openglvideo.cpp | 2 mythtv/libs/libmythtv/programdata.cpp | 41 mythtv/libs/libmythtv/ringbuffer.cpp | 19 mythtv/libs/libmythtv/subtitlescreen.cpp | 58 mythtv/libs/libmythtv/tv_play.cpp | 8 mythtv/libs/libmythtv/videobuffers.cpp | 6 mythtv/libs/libmythtv/videoout_nullvdpau.cpp | 4 mythtv/libs/libmythtv/videoout_opengl.cpp | 6 mythtv/libs/libmythui/mythuiwebbrowser.cpp | 2 mythtv/libs/libmythupnp/upnpcds.h | 2 mythtv/libs/libmythupnp/upnpcmgr.h | 2 mythtv/programs/mythbackend/main_helpers.cpp | 9 mythtv/programs/mythbackend/mainserver.cpp | 20 mythtv/programs/mythbackend/upnpcdstv.cpp | 27 mythtv/programs/mythbackend/upnpcdsvideo.cpp | 2 mythtv/programs/mythfrontend/editvideometadata.cpp | 10 mythtv/programs/mythfrontend/grabbersettings.cpp | 125 mythtv/programs/mythfrontend/grabbersettings.h | 7 mythtv/programs/mythfrontend/playbackbox.cpp | 158 mythtv/programs/mythfrontend/playbackbox.h | 13 mythtv/programs/mythfrontend/scheduleeditor.cpp | 76 mythtv/programs/mythfrontend/scheduleeditor.h | 1 mythtv/programs/mythmetadatalookup/lookup.cpp | 12 mythtv/programs/mythmetadatalookup/main.cpp | 12 mythtv/programs/mythtranscode/mpeg2fix.cpp | 23 mythtv/programs/mythtranscode/mpeg2fix.h | 4 mythtv/programs/mythtranscode/videodecodebuffer.cpp | 36 mythtv/programs/mythtranscode/videodecodebuffer.h | 25 mythtv/themes/classic/tv_schedule.xml | 2 123 files changed, 7006 insertions(+), 2872 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.6 -r 1.7 mythtv-0.27-fixes.patch Index: mythtv-0.27-fixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/mythtv-0.27-fixes.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mythtv-0.27-fixes.patch 28 Jul 2014 02:16:16 -0000 1.6 +++ mythtv-0.27-fixes.patch 13 Oct 2014 22:48:06 -0000 1.7 @@ -1,5 +1,6 @@ mythplugins/mythmusic/mythmusic/importmusic.cpp | 2 +- mythplugins/mythmusic/mythmusic/musicplayer.cpp | 6 + + mythplugins/mythmusic/mythmusic/smartplaylist.cpp | 13 +- mythtv/external/FFmpeg/README.sync | 3 +- mythtv/external/FFmpeg/RELEASE | 2 +- mythtv/external/FFmpeg/VERSION | 2 +- @@ -55,27 +56,47 @@ mythtv/libs/libmyth/mediamonitor-darwin.cpp | 10 + mythtv/libs/libmythbase/mythcorecontext.cpp | 3 +- mythtv/libs/libmythbase/mythversion.h | 2 +- + mythtv/libs/libmythdvdnav/dvdnav/dvdnav.c | 2 +- + mythtv/libs/libmythdvdnav/dvdnav/dvdnav.h | 2 +- + mythtv/libs/libmythdvdnav/dvdnav/remap.c | 1 + + mythtv/libs/libmythdvdnav/dvdnav/searching.c | 32 +- + mythtv/libs/libmythdvdnav/dvdnav/vm/vm.c | 6 +- + mythtv/libs/libmythdvdnav/dvdread/dvd_input.c | 44 +- + mythtv/libs/libmythdvdnav/dvdread/dvd_reader.c | 1 + + mythtv/libs/libmythdvdnav/dvdread/dvd_udf.c | 5 +- + mythtv/libs/libmythdvdnav/dvdread/ifo_print.c | 4 +- + mythtv/libs/libmythdvdnav/dvdread/ifo_read.c | 23 +- mythtv/libs/libmythmetadata/libmythmetadata.pro | 4 +- mythtv/libs/libmythmetadata/metadatacommon.cpp | 95 +- - mythtv/libs/libmythmetadata/metadatacommon.h | 51 +- - mythtv/libs/libmythmetadata/metadatadownload.cpp | 211 +- - mythtv/libs/libmythmetadata/metadatafactory.cpp | 2 +- - mythtv/libs/libmythmetadata/metadatagrabber.cpp | 584 +++ + mythtv/libs/libmythmetadata/metadatacommon.h | 52 +- + mythtv/libs/libmythmetadata/metadatadownload.cpp | 339 +- + mythtv/libs/libmythmetadata/metadatafactory.cpp | 69 +- + mythtv/libs/libmythmetadata/metadatafactory.h | 2 + + mythtv/libs/libmythmetadata/metadatagrabber.cpp | 595 +++ mythtv/libs/libmythmetadata/metadatagrabber.h | 100 + - .../libs/libmythmetadata/metadataimagedownload.cpp | 148 +- + .../libs/libmythmetadata/metadataimagedownload.cpp | 150 +- .../libs/libmythmetadata/metadataimagedownload.h | 1 + mythtv/libs/libmythmetadata/videometadata.cpp | 17 +- .../requesthandler/fileserverhandler.cpp | 3 +- - mythtv/libs/libmythtv/avformatdecoder.cpp | 12 + + mythtv/libs/libmythtv/avformatdecoder.cpp | 48 +- mythtv/libs/libmythtv/cc608decoder.cpp | 2 +- + mythtv/libs/libmythtv/cc708reader.cpp | 2 +- + .../libs/libmythtv/channelscan/channelscan_sm.cpp | 19 +- + mythtv/libs/libmythtv/channelscan/channelscan_sm.h | 2 + + mythtv/libs/libmythtv/eitcache.cpp | 4 +- + mythtv/libs/libmythtv/eitfixup.cpp | 4 +- mythtv/libs/libmythtv/lzoconf.h | 219 +- mythtv/libs/libmythtv/lzodefs.h | 2527 ++++++++---- + mythtv/libs/libmythtv/metadataimagehelper.cpp | 3 + mythtv/libs/libmythtv/minilzo.cpp | 4191 ++++++++++++++------ mythtv/libs/libmythtv/minilzo.h | 20 +- - mythtv/libs/libmythtv/mythplayer.cpp | 10 +- + mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp | 8 + + mythtv/libs/libmythtv/mythplayer.cpp | 141 +- mythtv/libs/libmythtv/openglvideo.cpp | 2 +- - mythtv/libs/libmythtv/ringbuffer.cpp | 7 +- + mythtv/libs/libmythtv/programdata.cpp | 41 +- + mythtv/libs/libmythtv/ringbuffer.cpp | 19 +- mythtv/libs/libmythtv/subtitlescreen.cpp | 58 +- + mythtv/libs/libmythtv/tv_play.cpp | 8 +- mythtv/libs/libmythtv/videobuffers.cpp | 6 + mythtv/libs/libmythtv/videoout_nullvdpau.cpp | 4 +- mythtv/libs/libmythtv/videoout_opengl.cpp | 6 +- @@ -84,13 +105,23 @@ mythtv/libs/libmythupnp/upnpcmgr.h | 2 +- mythtv/programs/mythbackend/main_helpers.cpp | 9 +- mythtv/programs/mythbackend/mainserver.cpp | 20 +- + mythtv/programs/mythbackend/upnpcdstv.cpp | 27 +- + mythtv/programs/mythbackend/upnpcdsvideo.cpp | 2 +- + mythtv/programs/mythfrontend/editvideometadata.cpp | 10 +- mythtv/programs/mythfrontend/grabbersettings.cpp | 125 +- mythtv/programs/mythfrontend/grabbersettings.h | 7 +- + mythtv/programs/mythfrontend/playbackbox.cpp | 158 +- + mythtv/programs/mythfrontend/playbackbox.h | 13 +- + mythtv/programs/mythfrontend/scheduleeditor.cpp | 76 +- + mythtv/programs/mythfrontend/scheduleeditor.h | 1 + + mythtv/programs/mythmetadatalookup/lookup.cpp | 12 +- mythtv/programs/mythmetadatalookup/main.cpp | 12 + - mythtv/programs/mythtranscode/mpeg2fix.cpp | 17 +- + mythtv/programs/mythtranscode/mpeg2fix.cpp | 23 +- mythtv/programs/mythtranscode/mpeg2fix.h | 4 + + .../programs/mythtranscode/videodecodebuffer.cpp | 36 +- + mythtv/programs/mythtranscode/videodecodebuffer.h | 25 +- mythtv/themes/classic/tv_schedule.xml | 2 +- - 92 files changed, 6321 insertions(+), 2577 deletions(-) + 123 files changed, 7006 insertions(+), 2872 deletions(-) diff --git a/mythplugins/mythmusic/mythmusic/importmusic.cpp b/mythplugins/mythmusic/mythmusic/importmusic.cpp index d0faf12..31a89da 100644 @@ -122,6 +153,51 @@ m_isPlaying = false; if (stopAll && getDecoder()) +diff --git a/mythplugins/mythmusic/mythmusic/smartplaylist.cpp b/mythplugins/mythmusic/mythmusic/smartplaylist.cpp +index de952e8..0fc546d 100644 +--- a/mythplugins/mythmusic/mythmusic/smartplaylist.cpp ++++ b/mythplugins/mythmusic/mythmusic/smartplaylist.cpp +@@ -52,10 +52,8 @@ static SmartPLField SmartPLFields[] = + { "Play Count", "music_songs.numplays", ftNumeric, 0, 9999, 0 }, + { "Compilation", "music_albums.compilation", ftBoolean, 0, 0, 0 }, + { "Comp. Artist", "music_comp_artists.artist_name", ftString, 0, 0, 0 }, +- { "Last Play", "FROM_DAYS(TO_DAYS(music_songs.lastplay))", +- ftDate, 0, 0, 0 }, +- { "Date Imported", "FROM_DAYS(TO_DAYS(music_songs.date_entered))", +- ftDate, 0, 0, 0 }, ++ { "Last Play", "music_songs.lastplay", ftDate, 0, 0, 0 }, ++ { "Date Imported", "music_songs.date_entered", ftDate, 0, 0, 0 }, + }; + + struct SmartPLOperator +@@ -334,7 +332,7 @@ bool SmartPLCriteriaRow::saveToDatabase(int smartPlaylistID) + query.bindValue(":FIELD", Field); + query.bindValue(":OPERATOR", Operator); + query.bindValue(":VALUE1", Value1); +- query.bindValue(":VALUE2", Value2); ++ query.bindValue(":VALUE2", Value2.isNull() ? "" : Value2); + + if (!query.exec()) + { +@@ -750,7 +748,7 @@ void SmartPlaylistEditor::updateMatches(void) + + m_matchesText->SetText(QString::number(m_matchesCount)); + +- m_playlistIsValid = (m_matchesCount > 0); ++ m_playlistIsValid = (m_criteriaRows.size() > 0); + m_showResultsButton->SetEnabled((m_matchesCount > 0)); + titleChanged(); + } +@@ -1015,6 +1013,9 @@ QString SmartPlaylistEditor::getOrderByClause(void) + + QString SmartPlaylistEditor::getWhereClause(void) + { ++ if (m_criteriaRows.size() == 0) ++ return QString(); ++ + bool bFirst = true; + QString sql = "WHERE "; + diff --git a/mythtv/external/FFmpeg/README.sync b/mythtv/external/FFmpeg/README.sync index a91b793..2bf19c5 100644 --- a/mythtv/external/FFmpeg/README.sync @@ -1537,7 +1613,7 @@ bool MythCoreContext::IsFrontendOnly(void) diff --git a/mythtv/libs/libmythbase/mythversion.h b/mythtv/libs/libmythbase/mythversion.h -index c189c40..85d6ecd 100644 +index c189c40..b097b21 100644 --- a/mythtv/libs/libmythbase/mythversion.h +++ b/mythtv/libs/libmythbase/mythversion.h @@ -12,7 +12,7 @@ @@ -1545,10 +1621,369 @@ /// Including changes in the libmythbase, libmyth, libmythtv, libmythav* and /// libmythui class methods in exported headers. -#define MYTH_BINARY_VERSION "0.27.20140702-1" -+#define MYTH_BINARY_VERSION "0.27.20140718-1" ++#define MYTH_BINARY_VERSION "0.27.20140719-1" /** \brief Increment this whenever the MythTV network protocol changes. * +diff --git a/mythtv/libs/libmythdvdnav/dvdnav/dvdnav.c b/mythtv/libs/libmythdvdnav/dvdnav/dvdnav.c +index 3a7952e..f4b5ecb 100644 +--- a/mythtv/libs/libmythdvdnav/dvdnav/dvdnav.c ++++ b/mythtv/libs/libmythdvdnav/dvdnav/dvdnav.c +@@ -203,7 +203,7 @@ int64_t dvdnav_convert_time(dvd_time_t *time) { + int64_t result; + int64_t frames; + +- result = (time->hour >> 4 ) * 10 * 60 * 60 * 90000; ++ result = (time->hour >> 4 ) * 10 * 60 * 60 * 90000ull; + result += (time->hour & 0x0f) * 60 * 60 * 90000; + result += (time->minute >> 4 ) * 10 * 60 * 90000; + result += (time->minute & 0x0f) * 60 * 90000; +diff --git a/mythtv/libs/libmythdvdnav/dvdnav/dvdnav.h b/mythtv/libs/libmythdvdnav/dvdnav/dvdnav.h +index 1e7fa08..a5a76de 100644 +--- a/mythtv/libs/libmythdvdnav/dvdnav/dvdnav.h ++++ b/mythtv/libs/libmythdvdnav/dvdnav/dvdnav.h +@@ -29,7 +29,7 @@ + #define MP_DVDNAV 1 + + // Change this only when syncing to mplayer dvdnav trunk +-#define DVDNAV_SVN_REV "svnR1251" ++#define DVDNAV_SVN_REV "svnR1294" + + #ifdef __cplusplus + extern "C" { +diff --git a/mythtv/libs/libmythdvdnav/dvdnav/remap.c b/mythtv/libs/libmythdvdnav/dvdnav/remap.c +index f1dea93..4632a49 100644 +--- a/mythtv/libs/libmythdvdnav/dvdnav/remap.c ++++ b/mythtv/libs/libmythdvdnav/dvdnav/remap.c +@@ -22,6 +22,7 @@ + + #include <stdlib.h> [...2607 lines suppressed...] diff --git a/mythtv/programs/mythmetadatalookup/main.cpp b/mythtv/programs/mythmetadatalookup/main.cpp index 0878925..1da7dfa 100644 --- a/mythtv/programs/mythmetadatalookup/main.cpp @@ -13021,7 +15003,7 @@ if ((retval = cmdline.ConfigureLogging()) != GENERIC_EXIT_OK) return retval; diff --git a/mythtv/programs/mythtranscode/mpeg2fix.cpp b/mythtv/programs/mythtranscode/mpeg2fix.cpp -index 8ba085c..3cf92b9 100644 +index 8ba085c..c7214d3 100644 --- a/mythtv/programs/mythtranscode/mpeg2fix.cpp +++ b/mythtv/programs/mythtranscode/mpeg2fix.cpp @@ -576,18 +576,21 @@ void MPEG2fixup::InitReplex() @@ -13050,7 +15032,22 @@ { case AV_CODEC_ID_MP2: case AV_CODEC_ID_MP3: -@@ -1376,6 +1379,7 @@ int MPEG2fixup::GetFrame(AVPacket *pkt) +@@ -803,10 +806,12 @@ bool MPEG2fixup::InitAV(QString inputfile, const char *type, int64_t offset) + break; + + case AVMEDIA_TYPE_AUDIO: +- if (!allaudio && inputFC->streams[i]->codec->channels == 0) ++ if (!allaudio && ext_count > 0 && ++ inputFC->streams[i]->codec->channels < 2 && ++ inputFC->streams[i]->codec->sample_rate < 100000) + { + LOG(VB_GENERAL, LOG_ERR, +- QString("Skipping invalid audio stream: %1").arg(i)); ++ QString("Skipping audio stream: %1").arg(i)); + break; + } + if (inputFC->streams[i]->codec->codec_id == AV_CODEC_ID_AC3 || +@@ -1376,6 +1381,7 @@ int MPEG2fixup::GetFrame(AVPacket *pkt) { LOG(VB_GENERAL, LOG_DEBUG, QString("Invalid stream ID %1, ignoring").arg(pkt->stream_index)); @@ -13058,7 +15055,7 @@ } av_free_packet(pkt); return 0; -@@ -2398,6 +2402,11 @@ int MPEG2fixup::Start() +@@ -2398,6 +2404,11 @@ int MPEG2fixup::Start() while (af->count()) { @@ -13089,6 +15086,154 @@ return inputFC->streams[id]->parser; } +diff --git a/mythtv/programs/mythtranscode/videodecodebuffer.cpp b/mythtv/programs/mythtranscode/videodecodebuffer.cpp +index 73d23e0..b6bbdf9 100644 +--- a/mythtv/programs/mythtranscode/videodecodebuffer.cpp ++++ b/mythtv/programs/mythtranscode/videodecodebuffer.cpp +@@ -1,11 +1,14 @@ + #include "videodecodebuffer.h" + ++#include "mythplayer.h" ++#include "videooutbase.h" ++ + VideoDecodeBuffer::VideoDecodeBuffer(MythPlayer *player, VideoOutput *videoout, + bool cutlist, int size) + : m_player(player), m_videoOutput(videoout), +- m_honorCutlist(cutlist), +- m_eof(false), m_maxFrames(size), +- m_runThread(true), m_isRunning(false) ++ m_honorCutlist(cutlist), m_maxFrames(size), ++ m_runThread(true), m_isRunning(false), ++ m_eof(false) + { + + } +@@ -35,8 +38,12 @@ void VideoDecodeBuffer::run() + m_isRunning = true; + while (m_runThread) + { ++ QMutexLocker locker(&m_queueLock); ++ + if (m_frameList.size() < m_maxFrames && !m_eof) + { ++ locker.unlock(); ++ + DecodedFrameInfo tfInfo; + tfInfo.frame = NULL; + tfInfo.didFF = 0; +@@ -47,21 +54,22 @@ void VideoDecodeBuffer::run() + { + tfInfo.frame = m_videoOutput->GetLastDecodedFrame(); + +- QMutexLocker locker(&m_queueLock); ++ locker.relock(); + m_frameList.append(tfInfo); + } +- else ++ else if (m_player->GetEof() != kEofStateNone) + { ++ locker.relock(); + m_eof = true; + } ++ else ++ continue; + + m_frameWaitCond.wakeAll(); + } + else + { +- m_frameWaitLock.lock(); +- m_frameWaitCond.wait(&m_frameWaitLock); +- m_frameWaitLock.unlock(); ++ m_frameWaitCond.wait(locker.mutex()); + } + } + m_isRunning = false; +@@ -69,27 +77,21 @@ void VideoDecodeBuffer::run() + + VideoFrame *VideoDecodeBuffer::GetFrame(int &didFF, bool &isKey) + { +- m_queueLock.lock(); ++ QMutexLocker locker(&m_queueLock); + + if (m_frameList.isEmpty()) + { +- m_queueLock.unlock(); +- + if (m_eof) + return NULL; + +- m_frameWaitLock.lock(); +- m_frameWaitCond.wait(&m_frameWaitLock); +- m_frameWaitLock.unlock(); ++ m_frameWaitCond.wait(locker.mutex()); + + if (m_frameList.isEmpty()) + return NULL; +- +- m_queueLock.lock(); + } + + DecodedFrameInfo tfInfo = m_frameList.takeFirst(); +- m_queueLock.unlock(); ++ locker.unlock(); + m_frameWaitCond.wakeAll(); + + didFF = tfInfo.didFF; +diff --git a/mythtv/programs/mythtranscode/videodecodebuffer.h b/mythtv/programs/mythtranscode/videodecodebuffer.h +index 50c33d0..b4e241a 100644 +--- a/mythtv/programs/mythtranscode/videodecodebuffer.h ++++ b/mythtv/programs/mythtranscode/videodecodebuffer.h +@@ -6,18 +6,20 @@ + #include <QMutex> + #include <QRunnable> + +-#include "mythplayer.h" + #include "videooutbase.h" + ++class MythPlayer; ++class VideoOutput; ++ + class VideoDecodeBuffer : public QRunnable + { + public: + VideoDecodeBuffer(MythPlayer *player, VideoOutput *videoout, + bool cutlist, int size = 5); +- ~VideoDecodeBuffer(); ++ virtual ~VideoDecodeBuffer(); + +- void stop(void); +- void run(); ++ void stop(void); ++ virtual void run(); + VideoFrame *GetFrame(int &didFF, bool &isKey); + + private: +@@ -28,17 +30,16 @@ class VideoDecodeBuffer : public QRunnable + bool isKey; + } DecodedFrameInfo; + +- MythPlayer *m_player; +- VideoOutput *m_videoOutput; +- bool m_honorCutlist; ++ MythPlayer * const m_player; ++ VideoOutput * const m_videoOutput; ++ bool const m_honorCutlist; ++ int const m_maxFrames; ++ bool volatile m_runThread; ++ bool volatile m_isRunning; ++ QMutex mutable m_queueLock; // Guards the following... + bool m_eof; +- int m_maxFrames; +- bool m_runThread; +- bool m_isRunning; +- QMutex m_queueLock; + QList<DecodedFrameInfo> m_frameList; + QWaitCondition m_frameWaitCond; +- QMutex m_frameWaitLock; + }; + + #endif diff --git a/mythtv/themes/classic/tv_schedule.xml b/mythtv/themes/classic/tv_schedule.xml index c517e3a..6559d45 100644 --- a/mythtv/themes/classic/tv_schedule.xml

9 years, 7 months

1
0
0 / 0

rpms/mythtv/devel mythtv-sd_fix.patch, NONE, 1.1 ChangeLog, 1.17, 1.18 mythtv.spec, 1.144, 1.145

by Richard Shaw

Author: hobbes1069 Update of /cvs/free/rpms/mythtv/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv469 Modified Files: ChangeLog mythtv.spec Added Files: mythtv-sd_fix.patch Log Message: * Mon Oct 13 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.27.3-2 - Update to latest fixes. - Add patch for schedules direct service change. mythtv-sd_fix.patch: datadirect.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE mythtv-sd_fix.patch --- Index: mythtv/libs/libmythtv/datadirect.cpp =================================================================== --- mythtv/libs/libmythtv/datadirect.cpp (revision 299141e0a69b706239beb35b096df9ed2cea8a7b) +++ mythtv/libs/libmythtv/datadirect.cpp (revision 4cb10e52b7e9c2ffec9111f76556a64c8fc7aba7) @@ -545,5 +545,5 @@ DataDirectURLs urls1( "Schedules Direct", - "http://webservices.schedulesdirect.tmsdatadirect.com" + "http://dd.schedulesdirect.org" "/schedulesdirect/tvlistings/xtvdService", "http://schedulesdirect.org", Index: ChangeLog =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/ChangeLog,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ChangeLog 28 Jul 2014 02:16:16 -0000 1.17 +++ ChangeLog 13 Oct 2014 22:47:27 -0000 1.18 @@ -1,3 +1,260 @@ +commit 629f7112ec77ddd6732ae00378ccf1b7283cbeec +Author: Stuart Auchterlonie <stuarta(a)squashedfrog.net> +Date: Tue Sep 23 17:35:32 2014 +0100 + + Handle [HD] in UK EIT fixups part 2 + 44c85ad369a9d2bd564728a65f4f8b1164df2483 didn't include HD in the + regexp which picked up the HD notification in the description. + + Hand cherry-picked from de131518b294fa75895b0de91a1f8dcf9f7ab274 + +commit a8040898f654a89f7f11dc5dabbaf06b44dc8f6b +Author: Stuart Morgan <smorgan(a)mythtv.org> +Date: Tue Sep 23 10:18:19 2014 +0100 + + UPnP: Fix dlna protocol string in 0.27, it wasn't DLNA compliant. + +commit 5a0266e0a0da1db8123488c34dd10809d98de3e0 +Author: Stuart Morgan <smorgan(a)mythtv.org> +Date: Tue Sep 23 10:14:16 2014 +0100 + + UPnP: Fix recording date folder names following UTC conversion. + +commit e2f46569ac53030345efa74782ae44cee3ec5a79 +Author: Karl Dietz <dekarl(a)mythtv.org> +Date: Fri Sep 19 23:43:46 2014 +0200 + + Handle [HD] in UK EIT fixups + + It appears that some transports transmit SD component descriptors on the + HD services. See https://forum.mythtv.org/viewtopic.php?f=2&t=353 + (cherry picked from commit 44c85ad369a9d2bd564728a65f4f8b1164df2483) + +commit 5c2cda7563c3a4656b112ecb48d3b97e9599dca6 +Author: Stuart Morgan <smorgan(a)mythtv.org> +Date: Thu Sep 18 11:54:55 2014 +0100 + + UPnP: Convert dates and times to local time before serving to the client + +commit 2d4a7c9235287b0589035974bff282e3f2e9a7e5 +Author: Richard Hulme <peper03(a)mythtv.org> +Date: Sun Jan 19 11:29:44 2014 +0100 + + Sync libdvdnav up to R1294: + + * Add missing strings.h #include for strncasecmp(). + * Fix crash when trying to play a DVD from different region than currently set in the DVD drive. + * Prevent segmentation faults in vdnav_describe_title_chapters() in case of parts with missing PGC. + * Let dvdnav_describe_title_chapters() ignore parts where the pgc_start_byte is above the last_byte. + * Let dvdnav_describe_title_chapters() skip PGCs with a cell number of zero. + * Fix integer overflow in dvdnav_convert_time(). + * Do not close file twice. + * Make sure program_map is not NULL. + * Let dvdnav_describe_title_chapters() skip PGCs with missing cells. + * Prevent general CPP macro from causing strange behavior. + * Avoid a crash when program number is zero. + * Check for out-of-bounds values for pgcn. + * In vm_new_vm(), use the proper calloc() argument order and don't derive 1 from the unrelated sizeof(char). + (cherry picked from commit 2a6038b5d7bf570e28fd8c3061483b0a22dcd830) + +commit e9f14bf72d40a52987eaf3c80e40c78f411b3cec +Author: Richard Hulme <peper03(a)mythtv.org> +Date: Sun Jan 19 11:24:12 2014 +0100 + + Sync libdvdread up to R1290: + + * Add missing strings.h #include for strcasecmp() / strncasecmp(). + * Replace uses of the deprecated dvdcss_handle type by dvdcss_t. + * Replace deprecated dvdcss_title() function by dvdcss_seek(). + * Do not extract libdvdcss version via dvdcss_interface_2. + * Add #define for DVDCSS_SEEK_KEY to allow compilation without dvdcss.h. + * If the start offset points past the last_byte (outside the region read) stop reading PTTs and adjust nr_of_srpts. + * Use correct name of the libdvdcss DLL on Windows. + * Fix spelling errors. + * Document warnings generated by DVDs made with the VDR-to-DVD device LG RC590M. + * Add an error message. + * Clear pf_temp to make sure it is initialized. + * Free `cached_dir_base` to fix memory leak. + * Abort when PTT search table has zero entries. + * Use 0 instead of NULL in integer comparison. + (cherry picked from commit 2874f0d150342539644a5838f5147fa4c31f51ff) + +commit 74ac2bdaa30743589abcd41bf7012fdf28cef74b +Author: Stuart Morgan <smorgan(a)mythtv.org> +Date: Sun Sep 7 12:52:25 2014 +0100 + + MythMusic: Allow smart playlist to be saved even if it produces no matches. The nature of smart playlists means that it may match tracks in the future. + + (cherry picked from commit 2f3f422e507dd5601aa0b0426bc81f59cda020a7) + +commit fb347b69f055ed3bc16e439dec0514550dad5816 +Author: Stuart Morgan <smorgan(a)mythtv.org> +Date: Sun Sep 7 12:37:11 2014 +0100 + + MythMusic: Fix NULL insert into NOT NULL column in SmartPlaylist editor. + + (cherry picked from commit 43b799a5fc57214102d586a01fc755e541e29ccd) + +commit 3afae9e094fb70b99abbf483b9d6c1aba83059aa +Author: Stuart Morgan <smorgan(a)mythtv.org> +Date: Sun Sep 7 12:31:56 2014 +0100 + + MythMusic: Fix sql error in SmartPlaylist editor when adding a new playlist. + + (cherry picked from commit e5d6a425053e2c6ce747cf8adfd7aaddf4bcb97a) + +commit 45fcdd836d507da8b798a2802b69e241f9e66e97 +Author: Stuart Morgan <smorgan(a)mythtv.org> +Date: Sun Sep 7 12:28:39 2014 +0100 + + MythMusic: Fix smart playlists uses lastplay or date_entered. + + (cherry picked from commit 428609b782c5644b2e885d861f19dbb354f344c0) + +commit 231972ca6da5432d05d513fd2a351aa0202470ee +Author: Karl Dietz <dekarl(a)mythtv.org> +Date: Wed Apr 2 20:00:53 2014 +0200 + + simplify handling of missing endtime at end of file in mythfilldatabase + + Instead of making up endtime of "next midnight" and "next 06:00 am" we + just let the database fill in its default of 0000-00-00 00:00 and replace + it later with whatever the next starttime is on that channel. + + This has seen very light testing, so I'm commiting it to master only. If + I get positive reports from users I'm happing to merge it into fixes. + + Fixes #11541 + + Reported as working on fixes/0.27 in https://code.mythtv.org/trac/ticket/11541#comment:12 + (cherry picked from commit 619b00848a0f272cf4e0529be4fedf48d9c414e9) + +commit 926bb8d2427388f3f051ee642bd7b629b4d18601 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Thu Aug 21 22:43:37 2014 +1000 + + RingBuffer: always read directly from file if read ahead thread isn’t running + + readInternalMode can only work if the read ahead thread is running + + (cherry picked from commit 0641cd9ac3eb142f239b70085bac459f3694eadd) + +commit 5b07c918a47b707943f20af71db67706ee1000b2 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Thu Aug 21 22:40:56 2014 +1000 + + RingBuffer: Properly wait for readahead thread to start + + Inverted test, no wait occurred causing a race condition later on which causes failures in LiveTV, usually when changing channels + + (cherry picked from commit 6b29f598776f8a2ecba09674b4c900ce0fb1fe7f) + +commit 082d5c1fbccd48dd862f14007c0445dee8502f3d +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Mon Aug 11 09:38:21 2014 +1000 + + Revert "TV UnpauseLiveTV calls tvchain->SwitchTo opposed to JumpTo to minimise visible disruption" + + This commit broke LiveTV channel change + + This reverts commit bfc6b9ed58029955d5a4230cad5851ed4848ed20. + + (cherry picked from commit 0f11604dd8429c9b6be847703898e9d4a55bb86e) + +commit d8d10dbef53a70784d1ffc2e3e702d3f5206a7f5 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Mon Aug 11 09:37:34 2014 +1000 + + Revert "Player: Enable AVSync to recover quicker after a seek or program change" + + This commit broke audio or frame rate change detection following a seek or channel change + + This reverts commit 195eb07fb106fbabf164a1989860adcc132ab9d2. + + (cherry picked from commit 0128796ef424552fb9af4c92c2ac05d2436b36b9) + +commit f097a8710d8f65b30ddf1d92e6759773b3cf151b +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Mon Aug 11 09:34:22 2014 +1000 + + Revert "Player: Finer a/v sync adjustments" + + This reverts commit f8d72280ccb3ec28391182cf6eaaf20c9c87ae4f. + + (cherry picked from commit d08503e30ccaa188ae27dad49ab67c343881db87) + +commit 628337cb3d0211f2f88b5aa8f1352ecd2ecdb021 +Merge: 6788ea9 cb7fd95 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Sun Aug 10 22:50:24 2014 +1000 + + Merge branch 'devel/027candidates' into fixes/0.27 + +commit cb7fd955cf8970b0135341a8d975720c9a4503b2 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Sun Aug 10 19:47:58 2014 +1000 + + Revert "Player: Amalgamate and simplify SwitchTo and JumpToProgram" + + This breaks seek when performed near the end of a program and makes the frontend unresponsive for several seconds when reaching the end of the current program + + This reverts commit cc927f687995a9620de581894a68935b0780b299. + + (cherry picked from commit 2bdb7cc5f5e5918cbdd19dcbb4902bec6d028ece) + +commit 6788ea9ab34b86a1b7f18a540f91d5c5514f4665 +Author: Jim Stichnoth <jstichnoth(a)mythtv.org> +Date: Sun Jul 13 08:46:16 2014 -0700 + + Make seeks faster for slow decoders / large keyframe distances. + + Exact seeking for HD-PVR recordings can be notoriously slow because + the keyframe distance is 128 frames and decoding (even GPU hardware + decoding) is often little faster than real-time. + + In most cases, it's a much better user experience to make a less + accurate but much faster seek to the preceding keyframe. + + There are two changes: + + 1. Impose a maximum wall-clock time on the forward frame-by-frame + seeking. After this maximum time elapses, abort any further frame + seeking. + + 2. In addition, try to predict whether fully accurate seeking will + complete within a reasonable time, and if after a few frames it seems + hopeless, just don't bother seeking any further. + + This approach allows fast decoders and video formats amenable to fast + decoding to continue to have exact seeking. + + Fixes #12004. + (cherry picked from commit 33acfaf30747592b9fca0913b2c2f8832418d618) + +commit 5c76f3356fe2178677019e0415151e64605411c4 +Author: Karl Dietz <dekarl(a)mythtv.org> +Date: Wed Jul 23 11:15:24 2014 +0200 + + Attempt to fix segfault in EITCache assumed to be due to QMap race + + Fixes #12219 + (cherry picked from commit 477c3f2b1cd3bcb38c5cfd9a3a934a95e1a13beb) + +commit 5e37f9cf53e196459c59faceb9317e4e755df4eb +Author: Jim Stichnoth <jstichnoth(a)mythtv.org> +Date: Mon Jul 28 09:36:58 2014 -0700 + + Captions: Delete *all* cc708 windows in CC708Reader::Reset(). + + Refs #12227. + + Signed-off-by: Jim Stichnoth <jstichnoth(a)mythtv.org> + (cherry picked from commit e97f4f59806a32421a2d2ab4c79549286c56b6ab) + + Conflicts: + + mythtv/libs/libmythtv/cc708reader.cpp + commit 0dd5ab38982619af18f99c4032c1010d68991047 Author: Jim Stichnoth <jstichnoth(a)mythtv.org> Date: Tue Jul 22 06:40:49 2014 -0700 @@ -23,6 +280,13 @@ Refs #12051. (cherry picked from commit 7d60440b2d790208a25ce707480f5b01657410f1) +commit 143cf1c051bfc55321689cd75cbd2387cd7c48e7 +Merge: bd1a02e f91e18d +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Sun Jul 20 00:01:13 2014 +1000 + + Merge branch 'fixes/0.27' into devel/027candidates + commit f91e18d652a5057b2e40f14a6afbda6b4abc128d Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> Date: Sat Jul 19 23:56:21 2014 +1000 @@ -33,6 +297,401 @@ This reverts commit 4630430b110dc173963c53d2bc0e7d15e6115d3e. +commit bd1a02e1646b02bac8501fa12bd807df57141957 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Sat Jul 19 22:02:30 2014 +1000 + + Bump ABI + +commit 24713519416992672204b89593ad45e595c0746c +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Sat Jul 19 21:51:24 2014 +1000 + + metadata: fix C++11 compilation + + multiple backports from master + +commit a452d8f853469c025f19bb23f5fa01294313d89c +Author: Karl Dietz <dekarl(a)mythtv.org> +Date: Sat May 31 15:11:43 2014 +0200 + + Guess its an episode if it has an episode title + + Guessing the content type for videos was only looking at the + season and episode number. + + (cherry picked from commit 75478511c1d791faefb913c8a160da1c9441b1cf) + +commit 322466107073ec12de69e3a9a810e2675f2b0362 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Sat Jul 19 03:39:27 2014 +1000 + + frontend: add search abilities to “change recording metadata” screen. + + This will allow to search for inetref and set season/episode as well as subtitle and description. + Themes will have to be updated to enjoy this functionality by adding a “query_button” button. + + (cherry picked from commit 41b9be6e64ce92553d84a1c255d049fc42636fef) + +commit 4b43f7ce7598e4c7328f19a3d207307149ae53f3 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Sat Jul 19 03:31:01 2014 +1000 + + metadata: also look for artwork when scanning a single recording + + no point waiting a day or having to run a full artwork scan + + (cherry picked from commit 4e50609edf5c38dcb6fb979b2d5dd2448ebe3e31) + +commit d9aa1b9974cb6e90265e9f89e56b34812b8ad89f +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Sat Jul 19 02:56:39 2014 +1000 + + metadata: return both movie and TV results when in non-automatic mode + + This allows not having to fiddle with season or episode #. TV or movie entries are presented first depending on the guessed type. + We only do so if multiple results were already found + + (cherry picked from commit 2f9424c78cf0edd8409b76fbef07667a8940ba82) + +commit 554be7ca490a1672450bb435cd984e1d46615b0e +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Thu Jul 17 23:40:33 2014 +1000 + + metadatalookup: fix logic error introduced in 5d3d319936513cac22557f9a3969f7210b8ac049 + + (cherry picked from commit e0155b9bb2b84b9574e587d65cf22f45d124d202) + +commit af9082ea5a4123662726dbfe58ee3516f9cb75db +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Thu Jul 17 23:33:00 2014 +1000 + + metadata: complete refactor of search + + Use different sequence of searches in order to find the best matching possibility. + For TV, should no match be found, search for a generic artwork. This generic artwork will be automatically upgraded should specialised artwork ever be found. + This is done by setting a season number 0 for that generic artwork. + Original season/episode number will never get rewritten like it used it (was set to 1x1) + + (cherry picked from commit 05f63f5258f7bc2937131510c3a81232c958547c) + +commit 630ae4b315d5bad8654621225e198abee070e1ed +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Thu Jul 17 23:18:25 2014 +1000 + + frontend: fix automatic mode introduced in previous commit + + (cherry picked from commit f9fef962ca042e2d09137c8a026082980b2d03dd) + +commit cc61fbda9d72b8d5ee4d3844096b55f43d581ad3 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Thu Jul 17 21:35:40 2014 +1000 + + frontend: simplify metadata search creation + + Use GuessLookupType API, no point duplicating the code all over the place + + (cherry picked from commit c2c27e5f493311a4fb4fe1816188cf57a6a857e8) + + Conflicts: + mythtv/programs/mythfrontend/scheduleeditor.cpp + +commit 212ab3e0f93d1a00a63f21b12f0d5ce6702f2e2c +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Thu Jul 17 21:32:44 2014 +1000 + + metadata: never overrides current video season/episode with with retrieved metadata ones + + Only do so, if season or episode is 0 + + (cherry picked from commit 2c1e405709270ef165e93346a77deb718831faff) + +commit 0d9231ebee0dd69708045ce8c14c449b16eb6cf5 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Thu Jul 17 21:30:52 2014 +1000 + + metadata: use extended inetref if available to determine the type of metadata + + (cherry picked from commit 2d4be81584230ac31dd2fa4f8b602a0c5e3d82c1) + +commit 6619a3ce7c7f1753f0618a2568d50062ac05cfd2 +Author: Karl Dietz <dekarl(a)mythtv.org> +Date: Sat May 31 10:18:04 2014 +0200 + + add GuessLookupType for VideoMetadata to match other content + + Refactor the lookup so its easier to compare the guessing. + + (cherry picked from commit 80c5e450b651732c476fbf8f1c47ba71a036f040) + +commit cef57fcf8cc69ccf5135fcbe5081f0b5468b3eee +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Thu Jul 17 21:27:02 2014 +1000 + + metadata: create Set/GetIsCollection + + Will be used to propagate the information that the metadata came from a collection rather than a given season/episode. + That information is only necessary during the lifetime of the Metadatalookup object, so no need to change other classes + + (cherry picked from commit 7407adf97fe10485a7afce561eb425d26f210ca8) + +commit b419d3fa8a84e36d98ea78a821bedc37985c9f6c +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Wed Jul 16 13:42:54 2014 +1000 + + Revert "metadata: properly handle media search type if we already have an extended inetref." + + This reverts commit 30b03cc2b86e949b434b7afc207f12d35e6c6d87. + + (cherry picked from commit 1abcb6f6a6785d834e9ba95d5ef963ab67fceaf1) + +commit 7b21180bca612a7aa53253986ebba8872586c141 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Tue Jul 15 20:47:50 2014 +1000 + + metadata: fix incorrect tests + + would always return false + + similar to a50a24b0f408957885ff928569a061df07e5e993 + + (cherry picked from commit 5d3d319936513cac22557f9a3969f7210b8ac049) + + Conflicts: + mythtv/programs/mythmetadatalookup/lookup.cpp + +commit df8b2418bd8a31eff5563a017e87682f1152ab6d +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Mon Jul 14 03:58:25 2014 +1000 + + metadata: do not unnecessarily query the database if there’s no chance that it will yield a result + + (cherry picked from commit 2d6eef6ecf0062f503b2188220eb8db9092cc6d6) + +commit ef4af9b3dee5583f61e9ec89d5071f717b294da6 +Author: Karl Dietz <dekarl(a)mythtv.org> +Date: Mon Jan 7 22:42:16 2013 +0100 + + Obey useonairguide and enable it for ERT + + Ignore the SDT in the EIT scanner, thus obeying useonairguide. + Add quirk for ONID 65330 (ERT) to the channel scanner. + + Refs #9592 + + (cherry picked from commit 7af260e6ff315fd511477e3cd1efb2e0b5cd0a67) + +commit db46c6a71c53bccebc640331ad35f0481c4c7fc2 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Thu Jul 10 23:14:49 2014 +1000 + + Limit bitrate to 100Mbit/s and fill_min to half the size of the ringbuffer + + Under some circumstances, FFmpeg can returns rubbish bitrates, set a maximum value of 100Mbit. This is almost twice the maximum bitrate permissible on a bluray. + + Fixes #12196 + + (cherry picked from commit 83050ac67d40a449bc5433e0edda2c41d75eb45f) + +commit a59b9d920d4039578405fae0d729943048325099 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Tue Jul 8 17:18:17 2014 +1000 + + Flush buffers prior to closing the codec. + + Avoid random crashes seen with HLS streams + + (cherry picked from commit af6f82616a970d9b5e292ae4cffc25c1878d0405) + +commit ae9d9094bbef8c4e3910df72c2dfd4049aab0d10 +Author: Lawrence Rust <lvr(a)softsystem.co.uk> +Date: Wed Mar 12 13:49:41 2014 +0000 + + Transcode: Fix a race condition in VideoDecodeBuffer when EOF encountered + + Signed-off-by: Lawrence Rust <lvr(a)softsystem.co.uk> + Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org> + (cherry picked from commit 0937dac17f362ca28ff8e627d58d6b32eecad02f) + +commit c4eaae346255b4e4956be27aded3a0ad9b2777c5 +Author: Lawrence Rust <lvr(a)softsystem.co.uk> +Date: Mon Jun 16 18:07:01 2014 +0100 + + Player: Allow seeking upto last frame when paused + + Signed-off-by: Lawrence Rust <lvr(a)softsystem.co.uk> + Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org> + (cherry picked from commit c63a09c92b4ee2d82c104cd358a31b8464ca3e23) + +commit 85c8cfec421dd1fd7e510556b97fdd7d90669954 +Author: Lawrence Rust <lvr(a)softsystem.co.uk> +Date: Thu Jun 26 18:02:16 2014 +0100 + + TV: Avoid a SEGV when switching from PiP to PbP + + If a PiP reaches EOF then it's still possible to select the menu item + to switch from PiP to PbP. Then TV::PxPToggleType calls + GetPlayer(mctx, 1)->SetPIPState(kPBPRight) but GetPlayer(mctx, 1) + returns NULL. + + 0 SetPIPState (change=<optimised out>, this=<optimised out>) + at playercontext.h:107 + 1 TV::PxPToggleType (this=0xa9d39f8, mctx=0xae006c8, wantPBP=true) + at tv_play.cpp:5881 + 2 0xb7029da6 in TV::HandlePxPTimerEvent (this=0xa9d39f8) + at tv_play.cpp:3191 + 3 0xb705b3da in TV::timerEvent (this=0xa9d39f8, te=0x0) + at tv_play.cpp:2796 + 4 0xb5379ee7 in QObject::event (this=0xa9d39f8, e=0xbfee4fbc) + at kernel/qobject.cpp:1157 + + This fix checks that the PiP is valid before changing state. + + Signed-off-by: Lawrence Rust <lvr(a)softsystem.co.uk> + Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org> + (cherry picked from commit d2a785b79196fb8194e60628b756ffc66d79db6c) + +commit 8b39b0a449e18bc1a69f09631a7d63311e069d5b +Author: Lawrence Rust <lvr(a)softsystem.co.uk> +Date: Tue Dec 6 20:44:13 2011 +0100 + + libmythtv: Add a mutex to the ChannelScanSM class + + This class is accessed by two threads, the signal monitor and the + thread that drives the scan. + + A segv can occur if one thread deletes the currentInfo member + while it is being used by the other. + + Signed-off-by: Lawrence Rust <lvr(a)softsystem.co.uk> + Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org> + (cherry picked from commit 738114f03f392ed882847e29eeb1462b028a0f3c) + +commit fcd250728735131bacb7ceda0217eac15481db8f +Author: Lawrence Rust <lvr(a)softsystem.co.uk> +Date: Tue Jul 8 14:25:27 2014 +1000 + + Player: Amalgamate and simplify SwitchTo and JumpToProgram + + 1. buffer->UpdateRawBitrate can wait for several 100mS so only call it if absolutely necessary i.e. if stream type hasn't changed. + + 2. Omit unnecessary call to buffer->IgnoreLiveEOF which also can wait for several 100mS. + + 3. Omit some lengthy calls to read the deleteMap and bookmarks if liveTV + + 4. Ensure there are sufficient video frames buffered before starting playback. + This reduces stutters in the first few seconds on remote frontends. + Also delays a/v playback start until ringbuffer is ready to read. + + 5. Reduce interference with RingBuffer readahead. + + Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org> + (cherry picked from commit cc927f687995a9620de581894a68935b0780b299) + +commit f307a3d5e60b0054e1833127d417c6acfada3213 +Author: Lawrence Rust <lvr(a)softsystem.co.uk> +Date: Thu Jun 2 12:55:13 2011 +0200 + + Player: Improve low bit rate / high latency stream playback + + DVB-S radio programs are low bit rate (64Kbps..256Kbps) and suffer + occasional latency. + + MHEG interaction streams are internet sourced and often suffer congestion + resulting in high latency for some packets. + + - Fix a number of issues to do with changing program to DVB-S radio and + the lack of video stream causing garbage video display. + + Signed-off-by: Lawrence Rust <lvr(a)softsystem.co.uk> + Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org> + (cherry picked from commit 0e0e04ccadfcbeeedbeb5e6286c591caa33d8e62) + + Conflicts: + mythtv/libs/libmythtv/mythplayer.cpp + +commit 47542ea4b690c957172ff30acb13a10a4f9fc0eb +Author: Lawrence Rust <lvr(a)softsystem.co.uk> +Date: Fri Jul 12 15:13:07 2013 +0100 + + Player: Finer a/v sync adjustments + + Signed-off-by: Lawrence Rust <lvr(a)softsystem.co.uk> + Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org> + (cherry picked from commit f8d72280ccb3ec28391182cf6eaaf20c9c87ae4f) + +commit c978683605d52fe28bb03a2ed5d112ddd7c22f8f +Author: Lawrence Rust <lvr(a)softsystem.co.uk> +Date: Fri Jun 14 19:53:14 2013 +0100 + + Player: Enable AVSync to recover quicker after a seek or program change + + The a/v timecodes can get out of step by 10's of seconds after a seek + or a livetv program change. This can cause frames to be doubled or dropped + until the a/v streams get back in step. + + This patch checks the a/v timecode difference and if larger than 1 second + disables frame dropping or doubling. + + Signed-off-by: Lawrence Rust <lvr(a)softsystem.co.uk> + Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org> + (cherry picked from commit 195eb07fb106fbabf164a1989860adcc132ab9d2) + +commit 3ccb0ad1eb1140b866bb8eb187f39e32393966d0 +Author: Lawrence Rust <lvr(a)softsystem.co.uk> +Date: Wed Jun 12 14:55:08 2013 +0100 + + Player: Clear EOF when resuming play + + RingBuffer::Read returns 0 (eof) when the buffer is paused. This causes + ffmpeg to set eof and prevent any further reads by the decoder. + + This patch clears the decoder's eof on restarting play which in turn + resets ffmpeg's eof. + + Signed-off-by: Lawrence Rust <lvr(a)softsystem.co.uk> + Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org> + (cherry picked from commit 604a9d8db63fababfeb07e1ffc8d45e3f4f2314c) + +commit dcc0560ea5ad4521b9c0b5c5afc7d5d7975dd675 +Author: Lawrence Rust <lvr(a)softsystem.co.uk> +Date: Wed Mar 20 13:51:07 2013 +0000 + + mythtranscode: skip audio description streams + + A number of recent broadcasts on UK Freeview (BBC & ITV) have an + audio description (AD) stream that is discontiguous. Mythtranscode attempts + to output all audio streams but if the AD stream is not present for + some time then the output FIFOs overflow. + + Signed-off-by: Lawrence Rust <lvr(a)softsystem.co.uk> + Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org> + (cherry picked from commit a1a6502d4529cbe074b587919f05ecbb97ce2c74) + +commit 8038187f1c74545f39d6cf3326df4dc903690a89 +Author: Lawrence Rust <lvr(a)softsystem.co.uk> +Date: Sun Jul 7 16:41:02 2013 +0100 + + TV UnpauseLiveTV calls tvchain->SwitchTo opposed to JumpTo to minimise visible disruption + + Signed-off-by: Lawrence Rust <lvr(a)softsystem.co.uk> + Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org> + (cherry picked from commit bfc6b9ed58029955d5a4230cad5851ed4848ed20) + +commit 266ed9dd68273a2f769372891417af0973f26545 +Author: Lawrence Rust <lvr(a)softsystem.co.uk> +Date: Tue Aug 20 19:37:29 2013 +0100 + + TV: Quit the TV playback loop when the primary player reports a fatal error + + If MythPlayer::OpenFile fails (for instance network congestion) then + TV::StartTV continues by restarting TV instance which then causes problems + for the backend. + + Signed-off-by: Lawrence Rust <lvr(a)softsystem.co.uk> + Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org> + (cherry picked from commit faad748af24b9bbbaa894243c9cf52fd841bb8d4) + commit 302dde18b440a52f8c53744129a4c9adfee3ef71 Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> Date: Sat Jul 19 15:13:21 2014 +1000 Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- mythtv.spec 28 Jul 2014 02:16:16 -0000 1.144 +++ mythtv.spec 13 Oct 2014 22:47:27 -0000 1.145 @@ -60,7 +60,7 @@ %define desktop_vendor RPMFusion # MythTV Version string -- preferably the output from git --describe -%define vers_string v0.27.3-109-g0dd5ab3 +%define vers_string v0.27.3-164-g629f711 %define branch fixes/0.27 # Git revision and branch ID @@ -78,7 +78,7 @@ %if "%{branch}" == "master" Release: 0.1.git.%{_gitrev}%{?dist} %else -Release: 1%{?dist} +Release: 2%{?dist} %endif # The primary license is GPLv2+, but bits are borrowed from a number of @@ -101,7 +101,7 @@ %define with_vdpau %{?_without_vdpau: 0} %{?!_without_vdpau: 1} %define with_vaapi %{?_without_vaapi: 0} %{?!_without_vaapi: 1} -%if 0%{?rhel} +%if 0%{?rhel} < 7 %define with_crystalhd %{?_without_crystalhd: 1} %{?!_without_crystalhd: 0} %define with_systemd %{?_without_systemd: 1} %{?!_without_systemd: 0} @@ -142,6 +142,7 @@ # http://code.mythtv.org/trac/ticket/11338 # Offset required for 0.27, patch was for 0.26.1 Patch2: mythtv-0.27-libcec2.patch +Patch3: mythtv-sd_fix.patch Source10: PACKAGE-LICENSING Source11: ChangeLog @@ -176,7 +177,7 @@ BuildRequires: freetype-devel >= 2 BuildRequires: libpng-devel BuildRequires: gcc-c++ -%if 0%{?fedora} >= 19 +%if ! 0%{?rhel} <= 6 BuildRequires: mariadb-devel >= 5 %else BuildRequires: mysql-devel >= 5 @@ -359,13 +360,17 @@ Requires: mythplugins = %{version}-%{release} Requires: mythweb = %{version} Requires: mythffmpeg = %{version}-%{release} -%if 0%{?fedora} >= 19 +%if ! 0%{?rhel} <= 6 Requires: mariadb-server >= 5, mariadb >= 5 %else Requires: mysql-server >= 5, mysql >= 5 %endif Requires: xmltv +%if 0%{?rhel} >= 7 +Requires: udisks2 +%else Requires: udisks +%endif # Generate the required mythtv-frontend-api version string here so we only # have to do it once. @@ -685,7 +690,7 @@ Requires: mkisofs >= 2.01 Requires: python >= 2.3.5 Requires: python-imaging -Requires: transcode >= 1.0.2 +#Requires: transcode >= 1.0.2 Requires: pmount %description -n mytharchive @@ -819,6 +824,7 @@ #patch0 -p1 -b .mythtv %patch1 -p1 -b .types_h %patch2 -p1 -b .libcec2 +%patch3 -p0 -b .sd_fix # Install ChangeLog install -m 0644 %{SOURCE11} . @@ -875,10 +881,8 @@ --libdir=%{_libdir} \ --libdir-name=%{_lib} \ --mandir=%{_mandir} \ - --disable-mythlogserver \ - --enable-ffmpeg-pthreads \ - --enable-joystick-menu \ --x11-path=%{_includedir} \ + --disable-mythlogserver \ --enable-libmp3lame \ --enable-libtheora --enable-libvorbis \ --enable-libx264 \ @@ -893,8 +897,8 @@ %if %{with_vaapi} --enable-vaapi \ %endif -%if %{with_crystalhd} - --enable-crystalhd \ +%if !%{with_crystalhd} + --disable-crystalhd \ %endif %if !%{with_perl} --without-bindings=perl \ @@ -1435,6 +1439,10 @@ %changelog +* Mon Oct 13 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.27.3-2 +- Update to latest fixes. +- Add patch for schedules direct service change. + * Sun Jul 27 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.27.3-1 - Update to new upstream release.

9 years, 7 months

1
0
0 / 0

rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec,1.161,1.162

by Nicolas Chauvet

Author: kwizart Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10688 Modified Files: xorg-x11-drv-nvidia.spec Log Message: Fix prelink hack Index: xorg-x11-drv-nvidia.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- xorg-x11-drv-nvidia.spec 13 Oct 2014 18:49:21 -0000 1.161 +++ xorg-x11-drv-nvidia.spec 13 Oct 2014 18:53:54 -0000 1.162 @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 343.22 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -499,6 +499,9 @@ %{_nvidia_libdir}/libnvidia-fbc.so %changelog +* Mon Oct 13 2014 kwizart <kwizart(a)gmail.com> - 1:343.22-2 +- Fix prelink hack - rfbz#3258#c13 + * Fri Sep 19 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:343.22-1 - Update to 343.22 - Remove IgnoreABI xorg override

9 years, 7 months

1
0
0 / 0

rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec,1.160,1.161

by Nicolas Chauvet

Author: kwizart Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10321 Modified Files: xorg-x11-drv-nvidia.spec Log Message: Fixup Index: xorg-x11-drv-nvidia.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v retrieving revision 1.160 retrieving revision 1.161 diff -u -r1.160 -r1.161 --- xorg-x11-drv-nvidia.spec 19 Sep 2014 11:57:16 -0000 1.160 +++ xorg-x11-drv-nvidia.spec 13 Oct 2014 18:49:21 -0000 1.161 @@ -304,7 +304,7 @@ %pre libs if [ -d %{_sysconfdir}/prelink.conf.d ]; then -echo "-b %{_nvidia_libdir}" > %{_sysconfdir}/prelink.conf.d/nvidia-%{lib}.conf +echo "-b %{_nvidia_libdir}" > %{_sysconfdir}/prelink.conf.d/nvidia-%{_lib}.conf fi %post

9 years, 7 months

1
0
0 / 0

rpms/VirtualBox-kmod/F-20 VirtualBox-kmod.spec,1.76,1.77

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/VirtualBox-kmod/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32221 Modified Files: VirtualBox-kmod.spec Log Message: * Sun Oct 12 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.18-1 - New upstream release and also build akmods Index: VirtualBox-kmod.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox-kmod/F-20/VirtualBox-kmod.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- VirtualBox-kmod.spec 10 Oct 2014 21:05:04 -0000 1.76 +++ VirtualBox-kmod.spec 12 Oct 2014 19:18:18 -0000 1.77 @@ -3,7 +3,7 @@ # "buildforkernels newest" macro for just that build; immediately after # queuing that build enable the macro again for subsequent builds; that way # a new akmod package will only get build when a new one is actually needed -%global buildforkernels newest +#global buildforkernels newest # In prerelease builds (such as betas), this package has the same # major version number, while the kernel module abi is not guarranteed @@ -19,8 +19,8 @@ %bcond_with hardening Name: VirtualBox-kmod -Version: 4.3.16 -Release: 1%{?prerel:.%{prerel}}%{?dist}.4 +Version: 4.3.18 +Release: 1%{?prerel:.%{prerel}}%{?dist} Summary: Kernel module for VirtualBox Group: System Environment/Kernel @@ -98,6 +98,9 @@ %changelog +* Sun Oct 12 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.18-1 +- New upstream release and also build akmods + * Fri Oct 10 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3.16-1.4 - Rebuilt for kernel

9 years, 7 months

1
0
0 / 0

rpms/VirtualBox/F-20 .cvsignore, 1.56, 1.57 VirtualBox-4.3.0-VBoxGuestLib.patch, 1.3, 1.4 VirtualBox.spec, 1.62, 1.63 sources, 1.56, 1.57 VirtualBox-4.3.10-gcc.patch, 1.1, NONE

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/VirtualBox/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30905 Modified Files: .cvsignore VirtualBox-4.3.0-VBoxGuestLib.patch VirtualBox.spec sources Removed Files: VirtualBox-4.3.10-gcc.patch Log Message: * Sat Oct 11 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.18-1 - New upstream release . - Removed trailing whitespaces . - Refactor VirtualBox-4.3.0-VBoxGuestLib.patch to try upstreaming . Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-20/.cvsignore,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- .cvsignore 11 Sep 2014 21:23:17 -0000 1.56 +++ .cvsignore 12 Oct 2014 17:39:17 -0000 1.57 @@ -1 +1 @@ -VirtualBox-4.3.16.tar.bz2 +VirtualBox-4.3.18.tar.bz2 VirtualBox-4.3.0-VBoxGuestLib.patch: Makefile.kmk | 2 ++ 1 file changed, 2 insertions(+) Index: VirtualBox-4.3.0-VBoxGuestLib.patch =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-20/VirtualBox-4.3.0-VBoxGuestLib.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- VirtualBox-4.3.0-VBoxGuestLib.patch 11 Sep 2014 21:23:17 -0000 1.3 +++ VirtualBox-4.3.0-VBoxGuestLib.patch 12 Oct 2014 17:39:17 -0000 1.4 @@ -1,15 +1,16 @@ when we use VBOX_USE_SYSTEM_XORG_HEADERS , we don't need compile the very old libXFree86 (from xfree86.org) Sérgio Basto <sergio(a)serjux.com> ---- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.orig 2014-09-11 15:31:56.706906433 +0100 -+++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2014-09-11 15:32:24.737206867 +0100 -@@ -39,10 +39,6 @@ LIBRARIES += \ - VBoxGuestR3Lib \ +--- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.orig 2014-10-11 13:03:35.000000000 +0100 ++++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2014-10-12 00:11:00.925507543 +0100 +@@ -40,9 +40,11 @@ LIBRARIES += \ VBoxGuestR3LibShared ifndef VBOX_ONLY_TESTSUITE -- if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) -- LIBRARIES += \ -- VBoxGuestR3LibXFree86 -- endif + if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) ++ ifndef VBOX_USE_SYSTEM_XORG_HEADERS + LIBRARIES += \ + VBoxGuestR3LibXFree86 + endif ++ endif if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) LIBRARIES += \ VBoxGuestR3LibXOrg Index: VirtualBox.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-20/VirtualBox.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- VirtualBox.spec 11 Sep 2014 21:23:17 -0000 1.62 +++ VirtualBox.spec 12 Oct 2014 17:39:17 -0000 1.63 @@ -26,7 +26,7 @@ #endif Name: VirtualBox -Version: 4.3.16 +Version: 4.3.18 Release: 1%{?prerel:.%{prerel}}%{?dist} Summary: A general-purpose full virtualizer for PC hardware @@ -52,7 +52,7 @@ Patch23: VirtualBox-4.3.10-xserver_guest.patch Patch24: VirtualBox-4.3.0-VBoxGuestLib.patch Patch26: VirtualBox-4.3.0-no-bundles.patch -Patch27: VirtualBox-4.3.10-gcc.patch +#Patch27: VirtualBox-4.3.10-gcc.patch BuildRequires: kBuild >= 0.1.9998 BuildRequires: SDL-devel xalan-c-devel @@ -90,7 +90,7 @@ #BuildRequires: glibc(x86-32) glibc-devel(x86-32) libstdc++(x86-32) #BuildRequires: glibc.i686 glibc-devel.i686 libstdc++.i686 #BuildRequires: /usr/lib/libc.so -#BuildRequires: /usr/lib/libstdc++.so.6 /lib/libc.so.6 +#BuildRequires: /usr/lib/libstdc++.so.6 /lib/libc.so.6 # For the X11 module BuildRequires: libdrm-devel @@ -199,7 +199,7 @@ %setup -qn %{name}-%{version}%{prereltag} find -name '*.py[co]' -delete -# Remove prebuilt binary tools +# Remove prebuilt binary tools rm -rf kBuild rm -rf tools # Remove bundle X11 sources and some lib sources, before patching. @@ -209,11 +209,11 @@ rm -rf src/VBox/Additions/x11/x11stubs rm -rf src/VBox/GuestHost/OpenGL/include/GL -rm -rf src/libs/boost-1.37.0/ -#rm -rf src/libs/liblzf-3.4/ -rm -rf src/libs/libxml2-2.6.31/ -rm -rf src/libs/libpng-1.2.8/ -rm -rf src/libs/zlib-1.2.6/ +rm -rf src/libs/boost-1.37.0/ +#rm -rf src/libs/liblzf-3.4/ +rm -rf src/libs/libxml2-2.6.31/ +rm -rf src/libs/libpng-1.2.8/ +rm -rf src/libs/zlib-1.2.6/ %patch1 -p1 -b .noupdates %patch2 -p1 -b .strings @@ -349,7 +349,7 @@ obj/bin/webtest \ %endif -install -p -m 0755 -D obj/bin/VBoxCreateUSBNode.sh $RPM_BUILD_ROOT/lib/udev/VBoxCreateUSBNode.sh +install -p -m 0755 -D obj/bin/VBoxCreateUSBNode.sh $RPM_BUILD_ROOT/lib/udev/VBoxCreateUSBNode.sh # Language files install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls \ @@ -378,15 +378,15 @@ install -p -m 0644 obj/bin/virtualbox.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages # Guest X.Org drivers -# Michael Thayer from Oracle wrote: I have applied the patch [1] I posted so that you -# can build with VBOX_USE_SYSTEM_XORG_HEADERS=1 set in future to only +# Michael Thayer from Oracle wrote: I have applied the patch [1] I posted so that you +# can build with VBOX_USE_SYSTEM_XORG_HEADERS=1 set in future to only # build the X.Org drivers against the installed system headers. # also wrote: # As vboxmouse_drv is not needed at all for X.Org Server 1.7 and later do not # build it in this case. # and # Build using local X.Org headers. We assume X.Org Server 1.7 or later. -# +# # [1] https://www.virtualbox.org/changeset/43588/vbox install -m 0755 -D obj/bin/additions/vboxvideo_drv_system.so \ @@ -413,7 +413,7 @@ install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \ $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh -#/usr/bin/VBoxClient-all does not exits +#/usr/bin/VBoxClient-all does not exits #install -m 0644 -D src/VBox/Additions/x11/Installer/vboxclient.desktop \ # $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop #desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop @@ -501,7 +501,7 @@ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : # Guest additions install -%post guest +%post guest /sbin/ldconfig /bin/systemctl daemon-reload >/dev/null 2>&1 || : # should be in kmod package, not here @@ -616,6 +616,11 @@ %changelog +* Sat Oct 11 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.18-1 +- New upstream release . +- Removed trailing whitespaces . +- Refactor VirtualBox-4.3.0-VBoxGuestLib.patch to try upstreaming . + * Wed Sep 10 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.16-1 - New upstream release . - Fixed VirtualBox-4.3.0-VBoxGuestLib.patch . @@ -651,7 +656,7 @@ - small adjustments in others patches. * Wed Dec 25 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.6-4 -- Update VirtualBox-4.3-mesa.patch, for guest drives and for Xorg-x11-server-1.14.99 in rawhide, glx internals "fixes" completely removed, eliminating BuildRequires of xorg-x11-server-source. +- Update VirtualBox-4.3-mesa.patch, for guest drives and for Xorg-x11-server-1.14.99 in rawhide, glx internals "fixes" completely removed, eliminating BuildRequires of xorg-x11-server-source. Also add to VBoxOGL_LIBS libXcomposite, libXdamage etc of the system. - Disable webservice for rawhide, problems reported upstream with new gsoap version. @@ -674,30 +679,30 @@ * 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, +- Refactor patches VirtualBox-4.3.0-32bit.patch, VirtualBox-4.3.0-libcxx.patch, VirtualBox-4.3.0-mesa.patch, VirtualBox-4.3.0-no-bundles.patch, VirtualBox-4.3.0-testmangle.patch and VirtualBox-4.3.0-VBoxGuestLib.patch - Took the opportunity to do a review: add some new binaries, need to review it again . * Sun Sep 29 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.18-2 -- Additions/linux: fix shared folders for Linux 3.11 +- Additions/linux: fix shared folders for Linux 3.11 * Fri Sep 20 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.18-1 - New upstream release. * Sun Sep 01 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.16-2 -- fixes for Kernel 3.11: +- fixes for Kernel 3.11: https://www.virtualbox.org/changeset/47484/vbox/trunk and - https://www.virtualbox.org/changeset/47588/vbox/trunk + https://www.virtualbox.org/changeset/47588/vbox/trunk * Fri Jul 05 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.16-1 - New upstream release. * Sun Jun 30 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.14-2 -- Bugfix, forgot rename *.modules to *.conf, as defined in modules-load.d(5) . +- Bugfix, forgot rename *.modules to *.conf, as defined in modules-load.d(5) . * Sat Jun 29 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.14-1 -- Change strings instructions to load modules. +- Change strings instructions to load modules. - New upstream release. - Drop gcc-4.8 patch. @@ -717,7 +722,7 @@ * Thu Mar 07 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.8-2 - Added upstreamed patch for kernels 3.9, "That fix will be part of the next maintenance - release". + release". * Sat Mar 02 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.8-1 - New upstream release. @@ -760,7 +765,7 @@ * Sat Oct 27 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-1 - New upstream release. -- Drop patch VirtualBox-4.2.0-xorg17.patch and add VBOX_USE_SYSTEM_XORG_HEADERS=1. Changeset r43588, +- Drop patch VirtualBox-4.2.0-xorg17.patch and add VBOX_USE_SYSTEM_XORG_HEADERS=1. Changeset r43588, https://www.virtualbox.org/changeset/43588/vbox , allow compile vboxvideo with system headers, and "As vboxmouse_drv is not needed at all for X.Org Server 1.7 and later do not build it". - enable-webservice on F17 and lower (stables) and disable-docs on F18 and rawhide, can't buid it @@ -770,8 +775,8 @@ - On F16, need add one xorg header for xorg-x11-server 1.11.x * Sun Sep 23 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-3 -- Another clean X11 bundle sources (src/VBox/Additions/x11/x11stubs), minor improve on -VirtualBox-4.2.0-xorg17.patch and split VBoxGuestLib part into VirtualBox-4.2.0-VBoxGuestLib.patch +- Another clean X11 bundle sources (src/VBox/Additions/x11/x11stubs), minor improve on +VirtualBox-4.2.0-xorg17.patch and split VBoxGuestLib part into VirtualBox-4.2.0-VBoxGuestLib.patch * Sat Sep 15 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-2 - Disable websrv because fails to build on rawhide, temporarily I hope. @@ -779,18 +784,18 @@ * Thu Sep 13 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-1 - 4.2.0 released - Rebase and rework VirtualBox-4.2.0-xorg17.patch, add 2 new Definitions: XSERVER_LIBPCIACCESS XORG_VERSION_CURRENT=101300000 -- Rename and rework VirtualBox-OSE-4.1.10-mesa.patch +- Rename and rework VirtualBox-OSE-4.1.10-mesa.patch - Reorganize last 2 patches. - Revert attempt to remove 32-bits patch. -* Thu Sep 13 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.7.RC4 +* Thu Sep 13 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.7.RC4 - Another try to compile with 32-bits suport on x86_64. * Sun Sep 09 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.6.RC4 -- Update to RC4. +- Update to RC4. - Rename 32-bits patch to VirtualBox-4.2.0-32bit.patch - Drop patch23 to fix ABI/API breakages in X11 1.13, appears fixed in RC4 ! -- Compile VBoxGuestLib with X11 sources from system and fix VBoxGuestR3LibRuntimeXF86.cpp. +- Compile VBoxGuestLib with X11 sources from system and fix VBoxGuestR3LibRuntimeXF86.cpp. - Removes X11 includes from sources (src/VBox/Additions/x11/x11include). * Fri Sep 07 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.5.RC3 @@ -808,7 +813,7 @@ - add BR # libstdc++.i686 and libc-devel.i686 for 32-bits BuildRequires: /usr/lib/libc.so BuildRequires: /usr/lib/libstdc++.so.6 /lib/libc.so.6 -- drop 32-bit patch and testmangle patch, no fails. +- drop 32-bit patch and testmangle patch, no fails. - rename and remove some patches cvs diff: VirtualBox-4.1.20-libcxx.patch was removed, no comparison available cvs diff: VirtualBox-4.1.20-x113.patch is a new entry, no comparison available @@ -858,8 +863,8 @@ * Tue May 22 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.16-1 - New upstream release. -* Mon May 21 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-7 -- Customize VBOX_VERSION_STRING. +* Mon May 21 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-7 +- Customize VBOX_VERSION_STRING. * Wed May 16 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-6 - Bump a release, to build a new tag, one more try. @@ -871,15 +876,15 @@ - Rename to VirtualBox, rfbz #1826 * Tue May 1 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-3 -- Review spec with fedora-review +- Review spec with fedora-review - Remove requirement for hal for F15 - .desktop, .service and xorg.conf.d/vboxvideo.conf are text files, put chmod 644 - don't try start vboxservice.service, because vboxservice.service depends on kmods, maybe start when - modules are loaded. + modules are loaded. * Sun Apr 29 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-2 -- Migrating vboxweb-service to a systemd unit file from a SysV initscript -- Add vboxservice.service systemd unit file in guest package, rfbz #2274. +- Migrating vboxweb-service to a systemd unit file from a SysV initscript +- Add vboxservice.service systemd unit file in guest package, rfbz #2274. * Thu Apr 26 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-1 - new release @@ -903,7 +908,7 @@ - Upsteam says that java stuff is fiexd , https://www.virtualbox.org/ticket/9848#comment:5 - Upsteam says that have compile fixes for kernel 3.3-rc1 (in changelog). - backport fix for web-service with newer versions of GSOAP, Changeset 40476 and 40477 in vbox, kindly - fixed from Frank Mehnert "The real fix can be found in r40476 and r40477. You should be able to + fixed from Frank Mehnert "The real fix can be found in r40476 and r40477. You should be able to apply these fixes to VBox 4.1.10 as well." and add -lssl and -lcrypto by my self. - drop Patch to allow to build with GCC 4.7 Index: sources =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-20/sources,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- sources 11 Sep 2014 21:23:17 -0000 1.56 +++ sources 12 Oct 2014 17:39:17 -0000 1.57 @@ -1 +1 @@ -16f8f3e5fea2677da7456bc8b6aff458 VirtualBox-4.3.16.tar.bz2 +0e6e345a5bc4321bc5014258c6e9a5bb VirtualBox-4.3.18.tar.bz2 --- VirtualBox-4.3.10-gcc.patch DELETED ---

9 years, 7 months

1
0
0 / 0

rpms/mpv/devel .cvsignore, 1.12, 1.13 mpv.spec, 1.30, 1.31 sources, 1.12, 1.13

by Miro Hrončok

Author: churchyard Update of /cvs/free/rpms/mpv/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26140 Modified Files: .cvsignore mpv.spec sources Log Message: * Sun Oct 12 2014 Miro Hrončok <mhroncok(a)redhat.com> - 0.6.0-1 - New version 0.6.0 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mpv/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 3 Sep 2014 13:35:10 -0000 1.12 +++ .cvsignore 12 Oct 2014 09:49:48 -0000 1.13 @@ -1 +1 @@ -v0.5.1.tar.gz +v0.6.0.tar.gz Index: mpv.spec =================================================================== RCS file: /cvs/free/rpms/mpv/devel/mpv.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- mpv.spec 26 Sep 2014 19:07:05 -0000 1.30 +++ mpv.spec 12 Oct 2014 09:49:48 -0000 1.31 @@ -1,6 +1,6 @@ Name: mpv -Version: 0.5.1 -Release: 2%{?dist} +Version: 0.6.0 +Release: 1%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ URL: http://%{name}.io/ @@ -112,6 +112,9 @@ %config(noreplace) %{_sysconfdir}/%{name}/input.conf %changelog +* Sun Oct 12 2014 Miro Hrončok <mhroncok(a)redhat.com> - 0.6.0-1 +- New version 0.6.0 + * Fri Sep 26 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 0.5.1-2 - Rebuilt for FFmpeg 2.4.x Index: sources =================================================================== RCS file: /cvs/free/rpms/mpv/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 3 Sep 2014 13:35:11 -0000 1.12 +++ sources 12 Oct 2014 09:49:48 -0000 1.13 @@ -1 +1 @@ -c6d0efd6e89660857f06103c30fb682e v0.5.1.tar.gz +ac06561522ac1767cd05987ea85e827c v0.6.0.tar.gz

9 years, 7 months

1
0
0 / 0

rpms/motion/devel motion.spec,1.28,1.29

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/motion/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11021 Modified Files: motion.spec Log Message: * Sat Oct 11 2014 Sérgio Basto <sergio(a)serjux.com> - 3.3.0.trunkREV557-9 - Rebuild for new gcc https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - Change naming, NamingGuideline http://fedoraproject.org/wiki/Packaging:NamingGuidelines#Pre-Release_pack..., since it is a forever pre-release. I adopt name version with pre-release tag, %{next_version}.trunkREV557 The motivation: rpmdev-bumpspec wasn't working correctly Index: motion.spec =================================================================== RCS file: /cvs/free/rpms/motion/devel/motion.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- motion.spec 20 Apr 2013 14:54:10 -0000 1.28 +++ motion.spec 12 Oct 2014 02:13:31 -0000 1.29 @@ -1,12 +1,13 @@ +%global nextver 3.3.0 Name: motion -Version: 3.3.0 -Release: trunkREV557.8%{?dist} +Version: %{nextver}.trunkREV557 +Release: 9%{?dist} Summary: A motion detection system Group: Applications/Multimedia License: GPLv2+ URL: http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome -Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{nextver}.tar.gz Source1: motion.service Source2: motion.tmpfiles Patch0: motion-0001-emit-asm-emms-only-on-x86-and-amd64-arches.patch @@ -32,23 +33,27 @@ without MySQL and PostgreSQL support. %prep -%setup -q +%setup -q -n %{name}-%{nextver} %patch0 -p1 %patch1 -p1 %build export PKG_CONFIG_LIBDIR="%{_libdir}/ffmpeg-compat/pkgconfig" -%configure --sysconfdir=%{_sysconfdir}/%{name} --without-optimizecpu --with-ffmpeg --without-mysql --without-pgsql +%configure --sysconfdir=%{_sysconfdir}/%{name} \ + --without-optimizecpu --with-ffmpeg --without-mysql --without-pgsql + make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} +#Rename docdir +mv %{buildroot}/%{_docdir}/%{name}-%{nextver} %{buildroot}/%{_docdir}/%{name} #We rename the configuration file mv %{buildroot}%{_sysconfdir}/%{name}/motion-dist.conf %{buildroot}%{_sysconfdir}/%{name}/motion.conf #We move the logrotate configuration mkdir %{buildroot}%{_sysconfdir}/logrotate.d -mv %{_builddir}/%{name}-%{version}/motion.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/motion +mv %{_builddir}/%{name}-%{nextver}/motion.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/motion #We run as motion:video user, reflect that in logrotate config sed -i 's|create 0600 root root|create 0600 motion video|g' %{buildroot}%{_sysconfdir}/logrotate.d/motion #We change the PID file path to match the one in the startup script @@ -96,17 +101,17 @@ #Permissions are bogus upstream, we need to be sure to set them here %defattr (-,root,root,-) %dir %{_sysconfdir}/%{name} -%dir %{_datadir}/%{name}-%{version} -%dir %{_datadir}/%{name}-%{version}/examples +%dir %{_datadir}/%{name}-%{nextver} +%dir %{_datadir}/%{name}-%{nextver}/examples %doc CHANGELOG COPYING CREDITS README motion_guide.html -%attr(0644,root,root) %{_datadir}/%{name}-%{version}/examples/motion-dist.conf -%attr(0755,root,root) %{_datadir}/%{name}-%{version}/examples/motion.init-Debian -%attr(0755,root,root) %{_datadir}/%{name}-%{version}/examples/motion.init-FreeBSD.sh -%attr(0755,root,root) %{_datadir}/%{name}-%{version}/examples/motion.init-Fedora -%attr(0644,root,root) %{_datadir}/%{name}-%{version}/examples/thread1.conf -%attr(0644,root,root) %{_datadir}/%{name}-%{version}/examples/thread2.conf -%attr(0644,root,root) %{_datadir}/%{name}-%{version}/examples/thread3.conf -%attr(0644,root,root) %{_datadir}/%{name}-%{version}/examples/thread4.conf +%attr(0644,root,root) %{_datadir}/%{name}-%{nextver}/examples/motion-dist.conf +%attr(0755,root,root) %{_datadir}/%{name}-%{nextver}/examples/motion.init-Debian +%attr(0755,root,root) %{_datadir}/%{name}-%{nextver}/examples/motion.init-FreeBSD.sh +%attr(0755,root,root) %{_datadir}/%{name}-%{nextver}/examples/motion.init-Fedora +%attr(0644,root,root) %{_datadir}/%{name}-%{nextver}/examples/thread1.conf +%attr(0644,root,root) %{_datadir}/%{name}-%{nextver}/examples/thread2.conf +%attr(0644,root,root) %{_datadir}/%{name}-%{nextver}/examples/thread3.conf +%attr(0644,root,root) %{_datadir}/%{name}-%{nextver}/examples/thread4.conf %attr(0644,root,root) %{_sysconfdir}/logrotate.d/motion %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/motion.conf %attr(0755,root,root) %{_bindir}/motion @@ -115,6 +120,13 @@ %attr(0755,root,root) %{_tmpfilesdir}/%{name}.conf %changelog +* Sat Oct 11 2014 Sérgio Basto <sergio(a)serjux.com> - 3.3.0.trunkREV557-9 +- Rebuild for new gcc https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild +- Change naming, NamingGuideline + http://fedoraproject.org/wiki/Packaging:NamingGuidelines#Pre-Release_pack..., + since it is a forever pre-release. I adopt name version with pre-release tag, %{next_version}.trunkREV557 + The motivation: rpmdev-bumpspec wasn't working correctly + * Sat Apr 20 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.8 - migrate from running as root to running as motion:video (fixes #1935) - don't ship INSTALL file

9 years, 7 months

1
0
0 / 0

rpms/VirtualBox-kmod/devel VirtualBox-kmod.spec,1.35,1.36

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/VirtualBox-kmod/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26921 Modified Files: VirtualBox-kmod.spec Log Message: * Sun Oct 12 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.18-1 - New upstream release and just build akmods for devel. Index: VirtualBox-kmod.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox-kmod/devel/VirtualBox-kmod.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- VirtualBox-kmod.spec 11 Sep 2014 17:28:44 -0000 1.35 +++ VirtualBox-kmod.spec 12 Oct 2014 00:45:05 -0000 1.36 @@ -19,7 +19,7 @@ %bcond_with hardening Name: VirtualBox-kmod -Version: 4.3.16 +Version: 4.3.18 Release: 1%{?prerel:.%{prerel}}%{?dist} Summary: Kernel module for VirtualBox @@ -98,6 +98,9 @@ %changelog +* Sun Oct 12 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.18-1 +- New upstream release and just build akmods for devel. + * Thu Sep 11 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.16-1 - New upstream release and just build akmods for devel.

9 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits October 2014