From patchwork Fri Aug 30 03:58:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 48501 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 BE1FDCA0ED7 for ; Fri, 30 Aug 2024 03:58:35 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web11.5219.1724990312040333132 for ; Thu, 29 Aug 2024 20:58:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=SUN9Ftxx; spf=pass (domain: gmail.com, ip: 209.85.214.172, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-201d5af11a4so12871375ad.3 for ; Thu, 29 Aug 2024 20:58:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724990311; x=1725595111; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=rWGhsOPbBdsYkXUYdBZrn189+6hXsLBVo7kfbJQAKPs=; b=SUN9Ftxxs459EmEaA+IHaOd1HpiGszaBzdu/LsNU4pfkybr4Sf5ivStly2lnUK35Vk ntS2O8Op1cEvHEgnuR+Kt9zGc8RlkHF2hM3SjsM6PyROA1brfanIuKgvDcHJUa5z8EQo jxrBKn/zkBafD9rg7BACJcVEsoDLthzKPI3YYfnW/kTc2yqzgPJ1whbIPmDUpm6VHXcX b2PeQ3H6OEoBJ6KIhq3bkkBNeZ6DLUmxFZg0Ajs9+M2WclBFxDKeMo3wTansMbncXCYX cmlnOKAQ/qeSul/cE17Abw/MbnUFUzWo+N8pt5wg7WgM8u5h3mYiyXzyt67wGo55PY7A qQJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724990311; x=1725595111; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=rWGhsOPbBdsYkXUYdBZrn189+6hXsLBVo7kfbJQAKPs=; b=CRLYIza6tVaRWCaGE/GXNouAfkkTjQX11g4OeU8aK3Xl3/sNkxYn/dQbi2W4WJm/tb MPp3wlFHZkkfe/nFhDkB9Y0gNeyO4MULcbzaTUgfSj8yK8zoyjWbKL7asQCQRmzlK2vL vc7XJTmAKAu/qm8sCUi/msH8AHc3gWIi9cQAxszb734gWUzGi8xRxv3lueUFFnVJsVIZ rpPt3E675xMWl1O+E/2Zmv10jusuobUTpvN2KNlvfGOzBdi0Ybsv5T6I+MCBT6ZzKcpi nDhDMe1B3tjTuFgNVvTcDDlvagFoDExFOe5tfcWwCf2F37FQ6yTi5HkBO+q4nS8UHk9N 9tuA== X-Gm-Message-State: AOJu0YwJif62j4zXcnyWfOBTwPKc7kHtvgLdEXgnFhN4k5ay8EQppHZD XGxJFrAERYW2UnYB6XGgsUWlB8BCqGYbgqpHAIwxDPehVKbBy2WminwuY/LL X-Google-Smtp-Source: AGHT+IHupXAmCA3iwALdJaBgJEE7C7ktJTwuwDry5Q6B5Q2RBhjKVBt3plTOOUl2sU3LuECCiPUygA== X-Received: by 2002:a17:903:1cd:b0:203:a279:a144 with SMTP id d9443c01a7336-2050c374301mr51697975ad.25.1724990310944; Thu, 29 Aug 2024 20:58:30 -0700 (PDT) Received: from apollo.localdomain ([2601:646:9d80:4380::2696]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2052919afb2sm2705035ad.3.2024.08.29.20.58.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Aug 2024 20:58:29 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-filesystems][PATCH 1/8] e2tools: Fix build with automake 1.17 Date: Thu, 29 Aug 2024 20:58:20 -0700 Message-ID: <20240830035827.406391-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 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 ; Fri, 30 Aug 2024 03:58:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/112040 Replace the do_configure hack with aid to configure detection logic via commandline Signed-off-by: Khem Raj --- .../recipes-utils/e2tools/e2tools_git.bb | 44 ++++--------------- ...Disable-portability-warning-as-error.patch | 34 ++++++++++++++ 2 files changed, 43 insertions(+), 35 deletions(-) create mode 100644 meta-filesystems/recipes-utils/e2tools/files/0001-Disable-portability-warning-as-error.patch diff --git a/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb b/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb index a0d194cae0..459c7058e1 100644 --- a/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb +++ b/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb @@ -15,6 +15,7 @@ PV = "0.1.0+git" SRC_URI = " \ git://github.com/e2tools/e2tools;protocol=https;branch=master \ + file://0001-Disable-portability-warning-as-error.patch \ file://run-ptest \ " @@ -24,41 +25,14 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig ptest -do_configure:prepend() { - git -C "${WORKDIR}/git" reset --hard HEAD - - # To install ptest for this package, special configuration needs to be - # done before do_configure(). So, do_configure_ptest() which is scheduled - # after do_configure() cannot be used. - - # We only do special configuration if we are installing ptest for this - # package. - if [ "${@d.getVar('PTEST_ENABLED')}" -eq "1" ]; then - # Since we guarantee run-time dependency when installing the ptest for - # this package, we do not need the check macros under section "checks - # for programs" in "configure.ac". Plus, these check macros set the - # ouput variables to incorrect values as these checks are performed on - # the host environment. Still, we need these variables outputted from - # these check macros. So, we insert the following lines to manually - # set these output variables to the correct value in "configure.ac". - - # Note that HAVE_DD_COMMAND and HAVE_MKE2FS_COMMAND are only ever used - # in tests/Makefile-files which determines whether to include the test - # cases. As for output variables CHMOD, DD, and MKE2FS, they only - # point to the programs which test cases need to run. Since these - # commands are guaranteed to be present due to RDEPENDS and are - # guaranteed to be accessible under PATH environment variable on the - # target, we only need to specify the name of these programs. - - perl -i -0777 -pe 's/(^dnl\s*=+\s*^dnl\s*Checks for compiler flags\s*^dnl\s*=+)/ -AC_SUBST([CHMOD], 'chmod') -AC_SUBST([DD], 'dd') -AC_SUBST([MKE2FS], 'mke2fs') -AM_CONDITIONAL([HAVE_DD_COMMAND], [true]) -AM_CONDITIONAL([HAVE_MKE2FS_COMMAND], [true]) -\1/ms' "${WORKDIR}/git/configure.ac" - fi -} +# Otherwise these tools will be detected from build host and +# assumptions will go wrong, Fun of cross compiling +EXTRA_OECONF += "\ + ac_cv_path_MKE2FS=${base_sbindir}/mke2fs \ + ac_cv_path_CHMOD=${base_bindir}/chmod \ + ac_cv_path_DD=${base_bindir}/dd \ + ac_cv_path_GREP=${base_bindir}/grep \ + " do_install_ptest() { rm -rf "${D}${PTEST_PATH}/*" diff --git a/meta-filesystems/recipes-utils/e2tools/files/0001-Disable-portability-warning-as-error.patch b/meta-filesystems/recipes-utils/e2tools/files/0001-Disable-portability-warning-as-error.patch new file mode 100644 index 0000000000..dec793f373 --- /dev/null +++ b/meta-filesystems/recipes-utils/e2tools/files/0001-Disable-portability-warning-as-error.patch @@ -0,0 +1,34 @@ +From e0aaedea30483bf5b9bb085e12fff79144fa1174 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 29 Aug 2024 11:12:57 -0700 +Subject: [PATCH] Disable portability warning as error + +With latest automake 1.17 its warning about escape hash +mark [1] and since configure.ac uses -werror to call automake +this becomes an error and reconfigure fails. + +escape hash mark is non-portable as discussed here [2] + +Fow now let it be a warning, it should be fixed in a portable way + +[1] https://debbugs.gnu.org/cgi/bugreport.cgi?bug=7610 +[2] https://lists.gnu.org/archive/html/automake/2011-08/msg00023.html + +Upstream-Status: Submitted [https://github.com/e2tools/e2tools/pull/31] +Signed-off-by: Khem Raj +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index dd32c4d..9f37591 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -14,6 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) + AM_INIT_AUTOMAKE([ + -Wall + -Werror ++-Wno-portability + 1.9.6 + foreign + subdir-objects From patchwork Fri Aug 30 03:58:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 48500 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 D5913CA0ED8 for ; Fri, 30 Aug 2024 03:58:35 +0000 (UTC) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mx.groups.io with SMTP id smtpd.web11.5220.1724990313424191203 for ; Thu, 29 Aug 2024 20:58:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=nnF077qL; spf=pass (domain: gmail.com, ip: 209.85.215.172, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-70b2421471aso775402a12.0 for ; Thu, 29 Aug 2024 20:58:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724990313; x=1725595113; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KHnX4Sqyz1QU01Qg3VnjMWI8K3DKyfsAx0vz5aVsHEY=; b=nnF077qLjyFYXfLi8fgL2mnpNKZNJmNq9du60dTcm6GjH4ME/BTMH8VNpoLEAbKvBV guZfkBwvBOOnzYPfgPgHB4plffaIKwC67bTSxQaIHgwESew98f+XPRtNYqbor8VqgToM 3UYESWMsdg1dEcXGkX43O11fHKjWpBpDeh8QcxfVahWba9IaOd5PsD8CxcKxf3/yOalI Szwyn1vWBj3Rp+Y509C5w7tGlLykIPOVyhbDF8AlwyyBANpwY91VN4jy1mKzHtJgPKmW Tn+BLmO7USSsmAiRzXsIDLzbP3pR7zMoZg/mfWX0IALhRQTfwn++GpT8iPSdXUDls8DL FkzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724990313; x=1725595113; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KHnX4Sqyz1QU01Qg3VnjMWI8K3DKyfsAx0vz5aVsHEY=; b=ZHXxk6XTO6nPaXqZPhZGNvEtNC8k9trp0mHKDIIYFvS1g+MqfEhweVjygRC9NDr6Qc G/bhEOl7B9ZjBgb5mcyfu6DgHYMfdoPNKTwdZnoJTLOSsejxfhEunfUj+YZUCqQxZ/uv Pv7c1LSmjmBaBvTsA3pI4s8waSxFX1if1fVSyTw/L8VgIpRdJqGCRxdCsBaPGThGQpM7 baxCiwvBO8tO2+/B2LvXU4EhUQctMVE7/sUKzQXQ8sWbN51OLZ5P2YU/Kp0zRm+qHXKj yRZPcTGf/GgKMDx/+CltgedEv1BLypyR8+Xv/y9Znjv3yGhe44mwDjctL0s0vZ0jSpqC cUzw== X-Gm-Message-State: AOJu0YwwThQDCNCg0ATOfD8914kPWZRrGEyhZcw2G/tizqw9n/x0auSu VBPJ6HaUb2iSWuNN1IJuopmAq0ZjMX0AXwf+qZ8XYd7lsQBPtvrdMMsCk/Ja X-Google-Smtp-Source: AGHT+IHiA5fpn/sfHV/+zfz4YGRFDoHc78E/9IkZKGrGEt6xW5sCYuWPC6UpGwSRe4TmL/e9AjSTww== X-Received: by 2002:a17:903:2301:b0:201:ed48:f11c with SMTP id d9443c01a7336-2050b9c3ef1mr58196095ad.0.1724990312436; Thu, 29 Aug 2024 20:58:32 -0700 (PDT) Received: from apollo.localdomain ([2601:646:9d80:4380::2696]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2052919afb2sm2705035ad.3.2024.08.29.20.58.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Aug 2024 20:58:31 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-multimedia][PATCH 2/8] minidlna: Upgrade to 1.3.3 release Date: Thu, 29 Aug 2024 20:58:21 -0700 Message-ID: <20240830035827.406391-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240830035827.406391-1-raj.khem@gmail.com> References: <20240830035827.406391-1-raj.khem@gmail.com> MIME-Version: 1.0 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 ; Fri, 30 Aug 2024 03:58:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/112041 Drop unneeded patches Add a patch to fix build with ffmpeg7 Signed-off-by: Khem Raj --- .../recipes-multimedia/minidlna/minidlna.inc | 3 +- ...01-Add-compatibility-with-FFMPEG-7.0.patch | 49 +++++++++++++++++++ .../0001-Update-Gettext-version.patch | 32 ------------ ...onfigure.ac-drop-non-standard-checks.patch | 37 -------------- .../{minidlna_1.3.0.bb => minidlna_1.3.3.bb} | 2 +- 5 files changed, 51 insertions(+), 72 deletions(-) create mode 100644 meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Add-compatibility-with-FFMPEG-7.0.patch delete mode 100644 meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch delete mode 100644 meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure.ac-drop-non-standard-checks.patch rename meta-multimedia/recipes-multimedia/minidlna/{minidlna_1.3.0.bb => minidlna_1.3.3.bb} (66%) diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc b/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc index aabf81dce0..8c9ead1489 100644 --- a/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc +++ b/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc @@ -11,9 +11,8 @@ inherit gettext autotools-brokensep update-rc.d systemd SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \ file://minidlna-daemon.init.d \ file://minidlna.service \ - file://0001-Update-Gettext-version.patch \ file://0001-configure-Check-for-clock_gettime-seprately-from-__N.patch \ - file://0001-configure.ac-drop-non-standard-checks.patch \ + file://0001-Add-compatibility-with-FFMPEG-7.0.patch \ " S = "${WORKDIR}/git" diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Add-compatibility-with-FFMPEG-7.0.patch b/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Add-compatibility-with-FFMPEG-7.0.patch new file mode 100644 index 0000000000..f9d9c694bc --- /dev/null +++ b/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Add-compatibility-with-FFMPEG-7.0.patch @@ -0,0 +1,49 @@ +From 92f8b94c697c225fb31062586f817c4fc3df8c2a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 29 Aug 2024 13:22:33 -0700 +Subject: [PATCH] Add compatibility with FFMPEG 7.0 + +channel_layout has been replaced with ch_layout + +Upstream-Status: Submitted [https://sourceforge.net/p/minidlna/git/merge-requests/59/] +Signed-off-by: Khem Raj +--- + libav.h | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/libav.h b/libav.h +index b69752c..a3153bd 100644 +--- a/libav.h ++++ b/libav.h +@@ -58,6 +58,7 @@ + #endif + + #define USE_CODECPAR LIBAVFORMAT_VERSION_INT >= ((57<<16)+(50<<8)+100) ++#define USE_CH_LAYOUT (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 28, 100)) + + #ifndef FF_PROFILE_H264_BASELINE + #define FF_PROFILE_H264_BASELINE 66 +@@ -174,7 +175,11 @@ lav_get_interlaced(AVStream *s) + #define lav_codec_tag(s) s->codecpar->codec_tag + #define lav_sample_rate(s) s->codecpar->sample_rate + #define lav_bit_rate(s) s->codecpar->bit_rate ++#if USE_CH_LAYOUT ++#define lav_channels(s) s->codecpar->ch_layout.nb_channels ++#else + #define lav_channels(s) s->codecpar->channels ++#endif + #define lav_width(s) s->codecpar->width + #define lav_height(s) s->codecpar->height + #define lav_profile(s) s->codecpar->profile +@@ -186,7 +191,11 @@ lav_get_interlaced(AVStream *s) + #define lav_codec_tag(s) s->codec->codec_tag + #define lav_sample_rate(s) s->codec->sample_rate + #define lav_bit_rate(s) s->codec->bit_rate ++#if USE_CH_LAYOUT ++#define lav_channels(s) s->codec->ch_layout.nb_channels ++#else + #define lav_channels(s) s->codec->channels ++#endif + #define lav_width(s) s->codec->width + #define lav_height(s) s->codec->height + #define lav_profile(s) s->codec->profile diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch b/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch deleted file mode 100644 index 6100da3581..0000000000 --- a/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a4290bf1887f9203288858ca76bdd20b2edf337a Mon Sep 17 00:00:00 2001 -From: Baptiste Durand -Date: Sun, 9 Sep 2018 20:50:41 +0200 -Subject: [PATCH] Update Gettext version - -Upstream-Status: Inappropriate [oe-core specific] - -Signed-off-by: Baptiste Durand ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -14,7 +14,7 @@ - # License along with MiniDLNA; if not, write to the Free Software - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - # USA. --AC_INIT(MiniDLNA,1.1.3,,minidlna) -+AC_INIT(MiniDLNA,1.2.1,,minidlna) - #LT_INIT - - AC_CANONICAL_TARGET -@@ -28,7 +28,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC - - AM_ICONV - AM_GNU_GETTEXT([external]) --AM_GNU_GETTEXT_VERSION(0.18) -+AM_GNU_GETTEXT_VERSION(0.20) - - # Checks for programs. - AC_PROG_AWK diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure.ac-drop-non-standard-checks.patch b/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure.ac-drop-non-standard-checks.patch deleted file mode 100644 index 93334b7dab..0000000000 --- a/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure.ac-drop-non-standard-checks.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 83425344b2d7339e8f5b0ad230c51278d330d613 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Sat, 22 Jan 2022 11:41:50 +0100 -Subject: [PATCH] configure.ac: drop non-standard checks - -Not sure what upstream is trying to do here but it does not work -with the latest autoconf. - -Upstream-Status: Inactive-Upstream -Signed-off-by: Alexander Kanavin ---- - configure.ac | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index aa7dd1c..858db52 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -418,7 +418,6 @@ for dir in "" /usr/local $SEARCH_DIR; do - AC_CHECK_LIB([id3tag -lz], [id3_file_open], [LIBID3TAG_LIBS="-lid3tag -lz"], [unset ac_cv_lib_id3tag_id3_file_open; LDFLAGS="$LDFLAGS_SAVE"; continue]) - break - done --test x"$ac_cv_lib_id3tag__lz___id3_file_open" = x"yes" || AC_MSG_ERROR([Could not find libid3tag]) - AC_SUBST(LIBID3TAG_LIBS) - - LDFLAGS_SAVE="$LDFLAGS" -@@ -444,10 +443,6 @@ for dir in "" /usr/local $SEARCH_DIR; do - [unset ac_cv_lib_avformat_av_open_input_file; unset ac_cv_lib_avformat_avformat_open_input; LDFLAGS="$LDFLAGS_SAVE"; continue])]) - break - done --if test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz___av_open_input_file" != x"yes" && -- test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz___avformat_open_input" != x"yes"; then -- AC_MSG_ERROR([Could not find libavformat - part of ffmpeg]) --fi - AC_SUBST(LIBAVFORMAT_LIBS) - - AC_CHECK_LIB(pthread, pthread_create) diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.0.bb b/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.3.bb similarity index 66% rename from meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.0.bb rename to meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.3.bb index 4238918c97..da0d90a993 100644 --- a/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.0.bb +++ b/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.3.bb @@ -1,4 +1,4 @@ require ${BPN}.inc -SRCREV = "109d63cb11ac207c18a784556834eb054b34b00b" +SRCREV = "1a9b32ee7a1c89e54e9f148199b73f9b33ad45ba" LIC_FILES_CHKSUM = "file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b" From patchwork Fri Aug 30 03:58:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 48502 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 D5945CA0EDB for ; Fri, 30 Aug 2024 03:58:35 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web10.5155.1724990314545704618 for ; Thu, 29 Aug 2024 20:58:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=SIPv/8py; spf=pass (domain: gmail.com, ip: 209.85.214.175, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-20203988f37so13593535ad.1 for ; Thu, 29 Aug 2024 20:58:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724990314; x=1725595114; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oO0rJ+dvWBATsPjWJ8vUgB3U+/BUjTvprL3PLkhZf0E=; b=SIPv/8pyNhJxeiDl5AF9d/BvjVDSoYFy3d/t6MFEoI+adr8qUfsAdAok5f8C7SeZnU a/rTTYWNO1/p3Cz3crNrOaXFrj69hlvGZMO0b2OVJAENyV44tKkw1i5sFBc7GRBg2+DI KgsOijDFI6WP8z0c5vfuLasRXQZmwNws8GK28FACx7pUraEGZqRsJ3zIZNSe1k6M1IV/ xSVKYjCZwy3f8yCH6bwrHw9/frXe4LK2v9Du5gCSMfQoJhQMdnCdUpExXk70hpDDvNhC YJijrC+xRhdpaDazmXXEskF2OJ3lX1d9xUgUXlZPMQsuB90OerGimax6cMOI+894yyOd X7Gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724990314; x=1725595114; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oO0rJ+dvWBATsPjWJ8vUgB3U+/BUjTvprL3PLkhZf0E=; b=Tw562vDqOgSAPFijYWybC3gB9+3qNnxD4jUyqpNzvabJOxcPU4WTgZhNrlEMqbu7Jl uvaMzWg5EwvHQZsEeczP618mIIo3SgnAv0VZQ8jiMpcIOfPvlYyMQvJ06fB4t5Tdozpy b5OmXz5jhj2ltiAcMTnHg5EJwtpmqPc+WIosWHlBlEIfFcnfvVgv8cmJRSE/7L2N3yZC 1eCFNwkI5j/qe8wfbinmgwP2Se8ucYijBTPQsahT3LOOEI63XkXg+uYnWVI629LzbggY mgZeDWmDL3T7ZKPeEcFvUcOFz0qfTfeIbXtnlupvRL0Vn9ryvssPFVy6tCZcCg+WlND9 Hnmw== X-Gm-Message-State: AOJu0YwEbuQLV53b5iRLTa1tlBEsWqKUsRLCooKeS2xsKZyj9b/62nx0 avR2TBgEHuKZXeYdXXvnwjIt4yWecbmMtzpM6uiTsWl070evJbfRZReW/nEU X-Google-Smtp-Source: AGHT+IFXSm3kCo/Qfxn5ZyefuynhQYpJR1bi4M03eErQePjFtHAFOAd5HwSRgunsbkDmy5wtQsc+TA== X-Received: by 2002:a17:902:ce8e:b0:203:a114:c0df with SMTP id d9443c01a7336-2050c3774f8mr53962505ad.23.1724990313453; Thu, 29 Aug 2024 20:58:33 -0700 (PDT) Received: from apollo.localdomain ([2601:646:9d80:4380::2696]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2052919afb2sm2705035ad.3.2024.08.29.20.58.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Aug 2024 20:58:32 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-multimedia][PATCH 3/8] vlc: Upgrade to 3.0.21 Date: Thu, 29 Aug 2024 20:58:22 -0700 Message-ID: <20240830035827.406391-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240830035827.406391-1-raj.khem@gmail.com> References: <20240830035827.406391-1-raj.khem@gmail.com> MIME-Version: 1.0 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 ; Fri, 30 Aug 2024 03:58:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/112042 Changes between 3.0.20 and 3.0.21: ---------------------------------- Decoders: * Improve Opus ambisonic support * Fix some ASS subtitle rendering issues * Fix Opus in MP4 behaviour * Fix VAAPI hw decoding with some drivers Input: * Add support for HTTP content range handling according to RFC 9110 * Fix some HLS Adaptive Streaming not working in audio-only mode Video Output: * Super Resolution scaling with AMD GPUs * The D3D11 HDR option can also turn on/off HDR for all sources regardless of the display * Improve subtitles rendering on Apple platforms of notably Asian languages by correcting font fallback lookups Video Filter: * New AMD VQ Enhancer filter * Add D3D11 option to use NVIDIA TrueHDR to generate HDR from SDR sources Audio Output: * Fix regression on macOS causing crashes when using audio devices with more than 9 channels Services Discovery: * Fix exposed UPnP directory URL schemes to be compliant with RFC 3986 Contrib: * Update FFmpeg to 4.4.4 * Update dav1d to 1.4.2 * Update libvpx to 1.14.1 libVLC: * the HWND passed to libvlc_media_player_set_hwnd must have the WS_CLIPCHILDREN style set. * Fix crashes when using caopengllayer Misc: * Fix various warnings, leaks and potential crashes * Fix security integer overflow in MMS module Signed-off-by: Khem Raj --- .../recipes-multimedia/vlc/vlc/4645.patch | 179 --------- .../recipes-multimedia/vlc/vlc/4665.patch | 377 ------------------ .../vlc/{vlc_3.0.20.bb => vlc_3.0.21.bb} | 5 +- 3 files changed, 1 insertion(+), 560 deletions(-) delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/4645.patch delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/4665.patch rename meta-multimedia/recipes-multimedia/vlc/{vlc_3.0.20.bb => vlc_3.0.21.bb} (97%) diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/4645.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/4645.patch deleted file mode 100644 index 3f2aa60512..0000000000 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/4645.patch +++ /dev/null @@ -1,179 +0,0 @@ -From 1e2918115ca2f5c4ffde00dc02ad89525714f6c2 Mon Sep 17 00:00:00 2001 -From: Thomas Guillem -Date: Tue, 5 Dec 2023 09:23:35 +0100 -Subject: [PATCH 1/5] input: fix incompatible-pointer-types assignment - -Fixes #28441 -Upstream-Status: Backport [https://code.videolan.org/videolan/vlc/-/merge_requests/4645] -Signed-off-by: Khem Raj ---- - src/input/input_internal.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/input/input_internal.h b/src/input/input_internal.h -index d29731edca1b..ea02f39f5add 100644 ---- a/src/input/input_internal.h -+++ b/src/input/input_internal.h -@@ -117,7 +117,7 @@ typedef struct input_thread_private_t - - /* Title infos FIXME multi-input (not easy) ? */ - int i_title; -- const input_title_t **title; -+ input_title_t * const *title; - - int i_title_offset; - int i_seekpoint_offset; --- -GitLab - - -From adcf4e66e2ce2c382bb97957c91bfde040f4f3ca Mon Sep 17 00:00:00 2001 -From: Zhao Zhili -Date: Thu, 1 Mar 2018 14:25:59 +0800 -Subject: [PATCH 2/5] yadif: fix variable type - -Signed-off-by: Thomas Guillem -(cherry picked from commit 77b86f4452be4dbe0d56a9cd1b66da61b116da60) -Signed-off-by: Thomas Guillem ---- - modules/video_filter/deinterlace/yadif.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/modules/video_filter/deinterlace/yadif.h b/modules/video_filter/deinterlace/yadif.h -index 4bc592ba9307..af16443d0804 100644 ---- a/modules/video_filter/deinterlace/yadif.h -+++ b/modules/video_filter/deinterlace/yadif.h -@@ -140,10 +140,10 @@ static void yadif_filter_line_c(uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8 - } - - static void yadif_filter_line_c_16bit(uint8_t *dst8, uint8_t *prev8, uint8_t *cur8, uint8_t *next8, int w, int prefs, int mrefs, int parity, int mode) { -- uint8_t *dst = (uint8_t *)dst8; -- uint8_t *prev = (uint8_t *)prev8; -- uint8_t *cur = (uint8_t *)cur8; -- uint8_t *next = (uint8_t *)next8; -+ uint16_t *dst = (uint16_t *)dst8; -+ uint16_t *prev = (uint16_t *)prev8; -+ uint16_t *cur = (uint16_t *)cur8; -+ uint16_t *next = (uint16_t *)next8; - int x; - uint16_t *prev2= parity ? prev : cur ; - uint16_t *next2= parity ? cur : next; --- -GitLab - - -From 45198e5328ff2b2f4eb2fb76add0789fec26270f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= -Date: Sun, 3 Mar 2019 09:59:10 +0200 -Subject: [PATCH 3/5] swscale: avoid invalid pointer conversion - -(cherry picked from commit ab00e6c59d42e05ab08893091783d8b5febc0058) -Signed-off-by: Thomas Guillem ---- - modules/video_chroma/swscale.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/modules/video_chroma/swscale.c b/modules/video_chroma/swscale.c -index 8993d11ec5dd..11897527355c 100644 ---- a/modules/video_chroma/swscale.c -+++ b/modules/video_chroma/swscale.c -@@ -588,8 +588,9 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx, - { - filter_sys_t *p_sys = p_filter->p_sys; - uint8_t palette[AVPALETTE_SIZE]; -- uint8_t *src[4]; int src_stride[4]; -- uint8_t *dst[4]; int dst_stride[4]; -+ uint8_t *src[4], *dst[4]; -+ const uint8_t *csrc[4]; -+ int src_stride[4], dst_stride[4]; - - GetPixels( src, src_stride, p_sys->desc_in, &p_filter->fmt_in.video, - p_src, i_plane_count, b_swap_uvi ); -@@ -606,11 +607,14 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx, - GetPixels( dst, dst_stride, p_sys->desc_out, &p_filter->fmt_out.video, - p_dst, i_plane_count, b_swap_uvo ); - -+ for (size_t i = 0; i < ARRAY_SIZE(src); i++) -+ csrc[i] = src[i]; -+ - #if LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0) -- sws_scale( ctx, src, src_stride, 0, i_height, -+ sws_scale( ctx, csrc, src_stride, 0, i_height, - dst, dst_stride ); - #else -- sws_scale_ordered( ctx, src, src_stride, 0, i_height, -+ sws_scale_ordered( ctx, csrc, src_stride, 0, i_height, - dst, dst_stride ); - #endif - } --- -GitLab - - -From 4431076ad4a21fdcabd3f7ef1d61c45891689b0c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= -Date: Sun, 3 Mar 2019 17:20:04 +0200 -Subject: [PATCH 4/5] dynamicoverlay: fix variable shadowing - -(cherry picked from commit d42e05d6b2c061ae352c131d5aebf8c8d8aa6d35) -Signed-off-by: Thomas Guillem ---- - modules/spu/dynamicoverlay/dynamicoverlay_commands.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c -index a93462925e8a..a85f9aafb0b9 100644 ---- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c -+++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c -@@ -899,12 +899,11 @@ static const commanddesc_static_t p_commands[] = - void RegisterCommand( filter_t *p_filter ) - { - filter_sys_t *p_sys = (filter_sys_t*) p_filter->p_sys; -- size_t i_index = 0; - - p_sys->i_commands = ARRAY_SIZE(p_commands); - p_sys->pp_commands = (commanddesc_t **) calloc( p_sys->i_commands, sizeof(commanddesc_t*) ); - if( !p_sys->pp_commands ) return; -- for( i_index = 0; i_index < p_sys->i_commands; i_index ++ ) -+ for( size_t i_index = 0; i_index < p_sys->i_commands; i_index ++ ) - { - p_sys->pp_commands[i_index] = (commanddesc_t *) malloc( sizeof(commanddesc_t) ); - if( !p_sys->pp_commands[i_index] ) return; --- -GitLab - - -From fda14fc7c013eb75291df10cc8b88336c51328ad Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= -Date: Mon, 26 Feb 2018 20:43:03 +0200 -Subject: [PATCH 5/5] dynamicoverlay: fix memory corruption - -Font alpha is 8-bits, not 32-bits. - -(cherry picked from commit 6f14081af7325d334a53126c4eea52bc30fc08a0) -Signed-off-by: Thomas Guillem ---- - modules/spu/dynamicoverlay/dynamicoverlay_commands.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c -index a85f9aafb0b9..7a71c6f2373a 100644 ---- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c -+++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c -@@ -234,8 +234,12 @@ static int parser_SetTextAlpha( char *psz_command, char *psz_end, - skip_space( &psz_command ); - if( isdigit( (unsigned char)*psz_command ) ) - { -- if( parse_digit( &psz_command, &p_params->fontstyle.i_font_alpha ) == VLC_EGENERIC ) -+ int32_t value; -+ -+ if( parse_digit( &psz_command, &value ) == VLC_EGENERIC ) - return VLC_EGENERIC; -+ -+ p_params->fontstyle.i_font_alpha = value; - } - return VLC_SUCCESS; - } --- -GitLab - diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/4665.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/4665.patch deleted file mode 100644 index c9ef33358e..0000000000 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/4665.patch +++ /dev/null @@ -1,377 +0,0 @@ -From 770789f265761fc7ab2de69ca105fec4ad93d9e2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= -Date: Mon, 26 Feb 2018 20:36:29 +0200 -Subject: [PATCH 1/9] chromaprint: missing cast - -(cherry picked from commit 7bd5bab3e43ae187f7219db61ed85d06d2ba0547) -Signed-off-by: Steve Lhomme -Upstream-Status: Backport [https://code.videolan.org/videolan/vlc/-/merge_requests/4665] -Signed-off-by: Khem Raj ---- - modules/stream_out/chromaprint.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/stream_out/chromaprint.c b/modules/stream_out/chromaprint.c -index 80ec31ba2590..c76cbda3c2bb 100644 ---- a/modules/stream_out/chromaprint.c -+++ b/modules/stream_out/chromaprint.c -@@ -231,7 +231,7 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id, - if ( !p_sys->b_finished && id->i_samples > 0 && p_buf->i_buffer ) - { - if(! chromaprint_feed( p_sys->p_chromaprint_ctx, -- p_buf->p_buffer, -+ (int16_t *)p_buf->p_buffer, - p_buf->i_buffer / BYTESPERSAMPLE ) ) - msg_Warn( p_stream, "feed error" ); - id->i_samples -= i_samples; --- -GitLab - - -From 6179d6b843f2a93af6a3d51c4244766e3eba9e77 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= -Date: Sun, 14 Apr 2019 09:41:38 +0300 -Subject: [PATCH 2/9] win32: wrap {g,s}etsockopt() - -char * can alias anything, and Winsock relies on that. Unfortunately, -the compiler still issues warnings. This works around that. - -(cherry picked from commit 36715d9b79f34824e126c2bc3aee2f1c1c16af46) -Signed-off-by: Steve Lhomme ---- - include/vlc_network.h | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/include/vlc_network.h b/include/vlc_network.h -index 010454a01c09..e39ffd0bacaa 100644 ---- a/include/vlc_network.h -+++ b/include/vlc_network.h -@@ -183,6 +183,22 @@ VLC_API int vlc_close(int); - - /** @} */ - -+#ifdef _WIN32 -+static inline int vlc_getsockopt(int s, int level, int name, -+ void *val, socklen_t *len) -+{ -+ return getsockopt(s, level, name, (char *)val, len); -+} -+#define getsockopt vlc_getsockopt -+ -+static inline int vlc_setsockopt(int s, int level, int name, -+ const void *val, socklen_t len) -+{ -+ return setsockopt(s, level, name, (const char *)val, len); -+} -+#define setsockopt vlc_setsockopt -+#endif -+ - /* Portable network names/addresses resolution layer */ - - #define NI_MAXNUMERICHOST 64 --- -GitLab - - -From 3391108f9709f0d77d9297c94371cf9cd30f2cbe Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Thu, 7 Dec 2023 15:43:04 +0100 -Subject: [PATCH 3/9] netsync: use char for temporary local buffer - -On Windows recvfrom/revc/sendto expects a char*. ---- - modules/control/netsync.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/modules/control/netsync.c b/modules/control/netsync.c -index 2a6a1a6a2bf8..8c91034d7cf2 100644 ---- a/modules/control/netsync.c -+++ b/modules/control/netsync.c -@@ -181,7 +181,7 @@ static void *Master(void *handle) - intf_sys_t *sys = intf->p_sys; - for (;;) { - struct pollfd ufd = { .fd = sys->fd, .events = POLLIN, }; -- uint64_t data[2]; -+ char data[16]; - - if (poll(&ufd, 1, -1) < 0) - continue; -@@ -198,8 +198,8 @@ static void *Master(void *handle) - if (master_system < 0) - continue; - -- data[0] = hton64(mdate()); -- data[1] = hton64(master_system); -+ SetQWBE(&data[0], mdate()); -+ SetQWBE(&data[8], master_system); - - /* Reply to the sender */ - sendto(sys->fd, data, 16, 0, -@@ -224,7 +224,7 @@ static void *Slave(void *handle) - - for (;;) { - struct pollfd ufd = { .fd = sys->fd, .events = POLLIN, }; -- uint64_t data[2]; -+ char data[16]; - - vlc_tick_t system = GetPcrSystem(sys->input); - if (system < 0) -@@ -233,7 +233,7 @@ static void *Slave(void *handle) - /* Send clock request to the master */ - const vlc_tick_t send_date = mdate(); - -- data[0] = hton64(system); -+ SetQWBE(&data[0], system); - send(sys->fd, data, 8, 0); - - /* Don't block */ -@@ -244,8 +244,8 @@ static void *Slave(void *handle) - if (recv(sys->fd, data, 16, 0) < 16) - goto wait; - -- const vlc_tick_t master_date = ntoh64(data[0]); -- const vlc_tick_t master_system = ntoh64(data[1]); -+ const vlc_tick_t master_date = GetQWBE(&data[0]); -+ const vlc_tick_t master_system = GetQWBE(&data[8]); - const vlc_tick_t diff_date = receive_date - - ((receive_date - send_date) / 2 + master_date); - --- -GitLab - - -From 27e584d7b9add8dbbb82b7227228e1ec1e25a089 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Tue, 3 Jan 2023 13:23:00 +0100 -Subject: [PATCH 4/9] access/dtv: move the lfind() Windows hack in the module - -So that we don't have to include search.h each time vlc_fixups.h is used. - -The Win32 prototype of lfind() expects an unsigned* for 'nelp', not a size_t*. - -(cherry picked from commit 7c43bcba27b6fe256456d93a9d32e10648f08da8) -Signed-off-by: Steve Lhomme ---- - include/vlc_fixups.h | 3 +++ - modules/access/dtv/access.c | 5 +++++ - 2 files changed, 8 insertions(+) - -diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h -index 37f788933779..861cb4cc5063 100644 ---- a/include/vlc_fixups.h -+++ b/include/vlc_fixups.h -@@ -501,8 +501,11 @@ void *tsearch( const void *key, void **rootp, int(*cmp)(const void *, const void - void *tfind( const void *key, const void **rootp, int(*cmp)(const void *, const void *) ); - void *tdelete( const void *key, void **rootp, int(*cmp)(const void *, const void *) ); - void twalk( const void *root, void(*action)(const void *nodep, VISIT which, int depth) ); -+#ifndef _WIN32 -+/* the Win32 prototype of lfind() expects an unsigned* for 'nmemb' */ - void *lfind( const void *key, const void *base, size_t *nmemb, - size_t size, int(*cmp)(const void *, const void *) ); -+#endif - #endif /* HAVE_SEARCH_H */ - #ifndef HAVE_TDESTROY - void tdestroy( void *root, void (*free_node)(void *nodep) ); -diff --git a/modules/access/dtv/access.c b/modules/access/dtv/access.c -index d9756c7b4885..c6ca5005883c 100644 ---- a/modules/access/dtv/access.c -+++ b/modules/access/dtv/access.c -@@ -32,6 +32,11 @@ - #ifdef HAVE_SEARCH_H - #include - #endif -+#if defined(_WIN32) -+/* the Win32 prototype of lfind() expects an unsigned* for 'nelp' */ -+# define lfind(a,b,c,d,e) \ -+ lfind((a),(b), &(unsigned){ (*(c) > UINT_MAX) ? UINT_MAX : *(c) }, (d),(e)) -+#endif - - #include "dtv/dtv.h" - --- -GitLab - - -From 5a9ca37a95b6e85e6beaaefba9aa4a886a45411c Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Mon, 15 Jul 2019 12:41:29 +0200 -Subject: [PATCH 5/9] vlc_common: fix swab() calls on win32 that don't use - const on source pointer - -(cherry picked from commit a9e0b1124e19225b903a2926951781e84002c410) -Signed-off-by: Steve Lhomme ---- - include/vlc_common.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/include/vlc_common.h b/include/vlc_common.h -index 8090b277150d..089878581763 100644 ---- a/include/vlc_common.h -+++ b/include/vlc_common.h -@@ -947,6 +947,11 @@ static inline void SetQWLE (void *p, uint64_t qw) - # define O_NONBLOCK 0 - # endif - -+/* the mingw32 swab() and win32 _swab() prototypes expect a char* instead of a -+ const void* */ -+# define swab(a,b,c) swab((char*) (a), (char*) (b), (c)) -+ -+ - # include - #endif /* _WIN32 */ - --- -GitLab - - -From b758e19479a80604e3feb470b197e4a13a203a85 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Wed, 10 Jul 2019 08:23:45 +0200 -Subject: [PATCH 6/9] avcodec: encoder: fix MPEG4 matrix passed as const - -lavc expects a pointer that it will free in avcodec_free_context(). - -(cherry picked from commit d86c4c87aa78130a4fd00294e25df865d0e2b327) -Signed-off-by: Steve Lhomme ---- - modules/codec/avcodec/encoder.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c -index 2b1c3604713d..4919ccf0e0e4 100644 ---- a/modules/codec/avcodec/encoder.c -+++ b/modules/codec/avcodec/encoder.c -@@ -588,8 +588,14 @@ int InitVideoEnc( vlc_object_t *p_this ) - - if ( p_sys->b_mpeg4_matrix ) - { -- p_context->intra_matrix = mpeg4_default_intra_matrix; -- p_context->inter_matrix = mpeg4_default_non_intra_matrix; -+ p_context->intra_matrix = av_malloc( sizeof(mpeg4_default_intra_matrix) ); -+ if ( p_context->intra_matrix ) -+ memcpy( p_context->intra_matrix, mpeg4_default_intra_matrix, -+ sizeof(mpeg4_default_intra_matrix)); -+ p_context->inter_matrix = av_malloc( sizeof(mpeg4_default_non_intra_matrix) ); -+ if ( p_context->inter_matrix ) -+ memcpy( p_context->inter_matrix, mpeg4_default_non_intra_matrix, -+ sizeof(mpeg4_default_non_intra_matrix)); - } - - if ( p_sys->b_pre_me ) --- -GitLab - - -From 55be3ce60795a09d13861c5637c1fe7aebc5ce8b Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Thu, 7 Dec 2023 14:18:22 +0100 -Subject: [PATCH 7/9] smb: fix potential string to wide string copy - -The type of net_resource depends on the UNICODE define. ---- - modules/access/smb.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules/access/smb.c b/modules/access/smb.c -index 5fe56f0c9dfe..6add2a3e6278 100644 ---- a/modules/access/smb.c -+++ b/modules/access/smb.c -@@ -524,7 +524,7 @@ static void Win32AddConnection( stream_t *p_access, const char *psz_server, - const char *psz_pwd, const char *psz_domain ) - { - char psz_remote[MAX_PATH]; -- NETRESOURCE net_resource; -+ NETRESOURCEA net_resource; - DWORD i_result; - VLC_UNUSED( psz_domain ); - -@@ -544,7 +544,7 @@ static void Win32AddConnection( stream_t *p_access, const char *psz_server, - - net_resource.lpRemoteName = psz_remote; - -- i_result = WNetAddConnection2( &net_resource, psz_pwd, psz_user, 0 ); -+ i_result = WNetAddConnection2A( &net_resource, psz_pwd, psz_user, 0 ); - - if( i_result != NO_ERROR ) - { --- -GitLab - - -From 5ae924bf212dce64a6424561d92426dbcc2cf3a0 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Wed, 6 Dec 2023 14:45:46 +0100 -Subject: [PATCH 8/9] dxva2: add missing mask initializers - ---- - modules/codec/avcodec/dxva2.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c -index 18b872fe0fe3..2e6809a05410 100644 ---- a/modules/codec/avcodec/dxva2.c -+++ b/modules/codec/avcodec/dxva2.c -@@ -84,12 +84,12 @@ DEFINE_GUID(DXVA_Intel_H264_NoFGT_ClearVideo, 0x604F8E68, 0x4951, 0x4c54, - - /* XXX Preferred format must come first */ - static const d3d9_format_t d3d_formats[] = { -- { "YV12", MAKEFOURCC('Y','V','1','2'), VLC_CODEC_YV12 }, -- { "NV12", MAKEFOURCC('N','V','1','2'), VLC_CODEC_NV12 }, -- //{ "IMC3", MAKEFOURCC('I','M','C','3'), VLC_CODEC_YV12 }, -- { "P010", MAKEFOURCC('P','0','1','0'), VLC_CODEC_P010 }, -+ { "YV12", MAKEFOURCC('Y','V','1','2'), VLC_CODEC_YV12, 0,0,0 }, -+ { "NV12", MAKEFOURCC('N','V','1','2'), VLC_CODEC_NV12, 0,0,0 }, -+ //{ "IMC3", MAKEFOURCC('I','M','C','3'), VLC_CODEC_YV12, 0,0,0 }, -+ { "P010", MAKEFOURCC('P','0','1','0'), VLC_CODEC_P010, 0,0,0 }, - -- { NULL, 0, 0 } -+ { NULL, 0, 0, 0,0,0 } - }; - - static const d3d9_format_t *D3dFindFormat(D3DFORMAT format) --- -GitLab - - -From 08c7a66780740679ba1b0abe9e30e73afc6bc271 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Wed, 6 Dec 2023 07:48:29 +0100 -Subject: [PATCH 9/9] win32/modules: use cast with GetProcAddress function - pointers - ---- - src/text/url.c | 3 ++- - src/win32/plugin.c | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/text/url.c b/src/text/url.c -index b962eb31f849..2eb4b8d10817 100644 ---- a/src/text/url.c -+++ b/src/text/url.c -@@ -892,7 +892,8 @@ static int IdnToAscii(DWORD flags, LPCWSTR str, int len, LPWSTR buf, int size) - int (WINAPI *IdnToAsciiReal)(DWORD, LPCWSTR, int, LPWSTR, int); - int ret = 0; - -- IdnToAsciiReal = GetProcAddress(h, "IdnToAscii"); -+ IdnToAsciiReal = (int (WINAPI *)(DWORD, LPCWSTR, int, LPWSTR, int)) -+ GetProcAddress(h, "IdnToAscii"); - if (IdnToAsciiReal != NULL) - ret = IdnToAsciiReal(flags, str, len, buf, size); - else -diff --git a/src/win32/plugin.c b/src/win32/plugin.c -index 1a65521fca75..b5c336eb99ca 100644 ---- a/src/win32/plugin.c -+++ b/src/win32/plugin.c -@@ -45,7 +45,8 @@ static BOOL WINAPI SetThreadErrorModeFallback(DWORD mode, DWORD *oldmode) - - BOOL (WINAPI *SetThreadErrorModeReal)(DWORD, DWORD *); - -- SetThreadErrorModeReal = GetProcAddress(h, "SetThreadErrorMode"); -+ SetThreadErrorModeReal = (BOOL (WINAPI *)(DWORD, DWORD *)) -+ GetProcAddress(h, "SetThreadErrorMode"); - if (SetThreadErrorModeReal != NULL) - return SetThreadErrorModeReal(mode, oldmode); - --- -GitLab - diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb similarity index 97% rename from meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb rename to meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb index 2a6b27add0..6406343c8d 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb @@ -25,11 +25,8 @@ SRC_URI = "https://get.videolan.org/${BPN}/${PV}/${BP}.tar.xz \ file://0006-configure-Disable-incompatible-function-pointer-type.patch \ file://taglib-2.patch \ file://0001-taglib-Fix-build-on-x86-32-bit.patch \ - file://4645.patch \ - file://4665.patch \ " -SRC_URI[sha256sum] = "adc7285b4d2721cddf40eb5270cada2aaa10a334cb546fd55a06353447ba29b5" - +SRC_URI[sha256sum] = "24dbbe1d7dfaeea0994d5def0bbde200177347136dbfe573f5b6a4cee25afbb0" inherit autotools-brokensep features_check gettext pkgconfig mime-xdg REQUIRED_DISTRO_FEATURES = "x11" From patchwork Fri Aug 30 03:58:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 48499 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 BD2DBCA0ED6 for ; Fri, 30 Aug 2024 03:58:35 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.web11.5221.1724990315249642593 for ; Thu, 29 Aug 2024 20:58:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=OGPbr3sR; spf=pass (domain: gmail.com, ip: 209.85.215.182, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-7cd76b56e59so507273a12.2 for ; Thu, 29 Aug 2024 20:58:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724990314; x=1725595114; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1ltfo++SsHzVDWsfuyG8gJE/XAZC5jlebbwD7Rro3XY=; b=OGPbr3sRpPrRswv7z977qDKANt5k1Z7fwQ11lqHGryMxcJrcPcmZL4SSXDzDnf/cN8 TxVF6q5aASgtKKCbB+vMa65NzxjjNyIdl6maVsPp1FcwxBxEaurgHp2zTzTxPrnCkio6 RuRm1JT+bmpzbP06vNk2vNIUwBJVvL6i7WXHg4gvLnMTiTRwwGxblyPMwLJJW8cPBDOs wpwMQN/DEI2kkuN3wixPzKtwVY0SxCBvYR3iRunwzElcJqIjmVnUNX+kYUqunDhyCnXZ UDRyIm7Rds8xyZ33ezhclzdMYQqo8hmgWu5+kRQEnrg2/Z6q/bSkKQUy+iDxUAPadUxK XCsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724990314; x=1725595114; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1ltfo++SsHzVDWsfuyG8gJE/XAZC5jlebbwD7Rro3XY=; b=hB5hLrVFanYEyKWfK7dDsAR3zU7Pi9tseCEKiZ5j7XIgq8pcg9svICzbq6v3UkHcCc YphBzR8rg3EaQFmeKWNUumrezJNwhbVdvLqOtPiRFwgL8tbP/F91sueKJwuZ5eLpUkuH 1iIVrIonKf3qJOBybRZvBTvWmr1EfKZrlgspXI5mIaFR1uahPLndJsETbfjQMJuTOPSw dz5ksuF/TtdVdhcKPuHpmrHBJaSNMF33mRBOzcyKgcQXKg04nUV9eOQ1+BkNY/g1IXq9 IbrN7cwp449Fma92SWoKGeEl84F2vhdhoKdpax9bLJp+TsUDuOlIS7VRDd0ZyHqN5P2L 7vpA== X-Gm-Message-State: AOJu0YxBFILWYfrlBT8lVUStOO3CqHA+PKAkIdKSez/ttMdsGUWe4nvO y7tflRV79Xk+MBFrbwpUU16rbQEbaKiA0tfrikS6YHS4pzXgX8had/PCvAN9 X-Google-Smtp-Source: AGHT+IEk0cOFJWPh43jKgsNl/syMwdNgo69yBgIS6OaARDtCpjj990Y4frapnbzG5UEg6PFfMbwPBw== X-Received: by 2002:a05:6a20:e617:b0:1ca:da64:4f4b with SMTP id adf61e73a8af0-1cce0ff0f21mr5397399637.2.1724990314269; Thu, 29 Aug 2024 20:58:34 -0700 (PDT) Received: from apollo.localdomain ([2601:646:9d80:4380::2696]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2052919afb2sm2705035ad.3.2024.08.29.20.58.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Aug 2024 20:58:33 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 4/8] libplacebo: Add recipe Date: Thu, 29 Aug 2024 20:58:23 -0700 Message-ID: <20240830035827.406391-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240830035827.406391-1-raj.khem@gmail.com> References: <20240830035827.406391-1-raj.khem@gmail.com> MIME-Version: 1.0 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 ; Fri, 30 Aug 2024 03:58:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/112043 Signed-off-by: Khem Raj --- .../mplayer/libplacebo_7.349.0.bb | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 meta-oe/recipes-multimedia/mplayer/libplacebo_7.349.0.bb diff --git a/meta-oe/recipes-multimedia/mplayer/libplacebo_7.349.0.bb b/meta-oe/recipes-multimedia/mplayer/libplacebo_7.349.0.bb new file mode 100644 index 0000000000..b68e67a8cb --- /dev/null +++ b/meta-oe/recipes-multimedia/mplayer/libplacebo_7.349.0.bb @@ -0,0 +1,22 @@ +SUMMARY ="Reusable library for GPU-accelerated video/image rendering primitives" +LICENSE = "Apache-2.0 & BSD-3-Clause & BSL-1.0 & MIT" +LIC_FILES_CHKSUM = "file://3rdparty/Vulkan-Headers/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://3rdparty/fast_float/LICENSE-APACHE;md5=81db248e90379bcfc0582b578b009bc3 \ + file://3rdparty/fast_float/LICENSE-BOOST;md5=2c7a3fa82e66676005cd4ee2608fd7d2 \ + file://3rdparty/fast_float/LICENSE-MIT;md5=32b11d50c7d9788d4270f6a83f3e68eb \ + file://3rdparty/glad/LICENSE;md5=ae570f26774ac096cff8f992091a223c \ + file://3rdparty/jinja/LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462 \ + file://3rdparty/jinja/docs/license.rst;md5=5f4c795946979fabc2361be4c70d0a9f \ + file://3rdparty/markupsafe/LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75 \ + file://3rdparty/markupsafe/docs/license.rst;md5=5f4c795946979fabc2361be4c70d0a9f \ + file://LICENSE;md5=435ed639f84d4585d93824e7da3d85da \ + file://demos/3rdparty/nuklear/src/LICENSE;md5=6052431ae6cd4f0082276c54996e7770 \ + file://demos/LICENSE;md5=65d3616852dbf7b1a6d4b53b00626032" + +SRC_URI = "gitsm://github.com/haasn/libplacebo;protocol=https;branch=master" + +SRCREV = "1fd3c7bde7b943fe8985c893310b5269a09b46c5" + +inherit meson pkgconfig + +S = "${WORKDIR}/git" From patchwork Fri Aug 30 03:58:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 48506 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 D7249CA0EDC for ; Fri, 30 Aug 2024 03:58:45 +0000 (UTC) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mx.groups.io with SMTP id smtpd.web10.5158.1724990316777279405 for ; Thu, 29 Aug 2024 20:58:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=lFHFrcF0; spf=pass (domain: gmail.com, ip: 209.85.215.171, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-656d8b346d2so854053a12.2 for ; Thu, 29 Aug 2024 20:58:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724990316; x=1725595116; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ywKebfd1EfHhuuotQoA+LSYe0Iw8bJ7JdPWTTgYgCPM=; b=lFHFrcF0f3RgNX8UgH3xz/vUlSiBgEAjqMQ5SYwMMaJnSGwv90cyCXFouPcrzGDRXd pOQZHHeLT5Jeq5IiilHwtMFDAvyDPOnl0JmlcM1anxPS1aAA2w4MzLCqGmCHjZxqrvG/ pacBWiIekX+uhcjKMBFsx3XtumDfO72U8TVjAsDFGaPYj9Eo6Ey2Y3N518j5qU9CcOsl eSQX1Ccv7kt+p1wRV9UcJcqo6wIurdLDvBUvxyVLqsMwkzE3Q2PCM+fVpL2xfM7+tY9c k/eSeHnMZvmuc0ACHQ8R49QGwNZ6k8D3mfRw9PddGHkCDgQ4xI5Ndcpl32pdv2sKuPgd ZRXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724990316; x=1725595116; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ywKebfd1EfHhuuotQoA+LSYe0Iw8bJ7JdPWTTgYgCPM=; b=KGSd/f23PS7tgywxZgoXKaWlWlrUkW4f4khoN9JHYDFn27UqgoV+jL4tgZiAG+3FtO qfObvx0FyPdIF6Mt3lXmlQ6IQzsQUorNy8hAUIUudQI+7vN+9mYYiHhPMZOvYNI+/sxf nPsL8VowXxGIdrWOJtiaUS+fE5yJJvFdwydAsQfnzKyI0nBtE5vZ3mWhxpAzYBHvpBnf Y03LsQ4wrr/5oLcEnQ0aA5tkah+CzyBX1XFFEUD34ihunSaADOTzq5pt4KW4kw2m68O8 YQEnmzd3ubsslHNUfqNtYxzqXe+KxdMojCl/UMJhmLCia/l1HLWfSF3xXWLIzAMWPsy7 /rAQ== X-Gm-Message-State: AOJu0YxAw2Mt6K5qxEDu0EEXROMUTH0URe297W4Gw5b+Pt7W9tbpKP6k 2/hvJPMb+T/+/RJpJBgF5qtKfd3vB0OJQzaKQ4U4QmmXs7Xd/kXxq0gpoXRB X-Google-Smtp-Source: AGHT+IGqqOqsTSPcWgQV4jLT936S0ONRkDDewtVhNKz5ktqCbOdOUDDE9Do0v5uRP1PGPcfc7HLJHg== X-Received: by 2002:a17:903:35cc:b0:1fa:a89:fd1a with SMTP id d9443c01a7336-2050c372578mr60470225ad.10.1724990315829; Thu, 29 Aug 2024 20:58:35 -0700 (PDT) Received: from apollo.localdomain ([2601:646:9d80:4380::2696]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2052919afb2sm2705035ad.3.2024.08.29.20.58.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Aug 2024 20:58:34 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 5/8] mpv: Upgrade to 0.38.0 release Date: Thu, 29 Aug 2024 20:58:24 -0700 Message-ID: <20240830035827.406391-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240830035827.406391-1-raj.khem@gmail.com> References: <20240830035827.406391-1-raj.khem@gmail.com> MIME-Version: 1.0 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 ; Fri, 30 Aug 2024 03:58:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/112044 https://github.com/mpv-player/mpv/releases migrate to using meson build system Signed-off-by: Khem Raj --- ...d-emitting-absolute-filepaths-into-g.patch | 33 ++++++++ .../mplayer/{mpv_0.35.1.bb => mpv_0.38.0.bb} | 79 ++++++++----------- 2 files changed, 68 insertions(+), 44 deletions(-) create mode 100644 meta-oe/recipes-multimedia/mplayer/mpv/0001-file2string-Avoid-emitting-absolute-filepaths-into-g.patch rename meta-oe/recipes-multimedia/mplayer/{mpv_0.35.1.bb => mpv_0.38.0.bb} (51%) diff --git a/meta-oe/recipes-multimedia/mplayer/mpv/0001-file2string-Avoid-emitting-absolute-filepaths-into-g.patch b/meta-oe/recipes-multimedia/mplayer/mpv/0001-file2string-Avoid-emitting-absolute-filepaths-into-g.patch new file mode 100644 index 0000000000..b96ec5d4c4 --- /dev/null +++ b/meta-oe/recipes-multimedia/mplayer/mpv/0001-file2string-Avoid-emitting-absolute-filepaths-into-g.patch @@ -0,0 +1,33 @@ +From 9878681df9919d28da3e4c6cc706e264abd9df92 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 29 Aug 2024 17:54:15 -0700 +Subject: [PATCH] file2string: Avoid emitting absolute filepaths into generated + sources + +These sources are bundled into src packages to be distributed and leaking +buildpaths results in violating reproducibility norms. + +Upstream-Status: Submitted [https://github.com/mpv-player/mpv/pull/14763] + +Signed-off-by: Khem Raj +--- + TOOLS/file2string.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/TOOLS/file2string.py b/TOOLS/file2string.py +index 5b1c4a95d1..39c1122a35 100755 +--- a/TOOLS/file2string.py ++++ b/TOOLS/file2string.py +@@ -22,10 +22,10 @@ + # License along with mpv. If not, see . + # + +-import sys ++import os, sys + + def file2string(infilename, infile, outfile): +- outfile.write("// Generated from %s\n\n" % infilename) ++ outfile.write("// Generated from %s\n\n" % os.path.basename(infilename)) + + conv = ["\\%03o" % c for c in range(256)] + safe_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" \ diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.38.0.bb similarity index 51% rename from meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb rename to meta-oe/recipes-multimedia/mplayer/mpv_0.38.0.bb index 0f50a6e8fe..e9384e88d3 100644 --- a/meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb +++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.38.0.bb @@ -9,20 +9,20 @@ DEPENDS = " \ jpeg \ libv4l \ libass \ + libplacebo \ " LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV_mpv = "140ec21c89d671d392877a7f3b91d67e7d7b9239" -SRC_URI = "git://github.com/mpv-player/mpv;name=mpv;branch=release/0.35;protocol=https \ - https://waf.io/waf-2.0.25;name=waf;subdir=git \ +SRCREV_mpv = "02254b92dd237f03aa0a151c2a68778c4ea848f9" +SRC_URI = "git://github.com/mpv-player/mpv;name=mpv;branch=release/0.38;protocol=https \ + file://0001-file2string-Avoid-emitting-absolute-filepaths-into-g.patch \ " -SRC_URI[waf.sha256sum] = "21199cd220ccf60434133e1fd2ab8c8e5217c3799199c82722543970dc8e38d5" S = "${WORKDIR}/git" -inherit waf pkgconfig mime-xdg +inherit meson pkgconfig mime-xdg LDFLAGS:append:riscv64 = " -latomic" @@ -42,59 +42,55 @@ PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)} \ " -PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 xsp libxv libxscrnsaver libxinerama libxpresent libxext" -PACKAGECONFIG[xv] = "--enable-xv,--disable-xv,libxv" -PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl" -PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" -PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,libdrm" -PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/libgbm" -PACKAGECONFIG[lua] = "--enable-lua,--disable-lua,lua luajit" -PACKAGECONFIG[libarchive] = "--enable-libarchive,--disable-libarchive,libarchive" -PACKAGECONFIG[jack] = "--enable-jack, --disable-jack, jack" -PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva" -PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" -PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland wayland-native libxkbcommon" +PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=diabled,virtual/libx11 xsp libxv libxscrnsaver libxinerama libxpresent libxext" +PACKAGECONFIG[xv] = "-Dxv=enabled,-Dxv=disabled,libxv" +PACKAGECONFIG[opengl] = "-Dgl=enabled,-Dgl=disabled,virtual/libgl" +PACKAGECONFIG[egl] = "-Degl=enabled,-Degl-disabled,virtual/egl" +PACKAGECONFIG[drm] = "-Ddrm=enabled,-Ddrm=disabled,libdrm" +PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/libgbm" +PACKAGECONFIG[lua] = "-Dlua=luajit,-Dlua=disabled,lua luajit" +PACKAGECONFIG[libarchive] = "-Dlibarchive=enabled,-Dlibarchive=disabled,libarchive" +PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack" +PACKAGECONFIG[vaapi] = "-Dvaapi=enabled,-Dvaapi=disabled,libva" +PACKAGECONFIG[vdpau] = "-Dvdpau=enabled,-Dvdpau=disabled,libvdpau" +PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,wayland wayland-native libxkbcommon" python __anonymous() { packageconfig = (d.getVar("PACKAGECONFIG") or "").split() extras = [] if "x11" in packageconfig and "opengl" in packageconfig: - extras.append(" --enable-gl-x11") + extras.append(" -Dgl-x11=enabled") if "x11" in packageconfig and "egl" in packageconfig: - extras.append(" --enable-egl-x11") + extras.append(" -Degl-x11=enabled") if "egl" in packageconfig and "drm" in packageconfig: - extras.append(" --enable-egl-drm") + extras.append(" -Degl-drm=enabled") if "vaapi" in packageconfig and "x11" in packageconfig: - extras.append(" --enable-vaapi-x11") + extras.append(" -Dvaapi-x11=enabled") if "vaapi" in packageconfig and "drm" in packageconfig: - extras.append(" --enable-vaapi-drm") + extras.append(" -Dvaapi-drm=enabled") if "vaapi" in packageconfig and "x11" in packageconfig and "egl" in packageconfig: - extras.append(" --enable-vaapi-x-egl") + extras.append(" -Dvaapi-x-egl=enabled") if "vdpau" in packageconfig and "opengl" in packageconfig and "x11" in packageconfig: - extras.append(" --enable-vdpau-gl-x11") + extras.append(" -Dvdpau-gl-x11=enabled") if "wayland" in packageconfig and "opengl" in packageconfig: - extras.append(" --enable-gl-wayland") + extras.append(" -Dgl-wayland=enabled") if "wayland" in packageconfig and "vaapi" in packageconfig: - extras.append(" --enable-vaapi-wayland") + extras.append(" -Dvaapi-wayland=enabled") if extras: d.appendVar("EXTRA_OECONF", "".join(extras)) } -SIMPLE_TARGET_SYS = "${@'${TARGET_SYS}'.replace('${TARGET_VENDOR}', '')}" +#SIMPLE_TARGET_SYS = "${@'${TARGET_SYS}'.replace('${TARGET_VENDOR}', '')}" EXTRA_OECONF = " \ - --prefix=${prefix} \ - --target=${SIMPLE_TARGET_SYS} \ - --confdir=${sysconfdir} \ - --datadir=${datadir} \ - --disable-manpage-build \ - --disable-libbluray \ - --disable-dvdnav \ - --disable-cdda \ - --disable-uchardet \ - --disable-rubberband \ - --disable-lcms2 \ - --disable-vapoursynth \ + -Dmanpage-build=disabled \ + -Dlibbluray=disabled \ + -Ddvdnav=disabled \ + -Dcdda=disabled \ + -Duchardet=disabled \ + -Drubberband=disabled \ + -Dlcms2=disabled \ + -Dvapoursynth=disabled \ ${PACKAGECONFIG_CONFARGS} \ " @@ -102,11 +98,6 @@ do_configure:append() { sed -i -e 's#${WORKDIR}##g' ${B}/config.h } -link_waf() { - ln -s waf-2.0.25 ${S}/waf -} -do_unpack[postfuncs] += "link_waf" - FILES:${PN} += " \ ${datadir}/icons \ ${datadir}/zsh \ From patchwork Fri Aug 30 03:58:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 48503 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 CA9E9CA0EDB for ; Fri, 30 Aug 2024 03:58:45 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web10.5159.1724990318364528506 for ; Thu, 29 Aug 2024 20:58:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=gjGG65GS; spf=pass (domain: gmail.com, ip: 209.85.214.170, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2021a99af5eso11610515ad.1 for ; Thu, 29 Aug 2024 20:58:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724990317; x=1725595117; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cRqUe2zyMZ14X3kikQr+23NUSDxmmq8ftQv8hok4tzo=; b=gjGG65GSiG3LixtWkPDbeJ+r8o+kgQurNR+KeCgJu6ZrpV1dPcOOZlw+m4GT6Kqad4 214aHnf+wj1NH5km2X8DaVMxqGHDDn3ZIyKhMprprBuh5usoDKmUzjrZJJuNu/dGbd0F Klgdv57SqlRvECHpkkcZ+FXMZkJNg5vfeXGuFMnYT62reUs3VWNGHBVyp5AjAhEJy6Ol HjnMEcr/MFL1DWboj2eclOMf/TOI6KLrMf6XPQOyQne7TeG3iXQDuk9EYZFrkYNMm/T3 ieSB4r3PvfVNXmB2vCKC5RmcYS7oMwZjbl07DWEZMiwKxsOL1LTbWxd/2lnXZgNVj3oD 5g/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724990317; x=1725595117; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cRqUe2zyMZ14X3kikQr+23NUSDxmmq8ftQv8hok4tzo=; b=N/IhXU2A18GSkAQohWmHUgZyiY6wcp3twkqo8JQ1Bl+dtqmDYQaodoVN4yBCZ/lln4 WLfwMxqx26LgtwWN8qlZgP1j97GrU/S+XRtl2wsRN5kJcL2Iv25zDncDT/97i7+dH4cI XUfnM0GeK5x11kGLjaX6k7NlhKycVpAI6DNKAgDBw2OcDf4JYJ2RppO7D13phSNZHPgw BrjReOTx9V5jdT1sPB0P6l/tUmEoUEc2NrLikSgt2VZqgBmX+mo8qIln2VYV0V4/S8lH DTk6a4xBMiWHYbcJNvSiyhWGqfQl3P2r312WSVxwn6XotLAaltr+A50k9lXG+b0LT8fW bfYw== X-Gm-Message-State: AOJu0YxZKkTyFhnTsJTm3NV3cHjzLI8eZA/0pbcRp3BuRaEJANt/wEKF sHdaTrSqSEcbiAWTH4WM0Hou0YMNZ1hY22aSdDDgL7Mj78nEZuLQqSmAN71I X-Google-Smtp-Source: AGHT+IETjDHu2hWFjcyIZmvz6KjwroawJmDXvAD5kNizGlWfN0HmDKw0OOOjztsVAM2XNLTBqEX+Fg== X-Received: by 2002:a17:903:2287:b0:202:4047:e419 with SMTP id d9443c01a7336-2050c33a4b6mr57778455ad.25.1724990317489; Thu, 29 Aug 2024 20:58:37 -0700 (PDT) Received: from apollo.localdomain ([2601:646:9d80:4380::2696]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2052919afb2sm2705035ad.3.2024.08.29.20.58.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Aug 2024 20:58:36 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-multimedia][PATCH 6/8] libmpdclient,mpc: Upgrade to 2.22 and 0.35 respectively Date: Thu, 29 Aug 2024 20:58:25 -0700 Message-ID: <20240830035827.406391-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240830035827.406391-1-raj.khem@gmail.com> References: <20240830035827.406391-1-raj.khem@gmail.com> MIME-Version: 1.0 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 ; Fri, 30 Aug 2024 03:58:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/112045 Signed-off-by: Khem Raj --- .../musicpd/{libmpdclient_2.20.bb => libmpdclient_2.22.bb} | 0 .../recipes-multimedia/musicpd/{mpc_0.34.bb => mpc_0.35.bb} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename meta-multimedia/recipes-multimedia/musicpd/{libmpdclient_2.20.bb => libmpdclient_2.22.bb} (100%) rename meta-multimedia/recipes-multimedia/musicpd/{mpc_0.34.bb => mpc_0.35.bb} (100%) diff --git a/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.20.bb b/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.22.bb similarity index 100% rename from meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.20.bb rename to meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.22.bb diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpc_0.34.bb b/meta-multimedia/recipes-multimedia/musicpd/mpc_0.35.bb similarity index 100% rename from meta-multimedia/recipes-multimedia/musicpd/mpc_0.34.bb rename to meta-multimedia/recipes-multimedia/musicpd/mpc_0.35.bb From patchwork Fri Aug 30 03:58:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 48505 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 E8C08CA0EDF for ; Fri, 30 Aug 2024 03:58:45 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web11.5223.1724990319195080959 for ; Thu, 29 Aug 2024 20:58:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=T+EvwGqp; spf=pass (domain: gmail.com, ip: 209.85.214.179, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-20227ba378eso12032485ad.0 for ; Thu, 29 Aug 2024 20:58:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724990318; x=1725595118; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fK0YtYkpUf0vNmjhkwyFFlQfIuyk5+MsEohASgucC9o=; b=T+EvwGqpQ+3WQ6i9rn+i/cyAlW1IgoAUGPlVBPPczz+dta+jmQSNtLy1Ri2yaibx4B gUjBnUlhmxv0cOmOfMVX0bIvPqgV6/ojXg9aV81KsR4TbgM7NKUd7ePvEtdcN5NrOdJY /4V0f2b8qv42roW19bncgW7vr3RG7q5whtbE29d1byaaNffVdvnOP1xEHKM5dLD3jpbS d0Gfk4lohctFy5gcdJVj0l/4Ykmf6mjWn02WGg7BIwJOefsn5qGRuxi+OzcNO5ZDGTQc WZ0KaNBey+B0X/ucGXdMbddcGeH+gyvEiVv0w8cEecLsK6Tzg2cXSAusP64mP6ZiuC58 mOaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724990318; x=1725595118; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fK0YtYkpUf0vNmjhkwyFFlQfIuyk5+MsEohASgucC9o=; b=lyhuVDLwXt/9Fk51MGK2Jy0IRmSenFybZhaZ0tTp9odS4JYnxd1lQS7ymq8gsi/Tpy LTfJPYYplePHzuZJ2kMwGMATvs/uQGniaSk3pHIK2FFolW/vez+wLqm8sLHEnkTXv6FH 1j3+EbAK1BYVR6H+dO/24lE7WrWunL4HlyVD0woi9yPaSyEAycwjgbhoxo6HUu1VJ007 D2xlPDp7NqsGn+ve6o/1Ks8R4g5Sj4RaBOKIGzvwqg4Q0QaPoaDM8OESKD7TriOIkiCT pmuY2VtYZ66j1Whj7CfPKkX+lQQOW+HMP4znUuSF3xKfNfSpf4PE1kp4oxRWb0U+wA8d eBNQ== X-Gm-Message-State: AOJu0Yy3+MbkT+aSvNM9QKA4ZwQVWdJysebwijgk41tzMP9JWTODzDLt RP0u/EcbAtD6DhCtzBk4qID9cOI9iqcdMMrRuM9q5Qmt0Y218dsb1UgIAXD/ X-Google-Smtp-Source: AGHT+IFJIqyfCeXGjhkfvUgopDFja9DEwF2YuH6/m+vtRq3RC68wRFhUZgjU81M7EOAbDv3xHnQtUA== X-Received: by 2002:a17:903:1c3:b0:1f7:1b08:dda9 with SMTP id d9443c01a7336-2050c2060c2mr66885455ad.8.1724990318321; Thu, 29 Aug 2024 20:58:38 -0700 (PDT) Received: from apollo.localdomain ([2601:646:9d80:4380::2696]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2052919afb2sm2705035ad.3.2024.08.29.20.58.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Aug 2024 20:58:37 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-multimedia][PATCH 7/8] vlc: Disable recipe Date: Thu, 29 Aug 2024 20:58:26 -0700 Message-ID: <20240830035827.406391-7-raj.khem@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240830035827.406391-1-raj.khem@gmail.com> References: <20240830035827.406391-1-raj.khem@gmail.com> MIME-Version: 1.0 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 ; Fri, 30 Aug 2024 03:58:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/112046 OE-core has moved to ffmpeg7, vlc3 needs to be ported to work with this version and vlc4 is not released yet. Signed-off-by: Khem Raj --- .../packagegroups/packagegroup-meta-multimedia.bb | 1 - meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb index 672c8abc9a..618eaa68d1 100644 --- a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb +++ b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb @@ -51,7 +51,6 @@ RDEPENDS:packagegroup-meta-multimedia = "\ openal-soft \ opusfile \ opus-tools \ - ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains("DISTRO_FEATURES", "x11", "vlc", "", d), "", d)} \ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "sox streamripper", "", d)} \ tinyalsa \ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 i686 x86-64", "x265", "", d), "", d)} \ 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 6406343c8d..2d2ecc63b9 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb @@ -132,3 +132,5 @@ FILES:${PN}-staticdev += "\ INSANE_SKIP:${PN} = "dev-so" EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "0", "1", d)}" + +SKIP_RECIPE[vlc] = "requires porting to ffmpeg >= 7 as of ffmpeg >= 5 it requires extensive changes disabling VAAPI (only supported with vlc >= 4)" From patchwork Fri Aug 30 03:58:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 48504 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 CA9ACCA0EDA for ; Fri, 30 Aug 2024 03:58:45 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web10.5160.1724990320540481001 for ; Thu, 29 Aug 2024 20:58:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=P4FmbdF4; spf=pass (domain: gmail.com, ip: 209.85.214.182, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2050b059357so11361665ad.2 for ; Thu, 29 Aug 2024 20:58:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724990320; x=1725595120; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JvS4l4aCvgSVq+azmTpQtGxtscrtF1z6muIydSLX9cU=; b=P4FmbdF4wJpZx9aKi/AeHXXBHF2TyXskGyEDxu7GRwWluOp4rqdU8Y+Jt8Xzl1aZ4H pE6DwydRIhT5hmaX5rtV+/BvJchU6HviAF+nQozsubsn9NRYY86Ot6/UddwtE3Wrw7f1 xNRA1MzBfiomRUiDjlXDkrmiTrReBMm+17PrtJzXjAIVxFiRtruWmQYOnOpJ6RBzCHnC BDZvuiLrriRCiLXE5evxAMLZyWeqw+LjujgqcD6xNgekLVdJLuZMQm8y6+PN8fmVNKKL Er7n5vtUTGmTW5FeC/tu/fXBCQqLs3xnIkZBlM4Ip8WcdOEhULFgrxXXGTRSUe+qhT2P 4MUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724990320; x=1725595120; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JvS4l4aCvgSVq+azmTpQtGxtscrtF1z6muIydSLX9cU=; b=cU//vIOa1K8qABywKWBXBBftAm/DmM1Ip0D7q7BufY8w8W7al+ABIf/2O8LKbX55X4 R4klzgW44Oj8xaNqmO1fKEBj/qDbceCm5MmMYeUqOagho4FAc7FnLG1Y7Qel6WKJWEpV BgT6Le944+DB2k8Aoz/KAUjVGX9Mc+dTTXzpcV8aWLH1P8ZJknm7uYYQx4GPAK5pSZkA cRxgQc6Q2guLEmGdLEDMZf+QktXgOjh8cV3CF+1QG68Er21cJsNiRzkw22HjH22F4C0t S7EFQE8I68YUzA7FMJNmPUzA5xP8ULeQskcXiKbg0Oe7iFwwUWv8wszgxN85Tl0/sNDP fRHQ== X-Gm-Message-State: AOJu0YxF03pT8fKZQWhsu72k6dG13jtqfIHs29jSB2mXB+U2YBo/jJ/D geiZvQyV96/cKxwSkMdiOKn0/+lfSvQ4T2h1nF+rNX17eR2vYKERM7oWphSP X-Google-Smtp-Source: AGHT+IH69jrmy6o2gdTiQLhfMn34fe0c1Q+0wC/3immOdED9sb3mK18wa+E0MxT7l8b6W5NACXvxOw== X-Received: by 2002:a17:902:dac5:b0:203:95eb:380 with SMTP id d9443c01a7336-2050c5255d5mr56991185ad.64.1724990319794; Thu, 29 Aug 2024 20:58:39 -0700 (PDT) Received: from apollo.localdomain ([2601:646:9d80:4380::2696]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2052919afb2sm2705035ad.3.2024.08.29.20.58.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Aug 2024 20:58:38 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-multimedia][PATCH 8/8] mpd: Upgrade to 0.23.15+git Date: Thu, 29 Aug 2024 20:58:27 -0700 Message-ID: <20240830035827.406391-8-raj.khem@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240830035827.406391-1-raj.khem@gmail.com> References: <20240830035827.406391-1-raj.khem@gmail.com> MIME-Version: 1.0 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 ; Fri, 30 Aug 2024 03:58:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/112047 Drop uneeded patch ver 0.23.15 (2023/12/20) * decoder - ffmpeg: fix build failure with FFmpeg 6.1 * output - alsa: limit buffer time to 2 seconds Use latest master for fmt 11.x fixes Signed-off-by: Khem Raj --- ...tch-src_decoder_plugins_FfmpegIo.cxx.patch | 26 ------------------- .../{mpd_0.23.14.bb => mpd_0.23.15.bb} | 11 +++++--- 2 files changed, 8 insertions(+), 29 deletions(-) delete mode 100644 meta-multimedia/recipes-multimedia/musicpd/mpd/0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch rename meta-multimedia/recipes-multimedia/musicpd/{mpd_0.23.14.bb => mpd_0.23.15.bb} (96%) diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch b/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch deleted file mode 100644 index b2dea331ef..0000000000 --- a/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e62fd0eefe8b475e70d87a673a7216aac3bb622f Mon Sep 17 00:00:00 2001 -From: Markus Volk -Date: Mon, 20 Nov 2023 17:49:59 +0100 -Subject: [PATCH] patch src_decoder_plugins_FfmpegIo.cxx - -Signed-off-by: Markus Volk -Upstream-Status: Pending [https://github.com/MusicPlayerDaemon/MPD/issues/1898] ---- - src/decoder/plugins/FfmpegIo.cxx | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/decoder/plugins/FfmpegIo.cxx b/src/decoder/plugins/FfmpegIo.cxx -index 572f1a86a..3e2347fec 100644 ---- a/src/decoder/plugins/FfmpegIo.cxx -+++ b/src/decoder/plugins/FfmpegIo.cxx -@@ -25,6 +25,7 @@ - #include "input/InputStream.hxx" - - extern "C" { -+#include - #include - } - --- -2.42.0 - diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.15.bb similarity index 96% rename from meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb rename to meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.15.bb index 33155da7d2..f066c405f1 100644 --- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb +++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.15.bb @@ -18,14 +18,19 @@ DEPENDS += " \ fmt \ " +PV .= "+git" SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=master;protocol=https \ - file://0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch \ file://mpd.conf.in \ " -SRCREV = "feac1a3f56591ccfb00870aba66c9ac3abac4773" +SRCREV = "965c466e9bda262790e76edd5272e9e74b407ff3" S = "${WORKDIR}/git" -EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)}" +EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)} \ + -Dadplug=disabled \ + -Dsndio=disabled \ + -Dshine=disabled \ + -Dtremor=disabled \ +" PACKAGECONFIG ??= "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "aac", "", d)} \ alsa ao bzip2 daemon \