commit 84f92fbf9ad10b7166443e38d29112b38e51e30f
Author: Jan Rękorajski <[email protected]>
Date: Sat Nov 30 13:25:00 2013 +0100
- workaround for freetype2 misdetection
ffmpeg.spec | 6 ++++--
freetype2.patch | 25 +++++++++++++++++++++++++
2 files changed, 29 insertions(+), 2 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 320fdaa..cc626b0 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -38,7 +38,7 @@ Summary: FFmpeg - a very fast video and audio converter
Summary(pl.UTF-8): FFmpeg - szybki konwerter audio/wideo
Name: ffmpeg
Version: 2.1.1
-Release: 2.2
+Release: 2.3
# 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)
@@ -50,6 +50,7 @@ Source1: ffserver.init
Source2: ffserver.sysconfig
Source3: ffserver.conf
Patch0: %{name}-opencv24.patch
+Patch1: freetype2.patch
URL: http://www.ffmpeg.org/
%{?with_openal:BuildRequires: OpenAL-devel >= 1.1}
%{?with_opencl:BuildRequires: OpenCL-devel >= 1.2}
@@ -328,6 +329,7 @@ Dokumentacja do ffmpeg.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
# package the grep result for mplayer, the result formatted as
./mplayer/configure
cat <<EOF > ffmpeg-avconfig
@@ -402,7 +404,7 @@ EOF
--libdir=%{_libdir} \
--shlibdir=%{_libdir} \
--mandir=%{_mandir} \
- --extra-cflags="-D_GNU_SOURCE=1 %{rpmcppflags} %{rpmcflags}
-I/usr/include/freetype2" \
+ --extra-cflags="-D_GNU_SOURCE=1 %{rpmcppflags} %{rpmcflags}" \
--extra-ldflags="%{rpmcflags} %{rpmldflags}" \
--cc="%{__cc}" \
--disable-debug \
diff --git a/freetype2.patch b/freetype2.patch
new file mode 100644
index 0000000..7a6c447
--- /dev/null
+++ b/freetype2.patch
@@ -0,0 +1,25 @@
+--- ffmpeg-2.1.1/configure~ 2013-11-30 13:14:22.612044487 +0100
++++ ffmpeg-2.1.1/configure 2013-11-30 13:24:12.010919213 +0100
+@@ -1102,6 +1102,13 @@
+ add_extralibs $(get_safe ${pkg}_libs)
+ }
+
++require_pkg_config2(){
++ pkg="$1"
++ check_cmd $pkg_config --exists --print-errors $pkg || die "ERROR: $pkg
not found"
++ add_cflags $(get_safe ${pkg}_cflags)
++ add_extralibs $(get_safe ${pkg}_libs)
++}
++
+ hostcc_o(){
+ eval printf '%s\\n' $HOSTCC_O
+ }
+@@ -4242,7 +4249,7 @@
+ enabled libfdk_aac && require libfdk_aac fdk-aac/aacenc_lib.h
aacEncOpen -lfdk-aac
+ flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal
-lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish
-lflite_cmulex -lflite"
+ enabled libflite && require2 libflite "flite/flite.h" flite_init
$flite_libs
+-enabled libfreetype && require_pkg_config freetype2 "ft2build.h
freetype/freetype.h" FT_Init_FreeType
++enabled libfreetype && require_pkg_config2 freetype2
+ enabled libgme && require libgme gme/gme.h gme_new_emu -lgme
-lstdc++
+ enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
+ check_lib "${gsm_hdr}" gsm_create -lgsm &&
break;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ffmpeg.git/commitdiff/84f92fbf9ad10b7166443e38d29112b38e51e30f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
