commit 1cfb9896f9bbfa732b443dc32473f93a016b7e88
Author: Jan Palus <[email protected]>
Date: Wed Dec 28 20:20:50 2016 +0100
up to 3.2.2
- openjpeg patch no longer needed
- updated decklink dep version
- disabled decklink bcond by default -- nobody seems to maintain base
package and new versions require registration for download
ffmpeg-openjpeg-build.patch | 36 ------------------------------------
ffmpeg.spec | 12 +++++-------
2 files changed, 5 insertions(+), 43 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 82c78c2..25026a5 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -14,7 +14,7 @@
%bcond_without bs2b # BS2B audio filter support
%bcond_without caca # textual display using libcaca
%bcond_without chromaprint # audio fingerprinting with chromaprint
-%bcond_without decklink # Blackmagic DeskLink output support
+%bcond_with decklink # Blackmagic DeskLink output support
%bcond_without flite # flite voice synthesis support
%bcond_without frei0r # frei0r video filtering
%bcond_without fribidi # fribidi support
@@ -64,21 +64,20 @@
Summary: FFmpeg - a very fast video and audio converter
Summary(pl.UTF-8): FFmpeg - szybki konwerter audio/wideo
Name: ffmpeg
-Version: 3.1
-Release: 4
+Version: 3.2.2
+Release: 1
# LGPL or GPL, chosen at configure time (GPL version is more featured)
# (postprocessing, some filters, x264, x265, xavs, xvid, x11grab)
# using v3 allows Apache-licensed libs (opencore-amr, libvo-*enc)
License: GPL v3+ with LGPL v3+ parts
Group: Applications/Multimedia
Source0: http://ffmpeg.org/releases/%{name}-%{version}.tar.xz
-# Source0-md5: 24ef0c0d541c857c8bc39215619b126f
+# Source0-md5: e34d1b92c5d844f2a3611c741a6dba18
Source1: ffserver.init
Source2: ffserver.sysconfig
Source3: ffserver.conf
-Patch0: %{name}-openjpeg-build.patch
URL: http://www.ffmpeg.org/
-%{?with_decklink:BuildRequires: Blackmagic_DeckLink_SDK}
+%{?with_decklink:BuildRequires: Blackmagic_DeckLink_SDK >= 10.6.1}
%{?with_openal:BuildRequires: OpenAL-devel >= 1.1}
%{?with_opencl:BuildRequires: OpenCL-devel >= 1.2}
%{?with_opengl:BuildRequires: OpenGL-GLX-devel}
@@ -378,7 +377,6 @@ Dokumentacja pakietu FFmpeg w formacie HTML.
%prep
%setup -q
-%patch0 -p1
# package the grep result for mplayer, the result formatted as
./mplayer/configure
cat <<EOF > ffmpeg-avconfig
diff --git a/ffmpeg-openjpeg-build.patch b/ffmpeg-openjpeg-build.patch
deleted file mode 100644
index 34fec82..0000000
--- a/ffmpeg-openjpeg-build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ruN ffmpeg-3.1.orig/configure ffmpeg-3.1/configure
---- ffmpeg-3.1.orig/configure 2016-06-27 01:54:28.000000000 +0200
-+++ ffmpeg-3.1/configure 2016-10-08 02:45:26.023232577 +0200
-@@ -5669,7 +5669,7 @@
- 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 -ruN ffmpeg-3.1.orig/libavcodec/libopenjpegdec.c
ffmpeg-3.1/libavcodec/libopenjpegdec.c
---- ffmpeg-3.1.orig/libavcodec/libopenjpegdec.c 2016-06-27
01:54:29.000000000 +0200
-+++ ffmpeg-3.1/libavcodec/libopenjpegdec.c 2016-10-08 02:45:39.532177348
+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 -ruN ffmpeg-3.1.orig/libavcodec/libopenjpegenc.c
ffmpeg-3.1/libavcodec/libopenjpegenc.c
---- ffmpeg-3.1.orig/libavcodec/libopenjpegenc.c 2016-06-27
01:54:29.000000000 +0200
-+++ ffmpeg-3.1/libavcodec/libopenjpegenc.c 2016-10-08 02:45:52.390124879
+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"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ffmpeg.git/commitdiff/1cfb9896f9bbfa732b443dc32473f93a016b7e88
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
