[meta-networking][PATCH 1/3] libcacard: set meson version based on PV

[meta-networking][PATCH 1/3] libcacard: set meson version based on PV

[Markus Volk]

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../0001-meson.build-set-hardcoded-version-string.patch       | 2 +-
 meta-networking/recipes-support/spice/libcacard_2.8.1.bb      | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta-networking/recipes-support/spice/libcacard/0001-meson.build-set-hardcoded-version-string.patch b/meta-networking/recipes-support/spice/libcacard/0001-meson.build-set-hardcoded-version-string.patch
index b9d31c458..68b900577 100644
--- a/meta-networking/recipes-support/spice/libcacard/0001-meson.build-set-hardcoded-version-string.patch
+++ b/meta-networking/recipes-support/spice/libcacard/0001-meson.build-set-hardcoded-version-string.patch
@@ -25,7 +25,7 @@ index 9cfe248..00745e5 100644
 @@ -1,5 +1,5 @@
  project('libcacard', 'c', 'cpp',
 -  version: run_command('build-aux/git-version-gen', '@0@/.tarball-version'.format(meson.source_root()), check: true).stdout().strip(),
-+  version: '2.8.1',
++  version: '@version@',
    license: 'LGPLv2.1',
    default_options: ['warning_level=2'],
  )
diff --git a/meta-networking/recipes-support/spice/libcacard_2.8.1.bb b/meta-networking/recipes-support/spice/libcacard_2.8.1.bb
index 44cccba9d..77bd72dd3 100644
--- a/meta-networking/recipes-support/spice/libcacard_2.8.1.bb
+++ b/meta-networking/recipes-support/spice/libcacard_2.8.1.bb
@@ -14,3 +14,7 @@ SRC_URI = " \
 S = "${WORKDIR}/git"
 
 inherit meson pkgconfig
+
+do_configure:prepend() {
+    sed -i "s|@version@|${PV}|" ${S}/meson.build
+}
-- 
2.42.1

[meta-networking][PATCH 2/3] spice: Set meson version based on PV

[Markus Volk]

This fixes:
| Dependency spice-server found: NO found UNKNOWN but need: '>=0.14.0'
| Run-time dependency spice-server found: NO
|
| ../qemu-8.1.2/meson.build:1038:10: ERROR: Dependency lookup for spice-server
with method 'pkgconfig' failed: Invalid version, need 'spice-server'
['>=0.14.0'] found 'UNKNOWN'.

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 ...n.build-set-hardcoded-version-string.patch | 26 +++++++++++++++++++
 .../recipes-support/spice/spice_git.bb        | 10 ++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 meta-networking/recipes-support/spice/spice/0001-meson.build-set-hardcoded-version-string.patch

diff --git a/meta-networking/recipes-support/spice/spice/0001-meson.build-set-hardcoded-version-string.patch b/meta-networking/recipes-support/spice/spice/0001-meson.build-set-hardcoded-version-string.patch
new file mode 100644
index 000000000..6717dec16
--- /dev/null
+++ b/meta-networking/recipes-support/spice/spice/0001-meson.build-set-hardcoded-version-string.patch
@@ -0,0 +1,26 @@
+From dd85d2ad3295f759176c73b9be527276b41a2ea5 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Mon, 27 Nov 2023 20:08:39 +0100
+Subject: [PATCH] meson.build: Set hardcoded version string
+
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index ab05fa5a..f65f7a4f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -2,7 +2,7 @@
+ # project definition
+ #
+ project('spice', 'c', 'cpp',
+-        version : run_command('build-aux/git-version-gen', meson.source_root() + '/.tarball-version', check : true).stdout().strip(),
++        version : '@version@',
+         license : 'LGPLv2.1',
+         meson_version : '>= 0.49',
+         default_options : ['buildtype=debugoptimized',
+-- 
+2.42.0
+
diff --git a/meta-networking/recipes-support/spice/spice_git.bb b/meta-networking/recipes-support/spice/spice_git.bb
index a1f3010dd..9596265ba 100644
--- a/meta-networking/recipes-support/spice/spice_git.bb
+++ b/meta-networking/recipes-support/spice/spice_git.bb
@@ -17,7 +17,10 @@ PV = "0.15.2"
 
 SRCREV = "0c2c1413a8b387ea597a95b6c867470a7c56c8ab"
 
-SRC_URI = "gitsm://gitlab.freedesktop.org/spice/spice;branch=master;protocol=https"
+SRC_URI = " \
+    gitsm://gitlab.freedesktop.org/spice/spice;branch=master;protocol=https \
+    file://0001-meson.build-set-hardcoded-version-string.patch \
+"
 
 S = "${WORKDIR}/git"
 
@@ -30,6 +33,11 @@ DEPENDS:append:class-nativesdk = " nativesdk-openssl"
 
 export PYTHON="${STAGING_BINDIR_NATIVE}/python3-native/python3"
 
+
+do_configure:prepend() {
+    sed -i "s|@version@|${PV}|" ${S}/meson.build
+}
+
 PACKAGECONFIG:class-native = ""
 PACKAGECONFIG:class-nativesdk = ""
 PACKAGECONFIG ?= "sasl opus smartcard gstreamer"
-- 
2.42.1

Re: [oe] [meta-networking][PATCH 2/3] spice: Set meson version based on PV

[Ross Burton]

On 29 Nov 2023, at 19:42, Markus Volk via lists.openembedded.org <f_l_k=t-online.de@lists.openembedded.org> wrote:
> + project('spice', 'c', 'cpp',
> +-        version : run_command('build-aux/git-version-gen', meson.source_root() + '/.tarball-version', check : true).stdout().strip(),
> ++        version : '@version@',

https://gitlab.freedesktop.org/spice/spice/-/blob/master/build-aux/git-version-gen?ref_type=heads suggests that a better solution would be to just:

do_configure:prepend() {
	echo ${PV} > ${S}/.tarball-version
}

Ross

Re: [oe] [meta-networking][PATCH 2/3] spice: Set meson version based on PV

[Khem Raj]

On Wed, Nov 29, 2023 at 12:26 PM Ross Burton <ross.burton@arm.com> wrote:
>
> On 29 Nov 2023, at 19:42, Markus Volk via lists.openembedded.org <f_l_k=t-online.de@lists.openembedded.org> wrote:
> > + project('spice', 'c', 'cpp',
> > +-        version : run_command('build-aux/git-version-gen', meson.source_root() + '/.tarball-version', check : true).stdout().strip(),
> > ++        version : '@version@',
>
> https://gitlab.freedesktop.org/spice/spice/-/blob/master/build-aux/git-version-gen?ref_type=heads suggests that a better solution would be to just:
>
> do_configure:prepend() {
>         echo ${PV} > ${S}/.tarball-version
> }
>

I would agree, this is better.

> Ross
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#107149): https://lists.openembedded.org/g/openembedded-devel/message/107149
> Mute This Topic: https://lists.openembedded.org/mt/102879462/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Re: [oe] [meta-networking][PATCH 2/3] spice: Set meson version based on PV

[Markus Volk]

[-- Attachment #1: Type: text/plain, Size: 126 bytes --]

On Wed, Nov 29 2023 at 04:52:21 PM -08:00:00, Khem Raj 
<raj.khem@gmail.com> wrote:
> I would agree, this is better.

indeed


[-- Attachment #2: Type: text/html, Size: 293 bytes --]