Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/virtualbox-modules/PKGBUILD
	community-testing/virtualbox/PKGBUILD
	community-testing/virtualbox/vbox-service.rc
	community-testing/virtualbox/vboxdrv-reference.patch
	core/cryptsetup/PKGBUILD
	core/ed/PKGBUILD
	core/module-init-tools/PKGBUILD
	libre/audacious-plugins-libre/PKGBUILD

5 files changed, 34 insertions, 14 deletions

diff --git a/community/flumotion/PKGBUILD b/community/flumotion/PKGBUILD
index c8380c111..37bd3d4c3 100644
--- a/community/flumotion/PKGBUILD
+++ b/community/flumotion/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 55283 2011-09-08 19:32:44Z spupykin $
+# $Id: PKGBUILD 58163 2011-11-07 13:53:24Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=flumotion
-pkgver=0.9.1
+pkgver=0.10.0
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="A streaming media server"
@@ -17,7 +17,7 @@ depends=('gtk2' 'pygtk' 'gstreamer0.10-python' 'kiwi' 'gstreamer0.10-good-plugin
 	'gstreamer0.10-base-plugins' 'python2-pyopenssl' 'twisted' 'gnome-vfs')
 makedepends=('perlxml')
 source=(http://www.flumotion.net/src/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('b2fa7c2e7ce8e2a5415f9096bfce783b')
+md5sums=('d7a34333346828f19f83b24886efde14')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD
index 5b71ad824..f0a9c65c5 100644
--- a/community/gmerlin/PKGBUILD
+++ b/community/gmerlin/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 57805 2011-11-03 09:25:18Z spupykin $
+# $Id: PKGBUILD 58153 2011-11-07 10:55:45Z spupykin $
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 
 pkgname=gmerlin
 pkgver=1.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Multimedia architecture for Linux"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://openmovieeditor.sourceforge.net/HomePage"
@@ -15,15 +15,18 @@ optdepends=('alsa-lib: for ALSA support'
 	    'libquicktime: for movie encoding'
 	    'pulseaudio: for PulseAudio support'
 	    'v4l-utils: for video conversion')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
 options=('!libtool')
-md5sums=('60d3c5081c8685ee7bc1afdfac8f6dc6')
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
+	libpng.patch)
+md5sums=('60d3c5081c8685ee7bc1afdfac8f6dc6'
+         'c262023434246705296d97bc7337a212')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   rm -rf cpuinfo.sh
 
+  patch -p1 <$srcdir/libpng.patch
   ./configure --prefix=/usr --without-doxygen
   make
 }
diff --git a/community/gmerlin/libpng.patch b/community/gmerlin/libpng.patch
new file mode 100644
index 000000000..c01105e63
--- /dev/null
+++ b/community/gmerlin/libpng.patch
@@ -0,0 +1,17 @@
+diff -wbBur gmerlin-1.0.0/plugins/png/ir_png.c gmerlin-1.0.0.my/plugins/png/ir_png.c
+--- gmerlin-1.0.0/plugins/png/ir_png.c	2011-01-07 18:37:06.000000000 +0300
++++ gmerlin-1.0.0.my/plugins/png/ir_png.c	2011-11-07 14:46:25.000000000 +0400
+@@ -127,13 +127,8 @@
+         bits = 16;
+         }
+       if(bit_depth < 8)
+-#if BG_MAKE_BUILD(PNG_LIBPNG_VER_MAJOR, PNG_LIBPNG_VER_MINOR, PNG_LIBPNG_VER_RELEASE) < BG_MAKE_BUILD(1,2,9)
+-        png_set_gray_1_2_4_to_8(png->png_ptr);
+-#else
+       png_set_expand_gray_1_2_4_to_8(png->png_ptr);
+-#endif
+ 
+-        png_set_gray_1_2_4_to_8(png->png_ptr);
+       if (png_get_valid(png->png_ptr, png->info_ptr, PNG_INFO_tRNS))
+         {
+         png_set_tRNS_to_alpha(png->png_ptr);
diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD
index ffc62aba9..f01801220 100644
--- a/community/lazarus/PKGBUILD
+++ b/community/lazarus/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 48949 2011-06-08 09:13:19Z spupykin $
+# $Id: PKGBUILD 58159 2011-11-07 11:17:57Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jens Adam (byte/jra) <j_adam@web.de>
 
 pkgname=lazarus
-pkgver=0.9.30
-pkgrel=2
+pkgver=0.9.30.2
+pkgrel=1
 pkgdesc='Delphi-like IDE for FreePascal'
 url='http://www.lazarus.freepascal.org/'
 license=('GPL2' 'MPL' 'custom:LGPL')
@@ -13,7 +13,7 @@ depends=('fpc' 'fpc-src' 'gtk2')
 #makedepends=(rpmextract)
 options=('!emptydirs' '!makeflags')
 source=(http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-src.tar.bz2)
-md5sums=('5ece11700df569ebb518ccca37d93f1d')
+md5sums=('0dcf54613c2f9d38a32d183431e2dfc9')
 
 build() {
   cd $srcdir/${pkgname}
diff --git a/community/nut/PKGBUILD b/community/nut/PKGBUILD
index e9a2de267..d08ffc87d 100644
--- a/community/nut/PKGBUILD
+++ b/community/nut/PKGBUILD
@@ -2,14 +2,14 @@
 # Contributor: Slash <demodevil5 [at] yahoo [dot] com>
 
 pkgname=nut
-pkgver=17.3
-pkgrel=2
+pkgver=17.4
+pkgrel=1
 pkgdesc='Records what you eat and analyzes your meals for nutrient levels in terms of the Daily Value or DV which is the standard for food labeling in the US.'
 url='http://nut.sourceforge.net/'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 source=("http://downloads.sourceforge.net/project/nut/nut/${pkgver}/nut-${pkgver}.tar.gz")
-md5sums=('791fa4730f82da66d539c0d4e82441a9')
+md5sums=('9d8b33fe0edbc54a6ebc8050dec7d56b')
 
 build() {
   cd ${pkgname}-${pkgver}