From 8f4802b2d269869354619e783ec9be78f18c5c8a Mon Sep 17 00:00:00 2001
From: Shackra Sislock <none@none>
Date: Thu, 26 Jul 2012 01:03:45 -0600
Subject: 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
---
 pcr/kervala_libsquish/PKGBUILD | 46 ---------------------------
 pcr/kervalasquish-hg/PKGBUILD  | 70 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 46 deletions(-)
 delete mode 100644 pcr/kervala_libsquish/PKGBUILD
 create mode 100644 pcr/kervalasquish-hg/PKGBUILD

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:
-- 
cgit v1.2.3


From abc224032aafb39cc6b95515dd5825d49dae44e4 Mon Sep 17 00:00:00 2001
From: Shackra Sislock <none@none>
Date: Thu, 26 Jul 2012 01:09:44 -0600
Subject: moving kervala_libsquish to kervalasquish and adding the common.cmake
 CMake module, see http://dev.ryzom.com/issues/1485#note-5

---
 libre/virtualbox-modules/PKGBUILD                            | 8 ++++----
 libre/virtualbox-modules/virtualbox-modules.install          | 6 +++---
 libre/virtualbox-modules/virtualbox-parabola-modules.install | 6 +++---
 pcr/kervalasquish-hg/PKGBUILD                                | 4 +++-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD
index 5e0feec6d..f965869f7 100644
--- a/libre/virtualbox-modules/PKGBUILD
+++ b/libre/virtualbox-modules/PKGBUILD
@@ -6,7 +6,7 @@
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-modules' 'virtualbox-parabola-modules')
 pkgver=4.1.18
-pkgrel=5
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -18,7 +18,7 @@ md5sums=('38db0a87cba659b484af868b0c2bd3ac'
          '4c88bd122677a35f68abd76eb01b378b'
          'ed1341881437455d9735875ddf455fbe')
 
-_extramodules=extramodules-3.5-LIBRE
+_extramodules=extramodules-3.4-LIBRE
 _kernver="$(cat /usr/lib/modules/${_extramodules}/version || true)"
 
 export KERN_DIR=/usr/lib/modules/${_kernver}/build
@@ -53,7 +53,7 @@ package_virtualbox-parabola-modules(){
     pkgdesc="Additions only for Parabola guests (kernel modules)"
     license=('GPL')
     install=virtualbox-parabola-modules.install
-    depends=('linux-libre>=3.5' 'linux-libre<3.6')
+    depends=('linux-libre>=3.4' 'linux-libre<3.5')
     replaces=('virtualbox-archlinux-modules')
     conflicts=('virtualbox-archlinux-modules')
     provides=("virtualbox-archlinux-modules=$pkgver")
@@ -79,7 +79,7 @@ package_virtualbox-modules(){
     pkgdesc="Kernel modules for VirtualBox"
     license=('GPL')
     install=virtualbox-modules.install
-    depends=('linux-libre>=3.5' 'linux-libre<3.6')
+    depends=('linux-libre>=3.4' 'linux-libre<3.5')
 
     source "$srcdir/VirtualBox-${pkgver}/env.sh"
 
diff --git a/libre/virtualbox-modules/virtualbox-modules.install b/libre/virtualbox-modules/virtualbox-modules.install
index 3f2a12a3f..b178686e2 100644
--- a/libre/virtualbox-modules/virtualbox-modules.install
+++ b/libre/virtualbox-modules/virtualbox-modules.install
@@ -3,17 +3,17 @@ post_install() {
 ===> You must load vboxdrv module before starting VirtualBox:
 ===> # modprobe vboxdrv
 EOF
-    EXTRAMODULES='extramodules-3.5-LIBRE'
+    EXTRAMODULES='extramodules-3.4-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.5-LIBRE'
+    EXTRAMODULES='extramodules-3.4-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
     echo 'In order to use the new version, reload all virtualbox modules manually.'
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.5-LIBRE'
+    EXTRAMODULES='extramodules-3.4-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
diff --git a/libre/virtualbox-modules/virtualbox-parabola-modules.install b/libre/virtualbox-modules/virtualbox-parabola-modules.install
index c3419c991..31575fb9d 100644
--- a/libre/virtualbox-modules/virtualbox-parabola-modules.install
+++ b/libre/virtualbox-modules/virtualbox-parabola-modules.install
@@ -2,16 +2,16 @@ post_install() {
 cat << EOF
 ===> You may want to load vboxguest, vboxsf and vboxvideo
 EOF
-    EXTRAMODULES='extramodules-3.5-LIBRE'
+    EXTRAMODULES='extramodules-3.4-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.5-LIBRE'
+    EXTRAMODULES='extramodules-3.4-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.5-LIBRE'
+    EXTRAMODULES='extramodules-3.4-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
diff --git a/pcr/kervalasquish-hg/PKGBUILD b/pcr/kervalasquish-hg/PKGBUILD
index c9ca2e7cd..0f2dd8124 100644
--- a/pcr/kervalasquish-hg/PKGBUILD
+++ b/pcr/kervalasquish-hg/PKGBUILD
@@ -9,7 +9,9 @@ url="http://code.google.com/p/libsquish/"
 license=('MIT')
 makedepends=('mercurial' 'gcc-libs')
 provides=('libsquish')
-conflicts=('libsquish' 'kervala_libsquish-hg')
+conflicts=('libsquish'
+           'kervala_libsquish-hg'
+           'kervalasquish-hg')
 
 _hgroot="http://hg.kervala.net"
 _hgrepo="packaging"
-- 
cgit v1.2.3


From d856ddfb2f4cd3c50f1a3a85e35e075ebbd3774d Mon Sep 17 00:00:00 2001
From: Shackra Sislock <none@none>
Date: Thu, 26 Jul 2012 01:30:46 -0600
Subject: adding cmake in makedepends, duh!

---
 pcr/kervalasquish-hg/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pcr/kervalasquish-hg/PKGBUILD b/pcr/kervalasquish-hg/PKGBUILD
index 0f2dd8124..e5e489950 100644
--- a/pcr/kervalasquish-hg/PKGBUILD
+++ b/pcr/kervalasquish-hg/PKGBUILD
@@ -2,12 +2,12 @@
 
 pkgname=kervalasquish-hg
 pkgver=220
-pkgrel=1
+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')
+makedepends=('mercurial' 'gcc-libs' 'cmake')
 provides=('libsquish')
 conflicts=('libsquish'
            'kervala_libsquish-hg'
-- 
cgit v1.2.3