moving kervala_libsquish to kervalasquish and adding the common.cmake CMake module, see http://dev.ryzom.com/issues/1485#note-5

--HG--
rename : pcr/kervala_libsquish/PKGBUILD => pcr/kervalasquish-hg/PKGBUILD

2 files changed, 70 insertions, 46 deletions

diff --git a/pcr/kervala_libsquish/PKGBUILD b/pcr/kervala_libsquish/PKGBUILD
deleted file mode 100644
index 033dd19ec..000000000
--- a/pcr/kervala_libsquish/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Maintainer: Jorge Araya <jorgean@lavabit.com>
-
-pkgname=kervala_libsquish-hg
-pkgver=220
-pkgrel=1
-pkgdesc="Open source DXT compression library, kervala's version"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/libsquish/"
-license=('MIT')
-makedepends=('mercurial' 'gcc-libs')
-provides=('libsquish')
-conflicts=('libsquish')
-source=()
-
-_hgroot="http://hg.kervala.net"
-_hgrepo="packaging"
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to Mercurial server...."
-
-  if [[ -d "$_hgrepo" ]]; then
-    cd "$_hgrepo"
-    hg pull -u
-    msg "The local files are updated."
-  else
-    hg clone "${_hgroot}/${_hgrepo}"
-  fi
-
-  msg "Mercurial checkout done or server timeout"
-  msg "Starting build..."
-
-  rm -rf "$srcdir/$_hgrepo-build"
-  cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build"
-  cd "$srcdir/$_hgrepo-build/squish"
-  make
-}
-
-package() {
-  cd "$srcdir/$_hgrepo-build/squish"
-  install -d -m 755 ${pkgdir}/usr/include
-  install -d -m 755 ${pkgdir}/usr/lib
-  make -e INSTALL_DIR="$pkgdir/usr/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/kervalasquish-hg/PKGBUILD b/pcr/kervalasquish-hg/PKGBUILD
new file mode 100644
index 000000000..c9ca2e7cd
--- /dev/null
+++ b/pcr/kervalasquish-hg/PKGBUILD
@@ -0,0 +1,70 @@
+# Maintainer: Jorge Araya <jorgean@lavabit.com>
+
+pkgname=kervalasquish-hg
+pkgver=220
+pkgrel=1
+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')
+provides=('libsquish')
+conflicts=('libsquish' 'kervala_libsquish-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: