Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=1c17ebf7946df5268ca69d01a2e74dfc06278306
commit 1c17ebf7946df5268ca69d01a2e74dfc06278306 Author: crazy <[email protected]> Date: Sat Feb 3 15:41:44 2018 +0100 ffmpeg-3.4.1-1-x86_64 * Version bump diff --git a/source/xmultimedia/ffmpeg/FrugalBuild b/source/xmultimedia/ffmpeg/FrugalBuild index 83e0e16..6ef6a2e 100644 --- a/source/xmultimedia/ffmpeg/FrugalBuild +++ b/source/xmultimedia/ffmpeg/FrugalBuild @@ -2,22 +2,22 @@ # Maintainer: crazy <[email protected]> pkgname=ffmpeg -pkgver=3.3.4 -pkgrel=2 +pkgver=3.4.1 +pkgrel=1 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' \ 'libtheora>=1.1.1-5' 'libvorbis>=1.3.5-5' 'x264>=20170705_2245' 'xvidcore>=1.3.4-3' 'libdc1394>=2.2.3-4' \ 'imlib2>=1.4.7-3' 'sdl2>=2.0.5' 'faad2>=2.7-5' 'gsm>=1.0.14-2' 'opencore-amr>=0.1.3-2' 'libxfixes>=5.0.1-2' \ 'libvpx>=1.6.0-1' 'libva>=1.6.2-5' 'libvdpau>=1.1.1-2' 'libxcb>=1.11.1-3' 'libbluray>=1.0.0' 'speex>=1.2rc2-4' \ - 'v4l-utils>=1.8.1-3' 'rtmpdump>=2.4-2' 'openjpeg>=2.2.0' 'libpulse>=9.0-2' 'x265>=2.5' 'libass>=0.13.6' \ - 'libcaca>=0.99.beta19-5' 'libstdc++>=6.2.1-5') -makedepends=('freetype2>=2.7' 'yasm>=1.3.0-2' 'x11-protos') + 'v4l-utils>=1.8.1-3' 'rtmpdump>=2.4-2' 'openjpeg>=2.2.0' 'libpulse>=9.0-2' 'x265>=2.6' 'libass>=0.13.6' \ + 'libcaca>=0.99.beta19-5' 'libstdc++>=7.3.0-7') +makedepends=('freetype2>=2.9' '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 openjpeg-2.2+2.3.patch) -signatures=("${source[0]}.asc" '') +source=(http://www.ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) +signatures=("${source[0]}.asc") Fconfopts=" --prefix='/usr' \ --docdir="/usr/share/doc/ffmpeg-$pkgver" \ diff --git a/source/xmultimedia/ffmpeg/openjpeg-2.2+2.3.patch b/source/xmultimedia/ffmpeg/openjpeg-2.2+2.3.patch deleted file mode 100644 index 80cc157..0000000 --- a/source/xmultimedia/ffmpeg/openjpeg-2.2+2.3.patch +++ /dev/null @@ -1,103 +0,0 @@ -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 +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.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 -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_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 +49,7 @@ - # include <openjpeg.h> - #endif - --#if 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 +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_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 -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_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 +46,7 @@ - # include <openjpeg.h> - #endif - --#if 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 +309,7 @@ - - opj_set_default_encoder_parameters(&ctx->enc_params); - --#if 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 +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_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 [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
