Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

8 files changed, 154 insertions, 69 deletions

diff --git a/pcr/amsynth/PKGBUILD b/pcr/amsynth/PKGBUILD
index 58c097cf4..1cd3cccf6 100644
--- a/pcr/amsynth/PKGBUILD
+++ b/pcr/amsynth/PKGBUILD
@@ -1,26 +1,26 @@
-# Mantainer: Guest One <theguestone at gmail dot com>
+# Maintainer : Guest One <theguestone at gmail dot com>
 
 pkgname=amsynth
 pkgver=1.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Analogue Modeling SYNTHesizer"
-arch=('i686')
+arch=('i686' 'x86_64')
 url="http://code.google.com/p/amsynth/"
 license=('GPL')
-depends=('gtkmm' 'jack')
-source=(http://amsynth.googlecode.com/files/amSynth-${pkgver}.tar.gz)
+depends=('gtkmm' 'jack' 'liblo')
+makedepends=('desktop-file-utils' 'dssi' 'libtool' 'ladspa')
+install="$pkgname.install"
+source=("http://amsynth.googlecode.com/files/amSynth-$pkgver.tar.gz")
 md5sums=('991329e433bb8c496f9ca5158faf0bca')
 
 build() {
-  cd ${srcdir}/amSynth-${pkgver}
-
-  sed -i -e 's|/amSynth|/amsynth|' src/main.cc
-
-  autoreconf --force --install
+  cd "$srcdir/amSynth-$pkgver"
+  libtoolize
   ./configure --prefix=/usr
   make
+}
 
-  install -Dm755 src/amSynth ${pkgdir}/usr/bin/amSynth
-  mkdir -p ${pkgdir}/usr/share/${pkgname}
-  install -m644 skel/{Controllersrc,presets} ${pkgdir}/usr/share/${pkgname}/
+package() {
+  cd "$srcdir/amSynth-$pkgver"
+  make DESTDIR="$pkgdir/" install
 }
diff --git a/pcr/amsynth/amsynth.install b/pcr/amsynth/amsynth.install
new file mode 100644
index 000000000..e111ef946
--- /dev/null
+++ b/pcr/amsynth/amsynth.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/pcr/lua51-sql-mysql/PKGBUILD b/pcr/lua51-sql-mysql/PKGBUILD
new file mode 100644
index 000000000..04ffee934
--- /dev/null
+++ b/pcr/lua51-sql-mysql/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Sébastien Luttringer <seblu@archlinux.org>
+# Contributor: Anders Bergh <anders1@gmail.com>
+
+pkgname=lua51-sql-mysql
+pkgdesc='MySQL module for Lua 5.1'
+pkgver=2.2.0
+pkgrel=3
+arch=('i686' 'x86_64')
+url='http://www.keplerproject.org/luasql/'
+license=('MIT')
+depends=('lua51' 'libmariadbclient')
+source=("https://github.com/downloads/keplerproject/luasql/luasql-$pkgver.tar.gz")
+md5sums=('59d72db444c6369c936d4f03694db6b7')
+
+build() {
+  cd luasql-$pkgver
+  sed -i '24s,$,/lua5.1,' config
+  msg2 'Building MySQL support'
+  make T=mysql PREFIX=/usr DRIVER_LIBS="$(mysql_config --libs)" \
+    DRIVER_INCS="$(mysql_config --include) -fPIC"
+}
+
+package() {
+  cd luasql-$pkgver
+  install -Dm644 src/mysql.so "$pkgdir/usr/lib/lua/5.1/luasql/mysql.so"
+  install -Dm644 doc/us/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/nekobee/PKGBUILD b/pcr/nekobee/PKGBUILD
index 164b50ac9..4e71ae93d 100644
--- a/pcr/nekobee/PKGBUILD
+++ b/pcr/nekobee/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=nekobee
 pkgver=0.1.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A TB303-style synthesizer for DSSI"
 url="https://github.com/gordonjcp/nekobee"
 depends=('liblo' 'gtk2')
@@ -19,5 +19,9 @@ cd $startdir/src/$pkgname-$pkgver
 patch -p1 -i $srcdir/$pkgname.patch
 ./waf configure --prefix=/usr
 ./waf
-DESTDIR=$startdir/pkg ./waf install
+}
+
+package() {
+cd $startdir/src/$pkgname-$pkgver
+DESTDIR=$pkgdir ./waf install
 }
diff --git a/pcr/prboom/PKGBUILD b/pcr/prboom/PKGBUILD
new file mode 100644
index 000000000..03f53784e
--- /dev/null
+++ b/pcr/prboom/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 77655 2012-10-13 11:44:28Z allan $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Thayer Williams <thayer@archlinux.org>
+# Contributor: dale <dale@archlinux.org>
+
+pkgname=prboom
+pkgver=2.5.0
+pkgrel=7
+pkgdesc='A game engine which provides a program to play Doom levels.'
+url='http://prboom.sourceforge.net/'
+license=('GPL2')
+arch=('i686' 'x86_64' 'mips64el')
+depends=('libpng' 'sdl_mixer' 'sdl_net' 'glu')
+makedepends=('mesa')
+source=("http://downloads.sourceforge.net/prboom/${pkgname}-${pkgver}.tar.gz"
+        'libpng-1.4.patch')
+md5sums=('a8a15f61fa2626ab98051ab2703378c4'
+         'ba53474db8e747035ca2320a445e4ae0')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	patch -p1 < ../libpng-1.4.patch
+
+	./configure --prefix=/usr --disable-i386-asm
+	sed -i "s|/games|/bin|g" "${srcdir}/${pkgname}-${pkgver}/src/Makefile"
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+}
+
diff --git a/pcr/prboom/libpng-1.4.patch b/pcr/prboom/libpng-1.4.patch
new file mode 100644
index 000000000..a2215e37b
--- /dev/null
+++ b/pcr/prboom/libpng-1.4.patch
@@ -0,0 +1,21 @@
+diff -Naur prboom-2.5.0-orig/src/SDL/i_sshot.c prboom-2.5.0/src/SDL/i_sshot.c
+--- prboom-2.5.0-orig/src/SDL/i_sshot.c	2010-01-24 23:26:03.000000000 -0500
++++ prboom-2.5.0/src/SDL/i_sshot.c	2010-01-24 23:28:42.000000000 -0500
+@@ -231,7 +231,7 @@
+   if (fp)
+   {
+     png_struct *png_ptr = png_create_write_struct(
+-        PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn);
++        PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn);
+ 
+     if (png_ptr)
+     {
+@@ -279,7 +279,7 @@
+             break;
+         }
+       }
+-      png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
++      png_destroy_write_struct(&png_ptr,  NULL);
+     }
+     fclose(fp);
+   }
diff --git a/pcr/python2-sfml2/PKGBUILD b/pcr/python2-sfml2/PKGBUILD
index b612997f3..ed5249a25 100644
--- a/pcr/python2-sfml2/PKGBUILD
+++ b/pcr/python2-sfml2/PKGBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
 pkgname=python2-sfml2
