From patchwork Tue Sep 16 16:08:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 70374 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E05ACAC599 for ; Tue, 16 Sep 2025 16:08:57 +0000 (UTC) Received: from mailout04.t-online.de (mailout04.t-online.de [194.25.134.18]) by mx.groups.io with SMTP id smtpd.web10.2604.1758038929499838399 for ; Tue, 16 Sep 2025 09:08:49 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: t-online.de, ip: 194.25.134.18, mailfrom: f_l_k@t-online.de) Received: from fwd76.aul.t-online.de (fwd76.aul.t-online.de [10.223.144.102]) by mailout04.t-online.de (Postfix) with SMTP id A2F64EEE7 for ; Tue, 16 Sep 2025 18:08:47 +0200 (CEST) Received: from intel-corei7-64.fritz.box ([84.163.44.62]) by fwd76.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1uyYEW-0l6aRd0; Tue, 16 Sep 2025 18:08:44 +0200 From: Markus Volk To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH] make use of virtual/ffmpeg Date: Tue, 16 Sep 2025 18:08:39 +0200 Message-ID: <20250916160839.3860748-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.50.1 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1758038924-757F1C1C-D26C8A25/0/0 CLEAN NORMAL X-TOI-MSGID: c840678b-d227-4830-a7ea-4dea439a1a8f List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 16 Sep 2025 16:08:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/119469 Signed-off-by: Markus Volk --- meta-gnome/recipes-gnome/tracker/localsearch_3.9.0.bb | 2 +- meta-multimedia/recipes-multimedia/gerbera/gerbera_2.4.1.bb | 2 +- meta-multimedia/recipes-multimedia/libheif/libheif_1.19.8.bb | 2 +- meta-multimedia/recipes-multimedia/minidlna/minidlna.inc | 2 +- meta-multimedia/recipes-multimedia/musicpd/mpd_0.24.3.bb | 2 +- .../recipes-multimedia/openal/openal-soft_1.24.3.bb | 2 +- meta-multimedia/recipes-multimedia/pipewire/pipewire_1.4.8.bb | 3 ++- meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb | 2 +- meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.15.bb | 2 +- meta-oe/recipes-multimedia/mplayer/libplacebo_7.351.0.bb | 2 +- meta-oe/recipes-support/freerdp/freerdp3_3.5.1.bb | 2 +- meta-oe/recipes-support/opencv/opencv_4.12.0.bb | 2 +- 12 files changed, 13 insertions(+), 12 deletions(-) diff --git a/meta-gnome/recipes-gnome/tracker/localsearch_3.9.0.bb b/meta-gnome/recipes-gnome/tracker/localsearch_3.9.0.bb index ffea1f76b3..76d04a7eac 100644 --- a/meta-gnome/recipes-gnome/tracker/localsearch_3.9.0.bb +++ b/meta-gnome/recipes-gnome/tracker/localsearch_3.9.0.bb @@ -47,7 +47,7 @@ PACKAGECONFIG:remove:libc-musl = "seccomp" PACKAGECONFIG[battery] = "-Dbattery_detection=upower,-Dbattery_detection=none,upower" PACKAGECONFIG[cue] = "-Dcue=enabled,-Dcue=disabled,libcue" -PACKAGECONFIG[ffmpeg] = "-Dlibav=enabled,-Dlibav=disabled,ffmpeg" +PACKAGECONFIG[ffmpeg] = "-Dlibav=enabled,-Dlibav=disabled,virtual/ffmpeg" PACKAGECONFIG[gexiv2] = ",,gexiv2" PACKAGECONFIG[gstreamer] = ",,gstreamer1.0 gstreamer1.0-plugins-base" PACKAGECONFIG[gupnp] = "-Dgstreamer_backend=gupnp,,gupnp-dlna" diff --git a/meta-multimedia/recipes-multimedia/gerbera/gerbera_2.4.1.bb b/meta-multimedia/recipes-multimedia/gerbera/gerbera_2.4.1.bb index 6348f25a57..cc59dbf17a 100644 --- a/meta-multimedia/recipes-multimedia/gerbera/gerbera_2.4.1.bb +++ b/meta-multimedia/recipes-multimedia/gerbera/gerbera_2.4.1.bb @@ -18,7 +18,7 @@ PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=TRUE,-DWITH_SYSTEMD=FALSE,systemd" PACKAGECONFIG[taglib] = "-DWITH_TAGLIB=TRUE,-DWITH_TAGLIB=FALSE,taglib" PACKAGECONFIG[curl] = "-DWITH_CURL=TRUE,-DWITH_CURL=FALSE,curl" PACKAGECONFIG[inotify] = "-DWITH_INOTIFY=TRUE,-DWITH_INOTIFY=FALSE,inotify-tools" -PACKAGECONFIG[avcodec] = "-DWITH_AVCODEC=TRUE,-DWITH_AVCODEC=FALSE,ffmpeg" +PACKAGECONFIG[avcodec] = "-DWITH_AVCODEC=TRUE,-DWITH_AVCODEC=FALSE,virtual/ffmpeg" PACKAGECONFIG[wavpack] = "-DWITH_WAVPACK=TRUE,-DWITH_WAVPACK=FALSE,wavpack" PACKAGECONFIG[exif] = "-DWITH_EXIF=TRUE,-DWITH_EXIF=FALSE,libexif" PACKAGECONFIG[exiv2] = "-DWITH_EXIV2=TRUE,-DWITH_EXIV2=FALSE,exiv2" diff --git a/meta-multimedia/recipes-multimedia/libheif/libheif_1.19.8.bb b/meta-multimedia/recipes-multimedia/libheif/libheif_1.19.8.bb index a3f5f21406..37189664a8 100644 --- a/meta-multimedia/recipes-multimedia/libheif/libheif_1.19.8.bb +++ b/meta-multimedia/recipes-multimedia/libheif/libheif_1.19.8.bb @@ -19,7 +19,7 @@ PACKAGECONFIG[aom] = "-DWITH_AOM_ENCODER=ON -DWITH_AOM_DECODER=ON,-DWITH_AOM_ENC PACKAGECONFIG[dav1d] = "-DWITH_DAV1D=ON, -DWITH_DAV1D=OFF,dav1d" PACKAGECONFIG[svt-av1] = "-DWITH_SvtEnc=ON,-DWITH_SvtEnc=OFF,svt-av1" PACKAGECONFIG[jpeg] = "-DWITH_JPEG_DECODER=ON -DWITH_JPEG_ENCODER=ON,-DWITH_JPEG_ENCODER=OFF -DWITH_JPEG_DECODER=OFF,jpeg" -PACKAGECONFIG[ffmpeg] = "-DWITH_FFMPEG_DECODER=ON,-DWITH_FFMPEG_DECODER=OFF,ffmpeg" +PACKAGECONFIG[ffmpeg] = "-DWITH_FFMPEG_DECODER=ON,-DWITH_FFMPEG_DECODER=OFF,virtual/ffmpeg" PACKAGECONFIG[jpeg2000] = "-DWITH_OpenJPEG_ENCODER=ON -DWITH_OpenJPEG_DECODER=ON,-DWITH_OpenJPEG_ENCODER=OFF -DWITH_OpenJPEG_DECODER=OFF,openjpeg" PACKAGECONFIG[openh264] = ",,openh264" diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc b/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc index cb2a1865e8..7b731d5666 100644 --- a/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc +++ b/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc @@ -1,7 +1,7 @@ DESCRIPTION = "MiniDLNA (aka ReadyDLNA) is server software with the aim of \ being fully compliant with DLNA/UPnP-AV clients." LICENSE = "GPL-2.0-only|BSD-3-Clause" -DEPENDS = "ffmpeg flac libav jpeg sqlite3 libexif libogg libid3tag libvorbis" +DEPENDS = "virtual/ffmpeg flac libav jpeg sqlite3 libexif libogg libid3tag libvorbis" # because it depends on libav which has commercial flag LICENSE_FLAGS = "commercial" diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.24.3.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.24.3.bb index d1dd4d7442..8e65c345c1 100644 --- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.24.3.bb +++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.24.3.bb @@ -47,7 +47,7 @@ PACKAGECONFIG[audiofile] = "-Daudiofile=enabled,-Daudiofile=disabled,audiofile" PACKAGECONFIG[bzip2] = "-Dbzip2=enabled,-Dbzip2=disabled,bzip2" PACKAGECONFIG[cdioparanoia] = "-Dcdio_paranoia=enabled,-Dcdio_paranoia=disabled,libcdio-paranoia" PACKAGECONFIG[daemon] = "-Ddaemon=true,-Ddaemon=false" -PACKAGECONFIG[ffmpeg] = "-Dffmpeg=enabled,-Dffmpeg=disabled,ffmpeg" +PACKAGECONFIG[ffmpeg] = "-Dffmpeg=enabled,-Dffmpeg=disabled,virtual/ffmpeg" PACKAGECONFIG[fifo] = "-Dfifo=true,-Dfifo=false" PACKAGECONFIG[flac] = "-Dflac=enabled,-Dflac=disabled,flac" PACKAGECONFIG[fluidsynth] = "-Dfluidsynth=enabled,-Dfluidsynth=disabled,fluidsynth" diff --git a/meta-multimedia/recipes-multimedia/openal/openal-soft_1.24.3.bb b/meta-multimedia/recipes-multimedia/openal/openal-soft_1.24.3.bb index a1d2932f93..e5ef736529 100644 --- a/meta-multimedia/recipes-multimedia/openal/openal-soft_1.24.3.bb +++ b/meta-multimedia/recipes-multimedia/openal/openal-soft_1.24.3.bb @@ -18,6 +18,6 @@ PACKAGECONFIG[oss] = "-DALSOFT_BACKEND_OSS=ON,-DALSOFT_BACKEND_OSS=OFF" PACKAGECONFIG[pulseaudio] = "-DALSOFT_BACKEND_PULSEAUDIO=ON,-DALSOFT_BACKEND_PULSEAUDIO=OFF,pulseaudio" PACKAGECONFIG[pipewire] = "-DALSOFT_BACKEND_PIPEWIRE=ON,-DALSOFT_BACKEND_PIPEWIRE=OFF,pipewire" PACKAGECONFIG[examples] = "-DALSOFT_EXAMPLES=ON,-DALSOFT_EXAMPLES=OFF" -PACKAGECONFIG[sdl2] = "-DALSOFT_BACKEND_SDL2=ON,-DALSOFT_BACKEND_SDL2=OFF,virtual/libsdl2 ffmpeg" +PACKAGECONFIG[sdl2] = "-DALSOFT_BACKEND_SDL2=ON,-DALSOFT_BACKEND_SDL2=OFF,virtual/libsdl2 virtual/ffmpeg" FILES:${PN} += "${datadir}" diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.4.8.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.4.8.bb index 8687244f3e..3de99273ff 100644 --- a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.4.8.bb +++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.4.8.bb @@ -108,7 +108,7 @@ PACKAGECONFIG[bluez-lc3] = "-Dbluez5-codec-lc3=enabled,-Dbluez5-codec-lc3=disabl # This packageconfig enables modemmanager specific code in the BlueZ backend. PACKAGECONFIG[bluez-backend-native-mm] = "-Dbluez5-backend-native-mm=enabled,-Dbluez5-backend-native-mm=disabled,modemmanager" PACKAGECONFIG[docs] = "-Ddocs=enabled,-Ddocs=disabled,doxygen-native graphviz-native" -PACKAGECONFIG[ffmpeg] = "-Dffmpeg=enabled,-Dffmpeg=disabled,ffmpeg" +PACKAGECONFIG[ffmpeg] = "-Dffmpeg=enabled,-Dffmpeg=disabled,virtual/ffmpeg" PACKAGECONFIG[flatpak] = "-Dflatpak=enabled,-Dflatpak=disabled,glib-2.0" PACKAGECONFIG[gsettings] = "-Dgsettings=enabled,-Dgsettings=disabled,glib-2.0" PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base,,gstreamer1.0-pipewire" @@ -409,3 +409,4 @@ do_install:append() { sed -i "s,${WORKDIR},,g" ${D}${datadir}/doc/pipewire/html/dir_*html fi } + diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb index 2d2ecc63b9..547fca0b75 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "coreutils-native fribidi libtool libgcrypt libgcrypt-native bison-native \ dbus libxml2 gnutls \ - tremor faad2 ffmpeg flac alsa-lib \ + tremor faad2 virtual/ffmpeg flac alsa-lib \ lua-native lua libidn \ avahi jpeg xz libmodplug \ libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \ diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.15.bb b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.15.bb index 8c6b3f7e14..f3726f91ed 100644 --- a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.15.bb +++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.15.bb @@ -24,7 +24,7 @@ PACKAGECONFIG ??= " \ PACKAGECONFIG[24bpp] = "-DWITH_24BPP=ON,-DWITH_24BPP=OFF," PACKAGECONFIG[filetransfer] = "-DWITH_TIGHTVNC_FILETRANSFER=ON,-DWITH_TIGHTVNC_FILETRANSFER=OFF," -PACKAGECONFIG[ffmpeg] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,ffmpeg,ffmpeg" +PACKAGECONFIG[ffmpeg] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,virtual/ffmpeg,ffmpeg" PACKAGECONFIG[gcrypt] = "-DWITH_GCRYPT=ON,-DWITH_GCRYPT=OFF,libgcrypt,libgcrypt" PACKAGECONFIG[gnutls] = "-DWITH_GNUTLS=ON,-DWITH_GNUTLS=OFF,gnutls" PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg" diff --git a/meta-oe/recipes-multimedia/mplayer/libplacebo_7.351.0.bb b/meta-oe/recipes-multimedia/mplayer/libplacebo_7.351.0.bb index 3a1096bb57..cc10f3c633 100644 --- a/meta-oe/recipes-multimedia/mplayer/libplacebo_7.351.0.bb +++ b/meta-oe/recipes-multimedia/mplayer/libplacebo_7.351.0.bb @@ -18,7 +18,7 @@ PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-loader shade PACKAGECONFIG[glslang] = "-Dglslang=enabled,-Dglslang=disabled,glslang" PACKAGECONFIG[opengl] = "-Dopengl=enabled,-Dopengl=disabled" PACKAGECONFIG[lcms] = "-Dlcms=enabled,-Dlcms=disabled,lcms" -PACKAGECONFIG[demos] = "-Ddemos=true,-Ddemos=false,ffmpeg virtual/libsdl2 libsdl2-image" +PACKAGECONFIG[demos] = "-Ddemos=true,-Ddemos=false,virtual/ffmpeg virtual/libsdl2 libsdl2-image" EXTRA_OEMESON = "-Dvulkan-registry=${STAGING_DATADIR}/vulkan/registry/vk.xml" diff --git a/meta-oe/recipes-support/freerdp/freerdp3_3.5.1.bb b/meta-oe/recipes-support/freerdp/freerdp3_3.5.1.bb index 7f58820eb7..ebaab77cdd 100644 --- a/meta-oe/recipes-support/freerdp/freerdp3_3.5.1.bb +++ b/meta-oe/recipes-support/freerdp/freerdp3_3.5.1.bb @@ -46,7 +46,7 @@ PACKAGECONFIG[cups] = "-DWITH_CUPS=ON,-DWITH_CUPS=OFF,cups" PACKAGECONFIG[fuse] = "-DWITH_FUSE=ON,-DWITH_FUSE=OFF,fuse3,fuse3" PACKAGECONFIG[pcsc] = "-DWITH_PCSC=ON,-DWITH_PCSC=OFF,pcsc-lite" PACKAGECONFIG[manpages] = "-DWITH_MANPAGES=ON,-DWITH_MANPAGES=OFF, libxslt-native docbook-xsl-stylesheets-native" -PACKAGECONFIG[ffmpeg] = "-DWITH_DSP_FFMPEG=ON -DWITH_FFMPEG=ON -DWITH_SWSCALE=ON, -DWITH_DSP_FFMPEG=OFF -DWITH_FFMPEG=OFF -DWITH_SWSCALE=OFF,ffmpeg" +PACKAGECONFIG[ffmpeg] = "-DWITH_DSP_FFMPEG=ON -DWITH_FFMPEG=ON -DWITH_SWSCALE=ON, -DWITH_DSP_FFMPEG=OFF -DWITH_FFMPEG=OFF -DWITH_SWSCALE=OFF,virtual/ffmpeg" PACKAGECONFIG[krb5] = "-DWITH_KRB5=ON -DWITH_KRB5_NO_NTLM_FALLBACK=OFF,-DWITH_KRB5=OFF,krb5" PACKAGECONFIG[openh264] = "-DWITH_OPENH264=ON,-DWITH_OPENH264=OFF,openh264" PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-icd-loader" diff --git a/meta-oe/recipes-support/opencv/opencv_4.12.0.bb b/meta-oe/recipes-support/opencv/opencv_4.12.0.bb index 5462c4f8da..4a124fe2ec 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.12.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.12.0.bb @@ -107,7 +107,7 @@ PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3," PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper," PACKAGECONFIG[java] = "-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native fastjar-native openjdk-8-native," PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg," -PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,ffmpeg," +PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,virtual/ffmpeg," PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils," PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers virtual/opencl-icd," PACKAGECONFIG[openvino] = "-DWITH_OPENVINO=ON,-DWITH_OPENVINO=OFF,openvino-inference-engine,openvino-inference-engine"