Updated to version 3.0.1

4 files changed, 300 insertions, 173 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6f10256e65f7..9db84482bfca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = vlc-decklink
 	pkgdesc = Multi-platform MPEG, VCD/DVD, and DivX player (with decklink support)
-	pkgver = 2.2.8
+	pkgver = 3.0.1
 	pkgrel = 1
-	url = http://www.videolan.org/vlc/
+	url = https://www.videolan.org/vlc/
 	arch = i686
 	arch = x86_64
 	license = LGPL2.1
 	license = GPL2
+	makedepends = gst-plugins-base-libs
 	makedepends = live-media
 	makedepends = libnotify
 	makedepends = libbluray
@@ -14,94 +15,161 @@ pkgbase = vlc-decklink
 	makedepends = kdelibs
 	makedepends = libdc1394
 	makedepends = libavc1394
-	makedepends = lirc
 	makedepends = libcaca
-	makedepends = gtk2
+	makedepends = gtk3
 	makedepends = librsvg
-	makedepends = portaudio
 	makedepends = libgme
 	makedepends = xosd
-	makedepends = projectm
 	makedepends = twolame
 	makedepends = aalib
+	makedepends = avahi
+	makedepends = libsystemd
 	makedepends = libmtp
+	makedepends = libupnp
+	makedepends = libmicrodns
 	makedepends = libdvdcss
 	makedepends = smbclient
-	makedepends = libgoom2
 	makedepends = vcdimager
-	makedepends = opus
 	makedepends = libssh2
 	makedepends = mesa
-	makedepends = qt4
+	makedepends = protobuf
+	makedepends = opencv
+	makedepends = libnfs
+	makedepends = mpg123
+	makedepends = libdvdread
+	makedepends = libdvdnav
+	makedepends = libogg
+	makedepends = libshout
+	makedepends = libmodplug
+	makedepends = libvpx
+	makedepends = libvorbis
+	makedepends = speex
+	makedepends = opus
+	makedepends = libtheora
+	makedepends = libpng
+	makedepends = libjpeg-turbo
+	makedepends = libx265.so
+	makedepends = libx264.so
+	makedepends = zvbi
+	makedepends = libass
+	makedepends = libkate
+	makedepends = libtiger
+	makedepends = sdl_image
+	makedepends = libpulse
+	makedepends = alsa-lib
+	makedepends = jack
+	makedepends = libsamplerate
+	makedepends = libsoxr
+	makedepends = lirc
+	makedepends = libgoom2
+	makedepends = projectm
+	makedepends = chromaprint
 	makedepends = blackmagic-decklink-sdk
 	depends = a52dec
 	depends = libdvbpsi
 	depends = libxpm
 	depends = libdca
-	depends = qt4
 	depends = libproxy
-	depends = sdl_image
-	depends = libdvdnav
 	depends = libtiger
 	depends = lua
 	depends = libmatroska
-	depends = zvbi
 	depends = taglib
 	depends = libmpcdec
-	depends = ffmpeg2.8
+	depends = ffmpeg
 	depends = faad2
 	depends = libupnp
-	depends = libshout
 	depends = libmad
 	depends = libmpeg2
 	depends = xcb-util-keysyms
 	depends = libtar
 	depends = libxinerama
-	optdepends = avahi: for service discovery using bonjour protocol
-	optdepends = libnotify: for notification plugin
-	optdepends = ncurses: for ncurses interface support
-	optdepends = libdvdcss: for decoding encrypted DVDs
-	optdepends = lirc: for lirc plugin
-	optdepends = libavc1394: for devices using the 1394ta AV/C
-	optdepends = libdc1394: for IEEE 1394 plugin
+	depends = libsecret
+	depends = libarchive
+	depends = qt5-base
+	depends = qt5-x11extras
+	depends = qt5-svg
+	depends = freetype2
+	depends = fribidi
+	depends = harfbuzz
+	depends = fontconfig
+	depends = libxml2
+	depends = gnutls
+	depends = libplacebo
+	depends = wayland-protocols
+	optdepends = avahi: service discovery using bonjour protocol
+	optdepends = gst-plugins-base-libs: for libgst plugins
+	optdepends = libdvdcss: decoding encrypted DVDs
+	optdepends = libavc1394: devices using the 1394ta AV/C
+	optdepends = libdc1394: IEEE 1394 access plugin
 	optdepends = kdelibs: KDE Solid hardware integration
-	optdepends = libva-vdpau-driver: vdpau back-end for nvidia
-	optdepends = libva-intel-driver: back-end for intel cards
-	optdepends = libbluray: for Blu-Ray support
-	optdepends = flac: for Free Lossless Audio Codec plugin
-	optdepends = portaudio: for portaudio support
-	optdepends = twolame: for TwoLAME mpeg2 encoder plugin
-	optdepends = projectm: for ProjectM visualisation plugin
-	optdepends = libcaca: for colored ASCII art video output
-	optdepends = libgme: for libgme plugin
-	optdepends = librsvg: for SVG plugin
-	optdepends = gnome-vfs: for GNOME Virtual File System support
-	optdepends = libgoom2: for libgoom plugin
+	optdepends = kwallet: kwallet keystore
+	optdepends = libva-vdpau-driver: vdpau backend nvidia
+	optdepends = libva-intel-driver: video backend intel
+	optdepends = libbluray: Blu-Ray video input
+	optdepends = flac: Free Lossless Audio Codec plugin
+	optdepends = twolame: TwoLAME mpeg2 encoder plugin
+	optdepends = libgme: Game Music Emu plugin
 	optdepends = vcdimager: navigate VCD with libvcdinfo
-	optdepends = aalib: for ASCII art plugin
-	optdepends = libmtp: for MTP devices support
-	optdepends = smbclient: for SMB access plugin
-	optdepends = libcdio: for audio CD playback support
-	optdepends = ttf-freefont: for subtitle font
-	optdepends = ttf-dejavu: for subtitle font
-	optdepends = opus: for opus support
-	optdepends = libssh2: for sftp support
-	optdepends = lua-socket: for http interface
-	optdepends = qt4: for the GUI
+	optdepends = libmtp: MTP devices discovery
+	optdepends = libsystemd: udev services discovery
+	optdepends = smbclient: SMB access plugin
+	optdepends = libcdio: audio CD playback
+	optdepends = ttf-freefont: subtitle font
+	optdepends = ttf-dejavu: subtitle font
+	optdepends = libssh2: sftp access
+	optdepends = opencv: opencv video
+	optdepends = libnfs: NFS access
+	optdepends = mpg123: mpg123 codec
+	optdepends = protobuf: chromecast streaming
+	optdepends = libmicrodns: mDNS services discovery (chromecast etc)
+	optdepends = lua-socket: http interface
+	optdepends = live-media: RTSP input
+	optdepends = libdvdread: DVD input module
+	optdepends = libdvdnav: DVD with navigation input module
+	optdepends = libogg: Ogg and OggSpots codec
+	optdepends = libshout: shoutcast/icecast output plugin
+	optdepends = libmodplug: MOD output plugin
+	optdepends = libvpx: VP8 and VP9 codec
+	optdepends = libvorbis: Vorbis decoder/encoder
+	optdepends = speex: Speex codec
+	optdepends = opus: opus codec
+	optdepends = libtheora: theora codec
+	optdepends = libpng: PNG support
+	optdepends = libjpeg-turbo: JPEG support
+	optdepends = librsvg: SVG plugin
+	optdepends = libx264: H264 encoding
+	optdepends = x265: HEVC/H.265 encoder
+	optdepends = zvbi: VBI/Teletext decoding
+	optdepends = libass: Subtitle support
+	optdepends = libkate: Kate codec
+	optdepends = libtiger: Tiger rendering for Kate streams
+	optdepends = sdl_image: SDL image support
+	optdepends = aalib: ASCII art video output
+	optdepends = libcaca: colored ASCII art video output
+	optdepends = libpulse: PulseAudio audio output
+	optdepends = alsa-lib: ALSA audio output
+	optdepends = jack: jack audio server
+	optdepends = libsamplerate: audio Resampler
+	optdepends = libsoxr: SoX audio Resampler
+	optdepends = chromaprint: Chromaprint audio fingerprinter
+	optdepends = lirc: lirc control
+	optdepends = libgoom2: Goom visualization
+	optdepends = projectm: ProjectM visualisation
+	optdepends = ncurses: ncurses interface
+	optdepends = libnotify: notification plugin
+	optdepends = gtk3: notification plugin
 	provides = vlc
 	conflicts = vlc-plugin
 	conflicts = vlc
 	conflicts = vlc-git
 	replaces = vlc-plugin
 	options = !emptydirs
