diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2023-01-13 17:55:19 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2023-01-13 21:05:42 +0300 |
| commit | 517393d903089f921915530ffa689a7a1d113420 (patch) | |
| tree | 8bac829cbf7fe13f7f1a4d937e1997d923755ed6 /meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc | |
| parent | 98ccb1903bfb490dc6075e694664d8f1edef74dd (diff) | |
| download | openbmc-517393d903089f921915530ffa689a7a1d113420.tar.xz | |
subtree updates Jan-13-2023
meta-openembedded: d04444509a..cd13881611:
Alex Kiernan (10):
mdns: Upgrade 1310.140.1 -> 1790.40.31
mdns: Set MDNS_VERSIONSTR_NODTS
mdns: Upgrade 1790.40.31 -> 1790.60.25
ostree: Upgrade 2022.5 -> 2022.7
ostree: Use systemd_system_unitdir for systemd units
ostree: Switch to fuse3 which is supported in ostree now
ostree: Fix comments for configuration/ptest
ostree: Handle musl's ERANGE mapping
usbguard: Remove pegtl from DEPENDS
usbguard: Upgrade 1.1.1 -> 1.1.2
Alex Stewart (2):
gvfs: stylize DEPENDS
gvfs: obviate the ssh-client requirement for gvfs
Alexander Kanavin (5):
frr: add a patch to correctly check presence of python from pkg-config
lirc: correctly use PYTHONPATH
libportal: move to oe-core
packagegroup-meta-python: drop python3-strict-rfc3339
nftables: fix builds with latest setuptools
Alexander Stein (1):
dool: Add patch to fix rebuild
Archana Polampalli (1):
Nodejs - Upgrade to 16.18.1
Bartosz Golaszewski (3):
python3-kmod: new package
python3-watchdogdev: new package
packagegroup-meta-python: add missing packages
Bruce Ashfield (1):
zfs: update to 2.1.7
Changqing Li (5):
linuxptp: fix do_compile error
keyutils: fix ptest failed since "+++ Can't Determine Endianness"
graphviz: Do not build tcl support for native
redis: 6.2.7 -> 6.2.8
redis: 7.0.5 -> 7.0.7
Chen Pei (2):
suitesparse:fix git branch in SRC_URI
botan: upgrade 2.19.2 -> 2.19.3
Chen Qi (4):
xfce4-verve-plugin: fix do_configure faiure about missing libpcre
networkmanager: fix dhcpcd PACKAGECONFIG
networkmanager: install config files into correct place
networkmanager: fix /etc/resolv.conf handling
Christian Eggers (1):
boost-url: remove recipe
Clément Péron (3):
navigation: bump proj to 9.1.0 library
proj: add a packageconfig to build as a static library
proj: avoid leaking host path in libproj
Devendra Tewari (1):
android-tools: Use echo instead of bbnote
Dmitry Baryshkov (1):
nss: fix cross-compilation error
Erwann Roussy (3):
python3-schedutils: add recipe
python3-linux-procfs: add recipe
tuna: add recipe
Fabio Estevam (2):
remmina: Update to 1.4.28
crucible: Upgrade to 2022.12.06
Geoff Parker (1):
python3-yappi: upgrade 1.3.6 -> 1.4.0, python 3.11 compatible
Gerbrand De Laender (1):
python3-aioserial: new package
Gianfranco Costamagna (2):
vbxguestdrivers: upgrade 7.0.2 -> 7.0.4
boinc-client: Update boinc from 7.18.1 to 7.20.4
Gianluigi Spagnuolo (1):
libbpf: add native and nativesdk BBCLASSEXTEND
Hains van den Bosch (2):
python3-twisted: Add python3-asyncio to RDEPENDS
python3-twisted: Add python3-typing-extensions to RDEPENDS
He Zhe (1):
protobuf: upgrade 3.21.5 -> 3.21.10
Jose Quaresma (1):
lshw: bump to 42fef565
Kai Kang (31):
freeradius: fix multilib systemd service start failure
wxwidgets: 3.1.5 -> 3.2.1
python3-attrdict3: add recipe with version 2.0.2
python3-wxgtk4: 4.1.1 -> 4.2.0
xfce4-settings: 4.16.3 -> 4.16.5
python3-m2crypto: fix CVE-2020-25657 and buildpaths qa issue
fixup! wxwidgets: 3.1.5 -> 3.2.1
postfix: fix multilib conflict of sample-main.cf
python3-wxgtk4: replace deprecated inspect.getargspec
libxfce4ui: 4.16.1 -> 4.18.0
thunar-volman: 4.16.0 -> 4.18.0
xfce4-cpufreq-plugin: 1.2.7 -> 1.2.8
xfce4-wavelan-plugin: 0.6.2 -> 0.6.3
xfce4-cpugraph-plugin: 1.2.6 -> 1.2.7
xfce4-sensors-plugin: 1.4.3 -> 1.4.4
thunar-shares-plugin: Bump GLib minimum required to 2.26
xfce4-dev-tools: 4.16.0 -> 4.18.0
libxfce4util: 4.16.0 -> 4.18.0
exo: 4.16.4 -> 4.18.0
garcon: 4.16.1 -> 4.18.0
xfce4-panel: 4.16.3 -> 4.18.0
thunar: 4.16.9 -> 4.18.0
tumbler: 4.16.0 -> 4.18.0
xfconf: 4.16.0 -> 4.18.0
xfce4-appfinder: 4.16.1 -> 4.18.0
xfce4-settings: 4.16.5 -> 4.18.0
xfce4-power-manager: 4.16.0 -> 4.18.0
xfce4-session: 4.16.0 -> 4.18.0
xfwm4: 4.16.1 -> 4.18.0
xfdesktop: 4.16.0 -> 4.18.0
xorg-lib: set XORG_EXT for recipes
Khem Raj (91):
gnome-text-editor: Add missing libpcre build time depenedency
ettercap: Add missing dependency on libpcre
xcb-util-cursor: Update to 0.1.4
lldpd: Use github release assets for SRC_URI
aufs-util: Fix build with large file support enabled systems
volume-key: Inherit python3targetconfig
proj: Enable apps when building native variant
python3-pyproj: Export PROJ_DIR
satyr: Inherit python3targetconfig
rest: Re-add 0.8.1
gfbgraph: Use rest 0.8.1
audit: Inherit python3targetconfig
opensaf: Check for _FILE_OFFSET_BITS instead of __TIMESIZE
flite: Add missing deps on alsa-lib and chrpath
python3-pystemd: Regenerate .c sources using newer cython
libreport: Inherit python3targetconfig
uw-imap: Disable parallelism
gnome-calendar: Upgrade to 43.1
gnome-photos: Upgrade to 43.0
libgweather: Remove 40.0
waf-samba.bbclass: point PYTHON_CONFIG to target python3-config
amtk: Add missing dep on python3-pygments-native
fontforge: Inherit python3targetconfig
tepl: Add missing dep on python3-pygments-native
alsa-oss: Remove recipe
opencv: Check for commercial_ffmpeg as well to enable ffmpeg
opencv: Fix build with ffmpeg 5.1+
fwts: Upgrade to 22.11.00
minio: Disable on mips
sip: Add recipe for 6.7.5
imapfilter: Upgrade to 2.7.6
perfetto: Do not pass TUNE_CCARGS to native/host compiler
stressapptest: Upgrade to latest tip
mariadb: Upgrade to 10.11.1
surf: Depend on gcr3
fatcat: Enable 64bit off_t
stressapptest: Fix build with largefile support and musl
nspr: Upgrade to 4.35
cryptsetup: Upgrade to 2.6.0
libyui,libyui-ncurses: Upgrade to 4.2.3
inotify-tools: Fix build on musl and lfs64
sdbus-c++-libsystemd: Upgrade to 250.9 systemd release
xfsprogs: Upgrade to 6.0.0
drbd,drbd-utils: Upgrade to 9.2.1 and drbd-utils to 9.22.0
libtraceevent: Add recipe
libtracefs: Add recipe
trace-cmd: Remove use of off64_t and lseek64
xfsdump: Add -D_LARGEFILE64_SOURCE on musl
xfstests: Add -D_LARGEFILE64_SOURCE on musl
mariadb: Alias lseek64/open64/ftruncate64 on musl systems
gperftools: Define off64_t on musl
android-tools: Define lseek64 = lseek on musl
php: Add -D_LARGEFILE64_SOURCE to cflags
spice-gtk: Use libucontext for coroutines on musl
wxwidgets: Fix build with musl
wxwidgets: Fix locale on musl
wxwidgets: Set HAVE_LARGEFILE_SUPPORT
python3-wxgtk4: Do not use GetAssertStackTrace with USE_STACKWALKER disabled
f2fs-tools: Upgrade to 1.15.0
trace-cmd: Pass ldflags to compiler
parole: Define DATADIRNAME
abseil-cpp: Replace off64_t with off_t
vsftpd_3.0.5.bb: Define _LARGEFILE64_SOURCE on musl
mozjs-102: Disable mozilla stackwalk on musl
fatresize: Fix build when 64bit time_t is enabled
boinc-client: Fix build when using 64bit time_t
python3-grpcio: Define -D_LARGEFILE64_SOURCE only for musl
gnome-online-accounts: Fix build race seen on musl systems
imagemagick: Do not set ac_cv_sys_file_offset_bits
spdlog: Do not use LFS64 functions with musl
mongodb: Do not use off64_t on musl
dracut: Do not undefine _FILE_OFFSET_BITS
libcamera: Diable 64bit time_t on glibc targets
v4l-utils: Diable 64bit time_t on glibc targets
opensaf: Fix the check for __fsblkcnt64_t size
libcereal,poco: Link with -latomic on ppc32 as well
sshpass: Use SPDX identified string for GPLv2
nftables: Upgrade to 1.0.6
mycroft: Check for pulseaudio in distro features
trace-cmd: Build libs before building rest
open-vm-tools: Fix build with 64-bit time_t
libtraceevent: Move plugins into package of its own
trace-cmd: Upgrade to 3.1.5
luajit: Update to latest on v2.1 branch
concurrencykit: Update to 0.7.0
concurrencykit: Set correct PLAT value for riscv32
concurrencykit: Fix build on riscv32 and riscv64
sysbench: Enable only on architectures supporting LuaJIT
packagegroup-meta-oe: Ensure sysbench is included in limited arches
hwloc: Update to 2.9.0
fluentbit: Link with libatomic on ppc32
Lei Maohui (1):
polkit: Fix multilib builds
Leon Anavi (9):
python3-watchdog: Upgrade 2.2.0 -> 2.2.1
python3-zeroconf: Upgrade 0.39.4 -> 0.47.1
python3-croniter: Upgrade 1.3.7 -> 1.3.8
python3-coverage: Upgrade 7.0.1 -> 7.0.3
python3-prompt-toolkit: Upgrade 3.0.31 -> 3.0.36
python3-simplejson: Upgrade 3.18.0 -> 3.18.1
python3-termcolor: Upgrade 2.1.1 -> 2.2.0
python3-cantools: Upgrade 37.2.0 -> 38.0.0
python3-marshmallow: Upgrade 3.18.0 -> 3.19.0
Livin Sunny (1):
libwebsockets: add ipv6 in PACKAGECONFIG
Markus Volk (88):
blueman: add RDEPEND on python3-fcntl
hwdata: add patch to use sysroot prefix for pkgdatadir
pipewire: upgrade 0.3.59 -> 0.3.60
spirv-cross: upgrade; fix build
blueman: upgrade 2.34 -> 2.35
pipewire: upgrade 0.3.60 -> 0.3.61
iwd: upgrade 1.30 -> 2.0
libgdata: use gcr3
libgweather: update 4.0.0 -> 4.2.0
gnome-online-accounts: use gcr3
geary: build with gcr3
gnome-keyring: use gcr3
evolution-data-server: update 3.44.2 -> 3.46.1
gnome-settings-daemon: update 42.1 -> 43.0
libnma: update 1.8.38 -> 1.10.4
geocode-glib: build with libsoup-3.0
gjs: update 1.72.2 -> 1.75.1
gnome-shell: update 42.0 -> 43.1
mutter: update 42.0 -> 43.1
polkit: add recipe for v122
mozjs: update 98 -> 102
appstream-glib: update 0.7.18 -> 0.8.2
gthumb: build with libsoup-3
amtk: update 5.3.1 -> 5.6.1
gedit: update 42.2 -> 43.2
evolution-data-server: remove libgdata dependency
tepl: update 6.0.0 -> 6.2.0
perfetto: pass TUNE_CCARGS to use machine tune
gnome-photos: update dependencies
thunar-archive-plugin: update 0.4.0 -> 0.5.0
libadwaita: remove deprecated sassc-native dependency
gnome-shell: remove deprecated sassc-native dependency
spice-gtk: add missing license information
pipewire: update 0.3.61 -> 0.3.62
gdm: update 42.0 -> 43.0
gnome-session: update 42.0 -> 43-0
geoclue: update to latest commit to allow to build with libsoup-3.0
gvfs: fix polkit homedir
editorconfig: add recipe
tracker: update 3.4.1 -> 3.4.2
gvfs: fix dependencies
gnome-calculator: update 42.2 -> 43.0.1
tracker-miners: update 3.4.1 -> 3.4.2
gnome-photos: add missing runtime dependency on tracker-miners
gtksourceview5: update 5.4.2 -> 5.6.1
remmina: build with libsoup-3.0
ostree: replace libsoup-2.4 by curl
gnome-text-editor: update 42.2 -> 43.1
gtk4: remove recipe
libxmlb: allow to build native
pipewire: update 0.3.62 -> 0.3.63
gnome-shell-extensions: update SRC_URI and remove sassc-native dep
grilo: update 0.3.14 -> 0.3.15
libstemmer: move recipe to meta-oe
xdg-desktop-portal: add recipe
bubblewrap: import recipe from meta-security
gnome-software: add recipe
basu: import recipe from meta-wayland
xdg-desktop-portal-wlr: add recipe
appstream: add recipe
flatpak: add recipe
flatpak-xdg-utils: add recipe
flatpak: add runtime dependency on flatpak-xdg-utils
wireplumber: update 0.4.12 -> 0.4.13
wireplumber: build with dbus support by default
xdg-desktop-portal-gnome: add recipe
libcloudproviders: add recipe
evince: update 42.3 -> 43.1
libportal: build libportal-gtk4 and vala support
nautilus: update 42.2 -> 43.1
gnome-desktop: update 42.0 -> 43
file-roller: update 3.42.0 -> 43.0
wireplumber: dont start systemd system service by default
gnome-bluetooth: update 42.4 -> 42.5
gnome-flashback: update 3.44.0 -> 3.46.0
libwnck3: update 40.1 -> 43.0
gnome-panel: update 3.44.0 -> 3.47.1
gnome-terminal: update 3.42.2 -> 3.46.7
dconf-editor: update 3.38.3 -> 43.0
gnome-shell: add missing RDEPENDS
gnome-control-center: update 42.0 -> 43.2
gnome-shell: add runtime dependency on adwaita-icon-theme
xdg-desktop-portal-gtk: add recipe
thunar: add tumbler to RRECOMMENDS
gnome:terminal add missing inherit meson
gnome-disk-utility: update 42.0 -> 43.0
eog: add recipe
libdecor: import recipe
Martin Jansa (3):
nss: fix SRC_URI
geoclue: fix polkit files only with modem-gps PACKAGECONFIG
layer.conf: update LAYERSERIES_COMPAT for mickledore
Mathieu Dubois-Briand (2):
nss: Add missing CVE product
nss: Whitelist CVEs related to libnssdbm
Matthias Klein (1):
paho-mqtt-c: upgrade 1.3.11 -> 1.3.12
Max Krummenacher (1):
opencv: follow changed name license_flags_accepted
Mingli Yu (25):
gnome-calculator: add opengl to REQUIRED_DISTRO_FEATURES
waylandpp: add opengl to REQUIRED_DISTRO_FEATURES
libnma: add opengl to REQUIRED_DISTRO_FEATURES
network-manager-applet: add opengl to REQUIRED_DISTRO_FEATURES
gssdp: check opengl is enabled or not
gtksourceview5: add opengl to REQUIRED_DISTRO_FEATURES
gnome-font-viewer: add opengl to REQUIRED_DISTRO_FEATURES
libxfce4ui: check opengl DISTRO_FEATURES
gnome-desktop: add opengl to REQUIRED_DISTRO_FEATURES
ibus: add opengl related check
nautilus: add opengl to REQUIRED_DISTRO_FEATURES
gnome-bluetooth: add opengl to REQUIRED_DISTRO_FEATURES
evince: add opengl to REQUIRED_DISTRO_FEATURES
gnome-calendar: add opengl to REQUIRED_DISTRO_FEATURES
xf86-video-amdgpu: add opengl to REQUIRED_DISTRO_FEATURES
spice-gtk: add opengl to REQUIRED_DISTRO_FEATURES
grail: add opengl to REQUIRED_DISTRO_FEATURES
frame: add opengl to REQUIRED_DISTRO_FEATURES
geis: add opengl to REQUIRED_DISTRO_FEATURES
evolution-data-server: add opengl to REQUIRED_DISTRO_FEATURES
libgweather4: add opengl to REQUIRED_DISTRO_FEATURES
geary: add opengl to REQUIRED_DISTRO_FEATURES
file-roller: add opengl to REQUIRED_DISTRO_FEATURES
gnome-photos: add opengl to REQUIRED_DISTRO_FEATURES
xdg-desktop-portal-wlr: add opengl to REQUIRED_DISTRO_FEATURES
Naveen Saini (3):
opencl-headers: add native and nativesdk
tcsh: add native nativesdk BBCLASSEXTEND
tbb: upgrade 2021.5.0 -> 2021.7.0
Omkar Patil (1):
ntfs-3g-ntfsprogs: Upgrade 2022.5.17 to 2022.10.3
Ovidiu Panait (1):
multipath-tools: upgrade 0.8.4 -> 0.9.3
Peter Bergin (1):
sysbench: Upgrade 0.4.12 -> 1.0.20
Peter Kjellerstedt (4):
chrony: Make it possible to enable editline support again
chrony: Remove the libcap and nss PACKAGECONFIGs
Revert "lldpd: Use github release assets for SRC_URI"
lldpd: Correct the checksum for the tar ball to match 1.0.16
Preeti Sachan (1):
fluidsynth: update SRC_URI to remove non-existing 2.2.x branch
Roger Knecht (1):
python3-rapidjson: add recipe
Sakib Sajal (1):
minio: fix license information
Samuli Piippo (1):
protobuf: stage protoc binary to sysroot
Tim Orling (4):
libio-pty-perl: upgrade 1.16 -> 1.17; enable ptest
libmozilla-ca-perl: add recipe for 20221114
libio-socket-ssl-perl: upgrade 2.075 -> 2.076
libtest-warnings-perl: move to oe-core
Tomasz Żyjewski (2):
python3-binwalk: add recipe for version 2.3.3
python3-uefi-firmware: add recipe for version 1.9
Wang Mingyu (190):
byacc: upgrade 20220128 -> 20221106
libforms: upgrade 1.2.4 -> 1.2.5pre1
libnftnl: upgrade 1.2.3 -> 1.2.4
mpich: upgrade 4.0.2 -> 4.0.3
python3-u-msgpack-python: upgrade 2.7.1 -> 2.7.2
python3-aiosignal: upgrade 1.2.0 -> 1.3.1
python3-eth-hash: upgrade 0.5.0 -> 0.5.1
python3-frozenlist: upgrade 1.3.1 -> 1.3.3
python3-google-auth: upgrade 2.14.0 -> 2.14.1
python3-greenlet: upgrade 2.0.0 -> 2.0.1
python3-imageio: upgrade 2.22.3 -> 2.22.4
python3-pycocotools: upgrade 2.0.5 -> 2.0.6
babl: upgrade 0.1.96 -> 0.1.98
ctags: upgrade 5.9.20221106.0 -> 5.9.20221113.0
gegl: upgrade 0.4.38 -> 0.4.40
freerdp: upgrade 2.8.1 -> 2.9.0
glibmm-2.68: upgrade 2.72.1 -> 2.74.0
googlebenchmark: upgrade 1.7.0 -> 1.7.1
gnome-backgrounds: upgrade 42.0 -> 43
nano: upgrade 6.4 -> 7.0
networkmanager-openvpn: upgrade 1.10.0 -> 1.10.2
python3-django: upgrade 4.1 -> 4.1.3
python3-flask-migrate: upgrade 3.1.0 -> 4.0.0
python3-eth-utils: upgrade 2.0.0 -> 2.1.0
python3-eventlet: upgrade 0.33.1 -> 0.33.2
python3-googleapis-common-protos: upgrade 1.56.4 -> 1.57.0
python3-google-api-python-client: upgrade 2.65.0 -> 2.66.0
python3-pymongo: upgrade 4.3.2 -> 4.3.3
lldpd: upgrade 1.0.15 -> 1.0.16
audit: upgrade 3.0.8 -> 3.0.9
ccid: upgrade 1.5.0 -> 1.5.1
colord: upgrade 1.4.5 -> 1.4.6
ctags: upgrade 5.9.20221113.0 -> 5.9.20221120.0
flatbuffers: upgrade 22.10.26 -> 22.11.23
libglvnd: upgrade 1.5.0 -> 1.6.0
gensio: upgrade 2.5.2 -> 2.6.1
mg: upgrade 20220614 -> 20221112
nbdkit: upgrade 1.33.2 -> 1.33.3
xfstests: upgrade 2022.10.30 -> 2022.11.06
pcsc-lite: upgrade 1.9.8 -> 1.9.9
python3-matplotlib-inline: upgrade 0.1.2 -> 0.1.6
python3-astroid: upgrade 2.12.12 -> 2.12.13
python3-asyncinotify: upgrade 2.0.5 -> 2.0.8
python3-charset-normalizer: upgrade 3.0.0 -> 3.0.1
python3-dateparser: upgrade 1.1.0 -> 1.1.4
python3-can: upgrade 4.0.0 -> 4.1.0
python3-flask-socketio: upgrade 5.3.1 -> 5.3.2
python3-ipython: upgrade 8.2.0 -> 8.6.0
python3-langtable: upgrade 0.0.60 -> 0.0.61
python3-jedi: upgrade 0.18.1 -> 0.18.2
python3-grpcio-tools: upgrade 1.50.0 -> 1.51.0
python3-grpcio: upgrade 1.50.0 -> 1.51.0
python3-networkx: upgrade 2.8.7 -> 2.8.8
python3-pyatspi: upgrade 2.38.2 -> 2.46.0
python3-pandas: upgrade 1.5.1 -> 1.5.2
python3-pybind11-json: upgrade 0.2.11 -> 0.2.13
python3-pychromecast: upgrade 12.1.4 -> 13.0.1
python3-pycodestyle: upgrade 2.9.1 -> 2.10.0
xterm: upgrade 373 -> 377
smarty: upgrade 4.2.1 -> 4.3.0
spdlog: upgrade 1.10.0 -> 1.11.0
python3-pyperf: upgrade 2.4.1 -> 2.5.0
python3-pyflakes: upgrade 2.5.0 -> 3.0.1
python3-pymisp: upgrade 2.4.157 -> 2.4.165.1
capnproto: upgrade 0.10.2 -> 0.10.3
libass: upgrade 0.16.0 -> 0.17.0
ctags: upgrade 5.9.20221120.0 -> 5.9.20221127.0
libio-socket-ssl-perl: upgrade 2.076 -> 2.077
python3-grpcio-tools: upgrade 1.51.0 -> 1.51.1
python3-asyncinotify: upgrade 2.0.8 -> 3.0.1
python3-grpcio: upgrade 1.51.0 -> 1.51.1
opensc: upgrade 0.22.0 -> 0.23.0
python3-ipython: upgrade 8.6.0 -> 8.7.0
ply: upgrade 2.2.0 -> 2.3.0
python3-apt: upgrade 2.3.0 -> 2.5.0
poppler: upgrade 22.11.0 -> 22.12.0
python3-asttokens: upgrade 2.1.0 -> 2.2.0
python3-cbor2: upgrade 5.4.3 -> 5.4.5
python3-geomet: upgrade 0.3.0 -> 1.0.0
python3-google-api-core: upgrade 2.10.2 -> 2.11.0
python3-google-api-python-client: upgrade 2.66.0 -> 2.68.0
python3-path: upgrade 16.5.0 -> 16.6.0
python3-google-auth: upgrade 2.14.1 -> 2.15.0
zabbix: upgrade 6.2.4 -> 6.2.5
xmlsec1: upgrade 1.2.36 -> 1.2.37
smcroute: upgrade 2.5.5 -> 2.5.6
python3-protobuf: upgrade 4.21.9 -> 4.21.10
python3-traitlets: upgrade 5.5.0 -> 5.6.0
python3-twine: upgrade 4.0.1 -> 4.0.2
python3-web3: upgrade 5.31.1 -> 5.31.2
python3-ujson: upgrade 5.5.0 -> 5.6.0
ctags: upgrade 5.9.20221127.0 -> 5.9.20221204.0
dnsmasq: upgrade 2.87 -> 2.88
flatbuffers: upgrade 22.11.23 -> 22.12.06
nbdkit: upgrade 1.33.3 -> 1.33.4
hwdata: upgrade 0.364 -> 0.365
evolution-data-server: update 3.46.1 -> 3.46.2
xfstests: upgrade 2022.11.06 -> 2022.11.27
python3-protobuf: upgrade 4.21.10 -> 4.21.11
python3-traitlets: upgrade 5.6.0 -> 5.7.0
python3-redis: upgrade 4.3.5 -> 4.4.0
python3-web3: upgrade 5.31.2 -> 5.31.3
python3-asttokens: upgrade 2.2.0 -> 2.2.1
python3-cbor2: upgrade 5.4.5 -> 5.4.6
python3-google-api-python-client: upgrade 2.68.0 -> 2.69.0
python3-gmpy2: upgrade 2.1.2 -> 2.1.3
python3-multidict: upgrade 6.0.2 -> 6.0.3
python3-watchdog: upgrade 2.1.9 -> 2.2.0
python3-pychromecast: upgrade 13.0.1 -> 13.0.2
python3-pymisp: upgrade 2.4.165.1 -> 2.4.166
python3-pytest-xdist: upgrade 3.0.2 -> 3.1.0
python3-yarl: upgrade 1.8.1 -> 1.8.2
zabbix: upgrade 6.2.5 -> 6.2.6
python3-yamlloader: upgrade 1.1.0 -> 1.2.2
tio: upgrade 2.3 -> 2.4
ctags: upgrade 5.9.20221204.0 -> 6.0.20221218.0
dash: upgrade 0.5.11.5 -> 0.5.12
nanopb: upgrade 0.4.6.4 -> 0.4.7
libio-socket-ssl-perl: upgrade 2.077 -> 2.078
libfile-slurper-perl: upgrade 0.013 -> 0.014
protobuf: upgrade 3.21.10 -> 3.21.12
python3-alembic: upgrade 1.8.1 -> 1.9.0
nano: upgrade 7.0 -> 7.1
python3-gmpy2: upgrade 2.1.3 -> 2.1.5
python3-eth-account: upgrade 0.7.0 -> 0.8.0
python3-google-api-python-client: upgrade 2.69.0 -> 2.70.0
python3-protobuf: upgrade 4.21.11 -> 4.21.12
python3-pycares: upgrade 4.2.2 -> 4.3.0
python3-pycurl: upgrade 7.45.1 -> 7.45.2
python3-pychromecast: upgrade 13.0.2 -> 13.0.4
python3-pyproj: upgrade 3.4.0 -> 3.4.1
python3-pydicti: upgrade 1.1.6 -> 1.2.0
python3-sentry-sdk: upgrade 1.11.1 -> 1.12.0
python3-traitlets: upgrade 5.7.0 -> 5.7.1
tio: upgrade 2.4 -> 2.5
python3-sqlalchemy: upgrade 1.4.44 -> 1.4.45
xfsdump: upgrade 3.1.11 -> 3.1.12
python3-isort: upgrade 5.10.1 -> 5.11.3
xfstests: upgrade 2022.11.27 -> 2022.12.11
ctags: upgrade 6.0.20221218.0 -> 6.0.20221225.0
gst-editing-services: upgrade 1.20.4 -> 1.20.5
logcheck: upgrade 1.3.24 -> 1.4.0
memtester: upgrade 4.5.1 -> 4.6.0
libmime-types-perl: upgrade 2.22 -> 2.23
metacity: upgrade 3.46.0 -> 3.46.1
python3-alembic: upgrade 1.9.0 -> 1.9.1
xfstests: upgrade 2022.12.11 -> 2022.12.18
python3-cytoolz: upgrade 0.12.0 -> 0.12.1
python3-asgiref: upgrade 3.5.2 -> 3.6.0
python3-autobahn: upgrade 22.7.1 -> 22.12.1
python3-coverage: upgrade 6.5.0 -> 7.0.1
python3-bitarray: upgrade 2.6.0 -> 2.6.1
python3-imageio: upgrade 2.22.4 -> 2.23.0
python3-isort: upgrade 5.11.3 -> 5.11.4
python3-multidict: upgrade 6.0.3 -> 6.0.4
python3-traitlets: upgrade 5.7.1 -> 5.8.0
python3-pymisp: upgrade 2.4.166 -> 2.4.167
python3-sentry-sdk: upgrade 1.12.0 -> 1.12.1
python3-supervisor: upgrade 4.2.4 -> 4.2.5
wolfssl: upgrade 5.5.3 -> 5.5.4
remmina: upgrade 1.4.28 -> 1.4.29
ser2net: upgrade 4.3.10 -> 4.3.11
tesseract: upgrade 5.2.0 -> 5.3.0
network-manager-applet: upgrade 1.26.0 -> 1.30.0
byacc: upgrade 20221106 -> 20221229
ctags: upgrade 6.0.20221225.0 -> 6.0.20230101.0
flashrom: upgrade 1.2 -> 1.2.1
fontforge: upgrade 20220308 -> 20230101
hunspell: upgrade 1.7.1 -> 1.7.2
libmime-types-perl: upgrade 2.23 -> 2.24
libnet-dns-perl: upgrade 1.35 -> 1.36
tepl: upgrade 6.2.0 -> 6.4.0
tcpdump: upgrade 4.99.1 -> 4.99.2
traceroute: upgrade 2.1.0 -> 2.1.1
openwsman: upgrade 2.7.1 -> 2.7.2
pcsc-tools: upgrade 1.6.0 -> 1.6.1
poppler: upgrade 22.12.0 -> 23.01.0
rsnapshot: upgrade 1.4.4 -> 1.4.5
tree: upgrade 2.0.4 -> 2.1.0
python3-bidict: upgrade 0.22.0 -> 0.22.1
python3-bitarray: upgrade 2.6.1 -> 2.6.2
python3-dateparser: upgrade 1.1.4 -> 1.1.5
python3-lz4: upgrade 4.0.2 -> 4.3.2
python3-mock: upgrade 4.0.3 -> 5.0.0
python3-pillow: upgrade 9.3.0 -> 9.4.0
python3-pydantic: upgrade 1.10.2 -> 1.10.4
python3-pyephem: upgrade 4.1.3 -> 4.1.4
python3-xlsxwriter: upgrade 3.0.3 -> 3.0.5
python3-xxhash: upgrade 3.1.0 -> 3.2.0
dnf-plugins/rpm.py: Fix grammar when RPM_PREFER_ELF_ARCH doesn't exit.
Xiangyu Chen (1):
lldpd: add ptest for lldpd package
Yi Zhao (13):
libpwquality: set correct pam plugin directory
ostree: add runtime dependency bubblewrap for PACKAGECONFIG[selinux]
ostree: fix selinux policy rebuild error on first deployment
frr: upgrade 8.3.1 -> 8.4.1
open-vm-tools: upgrade 12.1.0 -> 12.1.5
libtdb: upgrade 1.4.3 -> 1.4.7
libldb: upgrade 2.3.4 -> 2.6.1
libtalloc: upgrade 2.3.3 -> 2.3.4
libtevent: upgrade 0.10.2 -> 0.13.0
samba upgrade 4.14.14 -> 4.17.4
krb5: upgrade 1.17.2 -> 1.20.1
grubby: update to latest git rev
grubby: drop version 8.40
Zheng Qiu (1):
python3-inotify: add ptest
persianpros (1):
samba: Remove samba related PYTHONHASHSEED patches and use export function
zhengrq.fnst@fujitsu.com (15):
python3-pymodbus: upgrade 3.0.0 -> 3.0.2
python3-pywbemtools: upgrade 1.0.1 -> 1.1.0
python3-stevedore: upgrade 4.1.0 -> 4.1.1
ser2net: upgrade 4.3.9 -> 4.3.10
yelp-tools: upgrade 42.0 -> 42.1
python3-python-vlc: upgrade 3.0.16120 -> 3.0.18121
python3-sqlalchemy: upgrade 1.4.43 -> 1.4.44
python3-zopeinterface: upgrade 5.5.1 -> 5.5.2
python3-simplejson: upgrade 3.17.6 -> 3.18.0
python3-pywbemtools: upgrade 1.0.1 -> 1.1.1
python3-redis: upgrade 4.3.4 -> 4.3.5
python3-texttable: upgrade 1.6.4 -> 1.6.7
python3-sentry-sdk: upgrade 1.9.10 -> 1.11.1
python3-twitter: upgrade 4.10.1 -> 4.12.1
python3-termcolor: upgrade 2.1.0 -> 2.1.1
meta-security: 2aa48e6f4e..f991b20f56:
Alex Kiernan (1):
bubblewrap: Update 0.6.2 -> 0.7.0
Armin Kuster (2):
python3-privacyidea: update to 2.7.4
chipsec: update to 1.9.1
Michael Haener (1):
tpm2-tools: update to 5.3
meta-arm: d5f132b199..5c42f084f7:
Adam Johnston (1):
arm/trusted-services: Fix 'no such file' when building libts
Adrian Herrera (2):
atp: decouple m5readfile from m5ops
atp: move m5readfile to meta-gem5
Adrián Herrera Arcila (5):
atp: fix failing test_readme
gem5: support for EXTRAS
atp: separate recipe for gem5 models
atp: fix machine overrides in recipes
ci: add meta-atp to check-layers
David Bagonyi (1):
meta-arm-toolchain: Drop calls to datastore finalize
Diego Sueiro (2):
arm/classes: Introduce apply_local_src_patches bbclass
arm/trusted-firmware-m: Fix local source patches application
Emekcan (1):
arm/fvp: Upgrade Corstone1000 FVP
Emekcan Aras (6):
arm-bsp/documentation: corstone1000: update the user guide
arm/optee: Move optee-3.18 patches
arm/optee: support optee 3.19
arm-bsp/optee-os: Adds 3.19 bbappend
arm-bsp/optee-os: N1SDP support for optee-os 3.19
arm/qemuarm-secureboot: pin optee-os version
Jon Mason (5):
arm-bsp/trusted-services: rename bbappends with git version
arm/trusted-services: limit the ts compatible machines
arm-bsp/trusted-services: add n1sdp support
arm/trusted-firmware-m: update to 1.6.1
CI: define DEFAULT_TAG and CPU_REQUEST
Khem Raj (1):
gn: Replace lfs64 functions with original counterparts
Mohamed Omar Asaker (5):
arm-bsp/trusted-services: corstone1000: Use the stateless platform service calls
arm-bsp/trusted-firmware-m: Bump TFM to v1.7
arm-bsp/trusted-firmware-m: corstone1000: TFM 1.7
arm-bsp/musca_b1: Edit the platform name
arm-bsp/trusted-firmware-m: Remove TF-M 1.6 recipe
Peter Hoyes (3):
arm/fvp: Backport shlex.join from Python 3.8
arm/fvpboot: Disable timing annotation by default
arm/classes: Ensure patch files are sorted in apply_local_src_patches
Robbie Cao (1):
arm/fvp-base-r-aem: upgrade to version 11.20.15
Ross Burton (17):
CI: revert a meta-clang change which breaks pixman (thus, xserver)
CI: add variables needed for k8s runners
CI: add tags to all jobs
CI: no need to install telnet
CI: fix builds with clang
CI: use the .setup fragment in machine-coverage
arm/fvp-base-a-aem: upgrade to 11.20.15
arm-bsp/edk2-firmware: allow clang builds on juno
ci/get-binary-toolchains: rewrite, slightly
arm-bsp/documentation: update fvp-base documentation to use runfvp
CI: use qemuarm64 for pending-updates report job
meta-atp: remove
meta-gem5: remove
arm/fvp-envelope: name the FVP tarballs for checksums
arm/fvp-envelope: update HOMEPAGE
arm/fvp-base-a-aem: add support for aarch64 binaries
CI: don't pin fvp-base jobs to x86-64
poky: 44bb88cc86..0ce159991d:
Alejandro Hernandez Samaniego (6):
baremetal-image: Avoid overriding qemu variables from IMAGE_CLASSES
rust: Enable building rust from stable, beta and nightly channels
rust: Enable baremetal targets
baremetal-helloworld: Enable x86 and x86-64 ports
baremetal-helloworld: Move from skeleton to recipes-extended matching what rust-hello-world is doing
oe-selftest: Add baremetal toolchain test
Alex Kiernan (20):
rust: Install target.json for target rustc
rust: update 1.65.0 -> 1.66.0
oeqa/runtime/rust: Add basic compile/run test
libstd-rs: Merge .inc into .bb
libstd-rs: Move source directory to library/test
rust-llvm: Merge .inc into .bb
rust-llvm: Update LLVM_VERSION to match embedded version
packagegroup-rust-sdk-target: Add Rust SDK target packagegroup
packagegroup-core-sdk: Add SDK toolchain language selection support
rust: Merge .inc into .bb
rust: Move musl-x86 fix for `__stack_chk_fail_local` to rust-source
cargo: Merge .inc into .bb
cargo: Extend DEBUG_PREFIX_MAP to cover vendor
cargo: Include crossbeam-utils patch
cargo: Drop exclude from world
packagegroup-rust-sdk-target: Add cargo
oeqa/runtime/rust: Add cargo test
classes: image: Set empty weak default IMAGE_LINGUAS
default-distrovars: Include "c" in IMAGE_LINGUAS for glibc
rust: Merge all rustc-source patches into rust-source.inc
Alex Stewart (2):
lsof: add update-alternatives logic
opkg: upgrade to version 0.6.1
Alexander Kanavin (155):
elfutils: update 0.187 -> 0.188
rsync: update 3.2.5 -> 3.2.7
swig: update 4.0.2 -> 4.1.0
tcl: update 8.6.11 -> 8.6.12
quota: update 4.06 -> 4.09
shadow: update 4.12.3 -> 4.13
texinfo: update 6.8 -> 7.0
libhandy: update 1.6.3 -> 1.8.0
xf86-input-mouse: update 1.9.3 -> 1.9.4
flac: update 1.4.0 -> 1.4.2
icu: update 71.1 -> 72-1
libgpg-error: update 1.45 -> 1.46
popt: update 1.18 -> 1.19
vte: update 0.68.0 -> 0.70.1
webkitgtk: update 2.36.7 -> 2.38.2
man-db: update 2.10.2 -> 2.11.1
gawk: update 5.1.1 -> 5.2.1
unfs: update 0.9.22 -> 0.10.0
qemu-helper: depend on unfs3 and pseudo directly
runqemu: do not hardcode the ip address of the nfs server when using tap
selftest/runqemu: reenable the nfs rootfs test
glibc-tests: correctly pull in the actual tests when installing -ptest package
python3: fix tests on x86 (32 bit)
ptest-packagelists.inc: do not run valgrind ptests on 32 bit x86
python3: use the standard shell version of python3-config
python3targetconfig.bbclass: use PYTHONPATH to point to the target config
bitbake: fetch2/wget.py: correctly match versioned directories
devtool/upgrade: correctly handle recipes where S is a subdir of upstream tree
python3-numpy: fix upstream version check
python3-poetry-core: update 1.3.2 -> 1.4.0
tcl: update 8.6.12 -> 8.6.13
libnewt: update 0.52.21 -> 0.52.23
libxdmcp: update 1.1.3 -> 1.1.4
libxpm: update 3.5.13 -> 3.5.14
libxrandr: update 1.5.2 -> 1.5.3
bluez: update 5.65 -> 5.66
libxcrypt: update PV to match SRCREV
python3-dbusmock: update 0.28.4 -> 0.28.6
ruby: merge .inc into .bb
ruby: update 3.1.2 -> 3.1.3
ghostscript: update 9.56.1 -> 10.0.0
tzdata: update 2022d -> 2022g
systemtap: upgrade 4.7 -> 4.8
gnupg: upgrade 2.3.7 -> 2.3.8
ptest-packagelists.inc: correctly assign fast and slow tests
ovmf: update edk2-stable202208 -> edk2-stable202211
llvm: update 15.0.4 -> 15.0.6
tcmode-default.inc: set LLVMVERSION to a major version wildcard
cmake: update 3.24.2 -> 3.25.1
python3-native: further tweak to sysconfig.py to find python includes correctly
libslirp: add recipe to continue slirp support in qemu
qemu: update 7.1.0 -> 7.2.0
systemd: update 251.8 -> 252.4
dpkg: update 1.21.9 -> 1.21.13
python3-installer: update 0.5.1 -> 0.6.0
python3: update 3.11.0 -> 3.11.1
weston: update 11.0.0 -> 11.0.1
xhost: update 1.0.8 -> 1.0.9
xinit: update 1.4.1 -> 1.4.2
xkbcomp: update 1.4.5 -> 1.4.6
xprop: update 1.2.5 -> 1.2.6
xset: update 1.2.4 -> 1.2.5
xvinfo: update 1.1.4 -> 1.1.5
xf86-video-vesa: update 2.5.0 -> 2.6.0
libice: update 1.0.10 -> 1.1.1
libxcomposite: update 0.4.5 -> 0.4.6
libxdamage: update 1.1.5 -> 1.1.6
libxres: update 1.2.1 -> 1.2.2
libxscrnsaver: update 1.2.3 -> 1.2.4
libxv: update 1.0.11 -> 1.0.12
jquery: upgrade 3.6.1 -> 3.6.2
libmodule-build-perl: update 0.4231 -> 0.4232
python3-chardet: upgrade 5.0.0 -> 5.1.0
libarchive: upgrade 3.6.1 -> 3.6.2
stress-ng: upgrade 0.15.00 -> 0.15.01
vulkan: upgrade 1.3.231.1 -> 1.3.236.0
Revert "python3-native: further tweak to sysconfig.py to find python includes correctly"
conf/machine/include: add x86-64-v3 tunes (AVX, AVX2, BMI1, BMI2, F16C, FMA, LZCNT, MOVBE, XSAVE)
go: update 1.19.3 -> 1.19.4
vulkan-samples: update to latest revision
boost-build-native: update 1.80.0 -> 1.81.0
qemu: disable sporadically failing test-io-channel-command
devtool: process local files only for the main branch
libportal: add from meta-openembedded/meta-gnome
libportal: convert from gtk-doc to gi-docgen
epiphany: update 42.4 -> 43.0
qemux86-64: build for x86-64-v3 (2013 Haswell and later) rather than Core 2 from 2006
valgrind: disable tests that started failing after switching to x86-64-v3 target
glib-2.0: upgrade 2.74.3 -> 2.74.4
jquery: upgrade 3.6.2 -> 3.6.3
nasm: update 2.15.05 -> 2.16.01
ffmpeg: use nasm patched-in debug-prefix-map option to restore reproducibility
gtk+3: update 3.24.35 -> 3.24.36
libva-utils: update 2.16.0 -> 2.17.0
xcb-util: update 0.4.0 -> 0.4.1
gnupg: update 2.3.8 -> 2.4.0
libksba: update 1.6.2 -> 1.6.3
python3-pycryptodomex: upgrade 3.15.0 -> 3.16.0
piglit: upgrade to latest revision
python3-setuptools-scm: upgrade 7.0.5 -> 7.1.0
python3-attrs: upgrade 22.1.0 -> 22.2.0
webkitgtk: upgrade 2.38.2 -> 2.38.3
linux-firmware: upgrade 20221109 -> 20221214
harfbuzz: upgrade 5.3.1 -> 6.0.0
python3-pytz: upgrade 2022.6 -> 2022.7
strace: upgrade 6.0 -> 6.1
python3-pycryptodome: upgrade 3.15.0 -> 3.16.0
meson: upgrade 0.64.0 -> 1.0.0
xwayland: upgrade 22.1.5 -> 22.1.7
python3-pyrsistent: upgrade 0.19.2 -> 0.19.3
file: upgrade 5.43 -> 5.44
python3-subunit: upgrade 1.4.1 -> 1.4.2
python3-zipp: upgrade 3.10.0 -> 3.11.0
python3-cryptography: upgrade 38.0.3 -> 38.0.4
logrotate: upgrade 3.20.1 -> 3.21.0
python3-importlib-metadata: upgrade 5.0.0 -> 5.2.0
python3-numpy: upgrade 1.23.4 -> 1.24.1
xserver-xorg: upgrade 21.1.4 -> 21.1.6
puzzles: upgrade to latest revision
vte: upgrade 0.70.1 -> 0.70.2
libpsl: upgrade 0.21.1 -> 0.21.2
libtest-fatal-perl: upgrade 0.016 -> 0.017
python3-urllib3: upgrade 1.26.12 -> 1.26.13
python3-cryptography-vectors: upgrade 38.0.3 -> 38.0.4
python3-setuptools: upgrade 65.5.1 -> 65.6.3
libsdl2: upgrade 2.26.0 -> 2.26.1
python3-gitdb: upgrade 4.0.9 -> 4.0.10
diffoscope: upgrade 224 -> 230
python3-mako: upgrade 1.2.3 -> 1.2.4
python3-sphinx: upgrade 5.3.0 -> 6.0.0
libsolv: upgrade 0.7.22 -> 0.7.23
ruby: upgrade 3.1.3 -> 3.2.0
python3-lxml: upgrade 4.9.1 -> 4.9.2
python3-git: upgrade 3.1.29 -> 3.1.30
curl: upgrade 7.86.0 -> 7.87.0
kmscube: upgrade to latest revision
gobject-introspection: upgrade 1.72.0 -> 1.74.0
python3-dtschema: upgrade 2022.11 -> 2022.12
bash: upgrade 5.2.9 -> 5.2.15
kexec-tools: upgrade 2.0.25 -> 2.0.26
python3-jsonschema: upgrade 4.17.0 -> 4.17.3
python3-pycairo: upgrade 1.21.0 -> 1.23.0
nghttp2: upgrade 1.50.0 -> 1.51.0
python3-certifi: upgrade 2022.9.24 -> 2022.12.7
python3-hypothesis: upgrade 6.57.1 -> 6.61.0
libsndfile1: upgrade 1.1.0 -> 1.2.0
repo: upgrade 2.29.9 -> 2.31
libpcap: upgrade 1.10.1 -> 1.10.2
python3-jsonschema: depend on rfc3339-validator in all cases
python3-strict-rfc3339: remove the recipe
elfutils: do not error out on deprecated declarations
gcr3: limit version check to 3.x versions without odd-even rule
ncurses: restore version check as it's now again working due to release of 6.4
tiff: update 4.4.0 -> 4.5.0
qemu: fix recent reproducibility issues
Alexey Smirnov (1):
classes: make TOOLCHAIN more permissive for kernel
Anton Antonov (1):
rust: Do not use default compiler flags defined in CC crate
Antonin Godard (2):
busybox: always start do_compile with orig config files
busybox: rm temporary files if do_compile was interrupted
Atanas Bunchev (1):
qemu.rst: slirp port forwarding details
Bruce Ashfield (30):
linux-yocto-dev: bump to v6.0+
linux-yocto/5.19: update to v5.19.16
linux-yocto/5.15: update to v5.15.74
linux-yocto/5.19: update to v5.19.17
linux-yocto/5.15: update to v5.15.76
linux-yocto/5.19: cfg: intel and vesa updates
kern-tools: integrate ZFS speedup patch
linux-yocto-dev: bump to v6.1
kernel-devsrc: fix for v6.1+
lttng-modules: fix build for v6.1+
linux-yocto/5.19: security.cfg: remove configs which have been dropped
linux-yocto/5.15: update to v5.15.78
linux-yocto/5.19: fix CONFIG_CRYPTO_CCM mismatch warnings
linux-yocto/5.15: fix CONFIG_CRYPTO_CCM mismatch warnings
linux-yocto/5.19: fix elfutils run-backtrace-native-core ptest failure
linux-libc-headers: add 6.x fetch location
linux-libc-headers: bump to 6.1
linux-yocto/5.19: fix perf build with clang
linux-yocto/5.15: ltp and squashfs fixes
linux-yocto: introduce v6.1 reference kernel recipes
linux-yocto/5.15: fix perf build with clang
linux-yocto/5.15: libbpf: Fix build warning on ref_ctr_off
linux-yocto/5.15: update to v5.15.84
linux-yocto/6.1: update to v6.1.1
linux-yocto/5.15: powerpc: Fix reschedule bug in KUAP-unlocked user copy
linux-yocto/5.19: powerpc: Fix reschedule bug in KUAP-unlocked user copy
linux-yocto/6.1: update to v6.1.3
linux-yocto/6.1: cfg: remove CONFIG_ARM_CRYPTO
yocto-bsps/5.15: update to v5.15.78
linux-yocto/5.15: update to v5.15.80
Carlos Alberto Lopez Perez (3):
xwayland: libxshmfence is needed when dri3 is enabled
recipes: Enable nativesdk for gperf, unifdef, gi-docgen and its dependencies
mesa-gl: gallium is required when enabling x11
Changqing Li (2):
base.bbclass: Fix way to check ccache path
sqlite3: upgrade 3.40.0 -> 3.40.1
Charlie Johnston (1):
opkg: ensure opkg uses private gpg.conf when applying keys.
Chee Yang Lee (1):
migration-guides: add release-notes for 4.1.1
Chen Qi (10):
kernel.bbclass: make KERNEL_DEBUG_TIMESTAMPS work at rebuild
resolvconf: make it work
dhcpcd: fix to work with systemd
bitbake: command.py: cleanup bb.cache.parse_recipe
psplash: consider the situation of psplash not exist for systemd
bc: extend to nativesdk
rm_work: adjust dependency to make do_rm_work_all depend on do_rm_work
selftest: allow '-R' and '-r' be used together
dhcpcd: backport two patches to fix runtime error
libseccomp: fix typo in DESCRIPTION
Christian Eggers (1):
boost: add url lib
David Bagonyi (1):
u-boot: Fix u-boot signing when building with multiple u-boot configs
Dmitry Baryshkov (2):
linux-firmware: upgrade 20221012 -> 20221109
linux-firmware: add new fw file to ${PN}-qcom-adreno-a530
Enguerrand de Ribaucourt (1):
bitbake-layers: fix a typo
Enrico Jörns (1):
sstatesig: emit more helpful error message when not finding sstate manifest
Enrico Scholz (1):
sstate: show progress bar again
Fabre Sébastien (1):
u-boot: Add /boot in SYSROOT_DIRS
Frank de Brabander (4):
bitbake: README: Improve explanation about running the testsuite
bitbake: bin/utils: Ensure locale en_US.UTF-8 is available on the system
bitbake: process: log odd unlink events with bitbake.sock
bitbake: README: add required python version for bitbake
Harald Seiler (1):
opkg: Set correct info_dir and status_file in opkg.conf
Jagadeesh Krishnanjanappa (1):
qemuboot.bbclass: make sure runqemu boots bundled initramfs kernel image
Jan Kircher (1):
toolchain-scripts: compatibility with unbound variable protection
Javier Tia (1):
poky.conf: Add Fedora 36 as supported distro
Joe Slater (2):
python3: Fix CVE-2022-37460
libarchive: fix CVE-2022-36227
Jose Quaresma (2):
Revert "gstreamer1.0: disable flaky gstbin:test_watch_for_state_change test"
gstreamer1.0: Fix race conditions in gstbin tests
Joshua Watt (4):
qemu-helper-native: Correctly pass program name as argv[0]
bitbake: cooker: Use event to terminate parser threads
bitbake: cooker: Start sync thread a little earlier
bitbake: bitbake: Convert to argparse
Kai Kang (4):
xorg-lib-common.inc: set default value of XORG_EXT
libx11-compose-data: 1.6.8 -> 1.8.3
libx11: 1.8.1 -> 1.8.3
libsm: 1.2.3 > 1.2.4
Kasper Revsbech (1):
bitbake: fetch2/wget: handle username/password in uri
Khem Raj (47):
rsync: Delete pedantic errors re-ordering patch
pseudo: Disable LFS on 32bit arches
libxkbcommon: Extend to build native package
iso-codes: Extend to build native packages
xkeyboard-config: Extend to build native package
bluez5: enable position independent executables flag
rpcsvc-proto: Use autoconf knob to enable largefile support
gptfdisk: Enable largefile support functions
libpcre2: Upgrade to 10.42
erofs-utils: Convert from off64_t to off_t
pseudo: Remove 64bit time_t flags
unfs3: Define off64_t in terms of off_t on musl
acpid: Fix largefile enabled build
efivar: Replace off64_t with off_t
ltp: Fix largefile support
acl: Enable largefile support by default
libpciaccess: Do not use 64bit functions for largefile support
mdadm: Use _FILE_OFFSET_BITS to use largefile support
btrfs-tools: Do not use 64bit functions for largefile support
e2fsprogs: Do not use 64bit functions for largefile support
libbsd: Fix build with largefile support
gpgme: Fix with with largefile support
virglrenderer: Replace lseek64 with lseek
nfs-utils: Replace statfs64 with statfs
alsa-utils: Replace off64_t with off_t
lttng-tools: Fix build with largefile support
strace: Add knob to enable largefile support
numactl: Enable largefile support
qemu: Fix build with largefile support
systemd: Fix 252 release build on musl
rust: Do not use open64 on musl in getrandom crate
rust,libstd-rs: Fix build with latest musl
rust-llvm: Fix build on latest musl
cargo: Do not use open64 on musl anymore
llvm: Do not use lseek64
strace: Replace off64_t with off_t in sync_file_range.c test
vulkan-samples: Do not use LFS64 APIs in spdlog
pulseaudio: Do not use 64bit time_t flags
musl: Update to latest on tip of trunk
rust: Fix build with 64bit time_t
stress-ng: Do not enforce gold linker
time64.inc: Add GLIBC_64BIT_TIME_FLAGS on ppc/x86 as well
time64: Remove leading whitespace from GLIBC_64BIT_TIME_FLAGS
mpg123: Enable largefile support
site/powerpc32-linux: Do not cache statvfs64 across glibc and musl
tiff: Add packageconfig knob for webp
site/common-musl: Set ac_cv_sys_file_offset_bits default to 64
Lee Chee Yang (1):
migration-guides: add release-notes for 4.0.6
Luca Boccassi (2):
systemd: refresh patch to remove fuzz introduced by rebase on v252
systemd: ship pcrphase/measure tools and units in systemd-extra-utils
Luis (1):
rm_work.bbclass: use HOSTTOOLS 'rm' binary exclusively
Marek Vasut (5):
bitbake: fetch2/git: Prevent git fetcher from fetching gitlab repository metadata
package_rpm: Fix Linux 6.1.0 perf 1.0 version mistranslation
systemd: Make importd depend on glib-2.0 again
bitbake: bitbake-user-manual: Document override :append, :prepend, :remove order
bitbake: fetch2/git: Clarify the meaning of namespace
Markus Volk (12):
ell: upgrade 0.53 -> 0.54
libsdl2: update 2.24.2 -> 2.26.0
graphene: import from meta-oe
gtk4: import recipe from meta-gnome
gcr: rename gcr -> gcr3
gcr: add recipe for gcr-4, needed to build with gtk4
epiphany: use gcr3
gtk4: add tracker-miners runtime dependency
python3-dbusmock: allow to build native
gtk4: update 4.8.2 -> 4.8.3
gcr3: update 3.40.0 -> 3.41.1
librsvg: enable vapi build
Marta Rybczynska (2):
efibootmgr: update compilation with musl
cve-update-db-native: avoid incomplete updates
Martin Jansa (4):
libxml2: upgrade test data from 20080827 to 20130923
nativesdk-rpm: export RPM_ETCCONFIGDIR and MAGIC in environment like RPM_CONFIGDIR
nativesdk-rpm: don't create wrappers for WRAPPER_TOOLS
tune-x86-64-v3.inc: set QEMU_EXTRAOPTIONS like other tune-* files
Mathieu Dubois-Briand (1):
dbus: Add missing CVE product name
Michael Halstead (1):
uninative: Upgrade to 3.8.1 to include libgcc
Michael Opdenacker (34):
manuals: add missing references to classes
manuals: fix paragraphs with the "inherit" word
ref-manual/classes.rst: remove reference to sip.bbclass
manuals: simplify .gitignore files
manuals: split dev-manual/common-tasks.rst
dev-manual/sbom.rst: minor corrections
bitbake: bitbake-user-manual: update references to Yocto Project manual
bitbake.conf: remove SERIAL_CONSOLE variable
bitbake: bitbake-user-manual: add reference to bitbake git repository
ref-manual: add references to variables only documented in the BitBake manual
manuals: add reference to yocto-docs git repository to page footer
manuals: add missing references to variables
manuals: add missing SPDX license header to source files
manuals: fix double colons
ref-manual/resources.rst: fix formating
ref-manual: update references to release notes
manual: improve documentation about using external toolchains
ref-manual/images.rst: fix unnumbered list
manuals: define proper numbered lists
manuals: final removal of SERIAL_CONSOLE variable
ref-manual/resources.rst: improve description of mailing lists
ref-manual/system-requirements.rst: update buildtools instructions
manuals: create references to buildtools
documentation/poky.yaml.in: update minimum python version to 3.8
manuals: prepare 4.2 migration notes
bitbake: bitbake-user-manual: double colon fix
bitbake: bitbake-user-manual: remove "OEBasic" signature generator
migration-guides: fix 4.2 migration note issues
toaster-manual: fix description of introduction video
ref-manual/classes.rst: remove .bbclass from section titles
manuals: simplify references to classes
migration-1.6.rst: fix redundant reference
ref-manual/system-requirements.rst: recommend buildtools for not supported distros
.gitignore: ignore files generated by Toaster
Mikko Rapeli (5):
qemurunner.py: support setting slirp host IP address
runqemu: limit slirp host port forwarding to localhost 127.0.0.1
qemurunner.py: use IP address from command line
dev-manual/runtime-testing.rst: fix oeqa runtime test path
runqemu: add QB_SETUP_CMD and QB_CLEANUP_CMD
Mingli Yu (8):
tcl: correct the header location in tcl.pc
python3: make tkinter available when enabled
sudo: add selinux and audit PACKAGECONFIG
iproute2: add selinux PACKAGECONFIG
util-linux: add selinux PACKAGECONFIG
cronie: add selinux PACKAGECONFIG
psmisc: add selinux PACKAGECONFIG
gcr: add opengl to REQUIRED_DISTRO_FEATURES
Narpat Mali (2):
ffmpeg: fix for CVE-2022-3964
ffmpeg: fix for CVE-2022-3965
Ola x Nilsson (4):
kbd: Don't build tests
glibc: Add ppoll fortify symbol for 64 bit time_t
insane: Add QA check for 32 bit time and file offset functions
time64.conf: Include to enable 64 bit time flags
Ovidiu Panait (1):
kernel.bbclass: remove empty module directories to prevent QA issues
Patrick Williams (1):
kernel-fitimage: reduce dependency to the cpio
Pavel Zhukov (1):
oeqa/rpm.py: Increase timeout and add debug output
Peter Kjellerstedt (1):
recipes, classes: Avoid adding extra whitespace to PACKAGESPLITFUNCS
Peter Marko (2):
externalsrc: fix lookup for .gitmodules
oeqa/selftest/externalsrc: add test for srctree_hash_files
Petr Kubizňák (1):
harfbuzz: remove bindir only if it exists
Petr Vorel (1):
iputils: update to 20221126
Polampalli, Archana (1):
libpam: fix CVE-2022-28321
Qiu, Zheng (3):
valgrind: remove most hidden tests for arm64
tiff: Security fix for CVE-2022-3970
vim: upgrade 9.0.0820 -> 9.0.0947
Quentin Schulz (4):
cairo: update patch for CVE-2019-6461 with upstream solution
cairo: fix CVE patches assigned wrong CVE number
docs: kernel-dev: faq: update tip on how to not include kernel in image
docs: migration-guides: migration-4.0: specify variable name change for kernel inclusion in image recipe
Randy MacLeod (1):
valgrind: skip the boost_thread test on arm
Ranjitsinh Rathod (1):
curl: Correct LICENSE from MIT-open-group to curl
Ravula Adhitya Siddartha (2):
linux-yocto/5.15: update genericx86* machines to v5.15.78
linux-yocto/5.19: update genericx86* machines to v5.19.17
Richard Purdie (97):
bitbake: cache/cookerdata: Move recipe parsing functions from cache to databuilder
bitbake: cache: Drop broken/unused code
bitbake: cache: Drop unused function
bitbake: server: Ensure cooker profiling works
bitbake: worker/runqueue: Reduce initial data transfer in workerdata
bitbake: cache: Drop support for not saving the cache file
bitbake: runqueue: Add further debug for sstate reuse issues
bitbake: runqueue: Fix race issues around hash equivalence and sstate reuse
bitbake: data/siggen: Switch to use frozensets and optimize
bitbake: data_smart: Add debugging for overrides stability issue
bitbake: utils: Allow to_boolean to support int values
base: Drop do_package base definition
bitbake: data: Drop obsolete pydoc/path code
bitbake: BBHandler: Remove pointless global variable declarations
bitbake: runqueue: Improve error message for missing multiconfig
bitbake: data_smart: Small cache reuse optimization
bitbake.conf: Simplify CACHE setting
oeqa/selftest/tinfoil: Add test for separate config_data with recipe_parse_file()
qemu: Ensure libpng dependency is deterministic
bitbake: data: Tweak code layout
bitbake: cache/siggen: Simplify passing basehash data into the cache
bitbake: siggen/cache: Optionally allow adding siggen hash data to the bitbake cache
bitbake: parse: Add support for addpylib conf file directive and BB_GLOBAL_PYMODULES
bitbake: cookerdata: Ensure layers use LAYERSERIES_COMPAT fairly
base: Switch to use addpylib directive and BB_GLOBAL_PYMODULES
devtool/friends: Use LAYERSERIES_CORENAMES when generating LAYERSERIES_COMPAT entries
scripts/checklayer: Update to match bitbake changes
yocto-check-layer: Allow OE-Core to be tested
bitbake: main: Add timestamp to server retry messages
bitbake: main/server: Add lockfile debugging upon server retry
poky/poky-tiny: Drop largefile mentions
lib/sstatesig: Drop OEBasic siggen
bitbake: siggen: Drop non-multiconfig aware siggen support
bitbake: build/siggen/runqueue: Drop do_setscene references
bitbake: bitbake: Bump minimum python version requirement to 3.8
sanity: Update minimum python version to 3.8
bitbake: main/process: Add extra sockname debugging
Revert "kernel-fitimage: reduce dependency to the cpio"
bitbake: siggen: Directly store datacaches reference
bitbake: bitbake: siggen/runqueue: Switch to using RECIPE_SIGGEN_INFO feature for signature dumping
bitbake: siggen: Add dummy dataCaches from task context/datastore
bitbake: build/siggen: Rework stamps functions
bitbake: siggen: Clarify which fn is meant
bitbake: ast/data/codeparser: Add dependencies from python module functions
bitbake: codeparser/data: Add vardepsexclude support to module dependency code
bitbake.conf: Add module function vardepsexclude entries
time64: Rename to a .inc file to match the others
bitbake: command: Add ping command
bitbake: cache: Allow compression of the data in SiggenRecipeInfo
bitbake: siggen: Minor code improvement
bitbake: server/process: Add bitbake.sock race handling
oeqa/concurrencytest: Add number of failures to summary output
python3-poetry-core: Fix determinism issue breaking reproducibility
bitbake: cache/siggen: Fix cache issues with signature handling
bitbake: event: builtins fix for 'd' deletion
bitbake: cooker: Ensure cache is cleared for partial resets
bitbake: tinfoil: Ensure CommandExit is handled
bitbake: cache: Drop reciever side counting for SiggenRecipeInfo
bitbake: knotty: Avoid looping with tracebacks
bitbake: event: Add enable/disable heartbeat code
bitbake: cooker/cookerdata: Rework the way the datastores are reset
bitbake: server/process: Improve exception and idle function logging
bitbake: command: Tweak finishAsyncCommand ordering to avoid races
bitbake: cooker: Ensure commands clean up any parser processes
bitbake: server/process: Improve idle loop exit code
bitbake: event: Always use threadlock
bitbake: server/process: Add locking around idle functions accesses
bitbake: server/process: Run idle commands in a separate idle thread
bitbake: knotty: Ping the server/cooker periodically
bitbake: cookerdata: Fix cache/reparsing issue
bitbake: cookerdata: Fix previous commit to use a string, not a generator
bitbake: command: Ensure that failure cases call finishAsyncComand
layer.conf: Update to use mickledore as the layer series name
layer.conf: Mark master as compatible with mickledore
bitbake: lib/bb: Update thread/process locks to use a timeout
package: Move fixup_perms function to bb function library
package: Move get_conffiles/files_from_filevars functions to lib
package: Move pkgdata handling functions to oe.packagedata
package: Move emit_pkgdata to packagedata.py
package: Move package functions to function library
package: Drop unused function and obsolete comment
package: Move mapping_rename_hook to packagedata function library
python3-cython: Use PACKAGESPLITFUNCS instead of PACKAGEBUILDPKGD
package: Drop support for PACKAGEBUILDPKGD function customisation
recipes/classes: Drop prepend/append usage with PACKAGESPLITFUNCS
bitbake: cooker: Rework the parsing results submission
bitbake: cooker: Clean up inotify idle handler
uninative-tarball: Add libgcc
patchelf: Add fix submitted upstream for uninative segfaults
bitbake: cooker/command: Drop async command handler indirection via cooker
bitbake: process/cooker/command: Fix currentAsyncCommand locking/races
uninative: Ensure uninative is enabled in all cases for BuildStarted event
qemux86-64: Reduce tuning to core2-64
bitbake: tinfoil: Don't wait for events indefinitely
bitbake: knotty: Improve shutdown handling
bitbake: cooker: Fix exit handling issues
bitbake: server/process: Move heartbeat to idle thread
Robert Andersson (1):
go-crosssdk: avoid host contamination by GOCACHE
Ross Burton (28):
build-appliance-image: Update to master head revision
lib/buildstats: fix parsing of trees with reduced_proc_pressure directories
combo-layer: remove unused import
combo-layer: dont use bb.utils.rename
combo-layer: add sync-revs command
libxml2: upgrade 2.9.14 -> 2.10.3
libxml2: add more testing
python3-packaging: upgrade to 22.0
python3-hatchling: remove python3-tomli DEPENDS
python3-cryptography: remove python3-tomli RDEPENDS
meson: drop redundant is_debianlike() patch
meson: always use meson subcommands
libepoxy: remove upstreamed patch
gtk+3: upgrade 3.24.34 -> 3.24.35
gtk+3: port to Meson
meson: no need to rebuild on install
at-spi2-core: clean up x11 enabling
at-spi2-core: disable API docs if x11 is disabled
gtk+3: fix reproducible builds
lsof: upgrade 4.96.4 -> 4.96.5
pango: upgrade 1.50.11 -> 1.50.12
python3-hatch-vcs: upgrade 0.2.0 -> 0.3.0
python3-hatchling: upgrade 1.11.1 -> 1.12.1
python3-pathspec: upgrade 0.10.1 -> 0.10.3
rm_work: handle non-existant stamps directory
oeqa/selftest/debuginfod: improve testcase
elfutils: disable deprecation errors in all builds, not just native
curl: don't enable debug builds
Ryan Eatmon (1):
go: Update reproducibility patch to fix panic errors
Sandeep Gundlupet Raju (3):
libdrm: Remove libdrm-kms package
kernel-fitimage: Adjust order of dtb/dtbo files
kernel-fitimage: Allow user to select dtb when multiple dtb exists
Saul Wold (1):
at: Change when files are copied
Sergei Zhmylev (1):
oeqa/qemurunner: implement vmdk images support
Tim Orling (7):
python3-hypothesis: upgrade 6.56.4 -> 6.57.1
at-spi2-core: upgrade 2.44.1 -> 2.46.0
mirrors.bbclass: update CPAN_MIRROR
libtry-tiny-perl: add recipe for 0.31
libtest-fatal-perl: add recipe for 0.016
libtest-warnings-perl: move from meta-perl
liburi-perl: upgrade 5.08 -> 5.17
Trevor Woerner (1):
local.conf.sample: update bbclass locations
Vincent Davis Jr (1):
mesa: enable glvnd support
Wang Mingyu (49):
btrfs-tools: upgrade 6.0 -> 6.0.1
libpipeline: upgrade 1.5.6 -> 1.5.7
btrfs-tools: upgrade 6.0.1 -> 6.0.2
bind: upgrade 9.18.8 -> 9.18.9
ccache: upgrade 4.7.2 -> 4.7.4
dropbear: upgrade 2022.82 -> 2022.83
libinput: upgrade 1.21.0 -> 1.22.0
libxft: upgrade 2.3.6 -> 2.3.7
mpfr: upgrade 4.1.0 -> 4.1.1
glib-2.0: upgrade 2.74.1 -> 2.74.3
libxcrypt-compat: upgrade 4.4.30 -> 4.4.33
patchelf: upgrade 0.16.1 -> 0.17.0
pciutils: upgrade 3.8.0 -> 3.9.0
shaderc: upgrade 2022.3 -> 2022.4
sqlite3: upgrade 3.39.4 -> 3.40.0
stress-ng: upgrade 0.14.06 -> 0.15.00
swig: upgrade 4.1.0 -> 4.1.1
texinfo: upgrade 7.0 -> 7.0.1
usbutils: upgrade 014 -> 015
xz: upgrade 5.2.7 -> 5.2.9
wayland-protocols: upgrade 1.28 -> 1.31
gnu-config: upgrade to latest revision
libfontenc: upgrade 1.1.6 -> 1.1.7
libpcre2: upgrade 10.40 -> 10.41
libpng: upgrade 1.6.38 -> 1.6.39
libxau: upgrade 1.0.10 -> 1.0.11
libxkbfile: upgrade 1.1.1 -> 1.1.2
libxshmfence: upgrade 1.3.1 -> 1.3.2
xrandr: upgrade 1.5.1 -> 1.5.2
boost: upgrade 1.80.0 -> 1.81.0
ell: upgrade 0.54 -> 0.55
git: upgrade 2.38.1 -> 2.39.0
help2man: upgrade 1.49.2 -> 1.49.3
iproute2: upgrade 6.0.0 -> 6.1.0
libmpc: upgrade 1.2.1 -> 1.3.1
makedepend: upgrade 1.0.7 -> 1.0.8
psmisc: upgrade 23.5 -> 23.6
xz: upgrade 5.2.9 -> 5.4.0
gstreamer1.0: upgrade 1.20.4 -> 1.20.5
bind: upgrade 9.18.9 -> 9.18.10
btrfs-tools: upgrade 6.0.2 -> 6.1
librepo: upgrade 1.14.5 -> 1.15.1
libsdl2: upgrade 2.26.1 -> 2.26.2
libva-utils: upgrade 2.17.0 -> 2.17.1
libxkbcommon: upgrade 1.4.1 -> 1.5.0
mpfr: upgrade 4.1.1 -> 4.2.0
dpkg: upgrade 1.21.13 -> 1.21.17
rxvt-unicode: upgrade 9.30 -> 9.31
virglrenderer: upgrade 0.10.3 -> 0.10.4
Xiangyu Chen (3):
grub: backport patches to fix CVE-2022-28736
openssh: remove RRECOMMENDS to rng-tools for sshd package
grub2: backport patch to fix CVE-2022-2601 CVE-2022-3775
Yoann Congal (2):
bitbake: Group and reorder options in bitbake help
bitbake: main: Move --buildfile help at the end of "Execution" group
leimaohui (1):
libpng: Enable NEON for aarch64 to enensure consistency with arm32.
pgowda (1):
binutils: Add patch to fix CVE-2022-4285
张忠山 (1):
bitbake: data_smart: Use regex consistently for override matching
meta-raspberrypi: 93dadf336c..896566aa92:
Carlos Alberto Lopez Perez (1):
weston: disablepackageconfig options that fail to build with userland drivers
Khem Raj (2):
lirc: Drop upstreamed patch
linux-raspberrypi.inc: Weakly assign COMPATIBLE_MACHINE
Martin Jansa (2):
bluez5: update patches to apply on 5.66 version
layer.conf: update LAYERSERIES_COMPAT for mickledore
Vincent Davis Jr (5):
rpidistro-vlc,rpidistro-ffmpeg: update COMPATIBLE_HOST regex
rpidistro-vlc: upgrade 3.0.12 -> 3.0.17
rpi-default-providers: add libav and libpostproc
rpidistro-ffmpeg: upgrade 4.3.2 -> 4.3.4
rpidistro-ffmpeg: remove --enable-v4l2-request flag
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Ied8537beedde0f83790e6e3595057db45f408107
Diffstat (limited to 'meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc')
22 files changed, 1151 insertions, 451 deletions
diff --git a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0001-configure-fix-linking-on-RISC-V-ISA.patch b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0001-configure-fix-linking-on-RISC-V-ISA.patch index ac96efad84..3be8f1e026 100644 --- a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0001-configure-fix-linking-on-RISC-V-ISA.patch +++ b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0001-configure-fix-linking-on-RISC-V-ISA.patch @@ -2,11 +2,17 @@ From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= <remi@remlab.net> Date: Sat, 16 Jun 2018 21:31:45 +0300 Subject: configure: fix linking on RISC-V ISA -Upstream-status: Pending +Upstream-Status: Inappropriate + +RPI-Distro repo forks original vlc and applies patches +to enable raspiberry pi support. + --- configure.ac | 1 + 1 file changed, 1 insertion(+) +diff --git a/configure.ac b/configure.ac +index 2037a9e..df26367 100644 --- a/configure.ac +++ b/configure.ac @@ -113,6 +113,7 @@ case "${host_os}" in diff --git a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0002-Revert-configure-Require-libmodplug-0.8.9.patch b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0002-Revert-configure-Require-libmodplug-0.8.9.patch index 3dfcf853b0..61807b3e14 100644 --- a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0002-Revert-configure-Require-libmodplug-0.8.9.patch +++ b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0002-Revert-configure-Require-libmodplug-0.8.9.patch @@ -2,13 +2,18 @@ From: Sebastian Ramacher <sramacher@debian.org> Date: Mon, 19 Aug 2019 21:08:26 +0200 Subject: Revert "configure: Require libmodplug >= 0.8.9" -This reverts commit 48f014768dc22ecad23d0e9f53c38805a3aff832. +Upstream-Status: Inappropriate + +RPI-Distro repo forks original vlc and applies patches +to enable raspiberry pi support. -Upstream-status: Pending +This reverts commit 48f014768dc22ecad23d0e9f53c38805a3aff832. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/configure.ac b/configure.ac +index df26367..b8580ec 100644 --- a/configure.ac +++ b/configure.ac @@ -2207,7 +2207,7 @@ AC_ARG_ENABLE(mod, diff --git a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0003-CVE-2022-41325.patch b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0003-CVE-2022-41325.patch new file mode 100644 index 0000000000..41f7109679 --- /dev/null +++ b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0003-CVE-2022-41325.patch @@ -0,0 +1,83 @@ +From 4fcace61801f418786c42487c6b06b693ee87666 Mon Sep 17 00:00:00 2001 +From: Romain Vimont <rom1v@videolabs.io> +Date: Mon, 19 Sep 2022 17:17:01 +0200 +Subject: [PATCH] vnc: fix possible buffer overflow + +Upstream-Status: Inappropriate + +RPI-Distro repo forks original vlc and applies patches +to enable raspiberry pi support. + +Thanks to 0xMitsurugi [1] from Synacktiv [2] for the bug report and fix. + +[1] https://twitter.com/0xMitsurugi +[2] https://www.synacktiv.com/ + +Fixes #27335 + +(cherry picked from commit 5eb783fd44ed6298db3e38f7765f21c42e4405f9) +--- + modules/access/vnc.c | 23 ++++++++++++++++------- + 1 file changed, 16 insertions(+), 7 deletions(-) + +--- a/modules/access/vnc.c ++++ b/modules/access/vnc.c +@@ -33,6 +33,7 @@ + #ifdef HAVE_CONFIG_H + # include "config.h" + #endif ++#include <assert.h> + + #include <vlc_common.h> + #include <vlc_plugin.h> +@@ -115,7 +116,7 @@ + int i_cancel_state; + + rfbClient* p_client; +- int i_framebuffersize; ++ size_t i_framebuffersize; + block_t *p_block; + + float f_fps; +@@ -143,11 +144,16 @@ + p_sys->es = NULL; + } + +- int i_width = p_client->width; +- int i_height = p_client->height; +- int i_depth = p_client->format.bitsPerPixel; ++ assert(!(p_client->width & ~0xffff)); // fits in 16 bits ++ uint16_t i_width = p_client->width; + +- switch( i_depth ) ++ assert(!(p_client->height & ~0xffff)); // fits in 16 bits ++ uint16_t i_height = p_client->height; ++ ++ uint8_t i_bits_per_pixel = p_client->format.bitsPerPixel; ++ assert((i_bits_per_pixel & 0x7) == 0); // multiple of 8 ++ ++ switch( i_bits_per_pixel ) + { + case 8: + i_chroma = VLC_CODEC_RGB8; +@@ -180,7 +186,10 @@ + } + + /* Set up framebuffer */ +- p_sys->i_framebuffersize = i_width * i_height * i_depth / 8; ++ if (mul_overflow(i_width, i_height * (i_bits_per_pixel / 8), &p_sys->i_framebuffersize)) { ++ msg_Err(p_demux, "VNC framebuffersize overflow"); ++ return FALSE; ++ } + + /* Reuse unsent block */ + if ( p_sys->p_block ) +@@ -211,7 +220,7 @@ + fmt.video.i_frame_rate_base = 1000; + fmt.video.i_frame_rate = 1000 * p_sys->f_fps; + +- fmt.video.i_bits_per_pixel = i_depth; ++ fmt.video.i_bits_per_pixel = i_bits_per_pixel; + fmt.video.i_rmask = p_client->format.redMax << p_client->format.redShift; + fmt.video.i_gmask = p_client->format.greenMax << p_client->format.greenShift; + fmt.video.i_bmask = p_client->format.blueMax << p_client->format.blueShift; diff --git a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0003-mmal_20.patch b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0004-mmal_20.patch index 6038d0ee39..ab317303d9 100644 --- a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0003-mmal_20.patch +++ b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0004-mmal_20.patch @@ -1,4 +1,7 @@ -Upstream-status: Pending +Upstream-Status: Inappropriate + +RPI-Distro repo forks original vlc and applies patches +to enable raspiberry pi support. --- a/configure.ac +++ b/configure.ac @@ -26,13 +29,13 @@ Upstream-status: Pending fi AM_CONDITIONAL([HAVE_MMAL], [test "${have_mmal}" = "yes"]) +AM_CONDITIONAL([HAVE_MMAL_AVCODEC], [test "${enable_mmal_avcodec}" = "yes"]) - + dnl dnl evas plugin --- a/include/vlc_fourcc.h +++ b/include/vlc_fourcc.h @@ -365,6 +365,11 @@ - + /* Broadcom MMAL opaque buffer type */ #define VLC_CODEC_MMAL_OPAQUE VLC_FOURCC('M','M','A','L') +#define VLC_CODEC_MMAL_ZC_SAND8 VLC_FOURCC('Z','S','D','8') @@ -40,7 +43,7 @@ Upstream-status: Pending +#define VLC_CODEC_MMAL_ZC_SAND30 VLC_FOURCC('Z','S','D','3') +#define VLC_CODEC_MMAL_ZC_I420 VLC_FOURCC('Z','4','2','0') +#define VLC_CODEC_MMAL_ZC_RGB32 VLC_FOURCC('Z','R','G','B') - + /* DXVA2 opaque video surface for use with D3D9 */ #define VLC_CODEC_D3D9_OPAQUE VLC_FOURCC('D','X','A','9') /* 4:2:0 8 bpc */ --- a/modules/hw/mmal/Makefile.am @@ -48,12 +51,12 @@ Upstream-status: Pending @@ -1,23 +1,57 @@ include $(top_srcdir)/modules/common.am mmaldir = $(pluginsdir)/mmal - + -AM_CFLAGS += $(CFLAGS_mmal) -AM_LDFLAGS += -rpath '$(mmaldir)' $(LDFLAGS_mmal) +AM_CFLAGS += -pthread $(CFLAGS_mmal) +AM_LDFLAGS += -pthread -rpath '$(mmaldir)' $(LDFLAGS_mmal) - + -libmmal_vout_plugin_la_SOURCES = vout.c mmal_picture.c mmal_picture.h +libmmal_vout_plugin_la_SOURCES = vout.c mmal_cma.c mmal_picture.c subpic.c\ + mmal_cma.h mmal_picture.h subpic.h transform_ops.h\ @@ -63,7 +66,7 @@ Upstream-status: Pending +libmmal_vout_plugin_la_LDFLAGS = $(AM_LDFLAGS) -lm -lX11 -lXrandr libmmal_vout_plugin_la_LIBADD = $(LIBS_mmal) mmal_LTLIBRARIES = libmmal_vout_plugin.la - + -libmmal_codec_plugin_la_SOURCES = codec.c +libmmal_codec_plugin_la_SOURCES = codec.c mmal_cma.c mmal_picture.c subpic.c\ + mmal_cma.h mmal_picture.h subpic.h transform_ops.h\ @@ -72,7 +75,7 @@ Upstream-status: Pending libmmal_codec_plugin_la_LDFLAGS = $(AM_LDFLAGS) libmmal_codec_plugin_la_LIBADD = $(LIBS_mmal) mmal_LTLIBRARIES += libmmal_codec_plugin.la - + -libmmal_deinterlace_plugin_la_SOURCES = deinterlace.c mmal_picture.c +libmmal_deinterlace_plugin_la_SOURCES = deinterlace.c mmal_picture.c mmal_cma.c\ + mmal_cma.h mmal_picture.h transform_ops.h\ @@ -517,7 +520,7 @@ Upstream-status: Pending @@ -26,267 +26,443 @@ #include "config.h" #endif - + +#include <stdatomic.h> + #include <vlc_common.h> @@ -526,17 +529,17 @@ Upstream-status: Pending #include <vlc_codec.h> +#include <vlc_filter.h> #include <vlc_threads.h> - + -#include <bcm_host.h> #include <interface/mmal/mmal.h> #include <interface/mmal/util/mmal_util.h> #include <interface/mmal/util/mmal_default_components.h> - + +#include <interface/vcsm/user-vcsm.h> + +#include "mmal_cma.h" #include "mmal_picture.h" - + +#include "subpic.h" +#include "blend_rgba_neon.h" + @@ -550,18 +553,18 @@ Upstream-status: Pending #define NUM_EXTRA_BUFFERS 5 +//#define NUM_EXTRA_BUFFERS 10 #define NUM_DECODER_BUFFER_HEADERS 30 - + -#define MIN_NUM_BUFFERS_IN_TRANSIT 2 +#define CONVERTER_BUFFERS 4 // Buffers on the output of the converter + +#define MMAL_SLICE_HEIGHT 16 +#define MMAL_ALIGN_W 32 +#define MMAL_ALIGN_H 16 - + #define MMAL_OPAQUE_NAME "mmal-opaque" #define MMAL_OPAQUE_TEXT N_("Decode frames directly into RPI VideoCore instead of host memory.") #define MMAL_OPAQUE_LONGTEXT N_("Decode frames directly into RPI VideoCore instead of host memory. This option must only be used with the MMAL video output plugin.") - + -static int OpenDecoder(decoder_t *dec); -static void CloseDecoder(decoder_t *dec); - @@ -580,7 +583,7 @@ Upstream-status: Pending +#define MMAL_ISP_NAME "mmal-isp" +#define MMAL_ISP_TEXT N_("Use mmal isp rather than hvs.") +#define MMAL_ISP_LONGTEXT N_("Use mmal isp rather than hvs. This may be faster but has no blend.") - + -struct decoder_sys_t { - bool opaque; +typedef struct decoder_sys_t @@ -593,11 +596,11 @@ Upstream-status: Pending + hw_mmal_port_pool_ref_t *ppr; MMAL_ES_FORMAT_T *output_format; - vlc_sem_t sem; - + + MMAL_STATUS_T err_stream; bool b_top_field_first; bool b_progressive; - + + bool b_flushed; + + vcsm_init_type_t vcsm_init_type; @@ -613,7 +616,7 @@ Upstream-status: Pending atomic_bool started; -}; +} decoder_sys_t; - + -/* Utilities */ -static int change_output_format(decoder_t *dec); -static int send_output_buffer(decoder_t *dec); @@ -627,7 +630,7 @@ Upstream-status: Pending -static void control_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer); -static void input_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer); -static void output_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer); - + -static int OpenDecoder(decoder_t *dec) -{ - int ret = VLC_SUCCESS; @@ -647,12 +650,12 @@ Upstream-status: Pending + {{MMAL_PARAMETER_SUPPORTED_ENCODINGS, sizeof(((supported_mmal_enc_t *)0)->supported)}, {0}}, \ + -1 \ +} - + - if (dec->fmt_in.i_codec != VLC_CODEC_MPGV && - dec->fmt_in.i_codec != VLC_CODEC_H264) - return VLC_EGENERIC; +static supported_mmal_enc_t supported_decode_in_enc = SUPPORTED_MMAL_ENC_INIT; - + - sys = calloc(1, sizeof(decoder_sys_t)); - if (!sys) { - ret = VLC_ENOMEM; @@ -672,7 +675,7 @@ Upstream-status: Pending - dec->p_sys = sys; + return false; +} - + - sys->opaque = var_InheritBool(dec, MMAL_OPAQUE_NAME); - bcm_host_init(); +static bool set_and_test_enc_supported(supported_mmal_enc_t * const support, MMAL_PORT_T * port, const MMAL_FOURCC_T fcc) @@ -684,7 +687,7 @@ Upstream-status: Pending + else + support->n = (support->supported.header.size - sizeof(support->supported.header)) / + sizeof(support->supported.encodings[0]); - + - status = mmal_component_create(MMAL_COMPONENT_DEFAULT_VIDEO_DECODER, &sys->component); - if (status != MMAL_SUCCESS) { - msg_Err(dec, "Failed to create MMAL component %s (status=%"PRIx32" %s)", @@ -694,7 +697,7 @@ Upstream-status: Pending - } + return is_enc_supported(support, fcc); +} - + - sys->component->control->userdata = (struct MMAL_PORT_USERDATA_T *)dec; - status = mmal_port_enable(sys->component->control, control_port_cb); - if (status != MMAL_SUCCESS) { @@ -737,7 +740,7 @@ Upstream-status: Pending } + return 0; +} - + - sys->input = sys->component->input[0]; - sys->input->userdata = (struct MMAL_PORT_USERDATA_T *)dec; - if (dec->fmt_in.i_codec == VLC_CODEC_MPGV) @@ -776,7 +779,7 @@ Upstream-status: Pending + } + return 0; +} - + - if (dec->fmt_in.i_codec == VLC_CODEC_H264) { - if (dec->fmt_in.i_extra > 0) { - status = mmal_format_extradata_alloc(sys->input->format, @@ -804,7 +807,7 @@ Upstream-status: Pending } +} +#endif - + - status = mmal_port_format_commit(sys->input); - if (status != MMAL_SUCCESS) { - msg_Err(dec, "Failed to commit format for input port %s (status=%"PRIx32" %s)", @@ -822,7 +825,7 @@ Upstream-status: Pending - sys->input->buffer_size = sys->input->buffer_size_recommended; - sys->input->buffer_num = sys->input->buffer_num_recommended; +} - + - status = mmal_port_enable(sys->input, input_port_cb); - if (status != MMAL_SUCCESS) { - msg_Err(dec, "Failed to enable input port %s (status=%"PRIx32" %s)", @@ -830,7 +833,7 @@ Upstream-status: Pending - ret = VLC_EGENERIC; - goto out; - } - + - sys->output = sys->component->output[0]; - sys->output->userdata = (struct MMAL_PORT_USERDATA_T *)dec; +static void draw_corners(void * pic_buf, size_t pic_stride, unsigned int x, unsigned int y, unsigned int w, unsigned int h) @@ -846,7 +849,7 @@ Upstream-status: Pending + draw_line(pic_buf, pic_stride, x, y + h - 1, len, -(int)pic_stride); +} +#endif - + - if (sys->opaque) { - extra_buffers.hdr.id = MMAL_PARAMETER_EXTRA_BUFFERS; - extra_buffers.hdr.size = sizeof(MMAL_PARAMETER_UINT32_T); @@ -863,7 +866,7 @@ Upstream-status: Pending +{ + static const unsigned int primes[] = {2, 3, 5, 7, 11, 13, 17, 19, 23, 0}; + const unsigned int * p = primes; - + - msg_Dbg(dec, "Activate zero-copy for output port"); - MMAL_PARAMETER_BOOLEAN_T zero_copy = { - { MMAL_PARAMETER_ZERO_COPY, sizeof(MMAL_PARAMETER_BOOLEAN_T) }, @@ -873,7 +876,7 @@ Upstream-status: Pending + if (num == 0 || den == 0) { + return (MMAL_RATIONAL_T){.num = 0, .den = 0}; + } - + - status = mmal_port_parameter_set(sys->output, &zero_copy.hdr); - if (status != MMAL_SUCCESS) { - msg_Err(dec, "Failed to set zero copy on port %s (status=%"PRIx32" %s)", @@ -889,7 +892,7 @@ Upstream-status: Pending } + return (MMAL_RATIONAL_T){.num = num, .den = den}; +} - + - status = mmal_port_enable(sys->output, output_port_cb); - if (status != MMAL_SUCCESS) { - msg_Err(dec, "Failed to enable output port %s (status=%"PRIx32" %s)", @@ -901,7 +904,7 @@ Upstream-status: Pending +static picture_t * alloc_opaque_pic(decoder_t * const dec, MMAL_BUFFER_HEADER_T * const buf) +{ + decoder_sys_t *const dec_sys = dec->p_sys; - + - status = mmal_component_enable(sys->component); - if (status != MMAL_SUCCESS) { - msg_Err(dec, "Failed to enable component %s (status=%"PRIx32" %s)", @@ -919,11 +922,11 @@ Upstream-status: Pending + msg_Err(dec, "%s: Empty buffer", __func__); + goto fail2; } - + - sys->input_pool = mmal_pool_create(sys->input->buffer_num, 0); + if ((pic->context = hw_mmal_gen_context(buf, dec_sys->ppr)) == NULL) + goto fail2; - + - if (sys->opaque) { - dec->fmt_out.i_codec = VLC_CODEC_MMAL_OPAQUE; - dec->fmt_out.video.i_chroma = VLC_CODEC_MMAL_OPAQUE; @@ -961,22 +964,22 @@ Upstream-status: Pending + msg_Err(dec, "MMAL error %"PRIx32" \"%s\"", status, + mmal_status_to_string(status)); } - + - dec->pf_decode = decode; - dec->pf_flush = flush_decoder; + mmal_buffer_header_release(buffer); +} - + - vlc_sem_init(&sys->sem, 0); +static void input_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer) +{ + block_t * const block = (block_t *)buffer->user_data; - + -out: - if (ret != VLC_SUCCESS) - CloseDecoder(dec); + (void)port; // Unused - + - return ret; +#if TRACE_ALL + msg_Dbg((decoder_t *)port->userdata, "<<< %s: cmd=%d, data=%p, len=%d/%d, pts=%lld", __func__, @@ -989,14 +992,14 @@ Upstream-status: Pending + if (block != NULL) + block_Release(block); } - + -static void CloseDecoder(decoder_t *dec) +static void decoder_output_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer) { - decoder_sys_t *sys = dec->p_sys; - MMAL_BUFFER_HEADER_T *buffer; + decoder_t * const dec = (decoder_t *)port->userdata; - + - if (!sys) + if (buffer->cmd == 0 && buffer->length != 0) + { @@ -1016,7 +1019,7 @@ Upstream-status: Pending + // Buffer released or attached to pic - do not release again return; + } - + - if (sys->component && sys->component->control->is_enabled) - mmal_port_disable(sys->component->control); + if (buffer->cmd == MMAL_EVENT_FORMAT_CHANGED) @@ -1024,7 +1027,7 @@ Upstream-status: Pending + decoder_sys_t * const sys = dec->p_sys; + MMAL_EVENT_FORMAT_CHANGED_T * const fmt = mmal_event_format_changed_get(buffer); + MMAL_ES_FORMAT_T * const format = mmal_format_alloc(); - + - if (sys->input && sys->input->is_enabled) - mmal_port_disable(sys->input); + if (format == NULL) @@ -1033,7 +1036,7 @@ Upstream-status: Pending + { + mmal_format_full_copy(format, fmt->format); + format->encoding = MMAL_ENCODING_OPAQUE; - + - if (sys->output && sys->output->is_enabled) - mmal_port_disable(sys->output); + // If no PAR in the stream - see if we've got one from the demux @@ -1057,17 +1060,17 @@ Upstream-status: Pending + d = 1; + } + } - + - if (sys->component && sys->component->is_enabled) - mmal_component_disable(sys->component); + format->es->video.par = rationalize_sar(n, d); + } - + - if (sys->input_pool) - mmal_pool_destroy(sys->input_pool); + if (sys->output_format != NULL) + mmal_format_free(sys->output_format); - + - if (sys->output_format) - mmal_format_free(sys->output_format); + sys->output_format = format; @@ -1077,7 +1080,7 @@ Upstream-status: Pending + char buf0[5]; + msg_Warn(dec, "Unexpected output cb event: %s", str_fourcc(buf0, buffer->cmd)); + } - + - if (sys->output_pool) - mmal_pool_destroy(sys->output_pool); + // If we get here then we were flushing (cmd == 0 && len == 0) or @@ -1087,13 +1090,13 @@ Upstream-status: Pending + buffer->user_data = NULL; + mmal_buffer_header_release(buffer); +} - + - if (sys->component) - mmal_component_release(sys->component); - + - vlc_sem_destroy(&sys->sem); - free(sys); - + - bcm_host_deinit(); +static void fill_output_port(decoder_t *dec) +{ @@ -1113,7 +1116,7 @@ Upstream-status: Pending + hw_mmal_port_pool_ref_fill(sys->ppr); + return; } - + static int change_output_format(decoder_t *dec) { MMAL_PARAMETER_VIDEO_INTERLACE_TYPE_T interlace_type; @@ -1122,7 +1125,7 @@ Upstream-status: Pending MMAL_STATUS_T status; - int pool_size; int ret = 0; - + +#if TRACE_ALL + msg_Dbg(dec, "%s: <<<", __func__); +#endif @@ -1132,7 +1135,7 @@ Upstream-status: Pending status = mmal_port_format_commit(sys->output); @@ -300,7 +476,9 @@ static int change_output_format(decoder_ } - + port_reset: +#if TRACE_ALL msg_Dbg(dec, "%s: Do full port reset", __func__); @@ -1142,7 +1145,7 @@ Upstream-status: Pending msg_Err(dec, "Failed to disable output port (status=%"PRIx32" %s)", @@ -310,6 +488,7 @@ port_reset: } - + mmal_format_full_copy(sys->output->format, sys->output_format); + status = mmal_port_format_commit(sys->output); @@ -1151,7 +1154,7 @@ Upstream-status: Pending @@ -318,18 +497,10 @@ port_reset: goto out; } - + - if (sys->opaque) { - sys->output->buffer_num = NUM_DECODER_BUFFER_HEADERS; - pool_size = NUM_DECODER_BUFFER_HEADERS; @@ -1163,7 +1166,7 @@ Upstream-status: Pending - + sys->output->buffer_num = NUM_DECODER_BUFFER_HEADERS; sys->output->buffer_size = sys->output->buffer_size_recommended; - + - status = mmal_port_enable(sys->output, output_port_cb); + status = mmal_port_enable(sys->output, decoder_output_cb); if (status != MMAL_SUCCESS) { @@ -1171,7 +1174,7 @@ Upstream-status: Pending status, mmal_status_to_string(status)); @@ -338,25 +509,14 @@ port_reset: } - + if (!atomic_load(&sys->started)) { - if (!sys->opaque) { - sys->output_pool = mmal_port_pool_create(sys->output, pool_size, 0); @@ -1179,7 +1182,7 @@ Upstream-status: Pending - } - atomic_store(&sys->started, true); - + /* we need one picture from vout for each buffer header on the output * port */ - dec->i_extra_picture_buffers = pool_size; @@ -1196,7 +1199,7 @@ Upstream-status: Pending msg_Dbg(dec, "Request %d extra pictures", dec->i_extra_picture_buffers); +#endif } - + apply_fmt: @@ -366,8 +526,8 @@ apply_fmt: dec->fmt_out.video.i_y_offset = sys->output->format->es->video.crop.y; @@ -1208,7 +1211,7 @@ Upstream-status: Pending + dec->fmt_out.video.i_sar_den = sys->output_format->es->video.par.den; dec->fmt_out.video.i_frame_rate = sys->output->format->es->video.frame_rate.num; dec->fmt_out.video.i_frame_rate_base = sys->output->format->es->video.frame_rate.den; - + @@ -382,12 +542,19 @@ apply_fmt: sys->b_progressive = (interlace_type.eMode == MMAL_InterlaceProgressive); sys->b_top_field_first = sys->b_progressive ? true : @@ -1220,7 +1223,7 @@ Upstream-status: Pending interlace_type.eMode); +#endif } - + + // Tell the rest of the world we have changed format + vlc_mutex_lock(&sys->pic_lock); + ret = decoder_UpdateVideoFormat(dec); @@ -1232,7 +1235,7 @@ Upstream-status: Pending @@ -395,144 +562,85 @@ out: return ret; } - + -static int send_output_buffer(decoder_t *dec) +static MMAL_STATUS_T +set_extradata_and_commit(decoder_t * const dec, decoder_sys_t * const sys) @@ -1244,7 +1247,7 @@ Upstream-status: Pending MMAL_STATUS_T status; - unsigned buffer_size = 0; - int ret = 0; - + - if (!sys->output->is_enabled) - return VLC_EGENERIC; - @@ -1318,7 +1321,7 @@ Upstream-status: Pending - return ret; + return status; } - + -static void fill_output_port(decoder_t *dec) +static MMAL_STATUS_T decoder_send_extradata(decoder_t * const dec, decoder_sys_t *const sys) { @@ -1341,7 +1344,7 @@ Upstream-status: Pending + buf->length = dec->fmt_in.i_extra; + buf->data = dec->fmt_in.p_extra; + buf->flags = MMAL_BUFFER_HEADER_FLAG_CONFIG; - + - if (sys->output_pool) { - max_buffers_in_transit = __MAX(sys->output_pool->headers_num, - MIN_NUM_BUFFERS_IN_TRANSIT); @@ -1357,7 +1360,7 @@ Upstream-status: Pending + } } - buffers_to_send = max_buffers_in_transit - atomic_load(&sys->output_in_transit); - + - if (buffers_to_send > buffers_available) - buffers_to_send = buffers_available; - @@ -1373,14 +1376,14 @@ Upstream-status: Pending - break; + return MMAL_SUCCESS; } - + static void flush_decoder(decoder_t *dec) { - decoder_sys_t *sys = dec->p_sys; - MMAL_BUFFER_HEADER_T *buffer; - MMAL_STATUS_T status; + decoder_sys_t *const sys = dec->p_sys; - + - msg_Dbg(dec, "Flushing decoder ports..."); - mmal_port_flush(sys->output); - mmal_port_flush(sys->input); @@ -1404,7 +1407,7 @@ Upstream-status: Pending + msg_Dbg(dec, "%s: >>>", __func__); +#endif } - + static int decode(decoder_t *dec, block_t *block) { decoder_sys_t *sys = dec->p_sys; @@ -1414,7 +1417,7 @@ Upstream-status: Pending - uint32_t flags = 0; + uint32_t flags = MMAL_BUFFER_HEADER_FLAG_FRAME_START; MMAL_STATUS_T status; - + +#if TRACE_ALL + msg_Dbg(dec, "<<< %s: %lld/%lld", __func__, block == NULL ? -1LL : block->i_dts, block == NULL ? -1LL : block->i_pts); +#endif @@ -1431,12 +1434,12 @@ Upstream-status: Pending @@ -541,18 +649,50 @@ static int decode(decoder_t *dec, block_ msg_Err(dec, "Failed to change output port format"); } - + - if (!block) - goto out; + if (block == NULL) + return VLCDEC_SUCCESS; - + /* * Check whether full flush is required */ @@ -1453,7 +1456,7 @@ Upstream-status: Pending block_Release(block); return VLCDEC_SUCCESS; } - + + // Reenable stuff if the last thing we did was flush + if (!sys->output->is_enabled && + (status = mmal_port_enable(sys->output, decoder_output_cb)) != MMAL_SUCCESS) @@ -1481,11 +1484,11 @@ Upstream-status: Pending + // reported the size & the output stages have been set up if (atomic_load(&sys->started)) fill_output_port(dec); - + @@ -563,18 +703,21 @@ static int decode(decoder_t *dec, block_ if (block->i_flags & BLOCK_FLAG_CORRUPTED) flags |= MMAL_BUFFER_HEADER_FLAG_CORRUPTED; - + - while (block && block->i_buffer > 0) { - buffer = mmal_queue_timedwait(sys->input_pool->queue, 100); + while (block != NULL) @@ -1506,7 +1509,7 @@ Upstream-status: Pending buffer->dts = block->i_dts; buffer->alloc_size = sys->input->buffer_size; + buffer->user_data = NULL; - + len = block->i_buffer; if (len > buffer->alloc_size) @@ -585,94 +728,1808 @@ static int decode(decoder_t *dec, block_ @@ -1522,7 +1525,7 @@ Upstream-status: Pending block = NULL; } buffer->flags = flags; - + +#if TRACE_ALL + msg_Dbg(dec, "%s: -- Send buffer: cmd=%d, data=%p, size=%d, len=%d, offset=%d, flags=%#x, pts=%lld, dts=%lld", __func__,\ + buffer->cmd, buffer->data, buffer->alloc_size, buffer->length, buffer->offset, @@ -1542,17 +1545,17 @@ Upstream-status: Pending + flags &= ~MMAL_BUFFER_HEADER_FLAG_FRAME_START; } + return VLCDEC_SUCCESS; - + -out: - if (need_flush) - flush_decoder(dec); +fail: + flush_decoder(dec); + return VLCDEC_ECRITICAL; - + - return VLCDEC_SUCCESS; } - + -static void control_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer) + +static void CloseDecoder(decoder_t *dec) @@ -1921,7 +1924,7 @@ Upstream-status: Pending +#if TRACE_ALL + msg_Dbg(p_filter, "%s: <<< cmd=%d, data=%p, pic=%p", __func__, buffer->cmd, buffer->data, buffer->user_data); +#endif - + if (buffer->cmd == MMAL_EVENT_ERROR) { - status = *(uint32_t *)buffer->data; - msg_Err(dec, "MMAL error %"PRIx32" \"%s\"", status, @@ -1932,10 +1935,10 @@ Upstream-status: Pending + msg_Err(p_filter, "MMAL error %"PRIx32" \"%s\"", status, mmal_status_to_string(status)); } - + mmal_buffer_header_release(buffer); } - + -static void input_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer) +static void conv_input_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buf) { @@ -1967,14 +1970,14 @@ Upstream-status: Pending + vlc_mutex_lock(&sys->lock); + pic_fifo_put(&sys->ret_pics, pic); + vlc_mutex_unlock(&sys->lock); - + - mmal_buffer_header_release(buffer); - if (block) - block_Release(block); - atomic_fetch_sub(&sys->input_in_transit, 1); vlc_sem_post(&sys->sem); } - + -static void output_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer) +static void conv_output_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buf) { @@ -2006,7 +2009,7 @@ Upstream-status: Pending - fmt = mmal_event_format_changed_get(buffer); + filter_t * const p_filter = (filter_t *)port->userdata; + filter_sys_t * const sys = p_filter->p_sys; - + - format = mmal_format_alloc(); - mmal_format_full_copy(format, fmt->format); +#if TRACE_ALL @@ -2016,7 +2019,7 @@ Upstream-status: Pending +#endif + if (buf->cmd == 0) { + picture_t * const pic = (picture_t *)buf->user_data; - + - if (sys->opaque) - format->encoding = MMAL_ENCODING_OPAQUE; + if (pic == NULL) { @@ -2713,9 +2716,9 @@ Upstream-status: Pending + if (use_isp || use_resizer) + return VLC_EGENERIC; + } - + - sys->output_format = format; - + - mmal_buffer_header_release(buffer); + if (use_resizer) { + // use resizer overrides use_isp @@ -3858,7 +3861,7 @@ Upstream-status: Pending @@ -26,11 +26,12 @@ #include "config.h" #endif - + -#include <vlc_picture_pool.h> +#include <stdatomic.h> + @@ -3867,31 +3870,31 @@ Upstream-status: Pending #include <vlc_plugin.h> #include <vlc_filter.h> -#include <vlc_atomic.h> - + #include "mmal_picture.h" - + @@ -39,468 +40,814 @@ #include <interface/mmal/util/mmal_util.h> #include <interface/mmal/util/mmal_default_components.h> - + -#define MIN_NUM_BUFFERS_IN_TRANSIT 2 +#define MMAL_DEINTERLACE_NO_QPU "mmal-deinterlace-no-qpu" +#define MMAL_DEINTERLACE_NO_QPU_TEXT N_("Do not use QPUs for advanced HD deinterlacing.") +#define MMAL_DEINTERLACE_NO_QPU_LONGTEXT N_("Do not make use of the QPUs to allow higher quality deinterlacing of HD content.") - + -#define MMAL_DEINTERLACE_QPU "mmal-deinterlace-adv-qpu" -#define MMAL_DEINTERLACE_QPU_TEXT N_("Use QPUs for advanced HD deinterlacing.") -#define MMAL_DEINTERLACE_QPU_LONGTEXT N_("Make use of the QPUs to allow higher quality deinterlacing of HD content.") +#define MMAL_DEINTERLACE_ADV "mmal-deinterlace-adv" +#define MMAL_DEINTERLACE_ADV_TEXT N_("Force advanced deinterlace") +#define MMAL_DEINTERLACE_ADV_LONGTEXT N_("Force advanced deinterlace") - + -static int Open(filter_t *filter); -static void Close(filter_t *filter); +#define MMAL_DEINTERLACE_FAST "mmal-deinterlace-fast" +#define MMAL_DEINTERLACE_FAST_TEXT N_("Force fast deinterlace") +#define MMAL_DEINTERLACE_FAST_LONGTEXT N_("Force fast deinterlace") - + -vlc_module_begin() - set_shortname(N_("MMAL deinterlace")) - set_description(N_("MMAL-based deinterlace filter plugin")) @@ -3915,7 +3918,7 @@ Upstream-status: Pending +#define MMAL_DEINTERLACE_FULL_RATE "mmal-deinterlace-full-rate" +#define MMAL_DEINTERLACE_FULL_RATE_TEXT N_("Full output framerate") +#define MMAL_DEINTERLACE_FULL_RATE_LONGTEXT N_("Full output framerate. 1 output frame for each interlaced field input") - + -struct filter_sys_t { + +typedef struct filter_sys_t @@ -3940,14 +3943,14 @@ Upstream-status: Pending + bool use_passthrough; + unsigned int seq_in; // Seq of next frame to submit (1-15) [Init=1] + unsigned int seq_out; // Seq of last frame received (1-15) [Init=15] - + - MMAL_QUEUE_T *filtered_pictures; - vlc_sem_t sem; + vcsm_init_type_t vcsm_init_type; - + - atomic_bool started; +} filter_sys_t; - + - /* statistics */ - int output_in_transit; - int input_in_transit; @@ -3958,9 +3961,9 @@ Upstream-status: Pending -static void output_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer); -static picture_t *deinterlace(filter_t *filter, picture_t *picture); -static void flush(filter_t *filter); - + #define MMAL_COMPONENT_DEFAULT_DEINTERLACE "vc.ril.image_fx" - + -static int Open(filter_t *filter) +#define TRACE_ALL 0 + @@ -3975,7 +3978,7 @@ Upstream-status: Pending - bool use_qpu = var_InheritBool(filter, MMAL_DEINTERLACE_QPU); + filter_sys_t *const filter_sys = p_filter->p_sys; + picture_t * const pic = filter_NewPicture(p_filter); - + - MMAL_PARAMETER_IMAGEFX_PARAMETERS_T imfx_param = { - { MMAL_PARAMETER_IMAGE_EFFECT_PARAMETERS, sizeof(imfx_param) }, - MMAL_PARAM_IMAGEFX_DEINTERLACE_ADV, @@ -3984,7 +3987,7 @@ Upstream-status: Pending - }; + if (pic == NULL) + goto fail1; - + - int ret = VLC_SUCCESS; - MMAL_STATUS_T status; - filter_sys_t *sys; @@ -3992,28 +3995,28 @@ Upstream-status: Pending + msg_Err(p_filter, "%s: Empty buffer", __func__); + goto fail2; + } - + - msg_Dbg(filter, "Try to open mmal_deinterlace filter. frame_duration: %d, QPU %s!", - frame_duration, use_qpu ? "used" : "unused"); + if ((pic->context = hw_mmal_gen_context(buf, filter_sys->out_ppr)) == NULL) + goto fail2; - + - if (filter->fmt_in.video.i_chroma != VLC_CODEC_MMAL_OPAQUE) - return VLC_EGENERIC; + buf_to_pic_copy_props(pic, buf); - + - if (filter->fmt_out.video.i_chroma != VLC_CODEC_MMAL_OPAQUE) - return VLC_EGENERIC; +#if TRACE_ALL + msg_Dbg(p_filter, "pic: prog=%d, tff=%d, date=%lld", pic->b_progressive, pic->b_top_field_first, (long long)pic->date); +#endif - + - sys = calloc(1, sizeof(filter_sys_t)); - if (!sys) - return VLC_ENOMEM; - filter->p_sys = sys; + return pic; - + - bcm_host_init(); +fail2: + picture_Release(pic); @@ -4021,7 +4024,7 @@ Upstream-status: Pending +// mmal_buffer_header_release(buf); + return NULL; +} - + - status = mmal_component_create(MMAL_COMPONENT_DEFAULT_DEINTERLACE, &sys->component); - if (status != MMAL_SUCCESS) { - msg_Err(filter, "Failed to create MMAL component %s (status=%"PRIx32" %s)", @@ -4040,7 +4043,7 @@ Upstream-status: Pending +#else + VLC_UNUSED(port); +#endif - + - status = mmal_port_parameter_set(sys->component->output[0], &imfx_param.hdr); - if (status != MMAL_SUCCESS) { - msg_Err(filter, "Failed to configure MMAL component %s (status=%"PRIx32" %s)", @@ -4049,7 +4052,7 @@ Upstream-status: Pending - goto out; - } + mmal_buffer_header_release(buffer); - + - sys->component->control->userdata = (struct MMAL_PORT_USERDATA_T *)filter; - status = mmal_port_enable(sys->component->control, control_port_cb); - if (status != MMAL_SUCCESS) { @@ -4080,7 +4083,7 @@ Upstream-status: Pending +#endif + return; } - + - sys->input = sys->component->input[0]; - sys->input->userdata = (struct MMAL_PORT_USERDATA_T *)filter; - if (filter->fmt_in.i_codec == VLC_CODEC_MMAL_OPAQUE) @@ -4096,10 +4099,10 @@ Upstream-status: Pending + mmal_buffer_header_reset(buf); // User data stays intact so release will kill pic + mmal_buffer_header_release(buf); +} - + - es_format_Copy(&filter->fmt_out, &filter->fmt_in); - filter->fmt_out.video.i_frame_rate *= 2; - + - status = mmal_port_format_commit(sys->input); - if (status != MMAL_SUCCESS) { - msg_Err(filter, "Failed to commit format for input port %s (status=%"PRIx32" %s)", @@ -4109,7 +4112,7 @@ Upstream-status: Pending - } - sys->input->buffer_size = sys->input->buffer_size_recommended; - sys->input->buffer_num = sys->input->buffer_num_recommended; - + - if (filter->fmt_in.i_codec == VLC_CODEC_MMAL_OPAQUE) { - MMAL_PARAMETER_BOOLEAN_T zero_copy = { - { MMAL_PARAMETER_ZERO_COPY, sizeof(MMAL_PARAMETER_BOOLEAN_T) }, @@ -4118,7 +4121,7 @@ Upstream-status: Pending +static MMAL_STATUS_T fill_output_from_q(filter_t * const p_filter, filter_sys_t * const sys, MMAL_QUEUE_T * const q) +{ + MMAL_BUFFER_HEADER_T * out_buf; - + - status = mmal_port_parameter_set(sys->input, &zero_copy.hdr); - if (status != MMAL_SUCCESS) { - msg_Err(filter, "Failed to set zero copy on port %s (status=%"PRIx32" %s)", @@ -4136,7 +4139,7 @@ Upstream-status: Pending } + return MMAL_SUCCESS; +} - + - status = mmal_port_enable(sys->input, input_port_cb); - if (status != MMAL_SUCCESS) { - msg_Err(filter, "Failed to enable input port %s (status=%"PRIx32" %s)", @@ -4149,14 +4152,14 @@ Upstream-status: Pending +static MMAL_BOOL_T out_buffer_pre_release_cb(MMAL_BUFFER_HEADER_T *header, void *userdata) +{ + VLC_UNUSED(userdata); - + - sys->output = sys->component->output[0]; - sys->output->userdata = (struct MMAL_PORT_USERDATA_T *)filter; - mmal_format_full_copy(sys->output->format, sys->input->format); + cma_buf_t * const cb = header->user_data; + header->user_data = NULL; + cma_buf_unref(cb); // Copes fine with NULL - + - status = mmal_port_format_commit(sys->output); - if (status != MMAL_SUCCESS) { - msg_Err(filter, "Failed to commit format for output port %s (status=%"PRIx32" %s)", @@ -4240,7 +4243,7 @@ Upstream-status: Pending + goto fail; + } + mmal_buffer_header_reset(out_buf); - + - sys->output->buffer_num = 3; + // Attach cma_buf to the buffer & ensure it is freed when the buffer is released + // On a good send callback the pic will be extracted to avoid this @@ -4264,7 +4267,7 @@ Upstream-status: Pending + p_pic, out_buf->data, out_buf->user_data, out_buf->flags, + out_buf->length, out_buf->alloc_size, (long long)out_buf->pts); +#endif - + - if (filter->fmt_in.i_codec == VLC_CODEC_MMAL_OPAQUE) { - MMAL_PARAMETER_UINT32_T extra_buffers = { - { MMAL_PARAMETER_EXTRA_BUFFERS, sizeof(MMAL_PARAMETER_UINT32_T) }, @@ -4282,7 +4285,7 @@ Upstream-status: Pending } + out_buf = NULL; + } - + - MMAL_PARAMETER_BOOLEAN_T zero_copy = { - { MMAL_PARAMETER_ZERO_COPY, sizeof(MMAL_PARAMETER_BOOLEAN_T) }, - 1 @@ -4297,7 +4300,7 @@ Upstream-status: Pending + msg_Err(p_filter, "Pic has not attached buffer"); + goto fail; + } - + - status = mmal_port_parameter_set(sys->output, &zero_copy.hdr); - if (status != MMAL_SUCCESS) { - msg_Err(filter, "Failed to set zero copy on port %s (status=%"PRIx32" %s)", @@ -4317,7 +4320,7 @@ Upstream-status: Pending + goto fail; } } - + - status = mmal_port_enable(sys->output, output_port_cb); - if (status != MMAL_SUCCESS) { - msg_Err(filter, "Failed to enable output port %s (status=%"PRIx32" %s)", @@ -4410,7 +4413,7 @@ Upstream-status: Pending + // Crash on lockup + assert(ret_pics != NULL || seq_delta(sys->seq_in, sys->seq_out) < 5); } - + - status = mmal_component_enable(sys->component); - if (status != MMAL_SUCCESS) { - msg_Err(filter, "Failed to enable component %s (status=%"PRIx32" %s)", @@ -4471,20 +4474,20 @@ Upstream-status: Pending + // Leaving the input disabled is fine - but we want to leave the output enabled + // so we can retrieve buffers that are still bound to pictures } - + - sys->filtered_pictures = mmal_queue_create(); + sys->seq_in = 1; + sys->seq_out = 15; - + - filter->pf_video_filter = deinterlace; - filter->pf_flush = flush; +#if TRACE_ALL + msg_Dbg(p_filter, ">>> %s", __func__); +#endif +} - + - vlc_sem_init(&sys->sem, 0); - + -out: - if (ret != VLC_SUCCESS) - Close(filter); @@ -4493,7 +4496,7 @@ Upstream-status: Pending + // Nothing to do + VLC_UNUSED(p_filter); +} - + - return ret; +static picture_t * pass_deinterlace(filter_t * p_filter, picture_t * p_pic) +{ @@ -4502,7 +4505,7 @@ Upstream-status: Pending + p_pic->b_progressive = true; + return p_pic; } - + -static void Close(filter_t *filter) + +static void control_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer) @@ -4511,7 +4514,7 @@ Upstream-status: Pending - MMAL_BUFFER_HEADER_T *buffer; + filter_t *filter = (filter_t *)port->userdata; + MMAL_STATUS_T status; - + - if (!sys) + if (buffer->cmd == MMAL_EVENT_ERROR) { + status = *(uint32_t *)buffer->data; @@ -4533,7 +4536,7 @@ Upstream-status: Pending + + if (sys == NULL) return; - + - if (sys->component && sys->component->control->is_enabled) - mmal_port_disable(sys->component->control); + if (sys->use_passthrough) @@ -4541,19 +4544,19 @@ Upstream-status: Pending + free(sys); + return; + } - + - if (sys->input && sys->input->is_enabled) - mmal_port_disable(sys->input); + di_flush(filter); - + - if (sys->output && sys->output->is_enabled) - mmal_port_disable(sys->output); + if (sys->component && sys->component->control->is_enabled) + mmal_port_disable(sys->component->control); - + if (sys->component && sys->component->is_enabled) mmal_component_disable(sys->component); - + - while ((buffer = mmal_queue_get(sys->filtered_pictures))) { - picture_t *pic = (picture_t *)buffer->user_data; - picture_Release(pic); @@ -4575,22 +4578,22 @@ Upstream-status: Pending + if (sys->out_pool != NULL) + mmal_pool_destroy(sys->out_pool); } - + - if (sys->filtered_pictures) - mmal_queue_destroy(sys->filtered_pictures); + if (sys->out_q != NULL) + mmal_queue_destroy(sys->out_q); - + if (sys->component) mmal_component_release(sys->component); - + - vlc_sem_destroy(&sys->sem); + cma_vcsm_exit(sys->vcsm_init_type); + free(sys); +} + - + - bcm_host_deinit(); +static bool is_fmt_valid_in(const vlc_fourcc_t fmt) +{ @@ -4598,7 +4601,7 @@ Upstream-status: Pending + fmt == VLC_CODEC_MMAL_ZC_I420 || + fmt == VLC_CODEC_MMAL_ZC_SAND8; } - + -static int send_output_buffer(filter_t *filter) +static int OpenMmalDeinterlace(filter_t *filter) { @@ -4619,7 +4622,7 @@ Upstream-status: Pending + if (!is_fmt_valid_in(filter->fmt_in.video.i_chroma) || + filter->fmt_out.video.i_chroma != filter->fmt_in.video.i_chroma) + return VLC_EGENERIC; - + - if (!sys->output->is_enabled) { - ret = VLC_EGENERIC; - goto out; @@ -4665,7 +4668,7 @@ Upstream-status: Pending + msg_Warn(filter, "Deinterlace bypassed due to lack of GPU memory"); + } } - + - picture = filter_NewPicture(filter); - if (!picture) { - msg_Warn(filter, "Failed to get new picture"); @@ -4717,7 +4720,7 @@ Upstream-status: Pending } - picture->format.i_frame_rate = filter->fmt_out.video.i_frame_rate; - picture->format.i_frame_rate_base = filter->fmt_out.video.i_frame_rate_base; - + - buffer = picture->p_sys->buffer; - buffer->user_data = picture; - buffer->cmd = 0; @@ -4727,7 +4730,7 @@ Upstream-status: Pending + MMAL_COMPONENT_DEFAULT_DEINTERLACE, status, mmal_status_to_string(status)); + goto fail; + } - + - mmal_picture_lock(picture); + { + const MMAL_PARAMETER_IMAGEFX_PARAMETERS_T imfx_param = { @@ -4738,7 +4741,7 @@ Upstream-status: Pending + 4, + { 5 /* Frame type: mixed */, frame_duration, sys->half_rate, sys->use_qpu } + }; - + - status = mmal_port_send_buffer(sys->output, buffer); + status = mmal_port_parameter_set(sys->component->output[0], &imfx_param.hdr); + if (status != MMAL_SUCCESS) { @@ -4763,7 +4766,7 @@ Upstream-status: Pending + sys->component->control->name, status, mmal_status_to_string(status)); + goto fail; } - + -out: - return ret; -} @@ -4771,7 +4774,7 @@ Upstream-status: Pending + sys->input->userdata = (struct MMAL_PORT_USERDATA_T *)filter; + sys->input->format->encoding = vlc_to_mmal_video_fourcc(&filter->fmt_in.video); + hw_mmal_vlc_fmt_to_mmal_fmt(sys->input->format, &filter->fmt_in.video); - + -static void fill_output_port(filter_t *filter) -{ - filter_sys_t *sys = filter->p_sys; @@ -4785,7 +4788,7 @@ Upstream-status: Pending + es_format_Copy(&filter->fmt_out, &filter->fmt_in); + if (!sys->half_rate) + filter->fmt_out.video.i_frame_rate *= 2; - + - if (buffers_to_send > buffers_available) - buffers_to_send = buffers_available; + status = mmal_port_format_commit(sys->input); @@ -4797,7 +4800,7 @@ Upstream-status: Pending + sys->input->buffer_size = sys->input->buffer_size_recommended; + sys->input->buffer_num = 30; +// sys->input->buffer_num = sys->input->buffer_num_recommended; - + -#ifndef NDEBUG - msg_Dbg(filter, "Send %d buffers to output port (available: %d, in_transit: %d, buffer_num: %d)", - buffers_to_send, buffers_available, sys->output_in_transit, @@ -4812,7 +4815,7 @@ Upstream-status: Pending + goto fail; } -} - + -static picture_t *deinterlace(filter_t *filter, picture_t *picture) -{ - filter_sys_t *sys = filter->p_sys; @@ -4827,7 +4830,7 @@ Upstream-status: Pending + sys->input->name, status, mmal_status_to_string(status)); + goto fail; + } - + - fill_output_port(filter); + status = mmal_port_enable(sys->input, di_input_port_cb); + if (status != MMAL_SUCCESS) { @@ -4835,12 +4838,12 @@ Upstream-status: Pending + sys->input->name, status, mmal_status_to_string(status)); + goto fail; + } - + - buffer = picture->p_sys->buffer; - buffer->user_data = picture; - buffer->pts = picture->date; - buffer->cmd = 0; - + - if (!picture->p_sys->displayed) { - status = mmal_port_send_buffer(sys->input, buffer); - if (status != MMAL_SUCCESS) { @@ -4881,7 +4884,7 @@ Upstream-status: Pending } - if (out_picture) - out_picture->p_next = NULL; - + - return ret; -} - @@ -4891,7 +4894,7 @@ Upstream-status: Pending - MMAL_BUFFER_HEADER_T *buffer; + sys->output = sys->component->output[0]; + mmal_format_full_copy(sys->output->format, sys->input->format); - + - msg_Dbg(filter, "flush deinterlace filter"); + if (!sys->is_cma) + { @@ -4908,7 +4911,7 @@ Upstream-status: Pending + msg_Err(filter, "Failed to alloc cma buf pool"); + goto fail; + } - + - msg_Dbg(filter, "flush: flush ports (input: %d, output: %d in transit)", - sys->input_in_transit, sys->output_in_transit); - mmal_port_flush(sys->output); @@ -4934,13 +4937,13 @@ Upstream-status: Pending + msg_Err(filter, "Failed to alloc out pool"); + goto fail; + } - + -static void control_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer) -{ - filter_t *filter = (filter_t *)port->userdata; - MMAL_STATUS_T status; + port_parameter_set_bool(sys->output, MMAL_PARAMETER_ZERO_COPY, true); - + - if (buffer->cmd == MMAL_EVENT_ERROR) { - status = *(uint32_t *)buffer->data; - msg_Err(filter, "MMAL error %"PRIx32" \"%s\"", status, @@ -4951,12 +4954,12 @@ Upstream-status: Pending + msg_Err(filter, "Output port format commit failed"); + goto fail; + } - + - mmal_buffer_header_release(buffer); -} + sys->output->buffer_num = 30; + sys->output->buffer_size = sys->output->buffer_size_recommended; - + -static void input_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer) -{ - picture_t *picture = (picture_t *)buffer->user_data; @@ -4970,7 +4973,7 @@ Upstream-status: Pending + goto fail; + } + } - + - if (picture) { - picture_Release(picture); - } else { @@ -4982,7 +4985,7 @@ Upstream-status: Pending + sys->component->name, status, mmal_status_to_string(status)); + goto fail; } - + - atomic_fetch_sub(&sys->input_in_transit, 1); - vlc_sem_post(&sys->sem); + filter->pf_video_filter = deinterlace; @@ -4993,7 +4996,7 @@ Upstream-status: Pending + CloseMmalDeinterlace(filter); + return ret; } - + -static void output_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer) -{ - filter_t *filter = (filter_t *)port->userdata; @@ -5022,7 +5025,7 @@ Upstream-status: Pending + +vlc_module_end() + - + - if (buffer->cmd == 0) { - if (buffer->length > 0) { - atomic_store(&sys->started, true); @@ -8126,7 +8129,7 @@ Upstream-status: Pending @@ -21,25 +21,1542 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ - + +// We would really like to use vlc_thread.h but the detach thread stuff can't be +// used here :-( +#include <pthread.h> @@ -8148,7 +8151,7 @@ Upstream-status: Pending +#include <interface/mmal/util/mmal_default_components.h> +#include <interface/vmcs_host/vcgencmd.h> +#include <interface/vcsm/user-vcsm.h> - + +#include "mmal_cma.h" #include "mmal_picture.h" +#include "transform_ops.h" @@ -9291,7 +9294,7 @@ Upstream-status: Pending + ent = ent_list_extract_pic_ent(&pc->ents_cur, pic); + +// printf("ent_found: %p\n", ent); - + -int mmal_picture_lock(picture_t *picture) + if (ent == NULL) + { @@ -9523,7 +9526,7 @@ Upstream-status: Pending + case MMAL_ENCODING_RGB16: + pb = 2; + break; - + - int offset = 0; - picture->p[0].p_pixels = buffer->data; - for (int i = 1; i < picture->i_planes; i++) { @@ -9544,14 +9547,14 @@ Upstream-status: Pending +// msg_Err(p_filter, "%s: Unexpected format", __func__); + return VLC_EGENERIC; } - + - pic_sys->displayed = false; + // Fix up SAR if unset + if (pic->format.i_sar_den == 0 || pic->format.i_sar_num == 0) { + pic->format.i_sar_den = mm_fmt->par.den; + pic->format.i_sar_num = mm_fmt->par.num; + } - + + pic->i_planes = planes; + unsigned int offset = 0; + for (unsigned int i = 0; i != planes; ++i) { @@ -9680,17 +9683,17 @@ Upstream-status: Pending @@ -24,19 +24,298 @@ #ifndef VLC_MMAL_MMAL_PICTURE_H_ #define VLC_MMAL_MMAL_PICTURE_H_ - + +#include <stdatomic.h> + #include <vlc_common.h> #include <interface/mmal/mmal.h> - + +#include "mmal_cma.h" + /* Think twice before changing this. Incorrect values cause havoc. */ #define NUM_ACTUAL_OPAQUE_BUFFERS 30 - + -struct picture_sys_t { - vlc_object_t *owner; +#ifndef VLC_TICK_INVALID @@ -9969,18 +9972,18 @@ Upstream-status: Pending +vcsm_init_type_t cma_vcsm_type(void); +const char * cma_vcsm_init_str(const vcsm_init_type_t init_mode); + - + - MMAL_BUFFER_HEADER_T *buffer; - bool displayed; -}; +#define VOUT_DISPLAY_CHANGE_MMAL_BASE 1024 +#define VOUT_DISPLAY_CHANGE_MMAL_HIDE (VOUT_DISPLAY_CHANGE_MMAL_BASE + 0) - + -int mmal_picture_lock(picture_t *picture); +#define MMAL_COMPONENT_DEFAULT_RESIZER "vc.ril.resize" +#define MMAL_COMPONENT_ISP_RESIZER "vc.ril.isp" +#define MMAL_COMPONENT_HVS "vc.ril.hvs" - + #endif --- /dev/null +++ b/modules/hw/mmal/rpi_prof.h @@ -10879,17 +10882,17 @@ Upstream-status: Pending +++ b/modules/hw/mmal/vout.c @@ -27,21 +27,28 @@ #endif - + #include <math.h> +#include <stdatomic.h> - + #include <vlc_common.h> -#include <vlc_atomic.h> #include <vlc_plugin.h> #include <vlc_threads.h> #include <vlc_vout_display.h> +#include <vlc_modules.h> - + -#include "mmal_picture.h" - +#pragma GCC diagnostic push @@ -10907,13 +10910,13 @@ Upstream-status: Pending +#include "transform_ops.h" + +#define TRACE_ALL 0 - + #define MAX_BUFFERS_IN_TRANSIT 1 #define VC_TV_MAX_MODE_IDS 127 @@ -50,10 +57,28 @@ #define MMAL_LAYER_TEXT N_("VideoCore layer where the video is displayed.") #define MMAL_LAYER_LONGTEXT N_("VideoCore layer where the video is displayed. Subpictures are displayed directly above and a black background directly below.") - + -#define MMAL_BLANK_BACKGROUND_NAME "mmal-blank-background" -#define MMAL_BLANK_BACKGROUND_TEXT N_("Blank screen below video.") -#define MMAL_BLANK_BACKGROUND_LONGTEXT N_("Render blank screen below video. " \ @@ -10940,13 +10943,13 @@ Upstream-status: Pending +#define MMAL_VOUT_TRANSPARENT_LONGTEXT N_("Enable layers beneath the video layer."\ +" By default these are disabled."\ +" Having the lower layers enabled can impact video performance") - + #define MMAL_ADJUST_REFRESHRATE_NAME "mmal-adjust-refreshrate" #define MMAL_ADJUST_REFRESHRATE_TEXT N_("Adjust HDMI refresh rate to the video.") @@ -68,332 +93,628 @@ #define PHASE_OFFSET_TARGET ((double)0.25) #define PHASE_CHECK_INTERVAL 100 - + -static int Open(vlc_object_t *); -static void Close(vlc_object_t *); - @@ -10965,7 +10968,7 @@ Upstream-status: Pending - set_callbacks(Open, Close) -vlc_module_end() +#define SUBS_MAX 4 - + -struct dmx_region_t { - struct dmx_region_t *next; - picture_t *picture; @@ -10982,12 +10985,12 @@ Upstream-status: Pending + MMAL_COMPONENT_T *component; + subpic_reg_stash_t sub; +} vout_subpic_t; - + struct vout_display_sys_t { - vlc_cond_t buffer_cond; - vlc_mutex_t buffer_mutex; vlc_mutex_t manage_mutex; - + - plane_t planes[3]; /* Depending on video format up to 3 planes are used */ - picture_t **pictures; /* Actual list of alloced pictures passed into picture_pool */ - picture_pool_t *picture_pool; @@ -10998,11 +11001,11 @@ Upstream-status: Pending MMAL_POOL_T *pool; /* mmal buffer headers, used for pushing pictures to component*/ - struct dmx_region_t *dmx_region; int i_planes; /* Number of actually used planes, 1 for opaque, 3 for i420 */ - + - uint32_t buffer_size; /* size of actual mmal buffers */ int buffers_in_transit; /* number of buffers currently pushed to mmal component */ unsigned num_buffers; /* number of buffers allocated at mmal port */ - + - DISPMANX_DISPLAY_HANDLE_T dmx_handle; - DISPMANX_ELEMENT_HANDLE_T bkg_element; - DISPMANX_RESOURCE_HANDLE_T bkg_resource; @@ -11018,17 +11021,17 @@ Upstream-status: Pending + MMAL_DISPLAYTRANSFORM_T dest_transform; // Dest window coord transform + MMAL_DISPLAYTRANSFORM_T display_transform; // "Native" display transform + MMAL_DISPLAYTRANSFORM_T video_transform; // Combined config+native transform - + - int i_frame_rate_base; /* cached framerate to detect changes for rate adjustment */ - int i_frame_rate; + unsigned int i_frame_rate_base; /* cached framerate to detect changes for rate adjustment */ + unsigned int i_frame_rate; - + int next_phase_check; /* lowpass for phase check frequency */ int phase_offset; /* currently applied offset to presentation time in ns */ int layer; /* the dispman layer (z-index) used for video rendering */ + bool transparent; // Do not disable layers beneath ours - + bool need_configure_display; /* indicates a required display reconfigure to main thread */ bool adjust_refresh_rate; bool native_interlaced; @@ -11037,7 +11040,7 @@ Upstream-status: Pending - bool opaque; /* indicated use of opaque picture format (zerocopy) */ -}; + bool force_config; - + -static const vlc_fourcc_t subpicture_chromas[] = { - VLC_CODEC_RGBA, - 0 @@ -11058,14 +11061,14 @@ Upstream-status: Pending + MMAL_POOL_T * out_pool; + bool pending; + } isp; - + -/* Utility functions */ -static inline uint32_t align(uint32_t x, uint32_t y); -static int configure_display(vout_display_t *vd, const vout_display_cfg_t *cfg, - const video_format_t *fmt); + MMAL_POOL_T * copy_pool; + MMAL_BUFFER_HEADER_T * copy_buf; - + -/* VLC vout display callbacks */ -static picture_pool_t *vd_pool(vout_display_t *vd, unsigned count); -static void vd_prepare(vout_display_t *vd, picture_t *picture, @@ -11081,14 +11084,14 @@ Upstream-status: Pending + // Subpic blend if we have to do it here + vzc_pool_ctl_t * vzc; +}; - + -/* TV service */ -static int query_resolution(vout_display_t *vd, unsigned *width, unsigned *height); -static void tvservice_cb(void *callback_data, uint32_t reason, uint32_t param1, - uint32_t param2); -static void adjust_refresh_rate(vout_display_t *vd, const video_format_t *fmt); -static int set_latency_target(vout_display_t *vd, bool enable); - + -/* DispManX */ -static void display_subpicture(vout_display_t *vd, subpicture_t *subpicture); -static void close_dmx(vout_display_t *vd); @@ -11101,7 +11104,7 @@ Upstream-status: Pending -static void show_background(vout_display_t *vd, bool enable); -static void maintain_phase_sync(vout_display_t *vd); +// ISP setup - + -static int Open(vlc_object_t *object) +static inline bool want_isp(const vout_display_t * const vd) { @@ -11115,14 +11118,14 @@ Upstream-status: Pending - unsigned i; + return (vd->fmt.i_chroma == VLC_CODEC_MMAL_ZC_SAND10); +} - + - if (vout_display_IsWindowed(vd)) - return VLC_EGENERIC; +static inline bool want_copy(const vout_display_t * const vd) +{ + return (vd->fmt.i_chroma == VLC_CODEC_I420 || vd->fmt.i_chroma == VLC_CODEC_I420_10L); +} - + - sys = calloc(1, sizeof(struct vout_display_sys_t)); - if (!sys) - return VLC_ENOMEM; @@ -11133,7 +11136,7 @@ Upstream-status: Pending + VLC_CODEC_I420 : + vd->fmt.i_chroma; +} - + - sys->layer = var_InheritInteger(vd, MMAL_LAYER_NAME); - bcm_host_init(); +static MMAL_FOURCC_T vout_vlc_to_mmal_pic_fourcc(const unsigned int fcc) @@ -11155,14 +11158,14 @@ Upstream-status: Pending + } + return MMAL_ENCODING_I420; +} - + - sys->opaque = vd->fmt.i_chroma == VLC_CODEC_MMAL_OPAQUE; +static void display_set_format(const vout_display_t * const vd, MMAL_ES_FORMAT_T *const es_fmt, const bool is_intermediate) +{ + const unsigned int w = is_intermediate ? vd->fmt.i_visible_width : vd->fmt.i_width ; + const unsigned int h = is_intermediate ? vd->fmt.i_visible_height : vd->fmt.i_height; + MMAL_VIDEO_FORMAT_T * const v_fmt = &es_fmt->es->video; - + - status = mmal_component_create(MMAL_COMPONENT_DEFAULT_VIDEO_RENDERER, &sys->component); - if (status != MMAL_SUCCESS) { - msg_Err(vd, "Failed to create MMAL component %s (status=%"PRIx32" %s)", @@ -11189,7 +11192,7 @@ Upstream-status: Pending + v_fmt->frame_rate.num = vd->fmt.i_frame_rate; + v_fmt->frame_rate.den = vd->fmt.i_frame_rate_base; + v_fmt->color_space = vlc_to_mmal_color_space(vd->fmt.space); - + - sys->component->control->userdata = (struct MMAL_PORT_USERDATA_T *)vd; - status = mmal_port_enable(sys->component->control, control_port_cb); - if (status != MMAL_SUCCESS) { @@ -11241,12 +11244,12 @@ Upstream-status: Pending + status = *(uint32_t *)buffer->data; + msg_Err(vd, "MMAL error %"PRIx32" \"%s\"", status, mmal_status_to_string(status)); } - + - sys->input = sys->component->input[0]; - sys->input->userdata = (struct MMAL_PORT_USERDATA_T *)vd; + mmal_buffer_header_release(buffer); +} - + - if (sys->opaque) { - sys->input->format->encoding = MMAL_ENCODING_OPAQUE; - sys->i_planes = 1; @@ -11276,7 +11279,7 @@ Upstream-status: Pending + // but might not on later flushes as we shut down + vout_display_t * const vd = (vout_display_t *)port->userdata; + struct vout_isp_conf_s *const isp = &vd->sys->isp; - + - status = mmal_port_format_commit(sys->input); - if (status != MMAL_SUCCESS) { - msg_Err(vd, "Failed to commit format for input port %s (status=%"PRIx32" %s)", @@ -11298,7 +11301,7 @@ Upstream-status: Pending + mmal_buffer_header_release(buf); + } +} - + - vout_display_PlacePicture(&place, &vd->source, vd->cfg, false); - display_region.hdr.id = MMAL_PARAMETER_DISPLAYREGION; - display_region.hdr.size = sizeof(MMAL_DISPLAYREGION_T); @@ -11355,7 +11358,7 @@ Upstream-status: Pending + return err; + } } - + - for (i = 0; i < sys->i_planes; ++i) { - sys->planes[i].i_lines = buffer_height; - sys->planes[i].i_pitch = buffer_pitch; @@ -11368,7 +11371,7 @@ Upstream-status: Pending + return err; + } + } - + - if (i > 0) { - sys->planes[i].i_lines /= 2; - sys->planes[i].i_pitch /= 2; @@ -11383,7 +11386,7 @@ Upstream-status: Pending } + return MMAL_SUCCESS; +} - + - vlc_mutex_init(&sys->buffer_mutex); - vlc_cond_init(&sys->buffer_cond); - vlc_mutex_init(&sys->manage_mutex); @@ -11391,7 +11394,7 @@ Upstream-status: Pending +{ + struct vout_isp_conf_s * const isp = &vd_sys->isp; + VLC_UNUSED(vd); - + - vd->pool = vd_pool; - vd->prepare = vd_prepare; - vd->display = vd_display; @@ -11399,10 +11402,10 @@ Upstream-status: Pending - vd->manage = vd_manage; + if (isp->component == NULL) + return; - + - vc_tv_register_callback(tvservice_cb, vd); + isp_flush(isp); - + - if (query_resolution(vd, &sys->display_width, &sys->display_height) >= 0) { - vout_display_SendEventDisplaySize(vd, sys->display_width, sys->display_height); - } else { @@ -11418,28 +11421,28 @@ Upstream-status: Pending + mmal_queue_destroy(isp->out_q); + isp->out_q = NULL; } - + - sys->dmx_handle = vc_dispmanx_display_open(0); - vd->info.subpicture_chromas = subpicture_chromas; + if (isp->out_pool != NULL) { + mmal_port_pool_destroy(isp->output, isp->out_pool); + isp->out_pool = NULL; + } - + - vout_display_DeleteWindow(vd, NULL); + isp->input = NULL; + isp->output = NULL; - + -out: - if (ret != VLC_SUCCESS) - Close(object); + mmal_component_release(isp->component); + isp->component = NULL; - + - return ret; + return; } - + -static void Close(vlc_object_t *object) +// Restuff into output rather than return to pool is we can +static MMAL_BOOL_T isp_out_pool_cb(MMAL_POOL_T *pool, MMAL_BUFFER_HEADER_T *buffer, void *userdata) @@ -11457,13 +11460,13 @@ Upstream-status: Pending + } + return MMAL_TRUE; +} - + - vc_tv_unregister_callback_full(tvservice_cb, vd); +static MMAL_STATUS_T isp_setup(vout_display_t * const vd, vout_display_sys_t * const vd_sys) +{ + struct vout_isp_conf_s * const isp = &vd_sys->isp; + MMAL_STATUS_T err; - + - if (sys->dmx_handle) - close_dmx(vd); + if ((err = mmal_component_create(MMAL_COMPONENT_ISP_RESIZER, &isp->component)) != MMAL_SUCCESS) { @@ -11472,7 +11475,7 @@ Upstream-status: Pending + } + isp->input = isp->component->input[0]; + isp->output = isp->component->output[0]; - + - if (sys->component && sys->component->control->is_enabled) - mmal_port_disable(sys->component->control); + isp->component->control->userdata = (void *)vd; @@ -11480,29 +11483,29 @@ Upstream-status: Pending + msg_Err(vd, "Failed to enable ISP control port"); + goto fail; + } - + - if (sys->input && sys->input->is_enabled) - mmal_port_disable(sys->input); + isp->input->userdata = (void *)vd; + display_set_format(vd, isp->input->format, false); - + - if (sys->component && sys->component->is_enabled) - mmal_component_disable(sys->component); + if ((err = port_parameter_set_bool(isp->input, MMAL_PARAMETER_ZERO_COPY, true)) != MMAL_SUCCESS) + goto fail; - + - if (sys->pool) - mmal_port_pool_destroy(sys->input, sys->pool); + if ((err = mmal_port_format_commit(isp->input)) != MMAL_SUCCESS) { + msg_Err(vd, "Failed to set ISP input format"); + goto fail; + } - + - if (sys->component) - mmal_component_release(sys->component); + isp->input->buffer_size = isp->input->buffer_size_recommended; + isp->input->buffer_num = 30; - + - if (sys->picture_pool) - picture_pool_Release(sys->picture_pool); - else @@ -11516,7 +11519,7 @@ Upstream-status: Pending + msg_Err(vd, "Failed to create input pool"); + goto fail; + } - + - vlc_mutex_destroy(&sys->buffer_mutex); - vlc_cond_destroy(&sys->buffer_cond); - vlc_mutex_destroy(&sys->manage_mutex); @@ -11525,7 +11528,7 @@ Upstream-status: Pending + err = MMAL_ENOMEM; + goto fail; + } - + - if (sys->native_interlaced) { - if (vc_gencmd(response, sizeof(response), "hvs_update_fields 0") < 0 || - response[18] != '0') @@ -11539,7 +11542,7 @@ Upstream-status: Pending + msg_Err(vd, "Failed to set ISP input format"); + goto fail; } - + - free(sys->pictures); - free(sys); + isp->output->buffer_size = isp->output->buffer_size_recommended; @@ -11558,13 +11561,13 @@ Upstream-status: Pending + goto fail; + + return MMAL_SUCCESS; - + - bcm_host_deinit(); +fail: + isp_close(vd, vd_sys); + return err; } - + -static inline uint32_t align(uint32_t x, uint32_t y) { - uint32_t mod = x % y; - if (mod == 0) @@ -11792,7 +11795,7 @@ Upstream-status: Pending + } + return 0; } - + static int configure_display(vout_display_t *vd, const vout_display_cfg_t *cfg, const video_format_t *fmt) { @@ -11801,7 +11804,7 @@ Upstream-status: Pending - MMAL_DISPLAYREGION_T display_region; + vout_display_sys_t * const sys = vd->sys; MMAL_STATUS_T status; - + if (!cfg && !fmt) + { + msg_Err(vd, "%s: Missing cfg & fmt", __func__); @@ -11809,17 +11812,17 @@ Upstream-status: Pending + } + + isp_check(vd, sys); - + if (fmt) { sys->input->format->es->video.par.num = fmt->i_sar_num; @@ -412,30 +733,14 @@ static int configure_display(vout_displa if (!cfg) cfg = vd->cfg; - + - vout_display_PlacePicture(&place, fmt, cfg, false); + sys->video_transform = combine_transform( + vlc_to_mmal_transform(fmt->orientation), sys->display_transform); - + - display_region.hdr.id = MMAL_PARAMETER_DISPLAYREGION; - display_region.hdr.size = sizeof(MMAL_DISPLAYREGION_T); - display_region.fullscreen = MMAL_FALSE; @@ -11843,7 +11846,7 @@ Upstream-status: Pending + if (set_input_region(vd, fmt) != 0) return -EINVAL; - } - + - show_background(vd, var_InheritBool(vd, MMAL_BLANK_BACKGROUND_NAME)); sys->adjust_refresh_rate = var_InheritBool(vd, MMAL_ADJUST_REFRESHRATE_NAME); sys->native_interlaced = var_InheritBool(vd, MMAL_NATIVE_INTERLACED); @@ -11851,7 +11854,7 @@ Upstream-status: Pending @@ -446,204 +751,217 @@ static int configure_display(vout_displa return 0; } - + +static void kill_pool(vout_display_sys_t * const sys) +{ + if (sys->pic_pool != NULL) { @@ -11870,21 +11873,21 @@ Upstream-status: Pending - MMAL_STATUS_T status; - unsigned i; + vout_display_sys_t * const sys = vd->sys; - + - if (sys->picture_pool) { - if (sys->num_buffers < count) - msg_Warn(vd, "Picture pool with %u pictures requested, but we already have one with %u pictures", - count, sys->num_buffers); + msg_Dbg(vd, "%s: fmt:%dx%d,sar:%d/%d; source:%dx%d", __func__, + vd->fmt.i_width, vd->fmt.i_height, vd->fmt.i_sar_num, vd->fmt.i_sar_den, vd->source.i_width, vd->source.i_height); - + - goto out; + if (sys->pic_pool == NULL) { + sys->pic_pool = picture_pool_NewFromFormat(&vd->fmt, count); } + return sys->pic_pool; +} - + - if (sys->opaque) { - if (count <= NUM_ACTUAL_OPAQUE_BUFFERS) - count = NUM_ACTUAL_OPAQUE_BUFFERS; @@ -11896,7 +11899,7 @@ Upstream-status: Pending + return true; + return false; +} - + - MMAL_PARAMETER_BOOLEAN_T zero_copy = { - { MMAL_PARAMETER_ZERO_COPY, sizeof(MMAL_PARAMETER_BOOLEAN_T) }, - 1 @@ -11906,7 +11909,7 @@ Upstream-status: Pending +{ + vout_display_sys_t * const sys = vd->sys; + MMAL_STATUS_T err; - + - status = mmal_port_parameter_set(sys->input, &zero_copy.hdr); - if (status != MMAL_SUCCESS) { - msg_Err(vd, "Failed to set zero copy on port %s (status=%"PRIx32" %s)", @@ -11930,7 +11933,7 @@ Upstream-status: Pending -#ifndef NDEBUG - msg_Dbg(vd, "Creating picture pool with %u pictures", count); #endif - + - sys->input->buffer_num = count; - status = mmal_port_enable(sys->input, input_port_cb); - if (status != MMAL_SUCCESS) { @@ -11942,7 +11945,7 @@ Upstream-status: Pending + if (subpicture != NULL) { + subpicture_Delete(subpicture); } - + - status = mmal_component_enable(sys->component); - if (status != MMAL_SUCCESS) { - msg_Err(vd, "Failed to enable component %s (status=%"PRIx32" %s)", @@ -12017,11 +12020,11 @@ Upstream-status: Pending + msg_Err(vd, "Replicated buffer get fail"); + goto fail; } - + - sys->pictures[i]->i_planes = sys->i_planes; - memcpy(sys->pictures[i]->p, sys->planes, sys->i_planes * sizeof(plane_t)); - } - + - memset(&picture_pool_cfg, 0, sizeof(picture_pool_configuration_t)); - picture_pool_cfg.picture_count = sys->num_buffers; - picture_pool_cfg.picture = sys->pictures; @@ -12035,7 +12038,7 @@ Upstream-status: Pending + if (mmal_port_format_commit(sys->input) != MMAL_SUCCESS) + msg_Warn(vd, "Input format commit failed"); + } - + - sys->picture_pool = picture_pool_NewExtended(&picture_pool_cfg); - if (!sys->picture_pool) { - msg_Err(vd, "Failed to create picture pool"); @@ -12047,7 +12050,7 @@ Upstream-status: Pending + goto fail; + } } - + -out: - return sys->picture_pool; -} @@ -12123,18 +12126,18 @@ Upstream-status: Pending - } else { - picture_Release(picture); } - + - display_subpicture(vd, subpicture); +fail: + for (unsigned int i = 0; i != SUBS_MAX && sys->subpic_bufs[i] != NULL; ++i) { + mmal_buffer_header_release(sys->subpic_bufs[i]); + sys->subpic_bufs[i] = NULL; + } - + - if (subpicture) - subpicture_Delete(subpicture); + picture_Release(p_pic); - + if (sys->next_phase_check == 0 && sys->adjust_refresh_rate) maintain_phase_sync(vd); sys->next_phase_check = (sys->next_phase_check + 1) % PHASE_CHECK_INTERVAL; @@ -12146,7 +12149,7 @@ Upstream-status: Pending - vlc_mutex_unlock(&sys->buffer_mutex); - } } - + static int vd_control(vout_display_t *vd, int query, va_list args) { - vout_display_sys_t *sys = vd->sys; @@ -12155,7 +12158,7 @@ Upstream-status: Pending + vout_display_sys_t * const sys = vd->sys; int ret = VLC_EGENERIC; + VLC_UNUSED(args); - + switch (query) { - case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE: - tmp_cfg = va_arg(args, const vout_display_cfg_t *); @@ -12175,7 +12178,7 @@ Upstream-status: Pending + if (configure_display(vd, vd->cfg, &vd->source) >= 0) ret = VLC_SUCCESS; break; - + - case VOUT_DISPLAY_RESET_PICTURES: - vlc_assert_unreachable(); case VOUT_DISPLAY_CHANGE_ZOOM: @@ -12218,13 +12221,13 @@ Upstream-status: Pending + ret = VLC_SUCCESS; break; + } - + default: msg_Warn(vd, "Unknown control query %d", query); @@ -653,79 +971,207 @@ static int vd_control(vout_display_t *vd return ret; } - + +static void set_display_windows(vout_display_t *const vd, vout_display_sys_t *const sys) +{ + unsigned int width, height; @@ -12245,9 +12248,9 @@ Upstream-status: Pending - vout_display_sys_t *sys = vd->sys; - unsigned width, height; + vout_display_sys_t *const sys = vd->sys; - + vlc_mutex_lock(&sys->manage_mutex); - + if (sys->need_configure_display) { - close_dmx(vd); - sys->dmx_handle = vc_dispmanx_display_open(0); @@ -12261,10 +12264,10 @@ Upstream-status: Pending sys->need_configure_display = false; + set_display_windows(vd, sys); } - + vlc_mutex_unlock(&sys->manage_mutex); } - + -static void control_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer) + +static int attach_subpics(vout_display_t * const vd, vout_display_sys_t * const sys, @@ -12273,7 +12276,7 @@ Upstream-status: Pending - vout_display_t *vd = (vout_display_t *)port->userdata; - MMAL_STATUS_T status; + unsigned int n = 0; - + - if (buffer->cmd == MMAL_EVENT_ERROR) { - status = *(uint32_t *)buffer->data; - msg_Err(vd, "MMAL error %"PRIx32" \"%s\"", status, mmal_status_to_string(status)); @@ -12284,7 +12287,7 @@ Upstream-status: Pending + return VLC_ENOMEM; + } } - + - mmal_buffer_header_release(buffer); + // Attempt to import the subpics + for (subpicture_t * spic = subpicture; spic != NULL; spic = spic->p_next) @@ -12330,7 +12333,7 @@ Upstream-status: Pending + } + return VLC_SUCCESS; } - + -static void input_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer) + +static void vd_prepare(vout_display_t *vd, picture_t *p_pic, @@ -12425,12 +12428,12 @@ Upstream-status: Pending vout_display_sys_t *sys = vd->sys; - picture_t *picture = (picture_t *)buffer->user_data; + picture_sys_t *pic_sys = picture->p_sys; - + - if (picture) - picture_Release(picture); + if (!sys->adjust_refresh_rate || pic_sys->displayed) + return; - + - vlc_mutex_lock(&sys->buffer_mutex); - atomic_fetch_sub(&sys->buffers_in_transit, 1); - vlc_cond_signal(&sys->buffer_cond); @@ -12440,7 +12443,7 @@ Upstream-status: Pending + picture->date += sys->phase_offset; +#endif } - + -static int query_resolution(vout_display_t *vd, unsigned *width, unsigned *height) + +static void vd_control_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer) @@ -12449,7 +12452,7 @@ Upstream-status: Pending - int ret = 0; + vout_display_t *vd = (vout_display_t *)port->userdata; + MMAL_STATUS_T status; - + - if (vc_tv_get_display_state(&display_state) == 0) { - if (display_state.state & 0xFF) { - *width = display_state.display.hdmi.width; @@ -12468,23 +12471,23 @@ Upstream-status: Pending + status = *(uint32_t *)buffer->data; + msg_Err(vd, "MMAL error %"PRIx32" \"%s\"", status, mmal_status_to_string(status)); } - + - return ret; + mmal_buffer_header_release(buffer); } - + static void tvservice_cb(void *callback_data, uint32_t reason, uint32_t param1, uint32_t param2) @@ -780,9 +1226,9 @@ static void adjust_refresh_rate(vout_dis double best_score, score; int i; - + - vc_tv_get_display_state(&display_state); + vc_tv_get_display_state_id(sys->display_id, &display_state); if(display_state.display.hdmi.mode != HDMI_MODE_OFF) { - num_modes = vc_tv_hdmi_get_supported_modes_new(display_state.display.hdmi.group, + num_modes = vc_tv_hdmi_get_supported_modes_new_id(sys->display_id, display_state.display.hdmi.group, supported_modes, VC_TV_MAX_MODE_IDS, NULL, NULL); - + for (i = 0; i < num_modes; ++i) { @@ -810,7 +1256,7 @@ static void adjust_refresh_rate(vout_dis if((best_id >= 0) && (display_state.display.hdmi.mode != supported_modes[best_id].code)) { @@ -12498,7 +12501,7 @@ Upstream-status: Pending @@ -828,148 +1274,12 @@ static void adjust_refresh_rate(vout_dis } } - + -static void display_subpicture(vout_display_t *vd, subpicture_t *subpicture) -{ - vout_display_sys_t *sys = vd->sys; @@ -12648,7 +12651,7 @@ Upstream-status: Pending @@ -1012,32 +1322,436 @@ static void maintain_phase_sync(vout_dis } } - + -static void show_background(vout_display_t *vd, bool enable) +static void CloseMmalVout(vlc_object_t *object) { @@ -13700,7 +13703,7 @@ Upstream-status: Pending @@ -43,6 +43,8 @@ # include "../android/utils.h" #endif - + +#define REQUIRE_DMA_BUF_IMPORT 1 + typedef struct vlc_gl_sys_t @@ -13709,7 +13712,7 @@ Upstream-status: Pending @@ -355,6 +357,14 @@ static int Open (vlc_object_t *obj, cons goto error; } - + +#if REQUIRE_DMA_BUF_IMPORT + if (!CheckToken(ext, "EGL_EXT_image_dma_buf_import")) + { @@ -13728,7 +13731,7 @@ Upstream-status: Pending p_owner->b_waiting = false; vlc_cond_signal( &p_owner->wait_request ); + vlc_mutex_unlock( &p_owner->lock ); - + /* If the video output is paused or slow, or if the picture pool size was * under-estimated (e.g. greedy video filter, buggy decoder...), the @@ -2005,7 +2006,6 @@ void input_DecoderDelete( decoder_t *p_d @@ -13736,9 +13739,9 @@ Upstream-status: Pending if( p_owner->p_vout != NULL ) vout_Cancel( p_owner->p_vout, true ); - vlc_mutex_unlock( &p_owner->lock ); - + vlc_join( p_owner->thread, NULL ); - + --- a/src/misc/fourcc.c +++ b/src/misc/fourcc.c @@ -755,8 +755,13 @@ static const struct @@ -13762,7 +13765,7 @@ Upstream-status: Pending @@ -365,10 +365,30 @@ void picture_CopyProperties( picture_t * p_dst->b_top_field_first = p_src->b_top_field_first; } - + +static inline bool is_zc_chroma(const vlc_fourcc_t i_chroma) +{ + return i_chroma == VLC_CODEC_MMAL_OPAQUE || @@ -13789,15 +13792,15 @@ Upstream-status: Pending + for( int i = 0; i < p_src->i_planes; i++ ) + plane_CopyPixels( p_dst->p+i, p_src->p+i ); + } - + assert( p_dst->context == NULL ); - + --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -964,6 +964,17 @@ static picture_t *ConvertRGB32AndBlend(v return NULL; } - + + +static inline bool is_zc_chroma(const vlc_fourcc_t i_chroma) +{ @@ -13814,7 +13817,7 @@ Upstream-status: Pending vout_thread_sys_t *sys = vout->p; @@ -1098,7 +1109,7 @@ static int ThreadDisplayRenderPicture(vo } - + assert(vout_IsDisplayFiltered(vd) == !sys->display.use_dr); - if (sys->display.use_dr && !is_direct) { + if (sys->display.use_dr && !is_direct && !is_zc_chroma(todisplay->format.i_chroma)) { diff --git a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0004-mmal_exit_fix.patch b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0005-mmal_exit_fix.patch index b8ac0a0ba3..d8fc7fbfe2 100644 --- a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0004-mmal_exit_fix.patch +++ b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0005-mmal_exit_fix.patch @@ -1,4 +1,7 @@ -Upstream-status: Pending +Upstream-Status: Inappropriate + +RPI-Distro repo forks original vlc and applies patches +to enable raspiberry pi support. --- a/bin/vlc.c +++ b/bin/vlc.c @@ -12,5 +15,5 @@ Upstream-status: Pending +// signal (SIGINT, SIG_DFL); + _exit(0); } - + /***************************************************************************** diff --git a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0006-Use-packageconfig-to-detect-mmal-support.patch b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0006-Use-packageconfig-to-detect-mmal-support.patch deleted file mode 100644 index 3a2ac236c0..0000000000 --- a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0006-Use-packageconfig-to-detect-mmal-support.patch +++ /dev/null @@ -1,56 +0,0 @@ -From: Vincent Davis Jr <vince@underview.tech> -Date: Fri, 07 Jan 2022 07:10:47 PM CST -Subject: [PATCH] Use packageconfig to acquire mmal flags - -Need to use userland graphics libraries package files as it's best to not assume /opt/vc is where -all libs and headers are installed per distro. Also, needed to include $BCMHOST_MMAL_LIBS variable as -AC_CHECK_LIB(bcm_host) fails to find `vc_tv_unregister_callback_full`. Adding $BCMHOST_MMAL_LIBS uses all -libs inside bcm_host,mmal,vcsm,openmaxil .pc files when checking for `vc_tv_unregister_callback_full` -function. - -Upstream-status: Pending - -Signed-off-by: Vincent Davis Jr <vince@underview.tech> -diff --git a/configure.ac b/configure.ac -index bff220510..4d487409d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3483,23 +3483,25 @@ AC_ARG_ENABLE(mmal_avcodec, - [Use MMAL enabled avcodec libs (default disable)])) - if test "${enable_mmal}" != "no"; then - VLC_SAVE_FLAGS -- LDFLAGS="${LDFLAGS} -L/opt/vc/lib -lvchostif" -- CPPFLAGS="${CPPFLAGS} -isystem /opt/vc/include -isystem /opt/vc/include/interface/vcos/pthreads -isystem /opt/vc/include/interface/vmcs_host/linux" -- AC_CHECK_HEADERS(interface/mmal/mmal.h, -- [ AC_CHECK_LIB(bcm_host, vc_tv_unregister_callback_full, [ -+ PKG_CHECK_MODULES(BCMHOST_MMAL, [bcm_host mmal vcsm openmaxil egl], [ -+ HAVE_MMAL=yes -+ AC_CHECK_HEADERS(interface/mmal/mmal.h, -+ [ AC_CHECK_LIB(bcm_host $BCMHOST_MMAL_LIBS, vc_tv_unregister_callback_full, [ - have_mmal="yes" -- VLC_ADD_PLUGIN([mmal]) -- VLC_ADD_LDFLAGS([mmal],[ -L/opt/vc/lib ]) -- VLC_ADD_CFLAGS([mmal],[ -isystem /opt/vc/include -isystem /opt/vc/include/interface/vcos/pthreads -isystem /opt/vc/include/interface/vmcs_host/linux ]) -- VLC_ADD_LIBS([mmal],[ -lbcm_host -lmmal -lmmal_core -lmmal_components -lmmal_util -lvchostif -lvchiq_arm -lvcsm ]) ], [ -+ VLC_ADD_PLUGIN([bcm_host mmal vcsm openmaxil egl]) -+ VLC_ADD_CFLAGS([bcm_host mmal vcsm openmaxil egl],[$BCMHOST_MMAL_CFLAGS]) -+ VLC_ADD_LIBS([bcm_host mmal vcsm openmaxil egl],[$BCMHOST_MMAL_LIBS]) ], [ - AS_IF([test "${enable_mmal}" = "yes"], - [ AC_MSG_ERROR([Cannot find bcm library...]) ], - [ AC_MSG_WARN([Cannot find bcm library...]) ]) -- ], -- []) -- ] , [ AS_IF([test "${enable_mmal}" = "yes"], -- [ AC_MSG_ERROR([Cannot find development headers for mmal...]) ], -- [ AC_MSG_WARN([Cannot find development headers for mmal...]) ]) ]) -+ ],[]) -+ ],[ AS_IF([test "${enable_mmal}" = "yes"], -+ [ AC_MSG_ERROR([Cannot find development headers for mmal...]) ], -+ [ AC_MSG_WARN([Cannot find development headers for mmal...]) ]) ]) -+ ],:[ -+ AC_MSG_WARN([${BCMHOST_PKG_ERRORS}: userland graphics not available.]) -+ HAVE_MMAL=no -+ ]) - VLC_RESTORE_FLAGS - fi - AM_CONDITIONAL([HAVE_MMAL], [test "${have_mmal}" = "yes"]) diff --git a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0005-mmal_chain.patch b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0006-mmal_chain.patch index abd31df562..99fd03e101 100644 --- a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0005-mmal_chain.patch +++ b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0006-mmal_chain.patch @@ -1,10 +1,13 @@ -Upstream-status: Pending +Upstream-Status: Inappropriate + +RPI-Distro repo forks original vlc and applies patches +to enable raspiberry pi support. --- a/modules/video_chroma/chain.c +++ b/modules/video_chroma/chain.c @@ -280,8 +280,9 @@ static int BuildTransformChain( filter_t return VLC_SUCCESS; - + /* Lets try resize+chroma first, then transform */ - msg_Dbg( p_filter, "Trying to build chroma+resize" ); - EsFormatMergeSize( &fmt_mid, &p_filter->fmt_out, &p_filter->fmt_in ); diff --git a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0007-armv6.patch b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0007-armv6.patch new file mode 100644 index 0000000000..64a24268cf --- /dev/null +++ b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0007-armv6.patch @@ -0,0 +1,53 @@ +Upstream-Status: Inappropriate + +RPI-Distro repo forks original vlc and applies patches +to enable raspiberry pi support. + +--- a/modules/hw/mmal/blend_rgba_neon.S ++++ b/modules/hw/mmal/blend_rgba_neon.S +@@ -1,10 +1,10 @@ +- .syntax unified +- .arm +-// .thumb +- .text ++#include "../../arm_neon/asm.S" + .align 16 + .arch armv7-a +- .fpu neon-vfpv4 ++ .syntax unified ++#if HAVE_AS_FPU_DIRECTIVE ++ .fpu neon-vfpv4 ++#endif + + @ blend_rgbx_rgba_neon + +--- a/modules/hw/mmal/codec.c ++++ b/modules/hw/mmal/codec.c +@@ -29,6 +29,7 @@ + #include <stdatomic.h> + + #include <vlc_common.h> ++#include <vlc_cpu.h> + #include <vlc_plugin.h> + #include <vlc_codec.h> + #include <vlc_filter.h> +@@ -2311,6 +2312,9 @@ static int OpenBlendMmal(vlc_object_t *o + filter_t * const p_filter = (filter_t *)object; + const vlc_fourcc_t vfcc_dst = p_filter->fmt_out.video.i_chroma; + ++ if (!vlc_CPU_ARM_NEON()) ++ return VLC_EGENERIC; ++ + if (!hw_mmal_chroma_is_mmal(vfcc_dst) || + !hw_mmal_vzc_subpic_fmt_valid(&p_filter->fmt_in.video)) + { +@@ -2421,6 +2425,9 @@ static int OpenBlendNeon(vlc_object_t *o + MMAL_FOURCC_T mfcc_dst = vlc_to_mmal_video_fourcc(&p_filter->fmt_out.video); + blend_neon_fn * blend_fn = (blend_neon_fn *)0; + ++ if (!vlc_CPU_ARM_NEON()) ++ return VLC_EGENERIC; ++ + // Non-alpha RGB only for dest + if (vfcc_dst != VLC_CODEC_RGB32) + return VLC_EGENERIC; diff --git a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0007-use-vorbisidec.patch b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0007-use-vorbisidec.patch deleted file mode 100644 index 18bdc4ddd1..0000000000 --- a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0007-use-vorbisidec.patch +++ /dev/null @@ -1,18 +0,0 @@ -* tremor provides libvorbisidec, use it instead of libvorbisdec - -Upstream-status: Pending - -Signed-off-by: Tim Orling <TicoTimo@gmail.com> - -Index: vlc-2.2.1/modules/codec/Makefile.am -=================================================================== ---- vlc-2.2.1.orig/modules/codec/Makefile.am -+++ vlc-2.2.1/modules/codec/Makefile.am -@@ -234,7 +234,7 @@ codec_LTLIBRARIES += $(LTLIBtheora) - libtremor_plugin_la_SOURCES = codec/vorbis.c - libtremor_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_tremor - libtremor_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' --libtremor_plugin_la_LIBADD = -lvorbisdec -logg -+libtremor_plugin_la_LIBADD = -lvorbisidec -logg - EXTRA_LTLIBRARIES += libtremor_plugin.la - codec_LTLIBRARIES += $(LTLIBtremor) diff --git a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0010-fix-numeric_limits-is-not-a-member-of-std.patch b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0010-fix-numeric_limits-is-not-a-member-of-std.patch deleted file mode 100644 index a13b337fe2..0000000000 --- a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0010-fix-numeric_limits-is-not-a-member-of-std.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Vincent Davis Jr <vince@underview.tech> -Date: Fri, 07 Jan 2022 07:10:47 PM CST -Subject: [PATCH] Fix numeric limits not a member - -* Fixes bellow compiler issue: - ../../git/modules/demux/adaptive/playlist/SegmentInformation.cpp:397:23: error: 'numeric_limits' is not a member of 'std' - 397 | if(number == std::numeric_limits<uint64_t>::max()) - -Upstream-status: Pending - -Signed-off-by: Vincent Davis Jr <vince@underview.tech> -diff --git a/modules/demux/adaptive/playlist/SegmentInformation.cpp b/modules/demux/adaptive/playlist/SegmentInformation.cpp -index 344e155c7..8eeb05439 100644 ---- a/modules/demux/adaptive/playlist/SegmentInformation.cpp -+++ b/modules/demux/adaptive/playlist/SegmentInformation.cpp -@@ -34,6 +34,7 @@ - - #include <algorithm> - #include <cassert> -+#include <limits> - - using namespace adaptive::playlist; - -diff --git a/modules/demux/hls/playlist/Parser.cpp b/modules/demux/hls/playlist/Parser.cpp -index 67110e4cd..743969922 100644 ---- a/modules/demux/hls/playlist/Parser.cpp -+++ b/modules/demux/hls/playlist/Parser.cpp -@@ -42,6 +42,7 @@ - #include <map> - #include <cctype> - #include <algorithm> -+#include <limits> - - using namespace adaptive; - using namespace adaptive::playlist; diff --git a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0008-fix-luaL-checkint.patch b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/2001-fix-luaL-checkint.patch index 96b5d2d246..e8990fca60 100644 --- a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0008-fix-luaL-checkint.patch +++ b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/2001-fix-luaL-checkint.patch @@ -1,7 +1,10 @@ * luaL_checkint and luaL_optint were deprecated in lua 5.3 * replacement functions are luaL_checkinteger and luaL_optinteger -Upstream-status: Pending +Upstream-Status: Inappropriate + +RPI-Distro repo forks original vlc and applies patches to enable +raspiberry pi support. Signed-off-by: Tim Orling <TicoTimo@gmail.com> diff --git a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/2002-use-vorbisidec.patch b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/2002-use-vorbisidec.patch new file mode 100644 index 0000000000..bfabf21fa4 --- /dev/null +++ b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/2002-use-vorbisidec.patch @@ -0,0 +1,33 @@ +From d0a7ba506fd302ad195f79f287b5a5a154ac02a3 Mon Sep 17 00:00:00 2001 +From: Vincent Davis Jr <vince@underview.tech> +Date: Sun, 4 Dec 2022 16:09:51 -0600 +Subject: [PATCH] tremor provides libvorbisidec, use it instead of libvorbisdec + +Upstream-Status: Inappropriate + +RPI-Distro repo forks original vlc and applies patches to enable +raspiberry pi support. + +THIS PATCHES HAS BEEN REIMPLEMENTED INORDER TO APPLY PROPERLY. + +Signed-off-by: Tim Orling <TicoTimo@gmail.com> +--- + modules/codec/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am +index 3dadf1119..8b6189e92 100644 +--- a/modules/codec/Makefile.am ++++ b/modules/codec/Makefile.am +@@ -324,7 +324,7 @@ codec_LTLIBRARIES += $(LTLIBdaala) + libtremor_plugin_la_SOURCES = codec/vorbis.c + libtremor_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_tremor + libtremor_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' +-libtremor_plugin_la_LIBADD = -lvorbisdec -logg ++libtremor_plugin_la_LIBADD = -lvorbisidec -logg + EXTRA_LTLIBRARIES += libtremor_plugin.la + codec_LTLIBRARIES += $(LTLIBtremor) + +-- +2.38.1 + diff --git a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3001-configure.ac-setup-for-OE-usage.patch b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3001-configure.ac-setup-for-OE-usage.patch new file mode 100644 index 0000000000..d676be39bf --- /dev/null +++ b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3001-configure.ac-setup-for-OE-usage.patch @@ -0,0 +1,124 @@ +From ddc2ea76058466b45a1acf37bed0d794cd3112a3 Mon Sep 17 00:00:00 2001 +From: Vincent Davis Jr <vince@underview.tech> +Date: Fri, 9 Dec 2022 19:04:42 -0600 +Subject: [PATCH] configure.ac: setup for OE usage + +Upstream-Status: Inappropriate + +RPI-Distro repo forks original vlc and applies patches to enable +raspiberry pi support. + +Need to use userland graphics libraries package files as it's best +to not assume /opt/vc is where all libs and headers are installed per +distro. Also, needed to include $BCMHOST_MMAL_LIBS variable as +AC_CHECK_LIB(bcm_host) fails to find `vc_tv_unregister_callback_full`. +Adding $BCMHOST_MMAL_LIBS uses all libs inside +bcm_host.pc, mmal.pc, vcsm.pc, openmaxil.pc files when checking +for `vc_tv_unregister_callback_full` function. + +Supposed to change linked version to opengl to GLESv2 + +Ensure correct package config file is used for: +* opencv +* freerdp + +Adds Workaround for modules/codec/omxil/omxil_core.h + multiple definition of `pf_enable_graphic_buffers' + multiple definition of `pf_get_graphic_buffer_usage' + multiple definition of `pf_get_hal_format' + +Signed-off-by: Vincent Davis Jr <vince@underview.tech> +--- + configure.ac | 34 ++++++++++++++++++++++------------ + 1 file changed, 22 insertions(+), 12 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a72dca0b6..5b8585a26 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -95,6 +95,13 @@ AS_IF([test -n "${with_binary_version}"],[ + [Binary specific version]) + ]) + ++# Workaround for modules/codec/omxil/omxil_core.h ++# multiple definition of `pf_enable_graphic_buffers' ++# multiple definition of `pf_get_graphic_buffer_usage' ++# multiple definition of `pf_get_hal_format' ++AC_SUBST([AM_CXXFLAGS], [-fcommon]) ++AC_SUBST([AM_CFLAGS], [-fcommon]) ++ + dnl Prevent clang from accepting unknown flags with a mere warning + AX_APPEND_COMPILE_FLAGS([-Werror=unknown-warning-option -Werror=invalid-command-line-argument], [CFLAGS]) + AX_APPEND_COMPILE_FLAGS([-Werror=unknown-warning-option -Werror=invalid-command-line-argument], [CXXFLAGS]) +@@ -1900,7 +1907,7 @@ PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.6.2], (libbluray f + dnl + dnl OpenCV wrapper and example filters + dnl +-PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv > 2.0], (OpenCV (computer vision) filter), [auto]) ++PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv4 >= 2.0], (OpenCV (computer vision) filter), [auto]) + + + dnl +@@ -2077,7 +2084,7 @@ PKG_ENABLE_MODULES_VLC([VNC], [vnc], [libvncclient >= 0.9.9], (VNC/rfb client su + + dnl RDP/Remote Desktop access module + dnl +-PKG_ENABLE_MODULES_VLC([FREERDP], [rdp], [freerdp >= 1.0.1], (RDP/Remote Desktop client support) ) ++PKG_ENABLE_MODULES_VLC([FREERDP], [rdp], [freerdp2 >= 1.0.1], (RDP/Remote Desktop client support) ) + + dnl + dnl Real RTSP plugin +@@ -3089,14 +3096,14 @@ PKG_CHECK_MODULES([GL], [gl], [ + #ifdef _WIN32 + # include <GL/glew.h> + #endif +-#include <GL/gl.h> ++#include <GLES2/gl2.h> + ]], [ + [int t0 = GL_TEXTURE0;]]) + ], [ + GL_CFLAGS="" + have_gl="yes" + AS_IF([test "${SYS}" != "mingw32"], [ +- GL_LIBS="-lGL" ++ GL_LIBS="-lGLESv2" + ], [ + GL_LIBS="-lopengl32" + ]) +@@ -3483,15 +3490,14 @@ AC_ARG_ENABLE(mmal_avcodec, + [Use MMAL enabled avcodec libs (default disable)])) + if test "${enable_mmal}" != "no"; then + VLC_SAVE_FLAGS +- LDFLAGS="${LDFLAGS} -L/opt/vc/lib -lvchostif" +- CPPFLAGS="${CPPFLAGS} -isystem /opt/vc/include -isystem /opt/vc/include/interface/vcos/pthreads -isystem /opt/vc/include/interface/vmcs_host/linux" +- AC_CHECK_HEADERS(interface/mmal/mmal.h, +- [ AC_CHECK_LIB(bcm_host, vc_tv_unregister_callback_full, [ ++ PKG_CHECK_MODULES(BCMHOST_MMAL, [bcm_host mmal vcsm openmaxil egl], [ ++ HAVE_MMAL=yes ++ AC_CHECK_HEADERS(interface/mmal/mmal.h, ++ [ AC_CHECK_LIB(bcm_host $BCMHOST_MMAL_LIBS, vc_tv_unregister_callback_full, [ + have_mmal="yes" +- VLC_ADD_PLUGIN([mmal]) +- VLC_ADD_LDFLAGS([mmal],[ -L/opt/vc/lib ]) +- VLC_ADD_CFLAGS([mmal],[ -isystem /opt/vc/include -isystem /opt/vc/include/interface/vcos/pthreads -isystem /opt/vc/include/interface/vmcs_host/linux ]) +- VLC_ADD_LIBS([mmal],[ -lbcm_host -lmmal -lmmal_core -lmmal_components -lmmal_util -lvchostif -lvchiq_arm -lvcsm ]) ], [ ++ VLC_ADD_PLUGIN([bcm_host mmal vcsm openmaxil egl]) ++ VLC_ADD_CFLAGS([bcm_host mmal vcsm openmaxil egl],[$BCMHOST_MMAL_CFLAGS]) ++ VLC_ADD_LIBS([bcm_host mmal vcsm openmaxil egl],[$BCMHOST_MMAL_LIBS -lmmal_components]) ], [ + AS_IF([test "${enable_mmal}" = "yes"], + [ AC_MSG_ERROR([Cannot find bcm library...]) ], + [ AC_MSG_WARN([Cannot find bcm library...]) ]) +@@ -3500,6 +3506,10 @@ if test "${enable_mmal}" != "no"; then + ] , [ AS_IF([test "${enable_mmal}" = "yes"], + [ AC_MSG_ERROR([Cannot find development headers for mmal...]) ], + [ AC_MSG_WARN([Cannot find development headers for mmal...]) ]) ]) ++ ],:[ ++ AC_MSG_WARN([${BCMHOST_PKG_ERRORS}: userland graphics not available.]) ++ HAVE_MMAL=NO ++ ]) + VLC_RESTORE_FLAGS + fi + AM_CONDITIONAL([HAVE_MMAL], [test "${have_mmal}" = "yes"]) +-- +2.38.1 + diff --git a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0009-fix-EGL-macro-undeclared-and-EGLImageKHR.patch b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3002-fix-EGL-macro-undeclared-and-EGLImageKHR.patch index 9bd6b41469..ab72b4f3c9 100644 --- a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0009-fix-EGL-macro-undeclared-and-EGLImageKHR.patch +++ b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3002-fix-EGL-macro-undeclared-and-EGLImageKHR.patch @@ -2,11 +2,14 @@ From: Vincent Davis Jr <vince@underview.tech> Date: Fri, 07 Jan 2022 07:01:47 PM CST Subject: [PATCH] Fix EGL macro undeclared and EGLImageKHR +Upstream-Status: Inappropriate + +RPI-Distro repo forks original vlc and applies patches to enable +raspiberry pi support. + * Fixes compiler issues related to EGL macro constant/enum value type not being defined * Updates EGLImage to EGLImageKHR -Upstream-status: Pending - Signed-off-by: Vincent Davis Jr <vince@underview.tech> diff --git a/modules/hw/mmal/converter_mmal.c b/modules/hw/mmal/converter_mmal.c index f31cb81d8..426af668b 100644 diff --git a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3003-codec-omxil_core-replace-opt-vc-path-with-usr-lib.patch b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3003-codec-omxil_core-replace-opt-vc-path-with-usr-lib.patch new file mode 100644 index 0000000000..a2dba50b2f --- /dev/null +++ b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3003-codec-omxil_core-replace-opt-vc-path-with-usr-lib.patch @@ -0,0 +1,43 @@ +From 85f6603aca1d174848b42e696a4cff8af57613d6 Mon Sep 17 00:00:00 2001 +From: Vincent Davis Jr <vince@underview.tech> +Date: Thu, 8 Dec 2022 23:38:36 -0600 +Subject: [PATCH] codec: omxil_core replace /opt/vc path with /usr/lib + +Upstream-Status: Inappropriate + +RPI-Distro repo clones original VLC and applies patches to enable +raspiberry pi support. + +Configures omxil_core.c for OE usages as libbcm_host.so +and libopenmaxil.so are located in a different location. + +Signed-off-by: Vincent Davis Jr <vince@underview.tech> +--- + modules/codec/omxil/omxil_core.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules/codec/omxil/omxil_core.c b/modules/codec/omxil/omxil_core.c +index 5098f517a..5922d9034 100644 +--- a/modules/codec/omxil/omxil_core.c ++++ b/modules/codec/omxil/omxil_core.c +@@ -56,7 +56,7 @@ static const char *ppsz_dll_list[] = + #if defined(USE_IOMX) + "libiomx.so", /* Not used when using IOMX, the lib should already be loaded */ + #elif defined(RPI_OMX) +- "/opt/vc/lib/libopenmaxil.so", /* Broadcom IL core */ ++ "/usr/lib/libopenmaxil.so", /* Broadcom IL core */ + #elif 1 + "libOMX_Core.so", /* TI OMAP IL core */ + "libOmxCore.so", /* Qualcomm IL core */ +@@ -70,7 +70,7 @@ static const char *ppsz_dll_list[] = + #ifdef RPI_OMX + static const char *ppsz_extra_dll_list[] = + { +- "/opt/vc/lib/libbcm_host.so", /* Broadcom host library */ ++ "/usr/lib/libbcm_host.so", /* Broadcom host library */ + 0 + }; + #endif +-- +2.38.1 + diff --git a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3004-use-GLESv2-headers-over-GL-headers.patch b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3004-use-GLESv2-headers-over-GL-headers.patch new file mode 100644 index 0000000000..8016ab3795 --- /dev/null +++ b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3004-use-GLESv2-headers-over-GL-headers.patch @@ -0,0 +1,60 @@ +From 377a67af6c3f7c38f6f7ba24f042ba1a6cfd3f24 Mon Sep 17 00:00:00 2001 +From: Vincent Davis Jr <vince@underview.tech> +Date: Fri, 9 Dec 2022 00:21:43 -0600 +Subject: [PATCH] use GLESv2 headers over GL headers + +Upstream-Status: Inappropriate + +RPI-Distro repo forks original vlc and applies patches to enable +raspiberry pi support. + +We utilize GLESv2 during compilation. Patches ensures +we utilize headers for it. + +Signed-off-by: Vincent Davis Jr <vince@underview.tech> +--- + modules/video_output/opengl/converter.h | 12 +++--------- + modules/visualization/glspectrum.c | 4 +++- + 2 files changed, 6 insertions(+), 10 deletions(-) + +diff --git a/modules/video_output/opengl/converter.h b/modules/video_output/opengl/converter.h +index 7000e1f38..a3fe32671 100644 +--- a/modules/video_output/opengl/converter.h ++++ b/modules/video_output/opengl/converter.h +@@ -41,15 +41,9 @@ + # include <OpenGLES/ES2/glext.h> + # endif + #else /* !defined (__APPLE__) */ +-# if defined (USE_OPENGL_ES2) +-# include <GLES2/gl2.h> +-# include <GLES2/gl2ext.h> +-# else +-# ifdef _WIN32 +-# include <GL/glew.h> +-# endif +-# include <GL/gl.h> +-# endif ++#define USE_OPENGL_ES2 ++#include <GLES2/gl2.h> ++#include <GLES2/gl2ext.h> + #endif + + #define VLCGL_PICTURE_MAX 128 +diff --git a/modules/visualization/glspectrum.c b/modules/visualization/glspectrum.c +index 06f8d1bdf..470080b1a 100644 +--- a/modules/visualization/glspectrum.c ++++ b/modules/visualization/glspectrum.c +@@ -37,7 +37,9 @@ + #ifdef __APPLE__ + # include <OpenGL/gl.h> + #else +-# include <GL/gl.h> ++#define USE_OPENGL_ES2 ++#include <GLES2/gl2.h> ++#include <GLES2/gl2ext.h> + #endif + + #include <math.h> +-- +2.38.1 + diff --git a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3005-modules-remove-glspectrum-usage.patch b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3005-modules-remove-glspectrum-usage.patch new file mode 100644 index 0000000000..7cf210be27 --- /dev/null +++ b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3005-modules-remove-glspectrum-usage.patch @@ -0,0 +1,149 @@ +From 5f1bb5889d838719e381350b25c00ef3a75d0e02 Mon Sep 17 00:00:00 2001 +From: Vincent Davis Jr <vince@underview.tech> +Date: Fri, 9 Dec 2022 01:07:55 -0600 +Subject: [PATCH] modules: remove glspectrum usage + +Upstream-Status: Inappropriate + +RPI-Distro repo forks original vlc and applies patches to enable +raspiberry pi support. + +The glspectrum modules requries OpenGL +while we only want to utilize GLESv2. + +Signed-off-by: Vincent Davis Jr <vince@underview.tech> +--- + modules/Makefile.in | 24 ------------------------ + modules/visualization/Makefile.am | 10 ---------- + 2 files changed, 34 deletions(-) + +diff --git a/modules/Makefile.in b/modules/Makefile.in +index bde45db53..c9c4342ad 100644 +--- a/modules/Makefile.in ++++ b/modules/Makefile.in +@@ -481,7 +481,6 @@ TESTS = hpack_test$(EXEEXT) hpackenc_test$(EXEEXT) \ + @HAVE_WIN32_FALSE@am__append_247 = $(X_LIBS) $(X_PRE_LIBS) -lX11 + @HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@am__append_248 = $(X_LIBS) $(X_PRE_LIBS) -lX11 + @HAVE_EVAS_TRUE@am__append_249 = libevas_plugin.la +-@HAVE_GL_TRUE@am__append_250 = libglspectrum_plugin.la + @ENABLE_SOUT_TRUE@@HAVE_GCRYPT_TRUE@am__append_251 = libaccess_output_livehttp_plugin.la + @ENABLE_SOUT_TRUE@am__append_252 = libaccess_output_shout_plugin.la \ + @ENABLE_SOUT_TRUE@ libaccess_output_srt_plugin.la \ +@@ -2028,13 +2027,7 @@ libgles2_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(libgles2_plugin_la_CFLAGS) $(CFLAGS) \ + $(libgles2_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ +-libglspectrum_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +-am_libglspectrum_plugin_la_OBJECTS = visualization/glspectrum.lo \ +- visualization/visual/fft.lo visualization/visual/window.lo +-libglspectrum_plugin_la_OBJECTS = \ +- $(am_libglspectrum_plugin_la_OBJECTS) +-@HAVE_GL_TRUE@am_libglspectrum_plugin_la_rpath = -rpath $(visudir) + libglwin32_plugin_la_DEPENDENCIES = libchroma_copy.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_5) + am__objects_23 = \ +@@ -6507,7 +6500,6 @@ am__depfiles_remade = \ + video_splitter/$(DEPDIR)/clone.Plo \ + video_splitter/$(DEPDIR)/libpanoramix_plugin_la-panoramix.Plo \ + video_splitter/$(DEPDIR)/wall.Plo \ +- visualization/$(DEPDIR)/glspectrum.Plo \ + visualization/$(DEPDIR)/libgoom_plugin_la-goom.Plo \ + visualization/$(DEPDIR)/libprojectm_plugin_la-projectm.Plo \ + visualization/$(DEPDIR)/libvsxu_plugin_la-vsxu.Plo \ +@@ -6731,7 +6723,6 @@ SOURCES = $(liba52_plugin_la_SOURCES) $(libaa_plugin_la_SOURCES) \ + $(libglconv_vaapi_x11_plugin_la_SOURCES) \ + $(libglconv_vdpau_plugin_la_SOURCES) \ + $(libgles2_plugin_la_SOURCES) \ +- $(libglspectrum_plugin_la_SOURCES) \ + $(libglwin32_plugin_la_SOURCES) $(libglx_plugin_la_SOURCES) \ + $(libgme_plugin_la_SOURCES) $(libgnutls_plugin_la_SOURCES) \ + $(libgoom_plugin_la_SOURCES) $(libgradfun_plugin_la_SOURCES) \ +@@ -7130,7 +7121,6 @@ DIST_SOURCES = $(liba52_plugin_la_SOURCES) $(libaa_plugin_la_SOURCES) \ + $(libglconv_vaapi_x11_plugin_la_SOURCES) \ + $(libglconv_vdpau_plugin_la_SOURCES) \ + $(libgles2_plugin_la_SOURCES) \ +- $(libglspectrum_plugin_la_SOURCES) \ + $(libglwin32_plugin_la_SOURCES) $(libglx_plugin_la_SOURCES) \ + $(libgme_plugin_la_SOURCES) $(libgnutls_plugin_la_SOURCES) \ + $(libgoom_plugin_la_SOURCES) $(libgradfun_plugin_la_SOURCES) \ +@@ -12696,13 +12686,6 @@ libevent_thread_la_LDFLAGS = -static + visudir = $(pluginsdir)/visualization + visu_LTLIBRARIES = $(am__append_250) $(LTLIBgoom) $(LTLIBprojectm) \ + libvisual_plugin.la $(LTLIBvsxu) +-libglspectrum_plugin_la_SOURCES = \ +- visualization/glspectrum.c \ +- visualization/visual/fft.c visualization/visual/fft.h \ +- visualization/visual/window.c visualization/visual/window.h \ +- visualization/visual/window_presets.h +- +-libglspectrum_plugin_la_LIBADD = $(GL_LIBS) $(LIBM) + libgoom_plugin_la_SOURCES = visualization/goom.c + libgoom_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(GOOM_CFLAGS) + libgoom_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(visudir)' +@@ -15715,8 +15698,6 @@ visualization/$(am__dirstamp): + visualization/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) visualization/$(DEPDIR) + @: > visualization/$(DEPDIR)/$(am__dirstamp) +-visualization/glspectrum.lo: visualization/$(am__dirstamp) \ +- visualization/$(DEPDIR)/$(am__dirstamp) + visualization/visual/$(am__dirstamp): + @$(MKDIR_P) visualization/visual + @: > visualization/visual/$(am__dirstamp) +@@ -15728,8 +15709,6 @@ visualization/visual/fft.lo: visualization/visual/$(am__dirstamp) \ + visualization/visual/window.lo: visualization/visual/$(am__dirstamp) \ + visualization/visual/$(DEPDIR)/$(am__dirstamp) + +-libglspectrum_plugin.la: $(libglspectrum_plugin_la_OBJECTS) $(libglspectrum_plugin_la_DEPENDENCIES) $(EXTRA_libglspectrum_plugin_la_DEPENDENCIES) +- $(AM_V_CCLD)$(LINK) $(am_libglspectrum_plugin_la_rpath) $(libglspectrum_plugin_la_OBJECTS) $(libglspectrum_plugin_la_LIBADD) $(LIBS) + video_output/opengl/libglwin32_plugin_la-vout_helper.lo: \ + video_output/opengl/$(am__dirstamp) \ + video_output/opengl/$(DEPDIR)/$(am__dirstamp) +@@ -21420,7 +21399,6 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@video_splitter/$(DEPDIR)/clone.Plo@am__quote@ # am--include-marker + @AMDEP_TRUE@@am__include@ @am__quote@video_splitter/$(DEPDIR)/libpanoramix_plugin_la-panoramix.Plo@am__quote@ # am--include-marker + @AMDEP_TRUE@@am__include@ @am__quote@video_splitter/$(DEPDIR)/wall.Plo@am__quote@ # am--include-marker +-@AMDEP_TRUE@@am__include@ @am__quote@visualization/$(DEPDIR)/glspectrum.Plo@am__quote@ # am--include-marker + @AMDEP_TRUE@@am__include@ @am__quote@visualization/$(DEPDIR)/libgoom_plugin_la-goom.Plo@am__quote@ # am--include-marker + @AMDEP_TRUE@@am__include@ @am__quote@visualization/$(DEPDIR)/libprojectm_plugin_la-projectm.Plo@am__quote@ # am--include-marker + @AMDEP_TRUE@@am__include@ @am__quote@visualization/$(DEPDIR)/libvsxu_plugin_la-vsxu.Plo@am__quote@ # am--include-marker +@@ -30324,7 +30302,6 @@ distclean: distclean-recursive + -rm -f video_splitter/$(DEPDIR)/clone.Plo + -rm -f video_splitter/$(DEPDIR)/libpanoramix_plugin_la-panoramix.Plo + -rm -f video_splitter/$(DEPDIR)/wall.Plo +- -rm -f visualization/$(DEPDIR)/glspectrum.Plo + -rm -f visualization/$(DEPDIR)/libgoom_plugin_la-goom.Plo + -rm -f visualization/$(DEPDIR)/libprojectm_plugin_la-projectm.Plo + -rm -f visualization/$(DEPDIR)/libvsxu_plugin_la-vsxu.Plo +@@ -31722,7 +31699,6 @@ maintainer-clean: maintainer-clean-recursive + -rm -f video_splitter/$(DEPDIR)/clone.Plo + -rm -f video_splitter/$(DEPDIR)/libpanoramix_plugin_la-panoramix.Plo + -rm -f video_splitter/$(DEPDIR)/wall.Plo +- -rm -f visualization/$(DEPDIR)/glspectrum.Plo + -rm -f visualization/$(DEPDIR)/libgoom_plugin_la-goom.Plo + -rm -f visualization/$(DEPDIR)/libprojectm_plugin_la-projectm.Plo + -rm -f visualization/$(DEPDIR)/libvsxu_plugin_la-vsxu.Plo +diff --git a/modules/visualization/Makefile.am b/modules/visualization/Makefile.am +index 10619e030..aafc97f87 100644 +--- a/modules/visualization/Makefile.am ++++ b/modules/visualization/Makefile.am +@@ -1,16 +1,6 @@ + visudir = $(pluginsdir)/visualization + visu_LTLIBRARIES = + +-libglspectrum_plugin_la_SOURCES = \ +- visualization/glspectrum.c \ +- visualization/visual/fft.c visualization/visual/fft.h \ +- visualization/visual/window.c visualization/visual/window.h \ +- visualization/visual/window_presets.h +-libglspectrum_plugin_la_LIBADD = $(GL_LIBS) $(LIBM) +-if HAVE_GL +-visu_LTLIBRARIES += libglspectrum_plugin.la +-endif +- + libgoom_plugin_la_SOURCES = visualization/goom.c + libgoom_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(GOOM_CFLAGS) + libgoom_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(visudir)' +-- +2.38.1 + diff --git a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3006-codec-omxil_core.h-fix-multiple-definition-of.patch b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3006-codec-omxil_core.h-fix-multiple-definition-of.patch new file mode 100644 index 0000000000..e680c88bca --- /dev/null +++ b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3006-codec-omxil_core.h-fix-multiple-definition-of.patch @@ -0,0 +1,43 @@ +From fd4d233757cc46cd89f68b45ec4b059940dd84ae Mon Sep 17 00:00:00 2001 +From: Vincent Davis Jr <vince@underview.tech> +Date: Fri, 9 Dec 2022 19:58:11 -0600 +Subject: [PATCH] codec: omxil_core.h fix multiple definition of + +Upstream-Status: Inappropriate + +RPI-Distro repo forks original vlc and applies patches +to enable raspiberry pi support. + +Issue occurs during compilation as +* pf_enable_graphic_buffers +* pf_get_graphic_buffer_usage +* pf_get_hal_format + +Apears to be defined multiple times as the omxil_core.h +is included in multiple files. + +Signed-off-by: Vincent Davis Jr <vince@underview.tech> +--- + modules/codec/omxil/omxil_core.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/modules/codec/omxil/omxil_core.h b/modules/codec/omxil/omxil_core.h +index ac3db510b..f6e42f5ed 100644 +--- a/modules/codec/omxil/omxil_core.h ++++ b/modules/codec/omxil/omxil_core.h +@@ -34,9 +34,9 @@ extern OMX_ERRORTYPE (*pf_component_enum)(OMX_STRING, OMX_U32, OMX_U32); + extern OMX_ERRORTYPE (*pf_get_roles_of_component)(OMX_STRING, OMX_U32 *, OMX_U8 **); + + /* Extra IOMX android functions. Can be NULL if we don't link with libiomx */ +-OMX_ERRORTYPE (*pf_enable_graphic_buffers)(OMX_HANDLETYPE, OMX_U32, OMX_BOOL); +-OMX_ERRORTYPE (*pf_get_graphic_buffer_usage)(OMX_HANDLETYPE, OMX_U32, OMX_U32*); +-OMX_ERRORTYPE (*pf_get_hal_format) (const char *, int *); ++extern OMX_ERRORTYPE (*pf_enable_graphic_buffers)(OMX_HANDLETYPE, OMX_U32, OMX_BOOL); ++extern OMX_ERRORTYPE (*pf_get_graphic_buffer_usage)(OMX_HANDLETYPE, OMX_U32, OMX_U32*); ++extern OMX_ERRORTYPE (*pf_get_hal_format) (const char *, int *); + + int InitOmxCore(vlc_object_t *p_this); + void DeinitOmxCore(void); +-- +2.38.1 + diff --git a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3007-remove-xorg-related-link-libs.patch b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3007-remove-xorg-related-link-libs.patch new file mode 100644 index 0000000000..a0487fa2e4 --- /dev/null +++ b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3007-remove-xorg-related-link-libs.patch @@ -0,0 +1,36 @@ +From 34e4f4dad923095989ccb0ab8efb883c592bdbfd Mon Sep 17 00:00:00 2001 +From: Vincent Davis Jr <vince@underview.tech> +Date: Fri, 9 Dec 2022 20:04:27 -0600 +Subject: [PATCH] remove xorg related link libs + +Upstream-Status: Inappropriate + +RPI-Distro repo forks original vlc and applies patches +to enable raspiberry pi support. + +If x11 isn't defined in DISTRO_FEATURES +required xorg related libs are not included +in recipe-sysroot resulting in compilation +failure. + +Signed-off-by: Vincent Davis Jr <vince@underview.tech> +--- + modules/hw/mmal/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/hw/mmal/Makefile.am b/modules/hw/mmal/Makefile.am +index 4abe68e2e..86dad2c2d 100644 +--- a/modules/hw/mmal/Makefile.am ++++ b/modules/hw/mmal/Makefile.am +@@ -8,7 +8,7 @@ libmmal_vout_plugin_la_SOURCES = vout.c mmal_cma.c mmal_picture.c subpic.c\ + mmal_cma.h mmal_picture.h subpic.h transform_ops.h\ + mmal_piccpy_neon.S + libmmal_vout_plugin_la_CFLAGS = $(AM_CFLAGS) +-libmmal_vout_plugin_la_LDFLAGS = $(AM_LDFLAGS) -lm -lX11 -lXrandr ++libmmal_vout_plugin_la_LDFLAGS = $(AM_LDFLAGS) -lm + libmmal_vout_plugin_la_LIBADD = $(LIBS_mmal) + mmal_LTLIBRARIES = libmmal_vout_plugin.la + +-- +2.38.1 + diff --git a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3008-vo-Makefile.am-exclude-libgl_plugin.patch b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3008-vo-Makefile.am-exclude-libgl_plugin.patch new file mode 100644 index 0000000000..8806c80a60 --- /dev/null +++ b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3008-vo-Makefile.am-exclude-libgl_plugin.patch @@ -0,0 +1,97 @@ +From 28917a258a4173af0abda0eef7faef5cbf95f123 Mon Sep 17 00:00:00 2001 +From: Vincent Davis Jr <vince@underview.tech> +Date: Fri, 9 Dec 2022 21:28:48 -0600 +Subject: [PATCH] vo: Makefile.am exclude libgl_plugin + +Upstream-Status: Inappropriate + +RPI-Distro repo forks original vlc and applies patches +to enable raspiberry pi support. + +In the situation where opengl isn't included in +DISTRO_FEATURES. We need to exclude the opengl +vout plugin from being built. + +Signed-off-by: Vincent Davis Jr <vince@underview.tech> +--- + modules/video_output/Makefile.am | 64 -------------------------------- + 1 file changed, 64 deletions(-) + +diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am +index 78c06cfc4..14a330e68 100644 +--- a/modules/video_output/Makefile.am ++++ b/modules/video_output/Makefile.am +@@ -57,70 +57,6 @@ if HAVE_TVOS + vout_LTLIBRARIES += libvout_ios_plugin.la libglconv_cvpx_plugin.la + endif + +-### OpenGL ### +-libgles2_plugin_la_SOURCES = $(OPENGL_COMMONSOURCES) video_output/opengl/display.c +-libgles2_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES2_CFLAGS) -DUSE_OPENGL_ES2 $(OPENGL_COMMONCLFAGS) +-libgles2_plugin_la_LIBADD = $(GLES2_LIBS) $(LIBM) $(OPENGL_COMMONLIBS) +-libgles2_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' +- +-EXTRA_LTLIBRARIES += libgles2_plugin.la +-vout_LTLIBRARIES += $(LTLIBgles2) +- +-libgl_plugin_la_SOURCES = $(OPENGL_COMMONSOURCES) video_output/opengl/display.c +-libgl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS) $(OPENGL_COMMONCLFAGS) +-libgl_plugin_la_LIBADD = $(LIBM) $(OPENGL_COMMONLIBS) +-if HAVE_WIN32 +-libgl_plugin_la_CFLAGS += -DHAVE_GL_CORE_SYMBOLS +-libgl_plugin_la_LIBADD += $(GL_LIBS) +-endif +- +-libglconv_vaapi_wl_plugin_la_SOURCES = video_output/opengl/converter_vaapi.c \ +- video_output/opengl/converter.h \ +- hw/vaapi/vlc_vaapi.c hw/vaapi/vlc_vaapi.h +-libglconv_vaapi_wl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS) -DHAVE_VA_WL $(LIBVA_WL_CFLAGS) +-libglconv_vaapi_wl_plugin_la_LIBADD = $(LIBVA_LIBS) $(LIBVA_EGL_LIBS) \ +- $(LIBVA_WL_LIBS) +- +-libglconv_vaapi_x11_plugin_la_SOURCES = $(libglconv_vaapi_wl_plugin_la_SOURCES) +-libglconv_vaapi_x11_plugin_la_CFLAGS = $(AM_CFLAGS) -DHAVE_VA_X11 +-libglconv_vaapi_x11_plugin_la_LIBADD = $(LIBVA_LIBS) $(LIBVA_EGL_LIBS) \ +- $(LIBVA_X11_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11 +- +-libglconv_vaapi_drm_plugin_la_SOURCES = $(libglconv_vaapi_wl_plugin_la_SOURCES) +-libglconv_vaapi_drm_plugin_la_CFLAGS = $(AM_CFLAGS) -DHAVE_VA_DRM +-libglconv_vaapi_drm_plugin_la_LIBADD = $(LIBVA_LIBS) $(LIBVA_EGL_LIBS) \ +- $(LIBVA_DRM_LIBS) +- +-libglconv_vdpau_plugin_la_SOURCES = video_output/opengl/converter_vdpau.c \ +- video_output/opengl/converter.h hw/vdpau/vlc_vdpau.h +-libglconv_vdpau_plugin_la_CFLAGS = $(AM_CFLAGS) $(VDPAU_CFLAGS) +-libglconv_vdpau_plugin_la_LIBADD = $(LIBDL) libvlc_vdpau.la $(X_LIBS) $(X_PRE_LIBS) -lX11 +- +-if HAVE_GL +-vout_LTLIBRARIES += libgl_plugin.la +-if HAVE_EGL +-if HAVE_VAAPI +-if HAVE_WAYLAND_EGL +-if HAVE_VAAPI_WL +-vout_LTLIBRARIES += libglconv_vaapi_wl_plugin.la +-endif +-endif +-if HAVE_XCB +-if HAVE_VAAPI_X11 +-vout_LTLIBRARIES += libglconv_vaapi_x11_plugin.la +-endif +-endif +-if HAVE_VAAPI_DRM +-vout_LTLIBRARIES += libglconv_vaapi_drm_plugin.la +-endif +-endif +-endif # HAVE_EGL +- +-if HAVE_VDPAU +-vout_LTLIBRARIES += libglconv_vdpau_plugin.la +-endif +-endif # HAVE_GL +- + ### XCB ### + libvlc_xcb_events_la_SOURCES = \ + video_output/xcb/events.c video_output/xcb/events.h +-- +2.38.1 + diff --git a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3009-vo-converter_vaapi-Fix-EGL-macro-undeclared.patch b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3009-vo-converter_vaapi-Fix-EGL-macro-undeclared.patch new file mode 100644 index 0000000000..0f28199511 --- /dev/null +++ b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3009-vo-converter_vaapi-Fix-EGL-macro-undeclared.patch @@ -0,0 +1,59 @@ +From 35276c4b02b9114436108e74727d192f1e21f239 Mon Sep 17 00:00:00 2001 +From: Vincent Davis Jr <vince@underview.tech> +Date: Fri, 9 Dec 2022 23:31:33 -0600 +Subject: [PATCH] vo: converter_vaapi Fix EGL macro undeclared + +Upstream-Status: Inappropriate + +RPI-Distro repo forks original vlc and applies patches to enable +raspiberry pi support. + +Fixes compiler issues related to EGL macro constant/enum value type +not being defined + +Signed-off-by: Vincent Davis Jr <vince@underview.tech> +--- + modules/video_output/opengl/converter_vaapi.c | 27 +++++++++++++++++++ + 1 file changed, 27 insertions(+) + +diff --git a/modules/video_output/opengl/converter_vaapi.c b/modules/video_output/opengl/converter_vaapi.c +index cd842f711..59245fe4c 100644 +--- a/modules/video_output/opengl/converter_vaapi.c ++++ b/modules/video_output/opengl/converter_vaapi.c +@@ -55,6 +55,33 @@ + + #define DRM_FORMAT_MOD_INVALID fourcc_mod_code(NONE, DRM_FORMAT_RESERVED) + ++#define EGL_LINUX_DMA_BUF_EXT 0x3270 ++#define EGL_LINUX_DRM_FOURCC_EXT 0x3271 ++#define EGL_DMA_BUF_PLANE0_FD_EXT 0x3272 ++#define EGL_DMA_BUF_PLANE0_OFFSET_EXT 0x3273 ++#define EGL_DMA_BUF_PLANE0_PITCH_EXT 0x3274 ++#define EGL_DMA_BUF_PLANE1_FD_EXT 0x3275 ++#define EGL_DMA_BUF_PLANE1_OFFSET_EXT 0x3276 ++#define EGL_DMA_BUF_PLANE1_PITCH_EXT 0x3277 ++#define EGL_DMA_BUF_PLANE2_FD_EXT 0x3278 ++#define EGL_DMA_BUF_PLANE2_OFFSET_EXT 0x3279 ++#define EGL_DMA_BUF_PLANE2_PITCH_EXT 0x327A ++#define EGL_YUV_COLOR_SPACE_HINT_EXT 0x327B ++#define EGL_SAMPLE_RANGE_HINT_EXT 0x327C ++#define EGL_YUV_CHROMA_HORIZONTAL_SITING_HINT_EXT 0x327D ++#define EGL_YUV_CHROMA_VERTICAL_SITING_HINT_EXT 0x327E ++#define EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT 0x3443 ++#define EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT 0x3444 ++#define EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT 0x3445 ++#define EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT 0x3446 ++#define EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT 0x3447 ++#define EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT 0x3448 ++#define EGL_DMA_BUF_PLANE3_FD_EXT 0x3440 ++#define EGL_DMA_BUF_PLANE3_OFFSET_EXT 0x3441 ++#define EGL_DMA_BUF_PLANE3_PITCH_EXT 0x3442 ++#define EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT 0x3449 ++#define EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT 0x344A ++ + struct priv + { + struct vlc_vaapi_instance *vainst; +-- +2.38.1 + diff --git a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/rpidistro-vlc_3.0.12.bb b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/rpidistro-vlc_3.0.17.bb index b244dde88e..2653b28f90 100644 --- a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/rpidistro-vlc_3.0.12.bb +++ b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/rpidistro-vlc_3.0.17.bb @@ -9,17 +9,25 @@ SRC_URI = "\ git://git@github.com/RPi-Distro/vlc;protocol=https;branch=buster-rpt \ file://0001-configure-fix-linking-on-RISC-V-ISA.patch \ file://0002-Revert-configure-Require-libmodplug-0.8.9.patch \ - file://0003-mmal_20.patch \ - file://0004-mmal_exit_fix.patch \ - file://0005-mmal_chain.patch \ - file://0006-Use-packageconfig-to-detect-mmal-support.patch \ - file://0007-use-vorbisidec.patch \ - file://0008-fix-luaL-checkint.patch \ - file://0009-fix-EGL-macro-undeclared-and-EGLImageKHR.patch \ - file://0010-fix-numeric_limits-is-not-a-member-of-std.patch \ -" - -SRCREV = "f7fd69f12a3b89d03768fa3bd468e8f33cd1dc7c" + file://0003-CVE-2022-41325.patch \ + file://0004-mmal_20.patch \ + file://0005-mmal_exit_fix.patch \ + file://0006-mmal_chain.patch \ + file://0007-armv6.patch \ + file://2001-fix-luaL-checkint.patch \ + file://2002-use-vorbisidec.patch \ + file://3001-configure.ac-setup-for-OE-usage.patch \ + file://3002-fix-EGL-macro-undeclared-and-EGLImageKHR.patch \ + file://3003-codec-omxil_core-replace-opt-vc-path-with-usr-lib.patch \ + file://3004-use-GLESv2-headers-over-GL-headers.patch \ + file://3005-modules-remove-glspectrum-usage.patch \ + file://3006-codec-omxil_core.h-fix-multiple-definition-of.patch \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'file://3007-remove-xorg-related-link-libs.patch', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '', 'file://3008-vo-Makefile.am-exclude-libgl_plugin.patch', d)} \ + file://3009-vo-converter_vaapi-Fix-EGL-macro-undeclared.patch \ + " + +SRCREV = "b276eb0d7bc3213363e97dbb681ef7c927be6c73" S = "${WORKDIR}/git" @@ -37,24 +45,29 @@ EXTRA_OECONF = "\ --enable-run-as-root \ --enable-xvideo \ --disable-lua \ - --disable-screen --disable-caca \ + --disable-screen \ + --disable-caca \ --enable-vlm \ --enable-tremor \ - --disable-aa --disable-faad \ + --disable-aa \ + --disable-faad \ --enable-dbus \ --without-contrib \ --without-kde-solid \ --enable-realrtsp \ --disable-libtar \ --enable-avcodec \ -" + --disable-css \ + " PACKAGECONFIG ?= "\ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'mmal', d)} \ - live555 dv1394 notify fontconfig fluidsynth freetype dvdread png udev \ - x264 alsa harfbuzz jack neon fribidi dvbpsi a52 v4l2 gles2 \ -" + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2', '', d)} \ + ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11', 'notify', '', d)} \ + live555 dv1394 fontconfig fluidsynth freetype png udev \ + x264 alsa harfbuzz jack neon fribidi dvbpsi a52 v4l2 \ + " PACKAGECONFIG[mmal] = "--enable-omxil --enable-omxil-vout --enable-rpi-omxil --enable-mmal --enable-mmal-avcodec,,userland" PACKAGECONFIG[x264] = "--enable-x264,--disable-x264,x264" @@ -65,13 +78,13 @@ PACKAGECONFIG[live555] = "--enable-live555 LIVE555_PREFIX=${STAGING_DIR_HOST}${p PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass" PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc,libpostproc" PACKAGECONFIG[libva] = "--enable-libva,--disable-libva,libva" -PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" +#PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx" -PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp" +#PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp" PACKAGECONFIG[dvbpsi] = "--enable-dvbpsi,--disable-dvbpsi, libdvbpsi" -PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba" +#PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba" PACKAGECONFIG[upnp] = "--enable-upnp,--disable-upnp,libupnp" PACKAGECONFIG[dvdnav] = "--enable-dvdnav,--disable-dvdnav,libdvdnav libdvdcss" PACKAGECONFIG[sftp] = "--enable-sftp,--disable-sftp,libssh2" @@ -84,14 +97,14 @@ PACKAGECONFIG[svgdec] = "--enable-svgdec,--disable-svgdec,librsvg cairo" PACKAGECONFIG[notify] = "--enable-notify,--disable-notify, libnotify gtk+3" PACKAGECONFIG[fontconfig] = "--enable-fontconfig,--disable-fontconfig, fontconfig" PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype" -PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss" +#PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss" PACKAGECONFIG[vnc] = "--enable-vnc,--disable-vnc, libvncserver" -PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb, xcb-util-keysyms libxpm libxinerama" +PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb, xcb-util-keysyms libxpm libxinerama" PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" -PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" -PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland wayland-native" +#PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" +#PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland wayland-native" PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2" -PACKAGECONFIG[dca] = "--enable-dca,," +#PACKAGECONFIG[dca] = "--enable-dca,--disable-dca,libdca" PACKAGECONFIG[fribidi] = "--enable-fribidi,,fribidi" PACKAGECONFIG[gnutls] = "--enable-gnutls,,gnutls" PACKAGECONFIG[fluidsynth] = "--enable-fluidsynth,,fluidsynth" @@ -105,25 +118,15 @@ PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio" PACKAGECONFIG[sdl-image] = "--enable-sdl-image,,libsdl-image" PACKAGECONFIG[v4l2] = "--enable-v4l2,,v4l-utils" -# Workaround for modules/codec/omxil/omxil_core.h -# multiple definition of `pf_enable_graphic_buffers' -# multiple definition of `pf_get_graphic_buffer_usage' -# multiple definition of `pf_get_hal_format' -TARGET_CFLAGS:append = " -fcommon" -TARGET_CXXFLAGS:append = " -fcommon" +TARGET_CFLAGS:append = " -I${STAGING_INCDIR}/drm" +TARGET_LDFLAGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '-lGLESv2', '', d)}" # Ensures the --enable-mmal-avcodec flag is available for usage do_configure:prepend() { olddir=`pwd` cd ${S} ./bootstrap - cd $olddir -} - -do_configure:append() { - # https://forums.raspberrypi.com/viewtopic.php?p=1601535 - sed -i "/GLAPI void APIENTRY glShaderSource (/d" ${STAGING_INCDIR}/GL/glext.h - #sed -i -e s:'${top_builddir_slash}libtool':'${top_builddir_slash}'${TARGET_SYS}-libtool:g ${B}/doltlibtool + cd $olddir } # This recipe packages vlc as a library as well, so qt4 dependencies @@ -140,20 +143,20 @@ FILES:${PN} += "\ ${datadir}/vlc \ ${datadir}/icons \ ${datadir}/metainfo/vlc.appdata.xml \ -" + " FILES:${PN}-dbg += "\ ${libdir}/vlc/*/.debug \ ${libdir}/vlc/plugins/*/.debug \ -" + " FILES:${PN}-staticdev += "\ ${libdir}/vlc/plugins/*/*.a \ ${libdir}/vlc/libcompat.a \ -" + " # Only enable it for rpi class of machines COMPATIBLE_HOST = "null" -COMPATIBLE_HOST:rpi = "'(.*)'" +COMPATIBLE_HOST:rpi = "(.*)" INSANE_SKIP:${PN} = "dev-so" |