diff mbox series

[11/19] virglrenderer: upgrade 0.10.4 -> 1.0.0

Message ID 20231127101751.3187950-11-alex@linutronix.de
State Accepted, archived
Commit 21ca5d6babc3d668044296b0fbbc3e101f7ce5bd
Headers show
Series [01/19] sstate.bbclass: setscene_depvalid(): do not exclude shadow-native from task dependency resolution | expand

Commit Message

Alexander Kanavin Nov. 27, 2023, 10:17 a.m. UTC
venus (virtual vulkan support) is no longer experimental.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...1-meson.build-use-python3-directly-for-python.patch | 10 +++++-----
 ...{virglrenderer_0.10.4.bb => virglrenderer_1.0.0.bb} |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)
 rename meta/recipes-graphics/virglrenderer/{virglrenderer_0.10.4.bb => virglrenderer_1.0.0.bb} (84%)

Comments

Khem Raj Nov. 29, 2023, 4:22 a.m. UTC | #1
This fails to compile with clang as it finds undefined behavior
similar to vim -
https://github.com/vim/vim/commit/d315cf551f1d15609c4d7cf724e471de55f5cdac

| x86_64-yoe-linux-clang -target x86_64-yoe-linux -m64 -march=core2
-mtune=core2 -msse3 -mfpmath=sse -mlittle-endian --dyld-prefix=/usr
-Qunused-arguments -fstack-protector-strong -O2 -D_F
ORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security
--sysroot=/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/virglrenderer/1.0.0/recipe-sysroot
-Ivtest/virgl_test_serve
r.p -Ivtest -I../git/vtest -I../git/src/gallium/include
-I../git/src/gallium/auxiliary -I../git/src/gallium/auxiliary/util -I.
-I../git -Isrc -I../git/src -I../git/src/venus -I../git/src/d
rm -Isrc/mesa -I../git/src/mesa -I../git/src/mesa/compat
-I../git/src/mesa/pipe -I../git/src/mesa/util
-fdiagnostics-color=always -DNDEBUG -D_FILE_OFFSET_BITS=64 -Wall
-Winvalid-pch -Wextr
a -Wpedantic -std=gnu11 -Werror=implicit-function-declaration
-Werror=missing-prototypes -Werror=pedantic -Wmissing-prototypes
-Werror=incompatible-pointer-types -Werror=int-to-pointer-cas
t -Werror=switch -Wno-overlength-strings
-Wno-missing-field-initializers -fvisibility=hidden -imacros
/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/virglrenderer/1.0.0/build/config.h
-DHAVE_CONFIG_H=1 -O2 -pipe -g -feliminate-unused-debug-types
-fmacro-prefix-map=/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/virglrenderer/1.0.0/git=/usr/src/debug/virglrenderer/1
.0.0 -fdebug-prefix-map=/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/virglrenderer/1.0.0/git=/usr/src/debug/virglrenderer/1.0.0
-fmacro-prefix-map=/mnt/b/yoe/master/build/tmp/work/c
ore2-64-yoe-linux/virglrenderer/1.0.0/build=/usr/src/debug/virglrenderer/1.0.0
-fdebug-prefix-map=/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/virglrenderer/1.0.0/build=/usr/src/deb
ug/virglrenderer/1.0.0
-fdebug-prefix-map=/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/virglrenderer/1.0.0/recipe-sysroot=
-fmacro-prefix-map=/mnt/b/yoe/master/build/tmp/work/core2-
64-yoe-linux/virglrenderer/1.0.0/recipe-sysroot=
-fdebug-prefix-map=/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/virglrenderer/1.0.0/recipe-sysroot-native=
-pthread -MD -MQ vtest/vi
rgl_test_server.p/vtest_server.c.o -MF
vtest/virgl_test_server.p/vtest_server.c.o.d -o
vtest/virgl_test_server.p/vtest_server.c.o -c
../git/vtest/vtest_server.c
| ../git/vtest/vtest_server.c:244:2: error: embedding a directive
within macro arguments has undefined behavior
[-Werror,-Wembedded-directive]
|   244 | #ifdef ENABLE_VENUS
|       |  ^
| ../git/vtest/vtest_server.c:246:2: error: embedding a directive
within macro arguments has undefined behavior
[-Werror,-Wembedded-directive]
|   246 | #endif
|       |  ^
| 2 errors generated.

