diff mbox series

[meta-oe,2/3] libplacebo: dont use gitsm

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

Commit Message

Markus Volk Oct. 13, 2024, 8:34 p.m. UTC 
- Add PACKAGECONFIGs to allow build according to DISTRO_FEATURES
- Add path to vulkan-registry

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../mplayer/libplacebo_7.349.0.bb             | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

Comments

Khem Raj Oct. 14, 2024, 5:57 a.m. UTC | #1 
I think we can not shun using submods for fetching the needed modules.
It ends up with build time errors since it can not find fastfloat now,
and errors out with clang

https://errors.yoctoproject.org/Errors/Details/809534/

On Sun, Oct 13, 2024 at 1:41 PM Markus Volk via lists.openembedded.org
<f_l_k=t-online.de@lists.openembedded.org> wrote:
>
> - Add PACKAGECONFIGs to allow build according to DISTRO_FEATURES
> - Add path to vulkan-registry
>
> Signed-off-by: Markus Volk <f_l_k@t-online.de>
> ---
>  .../mplayer/libplacebo_7.349.0.bb             | 25 +++++++++----------
>  1 file changed, 12 insertions(+), 13 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..26e946370 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,21 @@
>  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"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=435ed639f84d4585d93824e7da3d85da"
>
> -SRC_URI = "gitsm://github.com/haasn/libplacebo;protocol=https;branch=master"
> +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)}"
> +
> +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 (#112842): https://lists.openembedded.org/g/openembedded-devel/message/112842
> Mute This Topic: https://lists.openembedded.org/mt/108989872/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Markus Volk Oct. 14, 2024, 11:40 p.m. UTC | #2 
The reason why I'd like to change this is that if libplacebo is built 
with gitsm, mpv fails with gpu-api=vulkan

fastfloat is a header only library but it has support for cmake, so it 
would presumably be easy to add a recipe for it.
If you dont mind i'd like to check out, if that would work with clang

On Sun, Oct 13 2024 at 10:57:07 PM -07:00:00, Khem Raj 
<raj.khem@gmail.com> wrote:
> I think we can not shun using submods for fetching the needed modules.
> It ends up with build time errors since it can not find fastfloat now,
> and errors out with clang
> 
> <https://errors.yoctoproject.org/Errors/Details/809534/>
> 
> On Sun, Oct 13, 2024 at 1:41 PM Markus Volk via 
> lists.openembedded.org
> <f_l_k=t-online.de@lists.openembedded.org 
> <mailto:f_l_k=t-online.de@lists.openembedded.org>> wrote:
>> 
>>  - Add PACKAGECONFIGs to allow build according to DISTRO_FEATURES
>>  - Add path to vulkan-registry
>> 
>>  Signed-off-by: Markus Volk <f_l_k@t-online.de 
>> <mailto:f_l_k@t-online.de>>
>>  ---
>>   .../mplayer/libplacebo_7.349.0.bb             | 25 
>> +++++++++----------
>>   1 file changed, 12 insertions(+), 13 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..26e946370 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,21 @@
>>   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>
>>  +LIC_FILES_CHKSUM = 
>> "file://LICENSE;md5=435ed639f84d4585d93824e7da3d85da" 
>> <file://license;md5=435ed639f84d4585d93824e7da3d85da/>
>> 
>>  -SRC_URI = 
>> "gitsm://github.com/haasn/libplacebo;protocol=https;branch=master"
>>  +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)}"
>>  +
>>  +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 (#112846): 
> <https://lists.openembedded.org/g/openembedded-devel/message/112846>
> Mute This Topic: <https://lists.openembedded.org/mt/108989872/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>]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Khem Raj Oct. 15, 2024, 1:21 a.m. UTC | #3 
On Mon, Oct 14, 2024 at 4:38 PM Markus Volk <f_l_k@t-online.de> wrote:
>
> The reason why I'd like to change this is that if libplacebo is built with gitsm, mpv fails with gpu-api=vulkan
>
> fastfloat is a header only library but it has support for cmake, so it would presumably be easy to add a recipe for it.
> If you dont mind i'd like to check out, if that would work with clang

That would be ok I guess, there are more gnome packages like vte which
could benefit from it eventually.

>
> On Sun, Oct 13 2024 at 10:57:07 PM -07:00:00, Khem Raj <raj.khem@gmail.com> wrote:
>
> I think we can not shun using submods for fetching the needed modules. It ends up with build time errors since it can not find fastfloat now, and errors out with clang https://errors.yoctoproject.org/Errors/Details/809534/ On Sun, Oct 13, 2024 at 1:41 PM Markus Volk via lists.openembedded.org <f_l_k=t-online.de@lists.openembedded.org> wrote:
>
> - Add PACKAGECONFIGs to allow build according to DISTRO_FEATURES - Add path to vulkan-registry Signed-off-by: Markus Volk <f_l_k@t-online.de> --- .../mplayer/libplacebo_7.349.0.bb | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 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..26e946370 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,21 @@ 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" +LIC_FILES_CHKSUM = "file://LICENSE;md5=435ed639f84d4585d93824e7da3d85da" -SRC_URI = "gitsm://github.com/haasn/libplacebo;protocol=https;branch=master" +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)}" + +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 (#112846): https://lists.openembedded.org/g/openembedded-devel/message/112846 Mute This Topic: https://lists.openembedded.org/mt/108989872/3618223 Group Owner: openembedded-devel+owner@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [f_l_k@t-online.de] -=-=-=-=-=-=-=-=-=-=-=-
diff mbox series

Patch

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..26e946370 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,21 @@ 
 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"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=435ed639f84d4585d93824e7da3d85da"
 
-SRC_URI = "gitsm://github.com/haasn/libplacebo;protocol=https;branch=master"
+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)}"
+
+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"