From c5901ce7e2618d91d0745e285a7bffcd0ceaf406 Mon Sep 17 00:00:00 2001 From: Shackra Sislock Date: Sat, 27 Jul 2013 14:57:48 -0600 Subject: packaging libsquish-svn for ryzom, replacing the old libsquish by Kervala --- pcr/ryzom-hg/PKGBUILD | 55 +++++++++++++++------------------------------------ 1 file changed, 16 insertions(+), 39 deletions(-) (limited to 'pcr/ryzom-hg/PKGBUILD') 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 # Maintainer (aur): Bjoern Bidar -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/" } -- cgit v1.2.3-2-g168b From 54441414b60185a36dab73bac3347c868b0f0137 Mon Sep 17 00:00:00 2001 From: Shackra Sislock Date: Sat, 27 Jul 2013 22:35:40 -0600 Subject: ryzom-hg PKGBUILD does its tarballs correctly, thanks to Lukeshu --- pcr/ryzom-hg/PKGBUILD | 52 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 20 deletions(-) (limited to 'pcr/ryzom-hg/PKGBUILD') diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD index 397ab8687..afa0025d9 100644 --- a/pcr/ryzom-hg/PKGBUILD +++ b/pcr/ryzom-hg/PKGBUILD @@ -2,40 +2,52 @@ # Maintainer (aur): Bjoern Bidar pkgname='ryzom-hg' -#pkgbase="ryzom-hg" -pkgver=20130706 -pkgrel="3:1" +_hgver=ce26956d3a4a +pkgver=20130727 +pkgrel="5" options=(debug) pkgdesc="An awesome free software 3D MMORPG game" arch=('i686' 'x86_64') url="http://www.ryzom.com/" -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=('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' +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') -sha256sums=('03ddd23d0b2e92c419dcdebe264890b5b1c906992ae93225be43869739f9f475' - 'd3d8286f5b60a63cbda83795cbe1a1d6e1442f33116502cc6563f8db86e458b6' - '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196') -mksource=("$pkgname-$pkgver-${pkgrel}::hg+https://bitbucket.org/ryzomcore") +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' '-DWITH_RYZOM_TOOLS=ON') # cmake common arguments +_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() { + 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-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 + 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 make all -j8 } package() { - cd "$srcdir/build-both" + cd "$srcdir/build" make DESTDIR="$pkgdir" install - install -Dm 644 "$srcdir/ryzom.desktop" "$pkgdir/usr/share/applications/" + install -Dm 644 "$srcdir/${pkgname}-${pkgver}/ryzom.desktop" "$pkgdir/usr/share/applications/" } + +mksha256sums=('SKIP' + '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196') + +sha256sums=('a8c90f3f41fb3d497022a2d14a9aa39352557f5745f97b93d0bed61cebf85402' + '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196') -- cgit v1.2.3-2-g168b From 6785d5420eb83d9990842bd812458ad862c0d9e7 Mon Sep 17 00:00:00 2001 From: Shackra Sislock Date: Sun, 28 Jul 2013 00:01:24 -0600 Subject: some changes on libsquish and ryzom PKGBUILD --- pcr/ryzom-hg/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pcr/ryzom-hg/PKGBUILD') 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() { -- cgit v1.2.3-2-g168b From f1c75e619a9cf7e22ef4aab5c42084cffa189c99 Mon Sep 17 00:00:00 2001 From: Shackra Sislock Date: Wed, 31 Jul 2013 16:26:55 -0600 Subject: updating Ryzom's PKGBUILD. Adding an optional libwww package --- pcr/ryzom-hg/PKGBUILD | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) (limited to 'pcr/ryzom-hg/PKGBUILD') 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') -- cgit v1.2.3-2-g168b From 688293a45505151207777b0f543ac4cac5d26fe5 Mon Sep 17 00:00:00 2001 From: Shackra Sislock Date: Thu, 1 Aug 2013 20:59:19 -0600 Subject: changes on ryzom --- pcr/ryzom-hg/PKGBUILD | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pcr/ryzom-hg/PKGBUILD') diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD index 29e791e75..0951e474d 100644 --- a/pcr/ryzom-hg/PKGBUILD +++ b/pcr/ryzom-hg/PKGBUILD @@ -4,12 +4,13 @@ pkgname='ryzom-hg' _hgver=ce26956d3a4a pkgver=20130727 -pkgrel=6 +pkgrel=7 pkgdesc="An awesome free software 3D MMORPG game" arch=('i686' 'x86_64') url="http://www.ryzom.com/" license=('AGPL3') 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") @@ -40,6 +41,9 @@ package() { 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') -- cgit v1.2.3-2-g168b