diff mbox series

[meta-oe,PATCHv2,1/2] fastfloat: add recipe

Message ID 20241015003627.1014058-1-f_l_k@t-online.de
State Accepted
Headers show
Series [meta-oe,PATCHv2,1/2] fastfloat: add recipe | expand

Commit Message

Markus Volk Oct. 15, 2024, 12:36 a.m. UTC
fastfloat is needed to compile libplacebo with clang

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../recipes-devtools/fastfloat/fastfloat_5.2.0.bb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 meta-oe/recipes-devtools/fastfloat/fastfloat_5.2.0.bb

Comments

Markus Volk Oct. 15, 2024, 12:38 a.m. UTC | #1
I have successfully built this for Clang

On Tue, Oct 15 2024 at 02:36:27 AM +02:00:00, Markus Volk 
<f_l_k@t-online.de> wrote:
> - Add PACKAGECONFIGs to allow build according to DISTRO_FEATURES
> - Add path to vulkan-registry
> - Add fastfloat dependency for clang
> - Build with lcms by default, because mpv warns about missing 
> littlecms2
>   support
> 
> Signed-off-by: Markus Volk <f_l_k@t-online.de 
> <mailto:f_l_k@t-online.de>>
> ---
>  .../mplayer/libplacebo_7.349.0.bb             | 28 
> +++++++++----------
>  1 file changed, 14 insertions(+), 14 deletions(-)
> 
> diff --git a/meta-oe/recipes-multimedia/mplayer/libplacebo_7.349.0.bb 
> b/meta-oe/recipes-multimedia/mplayer/libplacebo_7.349.0.bb
> index b68e67a8c..f0f18f2e4 100644
> --- a/meta-oe/recipes-multimedia/mplayer/libplacebo_7.349.0.bb
> +++ b/meta-oe/recipes-multimedia/mplayer/libplacebo_7.349.0.bb
> @@ -1,22 +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://license;md5=435ed639f84d4585d93824e7da3d85da/> \
> -                    
> <file://demos/3rdparty/nuklear/src/LICENSE;md5=6052431ae6cd4f0082276c54996e7770> 
> \
> -                    
> file://demos/LICENSE;md5=65d3616852dbf7b1a6d4b53b00626032" 
> <file://demos/LICENSE;md5=65d3616852dbf7b1a6d4b53b00626032>
> +LICENSE = "LGPL-2.1-only"
> +LIC_FILES_CHKSUM = 
> "file://LICENSE;md5=435ed639f84d4585d93824e7da3d85da" 
> <file://license;md5=435ed639f84d4585d93824e7da3d85da/>
> 
> -SRC_URI = 
> "gitsm://github.com/haasn/libplacebo;protocol=https;branch=master"
> +DEPENDS += "fastfloat"
> 
> +SRC_URI = 
> "git://code.videolan.org/videolan/libplacebo.git;protocol=https;branch=v7.349"
>  SRCREV = "1fd3c7bde7b943fe8985c893310b5269a09b46c5"
> 
>  inherit meson pkgconfig
> 
>  S = "${WORKDIR}/git"
> +
> +PACKAGECONFIG ??= "${@bb.utils.filter 
> <mailto:${@bb.utils.filter>('DISTRO_FEATURES', 'vulkan opengl', d)} 
> lcms"
> +
> +PACKAGECONFIG[vulkan] =  
> "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-loader vulkan-headers 
> shaderc spirv-shader-generator python3-mako-native 
> python3-jinja2-native glad-native"
> +PACKAGECONFIG[glslang] = 
> "-Dglslang=enabled,-Dglslang=disabled,glslang"
> +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.47.0
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#112914): 
> <https://lists.openembedded.org/g/openembedded-devel/message/112914>
> Mute This Topic: <https://lists.openembedded.org/mt/109014269/3618223>
> Group Owner: openembedded-devel+owner@lists.openembedded.org 
> <mailto:openembedded-devel+owner@lists.openembedded.org>
> Unsubscribe: 
> <https://lists.openembedded.org/g/openembedded-devel/unsub> 
> [f_l_k@t-online.de <mailto:f_l_k@t-online.de>]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Martin Jansa Oct. 17, 2024, 4:45 p.m. UTC | #2
In world builds I'm now seeing libplacebo failing in do_configure with:

