[arch-commits] Commit in vlc/trunk (PKGBUILD aom_compat.patch)

[Levente Polyak]

    Date: Saturday, April 25, 2020 @ 11:24:19
  Author: anthraxx
Revision: 381539

upgpkg: vlc 3.0.9.2-1: re-enable libplacebo as well

Modified:
  vlc/trunk/PKGBUILD
Deleted:
  vlc/trunk/aom_compat.patch

------------------+
 PKGBUILD         |   17 +++++++----------
 aom_compat.patch |   11 -----------
 2 files changed, 7 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-25 11:11:01 UTC (rev 381538)
+++ PKGBUILD	2020-04-25 11:24:19 UTC (rev 381539)
@@ -4,21 +4,20 @@
 # Contributor: Martin Sandsmark <martin.sandsmark at kde.org>
 
 pkgname=vlc
-_vlcver=3.0.8
+_vlcver=3.0.9.2
 # optional fixup version including hyphen
 _vlcfixupver=
 pkgver=${_vlcver}${_vlcfixupver//-/.r}
-pkgrel=13
+pkgrel=1
 pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player'
 url='https://www.videolan.org/vlc/'
 arch=('x86_64')
 license=('LGPL2.1' 'GPL2')
-# TODO: libplacebo https://github.com/haasn/libplacebo/commit/65ddefbadc3481a7835baa23701a7a2992ca2768
 depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'libproxy' 'lua' 'libidn'
          'libmatroska' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 'libmad'
          'libmpeg2' 'xcb-util-keysyms' 'libtar' 'libxinerama' 'libsecret'
          'libarchive' 'qt5-base' 'qt5-x11extras' 'qt5-svg' 'freetype2'
-         'fribidi' 'harfbuzz' 'fontconfig' 'libxml2' 'gnutls' # 'libplacebo'
+         'fribidi' 'harfbuzz' 'fontconfig' 'libxml2' 'gnutls' 'libplacebo'
          'wayland-protocols' 'aribb24')
 makedepends=('gst-plugins-base-libs' 'live-media' 'libnotify' 'libbluray'
              'flac' 'libdc1394' 'libavc1394' 'libcaca' 'gtk3'
@@ -98,13 +97,11 @@
 options=('!emptydirs')
 source=(https://download.videolan.org/${pkgname}/${_vlcver}/${pkgname}-${_vlcver}${_vlcfixupver}.tar.xz{,.asc}
         update-vlc-plugin-cache.hook
-        lua53_compat.patch
-        aom_compat.patch)
-sha512sums=('5ade0b350e98fd6fa90035bffabda96f0addb3844a7c0a242b4db1cab6a746e1adb1d713ddcb48ae51a7d1736090f096f5d3b0637a9f958ccf4fcf27e838cf70'
+        lua53_compat.patch)
+sha512sums=('c1009871449b3547ee8fec0c6e95fcf8f7b0328aa85c0c9670aa38ce11d083bae74584ec501b131232cd00fda707d6269ffa5f42c95aa04fe84b44045ca44409'
             'SKIP'
             '80357bae69e32b353d3784932d854e294906798e14faffb87c3383c3b6f6bdc57cbabb9c6e3f3c1adf0f8ddbb24153e72104c963cf1934970c2983c96daef9df'
-            '33cda373aa1fb3ee19a78748e2687f2b93c8662c9fda62ecd122a2e649df8edaceb54dda3991bc38c80737945a143a9e65baa2743a483bb737bb94cd590dc25f'
-            '5f3476ea0674640dd0321349dbec1e1d36169b456b5cc5492467e1db1e839c8af1b1b8ceeb16c54beb4d449aabd595c72984fbd2ae9df07f457867f99a7b7d98')
+            '33cda373aa1fb3ee19a78748e2687f2b93c8662c9fda62ecd122a2e649df8edaceb54dda3991bc38c80737945a143a9e65baa2743a483bb737bb94cd590dc25f')
 validpgpkeys=('65F7C6B4206BD057A7EB73787180713BE58D1ADC') # VideoLAN Release Signing Key
 
 prepare() {
@@ -222,7 +219,7 @@
               --enable-kwallet \
               --disable-update-check \
               --enable-notify \
-              --disable-libplacebo \
+              --enable-libplacebo \
               --enable-vlc \
               --enable-aribsub \
               --enable-aom \

Deleted: aom_compat.patch
===================================================================
--- aom_compat.patch	2020-04-25 11:11:01 UTC (rev 381538)
+++ aom_compat.patch	2020-04-25 11:24:19 UTC (rev 381539)
@@ -1,11 +0,0 @@
-diff -u -r vlc-3.0.8/modules/codec/aom.c vlc-3.0.8-aom/modules/codec/aom.c
---- vlc-3.0.8/modules/codec/aom.c	2019-01-09 16:02:11.000000000 +0000
-+++ vlc-3.0.8-aom/modules/codec/aom.c	2020-02-22 11:44:27.188620819 +0000
-@@ -98,7 +98,6 @@
- { VLC_CODEC_I444, AOM_IMG_FMT_I444, 8, 0 },
- 
- { VLC_CODEC_YV12, AOM_IMG_FMT_YV12, 8, 0 },
--{ VLC_CODEC_YUVA, AOM_IMG_FMT_444A, 8, 0 },
- 
- { VLC_CODEC_GBR_PLANAR, AOM_IMG_FMT_I444, 8, 1 },
- { VLC_CODEC_GBR_PLANAR_10L, AOM_IMG_FMT_I44416, 10, 1 },