commit: a3145b2a19e93b86c276b05e0eea938e3bcc721d Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Fri Feb 21 20:52:55 2020 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Fri Feb 21 20:56:38 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3145b2a
net-misc/dleyna-server: bump to 0.6.0 and use gupnp-1.2 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> net-misc/dleyna-server/Manifest | 1 + net-misc/dleyna-server/dleyna-server-0.6.0.ebuild | 43 +++++++++++++ net-misc/dleyna-server/files/0.6.0-gupnp-1.2.patch | 71 ++++++++++++++++++++++ 3 files changed, 115 insertions(+) diff --git a/net-misc/dleyna-server/Manifest b/net-misc/dleyna-server/Manifest index feb2ef6ac41..cd2cf3d5882 100644 --- a/net-misc/dleyna-server/Manifest +++ b/net-misc/dleyna-server/Manifest @@ -1 +1,2 @@ DIST dleyna-server-0.5.0.tar.gz 412938 BLAKE2B 532e1a418708d84dabd98670d84c865b6f69252cbd851504bd2d75bbbf683b699a47513a6ae994f809f3993a67815d5a3ee53683a016448c76d604fed040aceb SHA512 30bafd14c9b85406efc21dd078bce80ed10927ef2728c4535990654b6c279549c5a89099d9266cd1e22a2f574006d2c9cfec8e3e79109c2e760d8ab4609cf398 +DIST dleyna-server-0.6.0.tar.gz 107573 BLAKE2B c2460d20ac12d377170fc1292efa48ccec218b7c8e6f2d463a159bda801a7e9a5cfd239e51bcf9d997124a0a9ff305f3a4047228d54a55b26407fb1e37b2e238 SHA512 5fecc48f72afdac46da04d1785cf49384ed84b078802e4703cd86dc8e2c5db64df0232f66b73c73b3f358f7248117cd00fa4652397619d87f8f4a305e047306c diff --git a/net-misc/dleyna-server/dleyna-server-0.6.0.ebuild b/net-misc/dleyna-server/dleyna-server-0.6.0.ebuild new file mode 100644 index 00000000000..d0e3df56827 --- /dev/null +++ b/net-misc/dleyna-server/dleyna-server-0.6.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Service that allows to discover and manipulate DLNA Digital Media servers (DMS)" +HOMEPAGE="https://01.org/dleyna/"; +SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar_2.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + >=dev-libs/glib-2.36:2 + dev-libs/libxml2:2 + >=media-libs/gupnp-dlna-0.9.4:2.0 + >=net-libs/dleyna-core-0.6.0 + >=net-libs/gssdp-1.2:0= + >=net-libs/gupnp-1.2:0= + >=net-libs/gupnp-av-0.11.5 + >=net-libs/libsoup-2.28.2:2.4 +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PV}-gupnp-1.2.patch +) + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + find "${ED}" -name "*.la" -delete || die +} diff --git a/net-misc/dleyna-server/files/0.6.0-gupnp-1.2.patch b/net-misc/dleyna-server/files/0.6.0-gupnp-1.2.patch new file mode 100644 index 00000000000..ff9725e0f58 --- /dev/null +++ b/net-misc/dleyna-server/files/0.6.0-gupnp-1.2.patch @@ -0,0 +1,71 @@ +From 96c01c88363d6e5e9b7519bc4e8b5d86cf783e1f Mon Sep 17 00:00:00 2001 +From: Jan Tojnar <[email protected]> +Date: Sat, 16 Mar 2019 05:46:20 +0100 +Subject: [PATCH] Port to gupnp-1.2 + +gupnp_context_get_host_ip has been deprecated for a long time, as +the host-ip property moved to gssdp. + +There is also a ton of new deprecations but I will address that separately. +--- + configure.ac | 8 ++++---- + libdleyna/server/upnp.c | 4 ++-- + test/dbus/dms-info.c | 2 -- + 3 files changed, 6 insertions(+), 8 deletions(-) + mode change 100755 => 100644 libdleyna/server/upnp.c + mode change 100755 => 100644 test/dbus/dms-info.c + +diff --git a/configure.ac b/configure.ac +index 11879e7..61f4fca 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -36,10 +36,10 @@ LT_LANG([C]) + + # Checks for libraries. + PKG_PROG_PKG_CONFIG(0.16) +-PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28]) +-PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.28]) +-PKG_CHECK_MODULES([GSSDP], [gssdp-1.0 >= 0.13.2]) +-PKG_CHECK_MODULES([GUPNP], [gupnp-1.0 >= 0.20.3]) ++PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.36]) ++PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.36]) ++PKG_CHECK_MODULES([GSSDP], [gssdp-1.2 >= 0.13.2]) ++PKG_CHECK_MODULES([GUPNP], [gupnp-1.2 >= 0.20.3]) + PKG_CHECK_MODULES([GUPNPAV], [gupnp-av-1.0 >= 0.11.5]) + PKG_CHECK_MODULES([GUPNPDLNA], [gupnp-dlna-2.0 >= 0.9.4]) + PKG_CHECK_MODULES([SOUP], [libsoup-2.4 >= 2.28.2]) +diff --git a/libdleyna/server/upnp.c b/libdleyna/server/upnp.c +old mode 100755 +new mode 100644 +index 9913a76..d04efb8 +--- a/libdleyna/server/upnp.c ++++ b/libdleyna/server/upnp.c +@@ -351,8 +351,8 @@ static void prv_device_unavailable_cb(GUPnPControlPoint *cp, + + udn = gupnp_device_info_get_udn((GUPnPDeviceInfo *)proxy); + +- ip_address = gupnp_context_get_host_ip( +- gupnp_control_point_get_context(cp)); ++ ip_address = gssdp_client_get_host_ip( ++ GSSDP_CLIENT(gupnp_control_point_get_context(cp))); + + if (!udn || !ip_address) + goto on_error; +diff --git a/test/dbus/dms-info.c b/test/dbus/dms-info.c +old mode 100755 +new mode 100644 +index a189b9f..4530e58 +--- a/test/dbus/dms-info.c ++++ b/test/dbus/dms-info.c +@@ -360,8 +360,6 @@ int main(int argc, char *argv[]) + if (sigprocmask(SIG_BLOCK, &mask, NULL) == -1) + goto on_error; + +- g_type_init(); +- + /* Create proxy for com.intel.dLeynaServer.Manager. The Manager + object has no properties. We will create the proxy asynchronously + and use G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES to ensure that +-- +2.20.1 +
