summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/ghostscript-libre/PKGBUILD24
-rw-r--r--libre/ghostscript-libre/ghostscript-cups-rgbw.patch1
-rw-r--r--libre/ghostscript-libre/ghostscript-gpl-9.04-freetype-underlinking.patch12
-rw-r--r--libre/mplayer-libre/PKGBUILD33
-rw-r--r--libre/mplayer-libre/mplayer.desktop2
-rw-r--r--libre/mplayer-libre/mplayer.install4
-rw-r--r--libre/mplayer-vaapi-libre/PKGBUILD33
-rw-r--r--libre/texlive-bin-libre/PKGBUILD148
-rw-r--r--libre/texlive-bin-libre/texlive.install19
-rw-r--r--libre/virtualbox-libre/PKGBUILD55
-rw-r--r--libre/virtualbox-libre/vbox-service.rc4
-rw-r--r--libre/virtualbox-libre/vboxbuild18
-rw-r--r--libre/virtualbox-libre/vboxdrv-reference.patch56
-rw-r--r--libre/virtualbox-libre/virtualbox-source.install1
-rw-r--r--libre/virtualbox-libre/virtualbox.install6
-rw-r--r--libre/virtualbox-modules/60-vboxguest.rules2
-rw-r--r--libre/virtualbox-modules/LocalConfig.kmk19
-rw-r--r--libre/virtualbox-modules/PKGBUILD102
-rw-r--r--libre/virtualbox-modules/virtualbox-modules.install19
-rw-r--r--libre/virtualbox-modules/virtualbox-parabola-modules.install17
20 files changed, 386 insertions, 189 deletions
diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD
index eda488048..4462b7792 100644
--- a/libre/ghostscript-libre/PKGBUILD
+++ b/libre/ghostscript-libre/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 123066 2011-05-07 23:01:49Z stephane $
+# $Id: PKGBUILD 146976 2012-01-19 20:56:52Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Maintainer (Parabola): xihh
pkgname=ghostscript-libre
pkgver=9.04
-pkgrel=5
+_srcpkgrel=5
+pkgrel=6
pkgdesc="An interpreter for the PostScript language without non-free files"
arch=('i686' 'x86_64')
license=('GPL3') #non free files removed
-depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng' 'libjpeg' 'libtiff' 'lcms') # 'lcms2' won't get used) # move in libpaper from community?
+depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' 'libtiff>=4.0.0' 'lcms') # 'lcms2' won't get used) # move in libpaper from community?
makedepends=('gtk2' 'gnutls')
optdepends=('texlive-core: needed for dvipdf'
'gtk2: needed for gsx')
@@ -16,9 +17,13 @@ conflicts=('ghostscript')
replaces=('ghostscript-lrpng' 'ghostscript')
provides=('ghostscript-lprng' "ghostscript=$pkgver")
url="http://www.ghostscript.com/"
-source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz
- ghostscript-cups-rgbw.patch)
+source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${_srcpkgrel}-any.src.tar.xz
+ ghostscript-cups-rgbw.patch
+ ghostscript-gpl-9.04-freetype-underlinking.patch)
options=('!libtool' '!makeflags')
+md5sums=('ac8f77c94a6b5d5f0170c2e6db38c6bb'
+ 'bc56eb8c5fef0ecf964f6b3e9b7e65ae'
+ 'a1928c3e4459dcfee0aaa4b38fadba57')
build() {
cd ${srcdir}/ghostscript-${pkgver}
@@ -26,8 +31,11 @@ build() {
# fix broken color printing https://bugs.archlinux.org/task/25519
patch -Np1 -i ${srcdir}/ghostscript-cups-rgbw.patch
+ # fix a linking issue
+ patch -Np1 -i ${srcdir}/ghostscript-gpl-9.04-freetype-underlinking.patch
+
# force it to use system-libs
- rm -rf jpeg libpng zlib jasper expat tiff freetype lcms
+ rm -rf jpeg libpng zlib jasper expat tiff lcms freetype
./configure --prefix=/usr \
--enable-dynamic \
@@ -43,7 +51,7 @@ build() {
--without-luratech \
--disable-compile-inits #--help # needed for linking with system-zlib
make
-
+
# Build IJS
cd ${srcdir}/ghostscript-${pkgver}/ijs
./autogen.sh
@@ -70,5 +78,3 @@ package() {
cd ${srcdir}/ghostscript-${pkgver}/ijs
make DESTDIR=${pkgdir} install
}
-md5sums=('ac8f77c94a6b5d5f0170c2e6db38c6bb'
- 'fd89baafac6589dc93ba71a48c2ba9b4')
diff --git a/libre/ghostscript-libre/ghostscript-cups-rgbw.patch b/libre/ghostscript-libre/ghostscript-cups-rgbw.patch
index 00f99c844..f6ae2dae7 100644
--- a/libre/ghostscript-libre/ghostscript-cups-rgbw.patch
+++ b/libre/ghostscript-libre/ghostscript-cups-rgbw.patch
@@ -261,4 +261,3 @@ diff -up ghostscript-9.04/cups/gdevcups.c.cups-rgbw ghostscript-9.04/cups/gdevcu
}
}
-
diff --git a/libre/ghostscript-libre/ghostscript-gpl-9.04-freetype-underlinking.patch b/libre/ghostscript-libre/ghostscript-gpl-9.04-freetype-underlinking.patch
new file mode 100644
index 000000000..1a81863be
--- /dev/null
+++ b/libre/ghostscript-libre/ghostscript-gpl-9.04-freetype-underlinking.patch
@@ -0,0 +1,12 @@
+diff -Naur ghostscript-9.04/base/Makefile.in ghostscript-9.04.new/base/Makefile.in
+--- ghostscript-9.04/base/Makefile.in 2011-08-05 13:12:20.000000000 +0200
++++ ghostscript-9.04.new/base/Makefile.in 2011-08-16 16:06:50.487377337 +0200
+@@ -375,7 +375,7 @@
+ # Solaris may need -lnsl -lsocket -lposix4.
+ # (Libraries required by individual drivers are handled automatically.)
+
+-EXTRALIBS=@LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@
++EXTRALIBS=@LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@ @FT_LIBS@
+
+ # Define the standard libraries to search at the end of linking.
+ # Most platforms require -lpthread for the POSIX threads library;
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 2602022f4..3ca302e09 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -2,14 +2,16 @@
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
+# libvdpau is currently useful only with proprietary software
+
_pkgbase=mplayer
pkgbase=mplayer-libre
pkgname=('mplayer-libre' 'mencoder-libre')
pkgver=34426
-pkgrel=1
+pkgrel=3
arch=('i686' 'x86_64')
makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
-'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'speex'
+'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'speex'
'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray')
license=('GPL')
url="http://www.mplayerhq.hu/"
@@ -33,6 +35,7 @@ build() {
--disable-esd \
--disable-mga \
--disable-ass-internal \
+ --disable-vdpau \
--enable-xvmc \
--enable-radio \
--language=all \
@@ -47,22 +50,22 @@ package_mplayer-libre() {
install=mplayer.install
backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl'
- 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
+ 'libxinerama' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray')
provides=("mplayer=$pkgver")
replaces=('mplayer')
conflicts=('mplayer')
- cd ${srcdir}/${_pkgbase}
+ cd "${srcdir}/${_pkgbase}"
- make DESTDIR=${pkgdir} install-mplayer install-mplayer-man
- install -Dm644 etc/{codecs.conf,input.conf,example.conf} ${pkgdir}/etc/mplayer/
- install -dm755 ${pkgdir}/usr/share/mplayer/
- ln -s /usr/share/fonts/TTF/DejaVuSans.ttf ${pkgdir}/usr/share/mplayer/subfont.ttf
- rm -rf ${pkgdir}/usr/share/mplayer/font
+ make DESTDIR="${pkgdir}" install-mplayer install-mplayer-man
+ install -Dm644 etc/{codecs.conf,input.conf,example.conf} "${pkgdir}/etc/mplayer/"
+ install -dm755 "${pkgdir}/usr/share/mplayer/"
+ ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "${pkgdir}/usr/share/mplayer/subfont.ttf"
+ rm -rf "${pkgdir}/usr/share/mplayer/font"
#desktop file FS#14770
- install -Dm644 ${srcdir}/mplayer.desktop ${pkgdir}/usr/share/applications/mplayer.desktop
- install -Dm644 etc/mplayer.png ${pkgdir}/usr/share/pixmaps/mplayer.png
+ install -Dm644 "${srcdir}/mplayer.desktop" "${pkgdir}/usr/share/applications/mplayer.desktop"
+ install -Dm644 etc/mplayer.png "${pkgdir}/usr/share/pixmaps/mplayer.png"
}
package_mencoder-libre() {
@@ -73,7 +76,9 @@ package_mencoder-libre() {
replaces=('mencoder')
conflicts=('mencoder')
- cd ${srcdir}/${_pkgbase}
- make DESTDIR=${pkgdir} install-mencoder install-mencoder-man
- find $pkgdir/usr/share/man -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \;
+ cd "${srcdir}/${_pkgbase}"
+ make DESTDIR="${pkgdir}" install-mencoder install-mencoder-man
+ find "$pkgdir/usr/share/man" -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \;
}
+md5sums=('ff81117293e76b59e54debc439d8e612'
+ '647b9f4ab5284a7fef3f84f992214e77')
diff --git a/libre/mplayer-libre/mplayer.desktop b/libre/mplayer-libre/mplayer.desktop
index 07acea13f..e3229d042 100644
--- a/libre/mplayer-libre/mplayer.desktop
+++ b/libre/mplayer-libre/mplayer.desktop
@@ -14,7 +14,7 @@ Comment[zh]=多媒体播放器
Comment[pl]=Odtwarzaj filmy i muzykę
Icon=mplayer
TryExec=mplayer
-Exec=mplayer %F
+Exec=mplayer -really-quiet %F
Terminal=false
NoDisplay=true
Categories=GTK;AudioVideo;Audio;Video;Player;TV;
diff --git a/libre/mplayer-libre/mplayer.install b/libre/mplayer-libre/mplayer.install
index 660593cf5..f98ba7338 100644
--- a/libre/mplayer-libre/mplayer.install
+++ b/libre/mplayer-libre/mplayer.install
@@ -3,9 +3,9 @@ post_install() {
}
post_upgrade() {
- post_install
+ post_install $1
}
post_remove() {
- post_install
+ post_install $1
}
diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index 1904d4ec4..632ac4e12 100644
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -6,39 +6,34 @@
_pkgname=mplayer-vaapi
pkgname=mplayer-vaapi-libre
-pkgver=34180
-_sha1=79e6aa7b
-pkgrel=2
+pkgver=34578
+pkgrel=3
+pkgdesc="A movie player, compiled with vaapi support"
arch=('i686' 'x86_64')
-url="http://www.splitted-desktop.com/~gbeauchesne/mplayer-vaapi/"
+url="http://gitorious.org/vaapi/mplayer"
license=('GPL')
-depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl'
+depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio' 'libxinerama' 'sdl'
'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'mesa'
- 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'speex'
+ 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'speex' 'faad2'
'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca'
'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi' 'faad2'
'libva' 'libass' 'desktop-file-utils')
-makedepends=('p7zip-libre' 'live-media' 'yasm' 'ladspa' 'git')
-provides=("$_pkgname=$pkgver" 'mplayer')
+makedepends=('unzip-libre' 'live-media' 'yasm' 'ladspa' 'git')
+provides=("$_pkgname=$pkgver" "mplayer=$pkgver")
conflicts=('mplayer' "$_pkgname")
replaces=('mplayer-vaapi')
backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-#source=(http://pkgbuild.com/~foutrelis/mplayer-$pkgver.tar.xz
-# http://www.splitted-desktop.com/static/libva/mplayer-vaapi/mplayer-vaapi-$_vaapi_version.tar.bz2
-source=(mplayer-vaapi-$_sha1.tar.gz::http://gitorious.org/vaapi/mplayer/archive-tarball/$_sha1
+source=(http://pkgbuild.com/~foutrelis/mplayer-vaapi-$pkgver.tar.xz
mplayer.desktop
mplayer.png)
options=('!buildflags' '!emptydirs')
install=mplayer-vaapi.install
-sha256sums=('df3ec3d6eba8fd66d6ed7e84dcc909db3b0dcbee2fafdff86c8e66340de1e323'
+sha256sums=('cc35a057c8a64d2cdec2dc0a037811ef0f91dd03cd3d07465c7272a08665a37d'
'9aa54571b37d15aec2c8e3ddf086753217efc3084ebf466335b2f28d819c74da'
'061739a8cc267748ad58f168034cc39785d949a5262772535e1b347c7842af48')
build() {
- cd "$srcdir/vaapi-mplayer"
-
- [[ -d ffmpeg ]] && rm -rf ffmpeg
- tsocks git clone --depth 1 git://git.videolan.org/ffmpeg.git ffmpeg
+ cd "$srcdir/mplayer-vaapi-$pkgver"
./configure --prefix=/usr \
--enable-runtime-cpudetection \
@@ -46,6 +41,7 @@ build() {
--disable-arts \
--disable-liblzo \
--enable-speex \
+ --disable-cdparanoia \
--disable-openal \
--disable-libdv \
--disable-musepack \
@@ -65,7 +61,7 @@ build() {
}
package() {
- cd "$srcdir/vaapi-mplayer"
+ cd "$srcdir/mplayer-vaapi-$pkgver"
make -j1 DESTDIR="$pkgdir" install-mplayer install-mplayer-man
install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
@@ -78,6 +74,3 @@ package() {
}
# vim:set ts=2 sw=2 et:
-sha256sums=('ab9386e81df7ea7f25102940f7d86fdac797bcdc9b489e0ce118c505c02508ba'
- '9aa54571b37d15aec2c8e3ddf086753217efc3084ebf466335b2f28d819c74da'
- '061739a8cc267748ad58f168034cc39785d949a5262772535e1b347c7842af48')
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index 0074fb878..4964b0263 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -1,16 +1,17 @@
# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
+# $Id: PKGBUILD 148521 2012-02-03 01:16:06Z remy $
# Maintainer: Rémy Oudompheng <remy@archlinux.org>
# Contributor: francois <francois.archlinux.org>
pkgname=texlive-bin-libre
pkgver=2011.3
_luatex_ver=0.70.1
-pkgrel=1
+pkgrel=4
pkgdesc="TeX Live binaries"
license=('GPL')
arch=('i686' 'x86_64' 'mips64el')
depends=('t1lib' 'gd' 'poppler>=0.18.2' 'libsigsegv' 'zziplib')
-makedepends=('perl' 'clisp' 'ffcall' 'pkg-config')
+makedepends=('perl' 'clisp' 'ffcall')
optdepends=('ed: for texconfig')
provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin')
conflicts=('pdfjam' 'texlive-bin')
@@ -48,10 +49,7 @@ md5sums=('220a4f4cc0d915bf8fcbcb553dcee1ae'
'e7f0197559ef865d8c01683dab3b8526')
build() {
- cd $srcdir
- # Remove bundled packages available in Parabola or not needed.
- rm -rf source/{extra/{djgpp,xz},libs/{freetype2,gd,xpdf,libpng,zziplib,zlib,t1lib,poppler},utils/dialog}
- rm -rf luatex/source/libs/{libpng,zziplib,zlib,poppler}
+ cd "$srcdir"
# Building LuaTeX
# cd luatex-beta-${_luatex_ver}
cd luatex
@@ -72,7 +70,6 @@ build() {
--without-system-icu \
--without-system-kpathsea \
--with-system-freetype2 \
- --with-system-xpdf \
--with-system-poppler \
--with-freetype2-libdir=/usr/lib \
--with-freetype2-include=/usr/include/freetype2 \
@@ -105,7 +102,9 @@ build() {
test ! -d Work && mkdir Work
cd Work
echo "--> Initial configuration..."
- # we use temporary prefix to avoid messing the existing $pkgdir/usr/share/texmf tree
+ # we use temporary prefix to avoid messing the existing
+ # $pkgdir/usr/share/texmf tree
+ # system zlib is disabled due to issues with zlib 1.2.6 (FS#28221)
../configure --prefix=/usr -C \
--sysconfdir=/etc \
--datarootdir=/usr/share \
@@ -119,17 +118,16 @@ build() {
--disable-t1utils \
--disable-bibtexu \
--disable-xz \
- --with-system-zlib \
- --with-system-zziplib \
- --with-system-pnglib \
+ --without-system-zlib \
+ --without-system-zziplib \
+ --without-system-pnglib \
--with-system-ncurses \
--with-system-t1lib \
- --with-system-gd \
- --with-system-poppler \
- --with-system-xpdf \
- --with-system-freetype2 \
+ --without-system-gd \
+ --without-system-poppler \
+ --without-system-xpdf \
+ --without-system-freetype2 \
--without-system-graphite \
- --with-system-icu \
--with-freetype2-libdir=/usr/lib \
--with-freetype2-include=/usr/include/freetype2 \
--with-xdvi-x-toolkit=xaw \
@@ -137,8 +135,6 @@ build() {
--disable-aleph \
--disable-luatex \
--with-clisp-runtime=default \
- --disable-static \
- --enable-shared \
--enable-xindy --disable-xindy-rules --disable-xindy-docs
#############################################################
### make
@@ -149,65 +145,65 @@ build() {
}
package() {
- cd $srcdir
+ cd "$srcdir"
#############################################################
### install texmf tree
echo "-------------------------------------------------------"
echo "--> installing the texmf tree"
echo "-------------------------------------------------------"
- install -m755 -d $pkgdir/usr/share
- cp -r texmf $pkgdir/usr/share/
- install -d -m755 $pkgdir/etc/texmf/web2c
- install -d -m755 $pkgdir/etc/texmf/chktex
- install -d -m755 $pkgdir/etc/texmf/dvips/config
- install -d -m755 $pkgdir/etc/texmf/dvipdfm/config
- install -d -m755 $pkgdir/etc/texmf/dvipdfmx
- install -d -m755 $pkgdir/etc/texmf/tex/generic/config
- install -d -m755 $pkgdir/etc/texmf/ttf2pk
- install -d -m755 $pkgdir/etc/texmf/xdvi
- install -d -m755 $pkgdir/etc/fonts/conf.avail
- install -m644 $srcdir/09-texlive-fonts.conf $pkgdir/etc/fonts/conf.avail/
+ install -m755 -d "$pkgdir"/usr/share
+ cp -r texmf "$pkgdir"/usr/share/
+ install -d -m755 "$pkgdir"/etc/texmf/web2c
+ install -d -m755 "$pkgdir"/etc/texmf/chktex
+ install -d -m755 "$pkgdir"/etc/texmf/dvips/config
+ install -d -m755 "$pkgdir"/etc/texmf/dvipdfm/config
+ install -d -m755 "$pkgdir"/etc/texmf/dvipdfmx
+ install -d -m755 "$pkgdir"/etc/texmf/tex/generic/config
+ install -d -m755 "$pkgdir"/etc/texmf/ttf2pk
+ install -d -m755 "$pkgdir"/etc/texmf/xdvi
+ install -d -m755 "$pkgdir"/etc/fonts/conf.avail
+ install -m644 "$srcdir"/09-texlive-fonts.conf "$pkgdir"/etc/fonts/conf.avail/
# move man files to /usr/share/man
for i in 1 5; do
- install -d -m755 $pkgdir/usr/share/man/man$i
- mv $pkgdir/usr/share/texmf/doc/man/man$i/*.$i $pkgdir/usr/share/man/man$i/
+ install -d -m755 "$pkgdir"/usr/share/man/man$i
+ mv "$pkgdir"/usr/share/texmf/doc/man/man$i/*.$i "$pkgdir"/usr/share/man/man$i/
done
# move info files to /usr/share/info
- install -d -m755 $pkgdir/usr/share/info
- mv $pkgdir/usr/share/texmf/doc/info/*.info $pkgdir/usr/share/info/
- rm -rf $pkgdir/usr/share/texmf/doc/{man,info}
+ install -d -m755 "$pkgdir"/usr/share/info
+ mv "$pkgdir"/usr/share/texmf/doc/info/*.info "$pkgdir"/usr/share/info/
+ rm -rf "$pkgdir"/usr/share/texmf/doc/{man,info}
# copy config files to $TEXMFCONFIG tree
- cp -a $pkgdir/usr/share/texmf/chktex/chktexrc \
- $pkgdir/etc/texmf/chktex/
- cp -a $pkgdir/usr/share/texmf/web2c/mktex.cnf \
- $pkgdir/etc/texmf/web2c/
- cp -a $pkgdir/usr/share/texmf/web2c/updmap.cfg \
- $pkgdir/etc/texmf/web2c/
- cp -a $pkgdir/usr/share/texmf/web2c/fmtutil.cnf \
- $pkgdir/etc/texmf/web2c/
- cp -a $pkgdir/usr/share/texmf/dvips/config/config.ps \
- $pkgdir/etc/texmf/dvips/config/
- cp -a $pkgdir/usr/share/texmf/dvipdfm/config/config \
- $pkgdir/etc/texmf/dvipdfm/config/
- cp -a $pkgdir/usr/share/texmf/dvipdfmx/dvipdfmx.cfg \
- $pkgdir/etc/texmf/dvipdfmx/
- cp -a $pkgdir/usr/share/texmf/tex/generic/config/pdftexconfig.tex \
- $pkgdir/etc/texmf/tex/generic/config/
- cp -a $pkgdir/usr/share/texmf/tex/generic/config/language.dat \
- $pkgdir/etc/texmf/tex/generic/config/
- cp -a $pkgdir/usr/share/texmf/tex/generic/config/language.def \
- $pkgdir/etc/texmf/tex/generic/config/
- cp -a $pkgdir/usr/share/texmf/ttf2pk/ttf2pk.cfg \
- $pkgdir/etc/texmf/ttf2pk/
- cp -a $pkgdir/usr/share/texmf/xdvi/XDvi \
- $pkgdir/etc/texmf/xdvi/
+ cp -a "$pkgdir"/usr/share/texmf/chktex/chktexrc \
+ "$pkgdir"/etc/texmf/chktex/
+ cp -a "$pkgdir"/usr/share/texmf/web2c/mktex.cnf \
+ "$pkgdir"/etc/texmf/web2c/
+ cp -a "$pkgdir"/usr/share/texmf/web2c/updmap.cfg \
+ "$pkgdir"/etc/texmf/web2c/
+ cp -a "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf \
+ "$pkgdir"/etc/texmf/web2c/
+ cp -a "$pkgdir"/usr/share/texmf/dvips/config/config.ps \
+ "$pkgdir"/etc/texmf/dvips/config/
+ cp -a "$pkgdir"/usr/share/texmf/dvipdfm/config/config \
+ "$pkgdir"/etc/texmf/dvipdfm/config/
+ cp -a "$pkgdir"/usr/share/texmf/dvipdfmx/dvipdfmx.cfg \
+ "$pkgdir"/etc/texmf/dvipdfmx/
+ cp -a "$pkgdir"/usr/share/texmf/tex/generic/config/pdftexconfig.tex \
+ "$pkgdir"/etc/texmf/tex/generic/config/
+ cp -a "$pkgdir"/usr/share/texmf/tex/generic/config/language.dat \
+ "$pkgdir"/etc/texmf/tex/generic/config/
+ cp -a "$pkgdir"/usr/share/texmf/tex/generic/config/language.def \
+ "$pkgdir"/etc/texmf/tex/generic/config/
+ cp -a "$pkgdir"/usr/share/texmf/ttf2pk/ttf2pk.cfg \
+ "$pkgdir"/etc/texmf/ttf2pk/
+ cp -a "$pkgdir"/usr/share/texmf/xdvi/XDvi \
+ "$pkgdir"/etc/texmf/xdvi/
# remove TL specific warnings in the language.{dat,def} files:
- sed -i -e '/DO NOT EDIT/,+3 d' $pkgdir/etc/texmf/tex/generic/config/language.*
+ sed -i -e '/DO NOT EDIT/,+3 d' "$pkgdir"/etc/texmf/tex/generic/config/language.*
# clean updmap.cfg
- sed -i '/^\(Map\|MixedMap\)/d' $pkgdir/etc/texmf/web2c/updmap.cfg
- sed -i '/^#! \(Map\|MixedMap\)/d' $pkgdir/etc/texmf/web2c/updmap.cfg
+ sed -i '/^\(Map\|MixedMap\)/d' "$pkgdir"/etc/texmf/web2c/updmap.cfg
+ sed -i '/^#! \(Map\|MixedMap\)/d' "$pkgdir"/etc/texmf/web2c/updmap.cfg
# Don't list formats which need removed packages to work.
- sed -i '/csplain\|mex\|jadetex/d' $pkgdir/etc/texmf/web2c/fmtutil.cnf
+ sed -i '/csplain\|mex\|jadetex/d' "$pkgdir"/etc/texmf/web2c/fmtutil.cnf
#############################################################
### install
@@ -219,24 +215,24 @@ package() {
echo "--> Proceeding with make install ..."
echo "-------------------------------------------------------"
cd Work
- make DESTDIR=${pkgdir} texmf=$pkgdir/usr/share/texmf install
- rm -rf ${pkgdir}/usr/{texmf,share/texmf-dist}
+ make DESTDIR=${pkgdir} texmf="$pkgdir"/usr/share/texmf install
+ rm -rf "${pkgdir}"/usr/{texmf,share/texmf-dist}
# replace upstream texmf.cnf with ours
- rm -f $pkgdir/usr/share/texmf/web2c/texmf.cnf
- install -m644 $srcdir/texmf.cnf $pkgdir/etc/texmf/web2c/texmf.cnf
+ rm -f "$pkgdir"/usr/share/texmf/web2c/texmf.cnf
+ install -m644 "$srcdir"/texmf.cnf $pkgdir/etc/texmf/web2c/texmf.cnf
# since the location of texmf.cnf is hard-wired to be under /usr/share/texmf/web2c
# we make a symlink from /etc/texmf/web2c/texmf.cnf to the latter
- ln -sf /etc/texmf/web2c/texmf.cnf $pkgdir/usr/share/texmf/web2c/texmf.cnf
+ ln -sf /etc/texmf/web2c/texmf.cnf "$pkgdir"/usr/share/texmf/web2c/texmf.cnf
# fix location of TEXMFCACHE for luatools
- sed -i 's#texlive2010#texlive#' $pkgdir/usr/share/texmf/web2c/texmfcnf.lua
+ sed -i 's#texlive2010#texlive#' "$pkgdir"/usr/share/texmf/web2c/texmfcnf.lua
## remove aleph from fmtutil.cnf
- sed -i -e '/aleph/d' $pkgdir/usr/share/texmf/web2c/fmtutil.cnf
+ sed -i -e '/aleph/d' "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf
## install luatex binary
- cd $srcdir/luatex/build/texk/web2c
- ./libtool --mode=install install -m755 luatex $pkgdir/usr/bin/
- cd $pkgdir/usr/bin
+ cd "$srcdir"/luatex/build/texk/web2c
+ ./libtool --mode=install install -m755 luatex "$pkgdir"/usr/bin/
+ cd "$pkgdir"/usr/bin
/bin/ln -s luatex texlua
/bin/ln -s luatex texluac
@@ -246,7 +242,7 @@ package() {
# create symlinks for formats
echo "--> Create symlinks for TeX formats ..."
- LD_PRELOAD="${pkgdir}/usr/lib/libkpathsea.so.6" PATH="$PATH:${pkgdir}/usr/bin" texlinks -f $pkgdir/usr/share/texmf/web2c/fmtutil.cnf $pkgdir/usr/bin/
+ PATH="$PATH:${pkgdir}/usr/bin" texlinks -f "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf "$pkgdir"/usr/bin/
#############################################################
# remove dangling symlinks
_bibtexextra_scripts="
@@ -343,7 +339,7 @@ vpe"
${_pstricks_scripts} \
${_science_scripts} \
tlmgr; do
- rm -f $pkgdir/usr/bin/$s
+ rm -f "$pkgdir"/usr/bin/$s
done
###################################################################
}
diff --git a/libre/texlive-bin-libre/texlive.install b/libre/texlive-bin-libre/texlive.install
index 9307c536b..b85850123 100644
--- a/libre/texlive-bin-libre/texlive.install
+++ b/libre/texlive-bin-libre/texlive.install
@@ -1,3 +1,6 @@
+infodir=usr/share/info
+filelist=(dvipng.info dvips.info eplain.info epspdf.info fontname.info kpathsea.info latex2e-es.info latex2e.info latex2man.info mf2pt1.info tds.info texdraw.info web2c.info)
+
post_install() {
echo ">>> texlive: updating the filename database..."
usr/bin/mktexlsr
@@ -5,6 +8,11 @@ post_install() {
usr/bin/fmtutil-sys --all 1>/dev/null
echo " done."
echo " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
+
+ [[ -x usr/bin/install-info ]] || return 0
+ for file in "${filelist[@]}"; do
+ install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+ done
}
post_upgrade() {
@@ -14,5 +22,16 @@ post_upgrade() {
usr/bin/fmtutil-sys --all 1>/dev/null
echo " done."
echo " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
+
+ [[ -x usr/bin/install-info ]] || return 0
+ for file in "${filelist[@]}"; do
+ install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+ done
}
+pre_remove() {
+ [[ -x usr/bin/install-info ]] || return 0
+ for file in "${filelist[@]}"; do
+ install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+ done
+}
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 45b870e64..edf35ff62 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 56698 2011-10-10 18:23:45Z ibiru $
+# $Id: PKGBUILD 63763 2012-02-05 12:13:00Z ibiru $
# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
# Changes:
# * Adapt to linux-libre
@@ -9,20 +9,28 @@
#Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgbase=virtualbox-libre
pkgname=('virtualbox-libre' 'virtualbox-parabola-additions' 'virtualbox-sdk' 'virtualbox-source')
-pkgver=4.1.4
-pkgrel=3
+pkgver=4.1.8
+pkgrel=2
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst'
'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'linux-libre-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2')
+#'xorg-server-devel' 'xf86driproto' 'libxcomposite')
[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
- virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch
10-vboxdrv.rules vboxdrv-reference.patch LocalConfig.kmk vboxbuild
change_default_driver_dir.patch vbox-service.conf vbox-service.rc)
+md5sums=('2092bba46baa62fab5520d67dee2ece8'
+ '5f85710e0b8606de967716ded7b2d351'
+ '6ab2455c391d8cc005e2f4461ae26a3b'
+ '78ffa67ff131680f1d2b6f06d4325c5b'
+ '67688bff176d3c6fac5664dc282fea52'
+ '97e193f050574dd272a38e5ee5ebe62b'
+ '3c08ad30b89add47d3f45121200a5360'
+ 'e7416331d0bc331f3b5aae3e5d104642')
-_extramodules=extramodules-3.1-LIBRE
+_extramodules=extramodules-3.2-LIBRE
_kernver="$(cat /lib/modules/${_extramodules}/version)"
build() {
@@ -46,17 +54,16 @@ build() {
package_virtualbox-libre() {
pkgdesc="Powerful x86 virtualization for enterprise as well as home use"
- depends=('virtualbox-modules' 'libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng')
+ depends=('virtualbox-modules' 'libxml2' 'libxcursor' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng')
optdepends=('qt: for VirtualBox GUI'
'vde2: Virtual Distributed Ethernet support'
'virtualbox-sdk: developer kit'
'virtualbox-source: host kernel source modules for non-stock kernels')
- replaces=('virtualbox')
- conflicts=('virtualbox')
- provides=("virtualbox=$pkgver")
- replaces=('virtualbox-ose')
- conflicts=('virtualbox-ose')
+ backup=('etc/vbox/vbox.cfg')
+ replaces=('virtualbox' 'virtualbox-ose')
+ conflicts=('virtualbox' 'virtualbox-ose')
+ provides=("virtualbox=$pkgver")
install=virtualbox.install
source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
@@ -117,7 +124,9 @@ package_virtualbox-libre() {
package_virtualbox-source() {
pkgdesc="VirtualBox kernel modules source"
- depends=(linux-libre-headers gcc make)
+ depends=(gcc make)
+ provides=(virtualbox-modules)
+ optdepends=('linux-libre-headers')
install=virtualbox-source.install
source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
@@ -151,7 +160,7 @@ package_virtualbox-sdk() {
package_virtualbox-parabola-additions(){
pkgdesc="Additions only for Parabola guests (userspace tools)"
- depends=("virtualbox-parabola-modules=$pkgver" 'gcc-libs' 'libxmu' 'xorg-xrandr')
+ depends=("virtualbox-parabola-modules=$pkgver" 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes')
replaces=('virtualbox-guest-additions' 'virtualbox-archlinux-additions')
conflicts=('virtualbox-guest-additions' 'virtualbox-archlinux-additions')
provides=("virtualbox-archlinux-additions=${pkgver}")
@@ -181,23 +190,3 @@ package_virtualbox-parabola-additions(){
# install sample config
install -D -m644 "${srcdir}/vbox-service.conf" "${pkgdir}/etc/conf.d/vbox-service"
}
-md5sums=('dc6e6801b3823332b6ca2e9915221aae'
- 'bc048d1e58d84ece4a186199ee48d4c8'
- '5f85710e0b8606de967716ded7b2d351'
- 'cc3f278bc273011aa95277500a76f677'
- '78ffa67ff131680f1d2b6f06d4325c5b'
- 'a82d698e7868315cdf876cfb02fd2268'
- '97e193f050574dd272a38e5ee5ebe62b'
- '3c08ad30b89add47d3f45121200a5360'
- '778d865e56e31cc592fbfa257fdcfce7')
-
-md5sums=('dc6e6801b3823332b6ca2e9915221aae'
- 'a9f22ccaacb207e0e1c5450fede82d06'
- 'b7cbcf89a30c712fed4435dea28d1703'
- '5f85710e0b8606de967716ded7b2d351'
- 'cc3f278bc273011aa95277500a76f677'
- '78ffa67ff131680f1d2b6f06d4325c5b'
- 'a82d698e7868315cdf876cfb02fd2268'
- '97e193f050574dd272a38e5ee5ebe62b'
- '3c08ad30b89add47d3f45121200a5360'
- '778d865e56e31cc592fbfa257fdcfce7')
diff --git a/libre/virtualbox-libre/vbox-service.rc b/libre/virtualbox-libre/vbox-service.rc
index c1af2134d..6f1b8d892 100644
--- a/libre/virtualbox-libre/vbox-service.rc
+++ b/libre/virtualbox-libre/vbox-service.rc
@@ -11,13 +11,13 @@ case "$1" in
start)
stat_busy "Starting $name service"
[[ -z "$PID" ]] && ${name} $VBOX_SERVICE_OPTION &>/dev/null \
- && { add_daemon $name; stat_done; } \
+ && { add_daemon vbox-service; stat_done; } \
|| { stat_fail; exit 1; }
;;
stop)
stat_busy "Stopping $name service"
[[ -n "$PID" ]] && kill $PID &>/dev/null \
- && { rm_daemon $name; stat_done; } \
+ && { rm_daemon vbox-service; stat_done; } \
|| { stat_fail; exit 1; }
;;
restart)
diff --git a/libre/virtualbox-libre/vboxbuild b/libre/virtualbox-libre/vboxbuild
index cfc3c0a66..e6fb94edd 100644
--- a/libre/virtualbox-libre/vboxbuild
+++ b/libre/virtualbox-libre/vboxbuild
@@ -32,11 +32,11 @@ fi
for kdir in /lib/modules/[2-3]*; do
if [[ ! -d $kdir/kernel ]]; then
# found a stale kernel
- mods=("$kdir/misc/vbox"{drv,netadp,netflt,pci}.ko*)
+ mods=("$kdir/extramodules"{drv,netadp,netflt,pci}.ko*)
if (( ${#mods[@]} )); then
stat_busy "Removing all old VirtualBox kernel modules"
if rm -f "${mods[@]}" &&
- rmdir -p --ignore-fail-on-non-empty "$p/misc/" 2>/dev/null; then
+ rmdir -p --ignore-fail-on-non-empty "$kdir/extramodules" 2>/dev/null; then
stat_done
else
stat_fail
@@ -52,6 +52,7 @@ fi
for kernver; do
export KERN_DIR=/lib/modules/$kernver/build
+ export MODULE_DIR=/lib/modules/$kernver/extramodules
if [[ ! -d $KERN_DIR ]]; then
printf "error: \`%s' does not appear to be a valid kernel build directory.\n" \
"$KERN_DIR"
@@ -59,15 +60,22 @@ for kernver; do
fi
stat_busy "Recompiling VirtualBox kernel modules ($kernver)"
- for build in BUILDVBOX{DRV,NETFLT,NETADP,PCI}; do
+ if ! $BUILDVBOXDRV \
+ --save-module-symvers /tmp/vboxdrv-Module.symvers \
+ --no-print-directory install >> $LOG 2>&1; then
+ echo "Look at $LOG to find out what went wrong"
+ stat_fail
+ fi
+ for build in BUILDVBOX{NETFLT,NETADP,PCI}; do
if ! ${!build} \
- --save-module-symvers /tmp/vboxdrv-Module.symvers \
+ --use-module-symvers /tmp/vboxdrv-Module.symvers \
--no-print-directory install >> $LOG 2>&1; then
echo "Look at $LOG to find out what went wrong"
stat_fail
- continue
fi
done
+ gzip -f9 "$MODULE_DIR"/*.ko
+ depmod "$kernver"
stat_done
done
diff --git a/libre/virtualbox-libre/vboxdrv-reference.patch b/libre/virtualbox-libre/vboxdrv-reference.patch
index c310dbc8d..710e2e511 100644
--- a/libre/virtualbox-libre/vboxdrv-reference.patch
+++ b/libre/virtualbox-libre/vboxdrv-reference.patch
@@ -1,45 +1,57 @@
-diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
---- VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-07-19 15:11:37.730121727 +0000
-+++ VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-07-19 19:02:15.658471139 +0000
-@@ -75,9 +75,8 @@
+diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
+--- VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:22:13.636083176 +0000
++++ VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:48:58.915541368 +0000
+@@ -75,10 +75,9 @@
"The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
"there is a permission problem with /dev/vboxdrv. Please reinstall the kernel "
"module by executing<br/><br/>"
- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
-- "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS "
-- "package first. This package keeps track of Linux kernel changes and "
-+ " <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>"
-+ "as root. This package keeps track of Linux kernel changes and"
- "recompiles the vboxdrv kernel module if necessary."
+- "as root. If it is available in your distribution, you should install the "
+- "DKMS package first. This package keeps track of Linux kernel changes and "
+- "recompiles the vboxdrv kernel module if necessary."
++ " <font color=blue>'pacman -S virtualbox-modules'</font><br/><br/>"
++ "as root. If you don't use our stock kernel, install virtualbox-source and"
++ "execute /usr/bin/vboxbuild ."
);
-@@ -92,7 +91,7 @@
+ QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
+@@ -90,11 +89,8 @@
+
+ QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
"The VirtualBox kernel modules do not match this version of "
- "VirtualBox. The installation of VirtualBox was apparently not "
- "successful. Executing<br/><br/>"
+- "VirtualBox. The installation of VirtualBox was apparently not "
+- "successful. Executing<br/><br/>"
- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
+- "may correct this. Make sure that you do not mix the "
+- "OSE version and the PUEL version of VirtualBox."
++ "VirtualBox. Reload the modules or if you don't use our stock kernel execute<br/><br/> "
+ " <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>"
- "may correct this. Make sure that you do not mix the "
- "OSE version and the PUEL version of VirtualBox."
);
-diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.0_OSE/src/VBox/Installer/linux/VBox.sh
---- VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh 2011-07-19 15:11:37.603453927 +0000
-+++ VirtualBox-4.1.0_OSE/src/VBox/Installer/linux/VBox.sh 2011-07-19 19:02:15.658471139 +0000
-@@ -34,7 +34,7 @@
+
+ QString g_QStrHintOtherNoDriver = QApplication::tr(
+diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh
+--- VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:22:13.549415814 +0000
++++ VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:56:50.735874087 +0000
+@@ -32,17 +32,18 @@
+ cat << EOF
+ WARNING: The vboxdrv kernel module is not loaded. Either there is no module
available for the current kernel (`uname -r`) or it failed to
- load. Please recompile the kernel module and install it by
+- load. Please recompile the kernel module and install it by
++ load. Please reinstall the kernel module virtualbox-modules or
++ if you don't use our stock kernel compile the modules with
- sudo /etc/init.d/vboxdrv setup
+ sudo /usr/bin/vboxbuild
You will not be able to start VMs until this problem is fixed.
EOF
-@@ -42,7 +42,7 @@
+ elif [ ! -c /dev/vboxdrv ]; then
cat << EOF
- WARNING: The character device /dev/vboxdrv does not exist. Try
+-WARNING: The character device /dev/vboxdrv does not exist. Try
++WARNING: The character device /dev/vboxdrv does not exist. Try to load the module
- sudo /etc/init.d/vboxdrv restart
-+ sudo /usr/bin/vboxbuild
++ sudo modprobe vboxdrv
and if that is not successful, try to re-install the package.
diff --git a/libre/virtualbox-libre/virtualbox-source.install b/libre/virtualbox-libre/virtualbox-source.install
index 14537f23d..24d90b1c2 100644
--- a/libre/virtualbox-libre/virtualbox-source.install
+++ b/libre/virtualbox-libre/virtualbox-source.install
@@ -10,4 +10,3 @@ post_upgrade() {
===> To recompile the modules do /usr/bin/vboxbuild
EOF
}
-
diff --git a/libre/virtualbox-libre/virtualbox.install b/libre/virtualbox-libre/virtualbox.install
index b2d2e8858..29646e973 100644
--- a/libre/virtualbox-libre/virtualbox.install
+++ b/libre/virtualbox-libre/virtualbox.install
@@ -20,10 +20,10 @@ post_install() {
post_upgrade() {
getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers
utils
- if [ "$(vercmp $2 4.1.4-3)" -lt 0 ]; then
+ if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then
/bin/cat << EOF
-===> Starting with virtualbox version 4.1.4-3, kernel modules handling is done by virtualbox-modules.
-===> Use virtualbox-source package if you don't use our stock linux package.
+===> Starting with virtualbox version 4.1.6-1, kernel modules handling is done by virtualbox-modules.
+===> Use virtualbox-source package if you don't use our stock linux-libre package.
EOF
fi
}
diff --git a/libre/virtualbox-modules/60-vboxguest.rules b/libre/virtualbox-modules/60-vboxguest.rules
new file mode 100644
index 000000000..6285f7249
--- /dev/null
+++ b/libre/virtualbox-modules/60-vboxguest.rules
@@ -0,0 +1,2 @@
+ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600"
+ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666"
diff --git a/libre/virtualbox-modules/LocalConfig.kmk b/libre/virtualbox-modules/LocalConfig.kmk
new file mode 100644
index 000000000..af79f90cd
--- /dev/null
+++ b/libre/virtualbox-modules/LocalConfig.kmk
@@ -0,0 +1,19 @@
+VBOX_WITH_ADDITION_DRIVERS =
+VBOX_WITH_INSTALLER = 1
+VBOX_WITH_LINUX_ADDITIONS = 1
+VBOX_WITH_X11_ADDITIONS =
+VBOX_WITH_TESTCASES =
+VBOX_WITH_TESTSUITE =
+VBOX_WITH_ORIGIN :=
+VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
+VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
+VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
+VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
+VBOX_PATH_APP_DOCS := /usr/share/virtualbox
+VBOX_WITH_REGISTRATION_REQUEST =
+VBOX_WITH_UPDATE_REQUEST =
+VBOX_WITH_VNC := 1
+VBOX_BLD_PYTHON = python2
+VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk
+VBOX_GCC_WERR =
+VBOX_GCC_WARN =
diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD
new file mode 100644
index 000000000..9359edfb2
--- /dev/null
+++ b/libre/virtualbox-modules/PKGBUILD
@@ -0,0 +1,102 @@
+# $Id: PKGBUILD 62846 2012-01-27 17:21:04Z ibiru $
+#Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgbase=virtualbox-modules
+pkgname=('virtualbox-modules' 'virtualbox-parabola-modules')
+pkgver=4.1.8
+pkgrel=3
+arch=('i686' 'x86_64')
+url='http://virtualbox.org'
+license=('GPL')
+makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-headers')
+[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
+source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
+ LocalConfig.kmk 60-vboxguest.rules)
+md5sums=('2092bba46baa62fab5520d67dee2ece8'
+ '4c88bd122677a35f68abd76eb01b378b'
+ 'ed1341881437455d9735875ddf455fbe')
+
+_extramodules=extramodules-3.2-LIBRE
+_kernver="$(cat /lib/modules/${_extramodules}/version || true)"
+
+export KERN_DIR=/lib/modules/${_kernver}/build
+export KERN_INCL=/usr/src/linux-${_kernver}/include/
+
+build() {
+ cd "$srcdir/VirtualBox-${pkgver}_OSE"
+
+ cp "$srcdir/LocalConfig.kmk" .
+
+ ./configure \
+ --with-linux=/usr/src/linux-${_kernver} \
+ --disable-java \
+ --disable-docs \
+ --disable-xpcom \
+ --disable-python \
+ --disable-sdl-ttf \
+ --disable-alsa \
+ --disable-pulse \
+ --disable-dbus \
+ --disable-opengl \
+ --build-headless \
+ --nofatal
+ source ./env.sh
+ kmk all
+
+ make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
+ make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
+}
+
+package_virtualbox-parabola-modules(){
+ pkgdesc="Additions only for Parabola guests (kernel modules)"
+ license=('GPL')
+ install=virtualbox-parabola-modules.install
+ depends=('linux>=3.2' 'linux<3.3')
+ replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules')
+ conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules')
+ provides=("virtualbox-archlinux-modules=$pkgver")
+
+ source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
+
+ cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
+
+ for module in vboxguest.ko vboxsf.ko vboxvideo.ko; do
+ install -D -m644 ${module} \
+ "$pkgdir/lib/modules/${_extramodules}/${module}"
+ done
+
+ install -D -m 0644 "$srcdir/60-vboxguest.rules" \
+ "$pkgdir/lib/udev/rules.d/60-vboxguest.rules"
+
+ find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
+
+ sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-parabola-modules.install"
+}
+
+package_virtualbox-modules(){
+ pkgdesc="Kernel modules for VirtualBox"
+ license=('GPL')
+ install=virtualbox-modules.install
+ depends=('linux>=3.2' 'linux<3.3')
+
+ source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
+
+
+ cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
+
+ install -D -m644 vboxdrv.ko \
+ "$pkgdir/lib/modules/${_extramodules}/vboxdrv.ko"
+
+ install -D -m644 vboxnetadp.ko \
+ "$pkgdir/lib/modules/${_extramodules}/vboxnetadp.ko"
+
+ install -D -m644 vboxnetflt.ko \
+ "$pkgdir/lib/modules/${_extramodules}/vboxnetflt.ko"
+
+ install -D -m644 vboxpci.ko \
+ "$pkgdir/lib/modules/${_extramodules}/vboxpci.ko"
+
+ find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
+
+ sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-modules.install"
+}
diff --git a/libre/virtualbox-modules/virtualbox-modules.install b/libre/virtualbox-modules/virtualbox-modules.install
new file mode 100644
index 000000000..671c129d6
--- /dev/null
+++ b/libre/virtualbox-modules/virtualbox-modules.install
@@ -0,0 +1,19 @@
+post_install() {
+/bin/cat << EOF
+===> You must load vboxdrv module before starting VirtualBox:
+===> # modprobe vboxdrv
+EOF
+ EXTRAMODULES='extramodules-3.2-LIBRE'
+ depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}
+
+post_upgrade() {
+ EXTRAMODULES='extramodules-3.2-LIBRE'
+ depmod $(cat /lib/modules/$EXTRAMODULES/version)
+ rmmod vboxdrv || echo 'In order to use the new version, reload all virtualbox modules manually.'
+}
+
+post_remove() {
+ EXTRAMODULES='extramodules-3.2-LIBRE'
+ depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}
diff --git a/libre/virtualbox-modules/virtualbox-parabola-modules.install b/libre/virtualbox-modules/virtualbox-parabola-modules.install
new file mode 100644
index 000000000..b542db1ca
--- /dev/null
+++ b/libre/virtualbox-modules/virtualbox-parabola-modules.install
@@ -0,0 +1,17 @@
+post_install() {
+cat << EOF
+===> You may want to load vboxguest, vboxsf and vboxvideo
+EOF
+ EXTRAMODULES='extramodules-3.2-LIBRE'
+ depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}
+
+post_upgrade() {
+ EXTRAMODULES='extramodules-3.2-LIBRE'
+ depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}
+
+post_remove() {
+ EXTRAMODULES='extramodules-3.2-LIBRE'
+ depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}