updating Ryzom's PKGBUILD. Adding an optional libwww package

2 files changed, 54 insertions, 25 deletions

diff --git a/pcr/libwww-hg/PKGBUILD b/pcr/libwww-hg/PKGBUILD
new file mode 100644
index 000000000..9fc91e231
--- /dev/null
+++ b/pcr/libwww-hg/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
+# Maintainer (Archlinux): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Buharev Vasilij <buharev.v.p@gmail.com>
+
+pkgname=libwww-hg
+pkgver=20130730
+_changeset=facbea79943a
+pkgrel=11
+pkgdesc="A general-purpose client side WEB API"
+arch=('i686' 'x86_64')
+url="http://hg.kervala.net/packaging/"
+license=('W3C')
+depends=()
+conflicts=("libwww")
+provides=("libwww")
+makedepends=('gcc' 'pkgconfig' 'perl' 'zlib')
+options=('!libtool')
+source=("http://hg.kervala.net/packaging/archive/${_changeset}.tar.gz")
+sha256sums=('26adbb77c4ecb3df3a074597a8dfc45b7215879fbc0447cb086199c17ae8ba8d')
+
+
+build() {
+  cd "$srcdir/packaging-${_changeset}/libwww"
+  ./autogen.sh
+  ./configure --prefix=/usr/ \
+    --with-ssl=no --with-zlib --with-expat --with-gnu-ld \
+    --enable-shared --enable-static
+  #sed -i 's#Examples##' Library/Makefile
+  make
+}
+
+package() {
+  cd "$srcdir/packaging-${_changeset}/libwww"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD
index 01722ab34..29e791e75 100644
--- a/pcr/ryzom-hg/PKGBUILD
+++ b/pcr/ryzom-hg/PKGBUILD
@@ -4,50 +4,43 @@
 pkgname='ryzom-hg'
 _hgver=ce26956d3a4a
 pkgver=20130727
-pkgrel="5"
-options=(debug strip) # there is a segmentation fault on ryzom_client executable
+pkgrel=6
 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-svn' 'lua51' 'lua51-sql-mysql')
-makedepends=('mercurial' 'cpptest' 'cmake' 'bison')
-source=("libre://$pkgname-$pkgver.tar.gz"
-  'ryzom.desktop')
+depends=('curl' 'hicolor-icon-theme' 'libvorbis' 'libjpeg' 'libwww-hg' 'luabind' 'ryzom-data')
+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}"
-  'ryzom.desktop')
-
-_CAMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON'  '-DWITH_NEL_SAMPLES=OFF')
-_CMAKE_BOTH_ARGS=('-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' '-DWITH_NEL=ON' '-DWITH_DRIVER_OPENGL=ON' '-DWITH_DRIVER_OPENAL=ON')
+mksource=(".$pkgname-$pkgver::hg+https://bitbucket.org/ryzom/ryzomcore#revision=${_hgver}")
 
 mksource() {
   rm -rf "$srcdir/$pkgname-$pkgver"
-  cp "$srcdir/ryzom.desktop" "$srcdir/.$pkgname-$pkgver/code" 
   cp -a "$srcdir/.$pkgname-$pkgver/code" "${srcdir}/${pkgname}-${pkgver}"
 }
 
 build() {
   mkdir -p "$srcdir/build"
   cd "$srcdir/build"
-  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
-
+  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
 }
 
 package() {
   cd "$srcdir/build"
   make DESTDIR="$pkgdir" install
-  install -Dm 644 "$srcdir/${pkgname}-${pkgver}/ryzom.desktop" "$pkgdir/usr/share/applications/"
+  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
 }
 
-mksha256sums=('SKIP'
-  '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196')
-
-sha256sums=('a8c90f3f41fb3d497022a2d14a9aa39352557f5745f97b93d0bed61cebf85402'
-            '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196')
+mksha256sums=('SKIP')
+sha256sums=('a8c90f3f41fb3d497022a2d14a9aa39352557f5745f97b93d0bed61cebf85402')