Merge remote-tracking branch 'origin/testing' into testing

gstreamer0.10-bad/PKGBUILD

@@ -6,8 +6,8 @@
 pkgbase=gstreamer0.10-bad
 pkgname=('gstreamer0.10-bad' 'gstreamer0.10-bad-plugins')
 pkgver=0.10.23
-pkgrel=5
+pkgrel=6
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('LGPL' 'GPL')
 makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 
 	     'neon' 'faac' 'libmusicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 

gstreamer0.10-base/PKGBUILD

@@ -6,8 +6,8 @@
 pkgbase=('gstreamer0.10-base')
 pkgname=('gstreamer0.10-base' 'gstreamer0.10-base-plugins')
 pkgver=0.10.36
-pkgrel=3
+pkgrel=4
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('LGPL')
 makedepends=('pkgconfig' "gstreamer0.10>=${pkgver}" 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection')
 options=(!libtool !emptydirs)

gstreamer0.10-ffmpeg/PKGBUILD

@@ -1,19 +1,18 @@
 # Chakra Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer abveritas[at]chakra-project[dot]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=gstreamer0.10-ffmpeg
 pkgver=0.10.11
-pkgrel=3
+pkgrel=4
 pkgdesc="Gstreamer FFMpeg Plugin"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('GPL')
 depends=('gstreamer0.10-base>=0.10.34' 'bzip2')
 makedepends=('pkgconfig')
 url="http://www.gstreamer.net"
 groups=('gstreamer0.10-plugins')
-source=(http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-${pkgver}.tar.bz2)
+source=("http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-${pkgver}.tar.bz2")
 md5sums=('0d23197ba7ac06ea34fa66d38469ebe5')
 
 build() {
@@ -21,7 +20,11 @@ build() {
   unset CFLAGS
   unset CXXFLAGS
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static --with-ffmpeg-extra-configure="--enable-runtime-cpudetect"
-  make || return 1
+  make
-  make DESTDIR="${pkgdir}" install || return 1
+}
+
+package() {
+  cd "${srcdir}/gst-ffmpeg-${pkgver}"
+  make DESTDIR="${pkgdir}" install 
   rm -f ${pkgdir}/usr/lib/gstreamer-0.10/*.{l,}a
 }

gstreamer0.10-python/PKGBUILD

@@ -5,7 +5,7 @@
 
 pkgname=gstreamer0.10-python
 pkgver=0.10.22
-pkgrel=6
+pkgrel=7
 pkgdesc="Python bindings for GStreamer 0.10"
 arch=('i686' 'x86_64')
 license=('LGPL')

gstreamer0.10-ugly/PKGBUILD

@@ -6,7 +6,7 @@
 pkgbase=gstreamer0.10-ugly
 pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins')
 pkgver=0.10.19
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('LGPL')
 makedepends=('pkgconfig' 'gstreamer0.10-base' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 

libcaca/PKGBUILD

@@ -1,23 +1,28 @@
-# $Id: PKGBUILD 71245 2010-03-05 16:17:11Z jgc $
+# Platform Packages for Chakra, part of chakra-project.org
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+#
+# maintainer abveritas@chakra-project.org
 
 pkgname=libcaca
-pkgver=0.99.beta17
+pkgver=0.99.beta18
 pkgrel=1
 pkgdesc="Color AsCii Art library"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('LGPL')
-url="http://libcaca.zoy.org/"
+url="http://caca.zoy.org/wiki/libcaca"
-depends=('imlib2' 'ncurses>=5.7')
+depends=('imlib2' 'ncurses')
 options=(!libtool !emptydirs)
-source=(http://libcaca.zoy.org/files/libcaca/${pkgname}-${pkgver}.tar.gz)
+source=("http://libcaca.zoy.org/files/libcaca/${pkgname}-${pkgver}.tar.gz")
-md5sums=('790d6e26b7950e15909fdbeb23a7ea87')
+md5sums=('93d35dbdb0527d4c94df3e9a02e865cc')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --mandir=/usr/share/man \
     --enable-shared --disable-doc \
-    --disable-cxx --disable-gl --disable-csharp || return 1
+    --disable-cxx --disable-gl --disable-csharp
-  make || return 1
+  make
-  make DESTDIR="${pkgdir}" install || return 1
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }

poppler/PKGBUILD

@@ -2,22 +2,17 @@
 # Chakra Packages for Chakra, part of chakra-project.org
 #
 # Maintainer: Fabian Kosmale <0inkane@googlemail.com>
-# Contributor (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# Contributor (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt')
 pkgver=0.20.2
-pkgrel=1
+pkgrel=2
-arch=("i686" "x86_64")
+arch=('x86_64')
 license=('GPL')
 makedepends=('libjpeg-turbo' 'gcc-libs' 'cairo' 'libxml2' 'fontconfig' 'openjpeg' 'qt' 'pkgconfig' 'lcms')
 options=('!libtool')
 url="http://poppler.freedesktop.org/"
-source=(http://poppler.freedesktop.org/${pkgname}-${pkgver}.tar.gz)
+source=("http://poppler.freedesktop.org/${pkgname}-${pkgver}.tar.gz")
 md5sums=('45dd2c16c8c4d1a39e830e45745c4e25')
 
 

qt/PKGBUILD

@@ -6,7 +6,7 @@
 pkgbase=qt
 pkgname=('qt' 'qt-private-headers')
 pkgver=4.8.3
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://qt.nokia.com/'
 license=('GPL3' 'LGPL')