diff options
author | Peter Kjellerstedt <pkj@axis.com> | 2024-04-09 23:08:33 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-04-09 16:38:42 -0700 |
commit | 13c554605557b06ba09e54ce7ecad01a31f0c02d (patch) | |
tree | 48679fa26ed97d9ebde247c5fdce4ffa0a189e17 | |
parent | f61cc5260954e840494194805f6f957f60cd4833 (diff) | |
download | meta-openembedded-13c554605557b06ba09e54ce7ecad01a31f0c02d.tar.gz |
libnice: Update to 0.1.22
Changes since 0.1.21:
* ae3eb16 version 0.1.22
* 4d14e61 tests: Reduce the printing a little to please libxml
* 2de7472 Change padding to be rfc8489 conform
* 69840fa meson: Generate nice-version.h in the right builddir
* f071eb5 interfaces: Avoid using strncpy to keep NULL termination
* 332419e interfaces: Avoid overwriting the ifreq struct
* 2188064 interfaces: Don't iterate allocation
* 952d837 Include TURN sockets in nice_agent_get_sockets()
* d053572 nicesink: Protect field access with object lock
* 504189e ci: Update Windows image to latest
* 245c856 nice: Export nice_address_is_linklocal
* 60db3b6 gitlab-ci: Move Coverity build to Fedora 38
* 4b63250 agent/meson: Replace filename with basename
* f456747 agent: set consent timeout to value specified in RFC 7675
* f3688cf meson: do not build gst test in static mode
* b322577 ci: Remove keyring update for msys2
* 11df9cd ci: Update Windows image to 2022
* 63f4962 Use ifr_ifindex on Linux
* 37f1e24 Use ifr_index to fix build on OpenBSD
* f4e2838 Fix build with clang
* fdbffeb version 0.1.21.1
Move the recipe from meta-oe/recipes-support/farsight to
meta-oe/recipes-support/libnice since there is nothing else in the
farsight directory.
Also remove additions to do_configure() and do_compile() that have not
been needed since the switch to Meson.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-support/farsight/libnice/0001-agent-meson-Replace-filename-with-basename.patch | 40 | ||||
-rw-r--r-- | meta-oe/recipes-support/libnice/libnice_0.1.22.bb (renamed from meta-oe/recipes-support/farsight/libnice_0.1.21.bb) | 20 |
2 files changed, 3 insertions, 57 deletions
diff --git a/meta-oe/recipes-support/farsight/libnice/0001-agent-meson-Replace-filename-with-basename.patch b/meta-oe/recipes-support/farsight/libnice/0001-agent-meson-Replace-filename-with-basename.patch deleted file mode 100644 index 897de4a6c..000000000 --- a/meta-oe/recipes-support/farsight/libnice/0001-agent-meson-Replace-filename-with-basename.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From 7c510cd20bb443064ab4a0d2c6d917e807b2671b Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 22 May 2023 19:45:28 -0700 | ||
4 | Subject: [PATCH] agent/meson: Replace filename with basename | ||
5 | |||
6 | This avoids emitting absolute paths into generated sourcecode, it | ||
7 | improves reproducibility. See [1] | ||
8 | |||
9 | [1] https://developer-old.gnome.org/gobject/stable/glib-mkenums.html | ||
10 | |||
11 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/libnice/libnice/-/merge_requests/258] | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | agent/meson.build | 4 ++-- | ||
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/agent/meson.build b/agent/meson.build | ||
18 | index 2e5b272..44fcd6b 100644 | ||
19 | --- a/agent/meson.build | ||
20 | +++ b/agent/meson.build | ||
21 | @@ -29,14 +29,14 @@ gnome = import('gnome') | ||
22 | |||
23 | agent_enum_types_c = gnome.mkenums('agent-enum-types.c', sources : agent_headers, | ||
24 | fhead: '#include <config.h>\n#include <glib-object.h>\n#include "agent.h"\n#include "pseudotcp.h"\n#include "agent-enum-types.h"', | ||
25 | - fprod: '\n/* enumerations from "@filename@" */', | ||
26 | + fprod: '\n/* enumerations from "@basename@" */', | ||
27 | vhead: 'GType\n@enum_name@_get_type (void)\n{\n static GType type = 0;\n if (!type) {\n static const G@Type@Value values[] = {', | ||
28 | vprod: ' { @VALUENAME@, "@VALUENAME@", "@valuenick@" },', | ||
29 | vtail: ' { 0, NULL, NULL }\n };\n type = g_@type@_register_static ("@EnumName@", values);\n }\n return type;\n}\n\n') | ||
30 | |||
31 | agent_enum_types_h = gnome.mkenums('agent-enum-types.h', sources : agent_headers, | ||
32 | fhead: '#ifndef __AGENT_ENUM_TYPES_H__\n#define __AGENT_ENUM_TYPES_H__ 1\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n', | ||
33 | - fprod: '/* enumerations from "@filename@" */\n', | ||
34 | + fprod: '/* enumerations from "@basename@" */\n', | ||
35 | vhead: 'GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define NICE_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n', | ||
36 | ftail: 'G_END_DECLS\n\n#endif /* !AGENT_ENUM_TYPES_H */') | ||
37 | |||
38 | -- | ||
39 | 2.40.1 | ||
40 | |||
diff --git a/meta-oe/recipes-support/farsight/libnice_0.1.21.bb b/meta-oe/recipes-support/libnice/libnice_0.1.22.bb index 646dcb28c..175e10fdf 100644 --- a/meta-oe/recipes-support/farsight/libnice_0.1.21.bb +++ b/meta-oe/recipes-support/libnice/libnice_0.1.22.bb | |||
@@ -8,9 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9c42325015702feda4f4d2f19a55b767 \ | |||
8 | file://COPYING.MPL;md5=3c617710e51cdbe0fc00716f056dfb1a \ | 8 | file://COPYING.MPL;md5=3c617710e51cdbe0fc00716f056dfb1a \ |
9 | " | 9 | " |
10 | 10 | ||
11 | SRC_URI = "http://nice.freedesktop.org/releases/libnice-${PV}.tar.gz \ | 11 | SRC_URI = "http://nice.freedesktop.org/releases/${BP}.tar.gz" |
12 | file://0001-agent-meson-Replace-filename-with-basename.patch" | 12 | SRC_URI[sha256sum] = "a5f724cf09eae50c41a7517141d89da4a61ec9eaca32da4a0073faed5417ad7e" |
13 | SRC_URI[sha256sum] = "72e73a2acf20f59093e21d5601606e405873503eb35f346fa621de23e99b3b39" | ||
14 | 13 | ||
15 | DEPENDS = "glib-2.0 gnutls ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'graphviz-native', '', d)}" | 14 | DEPENDS = "glib-2.0 gnutls ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'graphviz-native', '', d)}" |
16 | 15 | ||
@@ -27,18 +26,5 @@ inherit meson gtk-doc gobject-introspection | |||
27 | EXTRA_OEMESON = "-Dexamples=disabled -Dtests=disabled" | 26 | EXTRA_OEMESON = "-Dexamples=disabled -Dtests=disabled" |
28 | 27 | ||
29 | FILES:${PN} += "${libdir}/gstreamer-1.0/*.so" | 28 | FILES:${PN} += "${libdir}/gstreamer-1.0/*.so" |
30 | FILES:${PN}-dev += "${libdir}/gstreamer-1.0/*.la" | 29 | FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a ${libdir}/gstreamer-1.0/pkgconfig" |
31 | FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" | ||
32 | FILES:${PN}-dbg += "${libdir}/gstreamer-1.0/.debug" | 30 | FILES:${PN}-dbg += "${libdir}/gstreamer-1.0/.debug" |
33 | |||
34 | do_configure:prepend() { | ||
35 | mkdir ${S}/m4 || true | ||
36 | } | ||
37 | |||
38 | do_compile:append() { | ||
39 | for i in $(find ${B} -name "*.pc") ; do | ||
40 | sed -i -e s:${STAGING_DIR_TARGET}::g \ | ||
41 | -e s:/${TARGET_SYS}::g \ | ||
42 | $i | ||
43 | done | ||
44 | } | ||