Author: salimma Update of /cvs/free/rpms/miro/F-17 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7807/F-17 Modified Files: miro.spec Added Files: miro-5.0.2-fix_ffmpeg.patch Log Message: * Wed Sep 26 2012 Michel Salim <salimma(a)fedoraproject.org&gt; - 5.0.2-2 - Avoid shipping pre-built codegen binary miro-5.0.2-fix_ffmpeg.patch: miro-segmenter.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) --- NEW FILE miro-5.0.2-fix_ffmpeg.patch --- --- /var/lib/mock/fedora-18-x86_64-miro/root/builddir/build/BUILD/miro-5.0.2/linux/miro-segmenter.c 2012-07-19 00:27:08.000000000 +0700 +++ linux/miro-segmenter.c 2012-09-27 09:09:55.284480879 +0700 @@ -156,7 +156,7 @@ exit(1); } - ret = av_open_input_file(&ic, input, ifmt, 0, NULL); + ret = avformat_open_input(&ic, input, ifmt, 0); if (ret != 0) { fprintf(stderr, "Could not open input file, make sure it is an mpegts file: %d\n", ret); exit(1); @@ -167,7 +167,7 @@ exit(1); } -#if LIBAVFORMAT_VERSION_MAJOR > 52 +#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 45, 0) ofmt = av_guess_format("mpegts", NULL, NULL); #else ofmt = guess_format("mpegts", NULL, NULL); @@ -215,12 +215,7 @@ } } - if (av_set_parameters(oc, NULL) < 0) { - fprintf(stderr, "Invalid output format parameters\n"); - exit(1); - } - - dump_format(oc, 0, input, 1); + av_dump_format(oc, 0, input, 1); if (video_st) { codec = avcodec_find_decoder(video_st->codec->codec_id); @@ -233,12 +228,12 @@ } } - if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) { + if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) { fprintf(stderr, "Could not open '%s'\n", output_filename); exit(1); } - if (av_write_header(oc)) { + if (avformat_write_header(oc, NULL)) { fprintf(stderr, "Could not write mpegts header to first output file\n"); exit(1); @@ -274,10 +269,10 @@ } if (segment_time - prev_segment_time >= segment_duration) { - put_flush_packet(oc->pb); - url_fclose(oc->pb); + avio_flush(oc->pb); + avio_close(oc->pb); - if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) { + if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) { fprintf(stderr, "Could not open '%s'\n", output_filename); break; } @@ -307,13 +302,13 @@ av_freep(&oc->streams[i]); } - url_fclose(oc->pb); + avio_close(oc->pb); av_free(oc); /* End-of-transcode marker. */ { struct sockaddr_in sockaddr; - int rc, s; + int rc, s; memset(&sockaddr, 0, sizeof(sockaddr)); sockaddr.sin_family = AF_INET; Index: miro.spec =================================================================== RCS file: /cvs/free/rpms/miro/F-17/miro.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- miro.spec 8 Aug 2012 00:02:05 -0000 1.7 +++ miro.spec 27 Sep 2012 06:21:31 -0000 1.8 @@ -5,7 +5,7 @@ Name: miro Version: 5.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Internet TV Player Group: Applications/Multimedia @@ -24,6 +24,10 @@ # fix GNOME screensaver not being inhibitable # submitted: http://bugzilla.pculture.org/show_bug.cgi?id=18018 Patch2: miro-4.0.2.1-fix_screensaver_inhibit.patch +# Don't install pre-built codegen binaries +Patch3: miro-5.0.2-no_bundled.patch +# Backport miro-segmenter changes for building with new FFmpeg +Patch4: miro-5.0.2-fix_ffmpeg.patch # Miro is temporarily using pre-built codegen binaries # available only on these two platforms @@ -93,6 +97,10 @@ %patch0 -p2 %patch1 -p2 %patch2 -p2 +%patch3 -p1 +%if 0%{?fedora} >= 18 +%patch4 -p0 +%endif # /Patches @@ -138,13 +146,6 @@ %files -f linux/miro.lang %{_bindir}/miro* -%ifarch x86_64 -%exclude %{_bindir}/codegen.Linux-i686 -%{_bindir}/codegen.Linux-x86_64 -%else -%{_bindir}/codegen.Linux-i686 -%exclude %{_bindir}/codegen.Linux-x86_64 -%endif %{_bindir}/echoprint-codegen %exclude %{_datadir}/miro/resources/testdata %{_datadir}/miro @@ -159,6 +160,9 @@ %changelog +* Wed Sep 26 2012 Michel Salim <salimma(a)fedoraproject.org&gt; - 5.0.2-2 +- Avoid shipping pre-built codegen binary + * Tue Aug 7 2012 Michel Salim <salimma(a)fedoraproject.org&gt; - 5.0.2-1 - Update to 5.0.2