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

7 files changed, 173 insertions, 160 deletions

diff --git a/pcr/python-sfml2/PKGBUILD b/pcr/python-sfml2/PKGBUILD
index 48a8e4d30..41df1a9d0 100644
--- a/pcr/python-sfml2/PKGBUILD
+++ b/pcr/python-sfml2/PKGBUILD
@@ -1,33 +1,37 @@
 # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
 pkgname=python-sfml2
-pkgver=1.1.0
-pkgrel=2
-pkgdesc="A Python 3 binding for SFML 2, written with Cython."
+pkgver=1.2
+pkgrel=0
+pkgdesc="Python 3 binding for SFML 2, written with Cython."
 arch=('i686' 'x86_64')
 url="http://openhelbreath.net/python-sfml2"
-license=('GPL3')
+license=('LGPL3')
 depends=('sfml' 'python3')
 makedepends=('sfml' 'cython')
-conflicts=('python-sfml2')
-source=('http://openhelbreath.net/python-sfml2/downloads/python-sfml2-1.1.tar.gz')
+conflicts=('python-sfml2' 'python-pysfml2' 'python-pysfml2-git')
+source=('https://github.com/Sonkun/python-sfml/archive/v1.2.zip')
 optdepends=('pyqt: To use pysfml with Qt')
 
 build() {
-        cd "$srcdir/pysfml2-$pkgver"
-	    python3 setup.py build
+    cd "$srcdir/python-sfml-$pkgver"
+    python3 setup.py build
 }
 
 package() {
-	cd "$srcdir/pysfml2-$pkgver"
-	python3 setup.py install --root="${pkgdir}" --prefix=/usr
+    cd "$srcdir/python-sfml-$pkgver"
+    python3 setup.py install --root="${pkgdir}" --prefix=/usr
 
-	# Copying the examples
+    # Copying the examples
     install -d -m755 "${pkgdir}/usr/lib/python3.2/site-packages/sfml/examples"
     cp -R examples/ "${pkgdir}/usr/lib/python3.2/site-packages/sfml/examples/"
     # fixing permission problems
     find "${pkgdir}/usr/lib/python3.2/site-packages/sfml/examples/" -iname "*.*" -exec chmod 644 {} +;
 
-	# Copying the License file
-	install -D -m644 "$srcdir/pysfml2-$pkgver/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    # Copying the License file
+    LICENSEFILE="${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    if [ ! -e $LICENSEFILE ]
+    then
+        install -D -m644 "$srcdir/python-sfml-$pkgver/COPYING" $LICENSEFILE
+    fi
 }
-sha256sums=('111af2ead2a7c1f2a44145059889ecbb91c08bad21dd18764391b60256b92af1')
+sha256sums=('24bf5c29eed525f4e81a43c1700ae37f6582e653fcb7f58ee41144b8cf46ce29')
diff --git a/pcr/python2-sfml2/PKGBUILD b/pcr/python2-sfml2/PKGBUILD
index 263097e50..b612997f3 100644
--- a/pcr/python2-sfml2/PKGBUILD
+++ b/pcr/python2-sfml2/PKGBUILD
@@ -1,36 +1,40 @@
 # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
 pkgname=python2-sfml2
-pkgver=1.1.0
-pkgrel=2
-pkgdesc="A Python 2 binding for SFML 2, written with Cython."
+pkgver=1.2
+pkgrel=0
+pkgdesc="Python 2 binding for SFML 2, written with Cython."
 arch=('i686' 'x86_64')
 url="http://openhelbreath.net/python-sfml2"
-license=('GPL3')
+license=('LGPL3')
 depends=('sfml' 'python2')
 makedepends=('sfml' 'cython2')
 conflicts=('python2-pysfml2' 'python2-pysfml2-git' 'python2-sfml2')
