Fri Oct 11 00:07:27 PDT 2013

17 files changed, 124 insertions, 501 deletions

diff --git a/extra/alsaplayer/PKGBUILD b/extra/alsaplayer/PKGBUILD
index 4fd53e435..a77b965fb 100644
--- a/extra/alsaplayer/PKGBUILD
+++ b/extra/alsaplayer/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 170547 2012-11-08 15:28:30Z heftig $
+# $Id: PKGBUILD 196265 2013-10-10 02:58:34Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=alsaplayer
 pkgver=0.99.81
-pkgrel=5
+pkgrel=6
 pkgdesc="A heavily multi-threaded PCM player that tries to excercise the ALSA library and driver quite a bit"
 arch=('i686' 'x86_64')
-url="http://www.alsaplayer.org/"
+url="http://alsaplayer.sourceforge.net/"
 license=('GPL')
 depends=('gcc-libs' 'desktop-file-utils')
 makedepends=('gtk2' 'libid3tag' 'libvorbis' 'libmad' 'libmikmod' 'jack' 'mesa' 'audiofile' 'doxygen')
@@ -22,7 +22,7 @@ optdepends=('gtk2: for the gtk2 GUI interface' \
             'libmikmod: for mod, s3m, it and xm formats supports')
 options=('!libtool')
 install=alsaplayer.install
