packaging libsquish-svn for ryzom, replacing the old libsquish by Kervala

1 files changed, 16 insertions, 39 deletions

diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD
index 8277ccf17..397ab8687 100644
--- a/pcr/ryzom-hg/PKGBUILD
+++ b/pcr/ryzom-hg/PKGBUILD
@@ -1,17 +1,18 @@
 # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
 # Maintainer (aur): Bjoern Bidar <theodorstormgrade@gmail.com>
 
-pkgname=('ryzom-hg-nel' 'ryzom-hg-client')
-pkgbase="ryzom-hg"
+pkgname='ryzom-hg'
+#pkgbase="ryzom-hg"
 pkgver=20130706
-pkgrel=2
+pkgrel="3:1"
+options=(debug)
 pkgdesc="An awesome free software 3D MMORPG game"
 arch=('i686' 'x86_64')
 url="http://www.ryzom.com/"
-license=('AGPL3')
+license=('GPL3')
 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')
-makedepends=('mercurial' 'cpptest' 'cmake' 'bison')
+makedepends=('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'
@@ -22,43 +23,19 @@ sha256sums=('03ddd23d0b2e92c419dcdebe264890b5b1c906992ae93225be43869739f9f475'
 
 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
+_CAMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON'  '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=ON') # cmake common arguments 
+_CMAKE_BOTH_ARGS=('-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' '-DWITH_NEL=ON' '-DWITH_DRIVER_OPENGL=ON' '-DWITH_DRIVER_OPENAL=ON')
 
-_CMAKE_LIB_ARGS=('-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_DRIVER_OPENGL=OFF' '-DWITH_DRIVER_OPENAL=OFF' '-DWITH_NEL=ON')
+build() {
+  mkdir -p "$srcdir/build-both"
+  cd "$srcdir/build-both"
+  cmake -b -Wno-dev "$srcdir/code" ${_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
 
-_CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' '-DWITH_NEL=OFF') # cmake args for building client
-
-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')
-
-  mkdir -p "$srcdir/build-nel"
-  cd "$srcdir/build-nel"
-
-  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
-  make DESTDIR="$pkgdir" install
+  make all -j8
 }
 
-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"
-
-  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
+package() {
+  cd "$srcdir/build-both"
   make DESTDIR="$pkgdir" install
+  install -Dm 644 "$srcdir/ryzom.desktop" "$pkgdir/usr/share/applications/"
 }