Mon Jan 23 23:15:06 UTC 2012

9 files changed, 183 insertions, 25 deletions

diff --git a/community/chromaprint/PKGBUILD b/community/chromaprint/PKGBUILD
new file mode 100644
index 000000000..ea7e1ef90
--- /dev/null
+++ b/community/chromaprint/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 62590 2012-01-22 09:25:04Z bisson $
+# Contributor: Wieland Hoffmann <the_mineo@web.de>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+
+pkgname=chromaprint
+pkgver=0.6
+pkgrel=2
+pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source'
+url='http://acoustid.org/chromaprint/'
+arch=('i686' 'x86_64')
+license=('LGPL')
+depends=('ffmpeg')
+makedepends=('cmake')
+source=("https://github.com/downloads/lalinsky/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('e8bcc1d0d8dfec86aa648b87ba3f69b6d589eae0')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_EXAMPLES=ON .
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+}
diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD
index adcaa6edb..955bd64db 100644
--- a/community/duplicity/PKGBUILD
+++ b/community/duplicity/PKGBUILD
@@ -1,19 +1,21 @@
-# $Id: PKGBUILD 60285 2011-12-08 22:52:59Z lfleischer $
+# $Id: PKGBUILD 62636 2012-01-23 00:53:34Z lfleischer $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Aaron Schaefer <aaron@elasticdog.com>
 
 pkgname=duplicity
 pkgver=0.6.17
-pkgrel=3
+pkgrel=4
 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm'
 arch=('i686' 'x86_64')
 url='http://www.nongnu.org/duplicity/'
 license=('GPL')
 depends=('librsync' 'ncftp' 'python2' 'python-boto' 'python-gnupginterface')
 source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"
-        'botobackend.patch')
+        'botobackend.patch'
+        'duplicity-0.6.17-fix-memleak.patch')
 md5sums=('36423ab4e3b9aa90c5c44d9fa93fba0f'
-         '49bbdc327230fe5985d18eaae37eec0c')
+         '49bbdc327230fe5985d18eaae37eec0c'
+         'b77e98d006842414fdda9662c8081d3b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -27,6 +29,9 @@ build() {
   # add hotfix issued by upstream (FS#27390)
   patch -p0 -i ../botobackend.patch
 
+  # fix a memory leak (upstream bug #908228)
+  patch -p0 -i ../duplicity-0.6.17-fix-memleak.patch
+
   python2 setup.py install --root="$pkgdir" --optimize=1
 
   # fix broken documentation permissions until upstream does (FS#27301)
diff --git a/community/duplicity/duplicity-0.6.17-fix-memleak.patch b/community/duplicity/duplicity-0.6.17-fix-memleak.patch
new file mode 100644
index 000000000..1c4c8daff
--- /dev/null
+++ b/community/duplicity/duplicity-0.6.17-fix-memleak.patch
@@ -0,0 +1,29 @@
+=== modified file 'duplicity/util.py'
+--- duplicity/util.py	2011-08-23 18:14:17 +0000
++++ duplicity/util.py	2012-01-20 21:50:01 +0000
+@@ -71,6 +71,10 @@
+         else:
+             raise
+ 
++class BlackHoleList(list):
++    def append(self, x):
++        pass
++
+ class FakeTarFile:
+     debug = 0
+     def __iter__(self):
+@@ -83,7 +87,12 @@
+     # yet.  So we want to ignore ReadError exceptions, which are used to signal
+     # this.
+     try:
+-        return tarfile.TarFile("arbitrary", mode, fp)
++        tf = tarfile.TarFile("arbitrary", mode, fp)
++        # Now we cause TarFile to not cache TarInfo objects.  It would end up
++        # consuming a lot of memory over the lifetime of our long-lasting
++        # signature files otherwise.
++        tf.members = BlackHoleList()
++        return tf
+     except tarfile.ReadError:
+         return FakeTarFile()
+ 
+
diff --git a/community/libfaketime/PKGBUILD b/community/libfaketime/PKGBUILD
index a95ab380d..447f4b364 100644
--- a/community/libfaketime/PKGBUILD
+++ b/community/libfaketime/PKGBUILD
@@ -1,20 +1,28 @@
-# $Id: PKGBUILD 47438 2011-05-23 06:26:34Z lfleischer $
+# $Id: PKGBUILD 62627 2012-01-22 21:34:26Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Dan Serban
 # Contributor: Ross Melin <rdmelin@gmail.com>
 
 pkgname=libfaketime
