Merge branch 'master' of ssh://gparabola/srv/git/abslibre

Conflicts:
	libre/kdelibs-libre/PKGBUILD

12 files changed, 325 insertions, 61 deletions

diff --git a/pcr/bsnes/PKGBUILD b/pcr/bsnes/PKGBUILD
index 34a8031e9..04c61bc30 100644
--- a/pcr/bsnes/PKGBUILD
+++ b/pcr/bsnes/PKGBUILD
@@ -1,63 +1,77 @@
 # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+# Split-package support hack for AUR.
 pkgname='bsnes'
-pkgver=088
-pkgrel=1
-pkgdesc="Super Nintendo Entertainment System (SNES) emulator focused on accuracy."
+
+true && pkgbase='bsnes'
+true && pkgname=('bsnes' 'bsnes-purify')
+pkgver=090
+pkgrel=2
+pkgdesc='Super Nintendo Entertainment System (SNES) emulator focused on accuracy.'
 arch=('i686' 'x86_64')
-url="http://byuu.org/bsnes/"
+url='http://byuu.org/bsnes/'
 license=('GPL3')
-depends=('libao' 'libgl' 'libxv' 'openal' 'sdl' 'qt>=4.7.0')
+depends=('libao' 'libgl' 'libxv' 'openal' 'sdl' 'qt>=4.8.0')
 makedepends=('pkgconfig' 'mesa')
 install='bsnes.install'
 changelog='bsnes.changelog'
-source=('http://bsnes.googlecode.com/files/bsnes_v088-source.tar.xz' 'add-usr-share-fallback.patch')
-md5sums=('a3b2e9ba28b752768bb9f777049b1239' '8fde2bb14f8dafbd5276f9a6092b7ffb')
-
+source=('http://bsnes.googlecode.com/files/bsnes_v090-source.tar.xz')
+md5sums=('c9642dae4255f5c6022b2217d64d3bc5')
 
-# Build the accuracy profile (you can also choose 'performance' or 'compatibility')
+__base_path="${srcdir}/${pkgbase}_v${pkgver}-source"
+# Build the accuracy profile (you can also choose 'performance' or 'compatibility').
 __profile='accuracy'
 
 build() {
-  cd "${srcdir}/${pkgname}_v${pkgver}-source/${pkgname}"
+  cd "${__base_path}/${pkgname}"
 
   # Makefile hacks:
   # Disable pulseaudio.
   sed -e 's|audio.pulseaudio ||' \
       -e 's|audio.pulseaudiosimple ||' \
-      -i 'target-ui/Makefile'
+      -i 'target-ethos/Makefile'
   # Don't copy the cheat file.
   sed -e '/mkdir -p ~\/.config\/$(name)/{N;d}' \
       -e '/cp data\/cheats.xml/{N;d}' \
-      -i 'target-ui/Makefile'
+      -i 'target-ethos/Makefile'
   # Don't use sudo
   sed -e 's/sudo install/install/' \
-      -i 'target-ui/Makefile'
-
-  # Apply patch to make bsnes look in /usr/share/bsnes for filters/shaders.
-  patch -p0 < "${srcdir}/add-usr-share-fallback.patch"
+      -i 'target-ethos/Makefile'
 
   # Fix building with QT >= 4.8.0.
   moc -i -Iphoenix/qt/ -o phoenix/qt/platform.moc phoenix/qt/platform.moc.hpp
 
   # Compile bsnes.
-  make flags="$CXXFLAGS -I. -DPROFILE_${__profile^^}" compiler=gcc platform=x profile=${__profile} phoenix=qt
+  make flags="$CXXFLAGS -I. -DPROFILE_${__profile^^}" compiler=gcc platform=x \
+       profile=${__profile} phoenix=qt target=ethos
+
+  # Compile purify.
+  cd "${__base_path}/purify"
+  moc -i -Iphoenix/qt/ -o phoenix/qt/platform.moc phoenix/qt/platform.moc.hpp
+  sed -e 's|link := -s|link := -s -lX11|' -i 'Makefile'
+  make compiler=gcc platform=x phoenix=qt
+}
+
+package_bsnes-purify() {
+  pkgver=01
+  pkgdesc='ROM cleanup utility for bsnes.'
+  install=''
 
-  # Compile the filters.
-  cd "${srcdir}/${pkgname}_v${pkgver}-source/snesfilter"
-  make compiler=gcc platform=x
+  cd "${__base_path}/purify"
+  install --directory "${pkgdir}/usr/bin"
+  install --mode=755 "${__base_path}/purify/purify" "${pkgdir}/usr/bin/${pkgbase}-purify"
 }
 
