[packages/ffmpeg] - up to 2.6
arekm
arekm at pld-linux.org
Sun Mar 8 08:53:42 CET 2015
commit a83031618506eb0e69a73dc496a7c379cdbfc0a8
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sun Mar 8 08:53:37 2015 +0100
- up to 2.6
ffmpeg-build.patch | 10 ++++++++++
ffmpeg-opencv24.patch | 11 -----------
ffmpeg.spec | 6 ++++--
3 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index f97387d..321fc0c 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -50,7 +50,7 @@
Summary: FFmpeg - a very fast video and audio converter
Summary(pl.UTF-8): FFmpeg - szybki konwerter audio/wideo
Name: ffmpeg
-Version: 2.5.4
+Version: 2.6
Release: 1
# LGPL or GPL, chosen at configure time (GPL version is more featured)
# (postprocessing, some filters, x264, x265, xavs, xvid, x11grab)
@@ -58,10 +58,11 @@ Release: 1
License: GPL v3+ with LGPL v3+ parts
Group: Applications/Multimedia
Source0: http://ffmpeg.org/releases/%{name}-%{version}.tar.bz2
-# Source0-md5: af92a816b642d32134a764d2d7f55b75
+# Source0-md5: 5bf6097833a3fea6a9e51b0a456c6922
Source1: ffserver.init
Source2: ffserver.sysconfig
Source3: ffserver.conf
+Patch0: %{name}-build.patch
URL: http://www.ffmpeg.org/
%{?with_decklink:BuildRequires: Blackmagic_DeckLink_SDK}
%{?with_openal:BuildRequires: OpenAL-devel >= 1.1}
@@ -352,6 +353,7 @@ 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-build.patch b/ffmpeg-build.patch
new file mode 100644
index 0000000..dcfae7e
--- /dev/null
+++ b/ffmpeg-build.patch
@@ -0,0 +1,10 @@
+--- ffmpeg-2.6/libavutil/opencl.c~ 2015-03-06 23:35:33.000000000 +0100
++++ ffmpeg-2.6/libavutil/opencl.c 2015-03-08 08:06:27.318661228 +0100
+@@ -588,6 +588,7 @@ end:
+
+ void av_opencl_uninit(void)
+ {
++ int i;
+ cl_int status;
+ LOCK_OPENCL;
+ opencl_ctx.init_count--;
diff --git a/ffmpeg-opencv24.patch b/ffmpeg-opencv24.patch
deleted file mode 100644
index c4bc602..0000000
--- a/ffmpeg-opencv24.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ffmpeg-2.3.3/configure~ 2014-08-17 15:33:04.000000000 +0200
-+++ ffmpeg-2.3.3/configure 2014-08-25 12:02:45.727180736 +0200
-@@ -4742,7 +4742,7 @@
- enabled libnut && require libnut libnut.h nut_demuxer_init -lnut
- enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
- enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
--enabled libopencv && require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader
-+enabled libopencv && add_extralibs -lopencv_core -lopencv_features2d -lopencv_imgproc -lopencv_objdetect -lgcrypt
- enabled libopenjpeg && { check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC ||
- check_lib openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC ||
- die "ERROR: libopenjpeg not found"; }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ffmpeg.git/commitdiff/a83031618506eb0e69a73dc496a7c379cdbfc0a8
More information about the pld-cvs-commit
mailing list