diff options
66 files changed, 2089 insertions, 847 deletions
diff --git a/libre-testing/syslinux/PKGBUILD b/libre-testing/syslinux/PKGBUILD index cdc3483d5..8a8845f0b 100644 --- a/libre-testing/syslinux/PKGBUILD +++ b/libre-testing/syslinux/PKGBUILD @@ -5,7 +5,7 @@ pkgname="syslinux" pkgver="6.01" -pkgrel="2" +pkgrel="4.1" arch=('x86_64' 'i686') pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)" url="http://syslinux.zytor.com/" @@ -22,6 +22,10 @@ optdepends=('perl-passwd-md5: For md5pass' 'util-linux: For isohybrid' 'efibootmgr: For EFI support' 'dosfstools: For EFI support') +md5sums=('5fe8959b92255143a334167ca1c395a6' + 'f048880b57e2c5a7017ff8804bfda327' + '0e7d47e1f791f0c5e7bd40ed5c6d80cc' + 'cb46ca47c6b6323127d908440057d98f') install="${pkgname}.install" @@ -30,11 +34,6 @@ source=("https://www.kernel.org/pub/linux/utils/boot/syslinux/${pkgname}-${pkgve 'syslinux-install_update' 'splash.png') -sha1sums=('d7bc1b188677f77ac2d7060d25491dc29877a9c4' - 'a0238479aa2ed0bbd91d879d35bf7fce2600830f' - 'b1d915045fe3094f5359df043c53e73a4dc32745' - '1be7066848f2d58d67c63436294de5322ca34318') - _build_syslinux_bios() { rm -rf "${srcdir}/${pkgname}-${pkgver}-bios/" || true diff --git a/libre-testing/syslinux/splash.png b/libre-testing/syslinux/splash.png Binary files differindex f94067681..eac14536b 100644 --- a/libre-testing/syslinux/splash.png +++ b/libre-testing/syslinux/splash.png diff --git a/libre-testing/syslinux/splash.xcf b/libre-testing/syslinux/splash.xcf Binary files differnew file mode 100644 index 000000000..c27d04445 --- /dev/null +++ b/libre-testing/syslinux/splash.xcf diff --git a/libre-testing/syslinux/syslinux-install_update b/libre-testing/syslinux/syslinux-install_update index c32ccf18a..4dc09696a 100644 --- a/libre-testing/syslinux/syslinux-install_update +++ b/libre-testing/syslinux/syslinux-install_update @@ -1,7 +1,7 @@ -#!/bin/bash +#!/usr/bin/env bash # -# Sylinux Installer / Updater Scripts -# Copyright (C) 2011 Matthew Gyurgyik <pyther@pyther.net> +# Syslinux Installer / Updater Script (for BIOS only) +# Copyright (C) 2013 Matthew Gyurgyik <pyther@pyther.net> # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -26,13 +26,13 @@ # shopt -s nullglob -libpath="/usr/lib/syslinux/bios" -bootpath="/boot/syslinux" -extlinux="/usr/bin/extlinux" +bios_libpath="/usr/lib/syslinux/bios/" +bios_bootpath="/boot/syslinux/" +EXTLINUX="/usr/bin/extlinux" -core_modules=(ldlinux.c32) -autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE -pciids_file=/usr/share/hwdata/pci.ids +bios_core_modules=(config.c32 chain.c32 ldlinux.c32 libcom32.c32 libgpl.c32 liblua.c32 libmenu.c32 libutil.c32 linux.c32 menu.c32 vesamenu.c32) +bios_autoupdate_file="/boot/syslinux/SYSLINUX_AUTOUPDATE" +pciids_file="/usr/share/hwdata/pci.ids" ## Helper functions ## # Taken from libui-sh @@ -120,7 +120,7 @@ usage() { cat << EOF usage: $0 options -This script will install or upgrade Syslinux +This script will install or upgrade Syslinux (for BIOS only) OPTIONS: -h Show this message @@ -133,16 +133,16 @@ OPTIONS: Arguments Required: -c Chroot install (ex: -c /mnt) -Example Usage: syslinux-install_update.sh -i -a -m (install, set boot flag, install mbr) - syslinux-install_update.sh -u (update) +Example Usage: $0 -i -a -m # (install, set boot flag, install mbr) + $0 -u # (update) EOF } # Trys to find the partition that /boot resides on # This will either be on /boot or / (root) getBoot() { - if [[ ! -d "$bootpath" ]]; then - echo "Could not find $bootpath" + if [[ ! -d "$bios_bootpath" ]]; then + echo "Could not find $bios_bootpath" echo "Is boot mounted? Is Syslinux installed?" exit 1 fi @@ -278,9 +278,9 @@ install_mbr() { { echo "ABORT! MBR installation to partition ($disk)!"; exit 4;} if [[ "$ptb" = MBR ]]; then - mbrfile="$libpath/mbr.bin" + mbrfile="$bios_libpath/mbr.bin" elif [[ "$ptb" = GPT ]]; then - mbrfile="$libpath/gptmbr.bin" + mbrfile="$bios_libpath/gptmbr.bin" fi if dd bs=440 count=1 conv=notrunc if="$mbrfile" of="$disk" &> /dev/null; then @@ -293,79 +293,65 @@ install_mbr() { return 0 } -_install() { +install_modules() { # Copy all com32 files to /boot - for file in "${libpath}"/*.c32; do + for file in "${bios_libpath}"/*.c32; do file=${file##*/} - # Symlink files if /boot resides on the same partition as root + rm "$bios_bootpath/$file" &> /dev/null if [[ "$boot" = root ]]; then - ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null + # Symlink files if /boot resides on the same partition as root + ln -sf "${bios_libpath#$CHROOT}/$file" "$bios_bootpath/$file" &> /dev/null elif [[ "$boot" = boot ]]; then - cp "$libpath/$file" "$bootpath/$file" + cp "$bios_libpath/$file" "$bios_bootpath/$file" fi done # Copy / Symlink pci.ids if pci.ids exists on the FS if [[ -f $pciids_file ]]; then + rm "$bios_bootpath/pci.ids" &> /dev/null if [[ "$boot" = root ]]; then - ln -s "$pciids_file" "$bootpath/pci.ids" &> /dev/null + ln -sf "$pciids_file" "$bios_bootpath/pci.ids" &> /dev/null elif [[ "$boot" = boot ]]; then - cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null + cp "$pciids_file" "$bios_bootpath/pci.ids" &> /dev/null fi fi +} + +_install() { + install_modules if device_is_raid "$bootpart"; then - echo "Detected RAID on /boot - installing Syslinux with --raid" - "$extlinux" --install "$bootpath" -r > /dev/null 2>&1 + echo "Detected RAID on /boot" + "$EXTLINUX" --install "$bios_bootpath" --raid &> /dev/null else - "$extlinux" --install "$bootpath" > /dev/null 2>&1 + "$EXTLINUX" --install "$bios_bootpath" &> /dev/null fi if (( $? )); then - echo "Syslinux install failed" + echo "Syslinux BIOS install failed" exit 2 else - echo "Syslinux install successful" + echo "Syslinux BIOS install successful" fi - touch "$CHROOT/$autoupdate_file" + touch "$CHROOT/$bios_autoupdate_file" } update() { - # Update c32 files in /boot, if /boot is not on same fs - if [[ "$boot" = boot ]]; then - for file in "$bootpath"/*.c32; do - file=${file##*/} - cp "$libpath/$file" "$bootpath/$file" &> /dev/null - done - if [[ -f "$bootpath/pci.ids" ]]; then - cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null - fi - fi - - # Ensure core modules exist and if not install them - for file in "${core_modules[@]}"; do - if [[ ! -f $bootpath/$file ]]; then - if [[ "$boot" = root ]]; then - ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null - elif [[ "$boot" = boot ]]; then - cp "$libpath/$file" "$bootpath/$file" - fi - fi - done + install_modules if device_is_raid $bootpart; then - echo "Detected RAID on /boot - installing Syslinux with --raid" - "$extlinux" --update "$bootpath" -r &> /dev/null + echo "Detected RAID on /boot" + "$EXTLINUX" --update "$bios_bootpath" --raid &> /dev/null else - "$extlinux" --update "$bootpath" &> /dev/null + "$EXTLINUX" --update "$bios_bootpath" &> /dev/null fi if (($?)); then - echo "Syslinux update failed" + echo "Syslinux BIOS update failed" exit 2 else - echo "Syslinux update successful" + echo "Syslinux BIOS update successful" fi } @@ -400,7 +386,7 @@ while getopts "c:uihmas" opt; do ;; s) # If AUTOUPDATE_FILE does not exist exit the script - if [[ -f $autoupdate_file ]]; then + if [[ -f $bios_autoupdate_file ]]; then UPDATE="True" else exit 0 @@ -432,14 +418,14 @@ fi # If a chroot dir is path set variables to reflect chroot if [[ "$CHROOT" ]]; then - libpath="$CHROOT$libpath" - bootpath="$CHROOT$bootpath" - extlinux="$CHROOT$extlinux" + bios_libpath="$CHROOT$bios_libpath" + bios_bootpath="$CHROOT$bios_bootpath" + EXTLINUX="$CHROOT$EXTLINUX" fi # Exit if no /boot path exists -if ( f=("$bootpath"/*); (( ! ${#f[@]} )) ); then - echo "Error: $bootpath is empty!" +if ( f=("$bios_bootpath"/*); (( ! ${#f[@]} )) ); then + echo "Error: $bios_bootpath is empty!" echo "Is /boot mounted?" exit 1 fi diff --git a/libre-testing/syslinux/syslinux.cfg b/libre-testing/syslinux/syslinux.cfg index 64d6596e3..0c0c6339a 100644 --- a/libre-testing/syslinux/syslinux.cfg +++ b/libre-testing/syslinux/syslinux.cfg @@ -32,15 +32,15 @@ UI vesamenu.c32 # Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu MENU TITLE Parabola GNU/Linux-libre MENU BACKGROUND splash.png -MENU COLOR border 30;44 #40ffffff #a0000000 std -MENU COLOR title 1;36;44 #9033ccff #a0000000 std -MENU COLOR sel 7;37;40 #e0ffffff #20ffffff all -MENU COLOR unsel 37;44 #50ffffff #a0000000 std -MENU COLOR help 37;40 #c0ffffff #a0000000 std -MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std -MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std -MENU COLOR msg07 37;40 #90ffffff #a0000000 std -MENU COLOR tabmsg 31;40 #30ffffff #00000000 std +MENU COLOR border 35;40 #ff777caa #a0000000 std +MENU COLOR title 1;35;40 #ff777caa #a0000000 std +MENU COLOR sel 7;35;47 #e0ffffff #20777caa all +MENU COLOR unsel 35;40 #ff777caa #a0000000 std +MENU COLOR help 35;40 #c0b2b2b2 #a0000000 std +MENU COLOR timeout_msg 35;40 #ff777caa #00000000 std +MENU COLOR timeout 1;35;40 #ff777caa #00000000 std +MENU COLOR msg07 35;40 #ff777caa #a0000000 std +MENU COLOR tabmsg 35;40 #ff777caa #00000000 std # boot sections follow # @@ -51,13 +51,13 @@ MENU COLOR tabmsg 31;40 #30ffffff #00000000 std LABEL parabola MENU LABEL Parabola GNU/Linux-libre LINUX ../vmlinuz-linux-libre - APPEND root=/dev/sda3 ro + APPEND root=/dev/sda3 rw INITRD ../initramfs-linux-libre.img LABEL parabolafallback MENU LABEL Parabola GNU/Linux-libre Fallback LINUX ../vmlinuz-linux-libre - APPEND root=/dev/sda3 ro + APPEND root=/dev/sda3 rw INITRD ../initramfs-linux-libre-fallback.img # If you want Memtest on syslinux, use this LABEL section to launch it (install the memtest86+ package) diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD index 00398bb39..d6711ac0f 100644 --- a/libre/audacious-plugins-libre/PKGBUILD +++ b/libre/audacious-plugins-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189804 2013-07-08 12:09:48Z bisson $ +# $Id: PKGBUILD 189986 2013-07-12 14:00:31Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: William Rea <sillywilly@gmail.com> @@ -9,7 +9,7 @@ _pkgname=audacious-plugins pkgname=audacious-plugins-libre pkgver=3.4 -pkgrel=2 +pkgrel=3 pkgdesc='Plugins for Audacious, without nonfree plugins' url='http://audacious-media-player.org/' license=('GPL' 'GPL3' 'LGPL' 'custom:BSD') diff --git a/libre/avidemux-libre/PKGBUILD b/libre/avidemux-libre/PKGBUILD index 475a7a7ec..3cdb513cb 100644 --- a/libre/avidemux-libre/PKGBUILD +++ b/libre/avidemux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 189962 2013-07-11 23:40:28Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgbase=avidemux pkgbase=avidemux-libre pkgname=('avidemux-libre-cli' 'avidemux-libre-gtk' 'avidemux-libre-qt') pkgver=2.5.6 -pkgrel=6.1 +pkgrel=7 arch=('i686' 'x86_64') license=('GPL') url="http://fixounet.free.fr/avidemux/" @@ -21,7 +21,9 @@ build() { cd "${srcdir}/${_pkgbase}_${pkgver}" mkdir build cd build - cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 .. + cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 \ + -D LRELEASE_EXECUTABLE=/usr/lib/qt4/bin/lrelease .. make # plugin build expects libraries to be already installed; we fake a prefix @@ -74,7 +76,7 @@ package_avidemux-libre-cli() { } package_avidemux-libre-gtk() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split), without nonfree faac support - GTK GUI" + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI, without nonfree faac support" depends=("avidemux-libre-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils') replaces=('avidemux-gtk') conflicts=('avidemux-gtk') @@ -97,7 +99,7 @@ package_avidemux-libre-gtk() { } package_avidemux-libre-qt() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split), without nonfree faac support - QT GUI" + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI, without nonfree faac support" depends=("avidemux-libre-cli=${pkgver}" 'qt4') replaces=('avidemux-qt') conflicts=('avidemux-qt') diff --git a/libre/avidemux-libre/PKGBUILD.WIP b/libre/avidemux-libre/PKGBUILD.WIP index c96084eb8..65499e1ef 100644 --- a/libre/avidemux-libre/PKGBUILD.WIP +++ b/libre/avidemux-libre/PKGBUILD.WIP @@ -1,36 +1,42 @@ # $Id: PKGBUILD 160693 2012-06-03 22:00:17Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -pkgbase=avidemux -pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') -pkgver=2.6.1 +_pkgbase=avidemux +pkgbase=avidemux-libre +pkgname=('avidemux-libre-cli' 'avidemux-libre-gtk' 'avidemux-libre-qt') +pkgver=2.6.4 pkgrel=1 arch=('i686' 'x86_64') -license=('GPL') +license=('GPL2') url="http://fixounet.free.fr/avidemux/" -makedepends=('cmake' 'libxslt' 'gtk3' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \ - 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \ +makedepends=('cmake' 'libxslt' 'gtk3' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \ + 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'x264' 'libsamplerate' \ 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva' \ 'libvdpau' 'libdca' 'fribidi' 'glu') options=('!makeflags' '!emptydirs') source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz) -sha1sums=('a34ffc6409d96c3df30394fbd221e6693ec081ec') -#source=(http://www.avidemux.org/nightly/source/snapshot_8273.tgz) -#sha1sums=('cf5256ce189a51898a2e1071ffd46cd993f453f2') +sha1sums=('7ed55fd5cfb6cfa73ebb9058af72fa2e3c9717c3') +#source=(http://www.avidemux.org/nightly/snapshot/source_r8810.tar.gz) +#sha1sums=('8c27d54e2b0655a8b8a3adfde1c0308ffedfec0c') -build() { -#mv snapshot_8273 ${pkgbase}_${pkgver} - - cd "${srcdir}/${pkgbase}_${pkgver}" +prepare() { +# mv 2.6_snapshot ${_pkgbase}_${pkgver} + cd ${_pkgbase}_${pkgver} sed -i 's|avidemux2|avidemux3|' avidemux2.desktop + sed -i 's|../avidemux/qt4|../avidemux/qt4 -DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt4|' bootStrap.bash + sed -i 's|#include "ADM_files.h"|#include "ADM_files.h"\n#include "ADM_toolkitGtk.h"|' avidemux/gtk/ADM_userInterfaces/ui_support.cpp +} + +build() { + cd ${_pkgbase}_${pkgver} bash bootStrap.bash --with-core --with-cli --with-gtk --with-qt4 --with-plugins } -package_avidemux-cli() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split)" +package_avidemux-libre-cli() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split), without nonfree faac support" depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva') optdepends=('lame: for the corresponding audio encoder plugin' - 'faac: for the corresponding audio encoder plugin' 'faad2: for the corresponding audio decoder plugin' 'opencore-amr: for the corresponding audio decoder plugin' 'jack: for the corresponding audio device plugin' @@ -38,11 +44,14 @@ package_avidemux-cli() { 'sdl: for the corresponding audio device plugin' 'x264: for the corresponding video encoder plugin' 'xvidcore: for the corresponding video encoder plugin' - 'qt: for the QtScript scripting support' + 'qt4: for the QtScript scripting support' 'libdca: for the corresponding audio decoder plugin' 'fribidi: for the corresponding video filter plugin') + provides=('avidemux' 'avidemux-cli') + conflicts=('avidemux' 'avidemux-cli') + replaces=('avidemux' "avidemux-cli=$pkgver") - cd "${srcdir}/${pkgbase}_${pkgver}" + cd ${_pkgbase}_${pkgver} (cd buildCli; make DESTDIR="${pkgdir}" install) (cd buildCore; make DESTDIR="${pkgdir}" install) (cd buildPluginsCLI; make DESTDIR="${pkgdir}" install) @@ -52,32 +61,34 @@ package_avidemux-cli() { install -D -m644 man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1" } -package_avidemux-gtk() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI" - depends=("avidemux-cli=${pkgver}" 'gtk3' 'libxv' 'desktop-file-utils') +package_avidemux-libre-gtk() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI, without nonfree faac support" + depends=("avidemux-libre-cli=${pkgver}" 'gtk3' 'libxv' 'desktop-file-utils') + replaces=('avidemux-gtk') + conflicts=('avidemux-gtk') + provides=("avidemux-gtk=$pkgver") install=avidemux.install - cd "${srcdir}/${pkgbase}_${pkgver}" + cd ${_pkgbase}_${pkgver} (cd buildGtk; make DESTDIR="${pkgdir}" install) (cd buildPluginsGtk; make DESTDIR="${pkgdir}" install) - install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" - rm "${pkgdir}"/usr/lib/ADM_plugins6/pluginSettings/x264/1/{PSP.json,iPhone.json} rm "${pkgdir}/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so" } -package_avidemux-qt() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI" - depends=("avidemux-cli=${pkgver}" 'qt' 'x264' 'glu') +package_avidemux-libre-qt() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI, without nonfree faac support" + depends=("avidemux-libre-cli=${pkgver}" 'qt4' 'x264' 'glu') + replaces=('avidemux-qt') + conflicts=('avidemux-qt') + provides=("avidemux-qt=$pkgver") install=avidemux.install - cd "${srcdir}/${pkgbase}_${pkgver}" + cd ${_pkgbase}_${pkgver} (cd buildQt4; make DESTDIR="${pkgdir}" install) (cd buildPluginsQt4; make DESTDIR="${pkgdir}" install) install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop" sed -i 's|gtk|qt4|' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" - - rm "${pkgdir}"/usr/lib/ADM_plugins6/pluginSettings/x264/1/{PSP.json,iPhone.json} } diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD index 6ec5ec2f5..d3c891067 100644 --- a/libre/blender-addon-luxrender/PKGBUILD +++ b/libre/blender-addon-luxrender/PKGBUILD @@ -4,21 +4,21 @@ _srcname=luxrender _pkgver=1.2.1 _bldname=blender _bldver=2.68 -_bldep=10 +_bldep=9 _pkgname=${_srcname::3}${_bldname::5}25 _srcver=c9deae0646d0 pkgname=$_bldname-addon-$_srcname pkgver=$_pkgver.v$_bldver -pkgrel=2 +pkgrel=3 pkgdesc="$_pkgname: A addon for the ${_bldname^} which allows render and export with LuxRender (built for the $_bldname-libre package)" arch=any url=http://www.$_srcname.net/ license=GPL depends=( $_srcname=$_pkgver - "$_bldname>=$(($_bldep-1)):$_bldver" - "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))" + "$_bldname-libre>=$_bldep:$_bldver" + "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))" ) provides=($_pkgname=$_pkgver) conflicts=$_pkgname diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD index b39705eed..90df03528 100644 --- a/libre/blender-libre/PKGBUILD +++ b/libre/blender-libre/PKGBUILD @@ -1,21 +1,12 @@ # Maintainer: Márcio Silva <coadde@lavabit.com> _pkgname=blender -epoch=9 -_pkgver=2.68 -pkgrel=1 +epoch=10 +_pkgver=2.68a +pkgrel=3 _jpgver=1.5 _pyver=3.3 -# Only used if package is unstable. -_svn=false -[[ $_svn == true ]] && { - pkgrel=1 - _svnrev=58224 - _svnver=.r$_svnrev - _svndesc=', svn version' -} - _spn=false [[ $_spn == true ]] && { _spnname=-spacenav @@ -23,8 +14,8 @@ _spn=false } pkgname=$_pkgname$_spnname-libre -pkgver=$_pkgver$_svnver -pkgdesc='Fully integrated 3D graphics creation suite, without nonfree povray and cuda support'$_svndesc$_spndesc +pkgver=$_pkgver +pkgdesc='Fully integrated 3D graphics creation suite, without nonfree povray and cuda support'$_spndesc arch=( mips64el x86_64 @@ -43,7 +34,7 @@ depends=( libpng libtiff openal - openexr + openexr-libre openimageio 'opencollada=20130413' opencolorio @@ -60,22 +51,40 @@ makedepends=( boost cmake mesa - subversion ) -provides=($_pkgname=$epoch:$_pkgver) -conflicts=$_pkgname +provides=($_pkgname) +[[ $_spn == true ]] && provides+=("$_pkgname-libre=$epoch:$pkgver") +conflicts=($_pkgname) +[[ $_spn == true ]] && conflicts+=($_pkgname-libre) replaces=$_pkgname install=$_pkgname.install source=http://download.$_pkgname.org/source/$_pkgname-$pkgver.tar.gz -sha512sums=b7a8ce36714881d8dd809c3597695945cceddfc65ab2d20597a7d9c6327805d86edc4131cdc543d9267e120833781764a8a43a2dba06866fc4e62761f7c93ebf -[[ $_svn == true ]] && { - source=$_pkgname-$pkgver::svn+https://svn.$_pkgname.org/svnroot/bf-$_pkgname/trunk/$_pkgname#revision=$_svnrev - sha512sums=SKIP -} +sha512sums=ce93779c5cbadf361f08ad0f9d5370d52878f94edc0b113d73711b842169d0e000e1500ece8e534439d94c5983e6ff3f15ca4ccd74db5f21447274c475090019 prepare() { cd $srcdir/$_pkgname-$pkgver + msg 'renaming wrong OS name' + _OS=$(uname -o) + [[ $_OS == GNU ]] && sed -i 's|BUILD_PLATFORM;|"GNU";|' source/creator/buildinfo.c + [[ $_OS == GNU/Linux ]] && sed -i 's|BUILD_PLATFORM;|"GNU/Linux-libre";|' source/creator/buildinfo.c + sed -i 's|Linux, Mac OS X, Windows and FreeBSD|GNU and GNU/Linux-libre| + s|Linux, FreeBSD|GNU, GNU/Linux-libre| + s|Unpack the archive, Then run the Blender executable.|Intall from Parabola repo (pacman -S '"$pkgname"'), Then run blender.| + \|Windows|d;\|Mac OS X|d + s|The downloaded Blender package includes|The '"${pkgname^}"' package includes| + ' release/text/readme.html + sed -i 's|Linux|GNU/Linux-libre| + ' release/scripts/{addons/game_engine_save_as_runtime,modules/bl_i18n_utils/utils_rtl}.py + sed -i 's| (.so under Linux, .dll under windows...)|| + ' release/scripts/{addons/ui_translate,modules/bl_i18n_utils}/settings.py + + msg 'removing Open Source term' + sed -i 's|free, open source|free| + s|free and open-source|free| + s|open-source and free|free| + ' release/text/readme.html + mkdir -v build msg 'Remove nonfree povray render support' @@ -85,7 +94,7 @@ prepare() { build() { cd $srcdir/$_pkgname-$pkgver/build - [[ $CARCH == x86_64 ]] && _SSE2=ON || _SSE2=OFF + [[ $CARCH == x86_64 || $CARCH == i686 ]] && _SSE=ON _SSE2=ON || _SSE=OFF _SSE2=OFF [[ $_spn == true ]] && _NDOF=ON || _NDOF=OFF cmake ..\ -DCMAKE_BUILD_TYPE=Release\ @@ -96,6 +105,7 @@ build() { -DPYTHON_LIBPATH=/usr/lib\ -DPYTHON_LIBRARY=python${_pyver}m\ -DPYTHON_VERSION=$_pyver\ + -DSUPPORT_SSE_BUILD=$_SSE\ -DSUPPORT_SSE2_BUILD=$_SSE2\ -DWITH_BULLET=ON\ -DWITH_CODEC_FFMPEG=ON\ @@ -123,7 +133,7 @@ build() { package() { cd $srcdir/$_pkgname-$pkgver/build make DESTDIR=$pkgdir install - python -m compileall $pkgdir/usr/share/$_pkgname || return 0 + python -m compileall $pkgdir/usr/share/$_pkgname } # vim:set ts=2 sw=2 et: diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 1b030ecd5..af128c250 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94300 2013-07-19 10:21:35Z jelle $ +# $Id: PKGBUILD 94576 2013-07-27 12:09:03Z jelle $ # Maintainer: jelle van der Waa <jelle@vdwaa.nl> # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -9,7 +9,7 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=0.9.40 +pkgver=0.9.41 pkgrel=1 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed" arch=('i686' 'x86_64' 'mips64el') @@ -30,7 +30,7 @@ install=calibre.install source=("http://sourceforge.net/projects/calibre/files/${pkgver}/calibre-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('f63b0e5697c5e997ecaaeaa82a14cd60' +md5sums=('2037b44c90a66e97823a637edfa194ca' '8353d1878c5a498b3e49eddef473605f' '675cd87d41342119827ef706055491e7') prepare(){ diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD index f52891d3d..4cc986be1 100644 --- a/libre/clementine-libre/PKGBUILD +++ b/libre/clementine-libre/PKGBUILD @@ -1,72 +1,84 @@ -# $Id: PKGBUILD 90335 2013-05-11 16:04:01Z tomegun $ -#Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -#Contributor: BlackEagle <ike.devolder@gmail.com> -#Contributor: Dany Martineau <dany.luc.martineau@gmail.com> -#Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -#Contributor (Parabola): Kete <kete@ninthfloor.org> -#Contributor (Parabola): Márcio Silva <coadde@lavabit.com> +# $Id: PKGBUILD 94971 2013-08-01 22:31:55Z alucryd $ +# Maintainer: Maxime Gauduin <alucryd@gmail.com> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: BlackEagle <ike.devolder@gmail.com> +# Contributor: Dany Martineau <dany.luc.martineau@gmail.com> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> +# Contributor (Parabola): Kete <kete@ninthfloor.org> +# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> _pkgname=clementine pkgname=clementine-libre pkgver=1.1.1 -pkgrel=8 +pkgrel=9 pkgdesc="A music player and library organizer, without nonfree artwork and spotify support" url="http://www.clementine-player.org/" license=('GPL') arch=('i686' 'x86_64') -depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod' 'projectm' - 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt4' 'libimobiledevice' 'chromaprint' - 'sparsehash' 'qjson' 'libcdio-paranoia' 'protobuf' 'qca' 'qca-ossl' 'gvfs') -makedepends=('cmake' 'boost' 'mesa') -optdepends=('gstreamer0.10-base-plugins: for more open formats' - 'gstreamer0.10-good-plugins: for use with "Good" plugin libraries' - 'gstreamer0.10-bad-libre-plugins: for use with "Bad" plugin libraries' - 'gstreamer0.10-ugly-plugins: for use with "Ugly" plugin libraries') +depends=('chromaprint' 'gstreamer0.10-base' 'libcdio' 'libgpod' 'liblastfm' 'libmtp' 'projectm' 'protobuf' 'qca-ossl' 'qjson' 'taglib') +makedepends=('cmake' 'boost' 'mesa' 'sparsehash') +optdepends=('gstreamer0.10-base-plugins: "Base" plugin libraries' + 'gstreamer0.10-good-plugins: "Good" plugin libraries' + 'gstreamer0.10-bad-libre-plugins: "Bad" plugin libraries' + 'gstreamer0.10-ugly-plugins: "Ugly" plugin libraries' + 'gvfs: Various devices support') replaces=('clementine') conflicts=('clementine') provides=("clementine=$pkgver") -source=(http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz +install=clementine.install +source=("http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz" 'clementine-1.1.1-libimobiledevice-fix.patch' 'remove-nonfree-artwork-and-spotify.patch' 'moognu.png') -install=clementine.install +md5sums=('28e4afb822388bd337a761db8f86febf' + '736df6cd828a3172701f63c8dc978cb9' + '9ccfe62f8784a1ccbe8c96f8cacad9d0' + '59a8c0d7659898c457b95f877718cf1c') -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" +prepare() { + cd ${_pkgname}-${pkgver} - patch -Np1 < "$srcdir"/clementine-1.1.1-libimobiledevice-fix.patch + patch -Np1 -i ../clementine-1.1.1-libimobiledevice-fix.patch - # Remove nonfree nonfree artwork and spotify references on files - patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch + # remove nonfree nonfree artwork and spotify references on files + patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch - # Remove nonfree spotifyblob folders - rm -rv ext/{clementine-spotifyblob,libclementine-spotifyblob} + # remove nonfree spotifyblob folders + rm -rv ext/{clementine-spotifyblob,libclementine-spotifyblob} - # Remove nonfree spotify files - rm -v cmake/SpotifyVersion.cmake - rm -v data/spotify-core-logo-128x128.png - rm -v data/icons/svg/spotify.svg - rm -v data/schema/schema-30.sql - rm -v src/{globalsearch/spotifysearchprovider.{cpp,h},internet/spotify{blobdownloader.{cpp,h},server.{cpp,h},service.{cpp,h},settingspage.{cpp,h,ui}}} + # remove nonfree spotify files + rm -v cmake/SpotifyVersion.cmake + rm -v data/spotify-core-logo-128x128.png + rm -v data/icons/svg/spotify.svg + rm -v data/schema/schema-30.sql + rm -v src/{globalsearch/spotifysearchprovider.{cpp,h},internet/spotify{blobdownloader.{cpp,h},server.{cpp,h},service.{cpp,h},settingspage.{cpp,h,ui}}} - ## Remove nonfree nyancat.png - rm -v data/nyancat.png + ## remove nonfree nyancat.png + rm -v data/nyancat.png - ## Put moognu.png to the source code - cp -v ../moognu.png data + ## rut moognu.png to the source code + install -m644 -v ../moognu.png data - # Create a blank file due that is a dependency for clementine - touch data/schema/schema-30.sql + # create a blank file due which is a dependency for clementine + touch data/schema/schema-30.sql +} - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_PROJECTM=1 -DBUILD_WERROR=0 - make +build() { + cd ${_pkgname}-${pkgver} + + if [[ -d build ]]; then + rm -rf build + fi + mkdir build && cd build + + cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_PROJECTM=1 -DBUILD_WERROR=0 + make } package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd ${_pkgname}-${pkgver}/build + + make DESTDIR="${pkgdir}" install } -md5sums=('28e4afb822388bd337a761db8f86febf' - '736df6cd828a3172701f63c8dc978cb9' - '5cc8f800dd4df7bd5548196009ab68e0' - '59a8c0d7659898c457b95f877718cf1c') + +# vim: ts=2 sw=2 et: diff --git a/libre/clementine-libre/clementine.install b/libre/clementine-libre/clementine.install index 2f0338d8a..927a10258 100644 --- a/libre/clementine-libre/clementine.install +++ b/libre/clementine-libre/clementine.install @@ -1,13 +1,15 @@ post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -ftq usr/share/icons/hicolor update-desktop-database -q } post_upgrade() { - post_install $1 + post_install } post_remove() { - post_install $1 + post_install } + +# vim: ts=2 sw=2 et: diff --git a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch index 6008b2d28..3a948bf96 100644 --- a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch +++ b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch @@ -658,8 +658,15 @@ diff -rauN clementine-1.1.1/src/core/backgroundstreams.cpp clementine-libre-1.1. if (version < kVersion) { diff -rauN clementine-1.1.1/src/analyzers/nyancatanalyzer.cpp clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp --- clementine-1.1.1/src/analyzers/nyancatanalyzer.cpp 2012-10-16 08:17:37.000000000 -0200 -+++ clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp 2013-05-13 03:56:04.732771832 -0300 -@@ -29,7 +29,7 @@ ++++ clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp 2013-08-02 00:16:25.974215711 -0300 +@@ -23,13 +23,13 @@ + #include <QTimerEvent> + #include <QBrush> + +-const char* NyanCatAnalyzer::kName = "Nyanalyzer cat"; ++const char* NyanCatAnalyzer::kName = "MooGNU"; + const float NyanCatAnalyzer::kPixelScale = 0.02f; + NyanCatAnalyzer::NyanCatAnalyzer(QWidget* parent) : Analyzer::Base(parent, 9), diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 56d994beb..2221fb7fe 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -13,7 +13,7 @@ _GRUB_BZR_REV="5043" pkgname=grub pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)" pkgver=2.00.${_GRUB_BZR_REV} -pkgrel=2 +pkgrel=3 url="https://www.gnu.org/software/grub/" arch=('x86_64' 'i686') license=('GPL3') @@ -40,19 +40,20 @@ optdepends=('freetype2: For grub-mkfont usage' source=("grub-${pkgver}::bzr+bzr://bzr.savannah.gnu.org/grub/trunk/grub/#revision=${_GRUB_BZR_REV}" 'parabola_grub_mkconfig_fixes.patch' '60_memtest86+' - 'grub.default') + 'grub.default' + 'grub-2.00-mkinitcpio-0.15.patch') +md5sums=('SKIP' + 'b3068b52b6f1dcd2850b5c7585bb185f' + 'be55eabc102f2c60b38ed35c203686d6' + '52d374e0194e3f2e39ff7c92ecd58a6c' + 'd25d2dcf8ba708dcf768fcaea799f59c' + 'SKIP' + 'SKIP') for _DIR_ in 915resolution ntldr-img ; do source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/#revision=") done -# sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b' -sha1sums=('SKIP' - '513172d91d1a2e2cda7c0a744c766d5868cb28bf' - '2aa2deeb7d7dc56f389aa1487b7a57b0d44ce559' - '06b926320cb2add6c157d59d46e553b89dd3aa03' - 'SKIP' - 'SKIP') _build_grub-common_and_bios() { @@ -173,6 +174,9 @@ prepare() { ## Apply Parabola specific fixes to enable grub-mkconfig detect kernels and initramfs patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch" echo + + ## fix 10_linux + patch -Np0 -i "${srcdir}/grub-2.00-mkinitcpio-0.15.patch" ## fix unifont.bdf location so that grub-mkfont can create *.pf2 files sed 's|/usr/share/fonts/unifont|/usr/share/fonts/unifont /usr/share/fonts/misc|g' -i "${srcdir}/grub-${pkgver}/configure.ac" diff --git a/libre/grub/grub-2.00-mkinitcpio-0.15.patch b/libre/grub/grub-2.00-mkinitcpio-0.15.patch new file mode 100644 index 000000000..1af848fa3 --- /dev/null +++ b/libre/grub/grub-2.00-mkinitcpio-0.15.patch @@ -0,0 +1,11 @@ +--- util/grub.d/10_linux.in.old 2013-07-28 08:55:47.825946239 +0200 ++++ util/grub.d/10_linux.in 2013-07-28 08:56:14.082201512 +0200 +@@ -138,7 +138,7 @@ + message="$(gettext_printf "Loading Linux %s ..." "${version}")" + sed "s/^/$submenu_indentation/" << EOF + echo '$(echo "$message" | grub_quote)' +- linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} ++ linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} rw ${args} + EOF + if test -n "${initrd}" ; then + # TRANSLATORS: ramdisk isn't identifier. Should be translated. diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD index eac23b4be..6477c774c 100644 --- a/libre/gst-plugins-bad-libre/PKGBUILD +++ b/libre/gst-plugins-bad-libre/PKGBUILD @@ -1,70 +1,25 @@ -# $Id: PKGBUILD 190001 2013-07-12 20:00:03Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> -pkgbase=gst-plugins-bad -pkgname=gst-plugins-bad-libre -pkgver=1.0.8 +_pkgname=gst-plugins-bad +pkgname=$_pkgname-libre +pkgver=1.0.9 pkgrel=1 pkgdesc='GStreamer Multimedia Framework Bad Plugins, without nonfree faac support' -arch=( - i686 - x86_64 - mips64el -) -license=( - LGPL -) +arch=('i686' 'x86_64' 'mips64el') +license=('LGPL') url="http://gstreamer.freedesktop.org/" -depends=( - celt - chromaprint - curl - faad2 - gst-plugins-base-libs - libdca - libdvdnav - libgme - libmms - libmodplug - libofa - neon - mjpegtools - mpg123 - opus - soundtouch - spandsp - wayland -) -makedepends=( - libdvdread - libexif - libmpeg2 - libvdpau - schroedinger -) -provides=( - $pkgbase=$pkgver -) -conflicts=( - $pkgbase -) -replaces=( - $pkgbase -) -options=( - '!libtool' - '!emptydirs' -) -source=( - "$url/src/$pkgbase/$pkgbase-$pkgver.tar.xz" -) -sha256sums=( - 6949b5532034fc37d5a874e4e3330107767238bc4def9f769b8193124e2420cc -) +depends=('mjpegtools' 'gst-plugins-base-libs' 'curl' 'chromaprint' 'libmms' 'faad2' 'mpg123' 'celt' 'libdca' 'soundtouch' 'spandsp' 'libdvdnav' 'libmodplug' 'libgme' 'opus' 'wayland' 'neon' 'libofa' 'fluidsynth' 'openjpeg') +makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2') +provides=($_pkgname=$pkgver) +conflicts=$_pkgname +replaces=$_pkgname +options=(!libtool !emptydirs) +source=(${url}/src/$_pkgname/$_pkgname-$pkgver.tar.xz) +sha256sums=('69d236b1d8188270a3f51f6710146d0ca63c2f1a9f6cfbab3399ef01b9498f75') build() { - cd $pkgbase-$pkgver + cd $_pkgname-$pkgver sed -i '/AC_PATH_XTRA/d' configure.ac aclocal -I m4 -I common/m4 autoconf @@ -78,11 +33,11 @@ build() { } check() { - cd $pkgbase-$pkgver + cd $_pkgname-$pkgver make check } package() { - cd $pkgbase-$pkgver - make DESTDIR=$pkgdir install + cd $_pkgname-$pkgver + make DESTDIR="${pkgdir}" install } diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index d70fde92d..13f61ecec 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188976 2013-06-27 14:29:36Z andyrtr $ +# $Id: PKGBUILD 191569 2013-07-25 20:33:03Z andyrtr $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor : Rémy Oudompheng <remy@archlinux.org> # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org> @@ -6,7 +6,7 @@ _pkgname=hplip pkgname=hplip-libre -pkgver=3.13.6 +pkgver=3.13.7 pkgrel=1 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation" arch=('i686' 'x86_64') @@ -31,7 +31,7 @@ options=('!libtool') install=hplip.install source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc} hp-mkuri.patch) -md5sums=('3dd5052864052b8cd4ce013bb71f4d6c' +md5sums=('e834c8dd270f441c963f5d883d2d48f3' 'SKIP' '0bd7779fdbc4d7a9386df04dce2cb8d4') diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 8cdf5228e..1a5692b89 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $ +# $Id: PKGBUILD 191727 2013-07-29 18:37:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgname=kdelibs pkgname=kdelibs-libre pkgver=4.10.5 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -30,7 +30,7 @@ sha1sums=('6caab0c70ab742dd711b44dd3f9bfdcbf9be31eb' 'a1502a964081ad583a00cf90c56e74bf60121830') prepare() { - cd "${srcdir}"/${_pkgname}-${pkgver} + cd ${_pkgname}-${pkgver} # avoid file conflict with gnome-menus patch -p1 -i "${srcdir}"/kde-applications-menu.patch # qmake refers to Qt5 @@ -40,7 +40,6 @@ prepare() { } build() { - cd "${srcdir}" mkdir build cd build cmake ../${_pkgname}-${pkgver} \ diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 3b4295415..4f4f0edf9 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $ +# $Id: PKGBUILD 191752 2013-07-30 08:53:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,25 +6,29 @@ pkgbase=kdenetwork pkgname=('kdenetwork-kopete-libre') pkgver=4.10.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdenetwork') -makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp' +makedepends=('cmake' 'automoc4' 'boost' 'speex' 'libotr3' 'ppp' 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn' 'libktorrent' 'libmms' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" - 'use-libotr3.patch') + 'use-libotr3.patch' + 'giflib5.patch') sha1sums=('3ee86a1a227593e9f37881da3c1db1a3c384b2e4' - '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384') + '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384' + '388319373e96e6f44446ea1132c35ae9f660e01c') prepare() { cd ${pkgbase}-${pkgver} patch -p1 -i "${srcdir}"/use-libotr3.patch - cd ../ -# Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34. + cd kopete + patch -p1 -i "${srcdir}"/giflib5.patch + cd ../../ + # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34. sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' "${pkgbase}-${pkgver}/kopete/protocols/CMakeLists.txt" rm -rf "${pkgbase}-${pkgver}/kopete/protocols/skype" sed 's/, Skype//' -i "${pkgbase}-${pkgver}/kopete/doc/index.docbook" diff --git a/libre/kdenetwork-kopete-libre/giflib5.patch b/libre/kdenetwork-kopete-libre/giflib5.patch new file mode 100644 index 000000000..231aefbc2 --- /dev/null +++ b/libre/kdenetwork-kopete-libre/giflib5.patch @@ -0,0 +1,67 @@ +From: Raymond Wooninck <tittiatcoke@gmail.com> +Date: Sun, 17 Mar 2013 12:24:09 +0000 +Subject: Enable building with giflib v5 +X-Git-Tag: v4.10.80 +X-Git-Url: http://quickgit.kde.org/?p=kopete.git&a=commitdiff&h=47ceec53aa5ee6b84a753fdbf735e44558513fe2 +--- +Enable building with giflib v5 + +REVIEW: 7066 + +svn path=/trunk/KDE/kdenetwork/kopete/; revision=1344846 +--- + + +--- a/protocols/wlm/wlmchatsession.cpp ++++ b/protocols/wlm/wlmchatsession.cpp +@@ -65,6 +65,10 @@ + #include "wlmchatsessioninkaction.h" + #ifdef HAVE_GIFLIB + #include <gif_lib.h> ++/* old giflib has no GIFLIB_MAJOR, define to avoid cpp warnings */ ++#ifndef GIFLIB_MAJOR ++#define GIFLIB_MAJOR 4 ++#endif + #endif + + WlmChatSession::WlmChatSession (Kopete::Protocol * protocol, +@@ -467,11 +471,15 @@ + { + #ifdef HAVE_GIFLIB + #ifdef HAVE_GIF_ERROR_STRING // giflib 4.2.0+ ++#if GIFLIB_MAJOR >= 5 ++ fprintf(stderr, "GIF-LIB error (exact reporting not implemented)\n"); ++#else + const char * errorString = GifErrorString(); + if (errorString) + fprintf(stderr, "GIF-LIB error: %s\n", errorString); + else + fprintf(stderr, "GIF-LIB undefined error: %d\n", GifError()); ++#endif + #else // older giflib versions, libungif + PrintGifError(); + #endif // HAVE_GIF_ERROR_STRING +@@ -483,6 +491,10 @@ + WlmChatSession::convertToGif( const QPixmap & ink, QString filename) + { + #ifdef HAVE_GIFLIB ++#if GIFLIB_MAJOR >= 5 ++#define FreeMapObject GifFreeMapObject ++#define MakeMapObject GifMakeMapObject ++#endif + int i, status; + GifFileType *GifFile; + ColorMapObject *screenColourmap; +@@ -525,7 +537,11 @@ + } + } + ++#if GIFLIB_MAJOR >= 5 ++ GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0, NULL); ++#else + GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0); ++#endif + if (!GifFile) { + FreeMapObject(imageColourmap); + FreeMapObject(screenColourmap); + diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD index 81165b02d..c78321b25 100644 --- a/libre/libquicktime-libre/PKGBUILD +++ b/libre/libquicktime-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91608 2013-05-25 11:33:59Z bpiotrowski $ +# $Id: PKGBUILD 94168 2013-07-15 13:24:41Z bpiotrowski $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor (Parabola): Jorge Lopez <jorginho@lavabit.com> @@ -6,19 +6,27 @@ pkgname=libquicktime-libre _pkgname=libquicktime pkgver=1.2.4 -pkgrel=6 +pkgrel=7 pkgdesc="A library for reading and writing quicktime files, without nonfree faac support" arch=('i686' 'x86_64') license=('GPL') url="http://libquicktime.sourceforge.net/" depends=('gtk2' 'ffmpeg' 'libxv' 'libxaw' 'faad2') +makedepends=('mesa-libgl') options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz") -sha256sums=('1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368') +source=("http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz" + ffmpeg2.0.patch) +sha256sums=('1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368' + 'a1c8415e8e7bc04c81b946b9e3746f7d5ef24819135962280c3a7ddb3f2baa2b') provides=("$_pkgname=$pkgver") conflicts=($_pkgname) replaces=($_pkgname) +prepare() { + cd $_pkgname-$pkgver + patch -Np1 -i ../ffmpeg2.0.patch +} + build() { cd "$srcdir/$_pkgname-$pkgver" ./configure --prefix=/usr \ diff --git a/libre/libquicktime-libre/ffmpeg2.0.patch b/libre/libquicktime-libre/ffmpeg2.0.patch new file mode 100644 index 000000000..6bec4d99a --- /dev/null +++ b/libre/libquicktime-libre/ffmpeg2.0.patch @@ -0,0 +1,135 @@ +Binary files a/plugins/ffmpeg/.lqt_ffmpeg.c.swp and b/plugins/ffmpeg/.lqt_ffmpeg.c.swp differ +diff -rupN a/plugins/ffmpeg/ffmpeg.h b/plugins/ffmpeg/ffmpeg.h +--- a/plugins/ffmpeg/ffmpeg.h 2012-02-15 20:48:30.000000000 +0100 ++++ b/plugins/ffmpeg/ffmpeg.h 2013-07-15 15:05:19.307534593 +0200 +@@ -45,3 +45,7 @@ void lqt_ffmpeg_set_parameter(AVCodecCon + + + #endif ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 ++#define CODEC_FLAG2_STRICT_GOP 0x00000002 ++#define CODEC_FLAG_QP_RD 0x08000000 ++#define CODEC_FLAG_CBP_RD 0x04000000 +diff -rupN a/plugins/ffmpeg/lqt_ffmpeg.c b/plugins/ffmpeg/lqt_ffmpeg.c +--- a/plugins/ffmpeg/lqt_ffmpeg.c 2012-02-15 20:48:30.000000000 +0100 ++++ b/plugins/ffmpeg/lqt_ffmpeg.c 2013-07-15 15:19:09.730831655 +0200 +@@ -89,19 +89,8 @@ int ffmpeg_num_video_codecs = -1; + PARAM_QSCALE, \ + PARAM_QCOMPRESS, \ + PARAM_QBLUR, \ +- PARAM_QUANTIZER_NOISE_SHAPING, \ + PARAM_TRELLIS + +-#define ENCODE_PARAM_VIDEO_QUANTIZER_IP \ +- ENCODE_PARAM_VIDEO_QUANTIZER_I, \ +- PARAM_I_QUANT_FACTOR, \ +- PARAM_I_QUANT_OFFSET +- +-#define ENCODE_PARAM_VIDEO_QUANTIZER_IPB \ +- ENCODE_PARAM_VIDEO_QUANTIZER_IP, \ +- PARAM_B_QUANT_FACTOR, \ +- PARAM_B_QUANT_OFFSET +- + #define ENCODE_PARAM_VIDEO_FRAMETYPES_IP \ + { \ + .name = "frame_types", \ +@@ -207,7 +196,6 @@ static lqt_parameter_info_static_t encod + ENCODE_PARAM_VIDEO_FRAMETYPES_IPB, + PARAM_FLAG_AC_PRED_MPEG4, + ENCODE_PARAM_VIDEO_RATECONTROL, +- ENCODE_PARAM_VIDEO_QUANTIZER_IPB, + PARAM_FLAG_CBP_RD, + ENCODE_PARAM_VIDEO_ME, + PARAM_FLAG_GMC, +@@ -225,7 +213,6 @@ static lqt_parameter_info_static_t encod + static lqt_parameter_info_static_t encode_parameters_dx50[] = { + ENCODE_PARAM_VIDEO_FRAMETYPES_IP, + ENCODE_PARAM_VIDEO_RATECONTROL, +- ENCODE_PARAM_VIDEO_QUANTIZER_IP, + ENCODE_PARAM_VIDEO_ME, + ENCODE_PARAM_VIDEO_ME_PRE, + ENCODE_PARAM_VIDEO_MASKING, +@@ -237,7 +224,6 @@ static lqt_parameter_info_static_t encod + static lqt_parameter_info_static_t encode_parameters_h263[] = { + ENCODE_PARAM_VIDEO_FRAMETYPES_IP, + ENCODE_PARAM_VIDEO_RATECONTROL, +- ENCODE_PARAM_VIDEO_QUANTIZER_IP, + ENCODE_PARAM_VIDEO_ME, + PARAM_FLAG_4MV, + ENCODE_PARAM_VIDEO_ME_PRE, +@@ -250,7 +236,6 @@ static lqt_parameter_info_static_t encod + static lqt_parameter_info_static_t encode_parameters_h263p[] = { + ENCODE_PARAM_VIDEO_FRAMETYPES_IP, + ENCODE_PARAM_VIDEO_RATECONTROL, +- ENCODE_PARAM_VIDEO_QUANTIZER_IP, + ENCODE_PARAM_VIDEO_ME, + PARAM_FLAG_4MV, + ENCODE_PARAM_VIDEO_ME_PRE, +@@ -264,7 +249,6 @@ static lqt_parameter_info_static_t encod + static lqt_parameter_info_static_t encode_parameters_msmpeg4v3[] = { + ENCODE_PARAM_VIDEO_FRAMETYPES_IP, + ENCODE_PARAM_VIDEO_RATECONTROL, +- ENCODE_PARAM_VIDEO_QUANTIZER_IP, + ENCODE_PARAM_VIDEO_ME, + ENCODE_PARAM_VIDEO_ME_PRE, + ENCODE_PARAM_VIDEO_MASKING, +diff -rupN a/plugins/ffmpeg/params.c b/plugins/ffmpeg/params.c +--- a/plugins/ffmpeg/params.c 2012-03-07 15:10:41.000000000 +0100 ++++ b/plugins/ffmpeg/params.c 2013-07-15 15:09:38.214189953 +0200 +@@ -202,8 +202,10 @@ void lqt_ffmpeg_set_parameter(AVCodecCon + PARAM_INT("ff_max_b_frames",max_b_frames); + PARAM_FLOAT("ff_b_quant_factor",b_quant_factor); + PARAM_INT("ff_b_frame_strategy",b_frame_strategy); ++#if (LIBAVCODEC_VERSION_MAJOR < 55) + PARAM_INT("ff_luma_elim_threshold",luma_elim_threshold); + PARAM_INT("ff_chroma_elim_threshold",chroma_elim_threshold); ++#endif + PARAM_INT("ff_strict_std_compliance",strict_std_compliance); + PARAM_QP2LAMBDA("ff_b_quant_offset",b_quant_offset); + PARAM_INT("ff_rc_min_rate",rc_min_rate); +@@ -241,8 +243,10 @@ void lqt_ffmpeg_set_parameter(AVCodecCon + PARAM_QP2LAMBDA("ff_lmax", lmax); + PARAM_INT("ff_noise_reduction",noise_reduction); + PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000); ++#if #if (LIBAVCODEC_VERSION_MAJOR < 55) + PARAM_INT("ff_inter_threshold",inter_threshold); + PARAM_INT("ff_quantizer_noise_shaping",quantizer_noise_shaping); ++#endif + PARAM_INT("ff_thread_count",thread_count); + PARAM_INT("ff_me_threshold",me_threshold); + PARAM_INT("ff_mb_threshold",mb_threshold); +diff -rupN a/plugins/ffmpeg/params.h b/plugins/ffmpeg/params.h +--- a/plugins/ffmpeg/params.h 2011-05-11 17:13:39.000000000 +0200 ++++ b/plugins/ffmpeg/params.h 2013-07-15 15:09:04.860858069 +0200 +@@ -177,6 +177,7 @@ the reference. Unused for constant quant + .val_max = { .val_int = 1 }, \ + } + ++#if (LIBAVCODEC_VERSION_MAJOR < 55) + #define PARAM_LUMA_ELIM_THRESHOLD \ + { \ + .name = "ff_luma_elim_threshold", \ +@@ -202,6 +203,7 @@ recommendation") \ + chrominamce. Negative values also consider dc \ + coefficient. 7 is JVT recommendation") \ + } ++#endif + + #define PARAM_STRICT_STANDARD_COMPLIANCE \ + { \ +@@ -739,6 +741,7 @@ with max and/or min bitrate, this must b + + /* Does nothing */ + /** Frame types */ ++#if (LIBAVCODEC_VERSION_MAJOR < 55) + #define PARAM_INTER_THRESHOLD \ + { \ + .name = "ff_inter_threshold", \ +@@ -759,6 +762,7 @@ with max and/or min bitrate, this must b + .help_string = TRS("Choose quantization such that noise will be masked by " \ + "similar-frequency content in the image") \ + } ++#endif + + /** Motion estimation */ + #define PARAM_ME_THRESHOLD \ diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index 6377a9032..a24893a6f 100644 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 190022 2013-07-13 02:26:08Z eric $ +# $Id: PKGBUILD 191729 2013-07-29 18:51:12Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor (Parabola): bitlord # Contributor (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=liferea pkgname=liferea-libre -pkgver=1.10.0 +pkgver=1.10.1.a pkgrel=1 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions" arch=('i686' 'x86_64') @@ -18,22 +18,25 @@ depends=('webkitgtk' 'libnotify' 'json-glib' 'libpeas' 'python2-gobject' 'gnome-icon-theme' 'desktop-file-utils') makedepends=('intltool') optdepends=('gnome-keyring: for keyring plugin support' - 'libgnome-keyring: for keyring plugin support') + 'libgnome-keyring: for keyring plugin support' + 'gst-plugins-base: for media player plugin support' + 'gst-plugins-good: for media player plugin support' + 'gst-plugins-bad-libre: for media player plugin support') options=('!libtool' '!emptydirs') install=liferea.install -source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2 +source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver%*.*}a.tar.bz2 remove-non-free-suggestions.patch) -sha1sums=('aac8e1dac30361758e3565cfddfd317f9f60b64a' +sha1sums=('c0c8508adb6ccfda46453b6a213c15ab78ad5d2c' '855de60c91b5fee71c7ec88dd04b7d24a02dc0d1') build() { - cd liferea-${pkgver} + cd liferea-${pkgver%*.*}a patch -Np1 -i "$srcdir/remove-non-free-suggestions.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-compile make } package() { - cd liferea-${pkgver} + cd liferea-${pkgver%*.*}a make DESTDIR="${pkgdir}" install } diff --git a/libre/mplayer-libre/0001-demux_gif-declare-missing-PrintGifError.patch b/libre/mplayer-libre/0001-demux_gif-declare-missing-PrintGifError.patch new file mode 100644 index 000000000..c8a527cf3 --- /dev/null +++ b/libre/mplayer-libre/0001-demux_gif-declare-missing-PrintGifError.patch @@ -0,0 +1,34 @@ +From 5194f95d39ffbb0a4a7b027d8f1b084436feb22c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b@bpiotrowski.pl> +Date: Sun, 14 Jul 2013 10:51:11 +0200 +Subject: [PATCH] demux_gif: declare missing PrintGifError + +Apparently it has been removed from newer Giflib releases. +--- + libmpdemux/demux_gif.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c +index eee7a85..3d761c0 100644 +--- a/libmpdemux/demux_gif.c ++++ b/libmpdemux/demux_gif.c +@@ -44,6 +44,16 @@ typedef struct { + + #define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F') + ++static void PrintGifError(void) ++{ ++ char *Err = GifErrorString(); ++ ++ if (Err != NULL) ++ fprintf(stderr, "\nGIF-LIB error: %s.\n", Err); ++ else ++ fprintf(stderr, "\nGIF-LIB undefined error %d.\n", GifError()); ++} ++ + #ifndef CONFIG_GIF_TVT_HACK + // not supported by certain versions of the library + static int my_read_gif(GifFileType *gif, uint8_t *buf, int len) +-- +1.8.3.2 + diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index a49b889bd..36bf2f4ff 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186432 2013-05-26 10:14:39Z foutrelis $ +# $Id: PKGBUILD 191803 2013-07-30 21:46:38Z bpiotrowski $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -8,7 +8,7 @@ _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') pkgver=36285 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') 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' @@ -18,15 +18,18 @@ url="http://www.mplayerhq.hu/" options=('!buildflags' '!emptydirs') source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop - cdio-includes.patch) + cdio-includes.patch + 0001-demux_gif-declare-missing-PrintGifError.patch) md5sums=('5e4f0d4d039b0219514cf52ae6da831d' 'c0d6ef795cf6de48e3b87ff7c23f0319' - '7b5be7191aafbea64218dc4916343bbc') + '7b5be7191aafbea64218dc4916343bbc' + '12a2a5b79849d57eab60a1bfec2978c4') prepare() { cd "$srcdir/$_pkgbase-$pkgver" patch -Np0 -i ../cdio-includes.patch + patch -Np1 -i ../0001-demux_gif-declare-missing-PrintGifError.patch } build() { diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD index 6fa12c5c6..9923b356b 100644 --- a/libre/mplayer-vaapi-libre/PKGBUILD +++ b/libre/mplayer-vaapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94263 2013-07-18 12:09:29Z foutrelis $ +# $Id: PKGBUILD 94736 2013-07-29 18:51:32Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> @@ -9,7 +9,7 @@ _pkgname=mplayer-vaapi pkgname=mplayer-vaapi-libre pkgver=36265 -pkgrel=2 +pkgrel=3 pkgdesc="A movie player, compiled with vaapi support, without nonfree faac support" arch=('i686' 'x86_64') url="http://gitorious.org/vaapi/mplayer" @@ -20,7 +20,7 @@ depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio-paranoia' 'libxinerama' 'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi' 'libbluray' 'libva' 'libass' 'desktop-file-utils') -makedepends=('unzip-libre' 'live-media' 'yasm' 'ladspa' 'git' 'mesa') +makedepends=('unzip' 'live-media' 'yasm' 'ladspa' 'git' 'mesa') provides=("mplayer=$pkgver" "mplayer-vaapi=$pkgver") conflicts=('mplayer' 'mplayer-vaapi') replaces=('mplayer-vaapi') @@ -28,7 +28,6 @@ backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') source=(http://pkgbuild.com/~foutrelis/sources/$_pkgname/$_pkgname-$pkgver.tar.xz{,.sig} cdio-includes.patch tweak-desktop-file.patch - demux-gif.patch subreader-fix-srt-parsing.patch) options=('!buildflags' '!emptydirs') install=mplayer-vaapi.install @@ -36,7 +35,6 @@ sha256sums=('5747c28c30c15d1000fb655a8abaa4b22483746d0e82775b27466948ae0c549a' 'SKIP' '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720' '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b' - '6774f57c027474388497606edfccbb33509cc78b573cdc322dd0955764c6f9c2' '8b6cd325d89ff8bce3662c6aaa9b61b8e6163c6574e09b575426a1eed02b8ad3') @@ -46,9 +44,6 @@ prepare() { patch -Np0 -i "$srcdir/cdio-includes.patch" patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch" - # https://bugs.archlinux.org/task/36039 - patch -Np0 -i "$srcdir/demux-gif.patch" - # http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2139 patch -Np0 -i "$srcdir/subreader-fix-srt-parsing.patch" } @@ -61,6 +56,7 @@ build() { --enable-runtime-cpudetection \ --disable-gui \ --disable-arts \ + --disable-gif \ --disable-liblzo \ --enable-speex \ --disable-cdparanoia \ diff --git a/libre/mplayer-vaapi-libre/demux-gif.patch b/libre/mplayer-vaapi-libre/demux-gif.patch deleted file mode 100644 index 68add7d28..000000000 --- a/libre/mplayer-vaapi-libre/demux-gif.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- libmpdemux/demux_gif.c-old 2012-08-20 08:47:01.000000000 -0600 -+++ libmpdemux/demux_gif.c 2013-07-05 11:27:55.488387360 -0600 -@@ -45,6 +45,16 @@ - - #define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F') - -+static void PrintGifError(void) -+{ -+ char *Err = GifErrorString(); -+ -+ if (Err != NULL) -+ fprintf(stderr, "\nGIF-LIB error: %s.\n", Err); -+ else -+ fprintf(stderr, "\nGIF-LIB undefined error %d.\n", GifError()); -+} -+ - #ifndef CONFIG_GIF_TVT_HACK - // not supported by certain versions of the library - static int my_read_gif(GifFileType *gif, uint8_t *buf, int len) diff --git a/libre/openexr-libre/PKGBUILD b/libre/openexr-libre/PKGBUILD new file mode 100644 index 000000000..638d504b7 --- /dev/null +++ b/libre/openexr-libre/PKGBUILD @@ -0,0 +1,63 @@ +# $Id: PKGBUILD 191713 2013-07-29 10:21:41Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +_pkgname=openexr +pkgname=openexr-libre +pkgver=2.0.1 +pkgrel=1 +pkgdesc="An high dynamic-range image file format library, without embedded nonfree fonts in the documentation" +url="http://www.openexr.com/" +arch=('i686' 'x86_64' 'mips64el') +license=('BSD') +depends=('zlib' 'ilmbase') +makedepends=('libcups' 'libxinerama') +[ "$CARCH" != "mips64el" ] && makedepends+=('libreoffice-writer' 'jre7-openjdk-headless') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +options=('!libtool') +source=("http://download.savannah.nongnu.org/releases/${_pkgname}/${_pkgname}-${pkgver}.tar.gz" + "http://repo.parabolagnulinux.org/other/${pkgname}/MultiViewOpenEXR.odt" + "http://repo.parabolagnulinux.org/other/${pkgname}/OpenEXRFileLayout.odt" + "http://repo.parabolagnulinux.org/other/${pkgname}/ReadingAndWritingImageFiles.odt" + "http://repo.parabolagnulinux.org/other/${pkgname}/TechnicalIntroduction.odt") +noextract=(MultiViewOpenEXR.odt OpenEXRFileLayout.odt ReadingAndWritingImageFiles.odt TechnicalIntroduction.odt) + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + [ "$CARCH" = "mips64el" ] && sed -i 's/ doc //' Makefile.in # no libreoffice yet + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + + # remove documentation with embedded nonfree fonts + rm -rv "doc/"{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.pdf + + # add source documentation with free fonts + install -m644 -v "${srcdir}/"{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt doc + + if [ "$CARCH" != "mips64el" ]; then + # convert documentation to pdf format + cd doc + + for x in ${noextract[@]}; do + libreoffice --headless --invisible --convert-to pdf ${x} + done + + cd .. + fi + + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" + + install -m644 "doc/"{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt "${pkgdir}/usr/share/doc/OpenEXR-${pkgver}" +} +md5sums=('4387e6050d2faa65dd5215618ff2ddce' + '69f117d3c91827e5de47f1e00137a4cc' + '4d5ffa31f9af63bd5c621c6cbac6c673' + 'de099240193d8a51086dfae914fff3cf' + 'ece8bf90d438b89c6bd9fe4a89cc318a') diff --git a/libre/openexr-libre/gcc43.patch b/libre/openexr-libre/gcc43.patch new file mode 100644 index 000000000..ab99eb9a1 --- /dev/null +++ b/libre/openexr-libre/gcc43.patch @@ -0,0 +1,11 @@ +--- exrenvmap/blurImage.cpp ++++ exrenvmap/blurImage.cpp +@@ -39,6 +39,8 @@ + // + //----------------------------------------------------------------------------- + ++#include <cstring> ++ + #include <blurImage.h> + + #include <resizeImage.h> diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD index 212c3beb0..408b6a5eb 100644 --- a/libre/parabola-keyring/PKGBUILD +++ b/libre/parabola-keyring/PKGBUILD @@ -15,5 +15,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make PREFIX=/usr DESTDIR=${pkgdir} install } -md5sums=('d876a03f772de98905fd7eadf0ad5e1c' +md5sums=('d50f8ba9f108b38c0e084d21742ea059' 'SKIP') diff --git a/libre/stuntrally-data-libre/PKGBUILD b/libre/stuntrally-data-libre/PKGBUILD new file mode 100644 index 000000000..52e5783bf --- /dev/null +++ b/libre/stuntrally-data-libre/PKGBUILD @@ -0,0 +1,51 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +pkgname=stuntrally-data-libre +_pkgname=stuntrally-data +pkgver=2.0 +pkgrel=1 +pkgdesc="Stunt Rally game with track editor, based on VDrift (data files), without nonfree data files" +arch=('any') +license=('GPL3' 'custom') +url="http://code.google.com/p/vdrift-ogre" +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +makedepends=('cmake' 'boost' 'libvorbis' 'mygui' 'sdl' 'enet' 'hicolor-icon-theme' 'libxcursor') +source=(StuntRally-$pkgver-sources.tar.xz::http://sourceforge.net/projects/stuntrally/files/$pkgver/StuntRally-$pkgver-sources.tar.xz/download + libre.patch ) +md5sums=('22eb331c4401a0ed03e7a9e916fdb60c' + 'e96df3ba70d6fd0949bb92f4dd609497') +prepare() { + # patch some data files and remove nonfree data files + cd $srcdir/StuntRally-$pkgver-sources + + patch -Np1 -i $srcdir/libre.patch + + rm -rv "data/"{grass/grassJungle.png,sounds/{0{1,2,3,4,5,6,7,8,9},1{0,1,2},boost,dirt{1,2},mud{1,_cont},scrap,screech,terrain{1,2,3,4,5},water{1,2,3,_cont}}.wav,terrain,trees2,cars/{3S,CT,M3,NS,TC6,XM},tracks/{detroit,ruudskogen,virginia,weekend}} +} + +build() { + # build the sources + cd $srcdir/StuntRally-$pkgver-sources + + mkdir build && cd build + + cmake .. \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DSHARE_INSTALL="share/stuntrally" + make +} + +package() { + #install the sources + cd $srcdir/StuntRally-$pkgver-sources/build + make DESTDIR="$pkgdir" install + + # clean up + rm -rf "$pkgdir/usr/share/stuntrally/tracks/build" + rm -rf "$pkgdir/usr/share/icons" + rm -rf "$pkgdir/usr/share/applications" + rm -rf "$pkgdir/usr/bin" +} diff --git a/libre/stuntrally-data-libre/libre.patch b/libre/stuntrally-data-libre/libre.patch new file mode 100644 index 000000000..642188f05 --- /dev/null +++ b/libre/stuntrally-data-libre/libre.patch @@ -0,0 +1,72 @@ +diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt +index e01fc1b..853ebf7 100644 +--- a/data/CMakeLists.txt ++++ b/data/CMakeLists.txt +@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8) + + # Install data files + # TODO: make this use all data/* subdirs without tracks, not entered by hand .. +-foreach(datadir cars carsim compositor editor fonts grass gui hud loading materials materials2 objects particles road road_s RTShaderLib skies skies_s sounds terrain terrain2 trees-old trees trees2) ++foreach(datadir cars carsim compositor editor fonts grass gui hud loading materials materials2 objects particles road road_s RTShaderLib skies skies_s sounds terrain2 trees-old trees) + install(DIRECTORY ${datadir} DESTINATION ${SHARE_INSTALL}) + endforeach() + +diff --git a/data/grass/_grass.txt b/data/grass/_grass.txt +index 787737e..84197af 100644 +--- a/data/grass/_grass.txt ++++ b/data/grass/_grass.txt +@@ -10,10 +10,3 @@ http://opengameart.org/content/plants-textures-pack-03 + http://opengameart.org/content/plants-textures-pack-04 + + many colored by CryHam for SR +- +----- Old +-grassJungle.png rest is colored +- +-This grass texture included with PagedGeometry was kindly provided by +-Agnisola Philippe (http://www.blitz3dfr.com/portal_joomla/) for +-commercial or non-commercial use. +diff --git a/data/sounds/_sounds_info.txt b/data/sounds/_sounds_info.txt +index 2cab386..eb4e086 100644 +--- a/data/sounds/_sounds_info.txt ++++ b/data/sounds/_sounds_info.txt +@@ -7,39 +7,3 @@ grass + gravel + tire_squeal + wind +- +--- new sounds from +-http://www.freesound.org/ +- +-various smaller cuts, from: +-[author soundname] +- +- metal hits 01..12: +-halleck metal-medium-hit +-halleck metal-hits-medium-1 +-halleck metal-hits-light-1 +-halleck metal-thump +-sagetyrtle crash-1 +-sagetyrtle crash-2 +-halleck big-metal-side-impact-1 +-halleck big-metal-side-impact-2 +-halleck metal-crash-1 +- metal scrap,screech +-halleck metal-roll-cage-hits-heavy +-halleck metal-screech-and-scraping +- +- water,mud: +-cgeffex large-splashes +- +- mud_cont, water_cont +-justinbw water-spigget-onto-mud-1 +-justinbw water-spigget-onto-mud-2 +- +- terrain,dirt: +-halleck hit-with-dirt-spray-1 +-halleck hit-with-dirt-spray-1-body +-halleck hit-with-dirt-spray-2-body +-halleck hit-with-dirt-spray-3 +- +- boost +-nathanshadow thruster-level-ii diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD index ecee94e9b..01505c5d2 100644 --- a/libre/syslinux/PKGBUILD +++ b/libre/syslinux/PKGBUILD @@ -3,8 +3,8 @@ # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=syslinux -pkgver=4.06 -pkgrel=2 +pkgver=4.07 +pkgrel=1.1 arch=('i686' 'x86_64') pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)" url="http://syslinux.zytor.com/" @@ -24,11 +24,11 @@ source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.t syslinux.cfg syslinux-install_update splash.png) -md5sums=('0384ef35b724615074e77b1fc89d5b47' +md5sums=('9ff6e1b94efab931fb4717b600d88779' '1528c376e43f0eaccaa80d8ad1bc13b4' - '31fe4d80ad74b01e5bc8fccc1d32cccd' + 'a43bd903face611bcc148522265dfe6c' '8559fb3daf3afa8688600d8a38118918' - 'befd0e7c38a03442b791f2a530b4dd2d') + 'cb46ca47c6b6323127d908440057d98f') build() { # Do not try to build syslinux with our default LDFLAGS, it will fail diff --git a/libre/syslinux/splash.png b/libre/syslinux/splash.png Binary files differindex f94067681..eac14536b 100644 --- a/libre/syslinux/splash.png +++ b/libre/syslinux/splash.png diff --git a/libre/syslinux/splash.xcf b/libre/syslinux/splash.xcf Binary files differnew file mode 100644 index 000000000..c27d04445 --- /dev/null +++ b/libre/syslinux/splash.xcf diff --git a/libre/syslinux/syslinux.cfg b/libre/syslinux/syslinux.cfg index cb5afb371..e7199438f 100644 --- a/libre/syslinux/syslinux.cfg +++ b/libre/syslinux/syslinux.cfg @@ -33,15 +33,15 @@ UI vesamenu.c32 # Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu MENU TITLE Parabola GNU/Linux-libre MENU BACKGROUND splash.png -MENU COLOR border 30;44 #40ffffff #a0000000 std -MENU COLOR title 1;36;44 #9033ccff #a0000000 std -MENU COLOR sel 7;37;40 #e0ffffff #20ffffff all -MENU COLOR unsel 37;44 #50ffffff #a0000000 std -MENU COLOR help 37;40 #c0ffffff #a0000000 std -MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std -MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std -MENU COLOR msg07 37;40 #90ffffff #a0000000 std -MENU COLOR tabmsg 31;40 #30ffffff #00000000 std +MENU COLOR border 35;40 #ff777caa #a0000000 std +MENU COLOR title 1;35;40 #ff777caa #a0000000 std +MENU COLOR sel 7;35;47 #e0ffffff #20777caa all +MENU COLOR unsel 35;40 #ff777caa #a0000000 std +MENU COLOR help 35;40 #c0b2b2b2 #a0000000 std +MENU COLOR timeout_msg 35;40 #ff777caa #00000000 std +MENU COLOR timeout 1;35;40 #ff777caa #00000000 std +MENU COLOR msg07 35;40 #ff777caa #a0000000 std +MENU COLOR tabmsg 35;40 #ff777caa #00000000 std # boot sections follow # @@ -52,13 +52,13 @@ MENU COLOR tabmsg 31;40 #30ffffff #00000000 std LABEL parabola MENU LABEL Parabola GNU/Linux-libre LINUX ../vmlinuz-linux-libre - APPEND root=/dev/sda3 ro + APPEND root=/dev/sda3 rw INITRD ../initramfs-linux-libre.img LABEL parabolafallback MENU LABEL Parabola GNU/Linux-libre Fallback LINUX ../vmlinuz-linux-libre - APPEND root=/dev/sda3 ro + APPEND root=/dev/sda3 rw INITRD ../initramfs-linux-libre-fallback.img # If you want Memtest on syslinux, use this LABEL section to launch it (install the memtest86+ package) diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD index f7c47e6a5..897db2854 100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin-libre/PKGBUILD @@ -1,16 +1,18 @@ -# $Id: PKGBUILD 189858 2013-07-10 07:18:58Z bpiotrowski $ +# $Id: PKGBUILD 192005 2013-08-03 20:33:12Z remy $ # Maintainer: Rémy Oudompheng <remy@archlinux.org> # Contributor: francois <francois.archlinux.org> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> # Contributor (Parabola): André Silva <emulatorman@lavabit.com> pkgname=texlive-bin-libre -pkgver=2012.0 -pkgrel=13 -pkgdesc="TeX Live binaries, without biber binaries (Parabola rebranded)" +pkgver=2013.30973 +pkgrel=2 +pkgdesc="TeX Live binaries (Parabola rebranded)" license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('t1lib' 'gd' 'poppler>=0.22.0' 'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2') +depends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler>=0.22.0' + 'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2' + 'icu' 'harfbuzz' 'harfbuzz-icu') makedepends=('perl' 'clisp' 'ffcall') optdepends=('ed: for texconfig') provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin') @@ -19,34 +21,11 @@ replaces=('texlive-bin') options=('!libtool' '!strip') url='http://tug.org/texlive/' install="texlive.install" -source=('texmf.cnf' - 'fix-fontforge-encoding.patch' - '09-texlive-fonts.conf' - 'poppler-0.20.patch' - 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20120623.tar.xz' - 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20120623.tar.xz' - 'luatex-r4449-radical-rule-thickness.patch' +source=('fix-fontforge-encoding.patch' + "http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-${pkgver}.tar.xz" ) -backup=(etc/texmf/web2c/texmf.cnf \ - etc/texmf/chktex/chktexrc \ - etc/texmf/dvipdfm/config/config \ - etc/texmf/dvipdfmx/dvipdfmx.cfg \ - etc/texmf/dvips/config/config.ps \ - etc/texmf/tex/generic/config/language.dat \ - etc/texmf/tex/generic/config/language.def \ - etc/texmf/tex/generic/config/pdftexconfig.tex \ - etc/texmf/ttf2pk/ttf2pk.cfg \ - etc/texmf/web2c/fmtutil.cnf \ - etc/texmf/web2c/mktex.cnf \ - etc/texmf/xdvi/XDvi) - -md5sums=('220a4f4cc0d915bf8fcbcb553dcee1ae' - 'bfb9716aa00c86c08cd31e5b32edeb98' - '393a4bf67adc7ca5df2b386759d1a637' - 'e3a664d5a7f0923f35060fe9d25d2573' - 'ac2c3c3aa765581f8504e21a5edbfb9f' - 'f315a860158cfc952c82a6d759961024' - '5190f3295eb9a604c5f17f5bd607299b') +md5sums=('bfb9716aa00c86c08cd31e5b32edeb98' + '0a8ffd5c0002a080a4202057b1f106c6') build() { cd "$srcdir" @@ -57,12 +36,7 @@ build() { fi # this patch removes spurious error message with locale "xx_YY.utf8" - patch -Np0 -i fix-fontforge-encoding.patch - # fix build with poppler >= 0.20 - patch -Np0 -i poppler-0.20.patch - # fix radical rule thickness regression in Luatex - # http://tex.stackexchange.com/q/61952/729 - patch -Np0 -i luatex-r4449-radical-rule-thickness.patch + #patch -Np0 -i fix-fontforge-encoding.patch # t4ht expects to be un /usr/share/texmf/bin/t4ht (FS#27251) sed -i s/SELFAUTOPARENT/TEXMFROOT/ source/texk/tex4htk/t4ht.c ############################################################# @@ -98,7 +72,11 @@ build() { --with-system-poppler \ --with-system-xpdf \ --with-system-freetype2 \ - --without-system-graphite \ + --with-system-pixman \ + --with-system-cairo \ + --with-system-harfbuzz \ + --with-system-graphite \ + --with-system-icu \ --with-freetype2-libdir=/usr/lib \ --with-freetype2-include=/usr/include/freetype2 \ --with-xdvi-x-toolkit=xaw \ @@ -117,64 +95,6 @@ build() { package() { 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/ - # 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/ - 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} - # 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/ - # 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.* - # 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 - # Don't list formats which need removed packages to work. - sed -i '/csplain\|mex\|jadetex/d' "$pkgdir"/etc/texmf/web2c/fmtutil.cnf ############################################################# ### install @@ -189,61 +109,103 @@ package() { 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 - # 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 - # fix location of TEXMFCACHE for luatools - 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 - ## install Perl libraries mkdir -p "$pkgdir"/usr/share/tlpkg/TeXLive install -m644 "${srcdir}"/source/utils/biber/TeXLive/*.pm "${pkgdir}/usr/share/tlpkg/TeXLive" - # create symlinks for formats - echo "--> Create symlinks for TeX formats ..." - PATH="$PATH:${pkgdir}/usr/bin" texlinks -f "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf "$pkgdir"/usr/bin/ + ## symlink engines by hand. texlinks has moved to texlive-core... + mkdir -p ${pkgdir}/usr/bin + ln -s eptex ${pkgdir}/usr/bin/platex + ln -s euptex ${pkgdir}/usr/bin/uplatex + ln -s luatex ${pkgdir}/usr/bin/dvilualatex + ln -s luatex ${pkgdir}/usr/bin/dviluatex + ln -s luatex ${pkgdir}/usr/bin/lualatex + ln -s luatex ${pkgdir}/usr/bin/pdfcsplain + ln -s pdftex ${pkgdir}/usr/bin/amstex + ln -s pdftex ${pkgdir}/usr/bin/cslatex + ln -s pdftex ${pkgdir}/usr/bin/csplain + ln -s pdftex ${pkgdir}/usr/bin/eplain + ln -s pdftex ${pkgdir}/usr/bin/etex + ln -s pdftex ${pkgdir}/usr/bin/jadetex + ln -s pdftex ${pkgdir}/usr/bin/latex + ln -s pdftex ${pkgdir}/usr/bin/mex + ln -s pdftex ${pkgdir}/usr/bin/mllatex + ln -s pdftex ${pkgdir}/usr/bin/mltex + ln -s pdftex ${pkgdir}/usr/bin/pdfetex + ln -s pdftex ${pkgdir}/usr/bin/pdfjadetex + ln -s pdftex ${pkgdir}/usr/bin/pdflatex + ln -s pdftex ${pkgdir}/usr/bin/pdfmex + ln -s pdftex ${pkgdir}/usr/bin/pdfxmltex + ln -s pdftex ${pkgdir}/usr/bin/texsis + ln -s pdftex ${pkgdir}/usr/bin/utf8mex + ln -s pdftex ${pkgdir}/usr/bin/xmltex + ln -s xetex ${pkgdir}/usr/bin/xelatex + ############################################################# # remove dangling symlinks _bibtexextra_scripts=" bibexport listbib +multibibliography urlbst " _core_scripts=" +a2ping +a5toa4 +adhocfilelist afm2afm +allcm +allec +allneeded +arara arlatex autoinst bundledoc checkcites -cmap2enc +chkweb +context ctanify ctanupload +ctxtools de-macro +deweb dosepsbin +dtxgen +dvi2fax dviasm +dvired +e2pall epstopdf findhyph -font2afm +fmtutil +fmtutil-sys +fontinst fragmaster installfont-tl +kpsepath +kpsetool +kpsewhere +kpsexpand latex2man latexdiff latexdiff-vc latexfileversion latexmk +latexpand latexrevise listings-ext.sh +ltxfileinfo +lua2dox_filter +luaotfload-tool +luatools match_parens mf2pt1 mkjobtexmf mkluatexfontdb mkt1font +mktexfmt mptopdf +mtxrun ot2kpx pdf180 pdf270 @@ -259,27 +221,49 @@ pdfjam-slides6up pdfjoin pdfnup pdfpun -pfm2kpx +pfarrei pkfix pkfix-helper +ps2eps +ps2frag +pslatex +pstopdf purifyeps repstopdf rpdfcrop -showglyphs +rungs +simpdftex sty2dtx +texconfig +texconfig-dialog +texconfig-sys texcount texdef texdiff texdirflatten +texdoc +texdoctk +texexec +texindy +texlinks texliveonfly texloganalyser -typeoutfileinfo +texmfstart thumbpdf +typeoutfileinfo +updmap +updmap-sys vpl2ovp vpl2vpl +xindy " _htmlxml_scripts="ht htcontext htlatex htmex httex httexi htxelatex htxetex mk4ht" - _langcjk_scripts="convbkmk updmap-setup-kanji" + _langcyrillic_scripts="rubibtex rumakeindex" + _langcjk_scripts="convbkmk ptex2pdf +kanji-fontmap-creator +kanji-config-updmap +kanji-config-updmap-sys +" _langextra_scripts="ebong" _langgreek_scripts="mkgrkindex" _latexextra_scripts=" @@ -288,7 +272,6 @@ exceltex makeglossaries pdfannotextractor perltex -ppower4 ps4pdf splitindex svn-multi @@ -302,6 +285,7 @@ vpe" ${_core_scripts} \ ${_htmlxml_scripts} \ ${_langcjk_scripts} \ + ${_langcyrillic_scripts} \ ${_langextra_scripts} \ ${_langgreek_scripts} \ ${_latexextra_scripts} \ @@ -309,8 +293,8 @@ vpe" ${_pictures_scripts} \ ${_pstricks_scripts} \ ${_science_scripts} \ - tlmgr biber; do # biber is not built from source - rm -f "$pkgdir"/usr/bin/$s + tlmgr; do + ! readlink -e "$pkgdir"/usr/bin/$s && rm "$pkgdir"/usr/bin/$s done ################################################################### } diff --git a/libre/texlive-bin-libre/texlive.install b/libre/texlive-bin-libre/texlive.install index 06a40a3b3..96a41bcfc 100644 --- a/libre/texlive-bin-libre/texlive.install +++ b/libre/texlive-bin-libre/texlive.install @@ -2,13 +2,16 @@ 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 - echo -n "creating all formats..." - usr/bin/fmtutil-sys --all 1>/dev/null - echo " done." - echo " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)" - + if [[ -f usr/bin/mktexlsr ]]; then + echo ">>> texlive: updating the filename database..." + usr/bin/mktexlsr + fi + if [[ -f usr/bin/fmtutil-sys ]]; then + echo -n "creating all formats..." + usr/bin/fmtutil-sys --all 1>/dev/null + echo " done." + echo " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)" + fi [[ -x usr/bin/install-info ]] || return 0 for file in "${filelist[@]}"; do install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null @@ -17,15 +20,19 @@ post_install() { post_upgrade() { local corename corever _pacout - echo ">>> texlive: updating the filename database..." - usr/bin/mktexlsr + if [[ -f usr/bin/mktexlsr ]]; then + echo ">>> texlive: updating the filename database..." + usr/bin/mktexlsr + fi _pacout=$(pacman -Q texlive-core 2>/dev/null) read corename corever <<< ${_pacout} if [[ ${corever} == 2012* ]]; then - echo -n "recreating all formats..." - usr/bin/fmtutil-sys --all 1>/dev/null - echo " done." - echo " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)" + if [[ -f usr/bin/fmtutil-sys ]]; then + echo -n "recreating all formats..." + usr/bin/fmtutil-sys --all 1>/dev/null + echo " done." + echo " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)" + fi else echo "WARNING: not recreating formats since texlive-core has version '$corever'" fi diff --git a/libre/texlive-core-libre/09-texlive-fonts.conf b/libre/texlive-core-libre/09-texlive-fonts.conf new file mode 100644 index 000000000..f870fbd7a --- /dev/null +++ b/libre/texlive-core-libre/09-texlive-fonts.conf @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> +<fontconfig> + <dir>/usr/share/texmf-dist/fonts/opentype</dir> + <dir>/usr/share/texmf-dist/fonts/truetype</dir> + <dir>/usr/local/share/texmf/fonts/opentype</dir> + <dir>/usr/local/share/texmf/fonts/truetype</dir> +</fontconfig> + diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD index fc949d923..dfd68b3db 100644 --- a/libre/texlive-core-libre/PKGBUILD +++ b/libre/texlive-core-libre/PKGBUILD @@ -4,34 +4,49 @@ pkgname=texlive-core-libre _pkgname=texlive-core -pkgver=2012.29661 -_revnr=${pkgver#2012.} -pkgrel=1 -pkgdesc="TeX Live core distribution, without nonfree add-on packages" +pkgver=2013.30962 +_revnr=${pkgver#2013.} +pkgrel=2 +pkgdesc="TeX Live core distribution, without nonfree add-on packages (Parabola rebranded)" license=('GPL') arch=(any) depends=('texlive-bin-libre') optdepends=( - 'perl: for many useful tools' 'ruby: for old ConTeXT MkII and epspdf' 'tk: for texdoctk' 'python2: for dviasm' 'ghostscript: for epstopdf, epspdf and other ConTeXt tools' 'psutils: to manipulate the output of dvips' 't1utils: can be useful when installing Type1 fonts' + 'jre7-openjdk: for utilities like arara' ) groups=('texlive-most') conflicts=('tetex' 'texlive-latex3' 'texlive-core') provides=('tetex' 'texlive-latex3' "texlive-core=$pkgver") replaces=('tetex' 'texlive-latex3' 'texlive-core') url='http://tug.org/texlive/' -source=("ftp://mirrors.kernel.org/archlinux/other/texlive/$_pkgname-$pkgver-src.zip" - "$_pkgname.maps") +source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" + "$_pkgname.maps" + "texmf.cnf" + "09-texlive-fonts.conf") options=(!strip) install=texlive.install -#backup=(etc/texmf/tex/context/config/cont-usr.tex) -md5sums=('4126fad75c577f5b067e612214039c93' - '306ab28bb9b070fc3e40d86d28ea7e8e') +backup=(etc/texmf/web2c/texmf.cnf \ + etc/texmf/chktex/chktexrc \ + etc/texmf/dvipdfmx/dvipdfmx.cfg \ + etc/texmf/dvips/config/config.ps \ + etc/texmf/tex/generic/config/language.dat \ + etc/texmf/tex/generic/config/language.def \ + etc/texmf/tex/generic/config/pdftexconfig.tex \ + etc/texmf/ttf2pk/ttf2pk.cfg \ + etc/texmf/web2c/fmtutil.cnf \ + etc/texmf/web2c/mktex.cnf \ + etc/texmf/xdvi/XDvi) + +md5sums=('cc2e2edd31b530d792460976c3ce940b' + '306ab28bb9b070fc3e40d86d28ea7e8e' + 'd5a3f442ec3b7aa1518170f64f9d006b' + '393a4bf67adc7ca5df2b386759d1a637') build() { cd "$srcdir" @@ -55,6 +70,9 @@ build() { } package() { + cd "$srcdir" + + # Install packages. install -m755 -d $pkgdir/var/lib/texmf/arch/installedpkgs sed -i '/^#/d' CONTENTS install -m644 CONTENTS $pkgdir/var/lib/texmf/arch/installedpkgs/${_pkgname}_${_revnr}.pkgs @@ -67,9 +85,70 @@ package() { done find texmf-dist -type d -exec install -d -m755 $pkgdir/usr/share/'{}' \; find texmf-dist -type f -exec install -m644 '{}' $pkgdir/usr/share/'{}' \; - if [[ -d $pkgdir/usr/share/texmf-dist/scripts ]]; then - find $pkgdir/usr/share/texmf-dist/scripts -type f -exec chmod a+x '{}' \; - fi + find texmf-dist -type f -executable -exec chmod 755 $pkgdir/usr/share/'{}' \; + + ############################################################# + ### install texmf tree + echo "--> installing the /etc/texmf tree" + 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/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/ + + # Remove manpages (already in texlive-bin). + rm -rf "$pkgdir"/usr/share/texmf-dist/doc/man + + # copy config files to $TEXMFCONFIG tree + cp -a "$pkgdir"/usr/share/texmf-dist/chktex/chktexrc \ + "$pkgdir"/etc/texmf/chktex/ + cp -a "$pkgdir"/usr/share/texmf-dist/web2c/mktex.cnf \ + "$pkgdir"/etc/texmf/web2c/ + cp -a "$pkgdir"/usr/share/texmf-dist/web2c/updmap.cfg \ + "$pkgdir"/etc/texmf/web2c/ + cp -a "$pkgdir"/usr/share/texmf-dist/web2c/fmtutil.cnf \ + "$pkgdir"/etc/texmf/web2c/ + cp -a "$pkgdir"/usr/share/texmf-dist/dvips/config/config.ps \ + "$pkgdir"/etc/texmf/dvips/config/ + cp -a "$pkgdir"/usr/share/texmf-dist/dvipdfmx/dvipdfmx.cfg \ + "$pkgdir"/etc/texmf/dvipdfmx/ + cp -a "$pkgdir"/usr/share/texmf-dist/tex/generic/config/pdftexconfig.tex \ + "$pkgdir"/etc/texmf/tex/generic/config/ + cp -a "$pkgdir"/usr/share/texmf-dist/tex/generic/config/language.dat \ + "$pkgdir"/etc/texmf/tex/generic/config/ + cp -a "$pkgdir"/usr/share/texmf-dist/tex/generic/config/language.def \ + "$pkgdir"/etc/texmf/tex/generic/config/ + cp -a "$pkgdir"/usr/share/texmf-dist/ttf2pk/ttf2pk.cfg \ + "$pkgdir"/etc/texmf/ttf2pk/ + cp -a "$pkgdir"/usr/share/texmf-dist/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.* + # 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 + + + # replace upstream texmf.cnf with ours + rm -f "$pkgdir"/usr/share/texmf-dist/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-dist/web2c/texmf.cnf + # fix location of TEXMFCACHE for luatools + sed -i 's#texlive2013#texlive#' "$pkgdir"/usr/share/texmf-dist/web2c/texmfcnf.lua + ## remove aleph from fmtutil.cnf + sed -i -e '/aleph/d' "$pkgdir"/usr/share/texmf-dist/web2c/fmtutil.cnf + + # create symlinks for formats + echo "--> Create symlinks for TeX formats ..." + mkdir -p "${pkgdir}/usr/bin" + bash "${pkgdir}"/usr/share/texmf-dist/scripts/texlive/texlinks.sh -f "$pkgdir"/usr/share/texmf-dist/web2c/fmtutil.cnf "$pkgdir"/usr/bin/ + # use python2 for dviasm sed -i 's/env python/env python2/' $pkgdir/usr/share/texmf-dist/scripts/dviasm/dviasm.py @@ -91,16 +170,30 @@ package() { # link programs from /usr/share/texmf-dist/scripts _linked_scripts=" +a2ping/a2ping.pl accfonts/mkt1font accfonts/vpl2ovp accfonts/vpl2vpl +adhocfilelist/adhocfilelist.sh +arara/arara.sh bundledoc/arlatex bundledoc/bundledoc -context/perl/mptopdf.pl checkcites/checkcites.lua +chktex/chkweb.sh +chktex/deweb.pl +context/perl/mptopdf.pl +context/stubs/unix/context +context/stubs/unix/ctxtools +context/stubs/unix/luatools +context/stubs/unix/mtxrun +context/stubs/unix/pstopdf +context/stubs/unix/texexec +context/stubs/unix/texmfstart ctanify/ctanify ctanupload/ctanupload.pl de-macro/de-macro +dosepsbin/dosepsbin.pl +dtxgen/dtxgen dviasm/dviasm.py epstopdf/epstopdf.pl findhyph/findhyph @@ -115,7 +208,10 @@ latexdiff/latexdiff.pl latexdiff/latexrevise.pl latexfileversion/latexfileversion latexmk/latexmk.pl -luaotfload/mkluatexfontdb.lua +latexpand/latexpand +ltxfileinfo/ltxfileinfo +lua2dox/lua2dox_filter +luaotfload/luaotfload-tool.lua match_parens/match_parens mf2pt1/mf2pt1.pl mkjobtexmf/mkjobtexmf.pl @@ -133,28 +229,61 @@ pdfjam/pdfjam-slides6up pdfjam/pdfjoin pdfjam/pdfnup pdfjam/pdfpun +pfarrei/a5toa4.tlu +pfarrei/pfarrei.tlu pkfix-helper/pkfix-helper pkfix/pkfix.pl +ps2eps/ps2eps.pl purifyeps/purifyeps +simpdftex/simpdftex sty2dtx/sty2dtx.pl texcount/texcount.pl texdef/texdef.pl texdiff/texdiff texdirflatten/texdirflatten +texdoc/texdoc.tlu +texdoctk/texdoctk.pl +texlive/allcm.sh +texlive/allneeded.sh +texlive/dvi2fax.sh +texlive/dvired.sh +texlive/e2pall.sh +texlive/fmtutil-sys.sh +texlive/fmtutil.sh +texlive/fontinst.sh +texlive/kpsetool.sh +texlive/kpsewhere.sh +texlive/ps2frag.sh +texlive/pslatex.sh +texlive/rungs.tlu +texlive/texconfig-dialog.sh +texlive/texconfig-sys.sh +texlive/texconfig.sh +texlive/texlinks.sh +texlive/updmap-sys.sh +texlive/updmap.pl +texliveonfly/texliveonfly.py texloganalyser/texloganalyser thumbpdf/thumbpdf.pl typeoutfileinfo/typeoutfileinfo.sh -texliveonfly/texliveonfly.py +xindy/texindy.pl +xindy/xindy.pl " install -m755 -d $pkgdir/usr/bin for _script in ${_linked_scripts}; do _scriptbase=$(basename $_script) _scriptbase=${_scriptbase%.*} - ln -s /usr/share/texmf-dist/scripts/${_script} ${pkgdir}/usr/bin/${_scriptbase} + [[ -f ${pkgdir}/usr/share/texmf-dist/scripts/${_script} ]] && + ln -s /usr/share/texmf-dist/scripts/${_script} ${pkgdir}/usr/bin/${_scriptbase} done ln -s /usr/share/texmf-dist/scripts/listings-ext/listings-ext.sh ${pkgdir}/usr/bin/listings-ext.sh # additional symlinks + ln -s allcm ${pkgdir}/usr/bin/allec + ln -s fmtutil ${pkgdir}/usr/bin/mktexfmt + ln -s kpsetool ${pkgdir}/usr/bin/kpsexpand + ln -s kpsetool ${pkgdir}/usr/bin/kpsepath ln -s epstopdf ${pkgdir}/usr/bin/repstopdf ln -s pdfcrop ${pkgdir}/usr/bin/rpdfcrop + ln -s luaotfload-tool ${pkgdir}/usr/bin/mkluatexfontdb } diff --git a/libre/texlive-core-libre/texlive.install b/libre/texlive-core-libre/texlive.install index 14ca7c531..77d4213be 100644 --- a/libre/texlive-core-libre/texlive.install +++ b/libre/texlive-core-libre/texlive.install @@ -11,7 +11,7 @@ post_install() { cp "$UPDMAP" "$TMPFILE" echo ">>> texlive: regenerating updmap.cfg (custom additions should go" echo " into /etc/texmf/web2c/updmap-local.cfg" - cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP + cp usr/share/texmf-dist/web2c/updmap-hdr.cfg $UPDMAP cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP [ -f "$UPDMAPLOCAL" ] && cat "$UPDMAPLOCAL" >> $UPDMAP echo ">>> texlive: updating the filename database..." @@ -33,7 +33,7 @@ post_upgrade() { cp "$UPDMAP" "$TMPFILE" echo ">>> texlive: regenerating updmap.cfg (custom additions should go" echo " into /etc/texmf/web2c/updmap-local.cfg" - cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP + cp usr/share/texmf-dist/web2c/updmap-hdr.cfg $UPDMAP cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP [ -f "$UPDMAPLOCAL" ] && cat "$UPDMAPLOCAL" >> $UPDMAP echo ">>> texlive: updating the filename database..." diff --git a/libre/texlive-core-libre/texmf.cnf b/libre/texlive-core-libre/texmf.cnf new file mode 100644 index 000000000..c96c20e39 --- /dev/null +++ b/libre/texlive-core-libre/texmf.cnf @@ -0,0 +1,782 @@ +% texmf.cnf for TeXLive/Parabola GNU/Linux-libre -- runtime path configuration file for kpathsea. +% Public domain. +% +% If you modify this original file, YOUR CHANGES WILL BE LOST when it is +% updated. Instead, put your changes -- and only your changes, not an +% entire copy! -- in ../../texmf.cnf. That is, if this file is +% installed in /some/path/to/texlive/2013/texmf-dist/web2c/texmf.cnf, +% add your custom settings to /some/path/to/texlive/2013/texmf.cnf. +% +% What follows is a super-summary of what this .cnf file can +% contain. Please read the Kpathsea manual for more information. +% +% Any identifier (sticking to A-Za-z_ for names is safest) can be assigned. +% The `=' (and surrounding spaces) is optional. +% $foo (or ${foo}) in a value expands to the envvar or cnf value of foo. +% Long lines can be continued with a \. +% +% Earlier entries (in the same or another file) override later ones, and +% an environment variable foo overrides any texmf.cnf definition of foo. +% +% All definitions are read before anything is expanded, so you can use +% variables before they are defined. +% +% If a variable assignment is qualified with `.PROGRAM', it is ignored +% unless the current executable (last filename component of argv[0]) is +% named PROGRAM. This foo.PROGRAM construct is not recognized on the +% right-hand side. For environment variables, use FOO_PROGRAM. +% +% Which file formats use which paths for searches is described in the +% various programs' and the Kpathsea documentation (http://tug.org/kpathsea). +% +% // means to search subdirectories (recursively). +% A leading !! means to look only in the ls-R db, never on the disk. +% In this file, either ; or : can be used to separate path components. +% A leading/trailing/doubled path separator in the paths will be +% expanded into the compile-time default. Probably not what you want. +% +% Brace notation is supported, for example: /usr/local/{mytex,othertex} +% expands to /usr/local/mytex:/usr/local/othertex. We make extensive +% use of this. + + +% Part 1: Search paths and directories. + +% This is the parent directory of our several trees, i.e., +% /usr/local/texlive/YYYY in the original TeX Live distribution. +% +% All trees must be organized according to the TeX Directory Structure +% (http://tug.org/tds), or files may not be found. +% +% Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share. +% Kpathsea sets SELFAUTOLOC (the directory with the binary), +% SELFAUTODIR (its parent), and SELFAUTOPARENT (its grandparent). +TEXMFROOT = $SELFAUTODIR/share + +% The main tree of distributed packages and programs: +TEXMFDIST = $TEXMFROOT/texmf-dist + +% We used to have a separate /texmf tree with some core programs and files. +% Keep the variable name. +TEXMFMAIN = $TEXMFDIST + +% Local additions to the distribution trees. +TEXMFLOCAL = /usr/local/share/texmf;/usr/share/texmf + +% TEXMFSYSVAR, where *-sys store cached runtime data. +TEXMFSYSVAR = /var/lib/texmf + +% TEXMFSYSCONFIG, where *-sys store configuration data. +TEXMFSYSCONFIG = /etc/texmf + +% Per-user texmf tree(s) -- organized per the TDS, as usual. To define +% more than one per-user tree, set this to a list of directories in +% braces, as described above. (This used to be HOMETEXMF.) ~ expands +% to %USERPROFILE% on Windows, $HOME otherwise. +TEXMFHOME = ~/texmf + +% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data. +TEXMFVAR = ~/.texlive/texmf-var + +% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. +TEXMFCONFIG = ~/.texlive/texmf-config + +% List all the texmf trees. For an explanation of what they are, see the +% TeX Live manual. +% +% For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named +% explicitly and before all other trees. +% +% TEXMFLOCAL precedes TEXMFDIST because locally-installed versions +% should take precedence over distribution files -- although it is +% generally a source of confusion to have different versions of a +% package installed, whatever the trees, so try to avoid it. +TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST} + +% Where to look for ls-R files. There need not be an ls-R in the +% directories in this path, but if there is one, Kpathsea will use it. +% By default, this is only the !! elements of TEXMF, so that mktexlsr +% does not create ls-R files in the non-!! elements -- because if an +% ls-R is present, it will be used, and the disk will not be searched. +% This is arguably a bug in kpathsea. +TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST} + +% The system trees. These are the trees that are shared by all users. +% If a tree appears in this list, the mktex* scripts will use +% VARTEXFONTS for generated files, if the original tree isn't writable; +% otherwise the current working directory is used. +SYSTEXMF = $TEXMFSYSVAR;$TEXMFLOCAL;$TEXMFDIST + +% First writable tree here is used by Lua(La)TeX for the font cache. +% LuaLaTeX uses the value here, while ConTeXt uses the same variable but +% from texmfcnf.lua; therefore the two values should be kept in sync. +% (As should everything else in texmf.cnf <-> texmfcnf.lua.) +TEXMFCACHE = $TEXMFSYSVAR;$TEXMFVAR + +% Where generated fonts may be written. This tree is used when the sources +% were found in a system tree and either that tree wasn't writable, or the +% varfonts feature was enabled in MT_FEATURES in mktex.cnf. +VARTEXFONTS = $TEXMFVAR/fonts + +% On some systems, there will be a system tree which contains all the font +% files that may be created as well as the formats. For example +% TEXMFVAR = /var/lib/texmf +% is used in many distros. In this case, set VARTEXFONTS like this +%VARTEXFONTS = $TEXMFVAR/fonts +% and do not mention it in TEXMFDBS (but _do_ mention TEXMFVAR). +% +% Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below +% one of the TEXMF directories (avoids overlapping ls-R files). + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Usually you will not need to edit any of the following variables. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% WEB2C is for Web2C specific files. The current directory may not be +% a good place to look for them. +WEB2C = $TEXMF/web2c + +% TEXINPUTS is for TeX input files -- i.e., anything to be found by \input +% or \openin, including .sty, .eps, etc. We specify paths for all known +% formats, past or present. Not all of them are built these days. + +% Plain TeX. Have the command tex check all directories as a last +% resort, we may have plain-compatible stuff anywhere. +TEXINPUTS.tex = .;$TEXMF/tex/{plain,generic,}// + +% Fontinst needs to read afm files. +TEXINPUTS.fontinst = .;$TEXMF/{tex,fonts/afm}// + +% Other plain-based formats. +TEXINPUTS.amstex = .;$TEXMF/tex/{amstex,plain,generic,}// +TEXINPUTS.csplain = .;$TEXMF/tex/{csplain,plain,generic,}// +TEXINPUTS.eplain = .;$TEXMF/tex/{eplain,plain,generic,}// +TEXINPUTS.ftex = .;$TEXMF/tex/{formate,plain,generic,}// +TEXINPUTS.mex = .;$TEXMF/tex/{mex,plain,generic,}// +TEXINPUTS.texinfo = .;$TEXMF/tex/{texinfo,plain,generic,}// + +% LaTeX 2e specific macros are stored in latex/, macros that can only be +% used with 2.09 in latex209/. In addition, we look in the directory +% latex209, useful for macros that were written for 2.09 and do not +% mention 2e at all, but can be used with 2e. +TEXINPUTS.cslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}// +TEXINPUTS.latex = .;$TEXMF/tex/{latex,generic,}// +TEXINPUTS.latex209 = .;$TEXMF/tex/{latex209,generic,latex,}// +TEXINPUTS.olatex = .;$TEXMF/tex/{latex,generic,}// + +% MLTeX. +TEXINPUTS.frlatex = .;$TEXMF/tex/{french,latex,generic,}// +TEXINPUTS.frtex = .;$TEXMF/tex/{french,plain,generic,}// +TEXINPUTS.mllatex = .;$TEXMF/tex/{latex,generic,}// +TEXINPUTS.mltex = .;$TEXMF/tex/{plain,generic,}// + +% e-TeX. +TEXINPUTS.elatex = .;$TEXMF/tex/{latex,generic,}// +TEXINPUTS.etex = .;$TEXMF/tex/{plain,generic,}// + +% pdfTeX. +TEXINPUTS.pdfcslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}// +TEXINPUTS.pdfcsplain = .;$TEXMF/tex/{csplain,plain,generic,}// +TEXINPUTS.pdflatex = .;$TEXMF/tex/{latex,generic,}// +TEXINPUTS.pdfmex = .;$TEXMF/tex/{mex,plain,generic,}// +TEXINPUTS.utf8mex = .;$TEXMF/tex/{mex,plain,generic,}// +TEXINPUTS.pdftex = .;$TEXMF/tex/{plain,generic,}// +TEXINPUTS.pdftexinfo = .;$TEXMF/tex/{texinfo,plain,generic,}// +TEXINPUTS.pdfamstex = .;$TEXMF/tex/{amstex,plain,generic,}// + +% pdfeTeX. +TEXINPUTS.pdfelatex = .;$TEXMF/tex/{latex,generic,}// +TEXINPUTS.pdfetex = .;$TEXMF/tex/{plain,generic,}// + +% pdfxTeX. +TEXINPUTS.pdfxlatex = .;$TEXMF/tex/{latex,generic,}// +TEXINPUTS.pdfxmex = .;$TEXMF/tex/{mex,plain,generic,}// +TEXINPUTS.pdfxtex = .;$TEXMF/tex/{plain,generic,}// + +% LuaTeX. +TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}// +TEXINPUTS.dvilualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +TEXINPUTS.dviluatex = .;$TEXMF/tex/{luatex,plain,generic,}// + +% XeTeX. +TEXINPUTS.xelatex = .;$TEXMF/tex/{xelatex,latex,xetex,generic,}// +TEXINPUTS.xeplain = .;$TEXMF/tex/{xeplain,eplain,plain,xetex,generic,}// +TEXINPUTS.xetex = .;$TEXMF/tex/{xetex,plain,generic,}// + +% Omega / Aleph. +TEXINPUTS.aleph = .;$TEXMF/tex/{plain,generic,}// +TEXINPUTS.elambda = .;$TEXMF/tex/{lambda,latex,generic,}// +TEXINPUTS.eomega = .;$TEXMF/tex/{plain,generic,}// +TEXINPUTS.lambda = .;$TEXMF/tex/{lambda,latex,generic,}// +TEXINPUTS.lamed = .;$TEXMF/tex/{lambda,latex,generic,}// +TEXINPUTS.omega = .;$TEXMF/tex/{plain,generic,}// + +% p(La)TeX. +TEXINPUTS.ptex = .;$TEXMF/tex/{ptex,plain,generic,}// +TEXINPUTS.platex = .;$TEXMF/tex/{platex,latex,generic,}// + +% epTeX, and for pmpost. +TEXINPUTS.eptex = .;$TEXMF/tex/{ptex,plain,generic,}// +TEX.pmpost = eptex + +% (e)up(La)TeX. +TEXINPUTS.uplatex = .;$TEXMF/tex/{uplatex,platex,latex,generic,}// +TEXINPUTS.uptex = .;$TEXMF/tex/{uptex,ptex,plain,generic,}// +TEXINPUTS.euptex = .;$TEXMF/tex/{uptex,ptex,plain,generic}// + +% pBibTeX bibliographies and style files. +BIBINPUTS.pbibtex = .;$TEXMF/{pbibtex,bibtex}/bib// +BSTINPUTS.pbibtex = .;$TEXMF/{pbibtex,bibtex}/bst// + +% ConTeXt. +TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic}// + +% jadetex. +TEXINPUTS.jadetex = .;$TEXMF/tex/{jadetex,latex,generic,}// +TEXINPUTS.pdfjadetex = .;$TEXMF/tex/{jadetex,latex,generic,}// + +% XMLTeX. +TEXINPUTS.xmltex = .;$TEXMF/tex/{xmltex,latex,generic,}// +TEXINPUTS.pdfxmltex = .;$TEXMF/tex/{xmltex,latex,generic,}// + +% Miscellany, no longer built. +TEXINPUTS.lamstex = .;$TEXMF/tex/{lamstex,plain,generic,}// +TEXINPUTS.lollipop = .;$TEXMF/tex/{lollipop,plain,generic,}// +TEXINPUTS.frpdflatex = .;$TEXMF/tex/{french,latex,generic,}// +TEXINPUTS.frpdftex = .;$TEXMF/tex/{french,plain,generic,}// + +% Earlier entries override later ones, so put this generic one last. +TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}// + +% ttf2tfm. +TTF2TFMINPUTS = .;$TEXMF/ttf2pk// + +% Metafont, MetaPost inputs. +MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source// +MPINPUTS = .;$TEXMF/metapost// + +% Dump files (fmt/base/mem) for vir{tex,mf,mp} to read. +% We want to find the engine-specific file, e.g., cont-en.fmt can +% exist under both pdftex/ and xetex/. But just in case some formats +% end up without an engine directory, look directly in web2c/ too. +% We repeat the same definition three times because of the way fmtutil +% is implemented; if we use ${TEXFORMATS}, the mpost/mf/etc. formats +% will not be found. +TEXFORMATS = .;$TEXMF/web2c{/$engine,} +MFBASES = .;$TEXMF/web2c{/$engine,} +MPMEMS = .;$TEXMF/web2c{/$engine,} +% +% As of 2008, pool files don't exist any more (the strings are compiled +% into the binaries), but just in case something expects to find these: +TEXPOOL = .;$TEXMF/web2c +MFPOOL = ${TEXPOOL} +MPPOOL = ${TEXPOOL} + +% support the original xdvi. Must come before the generic settings. +PKFONTS.XDvi = .;$TEXMF/%s;$VARTEXFONTS/pk/{%m,modeless}// +VFFONTS.XDvi = .;$TEXMF/%s +PSHEADERS.XDvi = .;$TEXMF/%q{dvips,fonts/type1}// +TEXPICTS.XDvi = .;$TEXMF/%q{dvips,tex}// + +% Device-independent font metric files. +VFFONTS = .;$TEXMF/fonts/vf// +TFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/tfm// + +% The $MAKETEX_MODE below means the drivers will not use a cx font when +% the mode is ricoh. If no mode is explicitly specified, kpse_prog_init +% sets MAKETEX_MODE to /, so all subdirectories are searched. See the manual. +% The modeless part guarantees that bitmaps for PostScript fonts are found. +PKFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/pk/{$MAKETEX_MODE,modeless}// + +% Similarly for the GF format, which only remains in existence because +% Metafont outputs it (and MF isn't going to change). +GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MODE// + +% A backup for PKFONTS and GFFONTS. Not used for anything. +GLYPHFONTS = .;$TEXMF/fonts + +% A place to puth everything that doesn't fit the other font categories. +MISCFONTS = .;$TEXMF/fonts/misc// + +% font name map files. This isn't just fonts/map// because ConTeXt +% wants support for having files with the same name in the different +% subdirs. Maybe if the programs ever get unified to accepting the same +% map file syntax the definition can be simplified again. +TEXFONTMAPS = .;$TEXMF/fonts/map/{$progname,pdftex,dvips,}// + +% BibTeX bibliographies and style files. bibtex8 also uses these. +BIBINPUTS = .;$TEXMF/bibtex/bib// +BSTINPUTS = .;$TEXMF/bibtex/{bst,csf}// + +% MlBibTeX. +MLBIBINPUTS = .;$TEXMF/bibtex/bib/{mlbib,}// +MLBSTINPUTS = .;$TEXMF/bibtex/{mlbst,bst}// + +% .ris and .bltxml bibliography formats. +RISINPUTS = .;$TEXMF/bibtex/ris// +BLTXMLINPUTS = .;$TEXMF/bibtex/bltxml// + +% MFT style files. +MFTINPUTS = .;$TEXMF/mft// + +% PostScript headers and prologues (.pro); unfortunately, some programs +% also use this for acessing font files (enc, type1, truetype) +TEXPSHEADERS = .;$TEXMF/{dvips,fonts/{enc,type1,type42,type3}}// +TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips,fonts/{enc,type1,type42,type3,truetype}}// + +% OSFONTDIR is to provide a convenient hook for allowing TeX to find +% fonts installed on the system (outside of TeX). An empty default +% value would add "//" to the search paths, so we give it a dummy value. +% OSFONTDIR = /usr/share/fonts + +% PostScript Type 1 outline fonts. +T1FONTS = .;$TEXMF/fonts/type1//;$OSFONTDIR// + +% PostScript AFM metric files. +AFMFONTS = .;$TEXMF/fonts/afm//;$OSFONTDIR// + +% TrueType outline fonts. +TTFONTS = .;$TEXMF/fonts/{truetype,opentype}//;$OSFONTDIR// + +% OpenType outline fonts. +OPENTYPEFONTS = .;$TEXMF/fonts/{opentype,truetype}//;$OSFONTDIR// + +% Type 42 outline fonts. +T42FONTS = .;$TEXMF/fonts/type42// + +% Ligature definition files. +LIGFONTS = .;$TEXMF/fonts/lig// + +% Dvips' config.* files (this name should not start with `TEX'!). +TEXCONFIG = $TEXMF/dvips// + +% Makeindex style (.ist) files. +INDEXSTYLE = .;$TEXMF/makeindex// + +% Font encoding files (.enc). +ENCFONTS = .;$TEXMF/fonts/enc// + +% CMap files. +CMAPFONTS = .;$TEXMF/fonts/cmap// + +% Subfont definition files. +SFDFONTS = .;$TEXMF/fonts/sfd// + +% OpenType feature files (.fea). +FONTFEATURES=.;$TEXMF/fonts/fea// + +% .cid and .cidmap +FONTCIDMAPS=.;$TEXMF/fonts/cid// + +% pdftex config files: +PDFTEXCONFIG = .;$TEXMF/pdftex/{$progname,}// + +% Used by DMP (ditroff-to-mpx), called by makempx -troff. +TRFONTS = /usr{/local,}/share/groff/{current/font,site-font}/devps +MPSUPPORT = .;$TEXMF/metapost/support + +% For xdvi to find mime.types and .mailcap, if they do not exist in +% ~. These are single directories, not paths. +% (But the default mime.types, at least, may well suffice.) +MIMELIBDIR = /etc +MAILCAPLIBDIR = /etc + +% Default settings for the fontconfig library as used by the Windows +% versions of xetex/xdvipdfmx. Not used by xetex on Unixish systems. +% ConTeXT MkIV (all platforms) also use these values. +% +FONTCONFIG_FILE = fonts.conf +FONTCONFIG_PATH = $TEXMFSYSVAR/fonts/conf +FC_CACHEDIR = $TEXMFSYSVAR/fonts/cache + +% TeX documentation and source files, for use with texdoc and kpsewhich. +TEXDOCS = $TEXMF/doc// +TEXSOURCES = .;$TEXMF/source// + +% Web and CWeb input paths. +WEBINPUTS = .;$TEXMF/web// +CWEBINPUTS = .;$TEXMF/cweb// + +% Omega-related fonts and other files. +OFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ofm,tfm}// +OPLFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/opl// +OVFFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ovf,vf}// +OVPFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/ovp// +OTPINPUTS = .;$TEXMF/omega/otp// +OCPINPUTS = .;$TEXMF/omega/ocp// + +% Some additional input variables for several programs. If you add +% a program that uses the `other text files' or `other binary files' +% search formats, you'll want to add their variables here as well. +T4HTINPUTS = .;$TEXMF/tex4ht// + +%% t4ht utility, sharing files with TeX4ht +TEX4HTFONTSET=alias,iso8859,unicode +TEX4HTINPUTS = .;$TEXMF/tex4ht/base//;$TEXMF/tex4ht/ht-fonts/{$TEX4HTFONTSET}// + +% TeXworks editor configuration and settings +TW_LIBPATH = $TEXMFCONFIG/texworks +TW_INIPATH = $TW_LIBPATH + +% For security, do not look in . for dvipdfmx.cfg, since the D option +% would allow command execution. +DVIPDFMXINPUTS = $TEXMF/dvipdfmx + +% Lua needs to look in TEXINPUTS for lua scripts distributed with packages. +% +% But we can't simply use $TEXINPUTS, since then if TEXINPUTS is set in +% the environment with a colon, say, TEXINPUTS=/some/dir:, the intended +% default expansion of TEXINPUTS will not happen and .lua files under +% the /tex/ will not be found. +% +% So, duplicate the TEXINPUTS.*lualatex values as LUAINPUTS.*lualatex. +% The default LUAINPUTS suffices for luatex and dviluatex. +% +LUAINPUTS.lualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +LUAINPUTS.dvilualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{luatex,plain,generic,}// + +% Lua needs to look for binary lua libraries distributed with packages. +CLUAINPUTS = .;$SELFAUTOLOC/lib/{$progname,$engine,}/lua// + +% Architecture independent executables. +TEXMFSCRIPTS = $TEXMF/scripts/{$progname,$engine,}// + +% Other languages. +JAVAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/java// +PERLINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/perl// +PYTHONINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/python// +RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// + + +%% The mktex* scripts rely on KPSE_DOT. Do not set it in the environment. +% KPSE_DOT = . + +% This definition isn't used from this .cnf file itself (that would be +% paradoxical), but the compile-time default in paths.h is built from it. +% The SELFAUTO* variables are set automatically from the location of +% argv[0], in kpse_set_program_name. +% +% This main texmf.cnf file is installed, for a release YYYY, in a +% directory such as /usr/local/texlive/YYYY/texmf-dist/web2c/texmf.cnf. +% Since this file is subject to future updates, the TeX Live installer +% or human administrator may also create a file +% /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file +% will take precedence over the distributed one. +% +% For security reasons, it is best not to include . in this path. +% +% The idea behind this lengthy definition: for each of +% SELFAUTO{LOC,DIR,PARENT}, look in the directory, +% then the subdirectories share/texmf-local, share/texmf-dist, share/texmf, +% then the subdirectories ./texmf-local, texmf-dist, ./texmf. +% At any given installation, most of these directories will not exist, +% but they all turn out to be useful somewhere. +% +% Special addition -- we want to include one more directory: the +% great-grandparent's texmf-local, because that is how TL is installed +% by default. That is, given a binary +% /usr/local/texlive/YYYY/bin/PLATFORM/kpsewhich, it should find +% /usr/local/texlive/texmf-local/web2c/texmf.cnf. I.e., not under YYYY. +% +% As a result, we cannot use actual brace expansion in the definition, +% since we don't want to scatter ../'s throughout the value. Hence we +% explicitly list every directory. Arguably more understandable anyway. +% +TEXMFCNF = {\ +$SELFAUTOLOC,\ +$SELFAUTOLOC/share/texmf-local/web2c,\ +$SELFAUTOLOC/share/texmf-dist/web2c,\ +$SELFAUTOLOC/share/texmf/web2c,\ +$SELFAUTOLOC/texmf-local/web2c,\ +$SELFAUTOLOC/texmf-dist/web2c,\ +$SELFAUTOLOC/texmf/web2c,\ +\ +$SELFAUTODIR,\ +$SELFAUTODIR/share/texmf-local/web2c,\ +$SELFAUTODIR/share/texmf-dist/web2c,\ +$SELFAUTODIR/share/texmf/web2c,\ +$SELFAUTODIR/texmf-local/web2c,\ +$SELFAUTODIR/texmf-dist/web2c,\ +$SELFAUTODIR/texmf/web2c,\ +\ +$SELFAUTOPARENT/../texmf-local/web2c,\ +$SELFAUTOPARENT,\ +\ +$SELFAUTOPARENT/share/texmf-local/web2c,\ +$SELFAUTOPARENT/share/texmf-dist/web2c,\ +$SELFAUTOPARENT/share/texmf/web2c,\ +$SELFAUTOPARENT/texmf-local/web2c,\ +$SELFAUTOPARENT/texmf-dist/web2c,\ +$SELFAUTOPARENT/texmf/web2c\ +} +% +% For reference, here is the old brace-using definition: +%TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c} + +% kpathsea 3.5.3 and later sets these at runtime. To avoid empty +% expansions from binaries linked against an earlier version of the +% library, we set $progname and $engine to something non-empty: +progname = unsetprogname +engine = unsetengine + + +% Part 2: Options. + +% If this option is set to true, `tex a.b' will look first for a.b.tex +% (within each path element), and then for a.b, i.e., we try standard +% extensions first. If this is false, we first look for a.b and then +% a.b.tex, i.e., we try the name as-is first. +% +% Both names are always tried; the difference is the order in which they +% are tried. The setting applies to all searches, not just .tex. +% +% This setting only affects names being looked up which *already* have +% an extension. A name without an extension (e.g., `tex story') will +% always have an extension added first. +% +% The default is true, because we already avoid adding the standard +% extension(s) in the usual cases. E.g., babel.sty will only look for +% babel.sty, not babel.sty.tex, regardless of this setting. +try_std_extension_first = t + +% Enable system commands via \write18{...}. When enabled fully (set to +% t), obviously insecure. When enabled partially (set to p), only the +% commands listed in shell_escape_commands are allowed. Although this +% is not fully secure either, it is much better, and so useful that we +% enable it for everything but bare tex. +shell_escape = p + +% No spaces in this command list. +% +% The programs listed here are as safe as any we know: they either do +% not write any output files, respect openout_any, or have hard-coded +% restrictions similar or higher to openout_any=p. They also have no +% features to invoke arbitrary other programs, and no known exploitable +% bugs. All to the best of our knowledge. They also have practical use +% for being called from TeX. +% +shell_escape_commands = \ +bibtex,bibtex8,\ +kpsewhich,\ +makeindex,\ +mpost,\ +repstopdf,\ + +% we'd like to allow: +% dvips - but external commands can be executed, need at least -R1. +% epspdf, ps2pdf, pstopdf - need to respect openout_any, +% and gs -dSAFER must be used and check for shell injection with filenames. +% (img)convert (ImageMagick) - delegates.mgk possible misconfig, besides, +% without Unix convert it hardly seems worth it, and Windows convert +% is something completely different that destroys filesystems, so skip. +% pygmentize - but is the filter feature insecure? +% ps4pdf - but it calls an unrestricted latex. +% rpdfcrop - maybe ok, but let's get experience with repstopdf first. +% texindy,xindy - but is the module feature insecure? +% ulqda - but requires optional SHA1.pm, so why bother. +% tex, latex, etc. - need to forbid --shell-escape, and inherit openout_any. + +% plain TeX should remain unenhanced. +shell_escape.tex = f +shell_escape.initex = f + +% This is used by the Windows script wrapper for restricting searching +% for the purportedly safe shell_escape_commands above to system +% directories. +TEXMF_RESTRICTED_SCRIPTS = \ + {!!$TEXMFLOCAL,!!$TEXMFDIST}/scripts/{$progname,$engine,}// + +% Allow TeX \openin, \openout, or \input on filenames starting with `.' +% (e.g., .rhosts) or outside the current tree (e.g., /etc/passwd)? +% a (any) : any file can be opened. +% r (restricted) : disallow opening "dotfiles". +% p (paranoid) : as `r' and disallow going to parent directories, and +% restrict absolute paths to be under $TEXMFOUTPUT. +openout_any = p +openin_any = a + +% Write .log/.dvi/etc. files here, if the current directory is unwritable. +%TEXMFOUTPUT = /tmp + +% If a dynamic file creation fails, log the command to this file, in +% either the current directory or TEXMFOUTPUT. Set to the +% empty string or 0 to avoid logging. +MISSFONT_LOG = missfont.log + +% Set to a colon-separated list of words specifying warnings to suppress. +% To suppress everything, use TEX_HUSH = all; this is currently equivalent to +% TEX_HUSH = checksum:lostchar:readable:special +% To suppress nothing, use TEX_HUSH = none or do not set the variable at all. +TEX_HUSH = none + +% Allow TeX, and MF to parse the first line of an input file for +% the %&format construct. +parse_first_line = t + +% But don't parse the first line if invoked as "tex", since we want that +% to remain Knuth-compatible. The src_specials and +% file_line_error_style settings, as well as the options -enctex, +% -mltex, -8bit, etc., also affect this, but they are all off by default. +parse_first_line.tex = f +parse_first_line.initex = f + +% Control file:line:error style messages. +file_line_error_style = f + +% Enable the mktex... scripts by default? These must be set to 0 or 1. +% Particular programs can and do override these settings, for example +% dvips's -M option. Your first chance to specify whether the scripts +% are invoked by default is at configure time. +% +% These values are ignored if the script names are changed; e.g., if you +% set DVIPSMAKEPK to `foo', what counts is the value of the environment +% variable/config value `FOO', not the `MKTEXPK' value. +% +%MKTEXTEX = 0 +%MKTEXPK = 0 +%MKTEXMF = 0 +%MKTEXTFM = 0 +%MKTEXFMT = 0 +%MKOCP = 0 +%MKOFM = 0 + +% Used by makempx to run TeX. We use "etex" because MetaPost is +% expecting DVI, and not "tex" because we want first line parsing. +TEX = etex + +% These variables specify the external program called for the +% interactive `e' option. %d is replaced by the line number and %s by +% the current filename. The default is specified at compile-time, and +% we let that stay in place since different platforms like different values. +%TEXEDIT = vi +%d '%s' % default for Unix +%TEXEDIT = texworks --position=+%d "%s" % default for Windows +%MFEDIT = ${TEXEDIT} +%MPEDIT = ${TEXEDIT} + +% The default `codepage and sort order' file for BibTeX8, when none is +% given as command line option or environment variable. +BIBTEX_CSFILE = 88591lat.csf + +% This variable is specific to Windows. It must be set to 0 or 1. The +% default is 0. Setting it to 1 tells the Windows script wrappers to +% use an already installed Perl interpreter if one is found on the +% search path, in preference to the Perl shipped with TeX Live. Thus, +% it may be useful if you both (a) installed a full Perl distribution +% for general use, and (b) need to run Perl programs from TL that use +% additional modules we don't provide. The TL Perl does provide all the +% standard Perl modules. +% +%TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL = 0 + + +% Part 3: Array and other sizes for TeX (and Metafont). +% +% If you want to change some of these sizes only for a certain TeX +% variant, the usual dot notation works, e.g., +% main_memory.hugetex = 20000000 +% +% If a change here appears to be ignored, try redumping the format file. + +% Memory. Must be less than 8,000,000 total. +% +% main_memory is relevant only to initex, extra_mem_* only to non-ini. +% Thus, have to redump the .fmt file after changing main_memory; to add +% to existing fmt files, increase extra_mem_*. (To get an idea of how +% much, try \tracingstats=2 in your TeX source file; +% web2c/tests/memtest.tex might also be interesting.) +% +% To increase space for boxes (as might be needed by, e.g., PiCTeX), +% increase extra_mem_bot. +% +% For some xy-pic samples, you may need as much as 700000 words of memory. +% For the vast majority of documents, 60000 or less will do. +% +main_memory = 5000000 % words of inimemory available; also applies to inimf&mp +extra_mem_top = 0 % extra high memory for chars, tokens, etc. +extra_mem_bot = 0 % extra low memory for boxes, glue, breakpoints, etc. + +% ConTeXt needs lots of memory. +extra_mem_top.context = 2000000 +extra_mem_bot.context = 4000000 + +% Words of font info for TeX (total size of all TFM files, approximately). +% Must be >= 20000 and <= 147483647 (without tex.ch changes). +font_mem_size = 8000000 + +% Total number of fonts. Must be >= 50 and <= 9000 (without tex.ch changes). +font_max = 9000 + +% Extra space for the hash table of control sequences. +hash_extra = 600000 + +% Max number of characters in all strings, including all error messages, +% help texts, font names, control sequences. These values apply to TeX. +pool_size = 6250000 +% Minimum pool space after TeX's own strings; must be at least +% 25000 less than pool_size, but doesn't need to be nearly that large. +string_vacancies = 90000 +% Maximum number of strings. +max_strings = 500000 +% min pool space left after loading .fmt +pool_free = 47500 + +% Buffer size. TeX uses the buffer to contain input lines, but macro +% expansion works by writing material into the buffer and reparsing the +% line. As a consequence, certain constructs require the buffer to be +% very large, even though most documents can be handled with a small value. +buf_size = 200000 + +% Hyphenation trie. The maximum possible is 4194303 (ssup_trie_size in +% the sources), but we don't need that much. The value here suffices +% for all known free hyphenation patterns to be loaded simultaneously +% (as TeX Live does). +% +trie_size = 1000000 + +hyph_size = 8191 % prime number of hyphenation exceptions, >610, <32767. + % http://primes.utm.edu/curios/page.php/8191.html +nest_size = 500 % simultaneous semantic levels (e.g., groups) +max_in_open = 15 % simultaneous input files and error insertions, + % also applies to MetaPost +param_size = 10000 % simultaneous macro parameters, also applies to MP +save_size = 100000 % for saving values outside current group +stack_size = 5000 % simultaneous input sources + +% These are Omega-specific. +ocp_buf_size = 500000 % character buffers for ocp filters. +ocp_stack_size = 10000 % stacks for ocp computations. +ocp_list_size = 1000 % control for multiple ocps. + +% These work best if they are the same as the I/O buffer size, but it +% doesn't matter much. Must be a multiple of 8. +dvi_buf_size = 16384 % TeX +gf_buf_size = 16384 % MF + +% It's probably inadvisable to change these. At any rate, we must have: +% 45 < error_line < 255; +% 30 < half_error_line < error_line - 15; +% 60 <= max_print_line; +% These apply to TeX, Metafont, and MetaPost. +error_line = 79 +half_error_line = 50 +max_print_line = 79 + +% Metafont only. +screen_width.mf = 1664 +screen_depth.mf = 1200 + +% BibTeX only (max_strings also determines hash_size and hash_prime). +ent_str_size = 250 +glob_str_size = 20000 +max_strings.bibtex = 35307 +max_strings.bibtex8 = 35307 +max_strings.bibtexu = 35307 +max_strings.pbibtex = 35307 + +% GFtype only. +line_length.gftype = 500 +max_rows.gftype = 8191 +max_cols.gftype = 8191 diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD index cc6dd7509..024cf8e65 100644 --- a/libre/texlive-fontsextra-libre/PKGBUILD +++ b/libre/texlive-fontsextra-libre/PKGBUILD @@ -4,8 +4,8 @@ pkgname=texlive-fontsextra-libre _pkgname=texlive-fontsextra -pkgver=2012.29646 -_revnr=${pkgver#2012.} +pkgver=2013.30955 +_revnr=${pkgver#2013.} pkgrel=1 pkgdesc="TeX Live - all sorts of extra fonts, without nonfree add-on packages" license=('GPL') @@ -16,12 +16,12 @@ replaces=('texlive-fontsextra') conflicts=('texlive-fontsextra') provides=('texlive-fontsextra') url='http://tug.org/texlive/' -source=("ftp://mirrors.kernel.org/archlinux/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps") +source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps") options=('!emptydirs') options=(!strip) install=texlive.install -md5sums=('25d99fb9897513ceb2ae19f078ad750c' - 'c57e28ee1d2481b7e14685c70d8e6a51') +md5sums=('9e10d4fb01d87179bfd8e184e1be9dd7' + '2135455716c1e7356ce6a9c213827904') build() { cd "$srcdir" @@ -55,9 +55,4 @@ package() { if [[ -d $pkgdir/usr/share/texmf-dist/scripts ]]; then find $pkgdir/usr/share/texmf-dist/scripts -type f -exec chmod a+x '{}' \; fi - - # remove stuff depending on omega/aleph - rm -rf $pkgdir/usr/share/texmf-dist/omega - find $pkgdir/ -wholename '*ocherokee*' -delete - find $pkgdir/ -wholename '*oinuit*' -delete } diff --git a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps index e76444d08..067ebb982 100644 --- a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps +++ b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps @@ -18,10 +18,12 @@ Map Kinigcap.map Map Konanur.map Map Kramer.map Map LibreBaskerville.map +Map LibreCaslon.map Map MnSymbol.map Map MorrisIn.map Map Nouveaud.map Map OrnementsADF.map +Map Raleway.map Map Romantik.map Map Rothdn.map Map RoyalIn.map @@ -77,6 +79,7 @@ Map gfssolomos.map Map gptimes.map Map hacm.map Map icelandic.map +Map ipaex-type1.map Map iwona.map Map kpfonts.map Map kurier.map @@ -101,6 +104,7 @@ Map quattrocento.map Map recycle.map Map rsfso.map Map sansmathaccent.map +Map sansmathfonts.map Map sqrcaps.map Map starfont.map Map superiors.map diff --git a/libre/texlive-fontsextra-libre/texlive.install b/libre/texlive-fontsextra-libre/texlive.install index 6f81bd4ba..bfd2222a0 100644 --- a/libre/texlive-fontsextra-libre/texlive.install +++ b/libre/texlive-fontsextra-libre/texlive.install @@ -11,7 +11,7 @@ post_install() { cp "$UPDMAP" "$TMPFILE" echo ">>> texlive: regenerating updmap.cfg (custom additions should go" echo " into /etc/texmf/web2c/updmap-local.cfg" - cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP + cp usr/share/texmf-dist/web2c/updmap-hdr.cfg $UPDMAP cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP [ -f "$UPDMAPLOCAL" ] && cat "$UPDMAPLOCAL" >> $UPDMAP echo ">>> texlive: updating the filename database..." @@ -27,7 +27,7 @@ post_upgrade() { cp "$UPDMAP" "$TMPFILE" echo ">>> texlive: regenerating updmap.cfg (custom additions should go" echo " into /etc/texmf/web2c/updmap-local.cfg" - cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP + cp usr/share/texmf-dist/web2c/updmap-hdr.cfg $UPDMAP cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP [ -f "$UPDMAPLOCAL" ] && cat "$UPDMAPLOCAL" >> $UPDMAP echo ">>> texlive: updating the filename database..." diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD index 184adb743..4d26a0884 100644 --- a/libre/texlive-latexextra-libre/PKGBUILD +++ b/libre/texlive-latexextra-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183221 2013-04-18 23:52:31Z remy $ +# $Id: PKGBUILD 189264 2013-07-01 21:36:52Z remy $ # Maintainer: Firmicus <firmicus āt gmx dōt net> # Maintainer: Rémy Oudompheng <remy@archlinux.org> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> @@ -6,8 +6,8 @@ pkgname=texlive-latexextra-libre _pkgname=texlive-latexextra -pkgver=2012.29701 -_revnr=${pkgver#2012.} +pkgver=2013.30964 +_revnr=${pkgver#2013.} pkgrel=1 pkgdesc="TeX Live - Large collection of add-on packages for LaTeX, without nonfree add-on packages" license=('GPL') @@ -15,18 +15,18 @@ arch=(any) depends=('texlive-core') optdepends=( 'texlive-pictures: to use the package overpic' - 'openjdk6: for use by ppower4' + 'jdk7-openjdk: for use by ppower4' ) provides=('texlive-latexextra') replaces=('texlive-latexextra') conflicts=('texlive-latexextra') groups=('texlive-most') url='http://tug.org/texlive/' -source=("ftp://mirrors.kernel.org/archlinux/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps") +source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps") options=('!emptydirs') options=(!strip) install=texlive.install -md5sums=('1b67842cdc5debc80730fced7ce369ce' +md5sums=('64386dfe9fc40f2d4edc7c653d716bdf' '9e4825f47dac663dd62c4bfa67899e84') build() { @@ -64,19 +64,11 @@ package() { ln -s /usr/share/texmf-dist/scripts/exceltex/exceltex "$pkgdir"/usr/bin/exceltex ln -s /usr/share/texmf-dist/scripts/glossaries/makeglossaries "$pkgdir"/usr/bin/makeglossaries ln -s /usr/share/texmf-dist/scripts/pax/pdfannotextractor.pl "$pkgdir"/usr/bin/pdfannotextractor - ln -s /usr/share/texmf-dist/scripts/perltex/perltex.pl "$pkgdir"/usr/bin/perltex + ln -s /usr/share/texmf-dist/scripts/perltex/perltex.pl "$pkgdir"/usr/bin/perltex ln -s /usr/share/texmf-dist/scripts/pst-pdf/ps4pdf "$pkgdir"/usr/bin/ps4pdf - ln -s /usr/share/texmf-dist/scripts/splitindex/perl/splitindex.pl "$pkgdir"/usr/bin/splitindex + ln -s /usr/share/texmf-dist/scripts/splitindex/splitindex.pl "$pkgdir"/usr/bin/splitindex ln -s /usr/share/texmf-dist/scripts/svn-multi/svn-multi.pl "$pkgdir"/usr/bin/svn-multi ln -s /usr/share/texmf-dist/scripts/vpe/vpe.pl "$pkgdir"/usr/bin/vpe - # but ppower4 was a symlink to ppower4.tlu, which was broken, but this is far better: - ( - cat <<"END" -#!/bin/bash -java -jar /usr/share/texmf-dist/scripts/ppower4/pp4p.jar $@ -END - ) > /tmp/ppower4 - install -m755 /tmp/ppower4 "$pkgdir"/usr/bin/ rm "$pkgdir"/usr/share/texmf-dist/scripts/glossaries/makeglossaries.bat rm "$pkgdir"/usr/share/texmf-dist/scripts/pst-pdf/ps4pdf.bat* rm "$pkgdir"/usr/share/texmf-dist/scripts/shipunov/biokey2html.bat diff --git a/libre/texlive-latexextra-libre/texlive.install b/libre/texlive-latexextra-libre/texlive.install index 3416a2732..befc29143 100644 --- a/libre/texlive-latexextra-libre/texlive.install +++ b/libre/texlive-latexextra-libre/texlive.install @@ -11,7 +11,7 @@ post_install() { cp "$UPDMAP" "$TMPFILE" echo ">>> texlive: regenerating updmap.cfg (custom additions should go" echo " into /etc/texmf/web2c/updmap-local.cfg" - cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP + cp usr/share/texmf-dist/web2c/updmap-hdr.cfg $UPDMAP cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP [ -f "$UPDMAPLOCAL" ] && cat "$UPDMAPLOCAL" >> $UPDMAP echo ">>> texlive: updating the filename database..." @@ -27,7 +27,7 @@ post_upgrade() { cp "$UPDMAP" "$TMPFILE" echo ">>> texlive: regenerating updmap.cfg (custom additions should go" echo " into /etc/texmf/web2c/updmap-local.cfg" - cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP + cp usr/share/texmf-dist/web2c/updmap-hdr.cfg $UPDMAP cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP [ -f "$UPDMAPLOCAL" ] && cat "$UPDMAPLOCAL" >> $UPDMAP echo ">>> texlive: updating the filename database..." diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD index 4bf584f15..cb48c5d90 100644 --- a/libre/xbmc-libre/PKGBUILD +++ b/libre/xbmc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92439 2013-06-05 11:42:01Z spupykin $ +# $Id: PKGBUILD 94534 2013-07-26 12:25:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> @@ -10,7 +10,7 @@ _prefix=/usr _pkgname=xbmc pkgname=xbmc-libre pkgver=12.2 -pkgrel=4.1 +pkgrel=5 pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation" arch=('i686' 'x86_64') url="http://xbmc.org" diff --git a/pcr/blender-addon-ogre/PKGBUILD b/pcr/blender-addon-ogre/PKGBUILD index 77ae390f6..4baf8ca39 100644 --- a/pcr/blender-addon-ogre/PKGBUILD +++ b/pcr/blender-addon-ogre/PKGBUILD @@ -2,23 +2,28 @@ _bldname=blender _bldver=2.68 -_bldep=10 +_bldep=9 _pkgname=ogre pkgname=$_bldname-addon-$_pkgname pkgver=0.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="${_bldname}2$_pkgname: A addon for the ${_bldname^} which allows export to ${_pkgname^}3D formats (scene/mesh/material/skeleton) (built for the $_bldname-libre package)" arch=any url=https://code.google.com/p/${_bldname}2$_pkgname license=LGPL2.1 depends=( - "$_bldname-libre>=$(($_bldep-1)):$_bldver" - "$_bldname-libre<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))" + "$_bldname-libre>=$_bldep:$_bldver" + "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))" ) source=https://${_bldname}2$_pkgname.googlecode.com/files/${_bldname}2$_pkgname-$pkgver.zip sha512sums=15609a6dc3f5901ec59193acb6944017cc426fa12ce658715006ba781b6c39a09f38a64c858b28f7e662dff50eccf06ec6ef6efc22e0d2876c6c77fb18c04712 +prepare() { + msg 'renaming wrong OS name' + sed -i 's|Linux|GNU/Linux|' io_export_${_pkgname}DotScene.py +} + package() { cd $srcdir a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons/$_pkgname diff --git a/pcr/cpptest/PKGBUILD b/pcr/cpptest/PKGBUILD new file mode 100644 index 000000000..df08feb00 --- /dev/null +++ b/pcr/cpptest/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> +# Contributor (aur): Juan Pablo Gonzalez Tognarelli <lord_jotape@yahoo.com.ar> +pkgname=cpptest +pkgver=1.1.2 +pkgrel=2 +pkgdesc="CppTest is a portable and powerful unit testing framework for handling automated tests in C++. with focus on usability and extendability." +url="http://cpptest.sourceforge.net/" +depends=(gcc-libs) +makedepends=(pkgconfig) +source=(http://downloads.sourceforge.net/sourceforge/cpptest/$pkgname-$pkgver.tar.gz) +md5sums=('79b9bff371d182f11a3235969f84ccb6') +arch=('i686' 'x86_64') +license="LGPL" + +build() { + cd ${srcdir}/$pkgname-$pkgver + ./configure --prefix=/usr + make || return 1 +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + make DESTDIR=${pkgdir} install +} diff --git a/pcr/culmus-latex/PKGBUILD b/pcr/culmus-latex/PKGBUILD index 251ba0518..8562f2fb5 100644 --- a/pcr/culmus-latex/PKGBUILD +++ b/pcr/culmus-latex/PKGBUILD @@ -1,5 +1,4 @@ -#Contributor (Arch): Dmitry Batenkov <dima dot batenkov at gmail dot -com> +#Contributor (Arch): Dmitry Batenkov <dima dot batenkov at gmail dot com> # Maintainer (Parabola): Alon Ivtsan <alonivtsan@lavabit.com> # taken from https://aur.archlinux.org/packages/culmus-latex/ diff --git a/pcr/kervalasquish-hg/PKGBUILD b/pcr/kervalasquish-hg/PKGBUILD deleted file mode 100644 index e5e489950..000000000 --- a/pcr/kervalasquish-hg/PKGBUILD +++ /dev/null @@ -1,72 +0,0 @@ -# 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: diff --git a/pcr/libsquish-svn/LICENSE b/pcr/libsquish-svn/LICENSE new file mode 100644 index 000000000..dd0f22eb9 --- /dev/null +++ b/pcr/libsquish-svn/LICENSE @@ -0,0 +1,24 @@ +/* ----------------------------------------------------------------------------- + + Copyright (c) 2006 Simon Brown si@sjbrown.co.uk + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + -------------------------------------------------------------------------- */ diff --git a/pcr/libsquish-svn/PKGBUILD b/pcr/libsquish-svn/PKGBUILD new file mode 100644 index 000000000..17af64a96 --- /dev/null +++ b/pcr/libsquish-svn/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> +# Contributor: F0ruD<fzerorubigd{AT}gmail{DOT}com> +pkgname=libsquish-svn +pkgver=48 +pkgrel=5 +pkgdesc="DXT compression library - svn build" +arch=('i686' 'x86_64') +url="http://code.google.com/p/libsquish" +makedepends=('subversion' ) +license=('MIT') +provides=('libsquish') +conflicts=('libsquish' 'kervalasquish-hg' 'kervala_libsquish-hg') +mksource=("$pkgname-$pkgver"::svn+http://libsquish.googlecode.com/svn/trunk/#revision=$pkgver) +mkmd5sums=('SKIP') + +source=("libre://$pkgname-$pkgver.tar.gz" + LICENSE) + +build() { + cd "$srcdir/$pkgname-$pkgver" + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + # make install + mkdir -p $pkgdir/usr/local/{include,lib} + + install -Dm 644 squish.h $pkgdir/usr/local/include/squish.h + install -Dm 644 libsquish.so.0.0 $pkgdir/usr/local/lib/libsquish.so.0.0 + install -Dm 644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +} + +sha256sums=('d1c057bf105872f50f504584fd7b31fb980ed5e235b14a92c6cb0aa7d7758e8f' + 'ed13029728a637f599833a68be22f3cc356a7f13be8d79284b2c415e172efd75') diff --git a/pcr/libwww-hg/PKGBUILD b/pcr/libwww-hg/PKGBUILD new file mode 100644 index 000000000..9fc91e231 --- /dev/null +++ b/pcr/libwww-hg/PKGBUILD @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> +# Maintainer (Archlinux): Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Buharev Vasilij <buharev.v.p@gmail.com> + +pkgname=libwww-hg +pkgver=20130730 +_changeset=facbea79943a +pkgrel=11 +pkgdesc="A general-purpose client side WEB API" +arch=('i686' 'x86_64') +url="http://hg.kervala.net/packaging/" +license=('W3C') +depends=() +conflicts=("libwww") +provides=("libwww") +makedepends=('gcc' 'pkgconfig' 'perl' 'zlib') +options=('!libtool') +source=("http://hg.kervala.net/packaging/archive/${_changeset}.tar.gz") +sha256sums=('26adbb77c4ecb3df3a074597a8dfc45b7215879fbc0447cb086199c17ae8ba8d') + + +build() { + cd "$srcdir/packaging-${_changeset}/libwww" + ./autogen.sh + ./configure --prefix=/usr/ \ + --with-ssl=no --with-zlib --with-expat --with-gnu-ld \ + --enable-shared --enable-static + #sed -i 's#Examples##' Library/Makefile + make +} + +package() { + cd "$srcdir/packaging-${_changeset}/libwww" + make DESTDIR="$pkgdir" install +} diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD index b83e7fef9..0961ef11d 100644 --- a/pcr/mitsuba/PKGBUILD +++ b/pcr/mitsuba/PKGBUILD @@ -1,24 +1,26 @@ # Maintainer: Márcio Silva <coadde@lavabit.com> _pkgname=mitsuba +_pkgver=0.4.4 +_pkgrel=4 _bldname=blender _bldver=2.68 -_bldep=10 +_bldep=9 _addname=$_pkgname-$_bldname _adddat=20130320 _addrev=40 -_addrel=2 +_addrel=3 _pyver=3.3 -# Wed Mar 20 01:30:37 2013 +0100 rev:40 ($srcdir/$_addname/${pkgname[0]}/__init__.py:bl_info>version) +# Wed Mar 20 01:30:37 2013 +0100 rev:40 ($srcdir/$_addname/$_pkgname/__init__.py:bl_info>version) _addver=0.2.1 pkgname=( $_pkgname $_bldname-addon-$_pkgname ) -pkgver=0.4.4 -pkgrel=3 +pkgver=$_pkgver +pkgrel=$_pkgrel pkgdesc='A physically based renderer' arch=( mips64el @@ -32,7 +34,7 @@ depends=( collada-dom glew libxxf86vm - openexr + openexr-libre qt4 xerces-c ) @@ -47,40 +49,43 @@ makedepends=( mercurial python ) -install=$_pkgname.install source=( - ${url}hg/$_pkgname/archive/v$pkgver.tar.bz2 - hg+${url}hg/$_addname - ${pkgname[1]}.install + $_pkgname-$pkgver.tar.bz2::${url}hg/$_pkgname/archive/v$pkgver.tar.bz2 + $_addname-$_addver.tar.bz2::${url}hg/$_addname/archive/$_addrev.tar.bz2 ) sha512sums=( 66dcab376a44eeb2fbe808a32ead5b554d777fb2f6a73c43883086b7829e0c697aaeccbb6fbbed9fcb221684a64ccce8be81a78ebcd228316ea12b8f6f3e7f6c - SKIP SKIP + c829978a28c7780605662c604450c3d00b8ac958310e26aa7ad02dfb50f1875420e0e85fe0c868e030946c894cb939d18a4589c9e06a169f86eba5948eb2147e ) prepare() { - mv $srcdir/${pkgname[1]}.install $startdir - cd $srcdir/$_pkgname-v$pkgver - [[ -d build ]] && rm -vr build - mkdir -v build + msg 'renaming wrong OS name' + _OS=$(uname -o) + [[ $_OS == GNU ]] && sed -i 's|Linux|GNU|I' src/libcore/plugin.cpp + [[ $_OS == GNU/Linux ]] && sed -i 's|Linux,|GNU/Linux-libre,|' src/libcore/plugin.cpp + sed -i 's|Linux/|Linux,| + s|Linux|GNU/Linux| + ' include/$_pkgname/core/{atomic,fstream,random,thread}.h - cd $startdir/../srcdest/$_addname + msg 'removing Open Source term' + sed -i 's|free-software/open-source|free-software| + ' include/$_pkgname/core/quad.h - msg "${pkgname[1]}" - hg update -c -r $_addrev - hg log -l 1 -r $_addrev + [[ -d build ]] && rm -vr build + mkdir -v build } build() { cd $srcdir/$_pkgname-v$pkgver/build - [[ $CARCH != x86_64 ]] && DMTS_SSE='-DMTS_SSE=OFF' + [[ $CARCH == x86_64 ]] && _SSE=ON || _SSE=OFF + # i686: MTS_SSE disabled cmake .. -DCMAKE_INSTALL_PREFIX=/usr\ - $DMTS_SSE\ -DBoost_PYTHON_LIBRARY=/usr/lib/libboost_python${_pyver::1}.so\ + -DMTS_SSE=$_SSE\ -DPYTHON_INCLUDE_DIR=/usr/include/python${_pyver}m\ -DPYTHON_LIBRARY=/usr/lib/libpython${_pyver}m.so make @@ -89,8 +94,9 @@ build() { package_mitsuba() { cd $srcdir/$_pkgname-v$pkgver/build make DESTDIR=$pkgdir install + install=$_pkgname.install - #fixing files and folders location + msg 'fixing files and folders location' a=$pkgdir/usr b=$srcdir/$_pkgname-v$pkgver install -vd $a/{bin,lib{,/python$_pyver/lib-dynload},share/{applications,{licenses/,}$_pkgname,pixmaps}} @@ -98,7 +104,7 @@ package_mitsuba() { install -vm644 $b/src/mtsgui/resources/${_pkgname}48.png $a/share/pixmaps install -vm644 $b/doc/license.txt $a/share/licenses/$_pkgname/LICENSE mv -v $a/{m{itsuba,ts{gui,import,srv,util}},bin} - mv -v $a/lib{${pkgname[0]}-{bidir,core,hw,render}.so,} + mv -v $a/lib{$pkgname-{bidir,core,hw,render}.so,} mv -v $a/{{data,plugins},share/$_pkgname} mv -v $a/{python/mitsuba.so,lib/python$_pyver/lib-dynload} mv -v $a/{sdk/include,} @@ -110,16 +116,19 @@ package_blender-addon-mitsuba() { arch=any depends=( $_pkgname=$pkgver - "$_bldname>=$(($_bldep-1)):$_bldver" - "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))" + "$_bldname-libre>=$_bldep:$_bldver" + "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))" ) _pkgver=$pkgver pkgver=$_addver.r$_addrev.v$_bldver pkgrel=$_addrel optdepends= - install=$pkgname.install - cd $srcdir/$_addname + cd $srcdir/$_addname-$_addrev + + msg 'fixing binary path' + sed -i 's|'"'default'"': efutil.find_config_value('"'mitsuba', 'defaults', 'binary_path', ''"')|'"'default'"': '"'/usr/bin'"'| + ' $_pkgname/properties/engine.py a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons b=$pkgdir/usr/share/licenses/$pkgname diff --git a/pcr/mitsuba/blender-addon-mitsuba.install b/pcr/mitsuba/blender-addon-mitsuba.install deleted file mode 100644 index 41d69870d..000000000 --- a/pcr/mitsuba/blender-addon-mitsuba.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - cat << EOF -## Please type "/usr/bin" in -## "Mitsuba Engine Settings" > "Executable path:" option -## to correct fuction. -EOF -} - -post_upgrade() { - post_install -} diff --git a/pcr/ryzom-hg-client/PKGBUILD b/pcr/ryzom-hg-client/PKGBUILD deleted file mode 100644 index 294e28024..000000000 --- a/pcr/ryzom-hg-client/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $ -# Maintainer: Jorge Araya Navarro <jorge@abril> -pkgname=ryzom-hg-client -pkgver=20130706 -pkgrel=2 -pkgdesc="An awesome free software 3D MMORPG game, Game client." -arch=('i686' 'x86_64') -url="http://www.ryzom.com/" -license=('AGPL') -groups=("ryzom-hg") -depends=('ryzom-hg-nel' 'expat') -makedepends=('cpptest' 'cmake' 'bison' 'ryzom-hg-nel') -provides=("ryzom-hg-client") -conflicts=("ryzom-hg-client") -replaces=("ryzom-hg-client") -source=("http://repo.parabolagnulinux.org/other/ryzom-$pkgver-$pkgrel-any.src.tar.gz") -sha256sums=('03ddd23d0b2e92c419dcdebe264890b5b1c906992ae93225be43869739f9f475') -mksource=("ryzom-$pkgver-${pkgrel}::hg+https://bitbucket.org/ryzomcore") -_CMAKE_COMMON_ARGS=('-DWITH_STATIC=ON' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON' '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=ON') # cmake arguments for server and client - -_CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' '-DWITH_NEL=OFF') # cmake args for building client - -build() { - mkdir -p "$srcdir/build-client" - cd "$srcdir/build-client" - cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_CLIENT_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin - - make -} - -package() { - cd "$srcdir/build-client" - make DESTDIR="$pkgdir" install - install -Dm 644 "$srcdir/ryzom.desktop" "$pkgdir/usr/share/applications/" -} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/ryzom-hg-nel/PKGBUILD b/pcr/ryzom-hg-nel/PKGBUILD deleted file mode 100644 index c66aaf567..000000000 --- a/pcr/ryzom-hg-nel/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $ -# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> -pkgname=ryzom-hg-nel -pkgver=20130706 -pkgrel=5 -pkgdesc="An awesome free software 3D MMORPG game, Game client." -arch=('i686' 'x86_64') -url="http://www.ryzom.com/" -license=('AGPL') -groups=("ryzom-hg") -depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost' 'luabind' 'libsquish' 'lua51' 'lua51-sql-mysql') -makedepends=('cpptest' 'cmake' 'bison') -provides=("ryzom-hg-nel") -conflicts=("ryzom-hg-nel") -replaces=("ryzom-hg-nel") - -source=("http://repo.parabolagnulinux.org/other/ryzom-$pkgver-2-any.src.tar.gz") -sha256sums=('03ddd23d0b2e92c419dcdebe264890b5b1c906992ae93225be43869739f9f475') - -mksource=("$pkgname-$pkgver-${pkgrel}::hg+https://bitbucket.org/ryzomcore") - -_CMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=OFF') # cmake arguments for server and client - -_CMAKE_LIB_ARGS=('-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_NEL=ON') - -build() { - mkdir -p "$srcdir/build-nel" - cd "$srcdir/build-nel" - cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_LIB_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin - - make -} - -package() { - cd "$srcdir/build-nel" - make DESTDIR="$pkgdir" install - # WWWInit.h is in /usr/include/w3c-libwww according to libwww package! - sed -ie 's/WWWInit\.h/w3c-libwww\/WWWInit.h/' ${pkgdir}/usr/include/nel/gui/group_html.h -} - -# vim:set ts=2 sw=2 et: - diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD index 8277ccf17..0951e474d 100644 --- a/pcr/ryzom-hg/PKGBUILD +++ b/pcr/ryzom-hg/PKGBUILD @@ -1,64 +1,50 @@ # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> # Maintainer (aur): Bjoern Bidar <theodorstormgrade@gmail.com> -pkgname=('ryzom-hg-nel' 'ryzom-hg-client') -pkgbase="ryzom-hg" -pkgver=20130706 -pkgrel=2 +pkgname='ryzom-hg' +_hgver=ce26956d3a4a +pkgver=20130727 +pkgrel=7 pkgdesc="An awesome free software 3D MMORPG game" arch=('i686' 'x86_64') url="http://www.ryzom.com/" license=('AGPL3') -groups=('ryzom-hg') -depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost' 'luabind' 'libsquish' 'lua51' 'lua51-sql-mysql') -makedepends=('mercurial' 'cpptest' 'cmake' 'bison') -# ryzom-20130706-2-any.src.tar.gz -source=("http://repo.parabolagnulinux.org/other/ryzom-20130706-2-any.src.tar.gz" - 'ryzom.sh' - 'ryzom.desktop') -sha256sums=('03ddd23d0b2e92c419dcdebe264890b5b1c906992ae93225be43869739f9f475' - 'd3d8286f5b60a63cbda83795cbe1a1d6e1442f33116502cc6563f8db86e458b6' - '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196') +depends=('curl' 'hicolor-icon-theme' 'libvorbis' 'libjpeg' 'libwww-hg' 'luabind' 'ryzom-data') +conflicts=('ryzom') +makedepends=('mercurial' 'cpptest' 'cmake' 'bison' 'freealut' 'rrdtool' 'boost') +source=("libre://$pkgname-$pkgver.tar.gz") -mksource=("$pkgname-$pkgver-${pkgrel}::hg+https://bitbucket.org/ryzomcore") +mksource=(".$pkgname-$pkgver::hg+https://bitbucket.org/ryzom/ryzomcore#revision=${_hgver}") -_CMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON' '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=OFF') # cmake arguments for server and client - -_CMAKE_LIB_ARGS=('-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_DRIVER_OPENGL=OFF' '-DWITH_DRIVER_OPENAL=OFF' '-DWITH_NEL=ON') - -_CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' '-DWITH_NEL=OFF') # cmake args for building client +mksource() { + rm -rf "$srcdir/$pkgname-$pkgver" + cp -a "$srcdir/.$pkgname-$pkgver/code" "${srcdir}/${pkgname}-${pkgver}" +} -package_ryzom-hg-nel() { - # options and directives that can be overridden - #pkgver=20130706 - #pkgrel=0 - pkgdesc="An awesome free software 3D MMORPG game. NeL library." - #depends=() +build() { + mkdir -p "$srcdir/build" + cd "$srcdir/build" + cmake -Wno-dev "$srcdir/${pkgname}-${pkgver}" -DFINAL_VERSION=ON -DWITH_STATIC=OFF -DWITH_NEL_TOOLS=OFF -DWITH_NEL_TESTS=OFF -DWITH_LUA51=ON -DWITH_NEL_SAMPLES=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_NEL=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin - provides=('ryzom-hg-nel') - conflicts=('ryzom-hg-nel') - replaces=('ryzom-hg-nel') - - mkdir -p "$srcdir/build-nel" - cd "$srcdir/build-nel" - - cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_LIB_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin - make - make DESTDIR="$pkgdir" install + make all } -package_ryzom-hg-client() { - # options and directives overrides - pkgdesc="An awesome free software 3D MMORPG game. Game client." - provides=('ryzom-hg-client') - conflicts=('ryzom-hg-client') - replaces=('ryzom-hg-client') - depends=('ryzom-hg-nel') - - mkdir -p "$srcdir/build-client" - cd "$srcdir/build-client" - - cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_CLIENT_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin - make +package() { + cd "$srcdir/build" make DESTDIR="$pkgdir" install + cd "$pkgdir/etc/ryzom/" + # instead of the open shard, we point to the actual ryzom shard. + # this cannot be on prepare(), I tried that already and didn't work + sed -i 's|"ryzom_open"|"ryzom_live"|g' client_default.cfg + sed -i 's|PatchServer = "";|PatchServer = "http://dl.ryzom.com/patch_live";|g' client_default.cfg + sed -i 's|SignUpURL = "";|SignUpURL = "http://www.ryzom.com/subscribe";|g' client_default.cfg + sed -i 's|"open.ryzom.com:40916";|"shard.ryzom.com:40916";|g' client_default.cfg + sed -i 's|CreateAccountURL = "";|CreateAccountURL = "https://secure.ryzom.com/signup/from_client.php";|g' client_default.cfg + sed -i 's|InstallWebPage = "";|InstallWebPage = "http://dl.ryzom.com/installer/";|g' client_default.cfg + sed -i 's|"http://open.ryzom.com:50000/stats/stats.php";|"http://shard.ryzom.com:50000/stats/stats.php";|g' client_default.cfg + sed -i 's|atys.|app.|g' client_default.cfg + sed -i 's|"app.ryzom.com" |"api.ryzom.com", "app.ryzom.com" |g' client_default.cfg } + +mksha256sums=('SKIP') +sha256sums=('a8c90f3f41fb3d497022a2d14a9aa39352557f5745f97b93d0bed61cebf85402') diff --git a/pcr/ryzom-hg/SRCBUILD b/pcr/ryzom-hg/SRCBUILD deleted file mode 100644 index a04662b0d..000000000 --- a/pcr/ryzom-hg/SRCBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> -pkgname=("ryzom-hg") -pkgver=20130708 -pkgrel=3 -pkgdesc="An awesome free software 3D MMORPG game" -arch=(any) -url="https://www.ryzom.com/" -license=('AGPL3') -makedepends=('mercurial') - -source=("ryzom.sh" - "ryzom.desktop") - -_hgroot='https://bitbucket.org/ryzom/ryzomcore' -_hgrepo='ryzomcore' - -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" -} - -package() { - PKGEXT=${SRCEXT} - PKGDEST=${SRCDEST} - cp ${srcdir}/ryzom.sh ${pkgdir}/ - cp ${srcdir}/ryzom.desktop ${pkgdir}/ - cp -a ${srcdir}/ryzomcore/code ${pkgdir}/ -} -sha256sums=('d3d8286f5b60a63cbda83795cbe1a1d6e1442f33116502cc6563f8db86e458b6' - '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196') diff --git a/pcr/ryzom-hg/ryzom.sh b/pcr/ryzom-hg/ryzom.sh deleted file mode 100644 index e3cff2c64..000000000 --- a/pcr/ryzom-hg/ryzom.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -if groups | grep games > /dev/null 2>&1 ; then - ryzom_sync - exec ryzom_client - -else - echo "you need to be in games group to run ryzom" - exit 1 -fi diff --git a/pcr/setbfree/PKGBUILD b/pcr/setbfree/PKGBUILD index 1b30f06c2..c17511f47 100644 --- a/pcr/setbfree/PKGBUILD +++ b/pcr/setbfree/PKGBUILD @@ -1,10 +1,9 @@ -# Maintainer: Guest One <theguestone at gmail dot com> pkgname=setbfree -pkgver=0.7.2 +pkgver=0.7.3 pkgrel=1 pkgdesc="A DSP Tonewheel Organ emulator." -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://setbfree.org/" license=('GPL') depends=('jack' 'liblo' 'tk' 'desktop-file-utils') @@ -12,7 +11,7 @@ makedepends=('lv2') install="$pkgname.install" source=("https://github.com/pantherb/setBfree/tarball/v$pkgver" "https://raw.github.com/pantherb/setBfree/master/debian/setbfree.desktop") -md5sums=('7b64947289687cbf71b9e87fdd006f36' +md5sums=('8b7b077dfb784927c7103948083e1f04' '8c2a863562f26856dcff0a456cf36dcf') build() { diff --git a/pcr/yafaray/PKGBUILD b/pcr/yafaray/PKGBUILD index e42a63269..458181279 100644 --- a/pcr/yafaray/PKGBUILD +++ b/pcr/yafaray/PKGBUILD @@ -1,27 +1,30 @@ # Maintainer: Márcio Silva <coadde@lavabit.com> _pkgname=yafaray +_pkgver=1.5 +_pkgrel=3 _pkgdate=20130510 _bldname=blender _bldver=2.68 -_bldep=10 +_bldep=9 _gitname=Core _addname=${_bldname^}-Exporter -_addrel=2 +_addrel=1 +_adddate=20130623 _pyver=3.3 # Fri May 10 00:57:12 2013 -0700 - Merge pull request #67 from DarkTide/master // Depth fix for hist on background _srcver=44323def5b3866ff601fd401ef2160b80ced8141 -# Fri May 10 00:24:58 2013 -0700 - Merge pull request #14 from DarkTide/master // Version bump, and some other fixes -_addver=e6688fc4f480bcb1ae7d0a6dbe65563b3d070169 +# Sun Jun 23 15:10:57 2013 +0200 - Refine AA changes for SPPM integrator +_addver=9bcb22e8b8bd9281999ad36c5b22604f671484bb pkgname=( $_pkgname $_bldname-addon-$_pkgname ) -pkgver=1.5.$_pkgdate -pkgrel=2 -pkgdesc='A libre software raytracing engine' +pkgver=$_pkgver.$_pkgdate +pkgrel=$_pkgrel +pkgdesc='A free software raytracing engine' arch=( mips64el x86_64 @@ -33,7 +36,7 @@ depends=( freetype2 libjpeg libxml2 - openexr + openexr-libre ) optdepends=( 'python: Python bindings' @@ -48,22 +51,30 @@ makedepends=( swig ) source=( - git://github.com/YafaRay/$_gitname.git - git://github.com/YafaRay/$_addname.git + $_gitname-$_srcver.tar.gz::https://github.com/YafaRay/$_gitname/archive/$_srcver.tar.gz + $_addname-$_addver.tar.gz::https://github.com/YafaRay/$_addname/archive/$_addver.tar.gz +) +sha512sums=( + 5045a3de89e0a2d029e8b6ce962eeadeb5587369217d11d42ca79706a65e6ac7b07584f68307f76c90dbaf190af9626e3351e391107a4e763fc9e41d48cfd7a6 + 59322686d0623481b38c531e2a8350cafcf8942eb08df2dfcc8f59657715aa716ca34d473f862291e8a375fccdf717d93898caa3e344cfa1a3e5e760c903d32c ) -sha512sums=(SKIP SKIP) prepare() { - cd $srcdir/$_gitname + cd $srcdir/$_gitname-$_srcver + + msg 'Renaming addon dir' + mv -v $srcdir/$_addname-$_addver $srcdir/$_pkgname - git checkout $_srcver + msg 'renaming wrong OS name' + sed -i 's|Linux|GNU/Linux| + ' $srcdir/$_pkgname/prop/yaf_scene.py [[ -d build ]] && rm -vr build mkdir -v build } build() { - cd $srcdir/$_gitname/build + cd $srcdir/$_gitname-$_srcver/build cmake .. -DCMAKE_INSTALL_PREFIX=/usr\ -DYAF_PY_VERSION=$_pyver\ -DYAF_BINDINGS_PY_DIR=/usr/lib/python$_pyver @@ -71,7 +82,7 @@ build() { } package_yafaray() { - cd $srcdir/$_gitname/build + cd $srcdir/$_gitname-$_srcver/build make DESTDIR=$pkgdir install } @@ -80,22 +91,19 @@ package_blender-addon-yafaray() { arch=any depends=( $_pkgname=$pkgver - "$_bldname>=$(($_bldep-1)):$_bldver" - "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))" + "$_bldname-libre>=$_bldep:$_bldver" + "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))" ) - pkgver=$pkgver.v$_bldver + pkgver=$_pkgver.$_adddate.v$_bldver pkgrel=$_addrel optdepends= - cd $srcdir/$_addname + cd $srcdir a=/usr/lib b=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons/$_pkgname/bin - git checkout $_addver - git checkout-index -a -f --prefix=${b%bin} - - install -vd $b + install -vd $b && cp -a $_pkgname ${b%$_pkgname/bin} ln -vsf $a/lib${_pkgname}core.so $b/lib${_pkgname}core.so ln -vsf $a/lib${_pkgname}plugin.so $b/lib${_pkgname}plugin.so ln -vsf $a/$_pkgname $b/plugins diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index a2d174304..311e554e7 100644 --- a/pcr/youtube-dl-current/PKGBUILD +++ b/pcr/youtube-dl-current/PKGBUILD @@ -5,7 +5,7 @@ pkgname=youtube-dl-current _pkgname=youtube-dl provides=(youtube-dl) -pkgver=2013.07.25.2 +pkgver=2013.08.02 pkgrel=1 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" arch=('any') @@ -14,7 +14,7 @@ license=('custom') depends=('python') makedepends=('python-distribute') source=(http://youtube-dl.org/downloads/${pkgver}/${_pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('db09e5672c674ccadd3c9afed77189d9' +md5sums=('772d2bbf3e9bcfc3da05d956cf6d8705' 'SKIP') prepare() { |
