summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShackra Sislock <jorgean@lavabit.com>2013-07-31 16:32:26 -0600
committerShackra Sislock <jorgean@lavabit.com>2013-07-31 16:32:26 -0600
commit50017ad52a6917b73775b247b385c9e1a7944da0 (patch)
treed3c81e80a2295cd5bddd0dcb7a22d45ea59f5054
parentf1c75e619a9cf7e22ef4aab5c42084cffa189c99 (diff)
parentb741202e552a48b21066f20413b8e2c49f062859 (diff)
downloadabslibre-50017ad52a6917b73775b247b385c9e1a7944da0.tar.gz
abslibre-50017ad52a6917b73775b247b385c9e1a7944da0.tar.bz2
abslibre-50017ad52a6917b73775b247b385c9e1a7944da0.zip
merging my branches
-rw-r--r--libre-testing/syslinux/PKGBUILD11
-rw-r--r--libre-testing/syslinux/splash.pngbin11984 -> 11947 bytes
-rw-r--r--libre-testing/syslinux/splash.xcfbin0 -> 30757 bytes
-rw-r--r--libre-testing/syslinux/syslinux-install_update108
-rw-r--r--libre-testing/syslinux/syslinux.cfg22
-rw-r--r--libre/calibre-libre/PKGBUILD6
-rw-r--r--libre/grub/PKGBUILD22
-rw-r--r--libre/grub/grub-2.00-mkinitcpio-0.15.patch11
-rw-r--r--libre/hplip-libre/PKGBUILD6
-rw-r--r--libre/liferea-libre/PKGBUILD17
-rw-r--r--libre/parabola-keyring/PKGBUILD2
-rw-r--r--libre/stuntrally-data-libre/PKGBUILD51
-rw-r--r--libre/stuntrally-data-libre/libre.patch72
-rw-r--r--libre/syslinux/PKGBUILD10
-rw-r--r--libre/syslinux/splash.pngbin11984 -> 11947 bytes
-rw-r--r--libre/syslinux/splash.xcfbin0 -> 30757 bytes
-rw-r--r--libre/syslinux/syslinux.cfg22
-rw-r--r--pcr/youtube-dl-current/PKGBUILD4
18 files changed, 245 insertions, 119 deletions
diff --git a/libre-testing/syslinux/PKGBUILD b/libre-testing/syslinux/PKGBUILD
index cdc3483d5..6e2264257 100644
--- a/libre-testing/syslinux/PKGBUILD
+++ b/libre-testing/syslinux/PKGBUILD
@@ -5,7 +5,7 @@
pkgname="syslinux"
pkgver="6.01"
-pkgrel="2"
+pkgrel="4"
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'
+ '2466fa3fe8c2577acb2a7025d7096c91'
+ '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
index f94067681..eac14536b 100644
--- a/libre-testing/syslinux/splash.png
+++ b/libre-testing/syslinux/splash.png
Binary files differ
diff --git a/libre-testing/syslinux/splash.xcf b/libre-testing/syslinux/splash.xcf
new file mode 100644
index 000000000..c27d04445
--- /dev/null
+++ b/libre-testing/syslinux/splash.xcf
Binary files differ
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..f88c1a5fe 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 #ff777caa #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/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/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/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/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/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..4967097b1 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
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'
+ '83649111686c4c58ec05eac324ae711a'
'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
index f94067681..eac14536b 100644
--- a/libre/syslinux/splash.png
+++ b/libre/syslinux/splash.png
Binary files differ
diff --git a/libre/syslinux/splash.xcf b/libre/syslinux/splash.xcf
new file mode 100644
index 000000000..c27d04445
--- /dev/null
+++ b/libre/syslinux/splash.xcf
Binary files differ
diff --git a/libre/syslinux/syslinux.cfg b/libre/syslinux/syslinux.cfg
index cb5afb371..4a0644956 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 #ff777caa #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/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index a2d174304..64778701a 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.07.31
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=('879407fed53888aae97a0eda26e693e6'
'SKIP')
prepare() {