On Mon, Nov 27, 2023 at 2:18 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> venus (virtual vulkan support) is no longer experimental.
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  ...1-meson.build-use-python3-directly-for-python.patch | 10 +++++-----
>  ...{virglrenderer_0.10.4.bb => virglrenderer_1.0.0.bb} |  8 ++++----
>  2 files changed, 9 insertions(+), 9 deletions(-)
>  rename meta/recipes-graphics/virglrenderer/{virglrenderer_0.10.4.bb => virglrenderer_1.0.0.bb} (84%)
>
> diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-meson.build-use-python3-directly-for-python.patch b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-meson.build-use-python3-directly-for-python.patch
> index 8230ba588b5..06379ee7166 100644
> --- a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-meson.build-use-python3-directly-for-python.patch
> +++ b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-meson.build-use-python3-directly-for-python.patch
> @@ -1,4 +1,4 @@
> -From c853c9e5c44f1b23a15a7ba629ee02f7d8ec23a0 Mon Sep 17 00:00:00 2001
> +From 2afe24fc95dbb89e99df29ccbe73afa835f58202 Mon Sep 17 00:00:00 2001
>  From: Alexander Kanavin <alex.kanavin@gmail.com>
>  Date: Mon, 6 Jan 2020 12:44:42 +0100
>  Subject: [PATCH] meson.build: use 'python3' directly for python
> @@ -14,15 +14,15 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
>  diff --git a/meson.build b/meson.build
> -index 13d95bb..b241eb2 100644
> +index de6d16b5..79cedbf6 100644
>  --- a/meson.build
>  +++ b/meson.build
> -@@ -64,7 +64,7 @@ flags = [
> +@@ -68,7 +68,7 @@ flags = [
>
>   add_project_arguments(cc.get_supported_arguments(flags), language : 'c')
>
>  -prog_python = import('python').find_installation('python3')
>  +prog_python = 'python3'
>
> - libdrm_dep = dependency('libdrm', version : '>=2.4.50')
> - thread_dep = dependency('threads')
> + not_found = dependency('', required: false)
> + libdrm_dep = dependency('libdrm', version : '>=2.4.50', required: get_option('drm').enabled() or get_option('venus'))
> diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_0.10.4.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_1.0.0.bb
> similarity index 84%
> rename from meta/recipes-graphics/virglrenderer/virglrenderer_0.10.4.bb
> rename to meta/recipes-graphics/virglrenderer/virglrenderer_1.0.0.bb
> index f76e7cb1b94..ffe30a9c525 100644
> --- a/meta/recipes-graphics/virglrenderer/virglrenderer_0.10.4.bb
> +++ b/meta/recipes-graphics/virglrenderer/virglrenderer_1.0.0.bb
> @@ -9,8 +9,8 @@ LICENSE = "MIT"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10"
>
>  DEPENDS = "libdrm libepoxy virtual/egl virtual/libgbm"
> -SRCREV = "88b9fe3bfc64b23a701e4875006dbc0e769f14f6"
> -SRC_URI = "git://gitlab.freedesktop.org/virgl/virglrenderer.git;branch=master;protocol=https \
> +SRCREV = "9c9d55ecbe502e0d71ee99529709efcca69aac42"
> +SRC_URI = "git://gitlab.freedesktop.org/virgl/virglrenderer.git;branch=main;protocol=https \
>             file://0001-meson.build-use-python3-directly-for-python.patch \
>             "
>
> @@ -18,9 +18,9 @@ S = "${WORKDIR}/git"
>
>  inherit meson pkgconfig features_check
>
> -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'venus-experimental', '', d)}"
> +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'venus', '', d)}"
>
> -PACKAGECONFIG[venus-experimental] = "-Dvenus-experimental=true,-Dvenus-experimental=false,vulkan-loader vulkan-headers"
> +PACKAGECONFIG[venus] = "-Dvenus=true,-Dvenus=false,vulkan-loader vulkan-headers"
>  PACKAGECONFIG[va] = "-Dvideo=true,-Dvideo=false,libva"
>  PACKAGECONFIG[render-server] = "-Drender-server=true,-Drender-server=false"
>  PACKAGECONFIG[drm-msm-experimental] = "-Ddrm-msm-experimental=true,-Ddrm-msm-experimental=false"
> --
> 2.39.2
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#191278): https://lists.openembedded.org/g/openembedded-core/message/191278
> Mute This Topic: https://lists.openembedded.org/mt/102826378/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-meson.build-use-python3-directly-for-python.patch b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-meson.build-use-python3-directly-for-python.patch
index 8230ba588b5..06379ee7166 100644
--- a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-meson.build-use-python3-directly-for-python.patch
+++ b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-meson.build-use-python3-directly-for-python.patch
@@ -1,4 +1,4 @@ 
-From c853c9e5c44f1b23a15a7ba629ee02f7d8ec23a0 Mon Sep 17 00:00:00 2001
+From 2afe24fc95dbb89e99df29ccbe73afa835f58202 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Mon, 6 Jan 2020 12:44:42 +0100
 Subject: [PATCH] meson.build: use 'python3' directly for python