-pkgver=1.2
+pkgver=master
 pkgrel=0
 pkgdesc="Python 2 binding for SFML 2, written with Cython."
 arch=('i686' 'x86_64')
-url="http://openhelbreath.net/python-sfml2"
+url="http://python-sfml.org"
 license=('LGPL3')
 depends=('sfml' 'python2')
 makedepends=('sfml' 'cython2')
 conflicts=('python2-pysfml2' 'python2-pysfml2-git' 'python2-sfml2')
-source=('https://github.com/Sonkun/python-sfml/archive/v1.2.zip')
+source=('https://github.com/Sonkun/python-sfml/archive/master.zip')
 optdepends=('pyqt-common: To use pysfml with Qt')
 
 build() {
@@ -37,4 +37,4 @@ package() {
         install -D -m644 "$srcdir/python-sfml-$pkgver/COPYING" $LICENSEFILE
     fi
 }
-sha256sums=('24bf5c29eed525f4e81a43c1700ae37f6582e653fcb7f58ee41144b8cf46ce29')
+sha256sums=('01bb4a07c3100807163cd2ddcb1208794b1dbac19706eabea430e23fbf00414b')
diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD
index e01f42ef0..8bc928115 100644
--- a/pcr/ryzom-hg/PKGBUILD
+++ b/pcr/ryzom-hg/PKGBUILD
@@ -1,29 +1,45 @@
 # Maintainer:Bjoern Bidar <theodorstormgrade@gmail.com
-# Maintainer:Jorge Araya Navarro <jorgean@lavabit.com>
 #_gui_toolkit=qt # qt or gtk
 _build_server=false # set true to build server (default:false)
 _build_client=true  # set false to don't build client (default:true)
 _CMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON'  '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=OFF'.) # cmake arguments for server and client
 _CMAKE_SERVER_ARGS=('-DWITH_RYZOM_SERVER=ON' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_DRIVER_OPENGL=OFF' '-DWITH_DRIVER_OPENAL=OFF' ) # cmake args for building server
 _CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' ) # cmake args for building client
-
 if [ $_build_client = true ] ; then
   true && pkgname=( 'ryzom-client-hg'  )
 fi
 
 if [ $_build_server = true ] ; then
   true && pkgname=( 'ryzom-client-hg' 'ryzom-server-hg')
-fi
+fi 
+pkgbase=ryzom-hg
+pkgname=ryzom-hg
+pkgver=20130331
+pkgrel=1
+pkgdesc="Ryzom is a Free to Play MMORPG . This version is for playing on an official server or launch a server"
+arch=('i686' 'x86_64')
+url="http://www.ryzom.com/"
+license=('AGPL3')
+depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2'  'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost'  'luabind' 'libsquish' 'lua51'  'lua51-sql-mysql') 
+conflicts=('ryzom-client-latest-hg')
+groups=('ryzom')
+makedepends=('mercurial' 'cpptest' 'cmake' 'bison')
+provides=('ryzom')
+source=( 'ryzom.sh' 'ryzom.desktop' )
+md5sums=('a5ca7dfae7b9073f78cd1b0b7380755f'
+         '71d5136d40ec4e76c2ac2b0c9e506aef')
+
+
 
 
 case $_gui_toolkit in
   qt) _CMAKE_COMMON_ARGS=( ${_CMAKE_COMMON_ARGS_ARGS[*]} '-DWITH_QT=ON' ) ;;
   gtk) _CMAKE_COMMON_ARGS=( ${_CMAKE_COMMON_ARGS_ARGS[*]} '-DWITH_GTK=ON' ) ;;
