Subversion Repositories pub

Compare Revisions

No changes between revisions

Ignore whitespace Rev 569 → Rev 570

/video-contact-sheet/trunk/dist/AUTHORS
1,5 → 1,9
Copyright 2007-2013 Toni Corvera
Copyright 2007-2014 Toni Corvera
 
Patches by Eris Belew (2014):
- Fixes for PKGBUILD for newer Arch systems
- Fix for potentially problematic unwrapped grep pattern
 
Patches by Phil Grundig (2008):
- Support for array/string operations on bash 2.05b
[no longer part of the script]
/video-contact-sheet/trunk/dist/CHANGELOG
1,3 → 1,9
1.13.1 (2014-02-25):
* BUGFIX: Fixed uncommon bug with unwrapped grep string [#217]
Submitted by Eris Belew
* OTHER: Adapt PKGBUILD to new guidelines [#219]
Submitted by Eris Belew
 
1.13 (2013-03-08):
* Complete manual pages
* Added 'anonymous' to the list of settings
/video-contact-sheet/trunk/dist/vcs
5,7 → 5,7
# vcs
# Video Contact Sheet *NIX: Generates contact sheets (previews) of videos
#
# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Toni Corvera
# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Toni Corvera
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
19,7 → 19,7
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# Author: Toni Corvera <outlyer@gmail.com>
#
29,9 → 29,9
# The full changelog can be found at <http://p.outlyer.net/vcs/files/CHANGELOG>
 
 
declare -r VERSION="1.13"
declare -r VERSION="1.13.1"
declare -r RELEASE=1
declare -ri PRERELEASE=2
declare -ri PRERELEASE=1
[ "$RELEASE" -eq 1 ] || declare -r SUBVERSION="-pre.${PRERELEASE}"
 
set -e
1920,11 → 1920,11
# Note to self: Don't change the -vc as it would affect $vdec
if [[ $DVD_MODE -eq 0 ]]; then
MPLAYER_CACHE=$("$MPLAYER_BIN" -benchmark -ao null -vo null -identify -frames 0 \
-quiet "$f" 2>"$STDERR" | grep ^ID)
-quiet "$f" 2>"$STDERR" | grep '^ID')
else
MPLAYER_CACHE=$("$MPLAYER_BIN" -benchmark -ao null -vo null -identify -frames 0 \
-quiet -dvd-device "$f" dvd://$DVD_TITLE \
2>"$STDERR" | grep ^ID)
2>"$STDERR" | grep '^ID')
fi
# Note the head -1!
mi[$VCODEC]=$(grep ID_VIDEO_FORMAT <<<"$MPLAYER_CACHE" | head -1 | cut -d'=' -f2) # FourCC
4270,7 → 4270,7
# Prints the program identification to stderr
show_vcs_info() { # Won't be printed in quiet modes
# Don't colourise this
infplain "Video Contact Sheet *NIX v${VERSION}${SUBVERSION}, (c) 2007-2013 Toni Corvera"
infplain "Video Contact Sheet *NIX v${VERSION}${SUBVERSION}, (c) 2007-2014 Toni Corvera"
}
 
# Prints the list of options to stdout
/video-contact-sheet/trunk/dist/arch/PKGBUILD.in
1,14 → 1,13
#
# $Rev$
#
# Maintainer (Upstream): Toni Corvera <outlyer@gmail.com>
#
# Build with '$ makepkg' on the same directory as this file
#
 
# Maintainer: Toni Corvera (Upstream) <outlyer@gmail.com>
pkgname=vcs
pkgver=@VERSION@
pkgrel=1.upstream
pkgrel=1
pkgdesc="tool to create contact sheets (previews) from videos"
arch=('any')
url="http://p.outlyer.net/vcs/"
25,9 → 24,13
# Debian & Arch didn't agree on this on my first try (???)
sha256sums=(@SHA256@)
 
build() {
prepare() {
cd $srcdir/$pkgname-$pkgver
make prepackage
}
 
package() {
cd $srcdir/$pkgname-$pkgver
make install DESTDIR=${pkgdir} prefix=/usr
install -D $srcdir/$pkgname-$pkgver/examples/vcs.conf.example \
${pkgdir}/usr/share/doc/$pkgname/vcs.conf.example
/video-contact-sheet/trunk/.
Property changes:
Modified: svn:mergeinfo
Merged /video-contact-sheet/branches/1.13.1:r567-569