[arch-commits] Commit in ffmpeg/repos (8 files)

Bartłomiej Piotrowski bpiotrowski at nymeria.archlinux.org
Tue Jan 14 06:49:50 UTC 2014


    Date: Tuesday, January 14, 2014 @ 07:49:49
  Author: bpiotrowski
Revision: 203681

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  ffmpeg/repos/extra-i686/PKGBUILD
    (from rev 203680, ffmpeg/trunk/PKGBUILD)
  ffmpeg/repos/extra-i686/ffmpeg-2.1.1-freetype2.patch
    (from rev 203680, ffmpeg/trunk/ffmpeg-2.1.1-freetype2.patch)
  ffmpeg/repos/extra-x86_64/PKGBUILD
    (from rev 203680, ffmpeg/trunk/PKGBUILD)
  ffmpeg/repos/extra-x86_64/ffmpeg-2.1.1-freetype2.patch
    (from rev 203680, ffmpeg/trunk/ffmpeg-2.1.1-freetype2.patch)
Deleted:
  ffmpeg/repos/extra-i686/PKGBUILD
  ffmpeg/repos/extra-i686/ffmpeg-2.1.1-freetype2.patch
  ffmpeg/repos/extra-x86_64/PKGBUILD
  ffmpeg/repos/extra-x86_64/ffmpeg-2.1.1-freetype2.patch

-------------------------------------------+
 /PKGBUILD                                 |  154 ++++++++++++++++++++++++++++
 /ffmpeg-2.1.1-freetype2.patch             |  146 ++++++++++++++++++++++++++
 extra-i686/PKGBUILD                       |   84 ---------------
 extra-i686/ffmpeg-2.1.1-freetype2.patch   |   73 -------------
 extra-x86_64/PKGBUILD                     |   84 ---------------
 extra-x86_64/ffmpeg-2.1.1-freetype2.patch |   73 -------------
 6 files changed, 300 insertions(+), 314 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2014-01-14 06:49:40 UTC (rev 203680)
+++ extra-i686/PKGBUILD	2014-01-14 06:49:49 UTC (rev 203681)
@@ -1,84 +0,0 @@
-# $Id$
-# Maintainer:  Ionut Biru <ibiru at archlinux.org>
-# Maintainer:  Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-# Contributor: Paul Mattal <paul at archlinux.org>
-
-pkgname=ffmpeg
-pkgver=2.1.1
-pkgrel=3
-epoch=1
-pkgdesc='Complete and free Internet live audio and video broadcasting solution'
-arch=('i686' 'x86_64')
-url='http://ffmpeg.org/'
-license=('GPL')
-depends=(
-      'alsa-lib' 'bzip2' 'fontconfig' 'gnutls' 'gsm' 'lame' 'libass'
-      'libbluray' 'libmodplug' 'libpulse' 'libtheora' 'libva' 'libvorbis' 'libvpx'
-      'opencore-amr' 'openjpeg' 'opus' 'rtmpdump' 'schroedinger' 'sdl' 'speex'
-      'v4l-utils' 'x264' 'xvidcore' 'zlib'
-      )
-makedepends=('libvdpau' 'yasm')
-source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2
-        ffmpeg-2.1.1-freetype2.patch)
-md5sums=('2719ab2b3311ac3775b9cdeb66c54849'
-         '4b5dd079a40f44f4e0d00cdbc9d52ec3')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 -i ../ffmpeg-2.1.1-freetype2.patch
-}
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure \
-    --prefix=/usr \
-    --disable-debug \
-    --disable-static \
-    --enable-avresample \
-    --enable-dxva2 \
-    --enable-fontconfig \
-    --enable-gnutls \
-    --enable-gpl \
-    --enable-libass \
-    --enable-libbluray \
-    --enable-libfreetype \
-    --enable-libgsm \
-    --enable-libmodplug \
-    --enable-libmp3lame \
-    --enable-libopencore_amrnb \
-    --enable-libopencore_amrwb \
-    --enable-libopenjpeg \
-    --enable-libopus \
-    --enable-libpulse \
-    --enable-librtmp \
-    --enable-libschroedinger \
-    --enable-libspeex \
-    --enable-libtheora \
-    --enable-libv4l2 \
-    --enable-libvorbis \
-    --enable-libvpx \
-    --enable-libx264 \
-    --enable-libxvid \
-    --enable-pic \
-    --enable-postproc \
-    --enable-runtime-cpudetect \
-    --enable-shared \
-    --enable-swresample \
-    --enable-vdpau \
-    --enable-version3 \
-    --enable-x11grab
-
-  make
-  make tools/qt-faststart
-  make doc/ff{mpeg,play,server}.1
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install install-man
-  install -Dm755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart
-}
-
-# vim:set ts=2 sw=2 et:

Copied: ffmpeg/repos/extra-i686/PKGBUILD (from rev 203680, ffmpeg/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2014-01-14 06:49:49 UTC (rev 203681)
@@ -0,0 +1,77 @@
+# $Id$
+# Maintainer:  Ionut Biru <ibiru at archlinux.org>
+# Maintainer:  Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+# Contributor: Paul Mattal <paul at archlinux.org>
+
+pkgname=ffmpeg
+pkgver=2.1.2
+pkgrel=1
+epoch=1
+pkgdesc='Complete and free Internet live audio and video broadcasting solution'
+arch=('i686' 'x86_64')
+url='http://ffmpeg.org/'
+license=('GPL')
+depends=(
+      'alsa-lib' 'bzip2' 'fontconfig' 'gnutls' 'gsm' 'lame' 'libass'
+      'libbluray' 'libmodplug' 'libpulse' 'libtheora' 'libva' 'libvorbis' 'libvpx'
+      'opencore-amr' 'openjpeg' 'opus' 'rtmpdump' 'schroedinger' 'sdl' 'speex'
+      'v4l-utils' 'x264' 'xvidcore' 'zlib'
+      )
+makedepends=('libvdpau' 'yasm')
+source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2)
+md5sums=('4c41fefca609c6ef0dfd539826783e73')
+
+build() {
+  cd $pkgname-$pkgver
+
+  ./configure \
+    --prefix=/usr \
+    --disable-debug \
+    --disable-static \
+    --enable-avresample \
+    --enable-dxva2 \
+    --enable-fontconfig \
+    --enable-gnutls \
+    --enable-gpl \
+    --enable-libass \
+    --enable-libbluray \
+    --enable-libfreetype \
+    --enable-libgsm \
+    --enable-libmodplug \
+    --enable-libmp3lame \
+    --enable-libopencore_amrnb \
+    --enable-libopencore_amrwb \
+    --enable-libopenjpeg \
+    --enable-libopus \
+    --enable-libpulse \
+    --enable-librtmp \
+    --enable-libschroedinger \
+    --enable-libspeex \
+    --enable-libtheora \
+    --enable-libv4l2 \
+    --enable-libvorbis \
+    --enable-libvpx \
+    --enable-libx264 \
+    --enable-libxvid \
+    --enable-pic \
+    --enable-postproc \
+    --enable-runtime-cpudetect \
+    --enable-shared \
+    --enable-swresample \
+    --enable-vdpau \
+    --enable-version3 \
+    --enable-x11grab
+
+  make
+  make tools/qt-faststart
+  make doc/ff{mpeg,play,server}.1
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install install-man
+  install -Dm755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: extra-i686/ffmpeg-2.1.1-freetype2.patch
===================================================================
--- extra-i686/ffmpeg-2.1.1-freetype2.patch	2014-01-14 06:49:40 UTC (rev 203680)
+++ extra-i686/ffmpeg-2.1.1-freetype2.patch	2014-01-14 06:49:49 UTC (rev 203681)
@@ -1,73 +0,0 @@
-From cea5812fa723c08b89d929eeba73462e05de2973 Mon Sep 17 00:00:00 2001
-From: Alexander Strasser <eclipse7 at gmx.net>
-Date: Fri, 6 Dec 2013 17:20:26 +0100
-Subject: [PATCH] configure: Special case libfreetype test
-
-Include the freetype header, in-directly through a macro, like it
-is done in the drawtext filter. Do not break if the header is moved.
-
-Unfortunately the drawtext filter included the file where the include
-macros are defined in a wrong way. This is not needed and breaks the
-build. Remove that #include line too.
-
-Signed-off-by: Alexander Strasser <eclipse7 at gmx.net>
----
- configure                 |   22 +++++++++++++++++++++-
- libavfilter/vf_drawtext.c |    1 -
- 2 files changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index 205cfc9..0b00684 100755
---- a/configure
-+++ b/configure
-@@ -1128,6 +1128,26 @@ require_pkg_config(){
-     add_extralibs $(get_safe ${pkg}_libs)
- }
- 
-+require_libfreetype(){
-+    log require_libfreetype "$@"
-+    pkg="freetype2"
-+    check_cmd $pkg_config --exists --print-errors $pkg \
-+      || die "ERROR: $pkg not found"
-+    pkg_cflags=$($pkg_config --cflags $pkg)
-+    pkg_libs=$($pkg_config --libs $pkg)
-+    {
-+        echo "#include <ft2build.h>"
-+        echo "#include FT_FREETYPE_H"
-+        echo "long check_func(void) { return (long) FT_Init_FreeType; }"
-+        echo "int main(void) { return 0; }"
-+    } | check_ld "cc" $pkg_cflags $pkg_libs \
-+      && set_safe ${pkg}_cflags $pkg_cflags \
-+      && set_safe ${pkg}_libs   $pkg_libs \
-+      || 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
- }
-@@ -4322,7 +4342,7 @@ enabled libfaac           && require2 libfaac "stdint.h faac.h" faacEncGetVersio
- 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_libfreetype
- 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;
-diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
-index dde3b0a..91b8218 100644
---- a/libavfilter/vf_drawtext.c
-+++ b/libavfilter/vf_drawtext.c
-@@ -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
--- 
-1.7.10.4
-

Copied: ffmpeg/repos/extra-i686/ffmpeg-2.1.1-freetype2.patch (from rev 203680, ffmpeg/trunk/ffmpeg-2.1.1-freetype2.patch)
===================================================================
--- extra-i686/ffmpeg-2.1.1-freetype2.patch	                        (rev 0)
+++ extra-i686/ffmpeg-2.1.1-freetype2.patch	2014-01-14 06:49:49 UTC (rev 203681)
@@ -0,0 +1,73 @@
+From cea5812fa723c08b89d929eeba73462e05de2973 Mon Sep 17 00:00:00 2001
+From: Alexander Strasser <eclipse7 at gmx.net>
+Date: Fri, 6 Dec 2013 17:20:26 +0100
+Subject: [PATCH] configure: Special case libfreetype test
+
+Include the freetype header, in-directly through a macro, like it
+is done in the drawtext filter. Do not break if the header is moved.
+
+Unfortunately the drawtext filter included the file where the include
+macros are defined in a wrong way. This is not needed and breaks the
+build. Remove that #include line too.
+
+Signed-off-by: Alexander Strasser <eclipse7 at gmx.net>
+---
+ configure                 |   22 +++++++++++++++++++++-
+ libavfilter/vf_drawtext.c |    1 -
+ 2 files changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 205cfc9..0b00684 100755
+--- a/configure
++++ b/configure
+@@ -1128,6 +1128,26 @@ require_pkg_config(){
+     add_extralibs $(get_safe ${pkg}_libs)
+ }
+ 
++require_libfreetype(){
++    log require_libfreetype "$@"
++    pkg="freetype2"
++    check_cmd $pkg_config --exists --print-errors $pkg \
++      || die "ERROR: $pkg not found"
++    pkg_cflags=$($pkg_config --cflags $pkg)
++    pkg_libs=$($pkg_config --libs $pkg)
++    {
++        echo "#include <ft2build.h>"
++        echo "#include FT_FREETYPE_H"
++        echo "long check_func(void) { return (long) FT_Init_FreeType; }"
++        echo "int main(void) { return 0; }"
++    } | check_ld "cc" $pkg_cflags $pkg_libs \
++      && set_safe ${pkg}_cflags $pkg_cflags \
++      && set_safe ${pkg}_libs   $pkg_libs \
++      || 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
+ }
+@@ -4322,7 +4342,7 @@ enabled libfaac           && require2 libfaac "stdint.h faac.h" faacEncGetVersio
+ 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_libfreetype
+ 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;
+diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
+index dde3b0a..91b8218 100644
+--- a/libavfilter/vf_drawtext.c
++++ b/libavfilter/vf_drawtext.c
+@@ -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
+-- 
+1.7.10.4
+

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2014-01-14 06:49:40 UTC (rev 203680)
+++ extra-x86_64/PKGBUILD	2014-01-14 06:49:49 UTC (rev 203681)
@@ -1,84 +0,0 @@
-# $Id$
-# Maintainer:  Ionut Biru <ibiru at archlinux.org>
-# Maintainer:  Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-# Contributor: Paul Mattal <paul at archlinux.org>
-
-pkgname=ffmpeg
-pkgver=2.1.1
-pkgrel=3
-epoch=1
-pkgdesc='Complete and free Internet live audio and video broadcasting solution'
-arch=('i686' 'x86_64')
-url='http://ffmpeg.org/'
-license=('GPL')
-depends=(
-      'alsa-lib' 'bzip2' 'fontconfig' 'gnutls' 'gsm' 'lame' 'libass'
-      'libbluray' 'libmodplug' 'libpulse' 'libtheora' 'libva' 'libvorbis' 'libvpx'
-      'opencore-amr' 'openjpeg' 'opus' 'rtmpdump' 'schroedinger' 'sdl' 'speex'
-      'v4l-utils' 'x264' 'xvidcore' 'zlib'
-      )
-makedepends=('libvdpau' 'yasm')
-source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2
-        ffmpeg-2.1.1-freetype2.patch)
-md5sums=('2719ab2b3311ac3775b9cdeb66c54849'
-         '4b5dd079a40f44f4e0d00cdbc9d52ec3')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 -i ../ffmpeg-2.1.1-freetype2.patch
-}
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure \
-    --prefix=/usr \
-    --disable-debug \
-    --disable-static \
-    --enable-avresample \
-    --enable-dxva2 \
-    --enable-fontconfig \
-    --enable-gnutls \
-    --enable-gpl \
-    --enable-libass \
-    --enable-libbluray \
-    --enable-libfreetype \
-    --enable-libgsm \
-    --enable-libmodplug \
-    --enable-libmp3lame \
-    --enable-libopencore_amrnb \
-    --enable-libopencore_amrwb \
-    --enable-libopenjpeg \
-    --enable-libopus \
-    --enable-libpulse \
-    --enable-librtmp \
-    --enable-libschroedinger \
-    --enable-libspeex \
-    --enable-libtheora \
-    --enable-libv4l2 \
-    --enable-libvorbis \
-    --enable-libvpx \
-    --enable-libx264 \
-    --enable-libxvid \
-    --enable-pic \
-    --enable-postproc \
-    --enable-runtime-cpudetect \
-    --enable-shared \
-    --enable-swresample \
-    --enable-vdpau \
-    --enable-version3 \
-    --enable-x11grab
-
-  make
-  make tools/qt-faststart
-  make doc/ff{mpeg,play,server}.1
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install install-man
-  install -Dm755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart
-}
-
-# vim:set ts=2 sw=2 et:

