summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/blender-libre/PKGBUILD6
-rw-r--r--libre/clementine-libre/PKGBUILD4
-rw-r--r--libre/clementine-libre/clementine-1.0.1-global-menu.patch17
-rw-r--r--libre/libquicktime-libre/PKGBUILD4
-rw-r--r--libre/linux-libre-lts/PKGBUILD4
-rw-r--r--libre/linux-libre/PKGBUILD3
-rw-r--r--libre/mplayer-libre/PKGBUILD30
-rw-r--r--libre/mplayer-vaapi-libre/PKGBUILD41
-rw-r--r--libre/mplayer-vaapi-libre/mplayer-vaapi.install8
-rw-r--r--libre/mplayer-vaapi-libre/tweak-desktop-file.patch22
-rw-r--r--libre/virtualbox-libre/PKGBUILD8
-rw-r--r--libre/virtualbox-libre/vboxbuild20
-rw-r--r--libre/virtualbox-modules-lts/PKGBUILD22
-rw-r--r--libre/virtualbox-modules-lts/virtualbox-modules-lts.install6
-rw-r--r--libre/virtualbox-modules-lts/virtualbox-parabola-modules-lts.install6
-rw-r--r--libre/virtualbox-modules/PKGBUILD18
-rw-r--r--libre/virtualbox-modules/virtualbox-modules.install6
-rw-r--r--libre/virtualbox-modules/virtualbox-parabola-modules.install6
18 files changed, 117 insertions, 114 deletions
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 6fc5679e7..05b54f402 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: John Sowiak <john@archlinux.org>
# Contributor: tobias <tobias@archlinux.org>
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
# Apparently, the blender guys refuse to release source tarballs for
# intermediate releases that deal mainly with binaries but incorporate tiny
@@ -14,9 +14,9 @@ _svn=true
_pkgname=blender
pkgname=blender-libre
true && pkgver=2.63a # Hack for svn
-true && pkgrel=2
+true && pkgrel=2.1
epoch=4
-pkgdesc="A fully integrated 3D graphics creation suite without cuda-toolkit recommendation"
+pkgdesc="A fully integrated 3D graphics creation suite (without nonfree cuda-toolkit support)"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url="http://www.blender.org"
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index c22a7a230..53ab2a644 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -3,12 +3,12 @@
#Contributor: BlackEagle <ike.devolder@gmail.com>
#Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
#Maintainer (Parabola): Kete <kete@ninthfloor.org>
-#Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+#Contributor (Parabola): André Silva <emulatorman@lavabit.com>
_pkgname=clementine
pkgname=clementine-libre
pkgver=1.0.1
-pkgrel=4
+pkgrel=6
pkgdesc="A music player and library organizer, without spotify support"
url="http://www.clementine-player.org/"
license=('GPL')
diff --git a/libre/clementine-libre/clementine-1.0.1-global-menu.patch b/libre/clementine-libre/clementine-1.0.1-global-menu.patch
new file mode 100644
index 000000000..91f93e058
--- /dev/null
+++ b/libre/clementine-libre/clementine-1.0.1-global-menu.patch
@@ -0,0 +1,17 @@
+diff -Naur clementine-1.0.1.ori/src/main.cpp clementine-1.0.1/src/main.cpp
+--- clementine-1.0.1.ori/src/main.cpp 2012-01-22 07:43:26.000000000 -0500
++++ clementine-1.0.1/src/main.cpp 2012-07-05 13:58:49.040596906 -0400
+@@ -280,13 +280,6 @@
+ UniversalEncodingHandler handler;
+ TagLib::ID3v1::Tag::setStringHandler(&handler);
+
+-#ifdef Q_OS_LINUX
+- // Force Clementine's menu to be shown in the Clementine window and not in
+- // the Unity global menubar thing. See:
+- // https://bugs.launchpad.net/unity/+bug/775278
+- setenv("QT_X11_NO_NATIVE_MENUBAR", "1", true);
+-#endif
+-
+ // Initialise logging
+ logging::Init();
+ logging::SetLevels(options.log_levels());
diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD
index 2a624348b..0538d1c76 100644
--- a/libre/libquicktime-libre/PKGBUILD
+++ b/libre/libquicktime-libre/PKGBUILD
@@ -1,11 +1,11 @@
# $Id$
# Maintainer: Mateusz Herych <heniekk@gmail.com>
-# Contributor (Parabola): Jorge Lopez <jorginho@adinet.com.uy>
+# Contributor (Parabola): Jorge Lopez <jorginho@lavabit.com>
pkgname=libquicktime-libre
_pkgname=libquicktime
pkgver=1.2.4
-pkgrel=1
+pkgrel=2
pkgdesc="A library for reading and writing quicktime files (no unfree faac support)."
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index f4807a4d8..17651ce1e 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -5,7 +5,7 @@
# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
pkgbase=linux-libre-lts
-pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE kernel
+pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE-LTS kernel
# pkgname=linux-custom # Build kernel with a different name
_kernelname=-LIBRE-LTS
_basekernel=3.0
@@ -357,7 +357,7 @@ package_linux-libre-lts-headers() {
done
# remove unneeded architectures
- rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,microblaze,mn10300,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,um,unicore32,v850,xtensa}
+ rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
if [ "$CARCH" = "mips64el" ]; then
rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/x86
else
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 077df9256..bf3d84383 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -62,9 +62,6 @@ build() {
# Add freedo as boot logo
patch -Np1 -i "${srcdir}/boot-logo.patch"
- # add latest fixes from stable queue, if needed
- # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
-
# Some chips detect a ghost TV output
# mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html
# Arch Linux bug report: FS#19234
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index cf2be2b5f..3e9d0a44d 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -1,33 +1,27 @@
-# $Id: PKGBUILD 152227 2012-03-05 09:38:48Z ibiru $
+# $Id: PKGBUILD 163126 2012-07-07 16:29:25Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
-
-# libvdpau is currently useful only with proprietary software
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
_pkgbase=mplayer
pkgbase=mplayer-libre
pkgname=('mplayer-libre' 'mencoder-libre')
-pkgver=34799
-pkgrel=2
+pkgver=35014
+pkgrel=1
arch=('i686' 'x86_64')
-makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
+makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' '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'
-'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio')
+'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio' 'subversion')
license=('GPL')
url="http://www.mplayerhq.hu/"
options=(!buildflags !emptydirs)
-source=(ftp://ftp.archlinux.org/other/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop
- live-media.patch)
-md5sums=('e8bd960bcdb48fdc5a1f45390dc13c53'
- 'c0d6ef795cf6de48e3b87ff7c23f0319'
- 'b6c057633ff7001ee0c102b5f81ec1e3')
+source=(ftp://ftp.archlinux.org/other/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop)
+md5sums=('d0785560e5e8eb02e089728ef4412eae'
+ 'c0d6ef795cf6de48e3b87ff7c23f0319')
build() {
cd "$srcdir/$_pkgbase"
- patch -Np0 -i "$srcdir/live-media.patch"
-
./configure --prefix=/usr \
--enable-runtime-cpudetection \
--disable-gui \
@@ -52,11 +46,11 @@ build() {
}
package_mplayer-libre() {
- pkgdesc="A movie player for GNU/Linux (no unfree faac support)"
+ pkgdesc="A movie player for GNU/Linux (without unfree faac support)"
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' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio')
provides=("mplayer=$pkgver")
replaces=('mplayer')
@@ -76,7 +70,7 @@ package_mplayer-libre() {
package_mencoder-libre() {
pkgdesc="Free command line video decoding, encoding and filtering tool (without unfree faac support)"
- depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'cdparanoia'
+ depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr'
'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio')
provides=("mencoder=$pkgver")
replaces=('mencoder')
diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index 3ef5c65ee..41f84e022 100644
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -1,47 +1,42 @@
# $Id$
-# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
+# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-_pkgname=mplayer-vaapi
pkgname=mplayer-vaapi-libre
-pkgver=34578
-pkgrel=5.1
-pkgdesc="A movie player, compiled with vaapi support"
+pkgver=35014
+pkgrel=1
+pkgdesc="A movie player, compiled with vaapi (without unfree faac support)"
arch=('i686' 'x86_64')
url="http://gitorious.org/vaapi/mplayer"
license=('GPL')
-depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio' 'libxinerama' 'sdl-libre'
+depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio' 'libxinerama' 'sdl'
'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'mesa'
'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')
+ 'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi'
+ 'libbluray' 'libva' 'libass' 'desktop-file-utils')
makedepends=('unzip-libre' 'live-media' 'yasm' 'ladspa' 'git')
-provides=("$_pkgname=$pkgver" "mplayer=$pkgver")
-conflicts=('mplayer' "$_pkgname")
+provides=("mplayer=$pkgver" "mplayer-vaapi=$pkgver")
+conflicts=('mplayer' 'mplayer-vaapi')
replaces=('mplayer-vaapi')
backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
source=(http://pkgbuild.com/~foutrelis/mplayer-vaapi-$pkgver.tar.xz
- tweak-desktop-file.patch
- mplayer.png
- live-media.patch)
+ tweak-desktop-file.patch)
options=('!buildflags' '!emptydirs')
install=mplayer-vaapi.install
-sha256sums=('cc35a057c8a64d2cdec2dc0a037811ef0f91dd03cd3d07465c7272a08665a37d'
- '5b39f0a61969bf330c4434cb17975101be93c27334f65e154e4a93033033e795'
- '061739a8cc267748ad58f168034cc39785d949a5262772535e1b347c7842af48'
- '9c1400f27dd2ea54c125c66ed1af0eab19761b1b2ae808fa491cd3732fd8a685')
+sha256sums=('db19a938e7de46aad567b6d7d8866ec6cb3919a29d60236609a83ebf4e1bb5f0'
+ '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b')
build() {
cd "$srcdir/mplayer-vaapi-$pkgver"
patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch"
- patch -Np0 -i "$srcdir/live-media.patch"
- ./configure --prefix=/usr \
+ ./configure \
+ --prefix=/usr \
--enable-runtime-cpudetection \
--disable-gui \
--disable-arts \
@@ -56,6 +51,8 @@ build() {
--disable-ass-internal \
--disable-faac \
--enable-xvmc \
+ --enable-radio \
+ --enable-radio-capture \
--disable-vdpau \
--enable-vaapi \
--language=all \
@@ -69,13 +66,13 @@ build() {
package() {
cd "$srcdir/mplayer-vaapi-$pkgver"
- make -j1 DESTDIR="$pkgdir" install-mplayer install-mplayer-man
+ make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
install -Dm644 etc/mplayer.desktop "$pkgdir/usr/share/applications/mplayer.desktop"
install -d "$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"
- install -Dm644 "$srcdir/mplayer.png" "$pkgdir/usr/share/pixmaps/mplayer.png"
+ install -Dm644 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png"
}
# vim:set ts=2 sw=2 et:
diff --git a/libre/mplayer-vaapi-libre/mplayer-vaapi.install b/libre/mplayer-vaapi-libre/mplayer-vaapi.install
index af56cdbf4..a44f19aef 100644
--- a/libre/mplayer-vaapi-libre/mplayer-vaapi.install
+++ b/libre/mplayer-vaapi-libre/mplayer-vaapi.install
@@ -1,9 +1,11 @@
post_install() {
- update-desktop-database -q
+ update-desktop-database -q
}
post_upgrade() {
- post_install
+ post_install
}
post_remove() {
- post_install
+ post_install
}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/mplayer-vaapi-libre/tweak-desktop-file.patch b/libre/mplayer-vaapi-libre/tweak-desktop-file.patch
index db0f377d2..606e356b0 100644
--- a/libre/mplayer-vaapi-libre/tweak-desktop-file.patch
+++ b/libre/mplayer-vaapi-libre/tweak-desktop-file.patch
@@ -1,19 +1,6 @@
---- mplayer.desktop.orig 2012-05-13 19:25:26.000000000 +0300
-+++ mplayer.desktop 2012-05-13 19:32:19.000000000 +0300
-@@ -7,12 +7,6 @@ GenericName[de]=Medienwiedergabe
- GenericName[fr]=Lecteur multimédia
- GenericName[it]=Lettore multimediale
- GenericName[ja]=メディアプレーヤー
--X-GNOME-FullName=MPlayer Media Player
--X-GNOME-FullName[ca]=MPlayer Reproductor multimèdia
--X-GNOME-FullName[de]=MPlayer Medienwiedergabe
--X-GNOME-FullName[fr]=MPlayer Lecteur multimédia
--X-GNOME-FullName[it]=MPlayer Lettore multimediale
--X-GNOME-FullName[ja]=MPlayer メディアプレーヤー
- Comment=Play movies and songs
- Comment[ca]=Reproduïu vídeos i cançons
- Comment[de]=Filme und Musik wiedergeben
-@@ -20,8 +14,9 @@ Comment[fr]=Lit les films et musiques
+--- mplayer.desktop.orig 2012-07-08 22:18:27.000000000 +0300
++++ mplayer.desktop 2012-07-08 22:19:08.000000000 +0300
+@@ -23,8 +23,9 @@ Comment[fr]=Lit les films et musiques
Comment[it]=Riproduce filmati e musica
Comment[ja]=動画や音声のファイルを再生します
Icon=mplayer
@@ -24,5 +11,4 @@
Terminal=false
+NoDisplay=true
Categories=GTK;AudioVideo;Audio;Video;Player;TV;
--MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-theora;video/x-matroska;video/3gpp;application/x-flash-video;
-+MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;video/3gpp;application/x-flash-video;
+ MimeType=application/mxf;application/x-netshow-channel;application/ogg;application/ram;application/vnd.rn-realmedia;application/x-shockwave-flash;application/smil;audio/ac3;audio/x-adpcm;audio/x-aiff;audio/AMR;audio/AMR-WB;audio/x-ape;audio/basic;audio/flac;audio/x-flac;audio/x-flac+ogg;audio/x-m4b;audio/x-matroska;audio/mp2;audio/mp4;audio/mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/ogg;audio/vnd.rn-realaudio;audio/x-scpls;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;video/3gpp;video/3gpp2;video/dv;video/x-flic;video/x-flv;video/x-matroska;video/mp2t;video/mp4;video/mpeg;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/ogg;video/x-ogm+ogg;video/quicktime;video/vnd.rn-realvideo;video/x-theora+ogg;video/webm;
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index a6dfc053b..8fa64046b 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -1,6 +1,6 @@
# $Id$
# Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
-# Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy>
+# Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
# Changes:
# * Adapt to linux-libre
@@ -12,7 +12,7 @@
pkgbase=virtualbox-libre
pkgname=('virtualbox-libre' 'virtualbox-parabola-additions' 'virtualbox-sdk' 'virtualbox-source')
pkgver=4.1.18
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
url='http://virtualbox.org'
license=('GPL' 'custom')
@@ -26,7 +26,7 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}
vboxweb.conf vboxweb.rc)
_extramodules=extramodules-3.4-LIBRE
-_kernver="$(cat /lib/modules/${_extramodules}/version)"
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)" || true
build() {
cd "$srcdir/VirtualBox-${pkgver}"
@@ -198,7 +198,7 @@ md5sums=('38db0a87cba659b484af868b0c2bd3ac'
'5f85710e0b8606de967716ded7b2d351'
'755ab0dd9bcacf2c00d2275b1ca69547'
'a1ff1d1b4423556887e48a32978226a6'
- '3c96faa76894c182c1bb56bb30d9a17e'
+ '248078ab922f27424ba9919d4aa90dcc'
'97e193f050574dd272a38e5ee5ebe62b'
'3c08ad30b89add47d3f45121200a5360'
'208cf5f842eb2e3a5b6dcfc59080d26c'
diff --git a/libre/virtualbox-libre/vboxbuild b/libre/virtualbox-libre/vboxbuild
index 4bc8e0c9d..350d0c6ad 100644
--- a/libre/virtualbox-libre/vboxbuild
+++ b/libre/virtualbox-libre/vboxbuild
@@ -1,13 +1,23 @@
#!/bin/bash
-. /etc/rc.conf
-. /etc/rc.d/functions
. /etc/vbox/vbox.cfg
MODLIST=()
LOG="/var/log/vbox-install.log"
>| "$LOG"
+stat_busy() {
+ printf '==> %s ... ' "$1"
+}
+
+stat_done() {
+ echo 'done'
+}
+
+stat_fail() {
+ echo 'failed'
+}
+
if [[ $INSTALL_DIR ]]; then
VBOXMANAGE=$INSTALL_DIR/VBoxManage
BUILDVBOXDRV=$INSTALL_DIR/src/vboxdrv/build_in_tmp
@@ -29,7 +39,7 @@ if (( ${#MODLIST[*]} )); then
modprobe -ar "${MODLIST[@]}" && stat_done || stat_fail
fi
-for kdir in /lib/modules/[2-3]*; do
+for kdir in /usr/lib/modules/[2-3]*; do
if [[ ! -d $kdir/kernel ]]; then
# found a stale kernel
mods=("$kdir/extramodules"{drv,netadp,netflt,pci}.ko*)
@@ -51,8 +61,8 @@ if (( ! $# )); then
fi
for kernver; do
- export KERN_DIR=/lib/modules/$kernver/build
- export MODULE_DIR=/lib/modules/$kernver/extramodules
+ export KERN_DIR=/usr/lib/modules/$kernver/build
+ export MODULE_DIR=/usr/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"
diff --git a/libre/virtualbox-modules-lts/PKGBUILD b/libre/virtualbox-modules-lts/PKGBUILD
index 80caec248..2daecb990 100644
--- a/libre/virtualbox-modules-lts/PKGBUILD
+++ b/libre/virtualbox-modules-lts/PKGBUILD
@@ -1,13 +1,13 @@
# $Id$
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-# Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy>
+# Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
pkgbase=virtualbox-modules-lts
pkgname=('virtualbox-modules-lts' 'virtualbox-parabola-modules-lts')
pkgver=4.1.18
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
url='http://virtualbox.org'
license=('GPL')
@@ -20,9 +20,9 @@ md5sums=('38db0a87cba659b484af868b0c2bd3ac'
'ed1341881437455d9735875ddf455fbe')
_extramodules=extramodules-3.0-LIBRE-LTS
-_kernver=$(pacman -Ss linux-libre-lts | awk 'NR==1{print $2}')-LIBRE-LTS
+_kernver=$(pacman -Q linux-libre-lts | awk '{ printf "%s-LIBRE-LTS", $2; exit }')
-export KERN_DIR=/lib/modules/${_kernver}/build
+export KERN_DIR=/usr/lib/modules/${_kernver}/build
export KERN_INCL=/usr/src/linux-${_kernver}/include/
build() {
@@ -65,7 +65,7 @@ package_virtualbox-parabola-modules-lts(){
for module in vboxguest.ko vboxsf.ko vboxvideo.ko; do
install -D -m644 ${module} \
- "$pkgdir/lib/modules/${_extramodules}/${module}"
+ "$pkgdir/usr/lib/modules/${_extramodules}/${module}"
done
install -D -m 0644 "$srcdir/60-vboxguest.rules" \
@@ -86,16 +86,16 @@ package_virtualbox-modules-lts(){
cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
install -D -m644 vboxdrv.ko \
- "$pkgdir/lib/modules/${_extramodules}/vboxdrv.ko"
+ "$pkgdir/usr/lib/modules/${_extramodules}/vboxdrv.ko"
install -D -m644 vboxnetadp.ko \
- "$pkgdir/lib/modules/${_extramodules}/vboxnetadp.ko"
+ "$pkgdir/usr/lib/modules/${_extramodules}/vboxnetadp.ko"
install -D -m644 vboxnetflt.ko \
- "$pkgdir/lib/modules/${_extramodules}/vboxnetflt.ko"
+ "$pkgdir/usr/lib/modules/${_extramodules}/vboxnetflt.ko"
install -D -m644 vboxpci.ko \
- "$pkgdir/lib/modules/${_extramodules}/vboxpci.ko"
+ "$pkgdir/usr/lib/modules/${_extramodules}/vboxpci.ko"
- find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
+ find "${pkgdir}" -name '*.ko' -exec gzip -9 {} +
}
diff --git a/libre/virtualbox-modules-lts/virtualbox-modules-lts.install b/libre/virtualbox-modules-lts/virtualbox-modules-lts.install
index 014fa0b88..5387563a6 100644
--- a/libre/virtualbox-modules-lts/virtualbox-modules-lts.install
+++ b/libre/virtualbox-modules-lts/virtualbox-modules-lts.install
@@ -5,14 +5,14 @@ post_install() {
===> You must load vboxdrv module before starting VirtualBox:
===> # modprobe vboxdrv
EOF
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
post_upgrade() {
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
echo 'In order to use the new version, reload all virtualbox modules manually.'
}
post_remove() {
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
diff --git a/libre/virtualbox-modules-lts/virtualbox-parabola-modules-lts.install b/libre/virtualbox-modules-lts/virtualbox-parabola-modules-lts.install
index 80d966a9d..54a052390 100644
--- a/libre/virtualbox-modules-lts/virtualbox-parabola-modules-lts.install
+++ b/libre/virtualbox-modules-lts/virtualbox-parabola-modules-lts.install
@@ -4,13 +4,13 @@ post_install() {
cat << EOF
===> You may want to load vboxguest, vboxsf and vboxvideo
EOF
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
post_upgrade() {
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
post_remove() {
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD
index 2e747105a..50e9b0721 100644
--- a/libre/virtualbox-modules/PKGBUILD
+++ b/libre/virtualbox-modules/PKGBUILD
@@ -1,12 +1,12 @@
# $Id$
#Maintainer: Ionut Biru <ibiru@archlinux.org>
-#Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy>
+#Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
#Contributor (Parabola): André Silva <emulatorman@lavabit.com>
pkgbase=virtualbox-modules
pkgname=('virtualbox-modules' 'virtualbox-parabola-modules')
pkgver=4.1.18
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL')
@@ -19,9 +19,9 @@ md5sums=('38db0a87cba659b484af868b0c2bd3ac'
'ed1341881437455d9735875ddf455fbe')
_extramodules=extramodules-3.4-LIBRE
-_kernver="$(cat /lib/modules/${_extramodules}/version || true)"
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version || true)"
-export KERN_DIR=/lib/modules/${_kernver}/build
+export KERN_DIR=/usr/lib/modules/${_kernver}/build
export KERN_INCL=/usr/src/linux-${_kernver}/include/
build() {
@@ -87,18 +87,18 @@ package_virtualbox-modules(){
cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
install -D -m644 vboxdrv.ko \
- "$pkgdir/lib/modules/${_extramodules}/vboxdrv.ko"
+ "$pkgdir/usr/lib/modules/${_extramodules}/vboxdrv.ko"
install -D -m644 vboxnetadp.ko \
- "$pkgdir/lib/modules/${_extramodules}/vboxnetadp.ko"
+ "$pkgdir/usr/lib/modules/${_extramodules}/vboxnetadp.ko"
install -D -m644 vboxnetflt.ko \
- "$pkgdir/lib/modules/${_extramodules}/vboxnetflt.ko"
+ "$pkgdir/usr/lib/modules/${_extramodules}/vboxnetflt.ko"
install -D -m644 vboxpci.ko \
- "$pkgdir/lib/modules/${_extramodules}/vboxpci.ko"
+ "$pkgdir/usr/lib/modules/${_extramodules}/vboxpci.ko"
- find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
+ 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
index 14242eaf4..b178686e2 100644
--- a/libre/virtualbox-modules/virtualbox-modules.install
+++ b/libre/virtualbox-modules/virtualbox-modules.install
@@ -4,16 +4,16 @@ post_install() {
===> # modprobe vboxdrv
EOF
EXTRAMODULES='extramodules-3.4-LIBRE'
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
post_upgrade() {
EXTRAMODULES='extramodules-3.4-LIBRE'
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
+ 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.4-LIBRE'
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
+ 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 0e101aedf..31575fb9d 100644
--- a/libre/virtualbox-modules/virtualbox-parabola-modules.install
+++ b/libre/virtualbox-modules/virtualbox-parabola-modules.install
@@ -3,15 +3,15 @@ cat << EOF
===> You may want to load vboxguest, vboxsf and vboxvideo
EOF
EXTRAMODULES='extramodules-3.4-LIBRE'
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
post_upgrade() {
EXTRAMODULES='extramodules-3.4-LIBRE'
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
post_remove() {
EXTRAMODULES='extramodules-3.4-LIBRE'
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-28 10:28:42 +0000