../git/src/opengl/include/glad/meson.build:11:2: ERROR: Problem
encountered: glad (required: >= 2.0, found: none) was not found in
PYTHONPATH or `3rdparty`. Please run `git submodule update --init`
followed by `meson --wipe`.

not sure why but I haven't seen this before this commit (and it seems
a bit random e.g. qemux86 world build failed, but rpi4 didn't but on
different DISTRO rpi4 build failed the same).

On Tue, Oct 15, 2024 at 2:36 AM Markus Volk via lists.openembedded.org
<f_l_k=t-online.de@lists.openembedded.org> wrote:
>
> I have successfully built this for Clang
>
> On Tue, Oct 15 2024 at 02:36:27 AM +02:00:00, Markus Volk <f_l_k@t-online.de> wrote:
>
> - Add PACKAGECONFIGs to allow build according to DISTRO_FEATURES - Add path to vulkan-registry - Add fastfloat dependency for clang - Build with lcms by default, because mpv warns about missing littlecms2 support Signed-off-by: Markus Volk <f_l_k@t-online.de> --- .../mplayer/libplacebo_7.349.0.bb | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/meta-oe/recipes-multimedia/mplayer/libplacebo_7.349.0.bb b/meta-oe/recipes-multimedia/mplayer/libplacebo_7.349.0.bb index b68e67a8c..f0f18f2e4 100644 --- a/meta-oe/recipes-multimedia/mplayer/libplacebo_7.349.0.bb +++ b/meta-oe/recipes-multimedia/mplayer/libplacebo_7.349.0.bb @@ -1,22 +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" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=435ed639f84d4585d93824e7da3d85da" -SRC_URI = "gitsm://github.com/haasn/libplacebo;protocol=https;branch=master" +DEPENDS += "fastfloat" +SRC_URI = "git://code.videolan.org/videolan/libplacebo.git;protocol=https;branch=v7.349" SRCREV = "1fd3c7bde7b943fe8985c893310b5269a09b46c5" inherit meson pkgconfig S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'vulkan opengl', d)} lcms" + +PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-loader vulkan-headers shaderc spirv-shader-generator python3-mako-native python3-jinja2-native glad-native" +PACKAGECONFIG[glslang] = "-Dglslang=enabled,-Dglslang=disabled,glslang" +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.47.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#112915): https://lists.openembedded.org/g/openembedded-devel/message/112915
> Mute This Topic: https://lists.openembedded.org/mt/109014305/3617156
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [martin.jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta-oe/recipes-devtools/fastfloat/fastfloat_5.2.0.bb b/meta-oe/recipes-devtools/fastfloat/fastfloat_5.2.0.bb
new file mode 100644
index 000000000..b121a97b2
--- /dev/null
+++ b/meta-oe/recipes-devtools/fastfloat/fastfloat_5.2.0.bb
@@ -0,0 +1,15 @@ 
+SUMMARY = "fast_float number parsing library: 4x faster than strtod"
+HOMEPAGE = "https://github.com/fastfloat/fast_float"
+LICENSE = "Apache-2.0 & BSL-1.0 & MIT"
+LIC_FILES_CHKSUM = " \
+	file://LICENSE-MIT;md5=32b11d50c7d9788d4270f6a83f3e68eb \
+	file://LICENSE-APACHE;md5=81db248e90379bcfc0582b578b009bc3 \
+	file://LICENSE-BOOST;md5=2c7a3fa82e66676005cd4ee2608fd7d2 \
+"
+
+SRC_URI = "git://github.com/fastfloat/fast_float.git;protocol=https;branch=main"
+
+SRCREV = "2b2395f9ac836ffca6404424bcc252bff7aa80e4"
+S = "${WORKDIR}/git"
+
+inherit cmake