Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3e5a2a022a8fb29d5b6e56da6c9baa446bbb7d76
commit 3e5a2a022a8fb29d5b6e56da6c9baa446bbb7d76 Author: crazy <cr...@frugalware.org> Date: Fri Oct 6 17:24:57 2017 +0200 ffmpeg-3.3.4-2-x86_64 * rebuild * fixed openjpeg patch and added openjpeg 2.3 support diff --git a/source/xmultimedia/ffmpeg/FrugalBuild b/source/xmultimedia/ffmpeg/FrugalBuild index bc2592a..83e0e16 100644 --- a/source/xmultimedia/ffmpeg/FrugalBuild +++ b/source/xmultimedia/ffmpeg/FrugalBuild @@ -3,7 +3,7 @@ pkgname=ffmpeg pkgver=3.3.4 -pkgrel=1 +pkgrel=2 pkgdesc="FFMpeg is a complete and free Internet live audio and video broadcasting solution for Linux/Unix." url="http://ffmpeg.sourceforge.net/"; depends=('alsa-lib>=1.1.2-2' 'a52dec>=0.7.4-6' 'faac>=1.28-5' 'lame>=3.99.5-5' \ @@ -16,8 +16,7 @@ makedepends=('freetype2>=2.7' 'yasm>=1.3.0-2' 'x11-protos') groups=('xmultimedia') archs=("x86_64") up2date="Flasttar http://www.ffmpeg.org/releases/"; -source=(http://www.ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2 \ - ffmpeg-openjpeg2.2.patch) +source=(http://www.ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2 openjpeg-2.2+2.3.patch) signatures=("${source[0]}.asc" '') Fconfopts=" --prefix='/usr' \ diff --git a/source/xmultimedia/ffmpeg/ffmpeg-openjpeg2.2.patch b/source/xmultimedia/ffmpeg/openjpeg-2.2+2.3.patch similarity index 61% rename from source/xmultimedia/ffmpeg/ffmpeg-openjpeg2.2.patch rename to source/xmultimedia/ffmpeg/openjpeg-2.2+2.3.patch index d23c914..80cc157 100644 --- a/source/xmultimedia/ffmpeg/ffmpeg-openjpeg2.2.patch +++ b/source/xmultimedia/ffmpeg/openjpeg-2.2+2.3.patch @@ -1,95 +1,103 @@ -diff -rupN ffmpeg-3.3.3.orig/configure ffmpeg-3.3.3/configure ---- ffmpeg-3.3.3.orig/configure 2017-07-29 19:49:29.000000000 +0200 -+++ ffmpeg-3.3.3/configure 2017-08-15 13:21:28.782566614 +0200 -@@ -1875,6 +1875,7 @@ HEADERS_LIST=" +diff -Naur ffmpeg-3.3.4/configure ffmpeg-3.3.4-p/configure +--- ffmpeg-3.3.4/configure 2017-09-12 02:51:31.000000000 +0200 ++++ ffmpeg-3.3.4-p/configure 2017-10-06 17:10:41.843775049 +0200 +@@ -1875,6 +1875,8 @@ machine_ioctl_meteor_h malloc_h opencv2_core_core_c_h ++ openjpeg_2_3_openjpeg_h + openjpeg_2_2_openjpeg_h openjpeg_2_1_openjpeg_h openjpeg_2_0_openjpeg_h openjpeg_1_5_openjpeg_h -@@ -5805,7 +5806,9 @@ enabled libopencv && { check_hea +@@ -5805,7 +5807,11 @@ 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 && add_cppflags -DOPJ_STATIC; } || -+enabled libopenjpeg && { { check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } || ++enabled libopenjpeg && { { check_lib openjpeg-2.3/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } || ++ check_lib openjpeg-2.3/openjpeg.h opj_version -lopenjp2 || ++ { check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } || + check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 || + { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } || check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 || { check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } || { check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } || -diff -rupN ffmpeg-3.3.3.orig/libavcodec/libopenjpegdec.c ffmpeg-3.3.3/libavcodec/libopenjpegdec.c ---- ffmpeg-3.3.3.orig/libavcodec/libopenjpegdec.c 2017-07-29 19:49:30.000000000 +0200 -+++ ffmpeg-3.3.3/libavcodec/libopenjpegdec.c 2017-08-15 13:21:28.869233484 +0200 -@@ -34,7 +34,9 @@ +diff -Naur ffmpeg-3.3.4/libavcodec/libopenjpegdec.c ffmpeg-3.3.4-p/libavcodec/libopenjpegdec.c +--- ffmpeg-3.3.4/libavcodec/libopenjpegdec.c 2017-09-12 02:51:33.000000000 +0200 ++++ ffmpeg-3.3.4-p/libavcodec/libopenjpegdec.c 2017-10-06 17:14:09.817509488 +0200 +@@ -34,7 +34,12 @@ #include "internal.h" #include "thread.h" -#if HAVE_OPENJPEG_2_1_OPENJPEG_H -+#if HAVE_OPENJPEG_2_2_OPENJPEG_H ++ ++#if HAVE_OPENJPEG_2_3_OPENJPEG_H ++# include <openjpeg-2.3/openjpeg.h> ++#elif HAVE_OPENJPEG_2_2_OPENJPEG_H +# include <openjpeg-2.2/openjpeg.h> +#elif HAVE_OPENJPEG_2_1_OPENJPEG_H # include <openjpeg-2.1/openjpeg.h> #elif HAVE_OPENJPEG_2_0_OPENJPEG_H # include <openjpeg-2.0/openjpeg.h> -@@ -44,7 +46,7 @@ +@@ -44,7 +49,7 @@ # include <openjpeg.h> #endif -#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H -+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H ++#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H # define OPENJPEG_MAJOR_VERSION 2 # define OPJ(x) OPJ_##x #else -@@ -429,7 +431,7 @@ static int libopenjpeg_decode_frame(AVCo +@@ -429,7 +434,7 @@ opj_stream_set_read_function(stream, stream_read); opj_stream_set_skip_function(stream, stream_skip); opj_stream_set_seek_function(stream, stream_seek); -#if HAVE_OPENJPEG_2_1_OPENJPEG_H -+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H ++#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H opj_stream_set_user_data(stream, &reader, NULL); #elif HAVE_OPENJPEG_2_0_OPENJPEG_H opj_stream_set_user_data(stream, &reader); -diff -rupN ffmpeg-3.3.3.orig/libavcodec/libopenjpegenc.c ffmpeg-3.3.3/libavcodec/libopenjpegenc.c ---- ffmpeg-3.3.3.orig/libavcodec/libopenjpegenc.c 2017-07-29 19:49:30.000000000 +0200 -+++ ffmpeg-3.3.3/libavcodec/libopenjpegenc.c 2017-08-15 13:21:28.869233484 +0200 -@@ -32,7 +32,9 @@ +diff -Naur ffmpeg-3.3.4/libavcodec/libopenjpegenc.c ffmpeg-3.3.4-p/libavcodec/libopenjpegenc.c +--- ffmpeg-3.3.4/libavcodec/libopenjpegenc.c 2017-09-12 02:51:33.000000000 +0200 ++++ ffmpeg-3.3.4-p/libavcodec/libopenjpegenc.c 2017-10-06 17:16:32.438440198 +0200 +@@ -32,7 +32,11 @@ #include "avcodec.h" #include "internal.h" -#if HAVE_OPENJPEG_2_1_OPENJPEG_H -+#if HAVE_OPENJPEG_2_2_OPENJPEG_H ++#if HAVE_OPENJPEG_2_3_OPENJPEG_H ++# include <openjpeg-2.3/openjpeg.h> ++#elif HAVE_OPENJPEG_2_2_OPENJPEG_H +# include <openjpeg-2.2/openjpeg.h> +#elif HAVE_OPENJPEG_2_1_OPENJPEG_H # include <openjpeg-2.1/openjpeg.h> #elif HAVE_OPENJPEG_2_0_OPENJPEG_H # include <openjpeg-2.0/openjpeg.h> -@@ -42,7 +44,7 @@ +@@ -42,7 +46,7 @@ # include <openjpeg.h> #endif -#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H -+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H ++#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H # define OPENJPEG_MAJOR_VERSION 2 # define OPJ(x) OPJ_##x #else -@@ -305,7 +307,7 @@ static av_cold int libopenjpeg_encode_in +@@ -305,7 +309,7 @@ opj_set_default_encoder_parameters(&ctx->enc_params); -#if HAVE_OPENJPEG_2_1_OPENJPEG_H -+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H ++#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H switch (ctx->cinema_mode) { case OPJ_CINEMA2K_24: ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K; -@@ -769,7 +771,7 @@ static int libopenjpeg_encode_frame(AVCo +@@ -769,7 +773,7 @@ opj_stream_set_write_function(stream, stream_write); opj_stream_set_skip_function(stream, stream_skip); opj_stream_set_seek_function(stream, stream_seek); -#if HAVE_OPENJPEG_2_1_OPENJPEG_H -+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H ++#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H opj_stream_set_user_data(stream, &writer, NULL); #elif HAVE_OPENJPEG_2_0_OPENJPEG_H opj_stream_set_user_data(stream, &writer); _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
