summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-07-26 05:53:03 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-07-26 05:53:03 -0300
commit14ba2fbc3763f75ff0b3cdede444930ee949d097 (patch)
tree9f240b959082acb9b496875bcfc4a9ac2fa9fa13
parent7f7fe0b75ce9d23467e21df43964bb2c3de73324 (diff)
parentd856ddfb2f4cd3c50f1a3a85e35e075ebbd3774d (diff)
downloadabslibre-14ba2fbc3763f75ff0b3cdede444930ee949d097.tar.gz
abslibre-14ba2fbc3763f75ff0b3cdede444930ee949d097.tar.bz2
abslibre-14ba2fbc3763f75ff0b3cdede444930ee949d097.zip
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
-rw-r--r--libre/virtualbox-modules/PKGBUILD8
-rw-r--r--libre/virtualbox-modules/virtualbox-modules.install6
-rw-r--r--libre/virtualbox-modules/virtualbox-parabola-modules.install6
-rw-r--r--pcr/kervala_libsquish/PKGBUILD46
-rw-r--r--pcr/kervalasquish-hg/PKGBUILD72
5 files changed, 82 insertions, 56 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/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..e5e489950
--- /dev/null
+++ b/pcr/kervalasquish-hg/PKGBUILD
@@ -0,0 +1,72 @@
+# 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: