Date: Monday, March 24, 2014 @ 09:59:44 Author: bpiotrowski Revision: 208536
archrelease: copy trunk to staging-i686, staging-x86_64 Added: ffmpeg-compat/repos/staging-i686/ ffmpeg-compat/repos/staging-i686/PKGBUILD (from rev 208535, ffmpeg-compat/trunk/PKGBUILD) ffmpeg-compat/repos/staging-i686/ffmpeg-0.10.10-freetype2.patch (from rev 208535, ffmpeg-compat/trunk/ffmpeg-0.10.10-freetype2.patch) ffmpeg-compat/repos/staging-x86_64/ ffmpeg-compat/repos/staging-x86_64/PKGBUILD (from rev 208535, ffmpeg-compat/trunk/PKGBUILD) ffmpeg-compat/repos/staging-x86_64/ffmpeg-0.10.10-freetype2.patch (from rev 208535, ffmpeg-compat/trunk/ffmpeg-0.10.10-freetype2.patch) -----------------------------------------------+ staging-i686/PKGBUILD | 80 ++++++++++++++++++++++++ staging-i686/ffmpeg-0.10.10-freetype2.patch | 50 +++++++++++++++ staging-x86_64/PKGBUILD | 80 ++++++++++++++++++++++++ staging-x86_64/ffmpeg-0.10.10-freetype2.patch | 50 +++++++++++++++ 4 files changed, 260 insertions(+) Copied: ffmpeg-compat/repos/staging-i686/PKGBUILD (from rev 208535, ffmpeg-compat/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2014-03-24 08:59:44 UTC (rev 208536) @@ -0,0 +1,80 @@ +# $Id$ +# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Ionut Biru <ib...@archlinux.org> +# Contributor: Tom Newsom <jeeps...@gmx.co.uk> +# Contributor: Paul Mattal <p...@archlinux.org> + +pkgname=ffmpeg-compat +pkgver=0.10.12 +pkgrel=2 +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' 'gsm' 'lame' 'libass' + 'libmodplug' 'libpulse' 'libtheora' 'libva' 'libvorbis' 'libvpx' + 'opencore-amr' 'openjpeg' 'rtmpdump' 'schroedinger' 'sdl' 'speex' + 'v4l-utils' 'x264' 'xvidcore' 'zlib' + ) +makedepends=('libvdpau' 'yasm') +source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2 + ffmpeg-0.10.10-freetype2.patch) +sha256sums=('118d82ca182871a9599202362106f03348dc335e2aec7d998d1f59ede3a8db02' + '05cf516b292c3815ecaaf72f12c0c73891b62b47d83f5d81f09380949e691988') + +prepare() { + cd ffmpeg-$pkgver + patch -p1 -i ../ffmpeg-0.10.10-freetype2.patch +} + +build() { + cd ffmpeg-$pkgver + + CFLAGS+=" -I/usr/include/openjpeg-1.5" \ + ./configure \ + --prefix=/usr \ + --incdir=/usr/include/ffmpeg-compat \ + --libdir=/usr/lib/ffmpeg-compat \ + --shlibdir=/usr/lib/ffmpeg-compat \ + --disable-debug \ + --disable-static \ + --enable-gpl \ + --enable-libass \ + --enable-libfreetype \ + --enable-libgsm \ + --enable-libmodplug \ + --enable-libmp3lame \ + --enable-libopencore_amrnb \ + --enable-libopencore_amrwb \ + --enable-libopenjpeg \ + --enable-libpulse \ + --enable-librtmp \ + --enable-libschroedinger \ + --enable-libspeex \ + --enable-libtheora \ + --enable-libv4l2 \ + --enable-libvorbis \ + --enable-libvpx \ + --enable-libx264 \ + --enable-libxvid \ + --enable-postproc \ + --enable-runtime-cpudetect \ + --enable-shared \ + --enable-vdpau \ + --enable-version3 \ + --enable-x11grab + + make +} + +package() { + cd ffmpeg-$pkgver + make DESTDIR="$pkgdir" install + rm -rf "$pkgdir"/usr/{bin,share} + + install -dm755 "$pkgdir"/etc/ld.so.conf.d/ + echo -e '/usr/lib/\n/usr/lib/ffmpeg-compat/' > "$pkgdir"/etc/ld.so.conf.d/$pkgname.conf +} Copied: ffmpeg-compat/repos/staging-i686/ffmpeg-0.10.10-freetype2.patch (from rev 208535, ffmpeg-compat/trunk/ffmpeg-0.10.10-freetype2.patch) =================================================================== --- staging-i686/ffmpeg-0.10.10-freetype2.patch (rev 0) +++ staging-i686/ffmpeg-0.10.10-freetype2.patch 2014-03-24 08:59:44 UTC (rev 208536) @@ -0,0 +1,50 @@ +diff -rupN a/configure b/configure +--- a/configure 2013-11-06 00:55:13.000000000 +0000 ++++ b/configure 2013-12-28 22:06:00.925551644 +0000 +@@ -943,6 +943,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) ++} ++ + check_host_cc(){ + log check_host_cc "$@" + cat > $TMPC +@@ -3134,7 +3154,7 @@ enabled libdirac && require_pkg_config + "libdirac_decoder/dirac_parser.h libdirac_encoder/dirac_encoder.h" \ + "dirac_decoder_init dirac_encoder_init" + enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac +-enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType ++enabled libfreetype && require_libfreetype + enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm + enabled libmodplug && require libmodplug libmodplug/modplug.h ModPlug_Load -lmodplug + enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame +diff -rupN a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c +--- a/libavfilter/vf_drawtext.c 2013-11-06 00:55:16.000000000 +0000 ++++ b/libavfilter/vf_drawtext.c 2013-12-28 22:06:16.495450750 +0000 +@@ -47,7 +47,6 @@ + #undef time + + #include <ft2build.h> +-#include <freetype/config/ftheader.h> + #include FT_FREETYPE_H + #include FT_GLYPH_H + Copied: ffmpeg-compat/repos/staging-x86_64/PKGBUILD (from rev 208535, ffmpeg-compat/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2014-03-24 08:59:44 UTC (rev 208536) @@ -0,0 +1,80 @@ +# $Id$ +# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Ionut Biru <ib...@archlinux.org> +# Contributor: Tom Newsom <jeeps...@gmx.co.uk> +# Contributor: Paul Mattal <p...@archlinux.org> + +pkgname=ffmpeg-compat +pkgver=0.10.12 +pkgrel=2 +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' 'gsm' 'lame' 'libass' + 'libmodplug' 'libpulse' 'libtheora' 'libva' 'libvorbis' 'libvpx' + 'opencore-amr' 'openjpeg' 'rtmpdump' 'schroedinger' 'sdl' 'speex' + 'v4l-utils' 'x264' 'xvidcore' 'zlib' + ) +makedepends=('libvdpau' 'yasm') +source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2 + ffmpeg-0.10.10-freetype2.patch) +sha256sums=('118d82ca182871a9599202362106f03348dc335e2aec7d998d1f59ede3a8db02' + '05cf516b292c3815ecaaf72f12c0c73891b62b47d83f5d81f09380949e691988') + +prepare() { + cd ffmpeg-$pkgver + patch -p1 -i ../ffmpeg-0.10.10-freetype2.patch +} + +build() { + cd ffmpeg-$pkgver + + CFLAGS+=" -I/usr/include/openjpeg-1.5" \ + ./configure \ + --prefix=/usr \ + --incdir=/usr/include/ffmpeg-compat \ + --libdir=/usr/lib/ffmpeg-compat \ + --shlibdir=/usr/lib/ffmpeg-compat \ + --disable-debug \ + --disable-static \ + --enable-gpl \ + --enable-libass \ + --enable-libfreetype \ + --enable-libgsm \ + --enable-libmodplug \ + --enable-libmp3lame \ + --enable-libopencore_amrnb \ + --enable-libopencore_amrwb \ + --enable-libopenjpeg \ + --enable-libpulse \ + --enable-librtmp \ + --enable-libschroedinger \ + --enable-libspeex \ + --enable-libtheora \ + --enable-libv4l2 \ + --enable-libvorbis \ + --enable-libvpx \ + --enable-libx264 \ + --enable-libxvid \ + --enable-postproc \ + --enable-runtime-cpudetect \ + --enable-shared \ + --enable-vdpau \ + --enable-version3 \ + --enable-x11grab + + make +} + +package() { + cd ffmpeg-$pkgver + make DESTDIR="$pkgdir" install + rm -rf "$pkgdir"/usr/{bin,share} + + install -dm755 "$pkgdir"/etc/ld.so.conf.d/ + echo -e '/usr/lib/\n/usr/lib/ffmpeg-compat/' > "$pkgdir"/etc/ld.so.conf.d/$pkgname.conf +} Copied: ffmpeg-compat/repos/staging-x86_64/ffmpeg-0.10.10-freetype2.patch (from rev 208535, ffmpeg-compat/trunk/ffmpeg-0.10.10-freetype2.patch) =================================================================== --- staging-x86_64/ffmpeg-0.10.10-freetype2.patch (rev 0) +++ staging-x86_64/ffmpeg-0.10.10-freetype2.patch 2014-03-24 08:59:44 UTC (rev 208536) @@ -0,0 +1,50 @@ +diff -rupN a/configure b/configure +--- a/configure 2013-11-06 00:55:13.000000000 +0000 ++++ b/configure 2013-12-28 22:06:00.925551644 +0000 +@@ -943,6 +943,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) ++} ++ + check_host_cc(){ + log check_host_cc "$@" + cat > $TMPC +@@ -3134,7 +3154,7 @@ enabled libdirac && require_pkg_config + "libdirac_decoder/dirac_parser.h libdirac_encoder/dirac_encoder.h" \ + "dirac_decoder_init dirac_encoder_init" + enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac +-enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType ++enabled libfreetype && require_libfreetype + enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm + enabled libmodplug && require libmodplug libmodplug/modplug.h ModPlug_Load -lmodplug + enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame +diff -rupN a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c +--- a/libavfilter/vf_drawtext.c 2013-11-06 00:55:16.000000000 +0000 ++++ b/libavfilter/vf_drawtext.c 2013-12-28 22:06:16.495450750 +0000 +@@ -47,7 +47,6 @@ + #undef time + + #include <ft2build.h> +-#include <freetype/config/ftheader.h> + #include FT_FREETYPE_H + #include FT_GLYPH_H +