-pkgver=0.8.1
+pkgver=0.9.1
 pkgrel=1
 pkgdesc='Report fake dates and times to programs without having to change the system-wide time.'
 arch=('i686' 'x86_64')
 url='http://www.code-wizards.com/projects/libfaketime/'
 license=('GPL2')
-source=("http://www.code-wizards.com/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('113d75d73e39f0f5022dc7385628d57c')
+source=("http://www.code-wizards.com/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'libfaketime-0.9.1-fix-as-needed.patch'
+        'libfaketime-0.9.1-fix-README-NEWS.patch')
+md5sums=('ce3f996dfd5826b4ac62f1a7cc36ea27'
+         '90873e4df35283463ef54b159c318686'
+         'b1b641a8e2298aa1646982e3bde96117')
 
 build() {
   cd "${pkgname}-${pkgver}"
+
+  patch -p1 -i ../libfaketime-0.9.1-fix-as-needed.patch
+  patch -p1 -i ../libfaketime-0.9.1-fix-README-NEWS.patch
+
   make
 }
 
diff --git a/community/libfaketime/libfaketime-0.9.1-fix-README-NEWS.patch b/community/libfaketime/libfaketime-0.9.1-fix-README-NEWS.patch
new file mode 100644
index 000000000..3d47c5404
--- /dev/null
+++ b/community/libfaketime/libfaketime-0.9.1-fix-README-NEWS.patch
@@ -0,0 +1,29 @@
+From c0c19a71c5481f3082afee2ac7962bd7abfcf134 Mon Sep 17 00:00:00 2001
+From: Lukas Fleischer <info@cryptocrack.de>
+Date: Sun, 22 Jan 2012 22:19:50 +0100
+Subject: [PATCH] Makefile: Fix installation of "README" and "NEWS"
+
+Initialize "INSTALL" in the top-level Makefile in order to avoid broken
+install(1) invocations such as:
+
+    dm0755 "/build/pkg/usr/share/doc/faketime/"
+    /bin/sh: dm0755: command not found
+
+Signed-off-by: Lukas Fleischer <info@cryptocrack.de>
+---
+ Makefile |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index f90e18e..d0225ba 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,3 +1,5 @@
++INSTALL = install
++
+ all:
+ 	$(MAKE) -C src all
+ 	$(MAKE) -C test all
+-- 
+1.7.8.4
+
diff --git a/community/libfaketime/libfaketime-0.9.1-fix-as-needed.patch b/community/libfaketime/libfaketime-0.9.1-fix-as-needed.patch
new file mode 100644
index 000000000..870349145
--- /dev/null
+++ b/community/libfaketime/libfaketime-0.9.1-fix-as-needed.patch
@@ -0,0 +1,39 @@
+From f0ee2ee1e0a2fa5f11614a55ab8543380faa9695 Mon Sep 17 00:00:00 2001
+From: Lukas Fleischer <info@cryptocrack.de>
+Date: Sun, 22 Jan 2012 21:47:52 +0100
+Subject: [PATCH] Fix linking with "-Wl,--as-needed"
+
+Reorder linker flags in order to ensure proper linking when using
+"--Wl,--as-needed". Read http://www.gentoo.org/proj/en/qa/asneeded.xml,
+especially "Importance of linking order" for details:
+
+    Basically, what the linker does is look for the symbols missing in a
+    given file (either an object file, a static archive or a library)
+    only in the files coming after it. When using the normal linking,
+    without --as-needed, this is not a problem, although there might be
+    some internal drawbacks on the linking stage, the files are linked
+    together without considering ordering. But with the flag, the
+    libraries that aren't used for resolving symbols are discarded and
+    thus not linked.
+
+Signed-off-by: Lukas Fleischer <info@cryptocrack.de>
+---
+ src/Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 9118815..d4a04b5 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -69,7 +69,7 @@ ${OBJ}: faketime.c
+ 	${CC} -o $@ -c ${CFLAGS} ${EXTRA_FLAGS} $<
+ 
+ lib%.so.${SONAME}: %.o
+-	${CC} -o $@ -Wl,-soname,$@ ${LDFLAGS} $<
++	${CC} -o $@ -Wl,-soname,$@ $< ${LDFLAGS}
+ 
+ clean: 
+ 	@rm -f ${OBJ} ${LIBS}
+-- 
+1.7.8.4
+
diff --git a/community/libvisual-projectm/PKGBUILD b/community/libvisual-projectm/PKGBUILD
index ea201188d..76635d757 100644
--- a/community/libvisual-projectm/PKGBUILD
+++ b/community/libvisual-projectm/PKGBUILD
@@ -1,26 +1,36 @@
-# $Id: PKGBUILD 61634 2009-12-20 18:27:47Z andrea $
+# $Id: PKGBUILD 62640 2012-01-23 02:32:15Z lfleischer $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=libvisual-projectm
 pkgver=2.0.1
-pkgrel=1
-pkgdesc="ProjectM XMMS plugin"
+pkgrel=3
+pkgdesc='ProjectM XMMS plugin.'
 arch=('i686' 'x86_64')
-url="http://projectm.sourceforge.net/"
+url='http://projectm.sourceforge.net/'
 license=('GPL')
 depends=('projectm>=2.0.1' 'libvisual' 'sdl')
 makedepends=('pkgconfig' 'cmake' 'libxext')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/projectm/projectM_libvisual-${pkgver}-Source.tar.gz)
