extra/vlc to 3.0.20-4

This commit is contained in:
Kevin Mihelich 2023-12-21 16:33:41 +00:00
parent fac778c014
commit 1c4c8682b3
3 changed files with 342 additions and 335 deletions

View file

@ -1,178 +1,196 @@
pkgbase = vlc
pkgdesc = Multi-platform MPEG, VCD/DVD, and DivX player
pkgver = 3.0.20
pkgrel = 2
pkgrel = 4
url = https://www.videolan.org/vlc/
arch = x86_64
license = LGPL2.1
license = GPL2
makedepends = gst-plugins-base-libs
makedepends = live-media
makedepends = libnotify
makedepends = libbluray
makedepends = flac
makedepends = libdc1394
makedepends = libavc1394
makedepends = libcaca
makedepends = gtk3
makedepends = librsvg
makedepends = libgme
makedepends = xosd
makedepends = twolame
license = GPL-2.0-or-later
license = LGPL-2.1-or-later
makedepends = aalib
makedepends = avahi
makedepends = systemd-libs
makedepends = libmtp
makedepends = libmicrodns
makedepends = libdvdcss
makedepends = smbclient
makedepends = vcdimager
makedepends = libssh2
makedepends = mesa
makedepends = protobuf
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 = aom
makedepends = srt
makedepends = dav1d
makedepends = aribb25
makedepends = avahi
makedepends = dav1d
makedepends = flac
makedepends = gst-plugins-base-libs
makedepends = gtk3
makedepends = jack
makedepends = libass
makedepends = libavc1394
makedepends = libbluray
makedepends = libcaca
makedepends = libdc1394
makedepends = libdvdcss
makedepends = libdvdnav
makedepends = libdvdread
makedepends = libgme
makedepends = libgoom2
makedepends = libjpeg-turbo
makedepends = libkate
makedepends = libmicrodns
makedepends = libmodplug
makedepends = libmtp
makedepends = libnotify
makedepends = libnfs
makedepends = libogg
makedepends = libpng
makedepends = libpulse
makedepends = librsvg
makedepends = libsamplerate
makedepends = libshout
makedepends = libsoxr
makedepends = libssh2
makedepends = libtheora
makedepends = libtiger
makedepends = libvorbis
makedepends = libvpx
makedepends = lirc
makedepends = live-media
makedepends = mesa
makedepends = mpg123
makedepends = opus
makedepends = pcsclite
makedepends = projectm
makedepends = protobuf
makedepends = sdl_image
makedepends = smbclient
makedepends = speex
makedepends = srt
makedepends = systemd-libs
makedepends = twolame
makedepends = vcdimager
makedepends = wayland-protocols
makedepends = x264
makedepends = libx264.so
makedepends = x265
makedepends = libx265.so
makedepends = xosd
makedepends = zvbi
depends = a52dec
depends = libdvbpsi
depends = libxpm
depends = libdca
depends = libproxy
depends = lua
depends = libidn
depends = libmatroska
depends = taglib
depends = libmpcdec
depends = ffmpeg4.4
depends = abseil-cpp
depends = aribb24
depends = bash
depends = cairo
depends = dbus
depends = faad2
depends = ffmpeg4.4
depends = fontconfig
depends = freetype2
depends = fribidi
depends = gcc-libs
depends = gdk-pixbuf2
depends = glib2
depends = glibc
depends = gnutls
depends = harfbuzz
depends = hicolor-icon-theme
depends = libarchive
depends = libdca
depends = libdvbpsi
depends = libglvnd
depends = libidn
depends = libmad
depends = libmatroska
depends = libmpcdec
depends = libmpeg2
depends = xcb-util-keysyms
depends = libtar
depends = libxinerama
depends = libproxy
depends = libsecret
depends = libtar
depends = libupnp
depends = libixml.so
depends = libupnp.so
depends = libarchive
depends = qt5-base
depends = qt5-x11extras
depends = qt5-svg
depends = freetype2
depends = fribidi
depends = harfbuzz
depends = fontconfig
depends = libva
depends = libx11
depends = libxcb
depends = libxinerama
depends = libxml2
depends = gnutls
depends = libplacebo
depends = aribb24
optdepends = avahi: service discovery using bonjour protocol
depends = libxpm
depends = lua
depends = qt5-base
depends = qt5-svg
depends = qt5-x11extras
depends = taglib
depends = wayland
depends = xcb-util-keysyms
depends = zlib
optdepends = aalib: ASCII art video output
optdepends = alsa-lib: ALSA audio output
optdepends = aom: AOM AV1 codec
optdepends = gst-plugins-base-libs: for libgst plugins
optdepends = aribb25: aribcam support
optdepends = avahi: service discovery using bonjour protocol
optdepends = dav1d: dav1d AV1 decoder
optdepends = libdvdcss: decoding encrypted DVDs
optdepends = libavc1394: devices using the 1394ta AV/C
optdepends = libdc1394: IEEE 1394 access 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 = libmtp: MTP devices discovery
optdepends = systemd-libs: udev services discovery
optdepends = smbclient: SMB access plugin
optdepends = libcdio: audio CD playback
optdepends = gnu-free-fonts: subtitle font
optdepends = ttf-dejavu: subtitle font
optdepends = libssh2: sftp access
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 = libdvdread: DVD input module
optdepends = gst-plugins-base-libs: for libgst plugins
optdepends = gstreamer: for libgst plugins
optdepends = gtk3: notification plugin
optdepends = jack: jack audio server
optdepends = kwallet: kwallet keystore
optdepends = libass: Subtitle support
optdepends = libavc1394: devices using the 1394ta AV/C
optdepends = libbluray: Blu-Ray video input
optdepends = libcaca: colored ASCII art video output
optdepends = libcdio: audio CD playback
optdepends = libdc1394: IEEE 1394 access plugin
optdepends = libdvdcss: decoding encrypted DVDs
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 = libdvdread: DVD input module
optdepends = libgme: Game Music Emu plugin
optdepends = libgoom2: Goom visualization
optdepends = libjpeg-turbo: JPEG support
optdepends = libkate: Kate codec
optdepends = libmodplug: MOD output plugin
optdepends = libmicrodns: mDNS services discovery (chromecast etc)
optdepends = libmtp: MTP devices discovery
optdepends = libnfs: NFS access
optdepends = libnotify: notification plugin
optdepends = libogg: Ogg and OggSpots codec
optdepends = libpng: PNG support
optdepends = libpulse: PulseAudio audio output
optdepends = libraw1394: IEEE 1394 access plugin
optdepends = librsvg: SVG plugin
optdepends = libsamplerate: audio Resampler
optdepends = libshout: shoutcast/icecast output plugin
optdepends = libsoxr: SoX audio Resampler
optdepends = libssh2: sftp access
optdepends = libtheora: theora codec
optdepends = libtiger: Tiger rendering for Kate streams
optdepends = libva-intel-driver: video backend intel
optdepends = libva-vdpau-driver: vdpau backend nvidia
optdepends = libvorbis: Vorbis decoder/encoder
optdepends = libvpx: VP8 and VP9 codec
optdepends = lirc: lirc control
optdepends = live-media: streaming over RTSP
optdepends = lua-socket: http interface
optdepends = mpg123: mpg123 codec
optdepends = ncurses: ncurses interface
optdepends = opus: opus codec
optdepends = pcsclite: aribcam support
optdepends = projectm: ProjectM visualisation
optdepends = protobuf: chromecast streaming
optdepends = sdl12-compat: SDL image support
optdepends = sdl_image: SDL image support
optdepends = smbclient: SMB access plugin
optdepends = speex: Speex codec
optdepends = speexdsp: Speex codec
optdepends = srt: SRT input/output plugin
optdepends = systemd-libs: udev services discovery
optdepends = ttf-dejavu: subtitle font
optdepends = twolame: TwoLAME mpeg2 encoder plugin
optdepends = vcdimager: navigate VCD with libvcdinfo
optdepends = x264: H264 encoding
optdepends = x265: HEVC/H.265 encoder
optdepends = zvbi: VBI/Teletext/webcam/v4l2 capture/decoding
optdepends = libass: Subtitle support
optdepends = libkate: Kate codec
optdepends = libtiger: Tiger rendering for Kate streams
optdepends = sdl_image: SDL image support
optdepends = srt: SRT input/output plugin
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 = lirc: lirc control
optdepends = libgoom2: Goom visualization
optdepends = projectm: ProjectM visualisation
optdepends = ncurses: ncurses interface
optdepends = libnotify: notification plugin
optdepends = gtk3: notification plugin
optdepends = aribb25: aribcam support
optdepends = pcsclite: aribcam support
optdepends = live-media: streaming over RTSP
conflicts = vlc-plugin
replaces = vlc-plugin
options = !emptydirs
source = https://download.videolan.org/vlc/3.0.20/vlc-3.0.20.tar.xz
source = https://download.videolan.org/vlc/3.0.20/vlc-3.0.20.tar.xz.asc
source = libplacebo-5.patch
source = update-vlc-plugin-cache.hook
validpgpkeys = 65F7C6B4206BD057A7EB73787180713BE58D1ADC
sha512sums = 02e58fb52dd75bf483ac4b298aecf86463b13d4782173d164adba6e4552d9262ff5e2ee1cbe1bce2c8a809801b79f328c6a8c475d34ae62aefaea02ae5ade406
sha512sums = SKIP
sha512sums = a06b04a8b059dbbef77d27435bd5bec3c26f937390bd112b0843385587e866e617c3dd0e66f99eed5fa4a91bc5f0fd9b5623f65b2f2435a54456dde2aa96209b
sha512sums = b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3
pkgname = vlc

