Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

1 files changed, 40 insertions, 90 deletions

diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD
index 8bc928115..0951e474d 100644
--- a/pcr/ryzom-hg/PKGBUILD
+++ b/pcr/ryzom-hg/PKGBUILD
@@ -1,100 +1,50 @@
-# Maintainer:Bjoern Bidar <theodorstormgrade@gmail.com
-#_gui_toolkit=qt # qt or gtk
-_build_server=false # set true to build server (default:false)
-_build_client=true  # set false to don't build client (default:true)
-_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
-_CMAKE_SERVER_ARGS=('-DWITH_RYZOM_SERVER=ON' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_DRIVER_OPENGL=OFF' '-DWITH_DRIVER_OPENAL=OFF' ) # cmake args for building server
-_CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' ) # cmake args for building client
-if [ $_build_client = true ] ; then
-  true && pkgname=( 'ryzom-client-hg'  )
-fi
-
-if [ $_build_server = true ] ; then
-  true && pkgname=( 'ryzom-client-hg' 'ryzom-server-hg')
-fi 
-pkgbase=ryzom-hg
-pkgname=ryzom-hg
-pkgver=20130331
-pkgrel=1
-pkgdesc="Ryzom is a Free to Play MMORPG . This version is for playing on an official server or launch a server"
+# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
+# Maintainer (aur): Bjoern Bidar <theodorstormgrade@gmail.com>
+
+pkgname='ryzom-hg'
+_hgver=ce26956d3a4a
+pkgver=20130727
+pkgrel=7
+pkgdesc="An awesome free software 3D MMORPG game"
 arch=('i686' 'x86_64')
 url="http://www.ryzom.com/"
 license=('AGPL3')
-depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2'  'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost'  'luabind' 'libsquish' 'lua51'  'lua51-sql-mysql') 
-conflicts=('ryzom-client-latest-hg')
-groups=('ryzom')
-makedepends=('mercurial' 'cpptest' 'cmake' 'bison')
-provides=('ryzom')
-source=( 'ryzom.sh' 'ryzom.desktop' )
-md5sums=('a5ca7dfae7b9073f78cd1b0b7380755f'
-         '71d5136d40ec4e76c2ac2b0c9e506aef')
-
-
-
-
-case $_gui_toolkit in
-  qt) _CMAKE_COMMON_ARGS=( ${_CMAKE_COMMON_ARGS_ARGS[*]} '-DWITH_QT=ON' ) ;;
-  gtk) _CMAKE_COMMON_ARGS=( ${_CMAKE_COMMON_ARGS_ARGS[*]} '-DWITH_GTK=ON' ) ;;
-esac 
+depends=('curl' 'hicolor-icon-theme' 'libvorbis' 'libjpeg' 'libwww-hg' 'luabind' 'ryzom-data')
+conflicts=('ryzom')
+makedepends=('mercurial' 'cpptest' 'cmake' 'bison' 'freealut' 'rrdtool' 'boost')
+source=("libre://$pkgname-$pkgver.tar.gz")
 
+mksource=(".$pkgname-$pkgver::hg+https://bitbucket.org/ryzom/ryzomcore#revision=${_hgver}")
 
-_hg_root='https://bitbucket.org/ryzom/ryzomcore'
-_hg_name='ryzomcore' 
-
-prepare() {
-    if [ -d "$_hg_name" ] ; then # fetch sources
-	cd "$_hg_name"
-	hg pull && hg update
-	cd ..
-    else
-	hg clone "$_hg_root"
-    fi
-    
-    msg2 "hg clone done or server timeout"
+mksource() {
+  rm -rf "$srcdir/$pkgname-$pkgver"
+  cp -a "$srcdir/.$pkgname-$pkgver/code" "${srcdir}/${pkgname}-${pkgver}"
 }
+
 build() {
-    cd $_hg_name
-    
-    if [ $_build_client = true ] ; then	
-	mkdir -p "$srcdir/build-client"
-	cd "$srcdir/build-client"
-	msg "client is $_build_client, building client"
-	cmake -b "$srcdir/$_hg_name/code"  ${_CMAKE_COMMON_ARGS_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
-	msg "Starting make, to build client"
-	make
-	
-    fi
-   
-    if [ $_build_server = true ] ; then
-	mkdir -p "$srcdir/build-server"
-	cd "$srcdir/build-server"
-	msg "client is $_build_server, building server"
-	cmake -b "$srcdir/$_hg_name/code"  ${_CMAKE_COMMON_ARGS_ARGS[*]} ${_CMAKE_SERVER_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
-	msg "Starting make, to build server"   
-	make	
-    fi
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+  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
+  
+  make all
 }
 
-if [ $_build_client = true ] ; then
-    
-    package_ryzom-client-hg() {
-	pkgdesc="Ryzom is a Free to Play MMORPG . This version is for playing on an official server"
-	depends=( 'curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'cmake' 'libpng' 'libjpeg' 'rrdtool' 'bison' 'libwww' 'boost' 'cpptest' 'luabind' 'libsquish' 'lua51'  'lua51-sql-mysql' 'ryzom-data' )
-	cd "$srcdir/build-client"
-	make DESTDIR="$pkgdir/" install
-	install -Dm 644 ${srcdir}/ryzom.desktop ${pkgdir}/usr/share/applications
-	sed -ie 's/\/usr\/bin\/ryzom_client/ryzom/' ${pkgdir}/usr/share/applications/ryzom.desktop # replace ryzom_client with our script
-	install -Dm755  ${srcdir}/ryzom.sh  ${pkgdir}/usr/bin/ryzom	
-    }
-fi
-
-if [ $_build_server = true ] ; then
-    
-    package_ryzom-server-hg() {
-	pkgdesc="Ryzom is a Free to Play MMORPG . This is the version to run a server"
-	cd "$srcdir/build-server"
-	make DESTDIR="$pkgdir/" install	
-    }
-fi
-
+package() {
+  cd "$srcdir/build"
+  make DESTDIR="$pkgdir" install
+  cd "$pkgdir/etc/ryzom/"
+  # instead of the open shard, we point to the actual ryzom shard.
+  # this cannot be on prepare(), I tried that already and didn't work
+  sed -i 's|"ryzom_open"|"ryzom_live"|g' client_default.cfg
+  sed -i 's|PatchServer = "";|PatchServer = "http://dl.ryzom.com/patch_live";|g' client_default.cfg
+  sed -i 's|SignUpURL = "";|SignUpURL = "http://www.ryzom.com/subscribe";|g' client_default.cfg
+  sed -i 's|"open.ryzom.com:40916";|"shard.ryzom.com:40916";|g' client_default.cfg
+  sed -i 's|CreateAccountURL = "";|CreateAccountURL = "https://secure.ryzom.com/signup/from_client.php";|g' client_default.cfg
+  sed -i 's|InstallWebPage = "";|InstallWebPage = "http://dl.ryzom.com/installer/";|g' client_default.cfg
+  sed -i 's|"http://open.ryzom.com:50000/stats/stats.php";|"http://shard.ryzom.com:50000/stats/stats.php";|g' client_default.cfg
+  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=('a8c90f3f41fb3d497022a2d14a9aa39352557f5745f97b93d0bed61cebf85402')