summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShackra Sislock <jorgean@lavabit.com>2013-07-27 14:57:48 -0600
committerShackra Sislock <jorgean@lavabit.com>2013-07-27 14:57:48 -0600
commitc5901ce7e2618d91d0745e285a7bffcd0ceaf406 (patch)
tree0d176ee9c8aa9aa2747f437bfb8decfd0bdfeceb
parent4e2b38c122e49c912ecaa01d1192a0aadd84a808 (diff)
packaging libsquish-svn for ryzom, replacing the old libsquish by Kervala
-rw-r--r--pcr/kervalasquish-hg/PKGBUILD72
-rw-r--r--pcr/libsquish-svn/LICENSE24
-rw-r--r--pcr/libsquish-svn/PKGBUILD40
-rw-r--r--pcr/ryzom-hg/PKGBUILD55
4 files changed, 80 insertions, 111 deletions
diff --git a/pcr/kervalasquish-hg/PKGBUILD b/pcr/kervalasquish-hg/PKGBUILD
deleted file mode 100644
index e5e489950..000000000
--- a/pcr/kervalasquish-hg/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# Maintainer: Jorge Araya <jorgean@lavabit.com>
-
-pkgname=kervalasquish-hg
-pkgver=220
-pkgrel=2
-pkgdesc="Free Software DXT compression library, kervala's version"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/libsquish/"
-license=('MIT')
-makedepends=('mercurial' 'gcc-libs' 'cmake')
-provides=('libsquish')
-conflicts=('libsquish'
- 'kervala_libsquish-hg'
- 'kervalasquish-hg')
-
-_hgroot="http://hg.kervala.net"
-_hgrepo="packaging"
-cmakerepo="cmake"
-
-build() {
- cd "$srcdir"
- msg "Connecting to Kervala's Mercurial server for libsquish..."
-
- if [[ -d "$_hgrepo" ]]; then
- cd "$_hgrepo"
- hg pull -u
- msg "The local files are updated."
- else
- hg clone "${_hgroot}/${_hgrepo}"
- fi
-
- msg "Connecting to Kervala's Mercurial server for cmake modules..."
-
- if [[ -d $srcdir/$cmakerepo ]]; then
- cd $srcdir/$cmakerepo
- hg pull -u
- msg "The local files are updated."
- else
- cd $srcdir
- hg clone ${_hgroot}/${cmakerepo}
- fi
-
- msg "Mercurial checkout done or server timeout"
- msg "Starting build..."
-
- if [[ -d $_hgrepo-build ]]; then
- rm -rf "$srcdir/$_hgrepo-build"
- fi
-
- cp -r "$srcdir/$_hgrepo/squish" "$srcdir/$_hgrepo-build"
-
- if [[ ! -d $_hgrepo-build/CMakeModules ]]; then
- mkdir "$srcdir/$_hgrepo-build/CMakeModules"
- cp $srcdir/cmake/modules/common.cmake $srcdir/$_hgrepo-build/CMakeModules/
- fi
-
- if [[ -d $srcdir/$_hgrepo-build/build ]]; then
- rm -rf $srcdir/$_hgrepo-build/build
- fi
-
- mkdir "$srcdir/$_hgrepo-build/build"
- cd "$srcdir/$_hgrepo-build/build"
- cmake -DCMAKE_INSTALL_PREFIX=/usr ..
- make
-}
-
-package() {
- cd "$srcdir/$_hgrepo-build/build"
- make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/libsquish-svn/LICENSE b/pcr/libsquish-svn/LICENSE
new file mode 100644
index 000000000..dd0f22eb9
--- /dev/null
+++ b/pcr/libsquish-svn/LICENSE
@@ -0,0 +1,24 @@
+/* -----------------------------------------------------------------------------
+
+ Copyright (c) 2006 Simon Brown si@sjbrown.co.uk
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ -------------------------------------------------------------------------- */
diff --git a/pcr/libsquish-svn/PKGBUILD b/pcr/libsquish-svn/PKGBUILD
new file mode 100644
index 000000000..c7b834b24
--- /dev/null
+++ b/pcr/libsquish-svn/PKGBUILD
@@ -0,0 +1,40 @@
+# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
+# Contributor: F0ruD<fzerorubigd{AT}gmail{DOT}com>
+pkgname=libsquish-svn
+pkgver=48
+pkgrel=4
+pkgdesc="DXT compression library - svn build"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/libsquish"
+makedepends=('subversion' )
+license=('MIT')
+provides=('libsquish')
+conflicts=('libsquish' 'kervalasquish-hg' 'kervala_libsquish-hg')
+mksource=("$pkgname-$pkgver"::svn+http://libsquish.googlecode.com/svn/trunk/#revision=$pkgver)
+mkmd5sums=('SKIP')
+
+source=("libre://$pkgname-$pkgver.tar.gz"
+ LICENSE)
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ #make install # it ignores DESTDIR, so it wound't work
+ mkdir -p $pkgdir/usr/{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 $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/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/"
}