View file

@ -11,104 +11,201 @@ _vlcver=3.0.20
# optional fixup version including hyphen
_vlcfixupver=
pkgver=${_vlcver}${_vlcfixupver//-/.r}
pkgrel=2
pkgrel=4
pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player'
url='https://www.videolan.org/vlc/'
arch=('x86_64')
license=('LGPL2.1' 'GPL2')
# NOTE: switch to ffmpeg4.4, as ffmpeg >= 5 requires extensive changes disabling VAAPI (only supported with vlc >= 4)
depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'libproxy' 'lua' 'libidn'
'libmatroska' 'taglib' 'libmpcdec' 'ffmpeg4.4' 'faad2' 'libmad'
'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' 'aribb24')
makedepends=('gst-plugins-base-libs' 'live-media' 'libnotify' 'libbluray'
'flac' 'libdc1394' 'libavc1394' 'libcaca' 'gtk3'
'librsvg' 'libgme' 'xosd' 'twolame' 'aalib' 'avahi' 'systemd-libs'
'libmtp' 'libmicrodns' 'libdvdcss' 'smbclient'
'vcdimager' 'libssh2' 'mesa' 'protobuf' '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' 'aom' 'srt' 'dav1d'
'aribb25' 'pcsclite' 'wayland-protocols')
# 'chromaprint: Chromaprint audio fingerprinter'
optdepends=('avahi: service discovery using bonjour protocol'
'aom: AOM AV1 codec'
'gst-plugins-base-libs: for libgst plugins'
'dav1d: dav1d AV1 decoder'
'libdvdcss: decoding encrypted DVDs'
'libavc1394: devices using the 1394ta AV/C'
'libdc1394: IEEE 1394 access 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'
'libmtp: MTP devices discovery'
'systemd-libs: udev services discovery'
'smbclient: SMB access plugin'
'libcdio: audio CD playback'
'gnu-free-fonts: subtitle font '
'ttf-dejavu: subtitle font'
'libssh2: sftp access'
'libnfs: NFS access'
'mpg123: mpg123 codec'
'protobuf: chromecast streaming'
'libmicrodns: mDNS services discovery (chromecast etc)'
'lua-socket: http interface'
'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'
'x264: H264 encoding'
'x265: HEVC/H.265 encoder'
'zvbi: VBI/Teletext/webcam/v4l2 capture/decoding'
'libass: Subtitle support'
'libkate: Kate codec'
'libtiger: Tiger rendering for Kate streams'
'sdl_image: SDL image support'
'srt: SRT input/output plugin'
'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'
'lirc: lirc control'
'libgoom2: Goom visualization'
'projectm: ProjectM visualisation'
'ncurses: ncurses interface'
'libnotify: notification plugin'
'gtk3: notification plugin'
'aribb25: aribcam support'
'pcsclite: aribcam support'
'live-media: streaming over RTSP')
license=(
'GPL-2.0-or-later'
'LGPL-2.1-or-later'
)
depends=(
'a52dec'
'abseil-cpp'
'aribb24'
'bash'
'cairo'
'dbus'
'faad2'
'ffmpeg4.4' # NOTE: switch to ffmpeg4.4, as ffmpeg >= 5 requires extensive changes disabling VAAPI (only supported with vlc >= 4)
'fontconfig'
'freetype2'
'fribidi'
'gcc-libs'
'gdk-pixbuf2'
'glib2'
'glibc'
'gnutls'
'harfbuzz'
'hicolor-icon-theme'
'libarchive'
'libdca'
'libdvbpsi'
'libglvnd'
'libidn'
'libmad'
'libmatroska'
'libmpcdec'
'libmpeg2'
'libproxy'
'libsecret'
'libtar'
'libupnp' 'libixml.so' 'libupnp.so'
'libva'
'libx11'
'libxcb'
'libxinerama'
'libxml2'
'libxpm'
'lua'
'qt5-base'
'qt5-svg'
'qt5-x11extras'
'taglib'
'wayland'
'xcb-util-keysyms'
'zlib'
)
makedepends=(
'aalib'
'alsa-lib'
'aom'
'aribb25'
'avahi'
'dav1d'
'flac'
'gst-plugins-base-libs'
'gtk3'
'jack'
'libass'
'libavc1394'
'libbluray'
'libcaca'
'libdc1394'
'libdvdcss'
'libdvdnav'
'libdvdread'
'libgme'
'libgoom2'
'libjpeg-turbo'
'libkate'
'libmicrodns'
'libmodplug'
'libmtp'
'libnotify'
'libnfs'
'libogg'
'libpng'
'libpulse'
'librsvg'
'libsamplerate'
'libshout'
'libsoxr'
'libssh2'
'libtheora'
'libtiger'
'libvorbis'
'libvpx'
'lirc'
'live-media'
'mesa'
'mpg123'
'opus'
'pcsclite'
'projectm'
'protobuf'
'sdl_image'
'smbclient'
'speex'
'srt'
'systemd-libs'
'twolame'
'vcdimager'
'wayland-protocols'
'x264' 'libx264.so'
'x265' 'libx265.so'
'xosd'
'zvbi'
)
optdepends=(
'aalib: ASCII art video output'
'alsa-lib: ALSA audio output'
'aom: AOM AV1 codec'
'aribb25: aribcam support'
'avahi: service discovery using bonjour protocol'
'dav1d: dav1d AV1 decoder'
'flac: Free Lossless Audio Codec plugin'
'gnu-free-fonts: subtitle font '
'gst-plugins-base-libs: for libgst plugins'
'gstreamer: for libgst plugins'
'gtk3: notification plugin'
'jack: jack audio server'
'kwallet: kwallet keystore'
'libass: Subtitle support'
'libavc1394: devices using the 1394ta AV/C'
'libbluray: Blu-Ray video input'
'libcaca: colored ASCII art video output'
'libcdio: audio CD playback'
'libdc1394: IEEE 1394 access plugin'
'libdvdcss: decoding encrypted DVDs'
'libdvdnav: DVD with navigation input module'
'libdvdread: DVD input module'
'libgme: Game Music Emu plugin'
'libgoom2: Goom visualization'
'libjpeg-turbo: JPEG support'
'libkate: Kate codec'
'libmodplug: MOD output plugin'
'libmicrodns: mDNS services discovery (chromecast etc)'
'libmtp: MTP devices discovery'
'libnfs: NFS access'
'libnotify: notification plugin'
'libogg: Ogg and OggSpots codec'
'libpng: PNG support'
'libpulse: PulseAudio audio output'
'libraw1394: IEEE 1394 access plugin'
'librsvg: SVG plugin'
'libsamplerate: audio Resampler'
'libshout: shoutcast/icecast output plugin'
'libsoxr: SoX audio Resampler'
'libssh2: sftp access'
'libtheora: theora codec'
'libtiger: Tiger rendering for Kate streams'
'libva-intel-driver: video backend intel'
'libva-vdpau-driver: vdpau backend nvidia'
'libvorbis: Vorbis decoder/encoder'
'libvpx: VP8 and VP9 codec'
'lirc: lirc control'
'live-media: streaming over RTSP'
'lua-socket: http interface'
'mpg123: mpg123 codec'
'ncurses: ncurses interface'
'opus: opus codec'
'pcsclite: aribcam support'
'projectm: ProjectM visualisation'
'protobuf: chromecast streaming'
'sdl12-compat: SDL image support'
'sdl_image: SDL image support'
'smbclient: SMB access plugin'
'speex: Speex codec'
'speexdsp: Speex codec'
'srt: SRT input/output plugin'
'systemd-libs: udev services discovery'
'ttf-dejavu: subtitle font'
'twolame: TwoLAME mpeg2 encoder plugin'
'vcdimager: navigate VCD with libvcdinfo'
'x264: H264 encoding'
'x265: HEVC/H.265 encoder'
'zvbi: VBI/Teletext/webcam/v4l2 capture/decoding'
)
conflicts=('vlc-plugin')
replaces=('vlc-plugin')
options=('!emptydirs')
source=(https://download.videolan.org/${pkgname}/${_vlcver}/${pkgname}-${_vlcver}${_vlcfixupver}.tar.xz{,.asc}
libplacebo-5.patch
update-vlc-plugin-cache.hook)
source=(
https://download.videolan.org/${pkgname}/${_vlcver}/${pkgname}-${_vlcver}${_vlcfixupver}.tar.xz{,.asc}
update-vlc-plugin-cache.hook
)
sha512sums=('02e58fb52dd75bf483ac4b298aecf86463b13d4782173d164adba6e4552d9262ff5e2ee1cbe1bce2c8a809801b79f328c6a8c475d34ae62aefaea02ae5ade406'
'SKIP'
'a06b04a8b059dbbef77d27435bd5bec3c26f937390bd112b0843385587e866e617c3dd0e66f99eed5fa4a91bc5f0fd9b5623f65b2f2435a54456dde2aa96209b'
'b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3')
validpgpkeys=('65F7C6B4206BD057A7EB73787180713BE58D1ADC') # VideoLAN Release Signing Key
@ -232,7 +329,7 @@ build() {
--enable-kwallet \
--disable-update-check \
--enable-notify \
--enable-libplacebo \
--disable-libplacebo \
--enable-vlc \
--enable-aribsub \
--enable-aribcam \

View file

@ -1,108 +0,0 @@
patch vaguely ported from: https://code.videolan.org/videolan/vlc/-/merge_requests/2233
diff --git a/modules/video_output/opengl/converter.h b/modules/video_output/opengl/converter.h
index 7000e1f..49fa667 100644
--- a/modules/video_output/opengl/converter.h
+++ b/modules/video_output/opengl/converter.h
@@ -26,6 +26,9 @@
#include <vlc_picture_pool.h>
#include <vlc_opengl.h>
+#include <libplacebo/log.h>
+#include <libplacebo/shaders.h>
+
/* if USE_OPENGL_ES2 is defined, OpenGL ES version 2 will be used, otherwise
* normal OpenGL will be used */
#ifdef __APPLE__
@@ -253,10 +256,6 @@ static inline bool HasExtension(const char *apis, const char *api)
return false;
}
-struct pl_context;
-struct pl_shader;
-struct pl_shader_res;
-
/*
* Structure that is filled by "glhw converter" module probe function
* The implementation should initialize every members of the struct that are
@@ -273,7 +272,7 @@ struct opengl_tex_converter_t
vlc_gl_t *gl;
/* libplacebo context, created by the caller (optional) */
- struct pl_context *pl_ctx;
+ pl_log pl_log;
/* Function pointers to OpenGL functions, set by the caller */
const opengl_vtable_t *vt;
@@ -337,7 +336,7 @@ struct opengl_tex_converter_t
bool yuv_color;
GLfloat yuv_coefficients[16];
- struct pl_shader *pl_sh;
+ pl_shader pl_sh;
const struct pl_shader_res *pl_sh_res;
/* Private context */
diff --git a/modules/video_output/opengl/fragment_shaders.c b/modules/video_output/opengl/fragment_shaders.c
index ecf7226..29f4148 100644
--- a/modules/video_output/opengl/fragment_shaders.c
+++ b/modules/video_output/opengl/fragment_shaders.c
@@ -611,7 +611,7 @@ opengl_fragment_shader_init_impl(opengl_tex_converter_t *tc, GLenum tex_target,
#ifdef HAVE_LIBPLACEBO
if (tc->pl_sh) {
- struct pl_shader *sh = tc->pl_sh;
+ pl_shader sh = tc->pl_sh;
struct pl_color_map_params color_params = pl_color_map_default_params;
color_params.intent = var_InheritInteger(tc->gl, "rendering-intent");
color_params.tone_mapping_algo = var_InheritInteger(tc->gl, "tone-mapping");
@@ -634,7 +634,7 @@ opengl_fragment_shader_init_impl(opengl_tex_converter_t *tc, GLenum tex_target,
pl_color_space_from_video_format(&tc->fmt),
dst_space, NULL, false);
- struct pl_shader_obj *dither_state = NULL;
+ pl_shader_obj dither_state = NULL;
int method = var_InheritInteger(tc->gl, "dither-algo");
if (method >= 0) {
diff --git a/modules/video_output/opengl/vout_helper.c b/modules/video_output/opengl/vout_helper.c
index 13d65e0..1ee99af 100644
--- a/modules/video_output/opengl/vout_helper.c
+++ b/modules/video_output/opengl/vout_helper.c
@@ -570,8 +570,7 @@ opengl_deinit_program(vout_display_opengl_t *vgl, struct prgm *prgm)
#ifdef HAVE_LIBPLACEBO
FREENULL(tc->uloc.pl_vars);
- if (tc->pl_ctx)
- pl_context_destroy(&tc->pl_ctx);
+ pl_log_destroy(&tc->pl_log);
#endif
vlc_object_release(tc);
@@ -622,21 +621,21 @@ opengl_init_program(vout_display_opengl_t *vgl, struct prgm *prgm,
// create the main libplacebo context
if (!subpics)
{
- tc->pl_ctx = pl_context_create(PL_API_VER, &(struct pl_context_params) {
+ tc->pl_log = pl_log_create(PL_API_VER, &(struct pl_log_params) {
.log_cb = log_cb,
.log_priv = tc,
.log_level = PL_LOG_INFO,
});
- if (tc->pl_ctx) {
+ if (tc->pl_log) {
# if PL_API_VER >= 20
- tc->pl_sh = pl_shader_alloc(tc->pl_ctx, &(struct pl_shader_params) {
+ tc->pl_sh = pl_shader_alloc(tc->pl_log, &(struct pl_shader_params) {
.glsl.version = tc->glsl_version,
.glsl.gles = tc->is_gles,
});
# elif PL_API_VER >= 6
- tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0);
+ tc->pl_sh = pl_shader_alloc(tc->pl_log, NULL, 0);
# else
- tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0, 0);
+ tc->pl_sh = pl_shader_alloc(tc->pl_log, NULL, 0, 0);
# endif
}
}