From b7c6c9c7844914d1d0617a24b9e3a84d691d1f64 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 7 Jul 2012 00:02:03 +0000 Subject: Sat Jul 7 00:02:03 UTC 2012 --- libre/linux-libre-lts/PKGBUILD | 4 +-- libre/linux-libre/PKGBUILD | 3 --- libre/mplayer-libre/PKGBUILD | 31 +++++++++------------- libre/mplayer-vaapi-libre/PKGBUILD | 8 +++--- libre/virtualbox-libre/PKGBUILD | 8 +++--- libre/virtualbox-libre/vboxbuild | 20 ++++++++++---- libre/virtualbox-modules-lts/PKGBUILD | 20 +++++++------- .../virtualbox-modules-lts.install | 6 ++--- .../virtualbox-parabola-modules-lts.install | 6 ++--- libre/virtualbox-modules/PKGBUILD | 18 ++++++------- .../virtualbox-modules/virtualbox-modules.install | 6 ++--- .../virtualbox-parabola-modules.install | 6 ++--- 12 files changed, 69 insertions(+), 67 deletions(-) (limited to 'libre') 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 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 4f4e557ae..08a32eae0 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..703d740c4 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 160672 2012-06-03 16:16:53Z ibiru $ # Maintainer : Ionut Biru # Contributor: Hugo Doria -# Maintainer (Parabola): André Silva - -# libvdpau is currently useful only with proprietary software +# Maintainer (Parabola): André Silva _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') -pkgver=34799 -pkgrel=2 +pkgver=34992 +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') 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=('04642b1eb68671577ff53bb84839253a' + 'c0d6ef795cf6de48e3b87ff7c23f0319') build() { cd "$srcdir/$_pkgbase" - patch -Np0 -i "$srcdir/live-media.patch" - ./configure --prefix=/usr \ --enable-runtime-cpudetection \ --disable-gui \ @@ -45,18 +39,19 @@ build() { --enable-radio \ --enable-radio-capture \ --language=all \ - --confdir=/etc/mplayer + --confdir=/etc/mplayer \ + --extra-cflags="-fpermissive" [ "$CARCH" = "i686" ] && sed 's|-march=i486|-march=i686|g' -i config.mak make } 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 +71,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..9b3ace8f8 100644 --- a/libre/mplayer-vaapi-libre/PKGBUILD +++ b/libre/mplayer-vaapi-libre/PKGBUILD @@ -1,15 +1,15 @@ # $Id$ -# Maintainer (Parabola): fauno -# Contributor (Parabola): André Silva # Maintainer: Evangelos Foutras # Contributor: Ionut Biru # Contributor: Hugo Doria +# Maintainer (Parabola): fauno +# Contributor (Parabola): André Silva _pkgname=mplayer-vaapi pkgname=mplayer-vaapi-libre pkgver=34578 -pkgrel=5.1 -pkgdesc="A movie player, compiled with vaapi support" +pkgrel=6 +pkgdesc="A movie player, compiled with vaapi and without unfree faac support" arch=('i686' 'x86_64') url="http://gitorious.org/vaapi/mplayer" license=('GPL') diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index e4326a2e1..942aa5d1c 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -1,6 +1,6 @@ # $Id$ # Maintainer (Parabola): Nicolas Reynolds -# Maintainer (Parabola): Jorge López +# Maintainer (Parabola): Jorge López # Contributor (Parabola): André Silva # 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') 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 d3b44d748..b4527fd91 100644 --- a/libre/virtualbox-modules-lts/PKGBUILD +++ b/libre/virtualbox-modules-lts/PKGBUILD @@ -1,13 +1,13 @@ # $Id$ # Maintainer: Bartłomiej Piotrowski -# Maintainer (Parabola): Márcio Silva +# Maintainer (Parabola): Márcio Silva # Maintainer (Parabola): André Silva -# Maintainer (Parabola): Jorge López +# Maintainer (Parabola): Jorge López pkgbase=virtualbox-modules-lts pkgname=('virtualbox-modules-lts' 'virtualbox-parabola-modules-lts') pkgver=4.1.18 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') 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 {} \; } 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 -#Maintainer (Parabola): Jorge López +#Maintainer (Parabola): Jorge López #Contributor (Parabola): André Silva 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) } -- cgit v1.2.3-54-g00ecf