This commit is contained in:
joborun linux 2022-12-04 05:43:28 +02:00
parent e99c278056
commit b76eb89f59
4 changed files with 25 additions and 36 deletions

View File

@ -6,7 +6,7 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=vlc
_vlcver=3.0.17.4
_vlcver=3.0.18
# optional fixup version including hyphen
_vlcfixupver=
pkgver=${_vlcver}${_vlcfixupver//-/.r}
@ -20,7 +20,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'
@ -103,9 +103,9 @@ options=('!emptydirs')
#options=('debug' '!emptydirs') ## uncomment this and comment the above options to produce the debug pkg
source=(https://download.videolan.org/${pkgname}/${_vlcver}/${pkgname}-${_vlcver}${_vlcfixupver}.tar.xz{,.asc}
libplacebo-5.patch
$pkgname-dav1d-1.0.patch::https://github.com/videolan/vlc/commit/2202c892c8dc.patch
# $pkgname-dav1d-1.0.patch::https://github.com/videolan/vlc/commit/2202c892c8dc.patch
update-vlc-plugin-cache.hook
caca-fix-to-newer-version.patch
# caca-fix-to-newer-version.patch
vlc-live-media-2021.patch)
prepare() {
@ -260,12 +260,18 @@ license=('LGPL2.1' 'GPL2')
validpgpkeys=('65F7C6B4206BD057A7EB73787180713BE58D1ADC') # VideoLAN Release Signing Key
sha256sums=(8c5a62d88a4fb45c1b095cf10befef217dfa87aedcec5184b9e7d590b6dd4133 # vlc-3.0.17.4.tar.xz
f310f9eda5cca0fda31f90ddc95b615f6de7c648bbfeac3f1de5b9ee67e57bee # vlc-3.0.17.4.tar.xz.asc
sha256sums=(57094439c365d8aa8b9b41fa3080cc0eef2befe6025bb5cef722accc625aedec # vlc-3.0.18.tar.xz
4f87ca191bdbd185afa21466e9f4790512682dc6b5087dd784509d6ba4e5e636 # vlc-3.0.18.tar.xz.asc
c47ecb0e8e8c03f8c5451aa12fc2e38e380364c38c411a13aa38b7b41def6989 # libplacebo-5.patch
1078b8dacbf2a2cacb4bf835f3e5817c816926604d8e564610604d92e20e02db # vlc-dav1d-1.0.patch
# 1078b8dacbf2a2cacb4bf835f3e5817c816926604d8e564610604d92e20e02db # vlc-dav1d-1.0.patch
b98043683dd90d3f5a3f501212dfc629839b661100de5ac79fd30cb7b4a06f13 # update-vlc-plugin-cache.hook
a45340d4f4fc371c70ae96e13ee8ced28930e77b1598b2429ac84a4a31029b86 # caca-fix-to-newer-version.patch
08f6a07a149039255d34ff04db08c3de477966118f62339a631b53ffa2dfd85a) # vlc-live-media-2021.patch
# a45340d4f4fc371c70ae96e13ee8ced28930e77b1598b2429ac84a4a31029b86 # caca-fix-to-newer-version.patch
753517a8b88c5950d516f0fe57a3ef169e0665ba7817d4b8d9976c666829a291) # vlc-live-media-2021.patch
sha512sums=('6fc8fdaa7e8862ad7133d69b3dab99ab9cd3945846a6ce5e2379b7f68ee9accd385c53b8573fc7c82f732c24678b4932b1154d2ad8accf06305f2f578d6fcd8e'
'SKIP'
'a06b04a8b059dbbef77d27435bd5bec3c26f937390bd112b0843385587e866e617c3dd0e66f99eed5fa4a91bc5f0fd9b5623f65b2f2435a54456dde2aa96209b'
'b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3'
'322461cb5e89e4828483dd0a5c6595f99e767885ae9a1aa2e4d0514ac7354f2ee93b3e5c80993dcff7cd218d7af210374724337b3fc8bc196d35ef5e2b41695d')

View File

@ -4,11 +4,11 @@
# Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
pkgname=vlc
_vlcver=3.0.17.4
_vlcver=3.0.18
# optional fixup version including hyphen
_vlcfixupver=
pkgver=${_vlcver}${_vlcfixupver//-/.r}
pkgrel=12
pkgrel=3
pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player'
url='https://www.videolan.org/vlc/'
arch=('x86_64')
@ -19,7 +19,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'
@ -30,7 +30,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'
@ -101,18 +101,14 @@ conflicts=('vlc-plugin')
replaces=('vlc-plugin')
options=('debug' '!emptydirs')
source=(https://download.videolan.org/${pkgname}/${_vlcver}/${pkgname}-${_vlcver}${_vlcfixupver}.tar.xz{,.asc}
$pkgname-dav1d-1.0.patch::https://github.com/videolan/vlc/commit/2202c892c8dc.patch
libplacebo-5.patch
update-vlc-plugin-cache.hook
caca-fix-to-newer-version.patch
vlc-live-media-2021.patch)
sha512sums=('dac14c6586603c064294672eb878253e52b3a7bef431fb10303345e5400591b5c1f2d452a2af03f503db0ca186582a84be06fdf05ab011c33f7b0bd5389c51fb'
sha512sums=('6fc8fdaa7e8862ad7133d69b3dab99ab9cd3945846a6ce5e2379b7f68ee9accd385c53b8573fc7c82f732c24678b4932b1154d2ad8accf06305f2f578d6fcd8e'
'SKIP'
'5f7aa43a7b248812758a8ef82d15d59fb566327fc3e837002a8f4741cabde09ed7caca905f6fe168554b9a4b7561816b3eff877f4dd6664ceaf0964281facb4f'
'a06b04a8b059dbbef77d27435bd5bec3c26f937390bd112b0843385587e866e617c3dd0e66f99eed5fa4a91bc5f0fd9b5623f65b2f2435a54456dde2aa96209b'
'b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3'
'ef479a246dc98f882a05ca56a1c2872cc67ced154c625790070b887858ddc250d55b1295db82c9122e5ecd3c2c9c712ec9718e28d0a9d21ff6a230eb6c5010ce'
'ad17d6f4f2cc83841c1c89623c339ec3ee94f6084ea980e2c8cbc3903854c85e5396e31bfd8dc90745b41794670903d854c4d282d8adec263087a9d47b226ccc')
'322461cb5e89e4828483dd0a5c6595f99e767885ae9a1aa2e4d0514ac7354f2ee93b3e5c80993dcff7cd218d7af210374724337b3fc8bc196d35ef5e2b41695d')
validpgpkeys=('65F7C6B4206BD057A7EB73787180713BE58D1ADC') # VideoLAN Release Signing Key
prepare() {

View File

@ -25,7 +25,6 @@ harfbuzz
fontconfig
libxml2
libplacebo
wayland-protocols
gst-plugins-base-libs
live-media
libnotify
@ -85,6 +84,8 @@ pcsclite
autoconf
automake
gettext
at-spi2-core
libglvnd
wayland-protocols

View File

@ -10,17 +10,3 @@ diff -ru vlc-3.0.13.orig/configure.ac vlc-3.0.13/configure.ac
other_libs_pic="-lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic"
AS_IF([test "${SYS}" = "mingw32"], [
# add ws2_32 for closesocket, select, recv
diff -ru vlc-3.0.13.orig/modules/access/live555.cpp vlc-3.0.13/modules/access/live555.cpp
--- vlc-3.0.13.orig/modules/access/live555.cpp 2019-03-29 20:01:15.000000000 +0100
+++ vlc-3.0.13/modules/access/live555.cpp 2021-05-03 16:04:38.030121796 +0200
@@ -852,7 +852,9 @@
if( !p_sys->b_multicast )
{
/* We need different rollover behaviour for multicast */
- p_sys->b_multicast = IsMulticastAddress( sub->connectionEndpointAddress() );
+ struct sockaddr_storage tempAddr;
+ sub->getConnectionEndpointAddress(tempAddr);
+ p_sys->b_multicast = IsMulticastAddress( tempAddr );
}
tk = (live_track_t*)malloc( sizeof( live_track_t ) );