[arch-commits] Commit in miro/trunk (PKGBUILD ffmpeg.patch)

[Andrea Scarpino]

    Date: Friday, July 6, 2012 @ 11:13:37
  Author: andrea
Revision: 163049

upgpkg: miro 5.0.1-2

FFmpeg rebuild

Modified:
  miro/trunk/PKGBUILD
  miro/trunk/ffmpeg.patch

--------------+
 PKGBUILD     |   11 ++++---
 ffmpeg.patch |   82 +++++++++++++++++----------------------------------------
 2 files changed, 32 insertions(+), 61 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-07-06 15:04:29 UTC (rev 163048)
+++ PKGBUILD	2012-07-06 15:13:37 UTC (rev 163049)
@@ -3,7 +3,7 @@
 
 pkgname=miro
 pkgver=5.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The free and open source internet TV platform"
 arch=('i686' 'x86_64')
 url="http://www.getmiro.com"
@@ -16,13 +16,16 @@
          'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen' 'xdg-utils')
 makedepends=('pkg-config' 'boost')
 install=miro.install
-options=('!makeflags')
-source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('d8e08c691958c250c990b45f2c8448c478d0f0fa')
+source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz"
+        'ffmpeg.patch')
+sha1sums=('d8e08c691958c250c990b45f2c8448c478d0f0fa'
+          'ce0f42be2a0a3ac99f07b5abfabf0975928c841c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   cd linux
+  patch -p2 -i "${srcdir}"/ffmpeg.patch
 
   python2 setup.py install --root="${pkgdir}"
 

Modified: ffmpeg.patch
===================================================================
--- ffmpeg.patch	2012-07-06 15:04:29 UTC (rev 163048)
+++ ffmpeg.patch	2012-07-06 15:13:37 UTC (rev 163049)
@@ -1,77 +1,45 @@
-diff -urN miro-4.0.old/linux/miro-segmenter.c miro-4.0/linux/miro-segmenter.c
---- miro-4.0.old/linux/miro-segmenter.c	2011-05-25 15:58:21.000000000 +0200
-+++ miro-4.0/linux/miro-segmenter.c	2011-05-25 16:09:41.000000000 +0200
-@@ -60,7 +60,7 @@
-     }
- 
-     switch (input_codec_context->codec_type) {
--        case CODEC_TYPE_AUDIO:
-+        case AVMEDIA_TYPE_AUDIO:
-             output_codec_context->channel_layout = input_codec_context->channel_layout;
-             output_codec_context->sample_rate = input_codec_context->sample_rate;
-             output_codec_context->channels = input_codec_context->channels;
-@@ -72,7 +72,7 @@
-                 output_codec_context->block_align = input_codec_context->block_align;
-             }
-             break;
--        case CODEC_TYPE_VIDEO:
-+        case AVMEDIA_TYPE_VIDEO:
-             output_codec_context->pix_fmt = input_codec_context->pix_fmt;
-             output_codec_context->width = input_codec_context->width;
-             output_codec_context->height = input_codec_context->height;
-@@ -154,7 +154,7 @@
+--- miro-5.0.1/linux/miro-segmenter.c~	2012-07-06 14:33:24.618082171 +0000
++++ miro-5.0.1/linux/miro-segmenter.c	2012-07-06 15:10:19.564146117 +0000
+@@ -156,7 +156,7 @@
          exit(1);
      }
  
--    ofmt = guess_format("mpegts", NULL, NULL);
-+    ofmt = av_guess_format("mpegts", NULL, NULL);
-     if (!ofmt) {
-         fprintf(stderr, "Could not find MPEG-TS muxer\n");
+-    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);
-@@ -174,12 +174,12 @@
- 
-     for (i = 0; i < ic->nb_streams && (video_index < 0 || audio_index < 0); i++) {
-         switch (ic->streams[i]->codec->codec_type) {
--            case CODEC_TYPE_VIDEO:
-+            case AVMEDIA_TYPE_VIDEO:
-                 video_index = i;
-                 ic->streams[i]->discard = AVDISCARD_NONE;
-                 video_st = add_output_stream(oc, ic->streams[i]);
-                 break;
--            case CODEC_TYPE_AUDIO:
-+            case AVMEDIA_TYPE_AUDIO:
-                 audio_index = i;
-                 ic->streams[i]->discard = AVDISCARD_NONE;
-                 audio_st = add_output_stream(oc, ic->streams[i]);
-@@ -195,7 +195,7 @@
-         exit(1);
+@@ -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);
-@@ -208,7 +208,7 @@
+@@ -233,12 +228,12 @@
          }
      }
  
 -    if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
-+    if (avio_open(&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);
      }
-@@ -234,7 +234,7 @@
-             break;
-         }
  
--        if (packet.stream_index == video_index && (packet.flags & PKT_FLAG_KEY)) {
-+        if (packet.stream_index == video_index && (packet.flags & AV_PKT_FLAG_KEY)) {
-             segment_time = (double)video_st->pts.val * video_st->time_base.num / video_st->time_base.den;
+-    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 @@
          }
-         else if (video_index < 0) {
-@@ -245,10 +245,10 @@
-         }
  
          if (segment_time - prev_segment_time >= segment_duration) {
 -            put_flush_packet(oc->pb);
@@ -80,11 +48,11 @@
 +            avio_close(oc->pb);
  
 -            if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
-+            if (avio_open(&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;
              }
-@@ -278,7 +278,7 @@
+@@ -307,7 +302,7 @@
          av_freep(&oc->streams[i]);
      }
  
@@ -92,4 +60,4 @@
 +    avio_close(oc->pb);
      av_free(oc);
  
-     return 0;
+     /* End-of-transcode marker. */