-	source = http://download.videolan.org/vlc/2.2.8/vlc-2.2.8.tar.xz
-	source = lua53_compat.patch
-	source = vlc-2.2.6-fix-memleak.patch
+	source = https://download.videolan.org/vlc/3.0.1/vlc-3.0.1.tar.xz
 	source = update-vlc-plugin-cache.hook
-	sha256sums = 9bf046848fb56d93518881b39099b8288ee005d5ba0ddf705b6f6643b8d562ec
+	source = lua53_compat.patch
+	sha256sums = ce700cdfb49d721b75581ee727e98cc60dae97407ccec0f82124d5e9a1cb1301
+	sha256sums = c6f60c50375ae688755557dbfc5bd4a90a8998f8cf4d356c10d872a1a0b44f3a
 	sha256sums = d1cb88a1037120ea83ef75b2a13039a16825516b776d71597d0e2eae5df2d8fa
-	sha256sums = 235ea97afcc46cb7b8b180c4cfc7abd44077c036991eb7e3e4af0f8e6ad8f91b
-	sha256sums = 4105af8697ac641867a76ddef5f91c69999bf6f980a5681bc36155bbce021f02
 
 pkgname = vlc-decklink
 
diff --git a/PKGBUILD b/PKGBUILD
index 5a56883c4def..f9c5aff03a3a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,117 +5,230 @@
 
 _srcname=vlc
 pkgname=vlc-decklink
-pkgver=2.2.8
+pkgver=3.0.1
 pkgrel=1
 pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player (with decklink support)'
+url='https://www.videolan.org/vlc/'
 arch=('i686' 'x86_64')
-url='http://www.videolan.org/vlc/'
 license=('LGPL2.1' 'GPL2')
-depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy'
-         'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska'
-         'zvbi' 'taglib' 'libmpcdec' 'ffmpeg2.8' 'faad2' 'libupnp'
-         'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms' 'libtar'
-         'libxinerama')
+depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'libproxy' 'libtiger' 'lua'
+         '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'
+         'wayland-protocols')
 makedepends=(
     # official repositories:
-        'live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
-        'libdc1394' 'libavc1394' 'lirc' 'libcaca' 'gtk2'
-        'librsvg' 'portaudio' 'libgme' 'xosd' 'projectm'
-        'twolame' 'aalib' 'libmtp' 'libdvdcss' 'smbclient'
-        'libgoom2' 'vcdimager' 'opus' 'libssh2' 'mesa' 'qt4'
+        'gst-plugins-base-libs' 'live-media' 'libnotify' 'libbluray'
+        'flac' 'kdelibs' 'libdc1394' 'libavc1394' 'libcaca' 'gtk3'
+        'librsvg' 'libgme' 'xosd' 'twolame' 'aalib' 'avahi' 'libsystemd'
+        'libmtp' 'libupnp' 'libmicrodns' 'libdvdcss' 'smbclient'
+        'vcdimager' 'libssh2' 'mesa' 'protobuf' 'opencv' 'libnfs' 'mpg123'
+        'libdvdread' 'libdvdnav' 'libogg' 'libshout' 'libmodplug' 'libvpx'
+        'libvorbis' 'speex' 'opus' 'libtheora' 'libpng' 'libjpeg-turbo'
+        'libx265.so' 'libx264.so' 'zvbi' 'libass' 'libkate' 'libtiger'
+        'sdl_image' 'libpulse' 'alsa-lib' 'jack' 'libsamplerate' 'libsoxr'
+        'lirc' 'libgoom2' 'projectm' 'chromaprint'
     # AUR:
         'blackmagic-decklink-sdk'
 )
