updating Ryzom (data and client) packages. Adding nel-hg package which contains the NeL engine to build MMORPG and which is required for Ryzom client to work.

Signed-off-by: shackra <elcorreo@deshackra.com>

6 files changed, 136 insertions, 42 deletions

diff --git a/.gitignore b/.gitignore
index 0df0dabdd..d57cb40ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,5 @@ pkg-libre/
 *.zip
 *.xz
 *.orig
+*.7z
+.*
\ No newline at end of file
diff --git a/pcr/nel-hg/PKGBUILD b/pcr/nel-hg/PKGBUILD
new file mode 100644
index 000000000..c0ab743f8
--- /dev/null
+++ b/pcr/nel-hg/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $
+# Maintainer: Jorge Araya Navarro <elcorreo@deshackra.com>
+pkgname='nel-hg'
+srcpkgname='ryzom-hg'
+hgver=923522b
+pkgver=20131215
+pkgrel=1
+pkgdesc="a toolkit for the development of massively online universes."
+arch=('i686' 'x86_64')
+url="http://www.ryzomcore.org/"
+license=('AGPL3')
+depends=('libpng' 'libjpeg' 'libwww-hg' 'boost' 'freetype2'
+  'luabind' 'libogg' 'libvorbis' 'openal' 'mesa' 'glu') # por saber
+makedepends=('mercurial' 'cpptest' 'cmake' 'bison')
+conflicts=('ryzom-nel' 'ryzom-client')
+# options=(!strip) # for debbuging propurses
+source=("https://repo.parabolagnulinux.org/other/$srcpkgname/$srcpkgname-$pkgver.tar.gz")
+sha256sums=('ad05f08004a80758a13566061ce29edfe4803c0c62e30190c437c781038c254e')
+
+
+mksource=("$srcpkgname-$pkgver::hg+https://bitbucket.org/ryzom/ryzomcore#revision=${hgver}")
+mksource() {
+  cd "$srcdir/$srcpkgname-$pkgver/"
+  rm -rf .hg*
+  cd "$srcdir/$srcpkgname-$pkgver/code/"
+  mv * ../
+  rm -rf "$srcdir/$srcpkgname-$pkgver/code/"
+  sed -i 's|<freetype/|<freetype2/|g' "${srcdir}/${srcpkgname}-${pkgver}/nel/src/3d/font_generator.cpp"
+}
+
+build() {
+  mkdir -p "$srcdir/build-nel"
+  cd "$srcdir/build-nel"
+  cmake -Wno-dev "$srcdir/${srcpkgname}-${pkgver}" -DFINAL_VERSION=ON -DWITH_STATIC=OFF -DWITH_NEL_TOOLS=OFF -DWITH_NEL_TESTS=OFF -DWITH_LUA51=ON  -DWITH_NEL_SAMPLES=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_CLIENT=OFF -DWITH_NEL=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON -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 -DFREETYPE_INCLUDE_DIRS="/usr/include;/usr/include/freetype2"
+
+  make -j1 all
+}
+
+package() {
+  cd "$srcdir/build-nel"
+
+  make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/ryzom-data/PKGBUILD b/pcr/ryzom-data/PKGBUILD
index 9f33a6794..2665cc411 100644
--- a/pcr/ryzom-data/PKGBUILD
+++ b/pcr/ryzom-data/PKGBUILD
@@ -1,45 +1,46 @@
-# Mantainer: Jorge Araya Navarro <jorgean@lavabit.com>
+# Mantainer: Jorge Araya Navarro <elcorreo@deshackra.com>
 pkgname='ryzom-data'
 group='ryzom'
 pkgver=0.8.0
-pkgrel=1
+pkgrel=2
 arch=('any')
 url="http://media.ryzom.com/"
 license=('CCPL:by-sa')
-makedepends=('rsync' 'p7zip')
-conflicts=('ryzom-data')
+depends=('rsync')
+makedepends=('p7zip')
 pkgdesc="An awesome free software 3D MMORPG game. Game data."
-source=("http://sourceforge.net/projects/ryzom/files/ryzom_client.7z/download" "updateryzomdata")
-noextract=("download")
-sha256sums=('fa9e44e1014f4ae8639f1ec092391a41f69fc343ce48dd39b55ffae06ec3291f'
-            'b42f74fd21cdbf6734214e5576dbbe7e4cf171bf5d712011fbea6529bd0123fd')
+source=("http://tempestintheaether.org/public_downloads/ryzom_core_client-data-22-09-2013.7z" "ryzomdata-update.sh")
+sha256sums=('f1110efb49bfb733f290ab5136986036a9f61fb692802714d9e6ec9b7e08f3ec'
+            '116c1c6bfe92bb55a6abf8401c290ef1505781a1cd76f67eb180f781f2034219')
+noextract=("ryzom_core_client-data-22-09-2013.7z")
+install=${pkgname}.install
 
-package() {
+prepare() {
   cd "$srcdir/"
-
-  if [[ -d "data" ]]; then
-     rm -rf data
-  fi
-
-  mv "download" "ryzom_client.7z"
+  
   msg "Extracting game data..."
-  7z x ryzom_client.7z ryzom/data/ >& /dev/null
-  cd ryzom/data/
+  7z x ryzom_core_client-data-22-09-2013.7z data/ >& /dev/null
+  msg "Extraction completed!"
 
+  cd "$srcdir/data/"
   msg "Updating the official Ryzom game data, this can take a while..."
-  rsync -rtzvu --progress --stats --recursive --timeout=30 www.ryzom.com::ryzom/data/ ./ >& /dev/null
-  msg 'Update completed...'
-
-  cd "$srcdir/ryzom/data"
+  rsync -rtzvu --progress --stats --recursive --timeout=30 www.ryzom.com::ryzom/data/ ./
+  msg 'Update completed!'
+}
 
+package() {
+  cd "$srcdir/data/"
   # creating directories
+  install -d -m 755 "$pkgdir/usr/bin/"
+  install -d -m 755 "$pkgdir/usr/share/ryzom/data/"
   install -d -m 755 "${pkgdir}/usr/share/ryzom/data/fonts/"
-  install -d -m 755 "${pkgdir}/etc/cron.d/"
-
+  
+  install -m 644 "$srcdir/ryzomdata-update.sh" "$pkgdir/usr/bin/"
+  chmod +x "$pkgdir/usr/bin/ryzomdata-update.sh"
+  
   # installing files
   install -m 644 fonts/* "${pkgdir}/usr/share/ryzom/data/fonts/"
   rm -rf fonts
 
   install -m 644 * "${pkgdir}/usr/share/ryzom/data/"
-  install -m 644 ${srcdir}/updateryzomdata "${pkgdir}/etc/cron.d/"
 }
diff --git a/pcr/ryzom-data/ryzom-data.install b/pcr/ryzom-data/ryzom-data.install
new file mode 100644
index 000000000..97fb2df21
--- /dev/null
+++ b/pcr/ryzom-data/ryzom-data.install
@@ -0,0 +1,19 @@
+pre_install() {
+    cat <<EOM
+  == IMPORTANT NOTICE ==
+
+  Check for data updates regularly using the command 'ryzomdata-update.sh'.
+  If you encounter any bug using that script, please report it (see links below)
+  and assign your report to shackra (which is me, the actual package maintainer).
+
+  Report any bug on:
+  * https://labs.parabola.nu
+EOM
+}
+
+pre_upgrade() {
+    pre_install
+}
+
+# vim:set ts=2 sw=2 et:
+# PS: vim sucks, Attn: Shackra, an EMACS user.
diff --git a/pcr/ryzom-data/ryzomdata-update.sh b/pcr/ryzom-data/ryzomdata-update.sh
new file mode 100755
index 000000000..ff59cf779
--- /dev/null
+++ b/pcr/ryzom-data/ryzomdata-update.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/sh
+# To the extent possible under law, Jorge Araya Navarro has waived all copyright and related or
+# neighboring rights to ryzomdata-update.sh. This work is published from: Costa Rica.
+
+error() {
+    printf '\E[31m'; echo "$@"; printf '\E[0m'
+}
+
+if [[ $(id -u) -ne 0 ]] ; then
+    error "Please run as root" ;
+    exit 1 ;
+fi
+
+# if running as root, then start the update.
+if [ -d "/usr/share/ryzom/data/" ]; then
+    cd /usr/share/ryzom/data
+    msg "Updating the official Ryzom game data, this can take a while..."
+    rsync -rtzvu --progress --stats --recursive --timeout=30 www.ryzom.com::ryzom/data/ ./
+    msg 'Update completed...'
+else
+    error "Seems that /usr/share/ryzom/data does not exists. Please install ryzom-data package using pacman."
+fi
diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD
index 2aa501159..392fc5850 100644
--- a/pcr/ryzom-hg/PKGBUILD
+++ b/pcr/ryzom-hg/PKGBUILD
@@ -1,38 +1,46 @@
-# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
+# Maintainer: Jorge Araya Navarro <elcorreo@deshackra.com>
 # Maintainer (aur): Bjoern Bidar <theodorstormgrade@gmail.com>
 
 pkgname='ryzom-hg'
-_hgver=923522b
+hgver=923522b
 pkgver=20131215
 pkgrel=3
 pkgdesc="An awesome free software 3D MMORPG game"
 arch=('i686' 'x86_64')
 url="http://www.ryzom.com/"
 license=('AGPL3')
-depends=('curl' 'hicolor-icon-theme' 'libvorbis' 'libjpeg' 'libwww-hg' 'luabind' 'ryzom-data')
-conflicts=('ryzom')
-makedepends=('mercurial' 'cpptest' 'cmake' 'bison' 'freealut' 'rrdtool' 'boost' 'freetype2')
-source=("libre://$pkgname-$pkgver.tar.gz")
+#depends=('nel-hg' 'ryzom-data' 'lua51') # use these when https://bitbucket.org/ryzom/ryzomcore/issue/149 is solved
+depends=('libpng' 'libjpeg' 'libwww-hg' 'boost' 'freetype2' 'luabind' 'libogg' 'libvorbis' 'openal' 'mesa' 'glu' 'lua51' 'ryzom-data')
+#conflicts=('ryzom' 'ryzom-client') # see above
+conflicts=('ryzom' 'ryzom-client' 'nel-hg' 'ryzom-nel')
+makedepends=('mercurial' 'cpptest' 'cmake' 'bison' 'boost' 'rrdtool')
+source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz")
+sha256sums=('ad05f08004a80758a13566061ce29edfe4803c0c62e30190c437c781038c254e')
 
-mksource=(".$pkgname-$pkgver::hg+https://bitbucket.org/ryzom/ryzomcore#revision=${_hgver}")
+mksource=("$pkgname-$pkgver::hg+https://bitbucket.org/ryzom/ryzomcore#revision=${hgver}")
 
 mksource() {
-  rm -rf "$srcdir/$pkgname-$pkgver"
-  cp -a "$srcdir/.$pkgname-$pkgver/code" "${srcdir}/${pkgname}-${pkgver}"
-  # some patching required...
-  sed -i 's|<freetype/|<freetype2/|g' "${srcdir}/${pkgname}-${pkgver}/nel/src/3d/font_generator.cpp"
+  cd "$srcdir/$pkgname-$pkgver/"
+  rm -rf .hg*
+  cd "$srcdir/$pkgname-$pkgver/code/"
+  mv * ../
+  rm -rf "$srcdir/$pkgname-$pkgver/code/"
+  sed -i 's|<freetype/|<freetype2/|g' "${srcdir}/${srcpkgname}-${pkgver}/nel/src/3d/font_generator.cpp"
 }
 
 build() {
-  mkdir -p "$srcdir/build"
-  cd "$srcdir/build"
+  mkdir -p "$srcdir/build-client"
+  cd "$srcdir/build-client"
+  # WITH_NEL is ON, see above
   cmake -Wno-dev "$srcdir/${pkgname}-${pkgver}" -DFINAL_VERSION=ON -DWITH_STATIC=OFF -DWITH_NEL_TOOLS=OFF -DWITH_NEL_TESTS=OFF -DWITH_LUA51=ON  -DWITH_NEL_SAMPLES=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_NEL=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON -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 -DFREETYPE_INCLUDE_DIRS="/usr/include;/usr/include/freetype2"
+
+ # cmake -Wno-dev "$srcdir/${pkgname}-${pkgver}" -DFINAL_VERSION=ON -DWITH_STATIC=OFF -DWITH_NEL_TOOLS=OFF -DWITH_NEL_TESTS=OFF -DWITH_LUA51=ON  -DWITH_NEL_SAMPLES=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_NEL=OFF -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON -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 -DLUA_INCLUDE_DIR="/usr/include/lua5.1/" -DLIBWWW_INCLUDE_DIR="/usr/include/w3c-libwww/"
   
-  make all
+  make -j1 all
 }
 
 package() {
-  cd "$srcdir/build"
+  cd "$srcdir/build-client"
   make DESTDIR="$pkgdir" install
   cd "$pkgdir/etc/ryzom/"
   # instead of the open shard, we point to the actual ryzom shard.
@@ -47,6 +55,3 @@ package() {
   sed -i 's|atys.|app.|g' client_default.cfg
   sed -i 's|"app.ryzom.com" |"api.ryzom.com", "app.ryzom.com" |g' client_default.cfg
 }
-
-mksha256sums=('SKIP')
-sha256sums=('187e9a508be4c3c07f768fc98497941ac4946caf2202d24311aac81d73cff5a5')