Fri Jan 3 03:17:00 UTC 2014

9 files changed, 28 insertions, 102 deletions

diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD
index dca38908c..09b123e8e 100644
--- a/extra/graphicsmagick/PKGBUILD
+++ b/extra/graphicsmagick/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 202659 2013-12-23 18:00:07Z ronald $
+# $Id: PKGBUILD 203038 2014-01-02 10:14:56Z bisson $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Anton Leontiev <bunder@t-25.ru>
 
 pkgname=graphicsmagick
-pkgver=1.3.18
-pkgrel=6
+pkgver=1.3.19
+pkgrel=1
 pkgdesc='Image processing system'
 url='http://www.graphicsmagick.org/'
 arch=('i686' 'x86_64')
@@ -19,21 +19,13 @@ optdepends=('jasper: jp2 module'
             'ghostscript: pdf, ps modules')
 makedepends=('perl' 'jasper' 'libpng' 'libwmf' 'libxml2' 'libtiff')
 depends=('freetype2' 'libxext' 'libsm' 'lcms2' 'libltdl' 'bzip2' 'xz')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz"
-        'benign.patch')
-sha1sums=('085c23666adcf88585119cb6aea7efe5c58481d4'
-          '04e16b9fe255e87cf16d4c61e313e8cdf7b2e24e')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz")
+sha1sums=('621c3e9a3b12e38dad225ee3466fd55a24c62066')
 
 options=('!emptydirs' 'libtool')
 
-prepare() {
-	cd "${srcdir}/GraphicsMagick-${pkgver}"
-	patch -p1 -i ../benign.patch
-}
-
 build() {
 	cd "${srcdir}/GraphicsMagick-${pkgver}"
-
 	./configure \
 		--prefix=/usr \
 		--enable-shared \
diff --git a/extra/graphicsmagick/benign.patch b/extra/graphicsmagick/benign.patch
deleted file mode 100644
index f9fe6a642..000000000
--- a/extra/graphicsmagick/benign.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Naur old/ChangeLog new/ChangeLog
---- old/ChangeLog	2013-03-09 13:19:31.000000000 -1000
-+++ new/ChangeLog	2013-11-22 06:33:59.189976814 -1000
-@@ -1,3 +1,10 @@
-+2013-10-16  Glenn Randers-Pehrson  <glennrp@simple.dallas.tx.us>
-+
-+	* Added calls to png_set_benign_errors() to allow benign errors
-+	to be handled as warnings.  In particular, GM builds with libpng-1.6.x
-+	will not crash while copying a PNG with a "known incorrect ICC
-+	profile".
-+
- 2013-03-09  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
- 
- 	* version.sh, www/index.rst: Prepare for 1.3.18 release.
-diff -Naur old/coders/png.c new/coders/png.c
---- old/coders/png.c	2013-03-09 13:19:31.000000000 -1000
-+++ new/coders/png.c	2013-11-22 06:33:25.423156308 -1000
-@@ -1689,6 +1689,12 @@
-         }
-       return(image);
-     }
-+
-+#ifdef PNG_BENIGN_ERRORS_SUPPORTED
-+  /* Allow benign errors */
-+  png_set_benign_errors(ping, 1);
-+#endif
-+
-   /*
-     Prepare PNG for reading.
-   */
-@@ -6453,6 +6459,12 @@
- #endif
-       return(MagickFail);
-     }
-+
-+#ifdef PNG_BENIGN_ERRORS_SUPPORTED
-+  /* Allow benign errors */
-+  png_set_benign_errors(ping, 1);
-+#endif
-+
-   /*
-     Prepare PNG for writing.
-   */
diff --git a/extra/libsidplayfp/PKGBUILD b/extra/libsidplayfp/PKGBUILD
index fa275e7e2..2d48654fe 100644
--- a/extra/libsidplayfp/PKGBUILD
+++ b/extra/libsidplayfp/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 198234 2013-10-30 13:37:47Z allan $
+# $Id: PKGBUILD 203036 2014-01-02 09:41:35Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Simon Perry <aur [at] sanxion [dot] net>
 # Contributor: Jonas Nyrén <jonas.nyren*mindkiller.com>
 
 pkgname=libsidplayfp
-pkgver=1.1.0
+pkgver=1.2.0
 pkgrel=1
 pkgdesc='Library to play Commodore 64 music derived from libsidplay2'
 url='http://sourceforge.net/projects/sidplay-residfp/'
 arch=('i686' 'x86_64')
 license=('GPL')
