From aa24f35a4f8c5d5e7f203d60bab0e16bda3ef40d Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 4 Aug 2011 16:31:24 -0500
Subject: celt-0.7: Initial inclusion. Dep of jack.

---
 abs/extra/celt-0.7/PKGBUILD | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 abs/extra/celt-0.7/PKGBUILD

diff --git a/abs/extra/celt-0.7/PKGBUILD b/abs/extra/celt-0.7/PKGBUILD
new file mode 100644
index 0000000..59b9e9c
--- /dev/null
+++ b/abs/extra/celt-0.7/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Lauri Niskanen <ape@ape3000.com>
+
+pkgname=celt-0.7
+_realname=celt
+pkgver=0.7.1
+pkgrel=2
+pkgdesc="Low-latency audio communication codec"
+arch=('i686' 'x86_64')
+url="http://www.celt-codec.org"
+license=('BSD')
+depends=('libogg')
+provides=('celt=$pkgver')
+conflicts=('celt')
+options=('!libtool')
+source=(http://downloads.xiph.org/releases/celt/$_realname-$pkgver.tar.gz)
+md5sums=('c7f6b8346e132b1a48dae0eff77ea9f0')
+
+build() {
+  cd "$srcdir/$_realname-$pkgver"
+
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="$pkgdir/" install
+}
+
+package() {
+	cd "$srcdir/$_realname-$pkgver"
+
+  install -Dm644 COPYING \
+    "$pkgdir/usr/share/licenses/$pkgname/BSD"
+}
+
+# vim:set ts=2 sw=2 et:
-- 
cgit v0.12


From 27b46664045c2aab50de79ace14901874288e6ab Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 4 Aug 2011 16:38:07 -0500
Subject: jack: Bump to latest.

---
 abs/core/jack/PKGBUILD       | 36 +++++++++++++++++++-----------------
 abs/core/jack/jack.changelog | 10 ++++++++--
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/abs/core/jack/PKGBUILD b/abs/core/jack/PKGBUILD
index 14cb175..e9f7898 100644
--- a/abs/core/jack/PKGBUILD
+++ b/abs/core/jack/PKGBUILD
@@ -1,37 +1,39 @@
-# $Id: PKGBUILD 86981 2010-08-08 11:15:35Z schiv $
-# Maintainer: tobias <tobias@archlinux.net>
-# Maintainer: Ray Rashif <schivmeister@gmail.com>
+# $Id$
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: tobias <tobias@archlinux.net>
 # Contributor: Robert Emil Berge <robert@rebi.no>
 
 pkgname=jack
 _longname=jack-audio-connection-kit
-pkgver=0.118.0
-pkgrel=4
+pkgver=0.121.2
+pkgrel=2
 pkgdesc="A low-latency audio server"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
-depends=('libsamplerate')
-makedepends=('doxygen' 'libffado')
-optdepends=('libffado: FireWire support')
+depends=('libsamplerate' 'readline')
+makedepends=('doxygen' 'libffado' 'celt-0.7')
+optdepends=('libffado: FireWire support'
+            'celt-0.7: NetJACK driver')
 url="http://jackaudio.org/"
 options=('!libtool')
-provides=("${_longname}=${pkgver}")
-replaces=("${_longname}")
+provides=("$_longname=$pkgver")
+replaces=("$_longname")
 changelog=$pkgname.changelog
-source=(http://jackaudio.org/downloads/${_longname}-${pkgver}.tar.gz)
-md5sums=('d58e29a55f285d54e75134cec8e02a10')
+source=("http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz")
+md5sums=('06c080349455afd4d217d6a8f9393e01')
 
 build() {
-  cd ${srcdir}/${_longname}-${pkgver}
+  cd "$srcdir/$_longname-$pkgver"
 
-  ./configure --prefix=/usr --libdir=/usr/lib
-  make || return 1
+  ./configure --prefix=/usr \
+              --libdir=/usr/lib
+  make
 }
 
 package() {
-  cd ${srcdir}/${_longname}-${pkgver}
+  cd "$srcdir/$_longname-$pkgver"
 
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/abs/core/jack/jack.changelog b/abs/core/jack/jack.changelog
index 6ad096e..54b9df6 100644
--- a/abs/core/jack/jack.changelog
+++ b/abs/core/jack/jack.changelog
@@ -1,7 +1,12 @@
-8 Aug 2010 (GMT+8) Ray Rashif <schivmeister@gmail.com>
+29 Jul 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
+
+	* 0.121.2-2:
+	Added celt support with celt-0.7 from community
+	Will not bring celt to extra as it's very unstable
+
+8 Aug 2010 (GMT+8) Ray Rashif <schiv@archlinux.org>
 
 	* 0.118.0-4 :
-	Testing build.
 	Built against libffado
 		- for FireWire support (see FS#19626)
 	Removed init scripts (no longer in tarball; unsupported).
@@ -13,3 +18,4 @@
 
 	* jack.changelog :
 	Added this changelog.
+	Only important changes will be logged.
-- 
cgit v0.12


From e26d2a72d84f0b0ca0370ffa09ca10d465b96079 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 4 Aug 2011 16:41:18 -0500
Subject: libass: Initial inclusion. Dep of mplayer

---
 abs/extra/libass/PKGBUILD | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 abs/extra/libass/PKGBUILD

diff --git a/abs/extra/libass/PKGBUILD b/abs/extra/libass/PKGBUILD
new file mode 100644
index 0000000..508e232
--- /dev/null
+++ b/abs/extra/libass/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
+
+pkgname=libass
+pkgver=0.9.13
+pkgrel=1
+pkgdesc="A portable library for SSA/ASS subtitles rendering"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/libass/"
+license=('BSD')
+depends=('enca' 'fontconfig' 'libpng')
+makedepends=('pkgconfig')
+options=(!libtool)
+source=("http://libass.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
+md5sums=('d99381922dcbeb7a766d2e7825cca193')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
-- 
cgit v0.12


From 18d5b0d34e3319ff989588a36165b95d3d45683c Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 4 Aug 2011 17:10:40 -0500
Subject: mplayer: Bump to latest. refs #647

---
 abs/core/mplayer/PKGBUILD        | 107 +++++++++++++++++++++++----------------
 abs/core/mplayer/__changlog      |   1 +
 abs/core/mplayer/mplayer.desktop |   2 +-
 abs/core/mplayer/mplayer.install |  11 ++++
 4 files changed, 75 insertions(+), 46 deletions(-)
 create mode 100644 abs/core/mplayer/__changlog
 create mode 100644 abs/core/mplayer/mplayer.install

diff --git a/abs/core/mplayer/PKGBUILD b/abs/core/mplayer/PKGBUILD
index 945a798..27cd4fb 100644
--- a/abs/core/mplayer/PKGBUILD
+++ b/abs/core/mplayer/PKGBUILD
@@ -1,55 +1,72 @@
-# $Id: PKGBUILD 97113 2010-10-26 14:11:03Z ibiru $
+# $Id$
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
-pkgname=mplayer
-pkgver=32492
+pkgbase=mplayer
+pkgname=('mplayer' 'mencoder')
+pkgver=33805
 pkgrel=2
-pkgdesc="A movie player for linux"
 arch=('i686' 'x86_64')
-depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss'
-         'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faac' 'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'libvdpau>=0.4'
-         'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx')
+makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
+'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
+'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass')
 license=('GPL')
 url="http://www.mplayerhq.hu/"
-makedepends=('unzip' 'mesa' 'live-media>=2010.01.13' 'yasm')
-backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz mplayer.desktop mplayer.png)
-md5sums=('01beb068608d3977fbb84b0b28935cee'
-         '647b9f4ab5284a7fef3f84f992214e77'
-         'd00874ccc644b7f43d6ef1c942fcef28')
+options=(!buildflags !emptydirs)
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz mplayer.desktop)
+md5sums=('512a0309ba5979a41ae93b740f4592f4'
+         'c0d6ef795cf6de48e3b87ff7c23f0319')
 
 build() {
-  # Custom CFLAGS break the mplayer build
-  unset CFLAGS LDFLAGS
-
-  cd ${srcdir}/${pkgname}
-
-  ./configure --prefix=/usr \
-      --enable-runtime-cpudetection \
-      --disable-gui \
-      --disable-arts \
-      --disable-liblzo \
-      --disable-speex \
-      --disable-openal \
-      --disable-fribidi \
-      --disable-libdv \
-      --disable-musepack \
-      --disable-esd \
-      --disable-mga \
-      --enable-xvmc \
-      --language=all \
-      --confdir=/etc/mplayer
-
-  [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
-
-  make
-  make -j1 DESTDIR=${pkgdir} install
-  install -Dm644 etc/{codecs.conf,input.conf,example.conf} ${pkgdir}/etc/mplayer/
-  install -dm755 ${pkgdir}/usr/share/mplayer/
-  ln -s /usr/share/fonts/TTF/DejaVuSans.ttf ${pkgdir}/usr/share/mplayer/subfont.ttf
-  rm -rf ${pkgdir}/usr/share/mplayer/font
-  #desktop file  FS#14770
-  install -Dm644 ${srcdir}/mplayer.desktop ${pkgdir}/usr/share/applications/mplayer.desktop
-  install -Dm644 ${srcdir}/mplayer.png ${pkgdir}/usr/share/pixmaps/mplayer.png
+    cd ${srcdir}/${pkgname}
+
+    ./configure --prefix=/usr \
+        --enable-runtime-cpudetection \
+        --disable-gui \
+        --disable-arts \
+        --disable-liblzo \
+        --disable-speex \
+        --disable-openal \
+        --disable-libdv \
+        --disable-musepack \
+        --disable-esd \
+        --disable-mga \
+        --disable-ass-internal \
+        --disable-pulse \
+        --enable-xvmc \
+        --language=all \
+        --confdir=/etc/mplayer
+    [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
+
+    make
+}
+
+package_mplayer() {
+    pkgdesc="A movie player for linux"
+    install=mplayer.install
+    backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
+    depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'  'libgl'
+    'libxinerama' 'libvdpau' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
+    'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass')
+
+    cd ${srcdir}/${pkgbase}
+
+    make DESTDIR=${pkgdir} install-mplayer  install-mplayer-man
+    install -Dm644 etc/{codecs.conf,input.conf,example.conf} ${pkgdir}/etc/mplayer/
+    install -dm755 ${pkgdir}/usr/share/mplayer/
+    ln -s /usr/share/fonts/TTF/DejaVuSans.ttf ${pkgdir}/usr/share/mplayer/subfont.ttf
+    rm -rf ${pkgdir}/usr/share/mplayer/font
+    #desktop file  FS#14770
+    install -Dm644 ${srcdir}/mplayer.desktop ${pkgdir}/usr/share/applications/mplayer.desktop
+    install -Dm644 etc/mplayer.png ${pkgdir}/usr/share/pixmaps/mplayer.png
+}
+
+package_mencoder() {
+    pkgdesc="Free command line video decoding, encoding and filtering tool"
+    depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'cdparanoia'
+    'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2' 'schroedinger' 'mpg123' 'libass')
+
+    cd ${srcdir}/${pkgbase}
+    make DESTDIR=${pkgdir} install-mencoder install-mencoder-man
+    find $pkgdir/usr/share/man -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \;
 }
diff --git a/abs/core/mplayer/__changlog b/abs/core/mplayer/__changlog
new file mode 100644
index 0000000..fdf7dab
--- /dev/null
+++ b/abs/core/mplayer/__changlog
@@ -0,0 +1 @@
+-disable pulse and remove libpulse deps in PKGBUILD
diff --git a/abs/core/mplayer/mplayer.desktop b/abs/core/mplayer/mplayer.desktop
index e3229d0..07acea1 100644
--- a/abs/core/mplayer/mplayer.desktop
+++ b/abs/core/mplayer/mplayer.desktop
@@ -14,7 +14,7 @@ Comment[zh]=多媒体播放器
 Comment[pl]=Odtwarzaj filmy i muzykę
 Icon=mplayer
 TryExec=mplayer
-Exec=mplayer -really-quiet %F
+Exec=mplayer %F
 Terminal=false
 NoDisplay=true
 Categories=GTK;AudioVideo;Audio;Video;Player;TV;
diff --git a/abs/core/mplayer/mplayer.install b/abs/core/mplayer/mplayer.install
new file mode 100644
index 0000000..660593c
--- /dev/null
+++ b/abs/core/mplayer/mplayer.install
@@ -0,0 +1,11 @@
+post_install() {
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
-- 
cgit v0.12


From 12cb37bdafb85bee1a95b27ca7bf6fe19fd6bf2a Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 4 Aug 2011 17:16:40 -0500
Subject: python-lxml: Bump to latest.

---
 abs/core/python_modules/python-lxml/PKGBUILD | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/abs/core/python_modules/python-lxml/PKGBUILD b/abs/core/python_modules/python-lxml/PKGBUILD
index 606ec54..df85c69 100644
--- a/abs/core/python_modules/python-lxml/PKGBUILD
+++ b/abs/core/python_modules/python-lxml/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: $
+# $Id$
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
@@ -6,8 +6,8 @@
 # Contributor: Guillem Rieu <guillemr@gmx.net>
 
 pkgname=python-lxml
-pkgver=2.2.6
-pkgrel=4
+pkgver=2.3
+pkgrel=1
 pkgdesc="Python binding for the libxml2 and libxslt libraries"
 arch=('i686' 'x86_64')
 license=('BSD' 'GPL' 'custom')
@@ -16,19 +16,15 @@ depends=('python2' 'libxslt')
 optdepends=("beautiful-soup: support for parsing not well formed HTML")
 conflicts=('lxml')
 replaces=('lxml')
-source=(http://codespeak.net/lxml/lxml-$pkgver.tgz)
-md5sums=('b1f700fb22d7ee9b977ee3eceb65b20c')
-
-build() {
-  /bin/true
-}
+source=("http://codespeak.net/lxml/lxml-${pkgver}.tgz")
+md5sums=('a245a015fd59b63e220005f263e1682a')
 
 package() {
   cd ${srcdir}/lxml-$pkgver
 
-  python2 setup.py install --root=${pkgdir} || return 1
+  python2 setup.py install --root="${pkgdir}" --optimize=1
 
-  install -D -m644 LICENSES.txt ${pkgdir}/usr/share/licenses/$pkgname/LICENSE || return 1
-  install -D -m644 doc/licenses/BSD.txt ${pkgdir}/usr/share/licenses/$pkgname/BSD.txt || return 1
-  install -D -m644 doc/licenses/elementtree.txt ${pkgdir}/usr/share/licenses/$pkgname/elementtree.txt || return 1
+  install -D -m644 LICENSES.txt ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
+  install -D -m644 doc/licenses/BSD.txt ${pkgdir}/usr/share/licenses/$pkgname/BSD.txt
+  install -D -m644 doc/licenses/elementtree.txt ${pkgdir}/usr/share/licenses/$pkgname/elementtree.txt
 }
-- 
cgit v0.12


From 6b1c57fc65f2287e030430c04e955ede3a74de26 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 4 Aug 2011 17:31:55 -0500
Subject: tar: Bump to latest. ref #647

---
 abs/core/tar/PKGBUILD    | 14 +++++++++-----
 abs/core/tar/__changelog |  1 +
 abs/core/tar/tar.install |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 abs/core/tar/__changelog

diff --git a/abs/core/tar/PKGBUILD b/abs/core/tar/PKGBUILD
index d4dd25b..3bde59b 100644
--- a/abs/core/tar/PKGBUILD
+++ b/abs/core/tar/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 98542 2010-11-11 03:48:12Z allan $
+# $Id$
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=tar
-pkgver=1.25
+pkgver=1.26
 pkgrel=1
 pkgdesc="Utility used to store, backup, and transport files"
 arch=('i686' 'x86_64')
@@ -13,16 +13,20 @@ groups=('base')
 depends=('glibc' 'sh')
 options=('!emptydirs')
 install=tar.install
-source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2
+source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
         tar.1)
-md5sums=('6e497f861c77bbba2f7da4e10270995b'
+md5sums=('0ced6f20b9fa1bea588005b5ad4b52c1'
          'e0538778516a284e3558c454b2576c2f')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
 
-  ./configure --prefix=/usr --libexecdir=/usr/lib/tar --bindir=/bin
+  FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix=/usr --libexecdir=/usr/lib/tar --bindir=/bin
   make
+}
+
+check() {
+  cd ${srcdir}/$pkgname-$pkgver
   make check
 }
   
diff --git a/abs/core/tar/__changelog b/abs/core/tar/__changelog
new file mode 100644
index 0000000..4c86946
--- /dev/null
+++ b/abs/core/tar/__changelog
@@ -0,0 +1 @@
+added FORCE_UNSAFE_CONFIGURE=1 to configure line of PKGBUILD
diff --git a/abs/core/tar/tar.install b/abs/core/tar/tar.install
index 2f36c3c..8de1f97 100644
--- a/abs/core/tar/tar.install
+++ b/abs/core/tar/tar.install
@@ -1,4 +1,4 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(tar.info tar.info-1 tar.info-2)
 
 post_install() {
-- 
cgit v0.12


From 6c3099aff3af9a3b217a5eeb12336c0dc09b8652 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 4 Aug 2011 17:38:30 -0500
Subject: libxrandr: Bump to latest. ref #647

---
 abs/core/libxrandr/PKGBUILD | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/abs/core/libxrandr/PKGBUILD b/abs/core/libxrandr/PKGBUILD
index 9c64cc8..8839b6b 100644
--- a/abs/core/libxrandr/PKGBUILD
+++ b/abs/core/libxrandr/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 29289 2009-03-07 18:44:39Z jgc $
+# $Id$
 # Maintainer: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 pkgname=libxrandr
-pkgver=1.3.0
+pkgver=1.3.2
 pkgrel=1
 pkgdesc="X11 RandR extension library"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org/"
-depends=('libxext>=1.0.5' 'libxrender' 'randrproto>=1.3.0')
-makedepends=('pkgconfig')
+depends=('libxext' 'libxrender' 'randrproto')
+makedepends=('xorg-util-macros')
 options=('!libtool')
 source=(${url}/releases/individual/lib/libXrandr-${pkgver}.tar.bz2)
-md5sums=('68eb59c3b7524db6ffd78746ee893d1d')
+sha1sums=('0c844a4c5237f96794f0c18a5af16dc5ab7a36ec')
 
 build() {
   cd "${srcdir}/libXrandr-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make
+  make DESTDIR="${pkgdir}" install
   install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
-- 
cgit v0.12


From 66be0cdc0ed7d5802527e7228adee01f4a17127d Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 4 Aug 2011 17:54:10 -0500
Subject: pcre: Bump to latest. Dep of glib2

---
 abs/core/pcre/ChangeLog                         | 40 -------------------------
 abs/core/pcre/PKGBUILD                          | 16 +++++-----
 abs/core/pcre/libpcre-7.7-buffer-overflow.patch | 16 ----------
 3 files changed, 8 insertions(+), 64 deletions(-)
 delete mode 100644 abs/core/pcre/ChangeLog
 delete mode 100644 abs/core/pcre/libpcre-7.7-buffer-overflow.patch

diff --git a/abs/core/pcre/ChangeLog b/abs/core/pcre/ChangeLog
deleted file mode 100644
index cdff568..0000000
--- a/abs/core/pcre/ChangeLog
+++ /dev/null
@@ -1,40 +0,0 @@
-2010-03-24  Eric Belanger  <eric@archlinux.org>
-
-	* pcre 8.02-1
-	* Upstream update
-
-2010-01-23  Eric Belanger  <eric@archlinux.org>
-
-	* pcre 8.01-1
-	* Upstream update
-
-2009-10-26  Eric Belanger  <eric@archlinux.org>
-
-	* pcre 8.00-1
-	* Upstream update
-
-2009-04-13  Eric Belanger  <eric@archlinux.org>
-
-	* pcre 7.9-1
-	* Upstream update
-
-2008-10-19  Eric Belanger  <eric@archlinux.org>
-
-	* Updated url
-
-2008-09-05  Eric Belanger  <eric@archlinux.org>
-
-	* pcre 7.8-1
-	* Upstream update
-	* Fixed license
-
-2008-07-07  Eric Belanger  <eric@archlinux.org>
-
-	* pcre 7.7-2
-	* Added libpcre-7.7-buffer-overflow.patch to fix buffer overflow (close FS#10845)
-
-2008-05-10  Eric Belanger  <eric@archlinux.org>
-
-	* pcre 7.7-1
-	* Upstream update
-	* Added ChangeLog
diff --git a/abs/core/pcre/PKGBUILD b/abs/core/pcre/PKGBUILD
index d31e23c..83dfe94 100644
--- a/abs/core/pcre/PKGBUILD
+++ b/abs/core/pcre/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 84661 2010-07-03 04:01:39Z allan $
+# $Id$
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=pcre
-pkgver=8.10
+pkgver=8.12
 pkgrel=1
 pkgdesc="A library that implements Perl 5-style regular expressions"
-arch=('i686' 'x86_64') 
+arch=('i686' 'x86_64')
 url="http://www.pcre.org/"
 license=('BSD')
 depends=('gcc-libs')
 options=('!libtool')
 source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('780867a700e9d4e4b9cb47aa5453e4b2')
-sha1sums=('8b345da0f835b2caabff071b0b5bab40564652be')
+md5sums=('f14a9fef3c92f3fc6c5ac92d7a2c7eb3')
+sha1sums=('2219b372bff53ee29a7e44ecf5977ad15df01cea')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
@@ -26,11 +26,11 @@ build() {
 package() {
   cd "${srcdir}"/${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
-  
+
   # grep uses pcre, so we need the libs in /lib
   install -dm755 "${pkgdir}"/lib
   mv "${pkgdir}"/usr/lib/libpcre.so.* "${pkgdir}"/lib/
-  ln -sf ../../lib/libpcre.so.0 "${pkgdir}"/usr/lib/libpcre.so
-  
+  ln -sf /lib/libpcre.so.0 "${pkgdir}"/usr/lib/libpcre.so
+
   install -Dm644 LICENCE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/abs/core/pcre/libpcre-7.7-buffer-overflow.patch b/abs/core/pcre/libpcre-7.7-buffer-overflow.patch
deleted file mode 100644
index a27987f..0000000
--- a/abs/core/pcre/libpcre-7.7-buffer-overflow.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -NrU5 pcre-7.7.orig/pcre_compile.c pcre-7.7/pcre_compile.c
---- pcre-7.7.orig/pcre_compile.c	2008-06-18 17:08:49.000000000 +0200
-+++ pcre-7.7/pcre_compile.c	2008-06-18 17:11:04.000000000 +0200
-@@ -4929,11 +4929,11 @@
-           {
-           if (code == cd->start_code + 1 + LINK_SIZE &&
-                (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE))
-             {
-             cd->external_options = newoptions;
--            options = newoptions;
-+            options = *optionsptr = newoptions;
-             }
-          else
-             {
-             if ((options & PCRE_IMS) != (newoptions & PCRE_IMS))
-               {
-- 
cgit v0.12


From 7a80bfb7738f90a5232afc3c39f8ded4e9dba21a Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 4 Aug 2011 18:12:20 -0500
Subject: glib2: Bump to latest. refs #647

---
 abs/core/glib2/PKGBUILD | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/abs/core/glib2/PKGBUILD b/abs/core/glib2/PKGBUILD
index f1738b7..c3ec618 100644
--- a/abs/core/glib2/PKGBUILD
+++ b/abs/core/glib2/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 99447 2010-11-14 19:35:34Z ibiru $
+# $Id$
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=glib2
-pkgver=2.26.1
+pkgver=2.28.8
 pkgrel=1
-pkgdesc="Common C routines used by GTK+ 2.4 and other libs"
+pkgdesc="Common C routines used by GTK+ and other libs"
 url="http://www.gtk.org/"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('pcre>=8.02')
+depends=('pcre>=8.12')
 makedepends=('pkgconfig' 'python2')
+checkdepends=('pygobject' 'dbus-python')
 options=('!libtool' '!docs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.26/glib-${pkgver}.tar.bz2
+source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.28/glib-${pkgver}.tar.xz
         glib2.sh
         glib2.csh)
-sha256sums=('7a74ff12b6b9dee1f2d0e520b56b68b621920c4f4250bdf23468e515625c28d5'
+sha256sums=('4d7ca95dbde8e8f60ab428c765b0dbb8a44be9eb9316491803ce5ee7b4748353'
             '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a'
             '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3')
 
@@ -25,6 +26,10 @@ build() {
       --with-pcre=system \
       --disable-fam
   make
+}
+
+package() {
+  cd "${srcdir}/glib-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   install -d "${pkgdir}/etc/profile.d"
@@ -35,3 +40,9 @@ build() {
       chmod -x "${_i}"
   done
 }
+
+check() {
+  cd "${srcdir}/glib-${pkgver}"
+  sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' gio/tests/gdbus-testserver.py
+  make -k check || true
+}
-- 
cgit v0.12