[packages/ffmpeg] - updated to 0.11.2 - added openjpeg patch to allow build with openjpeg 1.5 (use pkg-config to detec
qboosh
qboosh at pld-linux.org
Fri Oct 5 21:56:21 CEST 2012
commit ae5be86b10343594ac312e148803a336ba187781
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Oct 5 21:57:48 2012 +0200
- updated to 0.11.2
- added openjpeg patch to allow build with openjpeg 1.5 (use pkg-config to detect include dir)
ffmpeg-openjpeg.patch | 11 +++++++++++
ffmpeg.spec | 12 +++++++-----
2 files changed, 18 insertions(+), 5 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 4328544..dd855ce 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -22,20 +22,21 @@
Summary: FFmpeg - a very fast video and audio converter
Summary(pl.UTF-8): FFmpeg - szybki konwerter audio/wideo
Name: ffmpeg
-Version: 0.11.1
-Release: 3
+Version: 0.11.2
+Release: 1
# LGPL or GPL, chosen at configure time (GPL version is more featured)
# (postprocessing, some filters, x264, 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.bz2
-# Source0-md5: ff8cb914f657e164dd60ea1008b555a8
+# Source0-md5: 93c1908022567b321df74db7214da6ac
Source1: ffserver.init
Source2: ffserver.sysconfig
Source3: ffserver.conf
Patch0: %{name}-gsm.patch
Patch1: %{name}-opencv24.patch
+Patch2: %{name}-openjpeg.patch
URL: http://www.ffmpeg.org/
%{?with_openal:BuildRequires: OpenAL-devel}
BuildRequires: SDL-devel >= 1.2.1
@@ -74,7 +75,7 @@ BuildRequires: libvorbis-devel
%{?with_x264:BuildRequires: libx264-devel >= 0.1.3-1.20111212_2245}
BuildRequires: opencore-amr-devel
%{?with_opencv:BuildRequires: opencv-devel}
-BuildRequires: openjpeg-devel >= 1.3-2
+BuildRequires: openjpeg-devel >= 1.5
%{?with_pulseaudio:BuildRequires: pulseaudio-devel}
BuildRequires: speex-devel >= 1:1.2-rc1
%ifarch %{ix86}
@@ -179,7 +180,7 @@ Requires: libvorbis-devel
%{?with_vpx:Requires: libvpx-devel >= 0.9.6}
%{?with_x264:Requires: libx264-devel >= 0.1.3-1.20110625_2245}
Requires: opencore-amr-devel
-Requires: openjpeg-devel >= 1.3-2
+Requires: openjpeg-devel >= 1.5
Requires: schroedinger-devel
Requires: speex-devel >= 1:1.2-rc1
Requires: vo-aacenc-devel
@@ -250,6 +251,7 @@ dużej przestrzeni na dane skonfigurowanej w ffserver.conf).
%setup -q
%patch0 -p1
%patch1 -p0
+%patch2 -p1
# package the grep result for mplayer, the result formatted as ./mplayer/configure
cat <<EOF > ffmpeg-avconfig
diff --git a/ffmpeg-openjpeg.patch b/ffmpeg-openjpeg.patch
new file mode 100644
index 0000000..51badf7
--- /dev/null
+++ b/ffmpeg-openjpeg.patch
@@ -0,0 +1,11 @@
+--- ffmpeg-0.11.2/configure.orig 2012-10-05 21:04:40.855184264 +0200
++++ ffmpeg-0.11.2/configure 2012-10-05 21:23:33.891827315 +0200
+@@ -3225,7 +3225,7 @@
+ 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 && add_extralibs -lopencv_core -lopencv_features2d -lopencv_imgproc -lopencv_objdetect -lgcrypt
+-enabled libopenjpeg && require libopenjpeg openjpeg.h opj_version -lopenjpeg
++enabled libopenjpeg && require_pkg_config libopenjpeg openjpeg.h opj_version
+ enabled libpulse && require_pkg_config libpulse-simple pulse/simple.h pa_simple_new
+ enabled librtmp && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket
+ enabled libschroedinger && require_pkg_config schroedinger-1.0 schroedinger/schro.h schro_init
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ffmpeg.git/commitdiff/ae5be86b10343594ac312e148803a336ba187781
More information about the pld-cvs-commit
mailing list