-package() {
-  cd "${srcdir}/${pkgname}_v${pkgver}-source/${pkgname}"
-  make install profile=${__profile} DESTDIR="${pkgdir}" prefix=/usr
+package_bsnes() {
+  pkgver=090
+  pkgrel=2
+  pkgdesc='Super Nintendo Entertainment System (SNES) emulator focused on accuracy.'
+  url='http://byuu.org/bsnes/'
 
-  # Install the filters/shaders
-  install --directory "${pkgdir}/usr/share/${pkgname}/filters"
-  install -D --mode=644 "${srcdir}/${pkgname}_v${pkgver}-source"/snesfilter/out/*.filter "${pkgdir}/usr/share/${pkgname}/filters"
-  install --directory "${pkgdir}/usr/share/${pkgname}/shaders"
-  install -D --mode=644 "${srcdir}/${pkgname}_v${pkgver}-source"/snesshader/*.shader "${pkgdir}/usr/share/${pkgname}/shaders"
+  cd "${__base_path}/${pkgname}"
+  make install profile=${__profile} DESTDIR="${pkgdir}" prefix=/usr
 
   # Install the user-profile into /usr/share/bsnes/profile.
   install --directory "${pkgdir}/usr/share/${pkgname}/profile"
-  cp -R "${srcdir}/${pkgname}_v${pkgver}-source/${pkgname}"/profile/* "${pkgdir}/usr/share/${pkgname}/profile"
+  cp -R "${__base_path}/${pkgname}"/profile/* "${pkgdir}/usr/share/${pkgname}/profile"
 }
diff --git a/pcr/bsnes/add-usr-share-fallback.patch b/pcr/bsnes/add-usr-share-fallback.patch
deleted file mode 100644
index 4d2b5cf3c..000000000
--- a/pcr/bsnes/add-usr-share-fallback.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- target-ui/general/main-window.cpp	2012-02-03 23:33:00.000000000 +0100
-+++ target-ui/general/main-window.cpp	2012-02-13 18:02:04.988109569 +0100
-@@ -331,6 +331,10 @@
-     path = { application->userpath, "filters/" };
-     files = directory::files(path, "*.filter");
-   }
-+  if(files.size() == 0) {
-+    path = { "/usr/share/bsnes/", "filters/" };
-+    files = directory::files(path, "*.filter");
-+  }
-   array<RadioItem&> group;
-
-   settingsVideoFilterList = new RadioItem[files.size()];
-@@ -362,6 +366,10 @@
-     path = { application->userpath, "shaders/" };
-     files = directory::files(path, { "*.", config->video.driver, ".shader" });
-   }
-+  if(files.size() == 0) {
-+    path = { "/usr/share/bsnes/", "shaders/" };
-+    files = directory::files(path, { "*.", config->video.driver, ".shader" });
-+  }
-   array<RadioItem&> group;
-
-   settingsVideoShaderList = new RadioItem[files.size()];
diff --git a/pcr/bsnes/bsnes.changelog b/pcr/bsnes/bsnes.changelog
index 589a929d2..9328c9aee 100644
--- a/pcr/bsnes/bsnes.changelog
+++ b/pcr/bsnes/bsnes.changelog
@@ -1,3 +1,16 @@
+2012-08-07 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 090-2 :
+	Make sure to build bsnes purify with QT.
+
+2012-08-07 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 090-1 :
+	New upstream release.
+
+	* add-usr-share-fallback.patch :
+	Remove patch as filter/shader support has been removed.
+
 2012-04-24 [vEX] <niechift.dot.vex.at.gmail.dot.com>
 
 	* 088-1 :
diff --git a/pcr/bsnes/bsnes.install b/pcr/bsnes/bsnes.install
index f18765649..2e40f6bba 100644
--- a/pcr/bsnes/bsnes.install
+++ b/pcr/bsnes/bsnes.install
@@ -6,7 +6,13 @@ post_install() {
 ## arg 1:  the new package version
 ## arg 2:  the old package version
 post_upgrade() {
-  echo 'You should copy the /usr/share/bsnes/profile/ data into your'
-  echo '~/.config/bsnes/ folder unless you have already done so. It contains'
-  echo 'files that the emulator needs to function properly.'
+  echo 'As of 090 bsnes requires a new directory layout for the ROMs. You can'
+  echo 'use bsnes-purify to create it. You should also copy the '
+  echo '/usr/share/bsnes/profile/ data into your ~/.config/bsnes/ folder unless'
+  echo 'you have already done so. It contains files that the emulator needs to'
+  echo 'function properly.'
+
+  if [ "$(vercmp $2 090)" -lt 0 ]; then
+    echo 'The profile data changed with release 090, update your files.'
+  fi
 }
diff --git a/pcr/mednafen-wip/PKGBUILD b/pcr/mednafen-wip/PKGBUILD
new file mode 100755
index 000000000..cc33eeb75
--- /dev/null
+++ b/pcr/mednafen-wip/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Hans-Kristian Arntzen <maister@archlinux.us>
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Contributor: kagan <juanynie@mi.madritel.es>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+pkgname=mednafen-wip
+pkgver=0.9.24
+pkgrel=1
+pkgdesc="A command-line multi-system gaming emulator, WIP version"
+url="http://mednafen.sourceforge.net/"
+license=(GPL)
+arch=('i686' 'x86_64')
+depends=('libcdio>=0.82' 'libsamplerate' 'libogg' 'libvorbis' 'sdl' 'libsndfile' 'zlib')
+makedepends=('pkgconfig' 'mesa')
+conflicts=('mednafen')
+provides=('mednafen')
+source=('http://forum.fobby.net/index.php?t=getfile&id=380&')
+sha1sums=('bc0d867a3fa255f01d04ee6f028acab18849f16d')
+
+build() 
+{
+   cd $srcdir/mednafen
+   ./configure --prefix=/usr
+   make
+}
+
+package()
+{
+   cd $srcdir/mednafen
+   make DESTDIR=$pkgdir install
+}
diff --git a/pcr/python2-pysfml2-git/PKGBUILD b/pcr/python2-pysfml2-git/PKGBUILD
new file mode 100644
index 000000000..6bd8e759c
--- /dev/null
+++ b/pcr/python2-pysfml2-git/PKGBUILD
@@ -0,0 +1,49 @@
+# Maintainer: Philippe Huerlimann <phihue@gmail.com>
+pkgname=python2-pysfml2-git
+pkgver=20120804
+pkgrel=1
+pkgdesc="A Python 2 binding for SFML 2, written with Cython."
+arch=('i686' 'x86_64')
+url="http://pysfml2-cython.readthedocs.org/"
+license=('BSD')
+depends=('sfml-git' 'python2')
+makedepends=('cython2' 'git')
+source=()
+md5sums=() 
+_gitroot='https://github.com/bastienleonard/pysfml2-cython.git'
+_gitname='pysfml2-cython'
+
+build() {
+	cd "$srcdir"
+	msg "Connecting to GIT server...."
+
+	if [ -d $_gitname ] ; then
+		cd $_gitname && git pull origin
+		msg "The local files are updated."
+	else
+		git clone $_gitroot $_gitname
+	fi
+
+	msg "GIT checkout done or server timeout"
+	msg "Starting make..."
+
+	rm -rf "$srcdir/$_gitname-build"
+	git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
+	cd "$srcdir/$_gitname-build"
+
+	python2 setup.py build
+}
+
+package() {
+	cd "$srcdir/$_gitname-build"
+	python2 setup.py install --root="${pkgdir}" --prefix=/usr
+
+	# Copying the examples
+	cp -R examples "${pkgdir}/usr/lib/python2.7/site-packages/pysfml"
+
+	# Copying the License file
+	install -D -m644 "$srcdir/$_gitname-build/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+	# Fixing permissions
+	chmod 644 "${pkgdir}"/usr/lib/python2.7/site-packages/sfml.so
+}
diff --git a/pcr/ryzom-client/PKGBUILD b/pcr/ryzom-client/PKGBUILD
index 74d999d29..dbcd531f4 100644
--- a/pcr/ryzom-client/PKGBUILD
+++ b/pcr/ryzom-client/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
 pkgname=('ryzom-client')
 pkgver=0.8.0
-pkgrel=6
+pkgrel=7
 arch=('x86_64' 'i686')
 url="http://www.ryzom.com"
 license=('AGPL3')
@@ -29,7 +29,7 @@ build() {
   fi
   
   cd "ryzom-client"
-  cmake .. -Wno-dev -DFINAL_VERSION=ON -DWITH_RYZOM_CLIENT=ON -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL=OFF -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 -DWITH_SYMBOLS=ON
+  cmake .. -Wno-dev -DFINAL_VERSION=ON -DWITH_RYZOM_CLIENT=ON -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL=OFF -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
 
   make -j3
 }
@@ -39,4 +39,4 @@ package() {
   make DESTDIR="$pkgdir" install
 }
 
-sha256sums=('0abcf7daa01dab27a3b9a9276e521369693963be3a25624b3195023495212bc2')
\ No newline at end of file
+sha256sums=('0abcf7daa01dab27a3b9a9276e521369693963be3a25624b3195023495212bc2')
diff --git a/pcr/ryzom-nel/PKGBUILD b/pcr/ryzom-nel/PKGBUILD
index f7dd7c580..b45bef098 100644
--- a/pcr/ryzom-nel/PKGBUILD
+++ b/pcr/ryzom-nel/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
 pkgname='ryzom-nel'
 pkgver=0.8.0
-pkgrel=10
+pkgrel=11
 arch=('x86_64' 'i686')
 conflicts=('ryzom-nel')
 groups=('ryzom')
@@ -40,7 +40,7 @@ build() {
   cd $pkgname
 
   #CMAKE_USE_RELATIVE_PATHS=true
-  cmake .. -Wno-dev -DWITH_RYZOM=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL=ON -DCMAKE_INSTALL_PREFIX=/usr -DNL_ETC_PREFIX=/etc/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DNL_SHARE_PREFIX=/usr/share/nel -DNL_BIN_PREFIX=/usr/bin -DNL_SBIN_PREFIX=/usr/sbin -DNL_LIB_PREFIX=/usr/lib/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DWITH_SYMBOLS=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON
+  cmake .. -Wno-dev -DWITH_RYZOM=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL=ON -DCMAKE_INSTALL_PREFIX=/usr -DNL_ETC_PREFIX=/etc/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DNL_SHARE_PREFIX=/usr/share/nel -DNL_BIN_PREFIX=/usr/bin -DNL_SBIN_PREFIX=/usr/sbin -DNL_LIB_PREFIX=/usr/lib/nel -DNL_DRIVER_PREFIX=/usr/lib/nel
 
   make -j3
 }
diff --git a/pcr/sfml-git/PKGBUILD b/pcr/sfml-git/PKGBUILD
new file mode 100644
index 000000000..be243d639
--- /dev/null
+++ b/pcr/sfml-git/PKGBUILD
@@ -0,0 +1,67 @@
+# Maintainer: Ondrej Martinak <omartinak@gmail.com>
+# Contributor: Jorge Araya Navarro <jorgean@lavabit.com>
+
+pkgname=sfml-git
+pkgver=20120805
+pkgrel=1
+pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API.'
+arch=('i686' 'x86_64')
+url='http://www.sfml-dev.org/'
+license=('zlib')
+depends=('libsndfile' 'libxrandr' 'libjpeg' 'openal' 'glew' 'freetype2')
+makedepends=('git' 'mesa' 'cmake' 'doxygen')
+conflicts=('sfml')
+provides=('sfml')
+source=("arial.patch")
+
+_gitroot='https://github.com/LaurentGomila/SFML.git'
+_gitname='SFML'
+_gitchangeset='191730ac0d639cfdef8fae560cdbc7d7e8c67db1'
+
+build() {
+  cd "$srcdir"
+  msg "Connecting to GIT server...."
+
+  if [ -d $_gitname ] ; then
+    cd $_gitname && git pull origin
+    msg "The local files are updated."
+  else
+    git clone $_gitroot
+    cd $_gitname
+  fi
+
+  msg "GIT checkout done or server timeout"
+  msg "Starting make..."
+
+  rm -rf "$srcdir/$_gitname-build"
+  cd "$srcdir"
+  git checkout $_gitchangeset >& /dev/null
+  #Applying the patch
+  cp "$srcdir/arial.patch" "$srcdir/$_gitname/src/$_gitname/"
+  cd "$srcdir/$_gitname/src/$_gitname/"
+  patch -p3 -i arial.patch
+
+  cp -r "$srcdir/$_gitname" "$srcdir/$_gitname-build"
+  cd "$srcdir/$_gitname-build"
+
+  mkdir build && cd build
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
+        -DSFML_BUILD_DOC=true \
+        -DSFML_BUILD_EXAMPLES=true
+  make
+  make doc
+}
+
+package() {
+  cd "$srcdir/$_gitname-build/build"
+
+  make DESTDIR="$pkgdir/" install
+
+  install -Dm644 "$pkgdir/usr/share/SFML/cmake/Modules/FindSFML.cmake" "$pkgdir/usr/share/cmake-2.8/Modules/FindSFML.cmake"
+
+  install -Dm644 ../license.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+
+  make clean
+}
+
+sha256sums=('4a1a0991b45c93584405be7c7920d92ec95f39d2af533f6d09b0094e4110eae8')
diff --git a/pcr/sfml-git/arial.patch b/pcr/sfml-git/arial.patch
new file mode 100644
index 000000000..a9225065b
--- /dev/null
+++ b/pcr/sfml-git/arial.patch
@@ -0,0 +1,10 @@
+--- SFML-a/src/SFML/Graphics/CMakeLists.txt	2012-08-03 19:41:49.885910580 -0600
++++ SFML-b/src/SFML/Graphics/CMakeLists.txt	2012-08-03 19:42:53.578898858 -0600
+@@ -4,7 +4,6 @@
+ 

+ # all source files

+ set(SRC

+-    ${SRCROOT}/Arial.hpp

+     ${INCROOT}/BlendMode.hpp

+     ${SRCROOT}/Color.cpp

+     ${INCROOT}/Color.hpp

diff --git a/pcr/yate/PKGBUILD b/pcr/yate/PKGBUILD
new file mode 100644
index 000000000..01428fa27
--- /dev/null
+++ b/pcr/yate/PKGBUILD
@@ -0,0 +1,36 @@
+    # Maintainer: said
+    # Contributor: Yejun Yang <yejunx AT gmail DOT com>
+    # Contributor: Biru Ionut <ionut@archlinux.ro>
+    pkgname=yate
+    pkgver=4.1.0
+    pkgrel=1
+    pkgdesc="next-generation telephony engine"
+    arch=('i686' 'x86_64')
+    url="http://yate.null.ro"
+    license=('GPL')
+    depends=('speex' 'gsm' 'postgresql-libs' 'libmysqlclient' \
+             'alsa-lib')
+    makedepends=('pkgconfig')
+    source=(http://yate.null.ro/tarballs/yate4/${pkgname}-${pkgver}-1.tar.gz yate.init)
+    options=(!makeflags)
+    
+    md5sums=('06adaa9b8dc4f18908b35e9659ab9ad5'
+         'c0d344607046c47c1d75ac23d323817a')
+         
+    build() {
+      cd $srcdir/${pkgname}
+      export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
+      ./configure --prefix=/usr \
+                  --sysconfdir=/etc \
+                  --with-libpq \
+                  --with-mysql \
+                  --without-openh323   
+      make    
+    }
+    
+    package(){
+      cd $srcdir/${pkgname}
+      make DESTDIR=$pkgdir install
+      install -D -m755 $srcdir/yate.init $pkgdir/etc/rc.d/yate
+    }
+    
\ No newline at end of file
diff --git a/pcr/yate/yate.init b/pcr/yate/yate.init
new file mode 100755
index 000000000..762fff8c7
--- /dev/null
+++ b/pcr/yate/yate.init
@@ -0,0 +1,61 @@
+#!/bin/bash
+OPTS="-rs -vvv -l /var/log/yate"
+
+# Source function library.
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+RETVAL=0
+
+# See how we were called.
+case "$1" in
+    start)
+	stat_busy "Starting YATE"
+        unset DISPLAY
+
+	yate -d -p /var/run/yate.pid $OPTS
+        RETVAL=$?
+	if [ $RETVAL -gt 0 ]; then
+	    stat_fail
+	else
+	    add_daemon yate
+	    touch /var/lock/yate
+	    stat_done
+	fi
+	;;
+    stop)
+	stat_busy "Stopping YATE"
+	[ -f /var/run/yate.pid ] && kill $(cat /var/run/yate.pid) > /dev/null 2>&1
+	RETVAL=$?
+	if [ $RETVAL -gt 0 ]; then
+	    stat_fail
+	else
+	    rm -f /var/run/yate.pid
+	    rm -f /var/lock/yate
+	    rm_daemon yate
+	    stat_done
+	fi
+	;;
+    status)
+        [ -f /var/run/yate.pid ]  && echo -e "Yate is running" || echo -e "Yate is not running"
+        ;;
+    restart)
+	$0 stop
+	sleep 1
+	$1 start
+	;;
+    condrestart)
+	if [ -f /var/lock/yate ]; then
+	    $0 stop
+	    $0 start
+	fi
+	;;
+    reload)
+  	pkill yate -HUP
+	RETVAL=$?
+        ;;
+    *)
+	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
+	;;
+esac
+exit $RETVAL