cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adjust for gupnp-1.2

Browse Source
This commit is contained in:
jasper 2019-02-10 12:56:05 +00:00
parent 371d5e7fc4
commit d1ce5e3c2e
8 changed files with 149 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
net/gupnp/igd/Makefile
View File

@ -1,24 +1,31 @@
# $OpenBSD: Makefile,v 1.22 2017/11/21 00:13:02 naddy Exp $
# $OpenBSD: Makefile,v 1.23 2019/02/10 12:56:05 jasper Exp $
COMMENT= library to handle UPnP IGD port mapping
GNOME_PROJECT= gupnp-igd
GNOME_VERSION= 0.2.5
REVISION= 0
REVISION= 1
SHARED_LIBS += gupnp-igd-1.0 0.0 # 4.0
MODULES= lang/python \
x11/gnome
WANTLIB = ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gssdp-1.0
WANTLIB += gthread-2.0 gupnp-1.0 iconv intl lzma m pcre pthread soup-2.4
WANTLIB += sqlite3 xml2 z
WANTLIB += ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gssdp-1.2
WANTLIB += gthread-2.0 gupnp-1.2 iconv idn2 intl lzma m pcre psl
WANTLIB += pthread soup-2.4 sqlite3 unistring xml2 z
MODGNOME_TOOLS += gobject-introspection
LIB_DEPENDS= net/gupnp/core
LIB_DEPENDS= net/gupnp/core>=1.1.2
BUILD_DEPENDS= devel/py-gobject
RUN_DEPENDS= devel/py-gobject
# XXX remove when updating
post-patch:
cd ${WRKSRC} && \
sed -i -e 's,gssdp-1.0,gssdp-1.2,g' -e 's,gupnp-1.0,gupnp-1.2,g' \
configure gupnp-igd-1.0.pc.in libgupnp-igd/Makefile.in \
libgupnp-igd/GUPnPIgd-1.0.gir
.include <bsd.port.mk>

6
net/gupnp/igd/pkg/PLIST
View File

@ -1,14 +1,18 @@
@comment $OpenBSD: PLIST,v 1.5 2017/11/20 20:11:43 jasper Exp $
@comment $OpenBSD: PLIST,v 1.6 2019/02/10 12:56:05 jasper Exp $
include/gupnp-igd-1.0/
include/gupnp-igd-1.0/libgupnp-igd/
include/gupnp-igd-1.0/libgupnp-igd/gupnp-simple-igd-thread.h
include/gupnp-igd-1.0/libgupnp-igd/gupnp-simple-igd.h
lib/girepository-1.0/
lib/girepository-1.0/GUPnPIgd-1.0.typelib
lib/libgupnp-igd-1.0.a
lib/libgupnp-igd-1.0.la
@lib lib/libgupnp-igd-1.0.so.${LIBgupnp-igd-1.0_VERSION}
lib/pkgconfig/gupnp-igd-1.0.pc
share/gir-1.0/
share/gir-1.0/GUPnPIgd-1.0.gir
share/gtk-doc/
share/gtk-doc/html/
share/gtk-doc/html/gupnp-igd/
share/gtk-doc/html/gupnp-igd/GUPnPSimpleIgd.html
share/gtk-doc/html/gupnp-igd/GUPnPSimpleIgdThread.html

15
net/gupnp/tools/Makefile
View File

@ -1,21 +1,24 @@
# $OpenBSD: Makefile,v 1.29 2018/12/11 19:44:32 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.30 2019/02/10 12:56:05 jasper Exp $
COMMENT= free replacements of Intel UPnP tools
COMMENT= collection of developer-oriented UPnP tools
GNOME_PROJECT= gupnp-tools
GNOME_VERSION= 0.8.15
REVISION= 0
MODULES= devel/meson \
x11/gnome
WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gssdp-1.2 gtk-3 gtksourceview-4
WANTLIB += gupnp-1.2 gupnp-av-1.0 intl pango-1.0 pangocairo-1.0
WANTLIB += soup-2.4 xml2
MODGNOME_TOOLS= desktop-file-utils gtk-update-icon-cache
WANTLIB += c gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
WANTLIB += gssdp-1.0 gtk-3 gtksourceview-4 gupnp-1.0 gupnp-av-1.0
WANTLIB += intl soup-2.4 xml2
LIB_DEPENDS= net/gupnp/av \
net/gupnp/core \
net/gupnp/core>=1.1.2 \
x11/gtksourceview4
# Makefile.inc overrides

