git » vlc.git » commit a8f2bac

Rebuild with shared live-media

author Antonio Rojas
2022-12-04 10:29:17 UTC
committer Antonio Rojas
2022-12-04 10:29:17 UTC
parent 50d2a6d49abbe760364699055462802a8e12e6c0

Rebuild with shared live-media

PKGBUILD +5 -6
vlc-live-media-2021.patch +0 -12

diff --git a/PKGBUILD b/PKGBUILD
index 29d6faa..0409a60 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ _vlcver=3.0.18
 # optional fixup version including hyphen
 _vlcfixupver=
 pkgver=${_vlcver}${_vlcfixupver//-/.r}
-pkgrel=3
+pkgrel=4
 pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player'
 url='https://www.videolan.org/vlc/'
 arch=('x86_64')
@@ -96,19 +96,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() {
diff --git a/vlc-live-media-2021.patch b/vlc-live-media-2021.patch
deleted file mode 100644
index e39a6ed..0000000
--- a/vlc-live-media-2021.patch
+++ /dev/null
@@ -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