Thu Sep 27 00:42:07 PDT 2012

5 files changed, 124 insertions, 8 deletions

diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD
index 046e975d4..1274c5c59 100644
--- a/extra/feh/PKGBUILD
+++ b/extra/feh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 166623 2012-09-13 11:39:21Z bisson $
+# $Id: PKGBUILD 167159 2012-09-26 17:14:45Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=feh
-pkgver=2.6.1
+pkgver=2.6.2
 pkgrel=1
 pkgdesc='Fast and light imlib2-based image viewer'
 url='http://feh.finalrewind.org/'
@@ -16,7 +16,7 @@ optdepends=('perl: feh-cam, webcam wrapper for feh'
             'imagemagick: support more file formats')
 makedepends=('libxt')
 source=("${url}${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('09f2c03b0fc6b9e37fb998e42e3f7626b9fdfbad')
+sha1sums=('a2c6cf99ef2128834d14c0367cb5a9a11957ba6c')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnu-efi-libs/PKGBUILD b/extra/gnu-efi-libs/PKGBUILD
new file mode 100644
index 000000000..f71cd69b5
--- /dev/null
+++ b/extra/gnu-efi-libs/PKGBUILD
@@ -0,0 +1,75 @@
+# $Id: PKGBUILD 167140 2012-09-26 06:30:46Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer : Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
+
+_pkgver="3.0"
+pkgname="gnu-efi-libs"
+pkgver="${_pkgver}q"
+pkgrel="1"
+pkgdesc="Library for building x86_64 and i386 UEFI Applications using GNU toolchain"
+url="http://sourceforge.net/projects/gnu-efi/"
+license=('GPL')
+arch=('i686' 'x86_64')
+makedepends=('pciutils')
+if [[ "${CARCH}" == "x86_64" ]]; then
+	makedepends+=('lib32-glibc')
+fi
+conflicts=('gnu-efi')
+provides=('gnu-efi')
+replaces=('gnu-efi')
+options=('!strip' '!makeflags')
+source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz")
+sha1sums=('99d29be5fd17dfca762cf0e265477862c21d63bb')
+
+_build_gnu-efi-libs-x86_64() {	
+	cp -r "${srcdir}/gnu-efi-${_pkgver}" "${srcdir}/gnu-efi-${_pkgver}-x86_64"
+	cd "${srcdir}/gnu-efi-${_pkgver}-x86_64/"
+	ARCH="x86_64" make
+	ARCH="x86_64" make -C apps all	
+}
+
+_build_gnu-efi-libs-i386() {
+	cp -r "${srcdir}/gnu-efi-${_pkgver}" "${srcdir}/gnu-efi-${_pkgver}-i386"
+	cd "${srcdir}/gnu-efi-${_pkgver}-i386/"	
+	ARCH="ia32" make
+	ARCH="ia32" make -C apps all	
+}
+
+build() {	
+	## Fix Makefiles to enable compile for both UEFI arch
+	sed 's|INSTALLROOT=/usr/local|INSTALLROOT ?= /usr/lib|g' -i "${srcdir}/gnu-efi-${_pkgver}/Make.defaults"
+	sed 's|LIBDIR=lib|LIBDIR ?= lib|g' -i "${srcdir}/gnu-efi-${_pkgver}/Make.defaults"
+	sed 's|ARCH	   :=|ARCH	   ?=|g' -i "${srcdir}/gnu-efi-${_pkgver}/Make.defaults"
+	sed 's|-fno-strict-aliasing|-fno-strict-aliasing -fno-stack-protector|g' -i "${srcdir}/gnu-efi-${_pkgver}/Make.defaults"
+	if [[ "${CARCH}" == "x86_64" ]]; then
+		_build_gnu-efi-libs-x86_64
+	fi
+	_build_gnu-efi-libs-i386	
+}
+
+_package_gnu-efi-libs-x86_64() {
+	cd "${srcdir}/gnu-efi-${_pkgver}-x86_64/"	
+	make ARCH="x86_64" INSTALLROOT="${pkgdir}/usr/" LIBDIR="lib" install
+	install -d "${pkgdir}/usr/share/gnu-efi/x86_64/"
+	install -D -m0644 "${srcdir}/gnu-efi-${_pkgver}-x86_64/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/x86_64/"
+}
+
+_package_gnu-efi-libs-i386() {	
+	cd "${srcdir}/gnu-efi-${_pkgver}-i386/"
+	make ARCH="ia32" INSTALLROOT="${pkgdir}/usr/" LIBDIR="${_LIBDIR32}" install
+	install -d "${pkgdir}/usr/share/gnu-efi/i386/"
+	install -D -m0644 "${srcdir}/gnu-efi-${_pkgver}-i386/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/i386/"	
+}
+
+package() {
+	if [[ "${CARCH}" == "x86_64" ]]; then
+		_package_gnu-efi-libs-x86_64
+		
+		_LIBDIR32="lib32"
+		_package_gnu-efi-libs-i386
+	else
+		_LIBDIR32="lib"
+		_package_gnu-efi-libs-i386
+	fi	
+}
diff --git a/extra/ladspa/PKGBUILD b/extra/ladspa/PKGBUILD
index 3f0fb5aad..4885aaa34 100644
--- a/extra/ladspa/PKGBUILD
+++ b/extra/ladspa/PKGBUILD
@@ -1,22 +1,25 @@
-# $Id: PKGBUILD 137623 2011-09-10 08:28:05Z pierre $
+# $Id: PKGBUILD 167138 2012-09-26 05:02:07Z foutrelis $
 # Maintainer: damir <damir@archlinux.org>
 
 pkgname=ladspa
 pkgver=1.13
-pkgrel=3
+pkgrel=4
 pkgdesc="Linux Audio Developer's Simple Plugin API (LADSPA)"
 arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://www.ladspa.org/"
 depends=('gcc-libs')
 source=("http://www.ladspa.org/download/${pkgname}_sdk_${pkgver}.tgz"
-        'hardcode-path.patch')
+        'fix-memleak-in-plugin-scanning.patch'
+        'fallback-ladspa-path.patch')
 md5sums=('671be3e1021d0722cadc7fb27054628e'
-         '27743258232d828575d66940e6de2858')
+         '478c400e04c9db9cfd6ee1198beec9c5'
+         '8a0ad7d442662af160381e7302c6ed4c')
 
 build() {
   cd "${srcdir}/${pkgname}_sdk/src"
-  patch -Np1 -i "${srcdir}/hardcode-path.patch"
+  patch -Np1 -i "${srcdir}/fix-memleak-in-plugin-scanning.patch"
+  patch -Np2 -i "${srcdir}/fallback-ladspa-path.patch"
   sed \
     -e 's/mkdirhier/mkdir -p/' \
     -e "s#-O3#${CFLAGS} ${LDFLAGS/,--as-needed/}#" \
diff --git a/extra/ladspa/fallback-ladspa-path.patch b/extra/ladspa/fallback-ladspa-path.patch
new file mode 100644
index 000000000..7743bf4b4
--- /dev/null
+++ b/extra/ladspa/fallback-ladspa-path.patch
@@ -0,0 +1,27 @@
+diff -upr ladspa_sdk.orig/src/load.c ladspa_sdk/src/load.c
+--- ladspa_sdk.orig/src/load.c	2012-09-26 07:37:24.000000000 +0300
++++ ladspa_sdk/src/load.c	2012-09-26 07:38:58.000000000 +0300
+@@ -54,6 +54,8 @@ dlopenLADSPA(const char * pcFilename, in
+        to search. */
+ 
+     pcLADSPAPath = getenv("LADSPA_PATH");
++    if (! pcLADSPAPath)
++      pcLADSPAPath = "/usr/lib/ladspa";
+     
+     if (pcLADSPAPath) {
+ 
+diff -upr ladspa_sdk.orig/src/search.c ladspa_sdk/src/search.c
+--- ladspa_sdk.orig/src/search.c	2012-09-26 07:37:24.000000000 +0300
++++ ladspa_sdk/src/search.c	2012-09-26 07:38:46.000000000 +0300
+@@ -99,10 +99,7 @@ LADSPAPluginSearch(LADSPAPluginSearchCal
+ 
+   pcLADSPAPath = getenv("LADSPA_PATH");
+   if (!pcLADSPAPath) {
+-    fprintf(stderr,
+-	    "Warning: You do not have a LADSPA_PATH "
+-	    "environment variable set.\n");
+-    return;
++    pcLADSPAPath = "/usr/lib/ladspa";
+   }
+   
+   pcStart = pcLADSPAPath;
diff --git a/extra/ladspa/fix-memleak-in-plugin-scanning.patch b/extra/ladspa/fix-memleak-in-plugin-scanning.patch
new file mode 100644
index 000000000..76cb2e864
--- /dev/null
+++ b/extra/ladspa/fix-memleak-in-plugin-scanning.patch
@@ -0,0 +1,11 @@
+--- src/search.c.orig	2008-11-07 00:38:18.000000000 +0100
++++ src/search.c	2008-11-07 00:50:51.000000000 +0100
+@@ -83,6 +83,8 @@
+ 	dlclose(pcFilename);
+ 	free(pcFilename);
+       }
++    } else {
++      free(pcFilename);
+     }
+   }
+ }