deleted file mode 100644
@@ -1,40 +0,0 @@
-From 7c510cd20bb443064ab4a0d2c6d917e807b2671b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 22 May 2023 19:45:28 -0700
-Subject: [PATCH] agent/meson: Replace filename with basename
-
-This avoids emitting absolute paths into generated sourcecode, it
-improves reproducibility. See [1]
-
-[1] https://developer-old.gnome.org/gobject/stable/glib-mkenums.html
-
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/libnice/libnice/-/merge_requests/258]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- agent/meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/agent/meson.build b/agent/meson.build
-index 2e5b272..44fcd6b 100644
---- a/agent/meson.build
-+++ b/agent/meson.build
-@@ -29,14 +29,14 @@ gnome = import('gnome')
-
- agent_enum_types_c = gnome.mkenums('agent-enum-types.c', sources : agent_headers,
- fhead: '#include <config.h>\n#include <glib-object.h>\n#include "agent.h"\n#include "pseudotcp.h"\n#include "agent-enum-types.h"',
-- fprod: '\n/* enumerations from "@filename@" */',
-+ fprod: '\n/* enumerations from "@basename@" */',
- vhead: 'GType\n@enum_name@_get_type (void)\n{\n static GType type = 0;\n if (!type) {\n static const G@Type@Value values[] = {',
- vprod: ' { @VALUENAME@, "@VALUENAME@", "@valuenick@" },',
- vtail: ' { 0, NULL, NULL }\n };\n type = g_@type@_register_static ("@EnumName@", values);\n }\n return type;\n}\n\n')
-
- agent_enum_types_h = gnome.mkenums('agent-enum-types.h', sources : agent_headers,
- fhead: '#ifndef __AGENT_ENUM_TYPES_H__\n#define __AGENT_ENUM_TYPES_H__ 1\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n',
-- fprod: '/* enumerations from "@filename@" */\n',
-+ fprod: '/* enumerations from "@basename@" */\n',
- vhead: 'GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define NICE_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n',
- ftail: 'G_END_DECLS\n\n#endif /* !AGENT_ENUM_TYPES_H */')
-
-2.40.1
-
similarity index 66%
rename from meta-oe/recipes-support/farsight/libnice_0.1.21.bb
rename to meta-oe/recipes-support/libnice/libnice_0.1.22.bb
@@ -8,9 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9c42325015702feda4f4d2f19a55b767 \
file://COPYING.MPL;md5=3c617710e51cdbe0fc00716f056dfb1a \
"
-SRC_URI = "http://nice.freedesktop.org/releases/libnice-${PV}.tar.gz \
- file://0001-agent-meson-Replace-filename-with-basename.patch"
-SRC_URI[sha256sum] = "72e73a2acf20f59093e21d5601606e405873503eb35f346fa621de23e99b3b39"
+SRC_URI = "http://nice.freedesktop.org/releases/${BP}.tar.gz"
+SRC_URI[sha256sum] = "a5f724cf09eae50c41a7517141d89da4a61ec9eaca32da4a0073faed5417ad7e"
DEPENDS = "glib-2.0 gnutls ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'graphviz-native', '', d)}"
@@ -27,18 +26,5 @@ inherit meson gtk-doc gobject-introspection
EXTRA_OEMESON = "-Dexamples=disabled -Dtests=disabled"
FILES:${PN} += "${libdir}/gstreamer-1.0/*.so"
-FILES:${PN}-dev += "${libdir}/gstreamer-1.0/*.la"
-FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a"
+FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a ${libdir}/gstreamer-1.0/pkgconfig"
FILES:${PN}-dbg += "${libdir}/gstreamer-1.0/.debug"
-
-do_configure:prepend() {
- mkdir ${S}/m4 || true
-}
-
-do_compile:append() {
- for i in $(find ${B} -name "*.pc") ; do
- sed -i -e s:${STAGING_DIR_TARGET}::g \
- -e s:/${TARGET_SYS}::g \
- $i
- done
-}
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> --- ...meson-Replace-filename-with-basename.patch | 40 ------------------- .../libnice_0.1.22.bb} | 20 ++-------- 2 files changed, 3 insertions(+), 57 deletions(-) delete mode 100644 meta-oe/recipes-support/farsight/libnice/0001-agent-meson-Replace-filename-with-basename.patch rename meta-oe/recipes-support/{farsight/libnice_0.1.21.bb => libnice/libnice_0.1.22.bb} (66%)