diff options
Diffstat (limited to 'external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp')
11 files changed, 142 insertions, 54 deletions
diff --git a/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.0.2.bb b/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.0.2.bb deleted file mode 100644 index b60d1ea4..00000000 --- a/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.0.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -require gssdp.inc - -inherit gtk-doc - -PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk,gtk+3" - -SRC_URI = "${GNOME_MIRROR}/${BPN}/1.0/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "b30c9a406853c6a3a012d151d6e7ad2c" -SRC_URI[sha256sum] = "a1e17c09c7e1a185b0bd84fd6ff3794045a3cd729b707c23e422ff66471535dc" diff --git a/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp.inc b/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.2.2.bb index 23f17edd..ddaddd20 100644 --- a/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp.inc +++ b/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.2.2.bb @@ -4,16 +4,16 @@ LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" DEPENDS = "glib-2.0 libsoup-2.4" -inherit autotools pkgconfig gobject-introspection vala +SRC_URI = "${GNOME_MIRROR}/${BPN}/1.2/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "f00a470ebcba96f34def8f83ac5891ed" +SRC_URI[sha256sum] = "cabb9e3b456b8354a55e23eb0207545d974643cda6d623523470ebbc4188b0a4" -# Copy vapigen.m4 so that it doesn't get removed by vala class -# (normally this would be the right thing to do, but in gssdp the vapigen.m4 has only a custom macro) -do_configure_prepend() { - cp -f ${S}/m4/vapigen.m4 ${S}/m4/vapigen-custom.m4 || true -} +GTKDOC_MESON_OPTION = 'gtk_doc' -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)}" -PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk,gtk+" +inherit meson pkgconfig gobject-introspection vala gtk-doc + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'sniffer', '', d)}" +PACKAGECONFIG[sniffer] = "-Dsniffer=true,-Dsniffer=false,gtk+3," PACKAGES =+ "gssdp-tools" diff --git a/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.10.bb b/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.11.bb index cfd0227e..1881656b 100644 --- a/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.10.bb +++ b/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.11.bb @@ -1,7 +1,7 @@ require gupnp-av.inc SRC_URI = "${GNOME_MIRROR}/${BPN}/0.12/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "215f626508d76b767f5da7c9b92e87d8" -SRC_URI[sha256sum] = "8038ef84dddbe7ad91c205bf91dddf684f072df8623f39b6555a6bb72837b85a" +SRC_URI[md5sum] = "f09e99ae20271b0a8cadce806098ae8b" +SRC_URI[sha256sum] = "689dcf1492ab8991daea291365a32548a77d1a2294d85b33622b55cca9ce6fdc" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://libgupnp-av/gupnp-av.h;beginline=1;endline=22;md5=2b47b7b5f799d2ebabe62b895e848820" diff --git a/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/files/move_vapigen.patch b/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna/move_vapigen.patch index 9bfc31b8..9bfc31b8 100644 --- a/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/files/move_vapigen.patch +++ b/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna/move_vapigen.patch diff --git a/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd/0001-Swtich-to-new-GUPnP-API.patch b/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd/0001-Swtich-to-new-GUPnP-API.patch new file mode 100644 index 00000000..ff5a6d9c --- /dev/null +++ b/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd/0001-Swtich-to-new-GUPnP-API.patch @@ -0,0 +1,101 @@ +From 63531558a16ac2334a59f627b2fca5576dcfbb2e Mon Sep 17 00:00:00 2001 +From: Jens Georg <mail@jensge.org> +Date: Sat, 1 Dec 2018 21:33:21 +0100 +Subject: [PATCH] Swtich to new GUPnP API + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gupnp-igd/commit/63531558a16ac2334a59f627b2fca5576dcfbb2e] +--- + configure.ac | 2 +- + gupnp-igd-1.0-uninstalled.pc.in | 2 +- + gupnp-igd-1.0.pc.in | 2 +- + libgupnp-igd/Makefile.am | 2 +- + tests/gtest/gupnp-simple-igd.c | 6 ++++-- + 5 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f03921f..aa7f0ca 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -11,7 +11,7 @@ AC_STDC_HEADERS + AC_PROG_LIBTOOL + AC_FUNC_MMAP + +-PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0 gupnp-1.0 >= 0.18 gthread-2.0) ++PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2 gupnp-1.2 >= 0.18 gthread-2.0) + + # glib-genmarshal + GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` +diff --git a/gupnp-igd-1.0-uninstalled.pc.in b/gupnp-igd-1.0-uninstalled.pc.in +index 483956f..6db3bee 100644 +--- a/gupnp-igd-1.0-uninstalled.pc.in ++++ b/gupnp-igd-1.0-uninstalled.pc.in +@@ -5,7 +5,7 @@ includedir=${pcfiledir}/ + + Name: gupnp-igd-1.0 + Description: GUPnP Simple IGD library +-Requires: gupnp-1.0 ++Requires: gupnp-1.2 + Version: @VERSION@ + Libs: ${libdir}/libgupnp-av-1.0.la + Cflags: -I${includedir} +diff --git a/gupnp-igd-1.0.pc.in b/gupnp-igd-1.0.pc.in +index 6660d63..aa74ed3 100644 +--- a/gupnp-igd-1.0.pc.in ++++ b/gupnp-igd-1.0.pc.in +@@ -5,7 +5,7 @@ includedir=@includedir@ + + Name: gupnp-igd-1.0 + Description: GUPnP Simple IGD library +-Requires: gupnp-1.0 ++Requires: gupnp-1.2 + Version: @VERSION@ + Libs: -L${libdir} -lgupnp-igd-1.0 + Cflags: -I${includedir}/gupnp-igd-1.0 +diff --git a/libgupnp-igd/Makefile.am b/libgupnp-igd/Makefile.am +index fe020b5..e10d857 100644 +--- a/libgupnp-igd/Makefile.am ++++ b/libgupnp-igd/Makefile.am +@@ -60,7 +60,7 @@ GUPnPIgd_1_0_gir_VERSION = 1.0 + GUPnPIgd_1_0_gir_LIBS = $(lib_LTLIBRARIES) + GUPnPIgd_1_0_gir_FILES = $(libgupnp_igd_1_0_la_SOURCES) $(libgupnp_igd_inc_HEADERS) + GUPnPIgd_1_0_gir_INCLUDES=GObject-2.0 +-GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.0 ++GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.2 + GUPnPIgd_1_0_gir_CFLAGS=-I$(srcdir) -I$(top_srcdir) + + if HAVE_INTROSPECTION +diff --git a/tests/gtest/gupnp-simple-igd.c b/tests/gtest/gupnp-simple-igd.c +index 9b32b2a..d051d13 100644 +--- a/tests/gtest/gupnp-simple-igd.c ++++ b/tests/gtest/gupnp-simple-igd.c +@@ -273,13 +273,14 @@ run_gupnp_simple_igd_test (GMainContext *mainctx, GUPnPSimpleIgd *igd, + GUPnPDeviceInfo *subdev1; + GUPnPDeviceInfo *subdev2; + const gchar *xml_path = "."; ++ GError *error = NULL; + + g_signal_connect (igd, "context-available", + G_CALLBACK (ignore_non_localhost), NULL); + + if (mainctx) + g_main_context_push_thread_default (mainctx); +- context = gupnp_context_new (NULL, "lo", 0, NULL); ++ context = gupnp_context_new ("lo", 0, NULL); + g_assert (context); + + if (g_getenv ("XML_PATH")) +@@ -293,8 +294,9 @@ run_gupnp_simple_igd_test (GMainContext *mainctx, GUPnPSimpleIgd *igd, + gupnp_context_host_path (context, "WANPPPConnection.xml", "/WANPPPConnection.xml"); + */ + +- dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml", xml_path); ++ dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml", xml_path, &error); + g_assert (dev); ++ g_assert (error == NULL); + + subdev1 = gupnp_device_info_get_device (GUPNP_DEVICE_INFO (dev), + "urn:schemas-upnp-org:device:WANDevice:1"); +-- +2.25.1 + diff --git a/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.4.bb b/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.5.bb index 0aa594dc..1a98ace8 100644 --- a/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.4.bb +++ b/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.5.bb @@ -3,11 +3,13 @@ LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://libgupnp-igd/gupnp-simple-igd.c;beginline=1;endline=21;md5=aa292c0d9390463a6e1055dc5fc68e80" -DEPENDS = "glib-2.0 gupnp sqlite3" +DEPENDS = "glib-2.0 gssdp gupnp sqlite3" -SRC_URI = "http://download.gnome.org/sources/${BPN}/0.2/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "124371136b5a7b1056a3681780a62772" -SRC_URI[sha256sum] = "38c4a6d7718d17eac17df95a3a8c337677eda77e58978129ad3182d769c38e44" +SRC_URI = "http://download.gnome.org/sources/${BPN}/0.2/${BPN}-${PV}.tar.xz \ + file://0001-Swtich-to-new-GUPnP-API.patch \ + " +SRC_URI[md5sum] = "d164e096d0f140bb1f5d9503727b424a" +SRC_URI[sha256sum] = "8b4a1aa38bacbcac2c1755153147ead7ee9af7d4d1f544b6577cfc35e10e3b20" inherit autotools pkgconfig gtk-doc gobject-introspection diff --git a/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.0.bb b/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.0.bb new file mode 100644 index 00000000..bf84e7b7 --- /dev/null +++ b/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.0.bb @@ -0,0 +1,13 @@ +SUMMARY = "Tools for GUPnP" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ + file://src/network-light/main.c;beginline=1;endline=21;md5=2c39b3a000495dabd4932f231c7efed8" +DEPENDS = "gupnp gupnp-av gtk+3 glib-2.0-native intltool-native" +RRECOMMENDS_${PN} = "adwaita-icon-theme" + +SRC_URI = "http://download.gnome.org/sources/${BPN}/0.10/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "8c66d4aca756478615761a26ed7c8dba" +SRC_URI[sha256sum] = "41da7ff5ba8e2425adcb64ca5e04c81f57ca20ec6fdb84923939fdad42c6a18d" +inherit features_check meson pkgconfig gettext gtk-icon-cache + +REQUIRED_DISTRO_FEATURES = "x11" diff --git a/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb b/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb deleted file mode 100644 index 3ddb818d..00000000 --- a/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Tools for GUPnP" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ - file://src/network-light/main.c;beginline=1;endline=21;md5=2c39b3a000495dabd4932f231c7efed8" -DEPENDS = "gupnp gupnp-av gtk+3 intltool-native" -RRECOMMENDS_${PN} = "adwaita-icon-theme" - -SRC_URI = "http://download.gnome.org/sources/${BPN}/0.8/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "212d85ebce89b32468b59e1164050d40" -SRC_URI[sha256sum] = "aa3decb9d532c0e2e505adc592f431fd81c0231ded2981129e87da13712479ed" -inherit distro_features_check autotools pkgconfig gettext - -REQUIRED_DISTRO_FEATURES = "x11" diff --git a/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc b/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc index 6ce96316..2920581c 100644 --- a/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc +++ b/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc @@ -4,22 +4,16 @@ LICENSE = "LGPLv2+" DEPENDS = "e2fsprogs gssdp libsoup-2.4 libxml2" -inherit autotools pkgconfig vala gobject-introspection - -# Copy vapigen.m4 so that it doesn't get removed by vala class -# (normally this would be the right thing to do, but in gupnp the vapigen.m4 has only a custom macro) -do_configure_prepend() { - cp -f ${S}/m4/vapigen.m4 ${S}/m4/vapigen-custom.m4 || true -} +inherit meson pkgconfig vala gobject-introspection FILES_${PN} = "${libdir}/*.so.*" -FILES_${PN}-dev += "${bindir}/gupnp-binding-tool" +FILES_${PN}-dev += "${bindir}/gupnp-binding-tool*" -RDEPENDS_${PN}-dev = "python-textutils python-xml" +RDEPENDS_${PN}-dev = "python3 python3-xml" SYSROOT_PREPROCESS_FUNCS += "gupnp_sysroot_preprocess" gupnp_sysroot_preprocess () { install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ - install -m 755 ${D}${bindir}/gupnp-binding-tool ${SYSROOT_DESTDIR}${bindir_crossscripts}/ + install -m 755 ${D}${bindir}/gupnp-binding-tool* ${SYSROOT_DESTDIR}${bindir_crossscripts}/ } diff --git a/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.0.2.bb b/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.0.2.bb deleted file mode 100644 index 1bdf7d79..00000000 --- a/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.0.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -require gupnp.inc - -SRC_URI = "${GNOME_MIRROR}/${BPN}/1.0/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "afd96fe73856b38aaf1baf7526e08edd" -SRC_URI[sha256sum] = "5173fda779111c6b01cd4a5e41b594322be9d04f8c74d3361f0a0c2069c77610" - -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://libgupnp/gupnp.h;beginline=1;endline=20;md5=d78a69d9b6e63ee2dc72e7b674d97520" diff --git a/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.2.bb b/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.2.bb new file mode 100644 index 00000000..e6034971 --- /dev/null +++ b/external/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.2.bb @@ -0,0 +1,8 @@ +require gupnp.inc + +SRC_URI = "${GNOME_MIRROR}/${BPN}/1.2/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "2ade3d29c624ad98d70113e6e93908a5" +SRC_URI[sha256sum] = "9a80bd953e5c8772ad26b72f8da01cbe7241a113edd6084903f413ce751c9989" + +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ + file://libgupnp/gupnp.h;beginline=1;endline=20;md5=d78a69d9b6e63ee2dc72e7b674d97520" |