Updated package ffmpeg-compat-54 1.2.1-2

3 files changed, 4 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4422b3560760..c9a0758b235f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ffmpeg-compat-54
 	pkgdesc = Compatibility package for ffmpeg to provide versions 54 of libavcodec, libavdevice and libavformat, not anymore provided by the ffmpeg package
 	pkgver = 1.2.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://ffmpeg.org/
 	arch = i686
 	arch = x86_64
@@ -28,9 +28,7 @@ pkgbase = ffmpeg-compat-54
 	depends = jack
 	depends = libavutil-52
 	source = http://ffmpeg.org/releases/ffmpeg-1.2.1.tar.bz2
-	source = freetype2.patch
 	sha256sums = 0302375c3a64e9c2facfa7cbeb1aa333a39fdf6bbacda228cd48e04bf9ee32ca
-	sha256sums = 03e7e303f864e04ad1cae1af82c0179e111f9ef580634c72a315f22589a6d2ea
 
 pkgname = ffmpeg-compat-54
 
diff --git a/PKGBUILD b/PKGBUILD
index caad052ec567..093a34647d2b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=ffmpeg-compat-54
 pkgver=1.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Compatibility package for ffmpeg to provide versions 54 of libavcodec, libavdevice and libavformat, not anymore provided by the ffmpeg package"
 arch=('i686' 'x86_64')
 url="http://ffmpeg.org/"
@@ -11,15 +11,8 @@ depends=('gsm' 'lame' 'opencore-amr' 'openjpeg' 'opus' 'rtmpdump' 'libvpx'
          'schroedinger' 'speex' 'v4l-utils' 'xvidcore' 'libpulse'  'libx264'
          'libtheora' 'libbluray' 'libmodplug' 'sdl' 'jack' 'libavutil-52')
 makedepends=('yasm' 'libass')
-source=("http://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.bz2"
-        "freetype2.patch")
-sha256sums=('0302375c3a64e9c2facfa7cbeb1aa333a39fdf6bbacda228cd48e04bf9ee32ca'
-            '03e7e303f864e04ad1cae1af82c0179e111f9ef580634c72a315f22589a6d2ea')
-
-prepare() {
-  cd "ffmpeg-${pkgver}"
-  patch -p1 -i "${srcdir}/freetype2.patch"
-}
+source=("http://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.bz2")
+sha256sums=('0302375c3a64e9c2facfa7cbeb1aa333a39fdf6bbacda228cd48e04bf9ee32ca')
 
 build() {
   cd "ffmpeg-${pkgver}"
diff --git a/freetype2.patch b/freetype2.patch
deleted file mode 100644
index 564a8b47455c..000000000000
--- a/freetype2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru3 ffmpeg-1.2.1/configure ffmpeg-1.2.1-p/configure
---- ffmpeg-1.2.1/configure	2013-05-10 02:16:22.000000000 +0200
-+++ ffmpeg-1.2.1-p/configure	2014-01-05 12:17:12.004338758 +0100
-@@ -3903,7 +3903,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_config freetype2 "ft2build.h freetype2/freetype.h" FT_Init_FreeType
- enabled libgsm     && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
-                             check_lib "${gsm_hdr}" gsm_create -lgsm && break;
-                         done || die "ERROR: libgsm not found"; }
-diff -ru3 ffmpeg-1.2.1/libavfilter/vf_drawtext.c ffmpeg-1.2.1-p/libavfilter/vf_drawtext.c
---- ffmpeg-1.2.1/libavfilter/vf_drawtext.c	2013-05-10 02:16:06.000000000 +0200
-+++ ffmpeg-1.2.1-p/libavfilter/vf_drawtext.c	2014-01-05 12:18:33.674284457 +0100
-@@ -48,7 +48,7 @@
- #include "video.h"
- 
- #include <ft2build.h>
--#include <freetype/config/ftheader.h>
-+#include <freetype2/config/ftheader.h>
- #include FT_FREETYPE_H
- #include FT_GLYPH_H
- #if CONFIG_FONTCONFIG