miro 5.0.1

3 files changed, 95 insertions, 14 deletions

diff --git a/abs/extra/miro/PKGBUILD b/abs/extra/miro/PKGBUILD
index e0a8d7f..bcf8fbb 100644
--- a/abs/extra/miro/PKGBUILD
+++ b/abs/extra/miro/PKGBUILD
@@ -1,30 +1,49 @@
-# $Id: PKGBUILD 96701 2010-10-24 10:50:35Z ronald $
+# $Id: PKGBUILD 163155 2012-07-08 09:31:52Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=miro
-pkgver=4.0.2
+pkgver=5.0.1
 pkgrel=2
 pkgdesc="The free and open source internet TV platform"
 arch=('i686' 'x86_64')
 url="http://www.getmiro.com"
 license=('GPL2')
-depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'gnome-python'
+depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
          'python-pysqlite' 'pywebkitgtk' 'shared-mime-info'
          'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme'
          'gstreamer0.10-python' 'python-notify' 'libtorrent-rasterbar'
-	 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl'
-	 'python2-gconf')
-makedepends=('pkgconfig')
+         'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl' 
+         'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen' 'xdg-utils')
+makedepends=('pkg-config' 'boost')
 install=miro.install
-source=(http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('22342897ca748fa19738c9c1c510510f314fa7eb')
+source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz"
+        'ffmpeg.patch')
+sha1sums=('d8e08c691958c250c990b45f2c8448c478d0f0fa'
+          'ce0f42be2a0a3ac99f07b5abfabf0975928c841c')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}/linux"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  python2 setup.py install --root=${pkgdir} || return 1
+  cd linux
+  patch -p2 -i "${srcdir}"/ffmpeg.patch
+
+  python2 setup.py install --root="${pkgdir}"
 
   # fix miro startup script so --debug works with python2
-  sed -i "s|which python|which python2|" ${pkgdir}/usr/bin/miro
-  sed -i "s|./miro.real|/usr/bin/miro.real|" ${pkgdir}/usr/bin/miro
+  sed -i "s|which python|which python2|" "${pkgdir}/usr/bin/miro"
+  sed -i "s|./miro.real|/usr/bin/miro.real|" "${pkgdir}/usr/bin/miro"
+
+  # fix python scripts for python2
+  sed -i "s|/usr/bin/env python|/usr/bin/env python2|" ${pkgdir}/usr/share/miro/resources/searchengines/update-icons.py
+  for i in usr/share/miro/resources/testdata/echonest-replies/generate.py usr/share/miro/resources/searchengines/update-icons.py \
+    usr/share/miro/resources/testdata/7digital-replies/generate.py; do
+    sed -i "s|/usr/bin/python|/usr/bin/python2|" ${pkgdir}/${i} 
+  done
+
+  # Fakeroot segfaults on these; remove
+  if [ ${arch} == "i686" ]; then
+    rm -f ${pkgdir}/usr/bin/codegen.Linux-x86_64 || true
+  else
+    rm -f ${pkgdir}/usr/bin/codegen.Linux-i686 || true
+  fi
 }
diff --git a/abs/extra/miro/__changelog b/abs/extra/miro/__changelog
index 4c11c5f..e721716 100644
--- a/abs/extra/miro/__changelog
+++ b/abs/extra/miro/__changelog
@@ -1,2 +1 @@
-2/5/11 - chw - the miro.install that is used is LinHES specfic.
-2/5/11 - chw - added python2-gconf as dep.
+miro.install -custom
diff --git a/abs/extra/miro/ffmpeg.patch b/abs/extra/miro/ffmpeg.patch
new file mode 100644
index 0000000..99c1410
--- /dev/null
+++ b/abs/extra/miro/ffmpeg.patch
@@ -0,0 +1,63 @@
+--- 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);
+     }
+ 
+-    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);
+@@ -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,7 +302,7 @@
+         av_freep(&oc->streams[i]);
+     }
+ 
+-    url_fclose(oc->pb);
++    avio_close(oc->pb);
+     av_free(oc);
+ 
+     /* End-of-transcode marker. */