diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-03 17:45:52 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-03 17:45:52 +0200 |
| commit | 513c776d74c56a49781a09a5a772f4ea6d6bb401 (patch) | |
| tree | 161509e3271db459f14f8c69de7c52d4902ba107 /extra/miro | |
| parent | 8183144fe6e064d80985ac810f6178a3cf289d0d (diff) | |
| parent | e191a289464c21aafe7478065ea7ed3ddda0766f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/arm-elf-binutils/PKGBUILD
community/bird/PKGBUILD
community/cantata/PKGBUILD
community/dbmail/PKGBUILD
community/ekg2/PKGBUILD
community/ffmpeg-compat/PKGBUILD
community/gigedit/PKGBUILD
community/gimp-refocus/PKGBUILD
community/gmime24/PKGBUILD
community/gmpc/PKGBUILD
community/gnash/PKGBUILD
community/id3lib-rcc/PKGBUILD
community/linuxsampler/PKGBUILD
community/lwm/PKGBUILD
community/midori/PKGBUILD
community/mplayer2/PKGBUILD
community/mtpaint/PKGBUILD
community/nestopia/PKGBUILD
community/preload/PKGBUILD
community/projectm/PKGBUILD
community/rusxmms/PKGBUILD
community/taglib-rcc/PKGBUILD
community/the_silver_searcher/PKGBUILD
community/xnee/PKGBUILD
core/libgcrypt/PKGBUILD
core/libusbx/PKGBUILD
core/mkinitcpio-busybox/PKGBUILD
extra/a2ps/PKGBUILD
extra/a52dec/PKGBUILD
extra/abook/PKGBUILD
extra/avidemux/PKGBUILD
extra/bzflag/PKGBUILD
extra/cln/PKGBUILD
extra/exempi/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/fluxter/PKGBUILD
extra/fontforge/PKGBUILD
extra/glib/PKGBUILD
extra/gnet/PKGBUILD
extra/gnome-vfs/PKGBUILD
extra/gnutls/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gtk/PKGBUILD
extra/idnkit/PKGBUILD
extra/ilmbase/PKGBUILD
extra/imake/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/libdatrie/PKGBUILD
extra/libmbim/PKGBUILD
extra/libmp3splt/PKGBUILD
extra/libqmi/PKGBUILD
extra/libtxc_dxtn/PKGBUILD
extra/libxfont/PKGBUILD
extra/mesa/PKGBUILD
extra/modemmanager/PKGBUILD
extra/nedit/PKGBUILD
extra/nmap/PKGBUILD
extra/openexr/PKGBUILD
extra/purple-plugin-pack/PKGBUILD
extra/qemu/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/subversion/PKGBUILD
extra/transmission/PKGBUILD
extra/truecrypt/PKGBUILD
extra/vigra/PKGBUILD
extra/virtuoso/PKGBUILD
extra/vlc/PKGBUILD
extra/wireshark/PKGBUILD
extra/wxmaxima/PKGBUILD
extra/x264/PKGBUILD
extra/xorg-iceauth/PKGBUILD
extra/xorg-mkfontscale/PKGBUILD
extra/xorg-xfd/PKGBUILD
libre/abuse-libre/PKGBUILD
libre/clementine-libre/PKGBUILD
libre/linux-libre/PKGBUILD
Diffstat (limited to 'extra/miro')
| -rw-r--r-- | extra/miro/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/miro/ffmpeg.patch | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD index 81bd3704a..921762748 100644 --- a/extra/miro/PKGBUILD +++ b/extra/miro/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180405 2013-03-21 02:05:09Z eric $ +# $Id: PKGBUILD 191901 2013-08-01 06:53:34Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=miro pkgver=5.0.4 -pkgrel=3 +pkgrel=4 pkgdesc="The free and open source internet TV platform" arch=('i686' 'x86_64' 'mips64el') url="http://www.getmiro.com" @@ -19,7 +19,7 @@ install=miro.install source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz" 'ffmpeg.patch') sha1sums=('1144f98149ff07208b994a7cedb45a4beaaa451f' - 'ce0f42be2a0a3ac99f07b5abfabf0975928c841c') + '37dc0b4de66ccefd5fa3e9a68b187305180b4fc4') package() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/miro/ffmpeg.patch b/extra/miro/ffmpeg.patch index 99c14107d..efbf6f5da 100644 --- a/extra/miro/ffmpeg.patch +++ b/extra/miro/ffmpeg.patch @@ -61,3 +61,14 @@ 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"); + } + } |