Mon Dec 30 03:31:50 UTC 2013

6 files changed, 77 insertions, 86 deletions

diff --git a/extra/ffmpeg-compat/PKGBUILD b/extra/ffmpeg-compat/PKGBUILD
index 588e55dc9..5231f60fc 100644
--- a/extra/ffmpeg-compat/PKGBUILD
+++ b/extra/ffmpeg-compat/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 200640 2013-11-30 13:28:00Z bpiotrowski $
+# $Id: PKGBUILD 202972 2013-12-29 17:17:30Z bpiotrowski $
 # Maintainer:  Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=ffmpeg-compat
 pkgver=0.10.10
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc='Complete and free Internet live audio and video broadcasting solution'
 arch=('i686' 'x86_64')
@@ -20,8 +20,15 @@ depends=(
       'v4l-utils' 'x264' 'xvidcore' 'zlib'
       )
 makedepends=('libvdpau' 'yasm')
-source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2)
-sha256sums=('936058d7579bfc431b13d47c3f63ee25a0160d4c73cc0fa04fef97cd2394cb91')
+source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2
+        ffmpeg-0.10.10-freetype2.patch)
+sha256sums=('936058d7579bfc431b13d47c3f63ee25a0160d4c73cc0fa04fef97cd2394cb91'
+            '05cf516b292c3815ecaaf72f12c0c73891b62b47d83f5d81f09380949e691988')
+
+prepare() {
+  cd ffmpeg-$pkgver
+  patch -p1 -i ../ffmpeg-0.10.10-freetype2.patch
+}
 
 build() {
   cd ffmpeg-$pkgver
diff --git a/extra/ffmpeg-compat/ffmpeg-0.10.10-freetype2.patch b/extra/ffmpeg-compat/ffmpeg-0.10.10-freetype2.patch
new file mode 100644
index 000000000..1e8cc6547
--- /dev/null
+++ b/extra/ffmpeg-compat/ffmpeg-0.10.10-freetype2.patch
@@ -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
+ 
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index 0c548149f..eec7de9aa 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 201402 2013-12-10 17:38:51Z bpiotrowski $
+# $Id: PKGBUILD 202971 2013-12-29 17:17:29Z bpiotrowski $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -6,7 +6,7 @@
 
 pkgname=ffmpeg
 pkgver=2.1.1
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc='Complete and free Internet live audio and video broadcasting solution'
 arch=('i686' 'x86_64')
diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD
deleted file mode 100644
index 6a8d51a77..000000000
--- a/extra/libmtp/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 198802 2013-11-04 17:57:04Z andyrtr $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
-
-pkgname=libmtp
-pkgver=1.1.6
-pkgrel=3
-pkgdesc="Library implementation of the Media Transfer Protocol"
-arch=("i686" "x86_64")
-url="http://libmtp.sourceforge.net"
-license=('LGPL')
-depends=('libusb' 'libgcrypt')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('87835626dbcf39e62bfcdd4ae6da2063')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr --with-udev=/usr/lib/udev
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make -k check
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  
-  # fix broken udev rule
-  sed -i "/^Unable to open/d" ${pkgdir}/usr/lib/udev/rules.d/69-libmtp.rules
-}
diff --git a/extra/rasqal/PKGBUILD b/extra/rasqal/PKGBUILD
deleted file mode 100644
index f6713531d..000000000
--- a/extra/rasqal/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 198396 2013-10-30 14:37:02Z allan $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: AndyRTR <andyrtr@archlinux.org>
-# Contributor: Lawrence Lee <valheru@facticius.net>
-
-pkgname=rasqal
-epoch=1
-pkgver=0.9.30
-pkgrel=1
-pkgdesc="A free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings"
-url="http://librdf.org/rasqal"
-license=('GPL' 'LGPL')
-arch=('i686' 'x86_64')
-depends=('raptor' 'mpfr' 'util-linux')
-source=(http://download.librdf.org/source/${pkgname}-${pkgver}.tar.gz)
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--disable-static \
-	--enable-release
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make -k check || true # still fails some checks
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
-md5sums=('b12c5f9cfdb6b04efce5a4a186b8416b')
diff --git a/extra/rtmpdump/PKGBUILD b/extra/rtmpdump/PKGBUILD
index d88e4fe08..615219801 100644
--- a/extra/rtmpdump/PKGBUILD
+++ b/extra/rtmpdump/PKGBUILD
@@ -1,27 +1,29 @@
-# $Id: PKGBUILD 197306 2013-10-25 02:06:12Z bisson $
-# Maintainer:
+# $Id: PKGBUILD 202973 2013-12-29 17:17:31Z bpiotrowski $
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: xduugu
 # Contributor: Elis Hughes <elishughes@googlemail.com>
 
 pkgname=rtmpdump
-pkgver=20121230
-pkgrel=3
-pkgdesc="A tool to download rtmp streams"
+pkgver=20131205
+pkgrel=1
+pkgdesc='Tool to download rtmp streams'
 arch=('i686' 'x86_64')
-url="http://rtmpdump.mplayerhq.hu/"
+url='http://rtmpdump.mplayerhq.hu/'
 license=('GPL2' 'LGPL2.1')
 depends=('openssl')
+makedepends=('git')
 options=('!makeflags')
-#git://git.ffmpeg.org/rtmpdump 
-source=(ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-git-$pkgver.tar.xz)
-sha256sums=('2612ccbc041281c90d1fa59d20aec783fa3ef29de952323d8d89699fc3d5c4d2')
+source=(git://git.ffmpeg.org/rtmpdump#commit=dc76f0a8)
+md5sums=('SKIP')
 
 build() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   make
 }
 
 package() {
-  cd $pkgname-$pkgver
-  make prefix=/usr sbindir=/usr/bin mandir=/usr/share/man DESTDIR="$pkgdir" install
+  cd $pkgname
+  make prefix=/usr sbindir=/usr/bin \
+    mandir=/usr/share/man DESTDIR="$pkgdir" \
+    install
 }