summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2017-12-09 21:25:57 +0100
committerMartchus2017-12-09 21:25:57 +0100
commitf4e5c5e172406e6bb317d6186cac5d563a4368df (patch)
treedc18ca04ddf09c940ece937e520c0e6559ccb26e
parent2a5c6508b1d1333ab6d4d91f806e91fdd3e260f6 (diff)
downloadaur-f4e5c5e172406e6bb317d6186cac5d563a4368df.tar.gz
Update to 4.0.0v20171209
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD19
-rwxr-xr-xupdate.sh9
3 files changed, 22 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 330aa730abb..c6c68c57e79 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sat Dec 2 23:35:14 UTC 2017
+# Sat Dec 9 20:25:57 UTC 2017
pkgbase = vlc-nightly
pkgdesc = Multi-platform MPEG, VCD/DVD, and DivX player - nightly snapshot
- pkgver = 4.0.0v20171130
+ pkgver = 4.0.0v20171209
pkgrel = 1
url = https://www.videolan.org/vlc/
arch = x86_64
@@ -100,11 +100,11 @@ pkgbase = vlc-nightly
conflicts = vlc
replaces = vlc-plugin
options = !emptydirs
- source = http://nightlies.videolan.org/build/source/vlc-4.0.0-20171130-0243-git.tar.xz
+ source = http://nightlies.videolan.org/build/source/vlc-4.0.0-20171209-0235-dev.tar.xz
source = update-vlc-plugin-cache.hook
source = https://git.archlinux.org/svntogit/packages.git/plain/trunk/lua53_compat.patch?h=packages/vlc
source = find-deps.py
- sha256sums = 8ccdd70f2ea7212142a3335a237c5c135a96aa09f92bd0d567ae0b9359ac7157
+ sha256sums = 453aa3704ec2fccd9fbb1287abe37eb92abf23a091870c038347c9d6af9bdfe6
sha256sums = c6f60c50375ae688755557dbfc5bd4a90a8998f8cf4d356c10d872a1a0b44f3a
sha256sums = d1cb88a1037120ea83ef75b2a13039a16825516b776d71597d0e2eae5df2d8fa
sha256sums = 90b0e34d5772d2307ba07a1c2aa715db7488389003cfe6d3570b2a9c63061db7
diff --git a/PKGBUILD b/PKGBUILD
index 3aae7ca2a0e..562624faeb6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,10 +5,11 @@
_appname_=vlc
pkgname=${_appname_}-nightly
-pkgver=4.0.0v20171130
+pkgver=4.0.0v20171209
_pkgver=4.0.0
-_snapshot_=20171130
-_snapver_=0243
+_snapshot_=20171209
+_snapver_=0235
+_suffix_=dev
_nightly_=${_snapshot_}-${_snapver_}
pkgrel=1
pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player - nightly snapshot'
@@ -60,7 +61,7 @@ conflicts=("${_appname_}-plugin" "${_appname_}")
provides=("${_appname_}")
replaces=("${_appname_}-plugin")
options=('!emptydirs')
-source=("http://nightlies.videolan.org/build/source/vlc-${_pkgver}-${_nightly_}-git.tar.xz"
+source=("http://nightlies.videolan.org/build/source/vlc-${_pkgver}-${_nightly_}-${_suffix_}.tar.xz"
'update-vlc-plugin-cache.hook'
'https://git.archlinux.org/svntogit/packages.git/plain/trunk/lua53_compat.patch?h=packages/vlc'
'find-deps.py')
@@ -70,7 +71,7 @@ pkgver() {
}
prepare() {
- cd "${_appname_}-${_pkgver}-git"
+ cd "${_appname_}-${_pkgver}-${_suffix_}"
./bootstrap
@@ -80,7 +81,7 @@ prepare() {
}
build() {
- cd "${_appname_}-${_pkgver}-git"
+ cd "${_appname_}-${_pkgver}-${_suffix_}"
export CFLAGS+=" -I/usr/include/samba-4.0"
export CPPFLAGS+=" -I/usr/include/samba-4.0"
@@ -111,12 +112,12 @@ build() {
}
package() {
- cd "${_appname_}-${_pkgver}-git"
+ cd "${_appname_}-${_pkgver}-${_suffix_}"
make -i DESTDIR="${pkgdir}" install
for res in 16 32 48 128; do
- install -D -m644 "${srcdir}/${_appname_}-${_pkgver}-git/share/icons/${res}x${res}/${_appname_}.png" \
+ install -D -m644 "${srcdir}/${_appname_}-${_pkgver}-${_suffix_}/share/icons/${res}x${res}/${_appname_}.png" \
"${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/${_appname_}.png"
done
@@ -130,7 +131,7 @@ package() {
# depends=("${_detected_depends[@]}" "${_undetected_depends[@]}")
}
-sha256sums=('8ccdd70f2ea7212142a3335a237c5c135a96aa09f92bd0d567ae0b9359ac7157'
+sha256sums=('453aa3704ec2fccd9fbb1287abe37eb92abf23a091870c038347c9d6af9bdfe6'
'c6f60c50375ae688755557dbfc5bd4a90a8998f8cf4d356c10d872a1a0b44f3a'
'd1cb88a1037120ea83ef75b2a13039a16825516b776d71597d0e2eae5df2d8fa'
'90b0e34d5772d2307ba07a1c2aa715db7488389003cfe6d3570b2a9c63061db7')
diff --git a/update.sh b/update.sh
index e897502e913..9816f1d8951 100755
--- a/update.sh
+++ b/update.sh
@@ -19,7 +19,7 @@ srcfile=${BASH_REMATCH[2]}
msg2 "source file: $srcfile"
msg 'Split file name of latest nightly into components used in the PKGBUILD'
-compregex='vlc-(.*)-(.*)-(.*)-git.tar.xz'
+compregex='vlc-(.*)-(.*)-(.*)-(.*).tar.xz'
if ! [[ $srcfile =~ $compregex ]]; then
echo 'Unable to split source file into components used in PKGBUILD'
exit -1
@@ -27,9 +27,11 @@ fi
version=${BASH_REMATCH[1]}
date=${BASH_REMATCH[2]}
strange_number=${BASH_REMATCH[3]}
+suffix=${BASH_REMATCH[4]}
msg2 "version: $version"
msg2 "date: $date"
msg2 "strange number: $strange_number"
+msg2 "suffix: $suffix"
msg 'Update PKGBUILD'
mv 'PKGBUILD' 'PKGBUILD.bak'
@@ -38,6 +40,7 @@ awk \
-v _pkgver="_pkgver=${version}" \
-v _snapshot_="_snapshot_=${date}" \
-v _snapver_="_snapver_=${strange_number}" \
+ -v _suffix_="_suffix_=${suffix}" \
' /^[[:blank:]]*_pkgver=.*$/ {
print _pkgver
next
@@ -54,6 +57,10 @@ awk \
print _snapver_
next
}
+ /^[[:blank:]]*_suffix_=.*$/ {
+ print _suffix_
+ next
+ }
1
END {