-source=('http://openhelbreath.net/python-sfml2/downloads/python-sfml2-1.1.tar.gz')
+source=('https://github.com/Sonkun/python-sfml/archive/v1.2.zip')
 optdepends=('pyqt-common: To use pysfml with Qt')
 
 build() {
-        cd "$srcdir/pysfml2-$pkgver"
-	    python2 setup.py build
+    cd "$srcdir/python-sfml-$pkgver"
+    python2 setup.py build
 }
 
 package() {
-	cd "$srcdir/pysfml2-$pkgver"
-	python2 setup.py install --root="${pkgdir}" --prefix=/usr
+    cd "$srcdir/python-sfml-$pkgver"
+    python2 setup.py install --root="${pkgdir}" --prefix=/usr
 
-	# Copying the examples
+    # Copying the examples
     install -d -m755 "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples"
-        
-	cp -R examples/spacial_music "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/"
+
+    cp -R examples/spacial_music "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/"
     cp -R examples/pyqt4 "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/"
     cp -R examples/sound "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/"
 
     find "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/" -iname "*.*" -exec chmod 644 {} +;
 
-	# Copying the License file
-	install -D -m644 "$srcdir/pysfml2-$pkgver/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    # Copying the License file
+    LICENSEFILE="${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    if [ ! -e $LICENSEFILE ]
+    then
+        install -D -m644 "$srcdir/python-sfml-$pkgver/COPYING" $LICENSEFILE
+    fi
 }