-md5sums=('35e09b09210d48b437e3574bd00b15a8')
+source=("http://downloads.sourceforge.net/projectm/projectM_libvisual-${pkgver}-Source.tar.gz"
+        'libvisual-projectm-gcc-4.6.patch')
+md5sums=('35e09b09210d48b437e3574bd00b15a8'
+         'a1fa2fd4fc85b1f27e32d400e17a3196')
 
 build() {
-  cd ${srcdir}
-  mkdir build
-  cd build
-  cmake ../projectM_libvisual-${pkgver}-Source \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release || return 1
-  make || return
-  make DESTDIR=${pkgdir} install || return
+  cd "${srcdir}"
+
+  # fix build failure with GCC 4.6 (taken from SVN, revision 1355)
+  (cd "projectM_libvisual-${pkgver}-Source" && patch -p3 -i ../libvisual-projectm-gcc-4.6.patch)
+
+  mkdir build && cd build
+
+  cmake "../projectM_libvisual-${pkgver}-Source" \
+    -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/libvisual-projectm/libvisual-projectm-gcc-4.6.patch b/community/libvisual-projectm/libvisual-projectm-gcc-4.6.patch
new file mode 100644
index 000000000..0e1234f83
--- /dev/null
+++ b/community/libvisual-projectm/libvisual-projectm-gcc-4.6.patch
@@ -0,0 +1,11 @@
+--- trunk/src/projectM-libvisual/actor_projectM.cpp	2009/02/20 19:07:44	1210
++++ trunk/src/projectM-libvisual/actor_projectM.cpp	2011/05/06 12:04:58	1355
+@@ -209,7 +209,7 @@
+  * we aren't with projectm, so just ignore :) */
+ extern "C" VisPalette *lv_projectm_palette (VisPluginData *plugin)
+ {
+-	return NULL;
++	return (VisPalette *) NULL;
+ }
+ 
+ /* This is where the real rendering happens! This function is what we call, many times
diff --git a/community/picard/PKGBUILD b/community/picard/PKGBUILD
index 9937c04db..a93739555 100644
--- a/community/picard/PKGBUILD
+++ b/community/picard/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 58419 2011-11-12 17:18:36Z ibiru $
+# $Id: PKGBUILD 62594 2012-01-22 09:34:17Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 # Contributor: sysrq
 
 pkgname=picard
 pkgver=0.16
-pkgrel=3
+pkgrel=4
 pkgdesc='Official MusicBrainz tagger'
 url='http://musicbrainz.org/doc/MusicBrainz_Picard'
 license=('GPL')
 arch=('i686' 'x86_64')
 depends=('python2-pyqt' 'mutagen' 'libofa' 'ffmpeg')
-optdepends=('libdiscid: CD-Lookup feature')
+optdepends=('libdiscid: CD lookup'
+            'chromaprint: fingerprinting')
 source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('274071410550ee29051bb0137d72602921a015f9')