Split force-h264-youtube into its own recipe, built only for boards with cnm-wave-fw. chromium-wrapper checks for the extension directory at runtime before adding --load-extension.
Signed-off-by: Thorsten Lannynd <[email protected]> --- v4: - Add branch and layer to subject line v3: - Separate the extension into its own package and install on boards with Wave5 firmware - Enable extension if extension directory exists v2: - Shorten commit message title .../force_h264.js | 0 .../manifest.json | 0 ...mium-extension-force-h264-youtube_1.0.0.bb | 24 +++++++++++++++++++ .../chromium/chromium-ozone-wayland-arago.inc | 12 ++-------- 4 files changed, 26 insertions(+), 10 deletions(-) rename meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/{chromium/chromium-ozone-wayland/force-h264-youtube => chromium-extension-force-h264-youtube/chromium-extension-force-h264-youtube}/force_h264.js (100%) rename meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/{chromium/chromium-ozone-wayland/force-h264-youtube => chromium-extension-force-h264-youtube/chromium-extension-force-h264-youtube}/manifest.json (100%) create mode 100644 meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-extension-force-h264-youtube/chromium-extension-force-h264-youtube_1.0.0.bb diff --git a/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland/force-h264-youtube/force_h264.js b/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-extension-force-h264-youtube/chromium-extension-force-h264-youtube/force_h264.js similarity index 100% rename from meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland/force-h264-youtube/force_h264.js rename to meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-extension-force-h264-youtube/chromium-extension-force-h264-youtube/force_h264.js diff --git a/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland/force-h264-youtube/manifest.json b/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-extension-force-h264-youtube/chromium-extension-force-h264-youtube/manifest.json similarity index 100% rename from meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland/force-h264-youtube/manifest.json rename to meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-extension-force-h264-youtube/chromium-extension-force-h264-youtube/manifest.json diff --git a/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-extension-force-h264-youtube/chromium-extension-force-h264-youtube_1.0.0.bb b/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-extension-force-h264-youtube/chromium-extension-force-h264-youtube_1.0.0.bb new file mode 100644 index 00000000..16473415 --- /dev/null +++ b/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-extension-force-h264-youtube/chromium-extension-force-h264-youtube_1.0.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "Chromium extension that forces YouTube to use H.264 codec" +LICENSE = "CLOSED" + +python () { + if not bb.utils.contains("MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS", "cnm-wave-fw", True, False, d): + raise bb.parse.SkipRecipe("cnm-wave-fw not in MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS") +} + +RDEPENDS:${PN} = "chromium-ozone-wayland" + +SRC_URI = "file://force_h264.js \ + file://manifest.json \ + " + +EXTENSION_DIR = "${libdir}/chromium/extensions/force-h264-youtube" + +do_install() { + install -d ${D}${EXTENSION_DIR} + install -m 0644 ${WORKDIR}/force_h264.js \ + ${WORKDIR}/manifest.json \ + ${D}${EXTENSION_DIR}/ +} + +FILES:${PN} = "${EXTENSION_DIR}" diff --git a/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-arago.inc b/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-arago.inc index d8eb0204..93c802a6 100644 --- a/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-arago.inc +++ b/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-arago.inc @@ -1,7 +1,5 @@ PR:append = ".arago0" -EXTENSION_DIR = "/usr/lib/chromium/extensions/force-h264-youtube" - FILESEXTRAPATHS:prepend := "${THISDIR}/chromium-ozone-wayland:" PACKAGECONFIG:append = " proprietary-codecs" @@ -11,15 +9,9 @@ SRC_URI:append = " \ file://0002-chromium-gpu-sandbox-Allow-GPU-sandbox-access-to-V4L.patch \ file://0003-chromium-gpu-v4l2-Fix-OUTPUT-queue-streaming-in-V4L2.patch \ file://0004-media-gpu-v4l2-Avoid-placing-incomplete-H264-access-.patch \ - file://force-h264-youtube/force_h264.js \ - file://force-h264-youtube/manifest.json \ " do_install:append() { - install -d ${D}${EXTENSION_DIR} - install -m 0644 ${WORKDIR}/sources/force-h264-youtube/force_h264.js \ - ${WORKDIR}/sources/force-h264-youtube/manifest.json \ - ${D}${EXTENSION_DIR}/ + sed -i "/^CHROME_EXTRA_ARGS=/a [ -d \"${libdir}/chromium/extensions/force-h264-youtube\" ] && CHROME_EXTRA_ARGS=\"\$CHROME_EXTRA_ARGS --load-extension=${libdir}/chromium/extensions/force-h264-youtube\"" \ + ${D}${libdir}/chromium/chromium-wrapper } - -FILES:${PN}:append = " ${EXTENSION_DIR}" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#17703): https://lists.yoctoproject.org/g/meta-arago/message/17703 Mute This Topic: https://lists.yoctoproject.org/mt/121399558/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
