Date: Tuesday, August 13, 2013 @ 07:59:27 Author: bpiotrowski Revision: 192487
archrelease: copy trunk to extra-i686, extra-x86_64 Added: miro/repos/extra-i686/PKGBUILD (from rev 192486, miro/trunk/PKGBUILD) miro/repos/extra-i686/miro.install (from rev 192486, miro/trunk/miro.install) miro/repos/extra-x86_64/PKGBUILD (from rev 192486, miro/trunk/PKGBUILD) miro/repos/extra-x86_64/miro.install (from rev 192486, miro/trunk/miro.install) Deleted: miro/repos/extra-i686/PKGBUILD miro/repos/extra-i686/ffmpeg.patch miro/repos/extra-i686/miro.install miro/repos/extra-x86_64/PKGBUILD miro/repos/extra-x86_64/ffmpeg.patch miro/repos/extra-x86_64/miro.install ---------------------------+ /PKGBUILD | 90 ++++++++++++++++++++++++++++++++++++++++++++ /miro.install | 34 ++++++++++++++++ extra-i686/PKGBUILD | 49 ----------------------- extra-i686/ffmpeg.patch | 74 ------------------------------------ extra-i686/miro.install | 17 -------- extra-x86_64/PKGBUILD | 49 ----------------------- extra-x86_64/ffmpeg.patch | 74 ------------------------------------ extra-x86_64/miro.install | 17 -------- 8 files changed, 124 insertions(+), 280 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2013-08-13 05:59:14 UTC (rev 192486) +++ extra-i686/PKGBUILD 2013-08-13 05:59:27 UTC (rev 192487) @@ -1,49 +0,0 @@ -# $Id$ -# Maintainer: Ronald van Haren <ronald.archlinux.org> - -pkgname=miro -pkgver=5.0.4 -pkgrel=4 -pkgdesc="The free and open source internet TV platform" -arch=('i686' 'x86_64') -url="http://www.getmiro.com" -license=('GPL2') -depends=('python2-dbus' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf' - 'python2-pysqlite' 'pywebkitgtk' 'shared-mime-info' - 'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme' - 'gstreamer0.10-python' 'python2-notify' 'libtorrent-rasterbar' - 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python2-pycurl' - 'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen' 'xdg-utils') -makedepends=('boost') -install=miro.install -source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz" - 'ffmpeg.patch') -sha1sums=('1144f98149ff07208b994a7cedb45a4beaaa451f' - '37dc0b4de66ccefd5fa3e9a68b187305180b4fc4') - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - 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" - - # 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 [ ${CARCH} == "i686" ]; then - rm -f "${pkgdir}"/usr/bin/codegen.Linux-x86_64 || true - else - rm -f "${pkgdir}"/usr/bin/codegen.Linux-i686 || true - fi -} Copied: miro/repos/extra-i686/PKGBUILD (from rev 192486, miro/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2013-08-13 05:59:27 UTC (rev 192487) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Ronald van Haren <ronald.archlinux.org> + +pkgname=miro +pkgver=6.0 +pkgrel=1 +pkgdesc="The free and open source internet TV platform" +arch=('i686' 'x86_64') +url="http://www.getmiro.com" +license=('GPL2') +depends=('python2-dbus' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf' + 'python2-pysqlite' 'pywebkitgtk' 'shared-mime-info' + 'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme' + 'gstreamer0.10-python' 'python2-notify' 'libtorrent-rasterbar' + 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python2-pycurl' + 'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen' 'xdg-utils') +makedepends=('boost') +install=miro.install +source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz") +sha1sums=('96cd4ed4a26e157422e47dfebf491c8a42e54c51') + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + cd linux + 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" + + # 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 [ ${CARCH} == "i686" ]; then + rm -f "${pkgdir}"/usr/bin/codegen.Linux-x86_64 || true + else + rm -f "${pkgdir}"/usr/bin/codegen.Linux-i686 || true + fi +} Deleted: extra-i686/ffmpeg.patch =================================================================== --- extra-i686/ffmpeg.patch 2013-08-13 05:59:14 UTC (rev 192486) +++ extra-i686/ffmpeg.patch 2013-08-13 05:59:27 UTC (rev 192487) @@ -1,74 +0,0 @@ ---- 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. */ ---- miro-5.0.4/linux/miro-segmenter.c.orig 2012-10-04 20:48:31.000000000 +0200 -+++ miro-5.0.4/linux/miro-segmenter.c 2013-07-14 13:59:53.171303178 +0200 -@@ -228,7 +228,7 @@ - fprintf(stderr, "Could not find video decoder, key frames will not be honored\n"); - } - -- if (avcodec_open(video_st->codec, codec) < 0) { -+ if (avcodec_open2(video_st->codec, codec, NULL) < 0) { - fprintf(stderr, "Could not open video decoder, key frames will not be honored\n"); - } - } Deleted: extra-i686/miro.install =================================================================== --- extra-i686/miro.install 2013-08-13 05:59:14 UTC (rev 192486) +++ extra-i686/miro.install 2013-08-13 05:59:27 UTC (rev 192487) @@ -1,17 +0,0 @@ -post_install() { - update-desktop-database -q - xdg-icon-resource forceupdate --theme hicolor - update-mime-database usr/share/mime > /dev/null -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - update-desktop-database -q - xdg-icon-resource forceupdate --theme hicolor - update-mime-database usr/share/mime > /dev/null -} - - Copied: miro/repos/extra-i686/miro.install (from rev 192486, miro/trunk/miro.install) =================================================================== --- extra-i686/miro.install (rev 0) +++ extra-i686/miro.install 2013-08-13 05:59:27 UTC (rev 192487) @@ -0,0 +1,17 @@ +post_install() { + update-desktop-database -q + xdg-icon-resource forceupdate --theme hicolor + update-mime-database usr/share/mime > /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + update-desktop-database -q + xdg-icon-resource forceupdate --theme hicolor + update-mime-database usr/share/mime > /dev/null +} + + Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2013-08-13 05:59:14 UTC (rev 192486) +++ extra-x86_64/PKGBUILD 2013-08-13 05:59:27 UTC (rev 192487) @@ -1,49 +0,0 @@ -# $Id$ -# Maintainer: Ronald van Haren <ronald.archlinux.org> - -pkgname=miro -pkgver=5.0.4 -pkgrel=4 -pkgdesc="The free and open source internet TV platform" -arch=('i686' 'x86_64') -url="http://www.getmiro.com" -license=('GPL2') -depends=('python2-dbus' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf' - 'python2-pysqlite' 'pywebkitgtk' 'shared-mime-info' - 'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme' - 'gstreamer0.10-python' 'python2-notify' 'libtorrent-rasterbar' - 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python2-pycurl' - 'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen' 'xdg-utils') -makedepends=('boost') -install=miro.install -source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz" - 'ffmpeg.patch') -sha1sums=('1144f98149ff07208b994a7cedb45a4beaaa451f' - '37dc0b4de66ccefd5fa3e9a68b187305180b4fc4') - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - 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" - - # 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 [ ${CARCH} == "i686" ]; then - rm -f "${pkgdir}"/usr/bin/codegen.Linux-x86_64 || true - else - rm -f "${pkgdir}"/usr/bin/codegen.Linux-i686 || true - fi -} Copied: miro/repos/extra-x86_64/PKGBUILD (from rev 192486, miro/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2013-08-13 05:59:27 UTC (rev 192487) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Ronald van Haren <ronald.archlinux.org> + +pkgname=miro +pkgver=6.0 +pkgrel=1 +pkgdesc="The free and open source internet TV platform" +arch=('i686' 'x86_64') +url="http://www.getmiro.com" +license=('GPL2') +depends=('python2-dbus' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf' + 'python2-pysqlite' 'pywebkitgtk' 'shared-mime-info' + 'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme' + 'gstreamer0.10-python' 'python2-notify' 'libtorrent-rasterbar' + 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python2-pycurl' + 'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen' 'xdg-utils') +makedepends=('boost') +install=miro.install +source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz") +sha1sums=('96cd4ed4a26e157422e47dfebf491c8a42e54c51') + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + cd linux + 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" + + # 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 [ ${CARCH} == "i686" ]; then + rm -f "${pkgdir}"/usr/bin/codegen.Linux-x86_64 || true + else + rm -f "${pkgdir}"/usr/bin/codegen.Linux-i686 || true + fi +} Deleted: extra-x86_64/ffmpeg.patch =================================================================== --- extra-x86_64/ffmpeg.patch 2013-08-13 05:59:14 UTC (rev 192486) +++ extra-x86_64/ffmpeg.patch 2013-08-13 05:59:27 UTC (rev 192487) @@ -1,74 +0,0 @@ ---- 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. */ ---- miro-5.0.4/linux/miro-segmenter.c.orig 2012-10-04 20:48:31.000000000 +0200 -+++ miro-5.0.4/linux/miro-segmenter.c 2013-07-14 13:59:53.171303178 +0200 -@@ -228,7 +228,7 @@ - fprintf(stderr, "Could not find video decoder, key frames will not be honored\n"); - } - -- if (avcodec_open(video_st->codec, codec) < 0) { -+ if (avcodec_open2(video_st->codec, codec, NULL) < 0) { - fprintf(stderr, "Could not open video decoder, key frames will not be honored\n"); - } - } Deleted: extra-x86_64/miro.install =================================================================== --- extra-x86_64/miro.install 2013-08-13 05:59:14 UTC (rev 192486) +++ extra-x86_64/miro.install 2013-08-13 05:59:27 UTC (rev 192487) @@ -1,17 +0,0 @@ -post_install() { - update-desktop-database -q - xdg-icon-resource forceupdate --theme hicolor - update-mime-database usr/share/mime > /dev/null -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - update-desktop-database -q - xdg-icon-resource forceupdate --theme hicolor - update-mime-database usr/share/mime > /dev/null -} - - Copied: miro/repos/extra-x86_64/miro.install (from rev 192486, miro/trunk/miro.install) =================================================================== --- extra-x86_64/miro.install (rev 0) +++ extra-x86_64/miro.install 2013-08-13 05:59:27 UTC (rev 192487) @@ -0,0 +1,17 @@ +post_install() { + update-desktop-database -q + xdg-icon-resource forceupdate --theme hicolor + update-mime-database usr/share/mime > /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + update-desktop-database -q + xdg-icon-resource forceupdate --theme hicolor + update-mime-database usr/share/mime > /dev/null +} + +