diff options
| -rw-r--r-- | meta-networking/recipes-support/spice/libcacard/0001-meson.build-set-hardcoded-version-string.patch | 34 | ||||
| -rw-r--r-- | meta-networking/recipes-support/spice/libcacard_2.8.1.bb | 5 |
2 files changed, 38 insertions, 1 deletions
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 new file mode 100644 index 0000000000..b9d31c4584 --- /dev/null +++ b/meta-networking/recipes-support/spice/libcacard/0001-meson.build-set-hardcoded-version-string.patch | |||
| @@ -0,0 +1,34 @@ | |||
| 1 | From dbfc08b9dc879e21bfacbd153948d21db36d50cd Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Markus Volk <f_l_k@t-online.de> | ||
| 3 | Date: Thu, 23 Nov 2023 13:20:40 +0100 | ||
| 4 | Subject: [PATCH] meson.build: set hardcoded version string | ||
| 5 | |||
| 6 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
| 7 | |||
| 8 | This fixes version string in the pkgconfig file and thus unbreaks spice build | ||
| 9 | | spice-common| Run-time dependency libcacard found: NO | ||
| 10 | | | ||
| 11 | | ../git/subprojects/spice-common/meson.build:144:16: ERROR: Dependency lookup for libcacard with method 'pkgconfig' failed: Invalid version, need 'libcacard' ['>= 2.5.1'] found 'UNKNOWN'. | ||
| 12 | | | ||
| 13 | | A full log can be found at /home/flk/poky/build/tmp/work/corei7-64-poky-linux/spice/0.15.2/build/meson-logs/meson-log.txt | ||
| 14 | | ERROR: meson failed | ||
| 15 | |||
| 16 | Upstream-Status: Inappropriate [oe-specific] | ||
| 17 | --- | ||
| 18 | meson.build | 2 +- | ||
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 20 | |||
| 21 | diff --git a/meson.build b/meson.build | ||
| 22 | index 9cfe248..00745e5 100644 | ||
| 23 | --- a/meson.build | ||
| 24 | +++ b/meson.build | ||
| 25 | @@ -1,5 +1,5 @@ | ||
| 26 | project('libcacard', 'c', 'cpp', | ||
| 27 | - version: run_command('build-aux/git-version-gen', '@0@/.tarball-version'.format(meson.source_root()), check: true).stdout().strip(), | ||
| 28 | + version: '2.8.1', | ||
| 29 | license: 'LGPLv2.1', | ||
| 30 | default_options: ['warning_level=2'], | ||
| 31 | ) | ||
| 32 | -- | ||
| 33 | 2.42.0 | ||
| 34 | |||
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 c81322e680..44cccba9d1 100644 --- a/meta-networking/recipes-support/spice/libcacard_2.8.1.bb +++ b/meta-networking/recipes-support/spice/libcacard_2.8.1.bb | |||
| @@ -6,7 +6,10 @@ DEPENDS = "glib-2.0 pcsc-lite nss" | |||
| 6 | 6 | ||
| 7 | SRCREV = "7b07684ea6698d4885ff2062350ad8798a04de42" | 7 | SRCREV = "7b07684ea6698d4885ff2062350ad8798a04de42" |
| 8 | 8 | ||
| 9 | SRC_URI = "git://gitlab.freedesktop.org/spice/libcacard.git;protocol=https;branch=master" | 9 | SRC_URI = " \ |
| 10 | git://gitlab.freedesktop.org/spice/libcacard.git;protocol=https;branch=master \ | ||
| 11 | file://0001-meson.build-set-hardcoded-version-string.patch \ | ||
| 12 | " | ||
| 10 | 13 | ||
| 11 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
| 12 | 15 | ||