-optdepends=('avahi: for service discovery using bonjour protocol'
-            'libnotify: for notification plugin'
-            'ncurses: for ncurses interface support'
-            'libdvdcss: for decoding encrypted DVDs'
-            'lirc: for lirc plugin'
-            'libavc1394: for devices using the 1394ta AV/C'
-            'libdc1394: for IEEE 1394 plugin'
+optdepends=('avahi: service discovery using bonjour protocol'
+            'gst-plugins-base-libs: for libgst plugins'
+            'libdvdcss: decoding encrypted DVDs'
+            'libavc1394: devices using the 1394ta AV/C'
+            'libdc1394: IEEE 1394 access plugin'
             'kdelibs: KDE Solid hardware integration'
-            'libva-vdpau-driver: vdpau back-end for nvidia'
-            'libva-intel-driver: back-end for intel cards'
-            'libbluray: for Blu-Ray support'
-            'flac: for Free Lossless Audio Codec plugin'
-            'portaudio: for portaudio support'
-            'twolame: for TwoLAME mpeg2 encoder plugin'
-            'projectm: for ProjectM visualisation plugin'
-            'libcaca: for colored ASCII art video output'
-            'libgme: for libgme plugin'
-            'librsvg: for SVG plugin'
-            'gnome-vfs: for GNOME Virtual File System support'
-            'libgoom2: for libgoom plugin'
+            'kwallet: kwallet keystore'
+            'libva-vdpau-driver: vdpau backend nvidia'
+            'libva-intel-driver: video backend intel'
+            'libbluray: Blu-Ray video input'
+            'flac: Free Lossless Audio Codec plugin'
+            'twolame: TwoLAME mpeg2 encoder plugin'
+            'libgme: Game Music Emu plugin'
             'vcdimager: navigate VCD with libvcdinfo'
-            'aalib: for ASCII art plugin'
-            'libmtp: for MTP devices support'
-            'smbclient: for SMB access plugin'
-            'libcdio: for audio CD playback support'
-            'ttf-freefont: for subtitle font '
-            'ttf-dejavu: for subtitle font'
-            'opus: for opus support'
-            'libssh2: for sftp support'
-            'lua-socket: for http interface'
-            'qt4: for the GUI')
+            'libmtp: MTP devices discovery'
+            'libsystemd: udev services discovery'
+            'smbclient: SMB access plugin'
+            'libcdio: audio CD playback'
+            'ttf-freefont: subtitle font '
+            'ttf-dejavu: subtitle font'
+            'libssh2: sftp access'
+            'opencv: opencv video'
+            'libnfs: NFS access'
+            'mpg123: mpg123 codec'
+            'protobuf: chromecast streaming'
+            'libmicrodns: mDNS services discovery (chromecast etc)'
+            'lua-socket: http interface'
+            'live-media: RTSP input'
+            'libdvdread: DVD input module'
+            'libdvdnav: DVD with navigation input module'
+            'libogg: Ogg and OggSpots codec'
+            'libshout: shoutcast/icecast output plugin'
+            'libmodplug: MOD output plugin'
+            'libvpx: VP8 and VP9 codec'
+            'libvorbis: Vorbis decoder/encoder'
+            'speex: Speex codec'
+            'opus: opus codec'
+            'libtheora: theora codec'
+            'libpng: PNG support'
+            'libjpeg-turbo: JPEG support'
+            'librsvg: SVG plugin'
+            'libx264: H264 encoding'
+            'x265: HEVC/H.265 encoder'
+            'zvbi: VBI/Teletext decoding'
+            'libass: Subtitle support'
+            'libkate: Kate codec'
+            'libtiger: Tiger rendering for Kate streams'
+            'sdl_image: SDL image support'
+            'aalib: ASCII art video output'
+            'libcaca: colored ASCII art video output'
+            'libpulse: PulseAudio audio output'
+            'alsa-lib: ALSA audio output'
+            'jack: jack audio server'
+            'libsamplerate: audio Resampler'
+            'libsoxr: SoX audio Resampler'
+            'chromaprint: Chromaprint audio fingerprinter'
+            'lirc: lirc control'
+            'libgoom2: Goom visualization'
+            'projectm: ProjectM visualisation'
+            'ncurses: ncurses interface'
+            'libnotify: notification plugin'
+            'gtk3: notification plugin')
 provides=('vlc')
 conflicts=('vlc-plugin' 'vlc' 'vlc-git')
 replaces=('vlc-plugin')
 options=('!emptydirs')
