* [meta-oe][PATCH 1/2] libplacebo: add recipe
@ 2024-01-05 18:36 Markus Volk
2024-01-05 18:36 ` [meta-oe][PATCH 2/2] mpv: upgrade 0.35.1 -> 0.37.0 Markus Volk
2024-01-05 22:42 ` [oe] [meta-oe][PATCH 1/2] libplacebo: add recipe Khem Raj
0 siblings, 2 replies; 4+ messages in thread
From: Markus Volk @ 2024-01-05 18:36 UTC (permalink / raw)
To: openembedded-devel
libplacebo is a required build dependency for mpv-0.37
Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
...001-frame_queue.h-add-frame_duration.patch | 32 +++++++++++++++++++
.../libplacebo/0001-gpu.h-add-stride_w.patch | 30 +++++++++++++++++
.../mplayer/libplacebo_git.bb | 28 ++++++++++++++++
3 files changed, 90 insertions(+)
create mode 100644 meta-oe/recipes-multimedia/mplayer/libplacebo/0001-frame_queue.h-add-frame_duration.patch
create mode 100644 meta-oe/recipes-multimedia/mplayer/libplacebo/0001-gpu.h-add-stride_w.patch
create mode 100644 meta-oe/recipes-multimedia/mplayer/libplacebo_git.bb
diff --git a/meta-oe/recipes-multimedia/mplayer/libplacebo/0001-frame_queue.h-add-frame_duration.patch b/meta-oe/recipes-multimedia/mplayer/libplacebo/0001-frame_queue.h-add-frame_duration.patch
new file mode 100644
index 000000000..5b4ded981
--- /dev/null
+++ b/meta-oe/recipes-multimedia/mplayer/libplacebo/0001-frame_queue.h-add-frame_duration.patch
@@ -0,0 +1,32 @@
+From 8437cd1fa7dc1797d3290c121ca17b39a0d2fd6a Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Tue, 5 Dec 2023 19:49:42 +0100
+Subject: [PATCH] frame_queue.h: add frame_duration
+
+This fixes:
+| [ 87/266] Compiling stream/cookies.c
+| ../git/video/out/vo_gpu_next.c: In function 'draw_frame':
+| ../git/video/out/vo_gpu_next.c:932:14: error: 'struct pl_queue_params' has no member named 'frame_duration'
+| 932 | .frame_duration = frame->ideal_frame_duration,
+| | ^~~~~~~~~~~~~~
+
+---
+ src/include/libplacebo/utils/frame_queue.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/include/libplacebo/utils/frame_queue.h b/src/include/libplacebo/utils/frame_queue.h
+index 2a9c90c3..8afa4355 100644
+--- a/src/include/libplacebo/utils/frame_queue.h
++++ b/src/include/libplacebo/utils/frame_queue.h
+@@ -170,6 +170,8 @@ struct pl_queue_params {
+ // should instead be interpreted by the provided callback.
+ uint64_t timeout;
+
++ const float frame_duration;
++
+ // This callback will be used to pull new frames from the decoder. It may
+ // block if needed. The user is responsible for setting appropriate time
+ // limits and/or returning and interpreting QUEUE_MORE as sensible.
+--
+2.42.1
+
diff --git a/meta-oe/recipes-multimedia/mplayer/libplacebo/0001-gpu.h-add-stride_w.patch b/meta-oe/recipes-multimedia/mplayer/libplacebo/0001-gpu.h-add-stride_w.patch
new file mode 100644
index 000000000..f08e122cf
--- /dev/null
+++ b/meta-oe/recipes-multimedia/mplayer/libplacebo/0001-gpu.h-add-stride_w.patch
@@ -0,0 +1,30 @@
+From fbf74064bbb7133efe9234ef83976f06b3690e88 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Tue, 5 Dec 2023 19:35:51 +0100
+Subject: [PATCH] gpu.h: add stride_w
+
+this fixes:
+| [113/257] Compiling common/codecs.c
+| ../git/video/out/vo_gpu_next.c: In function 'update_overlays':
+| ../git/video/out/vo_gpu_next.c:268:14: error: 'struct pl_tex_transfer_params' has no member named 'stride_w'
+| 268 | .stride_w = item->packed->stride[0] / tex_fmt->texel_size,
+| | ^~~~~~~~
+---
+ src/include/libplacebo/gpu.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/include/libplacebo/gpu.h b/src/include/libplacebo/gpu.h
+index a63fdf7c..57b4f195 100644
+--- a/src/include/libplacebo/gpu.h
++++ b/src/include/libplacebo/gpu.h
+@@ -904,6 +904,7 @@ struct pl_tex_transfer_params {
+
+ // Note: The contents of the memory region / buffer must exactly match the
+ // texture format; i.e. there is no explicit conversion between formats.
++ size_t stride_w; //
+ };
+
+ #define pl_tex_transfer_params(...) (&(struct pl_tex_transfer_params) { __VA_ARGS__ })
+--
+2.42.1
+
diff --git a/meta-oe/recipes-multimedia/mplayer/libplacebo_git.bb b/meta-oe/recipes-multimedia/mplayer/libplacebo_git.bb
new file mode 100644
index 000000000..dd0796782
--- /dev/null
+++ b/meta-oe/recipes-multimedia/mplayer/libplacebo_git.bb
@@ -0,0 +1,28 @@
+SUMMARY = "The core rendering algorithms and ideas of mpv rewritten as an independent library."
+SECTION = "multimedia"
+HOMEPAGE = "https://opensourcelibs.com/lib/libplacebo"
+
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=435ed639f84d4585d93824e7da3d85da"
+
+SRC_URI = " \
+ git://code.videolan.org/videolan/libplacebo.git;protocol=https;branch=v6.338 \
+ file://0001-gpu.h-add-stride_w.patch \
+ file://0001-frame_queue.h-add-frame_duration.patch \
+"
+
+S = "${WORKDIR}/git"
+SRCREV = "2805a0d01c029084ab36bf5d0e3c8742012a0b27"
+PV = "6.338.1"
+
+inherit meson pkgconfig
+
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'vulkan opengl', d)}"
+
+PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-loader vulkan-headers shaderc spirv-shader-generator python3-mako-native python3-jinja2-native glad-native"
+PACKAGECONFIG[opengl] = "-Dopengl=enabled,-Dopengl=disabled,glad,glad"
+PACKAGECONFIG[lcms] = "-Dlcms=enabled,-Dlcms=disabled,lcms"
+PACKAGECONFIG[demos] = "-Ddemos=true,-Ddemos=false,ffmpeg libsdl2 libsdl2-image"
+
+EXTRA_OEMESON = "-Dvulkan-registry=${STAGING_DATADIR}/vulkan/registry/vk.xml"
+
--
2.43.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [meta-oe][PATCH 2/2] mpv: upgrade 0.35.1 -> 0.37.0
2024-01-05 18:36 [meta-oe][PATCH 1/2] libplacebo: add recipe Markus Volk
@ 2024-01-05 18:36 ` Markus Volk
2024-01-05 22:42 ` [oe] [meta-oe][PATCH 1/2] libplacebo: add recipe Khem Raj
1 sibling, 0 replies; 4+ messages in thread
From: Markus Volk @ 2024-01-05 18:36 UTC (permalink / raw)
To: openembedded-devel
- switch buildsystem from waf to meson
- add libplacebo dependency
- add vulkan support
- build libmpv (needed eg. for mpvpaper)
Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
.../recipes-multimedia/mplayer/mpv_0.35.1.bb | 116 ------------------
.../recipes-multimedia/mplayer/mpv_0.37.0.bb | 97 +++++++++++++++
2 files changed, 97 insertions(+), 116 deletions(-)
delete mode 100644 meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb
create mode 100644 meta-oe/recipes-multimedia/mplayer/mpv_0.37.0.bb
diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb
deleted file mode 100644
index 0f50a6e8f..000000000
--- a/meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb
+++ /dev/null
@@ -1,116 +0,0 @@
-SUMMARY = "Open Source multimedia player"
-DESCRIPTION = "mpv is a fork of mplayer2 and MPlayer. It shares some features with the former projects while introducing many more."
-SECTION = "multimedia"
-HOMEPAGE = "http://www.mpv.io/"
-
-DEPENDS = " \
- zlib \
- ffmpeg \
- jpeg \
- libv4l \
- libass \
-"
-
-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 \
- "
-SRC_URI[waf.sha256sum] = "21199cd220ccf60434133e1fd2ab8c8e5217c3799199c82722543970dc8e38d5"
-
-S = "${WORKDIR}/git"
-
-inherit waf pkgconfig mime-xdg
-
-LDFLAGS:append:riscv64 = " -latomic"
-
-LUA ?= "lua"
-LUA:mips64 = ""
-LUA:powerpc64 = ""
-LUA:powerpc64le = ""
-LUA:riscv64 = ""
-LUA:riscv32 = ""
-LUA:powerpc = ""
-
-# Note: lua is required to get on-screen-display (controls)
-PACKAGECONFIG ??= " \
- ${LUA} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \
- ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \
- ${@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"
-
-python __anonymous() {
- packageconfig = (d.getVar("PACKAGECONFIG") or "").split()
- extras = []
- if "x11" in packageconfig and "opengl" in packageconfig:
- extras.append(" --enable-gl-x11")
- if "x11" in packageconfig and "egl" in packageconfig:
- extras.append(" --enable-egl-x11")
- if "egl" in packageconfig and "drm" in packageconfig:
- extras.append(" --enable-egl-drm")
- if "vaapi" in packageconfig and "x11" in packageconfig:
- extras.append(" --enable-vaapi-x11")
- if "vaapi" in packageconfig and "drm" in packageconfig:
- extras.append(" --enable-vaapi-drm")
- if "vaapi" in packageconfig and "x11" in packageconfig and "egl" in packageconfig:
- extras.append(" --enable-vaapi-x-egl")
- if "vdpau" in packageconfig and "opengl" in packageconfig and "x11" in packageconfig:
- extras.append(" --enable-vdpau-gl-x11")
- if "wayland" in packageconfig and "opengl" in packageconfig:
- extras.append(" --enable-gl-wayland")
- if "wayland" in packageconfig and "vaapi" in packageconfig:
- extras.append(" --enable-vaapi-wayland")
- if extras:
- d.appendVar("EXTRA_OECONF", "".join(extras))
-}
-
-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 \
- ${PACKAGECONFIG_CONFARGS} \
-"
-
-do_configure:append() {
- sed -i -e 's#${WORKDIR}#<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 \
- ${datadir}/bash-completion \
- ${datadir}/metainfo \
- "
-EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "0", "1", d)}"
diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.37.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.37.0.bb
new file mode 100644
index 000000000..e6e74dbd5
--- /dev/null
+++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.37.0.bb
@@ -0,0 +1,97 @@
+SUMMARY = "Open Source multimedia player"
+DESCRIPTION = "mpv is a fork of mplayer2 and MPlayer. It shares some features with the former projects while introducing many more."
+SECTION = "multimedia"
+HOMEPAGE = "http://www.mpv.io/"
+
+DEPENDS = " \
+ alsa-lib \
+ ffmpeg \
+ libdrm \
+ libass \
+ libplacebo \
+"
+
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+SRCREV = "140ec21c89d671d392877a7f3b91d67e7d7b9239"
+SRC_URI = "git://github.com/mpv-player/mpv;name=mpv;branch=release/0.35;protocol=https"
+
+S = "${WORKDIR}/git"
+
+inherit meson pkgconfig mime-xdg
+
+LDFLAGS:append:riscv64 = " -latomic"
+
+LUA ?= "lua"
+LUA:mips64 = ""
+LUA:powerpc64 = ""
+LUA:powerpc64le = ""
+LUA:riscv64 = ""
+LUA:riscv32 = ""
+LUA:powerpc = ""
+
+# Note: lua is required to get on-screen-display (controls)
+PACKAGECONFIG ??= " \
+ ${LUA} \
+ drm \
+ vaapi \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'egl', '', d)} \
+ ${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland opengl pipewire pulseaudio vulkan', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland x11', 'gbm', '', d)} \
+"
+
+PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=disabled,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=enabled,-Dlua=disabled,luajit"
+PACKAGECONFIG[libarchive] = "-Dlibarchive=enabled,-Dlibarchive=disabled,libarchive"
+PACKAGECONFIG[jack] = "-Djack=enabled, -Djack=disabled, jack"
+PACKAGECONFIG[vaapi] = "-Dvaapi=enabled,-Dvaapi=disabled,libva"
+PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled,shaderc "
+PACKAGECONFIG[vdpau] = "-Dvdpau=enabled,-Dvdpau=disabled,libvdpau"
+PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,wayland wayland-native libxkbcommon"
+PACKAGECONFIG[pipewire] = "-Dpipewire=enabled,-Dpipewire=disabled,pipewire"
+PACKAGECONFIG[pulseaudio] = "-Dpulse=enabled,-Dpulse=disabled,pulseaudio"
+
+python __anonymous() {
+ packageconfig = (d.getVar("PACKAGECONFIG") or "").split()
+ extras = []
+ if "x11" in packageconfig and "opengl" in packageconfig:
+ extras.append(" -Dgl-x11=enabled")
+ if "x11" in packageconfig and "egl" in packageconfig:
+ extras.append(" -Degl-x11=enabled")
+ if "egl" in packageconfig and "drm" in packageconfig:
+ extras.append(" -Degl-drm=enabled")
+ if "vaapi" in packageconfig and "x11" in packageconfig:
+ extras.append(" -Dvaapi-x11=enabled")
+ if "vaapi" in packageconfig and "drm" in packageconfig:
+ extras.append(" -Dvaapi-drm=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")
+ if "wayland" in packageconfig and "vaapi" in packageconfig:
+ extras.append(" -Dvaapi-wayland=enabled")
+}
+
+SIMPLE_TARGET_SYS = "${@'${TARGET_SYS}'.replace('${TARGET_VENDOR}', '')}"
+
+EXTRA_OEMESON = " \
+ -Dmanpage-build=disabled \
+ -Dlibbluray=disabled \
+ -Dlibmpv=true \
+ -Ddvdnav=disabled \
+ -Dcdda=disabled \
+ -Duchardet=disabled \
+ -Drubberband=disabled \
+ -Dlcms2=disabled \
+ -Dvapoursynth=disabled \
+ ${PACKAGECONFIG_CONFARGS} \
+"
+
+FILES:${PN} += "${datadir}"
+EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "0", "1", d)}"
--
2.43.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [oe] [meta-oe][PATCH 1/2] libplacebo: add recipe
2024-01-05 18:36 [meta-oe][PATCH 1/2] libplacebo: add recipe Markus Volk
2024-01-05 18:36 ` [meta-oe][PATCH 2/2] mpv: upgrade 0.35.1 -> 0.37.0 Markus Volk
@ 2024-01-05 22:42 ` Khem Raj
2024-01-06 6:47 ` Markus Volk
1 sibling, 1 reply; 4+ messages in thread
From: Khem Raj @ 2024-01-05 22:42 UTC (permalink / raw)
To: Markus Volk; +Cc: openembedded-devel
On Fri, Jan 5, 2024 at 10:37 AM Markus Volk <f_l_k@t-online.de> wrote:
>
> libplacebo is a required build dependency for mpv-0.37
>
> Signed-off-by: Markus Volk <f_l_k@t-online.de>
> ---
> ...001-frame_queue.h-add-frame_duration.patch | 32 +++++++++++++++++++
> .../libplacebo/0001-gpu.h-add-stride_w.patch | 30 +++++++++++++++++
> .../mplayer/libplacebo_git.bb | 28 ++++++++++++++++
> 3 files changed, 90 insertions(+)
> create mode 100644 meta-oe/recipes-multimedia/mplayer/libplacebo/0001-frame_queue.h-add-frame_duration.patch
> create mode 100644 meta-oe/recipes-multimedia/mplayer/libplacebo/0001-gpu.h-add-stride_w.patch
> create mode 100644 meta-oe/recipes-multimedia/mplayer/libplacebo_git.bb
>
> diff --git a/meta-oe/recipes-multimedia/mplayer/libplacebo/0001-frame_queue.h-add-frame_duration.patch b/meta-oe/recipes-multimedia/mplayer/libplacebo/0001-frame_queue.h-add-frame_duration.patch
> new file mode 100644
> index 000000000..5b4ded981
> --- /dev/null
> +++ b/meta-oe/recipes-multimedia/mplayer/libplacebo/0001-frame_queue.h-add-frame_duration.patch
> @@ -0,0 +1,32 @@
> +From 8437cd1fa7dc1797d3290c121ca17b39a0d2fd6a Mon Sep 17 00:00:00 2001
> +From: Markus Volk <f_l_k@t-online.de>
> +Date: Tue, 5 Dec 2023 19:49:42 +0100
> +Subject: [PATCH] frame_queue.h: add frame_duration
> +
> +This fixes:
> +| [ 87/266] Compiling stream/cookies.c
> +| ../git/video/out/vo_gpu_next.c: In function 'draw_frame':
> +| ../git/video/out/vo_gpu_next.c:932:14: error: 'struct pl_queue_params' has no member named 'frame_duration'
> +| 932 | .frame_duration = frame->ideal_frame_duration,
> +| | ^~~~~~~~~~~~~~
> +
> +---
> + src/include/libplacebo/utils/frame_queue.h | 2 ++
> + 1 file changed, 2 insertions(+)
> +
> +diff --git a/src/include/libplacebo/utils/frame_queue.h b/src/include/libplacebo/utils/frame_queue.h
> +index 2a9c90c3..8afa4355 100644
> +--- a/src/include/libplacebo/utils/frame_queue.h
> ++++ b/src/include/libplacebo/utils/frame_queue.h
> +@@ -170,6 +170,8 @@ struct pl_queue_params {
> + // should instead be interpreted by the provided callback.
> + uint64_t timeout;
> +
> ++ const float frame_duration;
> ++
> + // This callback will be used to pull new frames from the decoder. It may
> + // block if needed. The user is responsible for setting appropriate time
> + // limits and/or returning and interpreting QUEUE_MORE as sensible.
> +--
> +2.42.1
> +
> diff --git a/meta-oe/recipes-multimedia/mplayer/libplacebo/0001-gpu.h-add-stride_w.patch b/meta-oe/recipes-multimedia/mplayer/libplacebo/0001-gpu.h-add-stride_w.patch
> new file mode 100644
> index 000000000..f08e122cf
> --- /dev/null
> +++ b/meta-oe/recipes-multimedia/mplayer/libplacebo/0001-gpu.h-add-stride_w.patch
> @@ -0,0 +1,30 @@
> +From fbf74064bbb7133efe9234ef83976f06b3690e88 Mon Sep 17 00:00:00 2001
> +From: Markus Volk <f_l_k@t-online.de>
> +Date: Tue, 5 Dec 2023 19:35:51 +0100
> +Subject: [PATCH] gpu.h: add stride_w
> +
> +this fixes:
> +| [113/257] Compiling common/codecs.c
> +| ../git/video/out/vo_gpu_next.c: In function 'update_overlays':
> +| ../git/video/out/vo_gpu_next.c:268:14: error: 'struct pl_tex_transfer_params' has no member named 'stride_w'
> +| 268 | .stride_w = item->packed->stride[0] / tex_fmt->texel_size,
> +| | ^~~~~~~~
> +---
> + src/include/libplacebo/gpu.h | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/src/include/libplacebo/gpu.h b/src/include/libplacebo/gpu.h
> +index a63fdf7c..57b4f195 100644
> +--- a/src/include/libplacebo/gpu.h
> ++++ b/src/include/libplacebo/gpu.h
> +@@ -904,6 +904,7 @@ struct pl_tex_transfer_params {
> +
> + // Note: The contents of the memory region / buffer must exactly match the
> + // texture format; i.e. there is no explicit conversion between formats.
> ++ size_t stride_w; //
> + };
> +
> + #define pl_tex_transfer_params(...) (&(struct pl_tex_transfer_params) { __VA_ARGS__ })
> +--
> +2.42.1
> +
> diff --git a/meta-oe/recipes-multimedia/mplayer/libplacebo_git.bb b/meta-oe/recipes-multimedia/mplayer/libplacebo_git.bb
> new file mode 100644
> index 000000000..dd0796782
> --- /dev/null
> +++ b/meta-oe/recipes-multimedia/mplayer/libplacebo_git.bb
> @@ -0,0 +1,28 @@
> +SUMMARY = "The core rendering algorithms and ideas of mpv rewritten as an independent library."
> +SECTION = "multimedia"
> +HOMEPAGE = "https://opensourcelibs.com/lib/libplacebo"
> +
> +LICENSE = "LGPL-2.1-only"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=435ed639f84d4585d93824e7da3d85da"
> +
> +SRC_URI = " \
> + git://code.videolan.org/videolan/libplacebo.git;protocol=https;branch=v6.338 \
> + file://0001-gpu.h-add-stride_w.patch \
> + file://0001-frame_queue.h-add-frame_duration.patch \
> +"
> +
> +S = "${WORKDIR}/git"
> +SRCREV = "2805a0d01c029084ab36bf5d0e3c8742012a0b27"
> +PV = "6.338.1"
> +
> +inherit meson pkgconfig
> +
> +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'vulkan opengl', d)}"
> +
> +PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-loader vulkan-headers shaderc spirv-shader-generator python3-mako-native python3-jinja2-native glad-native"
> +PACKAGECONFIG[opengl] = "-Dopengl=enabled,-Dopengl=disabled,glad,glad"
glad recipe does not exist in either core or meta-openembedded layers.
stdio: ERROR: Nothing PROVIDES 'glad-native' (but
/home/pokybuild/yocto-worker/meta-oe/build/meta-openembedded/meta-oe/recipes-multimedia/mplayer/libplacebo_git.bb
DEPENDS on or otherwise requires it). Close matches:
> +PACKAGECONFIG[lcms] = "-Dlcms=enabled,-Dlcms=disabled,lcms"
> +PACKAGECONFIG[demos] = "-Ddemos=true,-Ddemos=false,ffmpeg libsdl2 libsdl2-image"
> +
> +EXTRA_OEMESON = "-Dvulkan-registry=${STAGING_DATADIR}/vulkan/registry/vk.xml"
> +
> --
> 2.43.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#108050): https://lists.openembedded.org/g/openembedded-devel/message/108050
> Mute This Topic: https://lists.openembedded.org/mt/103548464/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [oe] [meta-oe][PATCH 1/2] libplacebo: add recipe
2024-01-05 22:42 ` [oe] [meta-oe][PATCH 1/2] libplacebo: add recipe Khem Raj
@ 2024-01-06 6:47 ` Markus Volk
0 siblings, 0 replies; 4+ messages in thread
From: Markus Volk @ 2024-01-06 6:47 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 382 bytes --]
On Fri, Jan 5 2024 at 02:42:51 PM -08:00:00, Khem Raj
<raj.khem@gmail.com> wrote:
> glad recipe does not exist in either core or meta-openembedded layers.
Yes, sorry. I forgot to push the recipe. Now i have sent it and also a
v3 for mpv that adds the hack for config.h again. At first I thought it
was no longer needed but without there still leaks buildpaths into the
binary
[-- Attachment #2: Type: text/html, Size: 546 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-01-06 6:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-05 18:36 [meta-oe][PATCH 1/2] libplacebo: add recipe Markus Volk
2024-01-05 18:36 ` [meta-oe][PATCH 2/2] mpv: upgrade 0.35.1 -> 0.37.0 Markus Volk
2024-01-05 22:42 ` [oe] [meta-oe][PATCH 1/2] libplacebo: add recipe Khem Raj
2024-01-06 6:47 ` Markus Volk
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.