extra/vlc to 3.0.18-4

extra/vlc/PKGBUILD

@@ -11,7 +11,7 @@ _vlcver=3.0.18
 # optional fixup version including hyphen
 _vlcfixupver=
 pkgver=${_vlcver}${_vlcfixupver//-/.r}
-pkgrel=1
+pkgrel=4
 pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player'
 url='https://www.videolan.org/vlc/'
 arch=('x86_64')
@@ -22,7 +22,7 @@ depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'libproxy' 'lua52' 'libidn'
          'libmpeg2' 'xcb-util-keysyms' 'libtar' 'libxinerama' 'libsecret'
          'libupnp' 'libixml.so' 'libupnp.so' 'libarchive' 'qt5-base'
          'qt5-x11extras' 'qt5-svg' 'freetype2' 'fribidi' 'harfbuzz'
-         'fontconfig' 'libxml2' 'gnutls' 'libplacebo' 'wayland-protocols')
+         'fontconfig' 'libxml2' 'gnutls' 'libplacebo')
 makedepends=('gst-plugins-base-libs' 'live-media' 'libnotify' 'libbluray'
              'flac' 'libdc1394' 'libavc1394' 'libcaca' 'gtk3'
              'librsvg' 'libgme' 'xosd' 'twolame' 'aalib' 'avahi' 'systemd-libs'
@@ -33,7 +33,7 @@ makedepends=('gst-plugins-base-libs' 'live-media' 'libnotify' 'libbluray'
              'libx265.so' 'libx264.so' 'zvbi' 'libass' 'libkate' 'libtiger'
              'sdl_image' 'libpulse' 'alsa-lib' 'jack' 'libsamplerate' 'libsoxr'
              'lirc' 'libgoom2' 'projectm' 'aom' 'srt' 'dav1d'
-             'aribb24' 'aribb25' 'pcsclite')
+             'aribb24' 'aribb25' 'pcsclite' 'wayland-protocols')
 
 #            'chromaprint: Chromaprint audio fingerprinter'
 optdepends=('avahi: service discovery using bonjour protocol'
@@ -99,19 +99,18 @@ optdepends=('avahi: service discovery using bonjour protocol'
             'gtk3: notification plugin'
             'aribb24: aribsub support'
             'aribb25: aribcam support'
-            'pcsclite: aribcam support')
+            'pcsclite: aribcam support'
+            'live-media: streaming over RTSP')
 conflicts=('vlc-plugin')
 replaces=('vlc-plugin')
 options=('debug' '!emptydirs')
 source=(https://download.videolan.org/${pkgname}/${_vlcver}/${pkgname}-${_vlcver}${_vlcfixupver}.tar.xz{,.asc}
         libplacebo-5.patch
-        update-vlc-plugin-cache.hook
-        vlc-live-media-2021.patch)
+        update-vlc-plugin-cache.hook)
 sha512sums=('6fc8fdaa7e8862ad7133d69b3dab99ab9cd3945846a6ce5e2379b7f68ee9accd385c53b8573fc7c82f732c24678b4932b1154d2ad8accf06305f2f578d6fcd8e'
             'SKIP'
             'a06b04a8b059dbbef77d27435bd5bec3c26f937390bd112b0843385587e866e617c3dd0e66f99eed5fa4a91bc5f0fd9b5623f65b2f2435a54456dde2aa96209b'
-            'b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3'
-            '322461cb5e89e4828483dd0a5c6595f99e767885ae9a1aa2e4d0514ac7354f2ee93b3e5c80993dcff7cd218d7af210374724337b3fc8bc196d35ef5e2b41695d')
+            'b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3')
 validpgpkeys=('65F7C6B4206BD057A7EB73787180713BE58D1ADC') # VideoLAN Release Signing Key
 
 prepare() {

extra/vlc/vlc-live-media-2021.patch

@@ -1,12 +0,0 @@
-diff -ru vlc-3.0.13.orig/configure.ac vlc-3.0.13/configure.ac
---- vlc-3.0.13.orig/configure.ac        2021-04-27 15:18:39.000000000 +0200
-+++ vlc-3.0.13/configure.ac     2021-05-03 16:26:26.691200904 +0200
-@@ -1825,7 +1825,7 @@
-         AC_MSG_ERROR([Update live555 or pass --disable-live555 to disable RTSP input support.])
-       ])
-     ], [
--      other_libs="-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment"
-+      other_libs="-lcrypto -lssl -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment"
-       other_libs_pic="-lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic"
-       AS_IF([test "${SYS}" = "mingw32"], [
-         # add ws2_32 for closesocket, select, recv