- up to 2.1.3

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 5cff9694879dc804e80678e401f8706d1ce91754..293a844ea17b86e7ed8a318b9f2768be5d99ce10 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -36,20 +36,19 @@
 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:       4
+Version:       2.1.3
+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: 2719ab2b3311ac3775b9cdeb66c54849
+# Source0-md5: 711b795bbc7b527c0f4a1828f324fd5a
 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}
@@ -324,7 +323,6 @@ Dokumentacja pakietu FFmpeg w formacie HTML.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 # package the grep result for mplayer, the result formatted as ./mplayer/configure
 cat <<EOF > ffmpeg-avconfig

diff --git a/freetype2.patch b/freetype2.patch
deleted file mode 100644 (file)
index a0a8aaf..0000000
--- a/freetype2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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;
---- ffmpeg-2.1.1/libavfilter/vf_drawtext.c~    2013-11-20 03:28:56.000000000 +0100
-+++ ffmpeg-2.1.1/libavfilter/vf_drawtext.c     2013-11-30 13:29:31.113931329 +0100
-@@ -48,7 +48,6 @@
- #include "video.h"
- 
- #include <ft2build.h>
--#include <freetype/config/ftheader.h>
- #include FT_FREETYPE_H
- #include FT_GLYPH_H
- #if CONFIG_FONTCONFIG