18
net/gupnp/tools/patches/patch-meson_build Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-meson_build,v 1.1 2019/02/10 12:56:05 jasper Exp $
https://github.com/GNOME/gupnp-tools/commit/41feb3168d3870e0d017c248f20cbe85bc5acde7
Index: meson.build
--- meson.build.orig
+++ meson.build
@@ -7,8 +7,8 @@ if host_machine.system() == 'windows'
win = import('windows')
endif
-gssdp = dependency('gssdp-1.0', version: '>= 0.13.3')
-gupnp = dependency('gupnp-1.0', version: '>= 0.20.14')
+gssdp = dependency('gssdp-1.2', version: '>= 1.1')
+gupnp = dependency('gupnp-1.2', version: '>= 1.1')
soup = dependency('libsoup-2.4', version: '>= 2.42')
gupnp_av = dependency('gupnp-av-1.0', version: '>= 0.5.5', required: false)
gtk = dependency('gtk+-3.0', version: '>= 3.10')

16
net/gupnp/tools/patches/patch-src_discover_gssdp-discover_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_discover_gssdp-discover_c,v 1.1 2019/02/10 12:56:05 jasper Exp $
https://github.com/GNOME/gupnp-tools/commit/41feb3168d3870e0d017c248f20cbe85bc5acde7
Index: src/discover/gssdp-discover.c
--- src/discover/gssdp-discover.c.orig
+++ src/discover/gssdp-discover.c
@@ -102,7 +102,7 @@ int main (int argc, char *argv[]) {
g_option_context_free (context);
- discover.client = gssdp_client_new (NULL, interface, &error);
+ discover.client = gssdp_client_new (interface, &error);
if (error != NULL) {
g_warning ("Failed to create GSSDP client: %s", error->message);
g_error_free (error);

54
net/gupnp/tools/patches/patch-src_network-light_upnp_c Normal file
View File

@ -0,0 +1,54 @@
$OpenBSD: patch-src_network-light_upnp_c,v 1.1 2019/02/10 12:56:05 jasper Exp $
https://github.com/GNOME/gupnp-tools/commit/41feb3168d3870e0d017c248f20cbe85bc5acde7
Index: src/network-light/upnp.c
--- src/network-light/upnp.c.orig
+++ src/network-light/upnp.c
@@ -386,7 +386,8 @@ static void init_friendly_name (gchar *name)
{
xmlNode *fdn_node;
- fdn_node = xml_util_get_element ((xmlNode *) doc->doc,
+ fdn_node = xml_util_get_element ((xmlNode *)
+ gupnp_xml_doc_get_doc (doc),
"root",
"device",
"friendlyName",
@@ -409,7 +410,8 @@ static void init_uuid (void)
uuid = gupnp_get_uuid ();
- uuid_node = xml_util_get_element ((xmlNode *) doc->doc,
+ uuid_node = xml_util_get_element ((xmlNode *) doc,
+ gupnp_xml_doc_get_doc (doc),
"root",
"device",
"UDN",
@@ -589,8 +591,16 @@ init_server (GUPnPContext *context)
gupnp_resource_factory_get_default (),
doc,
desc_location,
- DATA_DIR);
+ DATA_DIR,
+ &error);
+ if (error != NULL) {
+ g_warning ("Failed to create root device: %s",
+ error->message);
+ g_error_free (error);
+ return FALSE;
+ }
+
switch_power = gupnp_device_info_get_service (GUPNP_DEVICE_INFO (dev),
SWITCH_SERVICE);
@@ -663,7 +673,7 @@ prepare_desc (gchar *name)
uuid);
g_assert (desc_location != NULL);
- if (xmlSaveFile (desc_location, doc->doc) < 0) {
+ if (xmlSaveFile (desc_location, (xmlDoc *) gupnp_xml_doc_get_doc (doc)) < 0) {
g_print ("Error saving description file to %s.\n",
desc_location);

18
net/gupnp/tools/patches/patch-src_universal-cp_action-dialog_c Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_universal-cp_action-dialog_c,v 1.1 2019/02/10 12:56:05 jasper Exp $
https://github.com/GNOME/gupnp-tools/commit/41feb3168d3870e0d017c248f20cbe85bc5acde7
Index: src/universal-cp/action-dialog.c
--- src/universal-cp/action-dialog.c.orig
+++ src/universal-cp/action-dialog.c
@@ -679,8 +679,8 @@ on_action_complete (GUPnPServiceProxy *proxy,
gupnp_service_proxy_end_action_hash (proxy,
action,
- &error,
- out_args);
+ out_args,
+ &error);
if (error) {
GtkWidget *error_dialog;

16
net/gupnp/tools/patches/patch-src_upload_main_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_upload_main_c,v 1.1 2019/02/10 12:56:05 jasper Exp $
https://github.com/GNOME/gupnp-tools/commit/41feb3168d3870e0d017c248f20cbe85bc5acde7
Index: src/upload/main.c
--- src/upload/main.c.orig
+++ src/upload/main.c
@@ -176,7 +176,7 @@ main (gint argc,
}
error = NULL;
- upnp_context = gupnp_context_new (NULL, interface, 0, &error);
+ upnp_context = gupnp_context_new (interface, 0, &error);
if (error) {
g_printerr ("Error creating the GUPnP context: %s\n",
error->message);