+depends=('gcc-libs')
 makedepends=('vice')
 optdepends=('vice: better SID support')
 source=("http://downloads.sourceforge.net/project/sidplay-residfp/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('6c3617fcbd94fd364f3305a1c4d88485911110c7')
-
-options=('!staticlibs')
+sha1sums=('ebe114d75e9d9fd1e22dc1db27f48d248b0be628')
 
 build() {
 	cd "${pkgname}-${pkgver}"
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index a80077d40..a90d5b73d 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 199540 2013-11-15 08:46:07Z schiv $
+# $Id: PKGBUILD 203053 2014-01-02 22:35:26Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 _realname=OpenCV
-pkgver=2.4.7
-pkgrel=2
+pkgver=2.4.8
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -18,10 +18,10 @@ optdepends=('opencv-samples'
             'eigen2'
             'libcl: For coding with OpenCL'
             'python2-numpy: Python 2.x interface')
-source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.tar.gz"
+source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.zip"
         'pkgconfig.patch'
         'fsh.patch')
-md5sums=('33a12a8bba6e6dc32c97298c99b083b2'
+md5sums=('50cc1433b3654074206f5b3dbfd49848'
          'c7cea48ed7d4f729ebdb9673bac41bd3'
          'c597598d142dd34d0eb4af7d6e9779d8')
 
diff --git a/extra/qjackctl/PKGBUILD b/extra/qjackctl/PKGBUILD
index 3242ec5c9..fc5d69ad1 100644
--- a/extra/qjackctl/PKGBUILD
+++ b/extra/qjackctl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 181260 2013-04-02 20:48:27Z schiv $
+# $Id: PKGBUILD 203040 2014-01-02 12:16:31Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@archlinux.org>
 
 pkgname=qjackctl
-pkgver=0.3.10
+pkgver=0.3.11
 pkgrel=1
 pkgdesc="A Qt front-end for the JACK low-latency audio server"
 url="http://qjackctl.sourceforge.net/"
@@ -11,7 +11,7 @@ arch=('i686' 'x86_64')
 license=('GPL')
 depends=('jack' 'qt4') # qjackctl may soon support qt5
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('cc01522902105ca65e327e657e51ca5e')
+md5sums=('93eabb66334ffb770ab4e270621ab2a4')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/qsynth/PKGBUILD b/extra/qsynth/PKGBUILD
index 5cf2230ff..29d6a989b 100644
--- a/extra/qsynth/PKGBUILD
+++ b/extra/qsynth/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 203027 2014-01-01 20:51:27Z schiv $
+# $Id: PKGBUILD 203028 2014-01-02 06:23:00Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD
index aa68286a9..a08c7a03b 100644
--- a/extra/snd/PKGBUILD
+++ b/extra/snd/PKGBUILD
@@ -1,32 +1,22 @@
-# $Id: PKGBUILD 199037 2013-11-07 17:11:41Z schiv $
+# $Id: PKGBUILD 203030 2014-01-02 06:24:42Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: see .contrib
 
 pkgname=snd
-pkgver=14.1
-pkgrel=2
+pkgver=14.2
+pkgrel=1
 pkgdesc="An advanced sound editor"
 arch=('i686' 'x86_64')
 url="http://ccrma.stanford.edu/software/snd/"
-license=('custom')
+license=('custom:free')
 depends=('jack' 'gamin' 'gsl' 'fftw' 'gtk2' 'libmpc')
 makedepends=('ladspa' 'wavpack' 'flac' 'speex' 'gmp'
              'timidity++' 'mpg123' 'vorbis-tools')
 optdepends=('wavpack' 'flac' 'speex' 'mpg123'
             'timidity++' 'vorbis-tools')
-source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz"
-        'type_error.patch')
-md5sums=('955ca19ca70ac0e4d03cd710516c0174'
-         '9bfea0dccdfb5da1ba81e721672b11cc')
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # fix incomplete type error
-  # see http://www.mail-archive.com/cmdist@ccrma.stanford.edu/msg04241.html
-  patch -Np1 -i "$srcdir/type_error.patch"
-}
+            source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz")
+md5sums=('a442b98c75043bc8a4b9b50ba0c2b5b7')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/snd/type_error.patch b/extra/snd/type_error.patch
deleted file mode 100644
index 1232c6e36..000000000
--- a/extra/snd/type_error.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -bur snd-14.1.orig/snd-ladspa.c snd-14.1/snd-ladspa.c
---- snd-14.1.orig/snd-ladspa.c	2013-10-28 16:07:53.260612114 +0800
-+++ snd-14.1/snd-ladspa.c	2013-10-28 16:11:18.792831983 +0800
-@@ -1191,7 +1191,7 @@
-   if (descriptor->connect_port) 
-     descriptor->connect_port(XEN_TO_C_Ladspa_Handle(ptr),
- 			     XEN_TO_C_ULONG(port),
--			     double_to_float(samples->data, samples->length)
-+			     double_to_float(mus_vct_data(samples), mus_vct_length(samples))
- 			     );
-   return(XEN_FALSE);
- }
diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD
index 419e915bc..7ccd5f456 100644
--- a/extra/whois/PKGBUILD
+++ b/extra/whois/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 199908 2013-11-18 18:15:18Z giovanni $
+# $Id: PKGBUILD 203047 2014-01-02 17:53:12Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=whois
-pkgver=5.0.26
-pkgrel=2
+pkgver=5.1.0
+pkgrel=1
 pkgdesc="The whois client by Marco d'Itri"
 arch=('i686' 'x86_64')
 url="http://www.linux.it/~md/software/"
@@ -13,7 +13,7 @@ depends=('libidn')
 makedepends=('perl')
 backup=('etc/whois.conf')
 source=("http://ftp.debian.org/debian/pool/main/w/whois/${pkgname}_${pkgver}.tar.xz")
-md5sums=('236829eea77e85df2443a54815a1b41d')
+md5sums=('e16cc6ca56a6834ab60ace26215d6b0c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"