-esac
+esac 
 
 
 _hg_root='https://bitbucket.org/ryzom/ryzomcore'
-_hg_name='ryzomcore'
+_hg_name='ryzomcore' 
 
 prepare() {
     if [ -d "$_hg_name" ] ; then # fetch sources
@@ -33,84 +49,52 @@ prepare() {
     else
 	hg clone "$_hg_root"
     fi
-
+    
     msg2 "hg clone done or server timeout"
 }
 build() {
     cd $_hg_name
-
-    if [ $_build_client = true ] ; then
-
+    
+    if [ $_build_client = true ] ; then	
 	mkdir -p "$srcdir/build-client"
 	cd "$srcdir/build-client"
 	msg "client is $_build_client, building client"
 	cmake -b "$srcdir/$_hg_name/code"  ${_CMAKE_COMMON_ARGS_ARGS[*]} ${_CMAKE_CLIENT_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
 	msg "Starting make, to build client"
 	make
-
+	
     fi
-
+   
     if [ $_build_server = true ] ; then
 	mkdir -p "$srcdir/build-server"
 	cd "$srcdir/build-server"
 	msg "client is $_build_server, building server"
 	cmake -b "$srcdir/$_hg_name/code"  ${_CMAKE_COMMON_ARGS_ARGS[*]} ${_CMAKE_SERVER_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
-	msg "Starting make, to build server"
-	make
-
+	msg "Starting make, to build server"   
+	make	
     fi
-
 }
-if [ $_build_client = true ] ; then
 
+if [ $_build_client = true ] ; then
+    
     package_ryzom-client-hg() {
 	pkgdesc="Ryzom is a Free to Play MMORPG . This version is for playing on an official server"
 	depends=( 'curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'cmake' 'libpng' 'libjpeg' 'rrdtool' 'bison' 'libwww' 'boost' 'cpptest' 'luabind' 'libsquish' 'lua51'  'lua51-sql-mysql' 'ryzom-data' )
 	cd "$srcdir/build-client"
 	make DESTDIR="$pkgdir/" install
-	install -m 644 ${srcdir}/ryzom.desktop ${pkgdir}/usr/share/applications
+	install -Dm 644 ${srcdir}/ryzom.desktop ${pkgdir}/usr/share/applications
 	sed -ie 's/\/usr\/bin\/ryzom_client/ryzom/' ${pkgdir}/usr/share/applications/ryzom.desktop # replace ryzom_client with our script
-	cp ${srcdir}/ryzom.sh  ${pkgdir}/usr/bin/ryzom
-	chmod +x ${pkgdir}/usr/bin/ryzom
-	mkdir -p ${pkgdir}/usr/bin
-
+	install -Dm755  ${srcdir}/ryzom.sh  ${pkgdir}/usr/bin/ryzom	
     }
-
 fi
 
 if [ $_build_server = true ] ; then
-
+    
     package_ryzom-server-hg() {
 	pkgdesc="Ryzom is a Free to Play MMORPG . This is the version to run a server"
 	cd "$srcdir/build-server"
-	make DESTDIR="$pkgdir/" install
-     # install -m 644 ${srcdir}/ryzom.desktop ${pkgdir}/usr/share/applications
-     # sed -ie 's/\/usr\/bin\/ryzom_client/ryzom/' ${pkgdir}/usr/share/applications/ryzom.desktop # replace ryzom_client with our script
-	# cp ${srcdir}/ryzom.sh  ${pkgdir}/usr/bin/ryzom
-      #chmod +x ${pkgdir}/usr/bin/ryzom
-	mkdir -p ${pkgdir}/usr/bin
-
+	make DESTDIR="$pkgdir/" install	
     }
-
 fi
 
 
-
-
-
-pkgname=ryzom-hg
-pkgbase=ryzom-hg
-pkgver=20130331
-pkgrel=1
-pkgdesc="An awesome free software 3D MMORPG game"
-arch=('i686' 'x86_64')
-url="http://www.ryzom.com/"
-license=('AGPL3')
-depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2'  'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost'  'luabind' 'libsquish' 'lua51')  #'lua51-sql-mysql')
-conflicts=('ryzom-client-latest-hg' 'ryzom-client' 'ryzom-hg')
-groups=('ryzom')
-makedepends=('mercurial' 'cpptest' 'cmake' 'bison')
-provides=('ryzom')
-source=( 'ryzom.sh' 'ryzom.desktop' )
-md5sums=('a5ca7dfae7b9073f78cd1b0b7380755f'
-         '71d5136d40ec4e76c2ac2b0c9e506aef')