Copied: ffmpeg/repos/extra-x86_64/PKGBUILD (from rev 203680, ffmpeg/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2014-01-14 06:49:49 UTC (rev 203681)
@@ -0,0 +1,77 @@
+# $Id$
+# Maintainer:  Ionut Biru <ibiru at archlinux.org>
+# Maintainer:  Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+# Contributor: Paul Mattal <paul at archlinux.org>
+
+pkgname=ffmpeg
+pkgver=2.1.2
+pkgrel=1
+epoch=1
+pkgdesc='Complete and free Internet live audio and video broadcasting solution'
+arch=('i686' 'x86_64')
+url='http://ffmpeg.org/'
+license=('GPL')
+depends=(
+      'alsa-lib' 'bzip2' 'fontconfig' 'gnutls' 'gsm' 'lame' 'libass'
+      'libbluray' 'libmodplug' 'libpulse' 'libtheora' 'libva' 'libvorbis' 'libvpx'
+      'opencore-amr' 'openjpeg' 'opus' 'rtmpdump' 'schroedinger' 'sdl' 'speex'
+      'v4l-utils' 'x264' 'xvidcore' 'zlib'
+      )
+makedepends=('libvdpau' 'yasm')
+source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2)
+md5sums=('4c41fefca609c6ef0dfd539826783e73')
+
+build() {
+  cd $pkgname-$pkgver
+
+  ./configure \
+    --prefix=/usr \
+    --disable-debug \
+    --disable-static \
+    --enable-avresample \
+    --enable-dxva2 \
+    --enable-fontconfig \
+    --enable-gnutls \
+    --enable-gpl \
+    --enable-libass \
+    --enable-libbluray \
+    --enable-libfreetype \
+    --enable-libgsm \
+    --enable-libmodplug \
+    --enable-libmp3lame \
+    --enable-libopencore_amrnb \
+    --enable-libopencore_amrwb \
+    --enable-libopenjpeg \
+    --enable-libopus \
+    --enable-libpulse \
+    --enable-librtmp \
+    --enable-libschroedinger \
+    --enable-libspeex \
+    --enable-libtheora \
+    --enable-libv4l2 \
+    --enable-libvorbis \
+    --enable-libvpx \
+    --enable-libx264 \
+    --enable-libxvid \
+    --enable-pic \
+    --enable-postproc \
+    --enable-runtime-cpudetect \
+    --enable-shared \
+    --enable-swresample \
+    --enable-vdpau \
+    --enable-version3 \
+    --enable-x11grab
+
+  make
+  make tools/qt-faststart
+  make doc/ff{mpeg,play,server}.1
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install install-man
+  install -Dm755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: extra-x86_64/ffmpeg-2.1.1-freetype2.patch
===================================================================
--- extra-x86_64/ffmpeg-2.1.1-freetype2.patch	2014-01-14 06:49:40 UTC (rev 203680)
+++ extra-x86_64/ffmpeg-2.1.1-freetype2.patch	2014-01-14 06:49:49 UTC (rev 203681)
@@ -1,73 +0,0 @@
-From cea5812fa723c08b89d929eeba73462e05de2973 Mon Sep 17 00:00:00 2001
-From: Alexander Strasser <eclipse7 at gmx.net>
-Date: Fri, 6 Dec 2013 17:20:26 +0100
-Subject: [PATCH] configure: Special case libfreetype test
-
-Include the freetype header, in-directly through a macro, like it
-is done in the drawtext filter. Do not break if the header is moved.
-
-Unfortunately the drawtext filter included the file where the include
-macros are defined in a wrong way. This is not needed and breaks the
-build. Remove that #include line too.
-
-Signed-off-by: Alexander Strasser <eclipse7 at gmx.net>
----
- configure                 |   22 +++++++++++++++++++++-
- libavfilter/vf_drawtext.c |    1 -
- 2 files changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index 205cfc9..0b00684 100755
---- a/configure
-+++ b/configure
-@@ -1128,6 +1128,26 @@ require_pkg_config(){
-     add_extralibs $(get_safe ${pkg}_libs)
- }
- 
-+require_libfreetype(){
-+    log require_libfreetype "$@"
-+    pkg="freetype2"
-+    check_cmd $pkg_config --exists --print-errors $pkg \
-+      || die "ERROR: $pkg not found"
-+    pkg_cflags=$($pkg_config --cflags $pkg)
-+    pkg_libs=$($pkg_config --libs $pkg)
-+    {
-+        echo "#include <ft2build.h>"
-+        echo "#include FT_FREETYPE_H"
-+        echo "long check_func(void) { return (long) FT_Init_FreeType; }"
-+        echo "int main(void) { return 0; }"
-+    } | check_ld "cc" $pkg_cflags $pkg_libs \
-+      && set_safe ${pkg}_cflags $pkg_cflags \
-+      && set_safe ${pkg}_libs   $pkg_libs \
-+      || 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
- }
-@@ -4322,7 +4342,7 @@ enabled libfaac           && require2 libfaac "stdint.h faac.h" faacEncGetVersio
- 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_libfreetype
- 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;
-diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
-index dde3b0a..91b8218 100644
---- a/libavfilter/vf_drawtext.c
-+++ b/libavfilter/vf_drawtext.c
-@@ -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
--- 
-1.7.10.4
-

Copied: ffmpeg/repos/extra-x86_64/ffmpeg-2.1.1-freetype2.patch (from rev 203680, ffmpeg/trunk/ffmpeg-2.1.1-freetype2.patch)
===================================================================
--- extra-x86_64/ffmpeg-2.1.1-freetype2.patch	                        (rev 0)
+++ extra-x86_64/ffmpeg-2.1.1-freetype2.patch	2014-01-14 06:49:49 UTC (rev 203681)
@@ -0,0 +1,73 @@
+From cea5812fa723c08b89d929eeba73462e05de2973 Mon Sep 17 00:00:00 2001
+From: Alexander Strasser <eclipse7 at gmx.net>
+Date: Fri, 6 Dec 2013 17:20:26 +0100
+Subject: [PATCH] configure: Special case libfreetype test
+
+Include the freetype header, in-directly through a macro, like it
+is done in the drawtext filter. Do not break if the header is moved.
+
+Unfortunately the drawtext filter included the file where the include
+macros are defined in a wrong way. This is not needed and breaks the
+build. Remove that #include line too.
+
+Signed-off-by: Alexander Strasser <eclipse7 at gmx.net>
+---
+ configure                 |   22 +++++++++++++++++++++-
+ libavfilter/vf_drawtext.c |    1 -
+ 2 files changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 205cfc9..0b00684 100755
+--- a/configure
++++ b/configure
+@@ -1128,6 +1128,26 @@ require_pkg_config(){
+     add_extralibs $(get_safe ${pkg}_libs)
+ }
+ 
++require_libfreetype(){
++    log require_libfreetype "$@"
++    pkg="freetype2"
++    check_cmd $pkg_config --exists --print-errors $pkg \
++      || die "ERROR: $pkg not found"
++    pkg_cflags=$($pkg_config --cflags $pkg)
++    pkg_libs=$($pkg_config --libs $pkg)
++    {
++        echo "#include <ft2build.h>"
++        echo "#include FT_FREETYPE_H"
++        echo "long check_func(void) { return (long) FT_Init_FreeType; }"
++        echo "int main(void) { return 0; }"
++    } | check_ld "cc" $pkg_cflags $pkg_libs \
++      && set_safe ${pkg}_cflags $pkg_cflags \
++      && set_safe ${pkg}_libs   $pkg_libs \
++      || 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
+ }
+@@ -4322,7 +4342,7 @@ enabled libfaac           && require2 libfaac "stdint.h faac.h" faacEncGetVersio
+ 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_libfreetype
+ 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;
+diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
+index dde3b0a..91b8218 100644
+--- a/libavfilter/vf_drawtext.c
++++ b/libavfilter/vf_drawtext.c
+@@ -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
+-- 
+1.7.10.4
+




More information about the arch-commits mailing list