-sha256sums=('111af2ead2a7c1f2a44145059889ecbb91c08bad21dd18764391b60256b92af1')
+sha256sums=('24bf5c29eed525f4e81a43c1700ae37f6582e653fcb7f58ee41144b8cf46ce29')
diff --git a/pcr/ryzom-client/PKGBUILD b/pcr/ryzom-client/PKGBUILD
deleted file mode 100644
index fce700054..000000000
--- a/pcr/ryzom-client/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
-pkgname=ryzom-client-hg
-pkgver=2691
-pkgrel=3
-pkgdesc='An awesome free software 3D MMORPG game'
-arch=('x86_64' 'i686')
-url="http://www.ryzom.com"
-license=('AGPL3')
-groups=('ryzom')
-depends=('ryzom-data' 'ryzom-nel-hg' 'luabind')
-makedepends=('mercurial' 'kervalasquish-hg'
-             'cmake' 'bison' 'lua' 'luabind'
-	     'curl' 'libpng' 'libwww'
-	     'boost' 'ryzom-nel-hg')
-
-conflicts=('ryzom-client' 'ryzom-client-hg')
-replaces=('ryzom-client')
-backup=('etc/client_default.cfg')
-source=('ftp://ftp.ryzom.com/1210062202_client_default.cfg')
-noextract=()
-
-_hgroot=http://ryzom.hg.sourceforge.net:8000/hgroot/ryzom/ryzom
-_hgrepo=ryzom
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to Mercurial server...."
-
-  if [[ -d "$_hgrepo" ]]; then
-    cd "$_hgrepo"
-    hg pull -u
-    msg "The local files are updated."
-  else
-    hg clone "$_hgroot" "$_hgrepo"
-  fi
-
-  msg "Mercurial checkout done or server timeout"
-  msg "Starting build..."
-
-  rm -rf "$srcdir/$_hgrepo-build"
-  cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build"
-  mkdir "$srcdir/$_hgrepo-build/code/ryzom-client"
-  cd "$srcdir/$_hgrepo-build/code/ryzom-client"
-
-  #
-  # BUILD HERE
-  #
-  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 -DRYZOM_GAMES_PREFIX=bin
-  
- make -j3
- 
- # Replacing client_default.cfg file
- cp "$srcdir/1210062202_client_default.cfg" "$srcdir/$_hgrepo-build/code/ryzom-client/ryzom/client/client_default.cfg"
- sed -i s/"data"/"\/usr\/share\/ryzom\/data"/ "$srcdir/$_hgrepo-build/code/ryzom-client/ryzom/client/client_default.cfg"
- sed -i 's/= 1\.33333;/= 1\.7777;/' "$srcdir/$_hgrepo-build/code/ryzom-client/ryzom/client/client_default.cfg"
-}
-
-package() {
-  cd "$srcdir/$_hgrepo-build/code/ryzom-client"
-  make DESTDIR="$pkgdir" install
-}
-
-sha256sums=('0753c04dd7d61c43ec88d59428752b609d65f439eb1de9018bf922294e65966f')
diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD
new file mode 100644
index 000000000..e01f42ef0
--- /dev/null
+++ b/pcr/ryzom-hg/PKGBUILD
@@ -0,0 +1,116 @@
+# 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
+
+
+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
+
+
+_hg_root='https://bitbucket.org/ryzom/ryzomcore'
+_hg_name='ryzomcore'
+
+prepare() {
+    if [ -d "$_hg_name" ] ; then # fetch sources
+	cd "$_hg_name"
+	hg pull && hg update
+	cd ..
+    else
+	hg clone "$_hg_root"
+    fi
+
+    msg2 "hg clone done or server timeout"
+}
+build() {
+    cd $_hg_name
+
+    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
+
+    fi
+
+}
+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
+	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
+
+    }
+
+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
+
+    }
+
+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')
diff --git a/pcr/ryzom-hg/ryzom.desktop b/pcr/ryzom-hg/ryzom.desktop
new file mode 100644
index 000000000..d90063593
--- /dev/null
+++ b/pcr/ryzom-hg/ryzom.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Name=Ryzom
+Type=Application
+GenericName=ryzom
+Comment=Ryzom
+Exec=/usr/bin/ryzom
+Icon=/usr/share/ryzom/data/ryzom.png
+Terminal=false
+Hidden=false
+Categories=Game;RolePlaying;
diff --git a/pcr/ryzom-hg/ryzom.sh b/pcr/ryzom-hg/ryzom.sh
new file mode 100644
index 000000000..e3cff2c64
--- /dev/null
+++ b/pcr/ryzom-hg/ryzom.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+if groups | grep games > /dev/null 2>&1 ; then 
+  ryzom_sync 
+  exec ryzom_client
+  
+else 
+  echo "you need to be in games group to run ryzom"
+  exit 1
+fi
diff --git a/pcr/ryzom-nel/PKGBUILD b/pcr/ryzom-nel/PKGBUILD
deleted file mode 100644
index bc9fa3199..000000000
--- a/pcr/ryzom-nel/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
-pkgname=ryzom-nel-hg
-pkgver=2687
-pkgrel=3
-pkgdesc='An awesome free software 3D MMORPG game, NeL engine'
-arch=('x86_64' 'i686')
-url="http://www.ryzom.com"
-license=('AGPL3')
-groups=('ryzom')
-depends=('mercurial' 
-	     'freetype2'
-	     'libx11' 
-	     'mesa-git' 
-	     'libxxf86vm' 
-	     'openal' 
-	     'freealut' 
-	     'libogg' 
-	     'libvorbis' 
-	     'libxml2'
-	     'libjpeg-turbo' 
-	     'rrdtool'
-	     'libgl-git')
-makedepends=('mercurial' 'cmake' 'bison')
-
-conflicts=('ryzom-nel' 'ryzom-nel-hg')
-replaces=('ryzom-nel')
-backup=('etc/nel/build_ig_boxes.cfg'
-	'etc/nel/build_indoor_rbank.cfg'
-	'etc/nel/build_rbank.cfg'
-	'etc/nel/make_sheet_id.cfg'
-	'etc/nel/zviewer.cfg')
-
-_hgroot=http://ryzom.hg.sourceforge.net/hgroot/ryzom/ryzom
-_hgrepo=ryzom
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to Mercurial server...."
-
-  if [[ -d "$_hgrepo" ]]; then
-    cd "$_hgrepo"
-    hg pull -u
-    msg "The local files are updated."
-  else
-    hg clone "$_hgroot" "$_hgrepo"
-  fi
-
-  msg "Mercurial checkout done or server timeout"
-  msg "Starting build..."
-
-  rm -rf "$srcdir/$_hgrepo-build"
-  cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build"
-  mkdir "$srcdir/$_hgrepo-build/code/ryzom-nel"
-  cd "$srcdir/$_hgrepo-build/code/ryzom-nel"
-
-  #
-  # BUILD HERE
-  #
-  cmake .. -Wno-dev -DWITH_RYZOM=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL=ON -DCMAKE_INSTALL_PREFIX=/usr -DNL_ETC_PREFIX=/etc/nel
-  
- make -j3
-}
-
-package() {
-  cd "$srcdir/$_hgrepo-build/code/ryzom-nel"
-  make DESTDIR="$pkgdir" install
-}
-