From patchwork Thu Oct 31 17:07:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 51626 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 56A9AD767EF for ; Thu, 31 Oct 2024 17:05:29 +0000 (UTC) Received: from mailout10.t-online.de (mailout10.t-online.de [194.25.134.21]) by mx.groups.io with SMTP id smtpd.web10.17815.1730394322103122036 for ; Thu, 31 Oct 2024 10:05:22 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: t-online.de, ip: 194.25.134.21, mailfrom: f_l_k@t-online.de) Received: from fwd87.aul.t-online.de (fwd87.aul.t-online.de [10.223.144.113]) by mailout10.t-online.de (Postfix) with SMTP id 434C910AD for ; Thu, 31 Oct 2024 18:05:20 +0100 (CET) Received: from intel-corei7-64.fritz.box ([84.163.35.203]) by fwd87.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1t6Ybm-1YlI0n0; Thu, 31 Oct 2024 18:05:18 +0100 From: Markus Volk To: openembedded-devel@lists.openembedded.org Subject: [meta-multimedia][PATCH] mpv: cleanup and improvements Date: Thu, 31 Oct 2024 18:07:26 +0100 Message-ID: <20241031170726.486250-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1730394318-F27FA445-57AE5B72/0/0 CLEAN NORMAL X-TOI-MSGID: 5c0361f6-f0dd-4a79-8bbf-6739ec79df88 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 ; Thu, 31 Oct 2024 17:05:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/113372 - add PACKAGECONFIG for lcms2 - fix dependencies for vulkan and vdpau - replace leftover from autotools EXTRA_OECONF -> EXTRA_OEMESON - vaapi-x-egl option has been removed - gl-wayland option has been renamed to egl-wayland - explicitly disable shaderc which is only required for windows builds Signed-off-by: Markus Volk --- meta-oe/recipes-multimedia/mplayer/mpv_0.39.0.bb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.39.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.39.0.bb index c97252bd3..c699e73ef 100644 --- a/meta-oe/recipes-multimedia/mplayer/mpv_0.39.0.bb +++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.39.0.bb @@ -50,13 +50,14 @@ PACKAGECONFIG[drm] = "-Ddrm=enabled,-Ddrm=disabled,libdrm" PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/libgbm" PACKAGECONFIG[lua] = "-Dlua=luajit,-Dlua=disabled,luajit" PACKAGECONFIG[libarchive] = "-Dlibarchive=enabled,-Dlibarchive=disabled,libarchive" +PACKAGECONFIG[lcms2] = "-Dlcms2=enabled,-Dlcms2=disabled,lcms" PACKAGECONFIG[libmpv] = "-Dlibmpv=true,-Dlibmpv=false" PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack" PACKAGECONFIG[pipewire] = "-Dpipewire=enabled,-Dpipewire=disabled,pipewire" PACKAGECONFIG[pulseaudio] = "-Dpulse=enabled,-Dpulse=disabled,pulseaudio" PACKAGECONFIG[vaapi] = "-Dvaapi=enabled,-Dvaapi=disabled,libva" -PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled,shaderc" -PACKAGECONFIG[vdpau] = "-Dvdpau=enabled,-Dvdpau=disabled,libvdpau" +PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-headers" +PACKAGECONFIG[vdpau] = "-Dvdpau=enabled,-Dvdpau=disabled,libvdpau nv-codec-headers" PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,wayland wayland-native libxkbcommon" python __anonymous() { @@ -72,16 +73,14 @@ python __anonymous() { extras.append(" -Dvaapi-x11=enabled") if "vaapi" in packageconfig and "drm" in packageconfig: extras.append(" -Dvaapi-drm=enabled") - if "vaapi" in packageconfig and "x11" in packageconfig and "egl" in packageconfig: - extras.append(" -Dvaapi-x-egl=enabled") if "vdpau" in packageconfig and "opengl" in packageconfig and "x11" in packageconfig: extras.append(" -Dvdpau-gl-x11=enabled") if "wayland" in packageconfig and "opengl" in packageconfig: - extras.append(" -Dgl-wayland=enabled") + extras.append(" -Degl-wayland=enabled") if "wayland" in packageconfig and "vaapi" in packageconfig: extras.append(" -Dvaapi-wayland=enabled") if extras: - d.appendVar("EXTRA_OECONF", "".join(extras)) + d.appendVar("EXTRA_OEMESON", "".join(extras)) } #SIMPLE_TARGET_SYS = "${@'${TARGET_SYS}'.replace('${TARGET_VENDOR}', '')}" @@ -93,8 +92,8 @@ EXTRA_OEMESON = " \ -Dcdda=disabled \ -Duchardet=disabled \ -Drubberband=disabled \ - -Dlcms2=disabled \ -Dvapoursynth=disabled \ + -Dshaderc=disabled \ " do_configure:append() {