4 files changed, 86 insertions, 58 deletions
diff --git a/pcr/kervala_libsquish/PKGBUILD b/pcr/kervala_libsquish/PKGBUILD
deleted file mode 100644
index 033dd19ec..000000000
--- a/pcr/kervala_libsquish/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Maintainer: Jorge Araya <jorgean@lavabit.com>
-
-pkgname=kervala_libsquish-hg
-pkgver=220
-pkgrel=1
-pkgdesc="Open source DXT compression library, kervala's version"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/libsquish/"
-license=('MIT')
-makedepends=('mercurial' 'gcc-libs')
-provides=('libsquish')
-conflicts=('libsquish')
-source=()
-
-_hgroot="http://hg.kervala.net"
-_hgrepo="packaging"
-
-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"
-  cd "$srcdir/$_hgrepo-build/squish"
-  make
-}
-
-package() {
-  cd "$srcdir/$_hgrepo-build/squish"
-  install -d -m 755 ${pkgdir}/usr/include
-  install -d -m 755 ${pkgdir}/usr/lib
-  make -e INSTALL_DIR="$pkgdir/usr/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/kervalasquish-hg/PKGBUILD b/pcr/kervalasquish-hg/PKGBUILD
new file mode 100644
index 000000000..e5e489950
--- /dev/null
+++ b/pcr/kervalasquish-hg/PKGBUILD
@@ -0,0 +1,72 @@
+# Maintainer: Jorge Araya <jorgean@lavabit.com>
+
+pkgname=kervalasquish-hg
+pkgver=220
+pkgrel=2
+pkgdesc="Free Software DXT compression library, kervala's version"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/libsquish/"
+license=('MIT')
+makedepends=('mercurial' 'gcc-libs' 'cmake')
+provides=('libsquish')
+conflicts=('libsquish'
+           'kervala_libsquish-hg'
+           'kervalasquish-hg')
+
+_hgroot="http://hg.kervala.net"
+_hgrepo="packaging"
+cmakerepo="cmake"
+
+build() {
+  cd "$srcdir"
+  msg "Connecting to Kervala's Mercurial server for libsquish..."
+
+  if [[ -d "$_hgrepo" ]]; then
+    cd "$_hgrepo"
+    hg pull -u
+    msg "The local files are updated."
+  else
+    hg clone "${_hgroot}/${_hgrepo}"
+  fi
+
+  msg "Connecting to Kervala's Mercurial server for cmake modules..."
+
+  if [[ -d $srcdir/$cmakerepo ]]; then
+     cd $srcdir/$cmakerepo
+     hg pull -u
+     msg "The local files are updated."
+  else
+     cd $srcdir
+     hg clone ${_hgroot}/${cmakerepo}
+  fi
+
+  msg "Mercurial checkout done or server timeout"
+  msg "Starting build..."
+
+  if [[ -d $_hgrepo-build ]]; then
+     rm -rf "$srcdir/$_hgrepo-build"
+  fi
+
+  cp -r "$srcdir/$_hgrepo/squish" "$srcdir/$_hgrepo-build"
+
+  if [[ ! -d $_hgrepo-build/CMakeModules ]]; then
+     mkdir "$srcdir/$_hgrepo-build/CMakeModules"
+     cp $srcdir/cmake/modules/common.cmake $srcdir/$_hgrepo-build/CMakeModules/
+  fi
+
+  if [[ -d $srcdir/$_hgrepo-build/build ]]; then
+     rm -rf $srcdir/$_hgrepo-build/build
+  fi
+
+  mkdir "$srcdir/$_hgrepo-build/build"
+  cd "$srcdir/$_hgrepo-build/build"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr ..
+  make
+}
+
+package() {
+  cd "$srcdir/$_hgrepo-build/build"
+  make DESTDIR="${pkgdir}" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/ryzom-client/PKGBUILD b/pcr/ryzom-client/PKGBUILD
index d3d077d4f..74d999d29 100644
--- a/pcr/ryzom-client/PKGBUILD
+++ b/pcr/ryzom-client/PKGBUILD
@@ -1,24 +1,23 @@
 # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
 pkgname=('ryzom-client')
 pkgver=0.8.0
-pkgrel=1
+pkgrel=6
 arch=('x86_64' 'i686')
 url="http://www.ryzom.com"
 license=('AGPL3')
 pkgdesc="An awesome free software 3D MMORPG game"
-depends=('ryzom-data' 'ryzom-nel')
+depends=('ryzom-data' 'ryzom-nel' 'luabind')
 conflicts=('ryzom-client')
 groups=('ryzom')
-options=(!strip)
-makedepends=('kervala_libsquish-hg' 'cmake' 'bison'  
+
+makedepends=('kervalasquish-hg' 'cmake' 'bison'  
              'lua' 'luabind' 'curl' 'libpng' 'libwww'
              'boost' 'ryzom-nel')
 
 auser="shackra"
-achangeset="3222b96eed75"
+achangeset="56d1642e24ac"
 
 source=("https://bitbucket.org/$auser/ryzom/get/$achangeset.tar.gz")
-sha256sums=('95b5944db8b71b75e95becd8125b0437de5a88691b89e32c1ceb42454a62c568')
 
 build() {
   cd "$srcdir/$auser-ryzom-$achangeset/code"
@@ -39,3 +38,5 @@ package() {
   cd "$srcdir/$auser-ryzom-$achangeset/code/$pkgname"
   make DESTDIR="$pkgdir" install
 }
+
+sha256sums=('0abcf7daa01dab27a3b9a9276e521369693963be3a25624b3195023495212bc2')
+\ No newline at end of file
diff --git a/pcr/ryzom-nel/PKGBUILD b/pcr/ryzom-nel/PKGBUILD
index aff8ec5e4..f7dd7c580 100644
--- a/pcr/ryzom-nel/PKGBUILD
+++ b/pcr/ryzom-nel/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
 pkgname='ryzom-nel'
 pkgver=0.8.0
-pkgrel=7
+pkgrel=10
 arch=('x86_64' 'i686')
 conflicts=('ryzom-nel')
 groups=('ryzom')
-options=(!strip)
+
 pkgdesc="An awesome free software 3D MMORPG game, NeL engine"
 url="http://www.ryzom.com"
 license=('AGPL3')
@@ -20,10 +20,10 @@ depends=('freetype2'
          'libxml2' 
          'libjpeg' 
          'rrdtool' )
-makedepends=('cmake' 'bison' 'kervala_libsquish-hg')
+makedepends=('cmake' 'bison' 'kervalasquish-hg')
 
 auser="shackra"
-achangeset="3222b96eed75"
+achangeset="56d1642e24ac"
 
 source=("https://bitbucket.org/$auser/ryzom/get/$achangeset.tar.gz")
 
@@ -40,7 +40,7 @@ build() {
   cd $pkgname
 
   #CMAKE_USE_RELATIVE_PATHS=true
-  cmake .. -Wno-dev -DWITH_LIBWWW_STATIC=ON -DWITH_RYZOM=OFF -DWITH_RYZOM_TOOLS=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 -DWITH_SYMBOLS=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON
 
   make -j3
 }
@@ -49,4 +49,5 @@ package() {
   cd "$srcdir/$auser-ryzom-$achangeset/code/$pkgname"
   make DESTDIR="$pkgdir" install
 }
-sha256sums=('95b5944db8b71b75e95becd8125b0437de5a88691b89e32c1ceb42454a62c568')
+
+sha256sums=('0abcf7daa01dab27a3b9a9276e521369693963be3a25624b3195023495212bc2')