From 1ad1088977f85accdabaed75634c45a81a6fdc2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Jendrysik?= Date: Wed, 17 Dec 2014 09:12:50 +0100 Subject: main/ffmpeg: upgrade to 2.5.1, remove needless patches --- main/ffmpeg/APKBUILD | 25 +++++++++---------------- main/ffmpeg/fix-defines.patch | 10 ---------- main/ffmpeg/fix-libv4l2-errors.patch | 25 ------------------------- 3 files changed, 9 insertions(+), 51 deletions(-) delete mode 100644 main/ffmpeg/fix-defines.patch delete mode 100644 main/ffmpeg/fix-libv4l2-errors.patch (limited to 'main/ffmpeg') diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD index 117793206..557e466e3 100644 --- a/main/ffmpeg/APKBUILD +++ b/main/ffmpeg/APKBUILD @@ -1,6 +1,7 @@ +# Łukasz Jendrysik # Maintainer: Natanael Copa pkgname=ffmpeg -pkgver=2.3.5 +pkgver=2.5.1 pkgrel=0 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" url="http://ffmpeg.org/" @@ -14,9 +15,7 @@ makedepends="lame-dev libvorbis-dev xvidcore-dev zlib-dev depends= source="http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2 configure-dlvsym.patch - fix-flv-extradata.patch - fix-defines.patch - fix-libv4l2-errors.patch" + fix-flv-extradata.patch" _builddir="$srcdir"/$pkgname-$pkgver prepare() { @@ -79,18 +78,12 @@ libs() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr } -md5sums="b05d243a537ef300568c3986d1a5bde3 ffmpeg-2.3.5.tar.bz2 +md5sums="ad3b4c189e9a7d43ae54c52d409a43ef ffmpeg-2.5.1.tar.bz2 d041c60890392d80f74a567523f4c54d configure-dlvsym.patch -5f39e099cd7dfe71bb2f6b6615623d67 fix-flv-extradata.patch -fad4fc1e886146a4a2befc8fda052d50 fix-defines.patch -2b6897f352583ee8efdc0c09ef27a30f fix-libv4l2-errors.patch" -sha256sums="0762e5ff453352ef1a7bac3285e136d572706609e05b1489181f56cced601909 ffmpeg-2.3.5.tar.bz2 +5f39e099cd7dfe71bb2f6b6615623d67 fix-flv-extradata.patch" +sha256sums="03cf50b2f9109548e466f144c960b37031ffc1b9fab96382b4b26b7607c7ef52 ffmpeg-2.5.1.tar.bz2 ffd6beadaea4cdbc1326fe396d8cd34b3efb791a865a32f64b3fe998b679c1d0 configure-dlvsym.patch -8324bd3e154c151e64df36afd1edf05b8dc2dcd8e520208be0355a34b4209ad5 fix-flv-extradata.patch -4ccac0cf75fe53685c4cdda4061f7248de9a9b98e11f8e3aed8e1822b94d35d1 fix-defines.patch -872236e91e393b62a1a9d7aebdf0c417314f874a67cef55ad37b39ee57cf9edb fix-libv4l2-errors.patch" -sha512sums="8d9b4d4ad25c1b9f9277adf9452858f2f5500ef2930d385f0061e6fec6db150b49ea8eb94d4df3789171ee20082087a37c8ad9e9d23ee12722c57e96f0a0b55d ffmpeg-2.3.5.tar.bz2 +8324bd3e154c151e64df36afd1edf05b8dc2dcd8e520208be0355a34b4209ad5 fix-flv-extradata.patch" +sha512sums="09f77f501d67b3bda325c25dce8bd4a76b2a7acd54d1bee8e2e37a26f8d8fa46b6843bd77ec33b2ab5d50e573da98695e50c9082bd91c2220a9d6de37fa258b5 ffmpeg-2.5.1.tar.bz2 d9bb652093b1c2d03cead78bcafd59fc8305f36fe5359ac5d7caf038889f1239829e288c07e77a11bbef89de5fe54a5eae50a1c4718ec77137bb677ef9069e54 configure-dlvsym.patch -d4d369055ef9ec8742f971786b05b89a5748a32cee711f623b71e8aea54b004bebda4e618017a351162647360632b13bcc7f09059938734e692ec841fe769c46 fix-flv-extradata.patch -ea2630d4ae5383bc24a322318aa8c41af745145755333660deec4ed256096eca73a49c41a0921544dfaa53d8087378cb2b5654001332c7262ea39f18e5c472c8 fix-defines.patch -56bba30f200c748d47d60d2b18147522dbceec7e8c97f434d3dbfa239547113a3e9d3b280e22816adeafa994b22eefac4b968448afef1a07aa1c46d3ec359e68 fix-libv4l2-errors.patch" +d4d369055ef9ec8742f971786b05b89a5748a32cee711f623b71e8aea54b004bebda4e618017a351162647360632b13bcc7f09059938734e692ec841fe769c46 fix-flv-extradata.patch" diff --git a/main/ffmpeg/fix-defines.patch b/main/ffmpeg/fix-defines.patch deleted file mode 100644 index 8479e8b8d..000000000 --- a/main/ffmpeg/fix-defines.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ffmpeg-1.2.2.orig/libavutil/error.c -+++ ffmpeg-1.2.2/libavutil/error.c -@@ -17,6 +17,7 @@ - */ - - #undef _GNU_SOURCE -+#define _XOPEN_SOURCE 600 - #include "avutil.h" - #include "avstring.h" - #include "common.h" diff --git a/main/ffmpeg/fix-libv4l2-errors.patch b/main/ffmpeg/fix-libv4l2-errors.patch deleted file mode 100644 index cd3ad4314..000000000 --- a/main/ffmpeg/fix-libv4l2-errors.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit bcd3eb3 -Author: Giorgio Vazzana -Date: Fri Mar 8 13:03:43 2013 +0100 - - lavd/v4l2: silence libv4l2 logging - - Signed-off-by: Michael Niedermayer - -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; -- cgit v1.2.3