@@ -14,15 +14,15 @@  Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index 13d95bb..b241eb2 100644
+index de6d16b5..79cedbf6 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -64,7 +64,7 @@ flags = [
+@@ -68,7 +68,7 @@ flags = [
  
  add_project_arguments(cc.get_supported_arguments(flags), language : 'c')
  
 -prog_python = import('python').find_installation('python3')
 +prog_python = 'python3'
  
- libdrm_dep = dependency('libdrm', version : '>=2.4.50')
- thread_dep = dependency('threads')
+ not_found = dependency('', required: false)
+ libdrm_dep = dependency('libdrm', version : '>=2.4.50', required: get_option('drm').enabled() or get_option('venus'))
diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_0.10.4.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_1.0.0.bb
similarity index 84%
rename from meta/recipes-graphics/virglrenderer/virglrenderer_0.10.4.bb
rename to meta/recipes-graphics/virglrenderer/virglrenderer_1.0.0.bb
index f76e7cb1b94..ffe30a9c525 100644
--- a/meta/recipes-graphics/virglrenderer/virglrenderer_0.10.4.bb
+++ b/meta/recipes-graphics/virglrenderer/virglrenderer_1.0.0.bb
@@ -9,8 +9,8 @@  LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10"
 
 DEPENDS = "libdrm libepoxy virtual/egl virtual/libgbm"
-SRCREV = "88b9fe3bfc64b23a701e4875006dbc0e769f14f6"
-SRC_URI = "git://gitlab.freedesktop.org/virgl/virglrenderer.git;branch=master;protocol=https \
+SRCREV = "9c9d55ecbe502e0d71ee99529709efcca69aac42"
+SRC_URI = "git://gitlab.freedesktop.org/virgl/virglrenderer.git;branch=main;protocol=https \
            file://0001-meson.build-use-python3-directly-for-python.patch \
            "
 
@@ -18,9 +18,9 @@  S = "${WORKDIR}/git"
 
 inherit meson pkgconfig features_check
 
-PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'venus-experimental', '', d)}"
+PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'venus', '', d)}"
 
-PACKAGECONFIG[venus-experimental] = "-Dvenus-experimental=true,-Dvenus-experimental=false,vulkan-loader vulkan-headers"
+PACKAGECONFIG[venus] = "-Dvenus=true,-Dvenus=false,vulkan-loader vulkan-headers"
 PACKAGECONFIG[va] = "-Dvideo=true,-Dvideo=false,libva"
 PACKAGECONFIG[render-server] = "-Drender-server=true,-Drender-server=false"
 PACKAGECONFIG[drm-msm-experimental] = "-Ddrm-msm-experimental=true,-Ddrm-msm-experimental=false"