fix build with gssdp-1.2 and gupnp-1.2

This commit is contained in:
jasper 2019-02-10 12:57:12 +00:00
parent f305e3a2f8
commit 21d1dcfd04
8 changed files with 86 additions and 23 deletions

View File

@ -1,17 +1,18 @@
# $OpenBSD: Makefile,v 1.4 2017/10/09 17:45:27 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.5 2019/02/10 12:57:12 jasper Exp $
COMMENT= dLeyna dbus connector
GH_PROJECT= dleyna-connector-dbus
GH_TAGNAME= v0.3.0
REVISION= 0
BUILD_DEPENDS= x11/dbus
RUN_DEPENDS= x11/dbus
LIB_DEPENDS= net/dleyna/core
LIB_DEPENDS= net/dleyna/core>=0.6.0p0
WANTLIB += dleyna-core-1.0 ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += gssdp-1.0 gupnp-1.0 iconv intl lzma m pcre pthread
WANTLIB += soup-2.4 sqlite3 xml2 z
WANTLIB += gssdp-1.2 gupnp-1.2 iconv idn2 intl lzma m pcre psl
WANTLIB += pthread soup-2.4 sqlite3 unistring xml2 z
post-install:
rm ${PREFIX}/lib/dleyna-1.0/connectors/*.la

View File

@ -1,17 +1,18 @@
# $OpenBSD: Makefile,v 1.4 2017/10/09 17:45:27 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.5 2019/02/10 12:57:12 jasper Exp $
COMMENT= dLeyna utility functions library
GH_ACCOUNT= intel
GH_PROJECT= dleyna-core
GH_TAGNAME= v0.6.0
REVISION= 0
LIB_DEPENDS= net/gupnp/core
LIB_DEPENDS= net/gupnp/core>=1.1.2
SHARED_LIBS += dleyna-core-1.0 0.1 # 5.0
WANTLIB += ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gssdp-1.0
WANTLIB += gupnp-1.0 iconv intl lzma m pcre pthread soup-2.4 sqlite3
WANTLIB += xml2 z
WANTLIB += ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gssdp-1.2
WANTLIB += gupnp-1.2 iconv idn2 intl lzma m pcre psl pthread soup-2.4
WANTLIB += sqlite3 unistring xml2 z
.include <bsd.port.mk>

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-configure_ac,v 1.1 2019/02/10 12:57:12 jasper Exp $
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -39,7 +39,7 @@ 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([GMODULE], [gmodule-2.0 >= 2.28])
-PKG_CHECK_MODULES([GUPNP], [gupnp-1.0 >= 0.20.5])
+PKG_CHECK_MODULES([GUPNP], [gupnp-1.2 >= 1.1.0])
# Checks for header files.
AC_CHECK_HEADERS([stdlib.h string.h syslog.h])

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-dleyna-core-1_0_pc_in,v 1.1 2019/02/10 12:57:12 jasper Exp $
Index: dleyna-core-1.0.pc.in
--- dleyna-core-1.0.pc.in.orig
+++ dleyna-core-1.0.pc.in
@@ -8,5 +8,5 @@ Name: @PACKAGE@
Description: UPnP & DLNA core library
Libs: -L${libdir} -ldleyna-core-1.0
Cflags: -I${includedir}/dleyna-1.0
-Requires: glib-2.0 gio-2.0 gmodule-2.0 gupnp-1.0
+Requires: glib-2.0 gio-2.0 gmodule-2.0 gupnp-1.2
Version: @VERSION@

View File

@ -1,22 +1,23 @@
# $OpenBSD: Makefile,v 1.4 2017/10/09 17:45:27 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.5 2019/02/10 12:57:12 jasper Exp $
COMMENT= service for interacting with DMRs
GH_PROJECT= dleyna-renderer
REVISION= 0
SHARED_LIBS += dleyna-renderer-1.0 0.0 # 1.3
WANTLIB += c dleyna-core-1.0 ffi gio-2.0 glib-2.0 gmodule-2.0
WANTLIB += gobject-2.0 gssdp-1.2 gupnp-1.2 gupnp-av-1.0 gupnp-dlna-2.0
WANTLIB += iconv idn2 intl lzma m pcre psl pthread soup-2.4 sqlite3
WANTLIB += unistring xml2 z
RUN_DEPENDS= net/dleyna/connector-dbus
LIB_DEPENDS= net/dleyna/core \
LIB_DEPENDS= net/dleyna/core>=0.6.0p0 \
net/gupnp/av \
net/gupnp/dlna
FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/dleyna-renderer
WANTLIB += c dleyna-core-1.0 ffi gio-2.0 glib-2.0 gmodule-2.0
WANTLIB += gobject-2.0 gssdp-1.0 gupnp-1.0 gupnp-av-1.0 gupnp-dlna-2.0
WANTLIB += iconv intl lzma m pcre pthread soup-2.4 sqlite3 xml2
WANTLIB += z
.include <bsd.port.mk>

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-configure_ac,v 1.1 2019/02/10 12:57:13 jasper Exp $
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -38,8 +38,8 @@ LT_LANG([C])
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.5])
+PKG_CHECK_MODULES([GSSDP], [gssdp-1.2 >= 1.1.0])
+PKG_CHECK_MODULES([GUPNP], [gupnp-1.2 >= 1.1.0])
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])

View File

@ -1,22 +1,24 @@
# $OpenBSD: Makefile,v 1.4 2017/10/09 17:45:27 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.5 2019/02/10 12:57:13 jasper Exp $
COMMENT= service for interacting with DMSes
GH_PROJECT= dleyna-server
REVISION= 0
SHARED_LIBS += dleyna-server-1.0 0.0 # 1.3
RUN_DEPENDS= net/dleyna/connector-dbus
RUN_DEPENDS= net/dleyna/connector-dbus>=0.3.0p0
LIB_DEPENDS= net/dleyna/core \
LIB_DEPENDS= net/dleyna/core>=0.6.0p0 \
net/gupnp/av \
net/gupnp/dlna
WANTLIB += c dleyna-core-1.0 ffi gio-2.0 glib-2.0 gmodule-2.0
WANTLIB += gobject-2.0 gssdp-1.2 gupnp-1.2 gupnp-av-1.0 gupnp-dlna-2.0
WANTLIB += iconv idn2 intl lzma m pcre psl pthread soup-2.4 sqlite3
WANTLIB += unistring xml2 z
FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/dleyna-server
WANTLIB += c dleyna-core-1.0 ffi gio-2.0 glib-2.0 gmodule-2.0
WANTLIB += gobject-2.0 gssdp-1.0 gupnp-1.0 gupnp-av-1.0 gupnp-dlna-2.0
WANTLIB += iconv intl lzma m pcre pthread soup-2.4 sqlite3 xml2
WANTLIB += z
.include <bsd.port.mk>

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-configure_ac,v 1.1 2019/02/10 12:57:13 jasper Exp $
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -38,8 +38,8 @@ LT_LANG([C])
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([GSSDP], [gssdp-1.2 >= 1.1.0])
+PKG_CHECK_MODULES([GUPNP], [gupnp-1.2 >= 1.1.0])
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])