summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Choina2019-05-11 09:37:30 -0400
committerSolomon Choina2019-05-11 09:37:30 -0400
commit86c375afb6397e62dfc4dcb3b9e34f1c9bdee7d6 (patch)
treecea7405b2eea7dd6a939b58536c9ba4fd5df7ee6
parent7fd7bfaf740e2554cc14d55a39da10a172295462 (diff)
downloadaur-86c375afb6397e62dfc4dcb3b9e34f1c9bdee7d6.tar.gz
updpkgver
-rw-r--r--.SRCINFO6
-rw-r--r--3-3-opengl-update-libplacebo-call-for-changed-API.patch15
-rw-r--r--PKGBUILD18
3 files changed, 28 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8ae03d16979..9b8f481c2de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = vlc-nightly
pkgdesc = Multi-platform MPEG, VCD/DVD, and DivX player - nightly snapshot
- pkgver = 4.0.0v20190324
+ pkgver = 4.0.0v20190511
pkgrel = 1
url = https://nightlies.videolan.org/
arch = x86_64
@@ -168,11 +168,11 @@ pkgbase = vlc-nightly
conflicts = vlc
replaces = vlc-plugin
options = !emptydirs
- source = http://nightlies.videolan.org/build/source/vlc-4.0.0-20190324-0231-dev.tar.xz
+ source = http://nightlies.videolan.org/build/source/vlc-4.0.0-20190511-0231-dev.tar.xz
source = update-vlc-plugin-cache.hook
source = 0001-lua-Fix-build-using-lua-5.3.patch
source = find-deps.py
- sha256sums = 9f465ae1c61f5cae057d3c103d64e79d953e1018ba3ebe8a8f805facd18c051b
+ sha256sums = 622e53bcf12de170ccb3b26b5d198236aa39a7c88c08aa9edb13af9d6d04ec10
sha256sums = c6f60c50375ae688755557dbfc5bd4a90a8998f8cf4d356c10d872a1a0b44f3a
sha256sums = 3e6bddbaed443e40036c494a0754aedd2f94fe41bfa3754855e16f7452a03cdf
sha256sums = 90b0e34d5772d2307ba07a1c2aa715db7488389003cfe6d3570b2a9c63061db7
diff --git a/3-3-opengl-update-libplacebo-call-for-changed-API.patch b/3-3-opengl-update-libplacebo-call-for-changed-API.patch
new file mode 100644
index 00000000000..01fff5ad9bc
--- /dev/null
+++ b/3-3-opengl-update-libplacebo-call-for-changed-API.patch
@@ -0,0 +1,15 @@
+diff --git a/modules/video_output/opengl/vout_helper.c b/modules/video_output/opengl/vout_helper.c
+index f1069ccb1f..b59343f7b5 100644
+--- a/modules/video_output/opengl/vout_helper.c
++++ b/modules/video_output/opengl/vout_helper.c
+@@ -551,7 +551,9 @@ opengl_init_program(vout_display_opengl_t *vgl, vlc_video_context *context,
+ {
+ tc->pl_ctx = vlc_placebo_Create(VLC_OBJECT(tc));
+ if (tc->pl_ctx) {
+-# if PL_API_VER >= 6
++# if PL_API_VER >= 20
++ tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL);
++# elif PL_API_VER >= 6
+ tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0);
+ # else
+ tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0, 0);
diff --git a/PKGBUILD b/PKGBUILD
index 61e9496e46c..2a96cb6537e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,9 +5,9 @@
_appname_=vlc
pkgname=${_appname_}-nightly
-pkgver=4.0.0v20190324
+pkgver=4.0.0v20190511
_pkgver=4.0.0
-_snapshot_=20190324
+_snapshot_=20190511
_snapver_=0231
_suffix_=dev
_nightly_=${_snapshot_}-${_snapver_}
@@ -127,8 +127,8 @@ prepare() {
sed 's|whoami|echo builduser|g' -i configure
sed 's|hostname -f|echo arch|g' -i configure
- # libplacebo 0.6 API
- sed 's|pl_shader_alloc(tc->pl_ctx, NULL, 0, 0);|pl_shader_alloc(tc->pl_ctx, NULL, 0);|' -i modules/video_output/opengl/vout_helper.c
+ # libplacebo 12 API
+ sed 's|pl_shader_alloc(tc->pl_ctx, NULL, 0, 0);|pl_shader_alloc(tc->pl_ctx, NULL);|' -i modules/video_output/opengl/vout_helper.c
}
build() {
@@ -140,6 +140,8 @@ build() {
export LUAC=/usr/bin/luac
export LUA_LIBS="`pkg-config --libs lua`"
export RCC=/usr/bin/rcc-qt5
+ # export CC=clang
+ # export CXX=clang++
./configure --prefix=/usr \
--sysconfdir=/etc \
@@ -234,9 +236,9 @@ build() {
--enable-aribsub \
\
--libexecdir=/usr/lib \
- --disable-daala \
- --disable-fdkaac \
- --disable-decklink
+ --disable-daala \
+ --disable-fdkaac \
+ --disable-decklink
# note: removing --enable-daala for now because it is currently broken
# removing --enable-fdkaac for now because it is currently broken
# adding --disable-decklink because it is broken
@@ -263,7 +265,7 @@ package() {
# depends=("${_detected_depends[@]}" "${_undetected_depends[@]}")
}
-sha256sums=('9f465ae1c61f5cae057d3c103d64e79d953e1018ba3ebe8a8f805facd18c051b'
+sha256sums=('622e53bcf12de170ccb3b26b5d198236aa39a7c88c08aa9edb13af9d6d04ec10'
'c6f60c50375ae688755557dbfc5bd4a90a8998f8cf4d356c10d872a1a0b44f3a'
'3e6bddbaed443e40036c494a0754aedd2f94fe41bfa3754855e16f7452a03cdf'
'90b0e34d5772d2307ba07a1c2aa715db7488389003cfe6d3570b2a9c63061db7')