-source=("http://download.videolan.org/${_srcname}/${pkgver}/${_srcname}-${pkgver}.tar.xz"
-        'lua53_compat.patch'
-        'vlc-2.2.6-fix-memleak.patch'
-        'update-vlc-plugin-cache.hook')
-sha256sums=('9bf046848fb56d93518881b39099b8288ee005d5ba0ddf705b6f6643b8d562ec'
-            'd1cb88a1037120ea83ef75b2a13039a16825516b776d71597d0e2eae5df2d8fa'
-            '235ea97afcc46cb7b8b180c4cfc7abd44077c036991eb7e3e4af0f8e6ad8f91b'
-            '4105af8697ac641867a76ddef5f91c69999bf6f980a5681bc36155bbce021f02')
+source=("https://download.videolan.org/${_srcname}/${pkgver}/${_srcname}-${pkgver}.tar.xz"
+        'update-vlc-plugin-cache.hook'
+        'lua53_compat.patch')
+sha256sums=('ce700cdfb49d721b75581ee727e98cc60dae97407ccec0f82124d5e9a1cb1301'
+            'c6f60c50375ae688755557dbfc5bd4a90a8998f8cf4d356c10d872a1a0b44f3a'
+            'd1cb88a1037120ea83ef75b2a13039a16825516b776d71597d0e2eae5df2d8fa')
 
 prepare() {
     cd "${_srcname}-${pkgver}"
     
-    sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
-    sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp
+    sed -e 's:truetype/ttf-dejavu:TTF:g' -i modules/visualization/projectm.cpp
+    sed -e 's|-Werror-implicit-function-declaration||g' -i configure
     
     patch -Np1 -i "${srcdir}/lua53_compat.patch"
-    patch -Np1 -i "${srcdir}/vlc-2.2.6-fix-memleak.patch"
+    
+    sed 's|whoami|echo builduser|g' -i configure
+    sed 's|hostname -f|echo arch|g' -i configure
 }
 
 build() {
     cd "${_srcname}-${pkgver}"
     
-    export PKG_CONFIG_PATH='/usr/lib/ffmpeg2.8/pkgconfig'
-    export CFLAGS+=' -I/usr/include/samba-4.0'
-    export CPPFLAGS+=' -I/usr/include/samba-4.0'
-    export CXXFLAGS+=' -std=c++11'
+    export CFLAGS+=" -I/usr/include/samba-4.0"
+    export CPPFLAGS+=" -I/usr/include/samba-4.0"
+    export CXXFLAGS+=" -std=c++11"
     export LUAC='/usr/bin/luac'
     export LUA_LIBS="$(pkg-config --libs lua)"
-    export RCC='/usr/bin/rcc-qt4'
+    export RCC='/usr/bin/rcc-qt5'
     
     ./configure \
         --prefix='/usr' \
         --sysconfdir='/etc' \
         --disable-rpath \
-        --enable-faad \
         --enable-nls \
-        --enable-lirc \
-        --enable-ncurses \
+        --enable-archive \
+        --enable-live555 \
+        --enable-dc1394 \
+        --enable-dv1394 \
+        --enable-dvdread \
+        --enable-dvdnav \
+        --enable-bluray \
+        --enable-opencv \
+        --enable-smbclient \
+        --enable-sftp \
+        --enable-nfs \
         --enable-realrtsp \
-        --enable-aa \
-        --enable-vcdx \
-        --disable-upnp \
+        --enable-dvbpsi \
+        --enable-gme \
+        --enable-ogg \
+        --enable-shout \
+        --enable-matroska \
+        --enable-mod \
+        --enable-mpc \
+        --enable-mad \
+        --enable-mpg123 \
+        --enable-gst-decode \
+        --enable-avcodec \
+        --enable-libva \
+        --enable-avformat \
+        --enable-postproc \
+        --enable-faad \
+        --enable-vpx \
+        --enable-twolame \
+        --disable-fdkaac \
+        --enable-a52 \
+        --enable-dca \
+        --enable-flac \
+        --enable-libmpeg2 \
+        --enable-vorbis \
+        --enable-speex \
         --enable-opus \
-        --enable-sftp \
+        --enable-oggspots \
+        --disable-schroedinger \
+        --enable-png \
+        --enable-jpeg \
+        --enable-x264 \
+        --enable-x265 \
+        --enable-zvbi \
+        --enable-libass \
+        --enable-kate \
+        --enable-tiger \
+        --enable-vdpau \
+        --enable-wayland \
+        --enable-sdl-image \
+        --enable-freetype \
+        --enable-fribidi \
+        --enable-harfbuzz \
+        --enable-fontconfig \
+        --enable-svg \
+        --enable-svgdec \
+        --enable-aa \
+        --enable-caca \
+        --enable-pulse \
+        --enable-alsa \
+        --enable-jack \
+        --enable-samplerate \
+        --enable-soxr \
+        --enable-chromaprint \
+        --enable-chromecast \
+        --enable-qt \
+        --enable-skins2 \
+        --enable-libtar \
+        --enable-ncurses \
+        --enable-lirc \
+        --enable-goom \
+        --enable-projectm \
+        --enable-avahi \
+        --enable-mtp \
+        --enable-upnp \
+        --enable-microdns \
+        --enable-libxml2 \
+        --disable-libgcrypt \
+        --enable-gnutls \
+        --enable-taglib \
+        --enable-secret \
+        --enable-kwallet \
+        --disable-update-check \
+        --enable-notify \
+        --enable-libplacebo \
+        --enable-vlc \
         --enable-decklink
-    
+        
     make
 }
 
 package() {
     cd "${_srcname}-${pkgver}"
-
-    make DESTDIR="${pkgdir}" install
     
-    for _res in 16 32 48 128
+    make DESTDIR="$pkgdir" install
+    
+    for _res in 16 32 48 128 256
     do
         install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${_res}x${_res}/vlc.png" \
                          "${pkgdir}/usr/share/icons/hicolor/${_res}x${_res}/apps/vlc.png"
diff --git a/update-vlc-plugin-cache.hook b/update-vlc-plugin-cache.hook
index f767242671ab..3fbf13d9a1db 100644
--- a/update-vlc-plugin-cache.hook
+++ b/update-vlc-plugin-cache.hook
@@ -5,13 +5,7 @@ Operation = Upgrade
 Operation = Remove
 Target = usr/lib/vlc/plugins/*
 
-[Trigger]
-Type = Package
-Operation = Install
-Operation = Remove
-Target = qt4
-
 [Action]
 Description = Updating the vlc plugin cache...
 When = PostTransaction
-Exec = /usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins
+Exec = /usr/lib/vlc/vlc-cache-gen /usr/lib/vlc/plugins
diff --git a/vlc-2.2.6-fix-memleak.patch b/vlc-2.2.6-fix-memleak.patch
deleted file mode 100644
index de5c1ac153b2..000000000000
--- a/vlc-2.2.6-fix-memleak.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 66dc09662ae33d44c21a5159885afdcaabb0cbb0 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Filip=20Ros=C3=A9en?= <filip@atch.se>
-Date: Fri, 23 Sep 2016 13:52:31 +0200
-Subject: [PATCH] video_output/xcb: fix memory-leak in ReleaseDrawable
-
-The problem with the previous implementation is that "n" will never
-be equal to 0 at the relevant part of the code (given the
-unconditional pre-increment a few lines earlier).
-
-These changes fixes the issue by freeing the allocated memory if the
-first element of "used" is NULL (meaning that there are no more
-entities referred to by it).
-
-fixes #17112
-fixes #17293
-
-Signed-off-by: Thomas Guillem <thomas@gllm.fr>
----
- modules/video_output/xcb/window.c | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/modules/video_output/xcb/window.c b/modules/video_output/xcb/window.c
-index 02c9dd11e3..0c4f86f68c 100644
---- a/modules/video_output/xcb/window.c
-+++ b/modules/video_output/xcb/window.c
-@@ -538,12 +538,15 @@ static void ReleaseDrawable (vlc_object_t *obj, xcb_window_t window)
-         used[n] = used[n + 1];
-     while (used[++n]);
- 
--    if (n == 0)
--         var_SetAddress (obj->p_libvlc, "xid-in-use", NULL);
-+    if (!used[0])
-+        var_SetAddress (obj->p_libvlc, "xid-in-use", NULL);
-+    else
-+        used = NULL;
-+
-     vlc_mutex_unlock (&serializer);
- 
--    if (n == 0)
--        free (used);
-+    free( used );
-+
-     /* Variables are reference-counted... */
-     var_Destroy (obj->obj.libvlc, "xid-in-use");
- }
--- 
-2.11.0
-