3.1.5 released on 2016-10-22

Signed-off-by: Alexandre Demers <alexandre.f.demers@gmail.com>

3 files changed, 8 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 83c664743ccc..0171c3c67f6f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = lib32-ffmpeg
 	pkgdesc = Complete solution to record, convert and stream audio and video (32 bit)
-	pkgver = 3.1.3
-	pkgrel = 3
+	pkgver = 3.1.5
+	pkgrel = 1
 	epoch = 1
 	url = http://ffmpeg.org/
 	arch = x86_64
@@ -51,13 +51,11 @@ pkgbase = lib32-ffmpeg
 	provides = libpostproc.so
 	provides = libswresample.so
 	provides = libswscale.so
-	source = http://ffmpeg.org/releases/ffmpeg-3.1.3.tar.bz2
-	source = http://ffmpeg.org/releases/ffmpeg-3.1.3.tar.bz2.asc
-	source = https://trac.ffmpeg.org/raw-attachment/ticket/5694/ffmpeg_opj2.patch
+	source = http://ffmpeg.org/releases/ffmpeg-3.1.5.tar.bz2
+	source = http://ffmpeg.org/releases/ffmpeg-3.1.5.tar.bz2.asc
 	validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
-	sha256sums = 58bc89c65dd114d874efbf76f76368d03b5e407f0a3f42d5b40801c280968a38
+	sha256sums = 2400882a2c7795c74f0abebc28d267f2796510fb69ba324b0e9f16cc8dbb0d2b
 	sha256sums = SKIP
-	sha256sums = 336f14fa497598fbd437fc780305fa7c576fd6cd44aaef77b0b4f61448f55fb8
 
 pkgname = lib32-ffmpeg
 
diff --git a/PKGBUILD b/PKGBUILD
index c326e14f2230..f6db5208f875 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 
 _pkgbasename=ffmpeg
 pkgname=lib32-$_pkgbasename
-pkgver=3.1.3
-pkgrel=3
+pkgver=3.1.5
+pkgrel=1
 epoch=1
 pkgdesc="Complete solution to record, convert and stream audio and video (32 bit)"
 arch=('x86_64')
@@ -55,21 +55,16 @@ provides=(
 )
 source=(
       "http://ffmpeg.org/releases/$_pkgbasename-$pkgver.tar.bz2"{,.asc}
-      "https://trac.ffmpeg.org/raw-attachment/ticket/5694/ffmpeg_opj2.patch"
 )
 validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
 sha256sums=(
-      '58bc89c65dd114d874efbf76f76368d03b5e407f0a3f42d5b40801c280968a38'
+      '2400882a2c7795c74f0abebc28d267f2796510fb69ba324b0e9f16cc8dbb0d2b'
       'SKIP'
-      '336f14fa497598fbd437fc780305fa7c576fd6cd44aaef77b0b4f61448f55fb8'
 )
 
 build() {
   cd ${_pkgbasename}-${pkgver}
 
-  #Patching FFMPEG to compile against a change in OpenJPEG2 static library until this patch is integrated in next release
-  patch -p1 < ../ffmpeg_opj2.patch
-
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
   ./configure \
diff --git a/ffmpeg_opj2.patch b/ffmpeg_opj2.patch
deleted file mode 100644
index 11e66b4047df..000000000000
--- a/ffmpeg_opj2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -rupN ffmpeg-3.1.1/configure ffmpeg-3.1.1-new/configure
---- ffmpeg-3.1.1/configure	2016-06-27 01:54:28.000000000 +0200
-+++ ffmpeg-3.1.1-new/configure	2016-07-27 22:25:36.585141648 +0200
-@@ -5669,7 +5669,7 @@ enabled libopencv         && { check_hea
-                                  require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
-                                require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
- enabled libopenh264       && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
--enabled libopenjpeg       && { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC ||
-+enabled libopenjpeg       && { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
-                                check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC ||
-                                check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC ||
-                                check_lib openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC ||
-diff -rupN ffmpeg-3.1.1/libavcodec/libopenjpegdec.c ffmpeg-3.1.1-new/libavcodec/libopenjpegdec.c
---- ffmpeg-3.1.1/libavcodec/libopenjpegdec.c	2016-06-27 01:54:29.000000000 +0200
-+++ ffmpeg-3.1.1-new/libavcodec/libopenjpegdec.c	2016-07-27 22:25:45.509327071 +0200
-@@ -24,8 +24,6 @@
-  * JPEG 2000 decoder using libopenjpeg
-  */
-
--#define  OPJ_STATIC
--
- #include "libavutil/common.h"
- #include "libavutil/imgutils.h"
- #include "libavutil/intreadwrite.h"
-diff -rupN ffmpeg-3.1.1/libavcodec/libopenjpegenc.c ffmpeg-3.1.1-new/libavcodec/libopenjpegenc.c
---- ffmpeg-3.1.1/libavcodec/libopenjpegenc.c	2016-06-27 01:54:29.000000000 +0200
-+++ ffmpeg-3.1.1-new/libavcodec/libopenjpegenc.c	2016-07-27 22:25:40.298218807 +0200
-@@ -24,8 +24,6 @@
-  * JPEG 2000 encoder using libopenjpeg
-  */
-
--#define  OPJ_STATIC
--
- #include "libavutil/avassert.h"
- #include "libavutil/common.h"
- #include "libavutil/imgutils.h"