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>

1 files changed, 23 insertions, 18 deletions

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')