3 files changed, 35 insertions, 95 deletions
diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD
index 8277ccf17..01722ab34 100644
--- a/pcr/ryzom-hg/PKGBUILD
+++ b/pcr/ryzom-hg/PKGBUILD
@@ -1,64 +1,53 @@
 # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
 # Maintainer (aur): Bjoern Bidar <theodorstormgrade@gmail.com>
 
-pkgname=('ryzom-hg-nel' 'ryzom-hg-client')
-pkgbase="ryzom-hg"
-pkgver=20130706
-pkgrel=2
+pkgname='ryzom-hg'
+_hgver=ce26956d3a4a
+pkgver=20130727
+pkgrel="5"
+options=(debug strip) # there is a segmentation fault on ryzom_client executable
 pkgdesc="An awesome free software 3D MMORPG game"
 arch=('i686' 'x86_64')
 url="http://www.ryzom.com/"
 license=('AGPL3')
-groups=('ryzom-hg')
-depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost'  'luabind' 'libsquish' 'lua51' 'lua51-sql-mysql')
+depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost'  'luabind' 'libsquish-svn' 'lua51' 'lua51-sql-mysql')
 makedepends=('mercurial' 'cpptest' 'cmake' 'bison')
-# ryzom-20130706-2-any.src.tar.gz
-source=("http://repo.parabolagnulinux.org/other/ryzom-20130706-2-any.src.tar.gz"
-  'ryzom.sh'
+source=("libre://$pkgname-$pkgver.tar.gz"
   'ryzom.desktop')
-sha256sums=('03ddd23d0b2e92c419dcdebe264890b5b1c906992ae93225be43869739f9f475'
-            'd3d8286f5b60a63cbda83795cbe1a1d6e1442f33116502cc6563f8db86e458b6'
-            '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196')
-
-mksource=("$pkgname-$pkgver-${pkgrel}::hg+https://bitbucket.org/ryzomcore")
-
-_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_LIB_ARGS=('-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_DRIVER_OPENGL=OFF' '-DWITH_DRIVER_OPENAL=OFF' '-DWITH_NEL=ON')
+mksource=(".$pkgname-$pkgver::hg+https://bitbucket.org/ryzom/ryzomcore#revision=${_hgver}"
+  'ryzom.desktop')
 
-_CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' '-DWITH_NEL=OFF') # cmake args for building client
+_CAMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON'  '-DWITH_NEL_SAMPLES=OFF')
+_CMAKE_BOTH_ARGS=('-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' '-DWITH_NEL=ON' '-DWITH_DRIVER_OPENGL=ON' '-DWITH_DRIVER_OPENAL=ON')
 
-package_ryzom-hg-nel() {
-  # options and directives that can be overridden
-  #pkgver=20130706
-  #pkgrel=0
-  pkgdesc="An awesome free software 3D MMORPG game. NeL library."
-  #depends=()
-  
-  provides=('ryzom-hg-nel')
-  conflicts=('ryzom-hg-nel')
-  replaces=('ryzom-hg-nel')
+mksource() {
+  rm -rf "$srcdir/$pkgname-$pkgver"
+  cp "$srcdir/ryzom.desktop" "$srcdir/.$pkgname-$pkgver/code" 
+  cp -a "$srcdir/.$pkgname-$pkgver/code" "${srcdir}/${pkgname}-${pkgver}"
+}
 
-  mkdir -p "$srcdir/build-nel"
-  cd "$srcdir/build-nel"
+build() {
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+  cmake -b -Wno-dev "$srcdir/${pkgname}-${pkgver}" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_BOTH_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
+
+  make all
+}
 
-  cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_LIB_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
-  make
+package() {
+  cd "$srcdir/build"
   make DESTDIR="$pkgdir" install
+  install -Dm 644 "$srcdir/${pkgname}-${pkgver}/ryzom.desktop" "$pkgdir/usr/share/applications/"
 }
 
-package_ryzom-hg-client() {
-  # options and directives overrides
-  pkgdesc="An awesome free software 3D MMORPG game. Game client."
-  provides=('ryzom-hg-client')
-  conflicts=('ryzom-hg-client')
-  replaces=('ryzom-hg-client')
-  depends=('ryzom-hg-nel')
-
-  mkdir -p "$srcdir/build-client"
-  cd "$srcdir/build-client"
+mksha256sums=('SKIP'
+  '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196')
 
-  cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_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
-  make
-  make DESTDIR="$pkgdir" install
-}
+sha256sums=('a8c90f3f41fb3d497022a2d14a9aa39352557f5745f97b93d0bed61cebf85402'
+            '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196')
diff --git a/pcr/ryzom-hg/SRCBUILD b/pcr/ryzom-hg/SRCBUILD
deleted file mode 100644
index a04662b0d..000000000
--- a/pcr/ryzom-hg/SRCBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
-pkgname=("ryzom-hg")
-pkgver=20130708
-pkgrel=3
-pkgdesc="An awesome free software 3D MMORPG game"
-arch=(any)
-url="https://www.ryzom.com/"
-license=('AGPL3')
-makedepends=('mercurial')
-
-source=("ryzom.sh"
-  "ryzom.desktop")
-
-_hgroot='https://bitbucket.org/ryzom/ryzomcore'
-_hgrepo='ryzomcore'
-
-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"
-}
-
-package() {
-  PKGEXT=${SRCEXT}
-  PKGDEST=${SRCDEST}
-  cp ${srcdir}/ryzom.sh ${pkgdir}/
-  cp ${srcdir}/ryzom.desktop ${pkgdir}/
-  cp -a ${srcdir}/ryzomcore/code ${pkgdir}/
-}
-sha256sums=('d3d8286f5b60a63cbda83795cbe1a1d6e1442f33116502cc6563f8db86e458b6'
-            '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196')
diff --git a/pcr/ryzom-hg/ryzom.sh b/pcr/ryzom-hg/ryzom.sh
deleted file mode 100644
index e3cff2c64..000000000
--- a/pcr/ryzom-hg/ryzom.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/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