diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-03-30 11:25:09 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-03-30 11:26:23 +0200 |
| commit | 443c0298107901ec5db84a775af6f642c82580ad (patch) | |
| tree | a70fbf878c8d00121c4b80fa17653504f62c9c21 /main/ffmpeg | |
| parent | c3551851b12534201f77bd3670e1b316b3140cb3 (diff) | |
| download | aports-443c0298107901ec5db84a775af6f642c82580ad.tar.bz2 aports-443c0298107901ec5db84a775af6f642c82580ad.tar.xz | |
main/ffmpeg: upgrade to 1.2
and cherry-pick upstream commit bcd3eb3 to silence unmeaningful
errors.
Diffstat (limited to 'main/ffmpeg')
| -rw-r--r-- | main/ffmpeg/APKBUILD | 20 | ||||
| -rw-r--r-- | main/ffmpeg/fix-libv4l2-errors.patch | 25 |
2 files changed, 37 insertions, 8 deletions
diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD index e547052e7d..79f590c0f6 100644 --- a/main/ffmpeg/APKBUILD +++ b/main/ffmpeg/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ffmpeg -pkgver=1.1.4 +pkgver=1.2 pkgrel=0 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" url="http://ffmpeg.org/" @@ -13,7 +13,8 @@ makedepends="lame-dev libvorbis-dev faac-dev xvidcore-dev zlib-dev v4l-utils-dev yasm" depends= source="http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2 - configure-dlvsym.patch" + configure-dlvsym.patch + fix-libv4l2-errors.patch" _builddir="$srcdir"/$pkgname-$pkgver prepare() { @@ -72,9 +73,12 @@ libs() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr } -md5sums="4cf902c2859ffe2203465af3622f5ac9 ffmpeg-1.1.4.tar.bz2 -2cdc11a99bf97c63c7cca27b073cb47c configure-dlvsym.patch" -sha256sums="252c00bd781f08a3542795b8f111b131f4afe93f1c486a4884306d27823aef6d ffmpeg-1.1.4.tar.bz2 -0854db61ec784935d77516ba9a467ba61e118f951149c07acb6887a6b417ac55 configure-dlvsym.patch" -sha512sums="ad4ae8703fa0dfd6ec7ac7b45b0d2d3c4df544b56565932fed4f9b620c650f1762572b587a0c47eb1bb66c96a7e8c1374ac4ae0f6dfaf355ea8701c408e2c105 ffmpeg-1.1.4.tar.bz2 -635c80ca801577439bd1cf8470fb760755c243e59adc8b4d9b8412f24e2dc336802afddde09f3d59443e29d92123d0308482be8ad32ab0f265c960315632636f configure-dlvsym.patch" +md5sums="c871d20559cb64c015b5cf0858812a56 ffmpeg-1.2.tar.bz2 +2cdc11a99bf97c63c7cca27b073cb47c configure-dlvsym.patch +2b6897f352583ee8efdc0c09ef27a30f fix-libv4l2-errors.patch" +sha256sums="9a39fbc07dae0c893059e07491bcfb1e2409cc220f72b41eed23a04becea5aaf ffmpeg-1.2.tar.bz2 +0854db61ec784935d77516ba9a467ba61e118f951149c07acb6887a6b417ac55 configure-dlvsym.patch +872236e91e393b62a1a9d7aebdf0c417314f874a67cef55ad37b39ee57cf9edb fix-libv4l2-errors.patch" +sha512sums="e46cd47cd6cba2820165ac2464fda6d9442675339eea8cdc6b023bfa174f1b2b3e2e6fae85cff03671ed385c49b508c3bae966160418ddb0b1afdd3fee7780ae ffmpeg-1.2.tar.bz2 +635c80ca801577439bd1cf8470fb760755c243e59adc8b4d9b8412f24e2dc336802afddde09f3d59443e29d92123d0308482be8ad32ab0f265c960315632636f configure-dlvsym.patch +56bba30f200c748d47d60d2b18147522dbceec7e8c97f434d3dbfa239547113a3e9d3b280e22816adeafa994b22eefac4b968448afef1a07aa1c46d3ec359e68 fix-libv4l2-errors.patch" diff --git a/main/ffmpeg/fix-libv4l2-errors.patch b/main/ffmpeg/fix-libv4l2-errors.patch new file mode 100644 index 0000000000..cd3ad43147 --- /dev/null +++ b/main/ffmpeg/fix-libv4l2-errors.patch @@ -0,0 +1,25 @@ +commit bcd3eb3 +Author: Giorgio Vazzana <mywing81@gmail.com> +Date: Fri Mar 8 13:03:43 2013 +0100 + + lavd/v4l2: silence libv4l2 logging + + Signed-off-by: Michael Niedermayer <michaelni@gmx.at> + +diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c +index 0c1eb85..2d7773a 100644 +--- a/libavdevice/v4l2.c ++++ b/libavdevice/v4l2.c +@@ -884,6 +884,12 @@ static int v4l2_read_header(AVFormatContext *s1) + if (!st) + return AVERROR(ENOMEM); + ++#if CONFIG_LIBV4L2 ++ /* silence libv4l2 logging. if fopen() fails v4l2_log_file will be NULL ++ and errors will get sent to stderr */ ++ v4l2_log_file = fopen("/dev/null", "w"); ++#endif ++ + s->fd = device_open(s1); + if (s->fd < 0) + return s->fd; |