-source=(http://www.alsaplayer.org/${pkgname}-${pkgver}.tar.bz2)
+source=(http://alsaplayer.sourceforge.net/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('25817ebd1e5c36da31a88363315a1bf7a945ddfd')
 
 build() {
diff --git a/extra/aterm/PKGBUILD b/extra/aterm/PKGBUILD
deleted file mode 100644
index 0dafc580a..000000000
--- a/extra/aterm/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 135001 2011-08-09 20:47:19Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=aterm
-pkgver=1.0.1
-pkgrel=3
-pkgdesc="An xterm replacement with transparency support"
-arch=('i686' 'x86_64')
-url="http://aterm.sourceforge.net/"
-license=('GPL')
-depends=('libx11')
-makedepends=('libxt')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('c2eede028e1011e0ec7035cf319c9b5a')
-sha1sums=('a975753b415306a0734efc3773de8a86129bb54b')
-    
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-transparency=yes \
-    --enable-background-image --enable-fading --enable-menubar \
-    --enable-graphics
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/celt0.5.1/PKGBUILD b/extra/celt0.5.1/PKGBUILD
index f2a4fa2e5..fa7e927b3 100644
--- a/extra/celt0.5.1/PKGBUILD
+++ b/extra/celt0.5.1/PKGBUILD
@@ -5,13 +5,12 @@
 pkgname=celt0.5.1
 _basename=celt
 pkgver=0.5.1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Low-latency audio communication codec - SPICE version"
 arch=(i686 x86_64)
 url="http://www.celt-codec.org"
 license=('BSD')
 depends=('libogg')
-provides=('celt=0.5.1')
 options=('!libtool')
 source=(http://downloads.us.xiph.org/releases/celt/celt-$pkgver.tar.gz)
 md5sums=('67e7b5e45db57a6f1f0a6962f5ecb190')
diff --git a/extra/dssi/PKGBUILD b/extra/dssi/PKGBUILD
index 9cb76d7cd..d1c37bc3b 100644
--- a/extra/dssi/PKGBUILD
+++ b/extra/dssi/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 178955 2013-03-01 10:20:10Z andrea $
+# $Id: PKGBUILD 196279 2013-10-10 13:13:50Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Pajaro
 
 pkgname=dssi
 pkgver=1.1.1
-pkgrel=3
+pkgrel=4
 pkgdesc="An API for audio processing plugins & softsynths with UIs"
 arch=('i686' 'x86_64')
 url="http://dssi.sourceforge.net/"
@@ -20,7 +20,6 @@ md5sums=('619ab73c883b02dc37ddb37001591f8b'
          '258ca4d0ca28c5c4d4675147621fac18')
 
 build() {
-  . /etc/profile.d/qt4.sh
   cd "$srcdir/$pkgname-$pkgver"
 
   ./configure --prefix=/usr
diff --git a/extra/libdvbpsi/PKGBUILD b/extra/libdvbpsi/PKGBUILD
index ef0f43f6f..cbc7f8fdf 100644
--- a/extra/libdvbpsi/PKGBUILD
+++ b/extra/libdvbpsi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 195173 2013-09-26 15:48:02Z foutrelis $
+# $Id: PKGBUILD 196290 2013-10-10 15:39:09Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=libdvbpsi
-pkgver=1.1.0
+pkgver=1.1.1
 pkgrel=1
 epoch=1
 pkgdesc="A library designed for decoding and generation of MPEG TS and DVB PSI tables"
@@ -15,7 +15,7 @@ replaces=('libdvbpsi4' 'libdvbpsi5')
 conflicts=('libdvbpsi4' 'libdvbpsi5')
 url="http://developers.videolan.org/libdvbpsi/"
 source=("http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('1f84f9d1de08e15f94e6ff9957278064')
+md5sums=('0c7c355201f325ea99c522d8ec97bf86')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libffado/PKGBUILD b/extra/libffado/PKGBUILD
index d1a09155e..9510acf06 100644
--- a/extra/libffado/PKGBUILD
+++ b/extra/libffado/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 168113 2012-10-06 05:43:33Z schiv $
+# $Id: PKGBUILD 196292 2013-10-10 19:31:03Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: galiyosha@gmail.com
 # Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com>
 
 pkgname=libffado
 pkgver=2.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Driver for FireWire audio devices"
 arch=('i686' 'x86_64')
 url="http://www.ffado.org/"
@@ -17,9 +17,11 @@ optdepends=('python2: ffado-diag'
             'python2-pyqt: mixer applet')
 provides=('ffado')
 source=("http://www.ffado.org/files/$pkgname-$pkgver.tgz"
-        'python2-qt.patch')
+        'python2-qt.patch'
+        'rules.patch')
 md5sums=('26bce2be0b9c1fa4e614f2f494edf388'
-         '10aa837f5521da213caa93e1ddc58c0e')
+         '10aa837f5521da213caa93e1ddc58c0e'
+         'da1102bfb02e67b3dfcb3947435a81e9')
 
 _scons-conf() {
   scons DEBUG=False \
@@ -29,13 +31,21 @@ _scons-conf() {
         COMPILE_FLAGS="$CFLAGS" $@
 }
 
-build() {
+prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
   # python2 fix
   patch -Np1 -i "$srcdir/python2-qt.patch"
 
-  # build!
+  # rule comments must be on their own line
+  # see https://bugs.archlinux.org/task/36949
+  # and http://subversion.ffado.org/ticket/373
+  patch -Np0 -i "$srcdir/rules.patch"
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
   if [ "$CARCH" = 'x86_64' ]; then
     _scons-conf ENABLE_OPTIMIZATIONS=True
   else
@@ -53,7 +63,7 @@ package() {
     "$pkgdir/usr/share/applications/ffadomixer.desktop"
 
   install -Dm644 support/xdg/hi64-apps-ffado.png \
-    "$pkgdir/usr/share/pixmaps/$pkgname.png"
+    "$pkgdir/usr/share/pixmaps/ffado.png"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/libffado/rules.patch b/extra/libffado/rules.patch
new file mode 100644
index 000000000..8e37c164a
--- /dev/null
+++ b/extra/libffado/rules.patch
@@ -0,0 +1,84 @@
+--- libffado/60-ffado.rules	
++++ libffado/60-ffado.rules	
+@@ -1,35 +1,58 @@ 
+ SUBSYSTEM!="firewire", GOTO="ffado_end"
+ 
+-ATTR{vendor}=="0x000166", GROUP="audio", ENV{ID_FFADO}="1" # TC GROUP A/S
+-ATTR{vendor}=="0x0001f2", GROUP="audio", ENV{ID_FFADO}="1" # Mark of the Unicorn, Inc. (aka MOTU)
+-ATTR{vendor}=="0x0003db", GROUP="audio", ENV{ID_FFADO}="1" # Apogee Electronics Corp.
+-ATTR{vendor}=="0x000595", GROUP="audio", ENV{ID_FFADO}="1" # Alesis Corporation
+-ATTR{vendor}=="0x0007f5", GROUP="audio", ENV{ID_FFADO}="1" # Bridgeco Co AG
+-ATTR{vendor}=="0x000a92", GROUP="audio", ENV{ID_FFADO}="1" # Presonus Corporation
+-ATTR{vendor}=="0x000aac", GROUP="audio", ENV{ID_FFADO}="1" # TerraTec Electronic GmbH
+-ATTR{vendor}=="0x000d6c", GROUP="audio", ENV{ID_FFADO}="1" # M-Audio
+-ATTR{vendor}=="0x000f1b", GROUP="audio", ENV{ID_FFADO}="1" # Ego Systems Inc.
+-ATTR{vendor}=="0x000ff2", GROUP="audio", ENV{ID_FFADO}="1" # Loud Technologies Inc.
+-ATTR{vendor}=="0x001260", GROUP="audio", ENV{ID_FFADO}="1" # Stanton Magnetics,inc.
+-ATTR{vendor}=="0x00130e", GROUP="audio", ENV{ID_FFADO}="1" # Focusrite Audio Engineering Limited
+-ATTR{vendor}=="0x001486", GROUP="audio", ENV{ID_FFADO}="1" # Echo Digital Audio Corporation
+-ATTR{vendor}=="0x001496", GROUP="audio", ENV{ID_FFADO}="1" # Phonic Corporation
+-ATTR{vendor}=="0x001564", GROUP="audio", ENV{ID_FFADO}="1" # BEHRINGER Spezielle Studiotechnik GmbH
+-ATTR{vendor}=="0x001c2d", GROUP="audio", ENV{ID_FFADO}="1" # FlexRadio Systems
+-ATTR{vendor}=="0x001c6a", GROUP="audio", ENV{ID_FFADO}="1" # Weiss Engineering Ltd.
+-ATTR{vendor}=="0x0040ab", GROUP="audio", ENV{ID_FFADO}="1" # ROLAND DG CORPORATION
+-ATTR{vendor}=="0x000f64", GROUP="audio", ENV{ID_FFADO}="1" # DnR
++# TC GROUP A/S
++ATTR{vendor}=="0x000166", GROUP="audio", ENV{ID_FFADO}="1"
++# Mark of the Unicorn, Inc. (aka MOTU)
++ATTR{vendor}=="0x0001f2", GROUP="audio", ENV{ID_FFADO}="1"
++# Apogee Electronics Corp.
++ATTR{vendor}=="0x0003db", GROUP="audio", ENV{ID_FFADO}="1"
++# Alesis Corporation
++ATTR{vendor}=="0x000595", GROUP="audio", ENV{ID_FFADO}="1"
++# Bridgeco Co AG
++ATTR{vendor}=="0x0007f5", GROUP="audio", ENV{ID_FFADO}="1"
++# Presonus Corporation
++ATTR{vendor}=="0x000a92", GROUP="audio", ENV{ID_FFADO}="1"
++# TerraTec Electronic GmbH
++ATTR{vendor}=="0x000aac", GROUP="audio", ENV{ID_FFADO}="1"
++# M-Audio
++ATTR{vendor}=="0x000d6c", GROUP="audio", ENV{ID_FFADO}="1"
++# Ego Systems Inc.
++ATTR{vendor}=="0x000f1b", GROUP="audio", ENV{ID_FFADO}="1"
++# Loud Technologies Inc.
++ATTR{vendor}=="0x000ff2", GROUP="audio", ENV{ID_FFADO}="1"
++# Stanton Magnetics,inc.
++ATTR{vendor}=="0x001260", GROUP="audio", ENV{ID_FFADO}="1"
++# Focusrite Audio Engineering Limited
++ATTR{vendor}=="0x00130e", GROUP="audio", ENV{ID_FFADO}="1"
++# Echo Digital Audio Corporation
++ATTR{vendor}=="0x001486", GROUP="audio", ENV{ID_FFADO}="1"
++# Phonic Corporation
++ATTR{vendor}=="0x001496", GROUP="audio", ENV{ID_FFADO}="1"
++# BEHRINGER Spezielle Studiotechnik GmbH
++ATTR{vendor}=="0x001564", GROUP="audio", ENV{ID_FFADO}="1"
++# FlexRadio Systems
++ATTR{vendor}=="0x001c2d", GROUP="audio", ENV{ID_FFADO}="1"
++# Weiss Engineering Ltd.
++ATTR{vendor}=="0x001c6a", GROUP="audio", ENV{ID_FFADO}="1"
++# ROLAND DG CORPORATION
++ATTR{vendor}=="0x0040ab", GROUP="audio", ENV{ID_FFADO}="1"
++# DnR
++ATTR{vendor}=="0x000f64", GROUP="audio", ENV{ID_FFADO}="1"
+ 
+ # The devices below are by vendors who make other firewire devices in
+ # addition to their audio interfaces.  They need more specific rules to
+ # ensure only audio interfaces are covered here.
+ 
+-ATTR{vendor}=="0x00022e", ATTR{model}=="0x010067", GROUP="audio", ENV{ID_FFADO}="1" # Tascam, a subsiduary of TEAC (the OUI is TEAC's)
++# Tascam, a subsiduary of TEAC (the OUI is TEAC's)
++ATTR{vendor}=="0x00022e", ATTR{model}=="0x010067", GROUP="audio", ENV{ID_FFADO}="1"
+ 
+ # The devices below abuse another Vendor's ID, and therefore we need more advanced rules for those.
+ 
+-ATTR{vendor}=="0x00000a", ATTR{model}=="0x030000", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" # CME, Matrix K FW
+-ATTR{vendor}=="0x00000f", ATTR{model}=="0x01006?", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" # Mackie, Onyx Firewire 
+-ATTR{vendor}=="0x000a35", ATTR{units}=="0x000a35:0x00000[12]", GROUP="audio", ENV{ID_FFADO}="1" # RME
++# CME, Matrix K FW
++ATTR{vendor}=="0x00000a", ATTR{model}=="0x030000", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1"
++# Mackie, Onyx Firewire 
++ATTR{vendor}=="0x00000f", ATTR{model}=="0x01006?", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1"
++# RME
++ATTR{vendor}=="0x000a35", ATTR{units}=="0x000a35:0x00000[12]", GROUP="audio", ENV{ID_FFADO}="1"
+ 
+ LABEL="ffado_end"
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index dad45d5e7..4e086ad51 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193933 2013-09-07 05:53:52Z giovanni $
+# $Id: PKGBUILD 196286 2013-10-10 15:22:37Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=mercurial
-pkgver=2.7.1
+pkgver=2.7.2
 pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI')
 backup=('etc/mercurial/hgrc')
 source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz"
         'mercurial.profile')
-md5sums=('3313de3667902ae4dc82f29f5280294d'
+md5sums=('ec00ddc6aadfea1e11b23650cb741d53'
          '43e1d36564d4c7fbe9a091d3ea370a44')
 
 package() {
diff --git a/extra/ogle/PKGBUILD b/extra/ogle/PKGBUILD
deleted file mode 100644
index 240daa30b..000000000
--- a/extra/ogle/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 137878 2011-09-12 06:26:48Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=ogle
-pkgver=0.9.2
-pkgrel=13
-pkgdesc="A simple DVD player for Linux"
-arch=('i686' 'x86_64')
-url="http://www.dtek.chalmers.se/groups/dvd/"
-license=('GPL')
-depends=('sh' 'libxml2' 'libdvdread' 'libjpeg' 'libmad' 'libxinerama' 'libxv'
-         'alsa-lib' 'a52dec' 'libxxf86vm')
-options=('!libtool')
-# http://www.dtek.chalmers.se/groups/dvd/dist/${pkgname}-${pkgver}.tar.gz
-source=(ftp://ftp.archlinux.org/other/ogle/${pkgname}-${pkgver}.tar.gz \
-        xvideofix.patch	gcc34alsafix.patch gcc4.patch dvdread-4.1.3.patch \
-        ogle-vuln-scripts-makefile.patch)
-md5sums=('a76a9892bdb807a4bcf859d15a91f0f9'
-         '57f1cf36eed82c56f24e9c0fc25ce2b3'
-         '4ebc822b252fade6b53c5ceb5be45bf5'
-         'd08cff87c5ec41a7eebc0d2384835688'
-         '597906c64ff7f5185de8430fdae3107d'
-         'd052b01f293c61d399fdd0ac2abb1cf4')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i "${srcdir}/dvdread-4.1.3.patch"
-  patch -p1 -i "${srcdir}/xvideofix.patch"
-  patch -p1 -i "${srcdir}/gcc34alsafix.patch"
-  patch -p1 -i "${srcdir}/gcc4.patch"
-  patch -p0 -i "${srcdir}/ogle-vuln-scripts-makefile.patch"
-
-   # fix alsa detection - stolen from their cvs
-  sed -i 's|^.*MINOR\=\=5.*$|#if SND_LIB_MAJOR==0 && SND_LIB_MINOR<6|' configure
-  sed -i 's|__diga_end:|\0;|' libogleao/alsa_audio.c
-  ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --with-x
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  export LIBRARY_PATH="${pkgdir}/usr/lib/ogle"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/ogle/dvdread-4.1.3.patch b/extra/ogle/dvdread-4.1.3.patch
deleted file mode 100644
index d928ac2aa..000000000
--- a/extra/ogle/dvdread-4.1.3.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2009/01/27 02:06:49 jmcneill Exp $
-
---- vmg/ifo_dump.c.orig	2009-01-26 21:00:17.000000000 -0500
-+++ vmg/ifo_dump.c	2009-01-26 21:00:33.000000000 -0500
-@@ -65,38 +65,38 @@ static void print_ifo(char *path, int ti
-   if(h->vmgi_mat != NULL) {
-     
-     printf("VMG top level\n-------------\n");
--    ifoPrint_VMGI_MAT(h->vmgi_mat);
-+    ifo_print_VMGI_MAT(h->vmgi_mat);
-       
-     printf("\nFirst Play PGC\n--------------\n");
--    ifoPrint_PGC(h->first_play_pgc);
-+    ifo_print_PGC(h->first_play_pgc);
-       
-     printf("\nTitle Track search pointer table\n");
-     printf(  "------------------------------------------------\n");
--    ifoPrint_TT_SRPT(h->tt_srpt);
-+    ifo_print_TT_SRPT(h->tt_srpt);
-       
-     printf("\nMenu PGCI Unit table\n");
-     printf(  "--------------------\n");
-     if(h->vmgi_mat->vmgm_pgci_ut != 0) {
--      ifoPrint_PGCI_UT(h->pgci_ut);
-+      ifo_print_PGCI_UT(h->pgci_ut);
-     } else 
-       printf("No Menu PGCI Unit table present\n");
-       
-     printf("\nParental Manegment Information table\n");
-     printf(  "------------------------------------\n");
-     if(h->vmgi_mat->ptl_mait != 0) {
--      ifoPrint_PTL_MAIT(h->ptl_mait);
-+      ifo_print_PTL_MAIT(h->ptl_mait);
-     } else
-       printf("No Parental Management Information present\n");
-       
-     printf("\nVideo Title Set Attribute Table\n");
-     printf(  "-------------------------------\n");
--    ifoPrint_VTS_ATRT(h->vts_atrt);
-+    ifo_print_VTS_ATRT(h->vts_atrt);
- 
-       
-     printf("\nText Data Manager Information\n");
-     printf(  "-----------------------------\n");
-     if(h->vmgi_mat->txtdt_mgi != 0) {
--      //ifoPrint_TXTDT_MGI(h->txtdt_mgi);
-+      //ifo_print_TXTDT_MGI(h->txtdt_mgi);
-       printf("Can't print Text Data Manager Information yet\n");
-     } else
-       printf("No Text Data Manager Information present\n");
-@@ -106,14 +106,14 @@ static void print_ifo(char *path, int ti
-       printf("\nCell Address table\n");
-       printf(  "-----------------\n");
-       if(h->vmgi_mat->vmgm_c_adt != 0) {
--	ifoPrint_C_ADT(h->menu_c_adt);
-+	ifo_print_C_ADT(h->menu_c_adt);
-       } else
- 	printf("No Cell Address table present\n");
-       
-       printf("\nVideo Title set Menu VOBU address map\n");
-       printf(  "-----------------\n");
-       if(h->vmgi_mat->vmgm_vobu_admap != 0) {
--	ifoPrint_VOBU_ADMAP(h->menu_vobu_admap);
-+	ifo_print_VOBU_ADMAP(h->menu_vobu_admap);
-       } else
- 	printf("No Menu VOBU address map present\n");
-     }
-@@ -122,20 +122,20 @@ static void print_ifo(char *path, int ti
-   if(h->vtsi_mat != NULL) {
-       
-     printf("VTS top level\n-------------\n");
--    ifoPrint_VTSI_MAT(h->vtsi_mat);
-+    ifo_print_VTSI_MAT(h->vtsi_mat);
-       
-     printf("\nPart of title search pointer table information\n");
-     printf(  "----------------------------------------------\n");
--    ifoPrint_VTS_PTT_SRPT(h->vts_ptt_srpt);
-+    ifo_print_VTS_PTT_SRPT(h->vts_ptt_srpt);
-        
-     printf("\nPGCI Unit table\n");
-     printf(  "--------------------\n");
--    ifoPrint_PGCIT(h->vts_pgcit);
-+    ifo_print_PGCIT(h->vts_pgcit);
-       
-     printf("\nMenu PGCI Unit table\n");
-     printf(  "--------------------\n");
-     if(h->vtsi_mat->vtsm_pgci_ut != 0) {
--      ifoPrint_PGCI_UT(h->pgci_ut);
-+      ifo_print_PGCI_UT(h->pgci_ut);
-     } else
-       printf("No Menu PGCI Unit table present\n");
-       
-@@ -144,31 +144,31 @@ static void print_ifo(char *path, int ti
-       printf("\nTime Map table\n");
-       printf(  "-----------------\n");
-       if(h->vtsi_mat->vts_tmapt != 0) {
--	ifoPrint_VTS_TMAPT(h->vts_tmapt);
-+	ifo_print_VTS_TMAPT(h->vts_tmapt);
-       } else
- 	printf("No Time Map table present\n");
-       
-       printf("\nMenu Cell Address table\n");
-       printf(  "-----------------\n");
-       if(h->vtsi_mat->vtsm_c_adt != 0) {
--	ifoPrint_C_ADT(h->menu_c_adt);
-+	ifo_print_C_ADT(h->menu_c_adt);
-       } else
- 	printf("No Cell Address table present\n");
-       
-       printf("\nVideo Title Set Menu VOBU address map\n");
-       printf(  "-----------------\n");
-       if(h->vtsi_mat->vtsm_vobu_admap != 0) {
--	ifoPrint_VOBU_ADMAP(h->menu_vobu_admap);
-+	ifo_print_VOBU_ADMAP(h->menu_vobu_admap);
-       } else
- 	printf("No Menu VOBU address map present\n");
-       
-       printf("\nCell Address table\n");
-       printf(  "-----------------\n");
--      ifoPrint_C_ADT(h->vts_c_adt);
-+      ifo_print_C_ADT(h->vts_c_adt);
-       
-       printf("\nVideo Title Set VOBU address map\n");
-       printf(  "-----------------\n");
--      ifoPrint_VOBU_ADMAP(h->vts_vobu_admap);
-+      ifo_print_VOBU_ADMAP(h->vts_vobu_admap);
-       
-     }
-   }
diff --git a/extra/ogle/gcc34alsafix.patch b/extra/ogle/gcc34alsafix.patch
deleted file mode 100644
index 76de3462d..000000000
--- a/extra/ogle/gcc34alsafix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ogle-0.9.2/libogleao/alsa_audio.c	2003-10-18 17:38:30.000000000 -0700
-+++ ogle-0.9.2-patch/libogleao/alsa_audio.c	2005-04-22 18:21:23.000000000 -0700
-@@ -248,10 +248,9 @@
-       //Shouldn't ctl_handle be closed here?
-     }
-     
--    snd_ctl_close(ctl_handle);
--  
--  __diga_end:
-+    snd_ctl_close(ctl_handle);  
-   }
-+  __diga_end:
-   
-   return 0;
- }
diff --git a/extra/ogle/gcc4.patch b/extra/ogle/gcc4.patch
deleted file mode 100644
index b6a10a325..000000000
--- a/extra/ogle/gcc4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN ogle-0.9.2-old/ac3/ac3dec_wrap.c ogle-0.9.2/ac3/ac3dec_wrap.c
---- ogle-0.9.2-old/ac3/ac3dec_wrap.c	2003-03-02 15:50:03.000000000 +0000
-+++ ogle-0.9.2/ac3/ac3dec_wrap.c	2005-09-30 17:07:27.000000000 +0000
-@@ -48,7 +48,7 @@
- static void handle_events(MsgEventQ_t *q, MsgEvent_t *ev);
- 
- 
--static char *program_name;
-+char *program_name;
- 
- static FILE *outfile;
- 
diff --git a/extra/ogle/ogle-vuln-scripts-makefile.patch b/extra/ogle/ogle-vuln-scripts-makefile.patch
deleted file mode 100644
index f25964378..000000000
--- a/extra/ogle/ogle-vuln-scripts-makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-This patch inhibits the installation of debug scripts vulnerable to a symlink
-attack, see bug 245921 for reference.
-
---- scripts/Makefile.in.orig	2009-04-04 18:13:33.000000000 +0200
-+++ scripts/Makefile.in	2009-04-04 18:15:46.000000000 +0200
-@@ -133,10 +133,10 @@
- subdir = scripts
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_CLEAN_FILES = ogle
--SCRIPTS = $(bin_SCRIPTS) $(dist_pkglib_SCRIPTS)
-+SCRIPTS = $(bin_SCRIPTS)
- 
- DIST_SOURCES =
--DIST_COMMON = $(dist_pkglib_SCRIPTS) Makefile.am Makefile.in ogle.in
-+DIST_COMMON = Makefile.am Makefile.in ogle.in
- all: all-am
- 
- .SUFFIXES:
-@@ -279,7 +279,7 @@
- 
- install-data-am:
- 
--install-exec-am: install-binSCRIPTS install-dist_pkglibSCRIPTS
-+install-exec-am: install-binSCRIPTS
- 
- install-info: install-info-am
- 
-@@ -295,7 +295,7 @@
- 
- mostlyclean-am: mostlyclean-generic mostlyclean-libtool
- 
--uninstall-am: uninstall-binSCRIPTS uninstall-dist_pkglibSCRIPTS \
-+uninstall-am: uninstall-binSCRIPTS \
- 	uninstall-info-am
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
diff --git a/extra/ogle/xvideofix.patch b/extra/ogle/xvideofix.patch
deleted file mode 100644
index aafde447a..000000000
--- a/extra/ogle/xvideofix.patch
+++ /dev/null
@@ -1,205 +0,0 @@
---- ogle-0.9.2/mpeg2_video/video_output_x11.c	2003-11-04 04:02:10.000000000 -0800
-+++ ogle-0.9.2-patch/mpeg2_video/video_output_x11.c	2005-04-22 18:37:56.000000000 -0700
-@@ -286,6 +286,7 @@
-   }
- }
- 
-+
- /* This section of the code looks for the Xv extension for hardware
-  * yuv->rgb and scaling. If it is not found, or any suitable adapter
-  * is not found, use_xv will be set to 0. Otherwise it allocates a
-@@ -299,121 +300,136 @@
- {
-   int xv_found = 0;
- #ifdef HAVE_XV
--  int i, j;
-+  int i, j, k;
-   int result;
- 
-   xv_port = 0; /* We have no port yet. */
--  
-+
-   /* Check for the Xvideo extension */
--  result = XvQueryExtension(mydisplay, &xv_version, &xv_release, 
--			    &xv_request_base, &xv_event_base, 
-+  result = XvQueryExtension(mydisplay, &xv_version, &xv_release,
-+			    &xv_request_base, &xv_event_base,
- 			    &xv_error_base);
-   if(result != Success) {
-     WARNING("%s", "Xvideo extension not found\n");
-     use_xv = 0;
-     return;
-   }
--  
-+
-   NOTE("Found Xv extension %d.%d, checking for suitable adaptors\n",
-        xv_version, xv_release);
--  
-+
-   /* Check for available adaptors */
--  result = XvQueryAdaptors(mydisplay, DefaultRootWindow (mydisplay), 
-+  result = XvQueryAdaptors(mydisplay, DefaultRootWindow (mydisplay),
- 			   &xv_num_adaptors, &xv_adaptor_info);
-   if(result != Success) {
-     WARNING("%s", "No Xv adaptors found\n");
-     use_xv = 0;
-     return;
-   }
--      
-+
-   /* Check adaptors */
-   for(i = 0; i < xv_num_adaptors; i++) {
--    
-+
-     /* Is it usable for displaying XvImages */
-     if(!(xv_adaptor_info[i].type & XvInputMask) ||
-        !(xv_adaptor_info[i].type & XvImageMask))
-       continue;
--    
--    xv_port = xv_adaptor_info[i].base_id;
--      
--    /* Check image formats of adaptor */
--    xv_formats = XvListImageFormats(mydisplay, xv_port, &xv_num_formats);
--    for(j = 0; j < xv_num_formats; j++) {
--      if(xv_formats[j].id == 0x32315659) { /* YV12 */
--	//if(xv_formats[j].id == 0x30323449) { /* I420 */
--	xv_id = xv_formats[j].id;
--	break;
--      } 
--    }
--    /* No matching format found */
--    if(j == xv_num_formats)
--      continue;
--      
--    NOTE("Xv adaptor \"%s\" port %li image format %i\n",
--	 xv_adaptor_info[i].name, xv_port, xv_id);
--      
--    /* Allocate XvImages */
-+
-+		/* Check Available Ports */
-+		for (j = 0; j <  xv_adaptor_info[i].num_ports && !xv_port ; j++) {
-+			
-+			/* Check Image formats of adaptor */
-+			xv_formats = XvListImageFormats(mydisplay,xv_adaptor_info[i].base_id + j, &xv_num_formats); 
-+			for (k = 0; k < xv_num_formats; k ++) {
-+				
-+				/* Check for proper format (YV12) and see if we can grab the port */			
-+				if ( (xv_formats[k].id == 0x32315659) && (XvGrabPort(mydisplay,xv_adaptor_info[i].base_id + j,0) == Success) ) { 
-+					xv_id = xv_formats[k].id;
-+					xv_port = xv_adaptor_info[i].base_id +  j;
-+					break;
-+					}
-+				
-+				}
-+
-+			/* delete stuff nicely */
-+			XFree(xv_formats);	
-+			}
-+		
-+		/* Check next Adapter */
-+		if (xv_port==0) continue;		
-+				
-+		/* Report what we found */							
-+    NOTE("Xv adaptor \"%s\" port %li image format %i\n", xv_adaptor_info[i].name, xv_port, xv_id);
-+			
-+		/* Allocate XvImage */
-     xv_image = XvShmCreateImage(mydisplay, xv_port, xv_id, NULL,
- 				padded_width,
--				padded_height, 
-+				padded_height,
- 				&shm_info);
--    
--    /* Got an Image? */
-+
-+    /* Got an milk? */
-     if(xv_image == NULL)
-       continue;
--    
-+		
-     /* Test and see if we really got padded_width x padded_height */
-     if(xv_image->width != padded_width ||
-        xv_image->height != padded_height) {
-       FATAL("XvShmCreateImage got size: %d x %d\n",
- 	    xv_image->width, xv_image->height);
-       exit(1);
--    }
--    
-+    	}
-+		
-+		/* Now Finish Up */
-     shm_info.shmid = picture_buffer_shmid;
-     shm_info.shmaddr = picture_buffer_addr;
--    
--    /* Set the data pointer to the decoders picture segment. */  
-+
-+    /* Set the data pointer to the decoders picture segment. */
-     //    xv_image->data = picture_data->y;
-     shm_info.readOnly = True;
--    
-+
-     /* make sure we don't have any unhandled errors */
-     XSync(mydisplay, False);
--    
-+
-     /* set error handler so we can check if xshmattach failed */
-     prev_xerrhandler = XSetErrorHandler(xshm_errorhandler);
--    
-+
-     /* get the serial of the xshmattach request */
-     req_serial = NextRequest(mydisplay);
--    
-+
-     /* try to attach */
-     XShmAttach(mydisplay, &shm_info);
--    
-+
-     /* make sure xshmattach has been processed and any errors
-        have been returned to us */
-     XSync(mydisplay, False);
--    
-+
-     /* revert to the previous xerrorhandler */
-     XSetErrorHandler(prev_xerrhandler);
--    
-+
-     if(use_xshm) {
- #if 0
-       shmctl(shm_info.shmid, IPC_RMID, 0); // only works on Linux..
- #endif
--      
-+
-       CompletionType = XShmGetEventBase(mydisplay) + ShmCompletion;
-     }
-     xv_found = 1;
- 
-     /* All set up! */
-     break;
--  }
-+		}
-+	
-+	/* Clean up */
-+	XvFreeAdaptorInfo(xv_adaptor_info);
-+
- #endif /* HAVE_XV */
-+	/* In case we didn't find a working Xv */ 
-   if(!xv_found) {
-     use_xv = 0;
--  }
--}
--     
-+	  }
-+	
-+	}
-+
- 
- /* This section of the code tries to use the MIT XShm extension for 
-  * accellerated transfers to to X. XShm extension is need and only
-@@ -1726,6 +1742,8 @@
- 
-   if(mydisplay) {
-     XSync(mydisplay,True);
-+    if (use_xv) 
-+      XvUngrabPort(mydisplay,xv_port,CurrentTime);
-     if(use_xshm)
-       XShmDetach(mydisplay, &shm_info);
-     if(window.ximage != 0)
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index 13b7dcc97..c2c60c5a9 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191907 2013-08-01 06:53:40Z bpiotrowski $
+# $Id: PKGBUILD 196269 2013-10-10 11:00:54Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
@@ -6,7 +6,7 @@ pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 _realname=OpenCV
 pkgver=2.4.6.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index 4bbef63c2..282bc6307 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 196197 2013-10-08 07:36:04Z tpowa $
+# $Id: PKGBUILD 196267 2013-10-10 06:36:39Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=('qemu' 'libcacard')
-pkgver=1.6.0
-pkgrel=6
+pkgver=1.6.1
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
 url="http://wiki.qemu.org/Index.html"
@@ -73,5 +73,5 @@ package_libcacard() {
  cp -a ${srcdir}/qemu-${pkgver}/libcacard.pc ${pkgdir}/usr/lib/pkgconfig/
  cp -a ${srcdir}/qemu-${pkgver}/.libs/vscclient ${pkgdir}/usr/bin/
 }
-md5sums=('f3f39308472d629aca57a255a0c91ba9'
+md5sums=('3a897d722457c5a895cd6ac79a28fda0'
          '9d6de26867a05c306157e3d3c612b28a')
diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD
index d1e7aa333..4d1fc5827 100644
--- a/extra/weechat/PKGBUILD
+++ b/extra/weechat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 193946 2013-09-07 16:40:23Z andrea $
+# $Id: PKGBUILD 196288 2013-10-10 15:27:58Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: lucke <lucke at o2 dot pl>
 
 pkgname=weechat
-pkgver=0.4.1
-pkgrel=4
+pkgver=0.4.2
+pkgrel=1
 pkgdesc="Fast, light and extensible IRC client (curses UI)"
 arch=('i686' 'x86_64')
 url="http://www.weechat.org/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'pkg-config' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' '
 optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile')
 options=('!libtool')
 source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('071d6f1cd21c892cae126af21095c43f')
+md5sums=('fbbb4c319474d4a3b123fea7e8402fa2')
 
 prepare() {
   mkdir build