some changes on libsquish and ryzom PKGBUILD

4 files changed, 8 insertions, 92 deletions

diff --git a/pcr/libsquish-svn/PKGBUILD b/pcr/libsquish-svn/PKGBUILD
index c7b834b24..17af64a96 100644
--- a/pcr/libsquish-svn/PKGBUILD
+++ b/pcr/libsquish-svn/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: F0ruD<fzerorubigd{AT}gmail{DOT}com>
 pkgname=libsquish-svn
 pkgver=48
-pkgrel=4
+pkgrel=5
 pkgdesc="DXT compression library - svn build"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/libsquish"
@@ -23,18 +23,13 @@ build() {
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  #make install # it ignores DESTDIR, so it wound't work
-  mkdir -p $pkgdir/usr/{include,lib}
+  # make install
+  mkdir -p $pkgdir/usr/local/{include,lib}
   
-  install -Dm 644 squish.h $pkgdir/usr/include/squish.h
-  install -Dm 644 libsquish.so.0.0 $pkgdir/usr/lib/libsquish.so.0.0
+  install -Dm 644 squish.h $pkgdir/usr/local/include/squish.h
+  install -Dm 644 libsquish.so.0.0 $pkgdir/usr/local/lib/libsquish.so.0.0
   install -Dm 644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
 
-# prepare() {
-#   cd "$srcdir/$pkgname-$pkgver"
-#   sed -i "s|/usr/local|${pkgdir}/usr|g" config
-# }
-
 sha256sums=('d1c057bf105872f50f504584fd7b31fb980ed5e235b14a92c6cb0aa7d7758e8f'
             'ed13029728a637f599833a68be22f3cc356a7f13be8d79284b2c415e172efd75')
diff --git a/pcr/ryzom-hg-client/PKGBUILD b/pcr/ryzom-hg-client/PKGBUILD
deleted file mode 100644
index 294e28024..000000000
--- a/pcr/ryzom-hg-client/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $
-# Maintainer: Jorge Araya Navarro <jorge@abril>
-pkgname=ryzom-hg-client
-pkgver=20130706
-pkgrel=2
-pkgdesc="An awesome free software 3D MMORPG game, Game client."
-arch=('i686' 'x86_64')
-url="http://www.ryzom.com/"
-license=('AGPL')
-groups=("ryzom-hg")
-depends=('ryzom-hg-nel' 'expat')
-makedepends=('cpptest' 'cmake' 'bison' 'ryzom-hg-nel')
-provides=("ryzom-hg-client")
-conflicts=("ryzom-hg-client")
-replaces=("ryzom-hg-client")
-source=("http://repo.parabolagnulinux.org/other/ryzom-$pkgver-$pkgrel-any.src.tar.gz")
-sha256sums=('03ddd23d0b2e92c419dcdebe264890b5b1c906992ae93225be43869739f9f475')
-mksource=("ryzom-$pkgver-${pkgrel}::hg+https://bitbucket.org/ryzomcore")
-_CMAKE_COMMON_ARGS=('-DWITH_STATIC=ON' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON'  '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=ON') # cmake arguments for server and client
-
-_CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' '-DWITH_NEL=OFF') # cmake args for building client
-
-build() {
-  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-client"
-  make DESTDIR="$pkgdir" install
-  install -Dm 644 "$srcdir/ryzom.desktop" "$pkgdir/usr/share/applications/"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/ryzom-hg-nel/PKGBUILD b/pcr/ryzom-hg-nel/PKGBUILD
deleted file mode 100644
index c66aaf567..000000000
--- a/pcr/ryzom-hg-nel/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $
-# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
-pkgname=ryzom-hg-nel
-pkgver=20130706
-pkgrel=5
-pkgdesc="An awesome free software 3D MMORPG game, Game client."
-arch=('i686' 'x86_64')
-url="http://www.ryzom.com/"
-license=('AGPL')
-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=('cpptest' 'cmake' 'bison')
-provides=("ryzom-hg-nel")
-conflicts=("ryzom-hg-nel")
-replaces=("ryzom-hg-nel")
-
-source=("http://repo.parabolagnulinux.org/other/ryzom-$pkgver-2-any.src.tar.gz")
-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_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_NEL=ON')
-
-build() {
-  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
-}
-
-package() {
-  cd "$srcdir/build-nel"
-  make DESTDIR="$pkgdir" install
-  # WWWInit.h is in /usr/include/w3c-libwww according to libwww package!
-  sed -ie 's/WWWInit\.h/w3c-libwww\/WWWInit.h/' ${pkgdir}/usr/include/nel/gui/group_html.h
-}
-
-# vim:set ts=2 sw=2 et:
-
diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD
index afa0025d9..01722ab34 100644
--- a/pcr/ryzom-hg/PKGBUILD
+++ b/pcr/ryzom-hg/PKGBUILD
@@ -5,7 +5,7 @@ pkgname='ryzom-hg'
 _hgver=ce26956d3a4a
 pkgver=20130727
 pkgrel="5"
-options=(debug)
+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/"
@@ -30,14 +30,14 @@ mksource() {
 build() {
   mkdir -p "$srcdir/build"
   cd "$srcdir/build"
-  cmake -b -Wno-dev "$srcdir/${pkgname}-${pkgver}" "${_CMAKE_COMMON_ARGS[*]}" "${_CMAKE_BOTH_ARGS[*]}" \
+  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 -j8
+  make all
 }
 
 package() {