From c5d655b32afb074d2e7d4fdc154ffa806a32ba0a Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Fri, 10 Oct 2014 12:21:52 +0000 Subject: [PATCH] Update to libnice-0.1.8. --- net/libnice/Makefile | 18 ++++++++++++------ net/libnice/distinfo | 4 ++-- net/libnice/patches/patch-configure | 12 ------------ net/libnice/pkg/PLIST | 10 +++++++--- 4 files changed, 21 insertions(+), 23 deletions(-) delete mode 100644 net/libnice/patches/patch-configure diff --git a/net/libnice/Makefile b/net/libnice/Makefile index a261f44c51c..18029016de2 100644 --- a/net/libnice/Makefile +++ b/net/libnice/Makefile @@ -1,18 +1,19 @@ -# $OpenBSD: Makefile,v 1.28 2014/09/13 16:36:54 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.29 2014/10/10 12:21:52 ajacoutot Exp $ SHARED_ONLY = Yes COMMENT = GLib ICE implementation -DISTNAME = libnice-0.1.6 +DISTNAME = libnice-0.1.8 -SHARED_LIBS += nice 2.2 # 14.0 +SHARED_LIBS += nice 2.3 # 15.0 CATEGORIES = net HOMEPAGE = http://nice.freedesktop.org/ -MAINTAINER = Tom Murphy +MAINTAINER = Jasper Lievisse Adriaanse , \ + Antoine Jacoutot # LGPLv2.1/MPLv1.1 PERMIT_PACKAGE_CDROM = Yes @@ -22,10 +23,12 @@ WANTLIB += gssdp-1.0 gstbase-1.0 gstreamer-1.0 gthread-2.0 gupnp-1.0 WANTLIB += gupnp-igd-1.0 m pcre pthread soup-2.4 sqlite3 xml2 WANTLIB += z -MASTER_SITES = ${HOMEPAGE}/releases/ +MASTER_SITES = http://nice.freedesktop.org/releases/ MODULES = devel/gettext +BUILD_DEPENDS = devel/gobject-introspection + LIB_DEPENDS = multimedia/gstreamer1/core \ net/gupnp/igd @@ -36,8 +39,11 @@ CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ USE_GMAKE = Yes +# configure sets -Werror +CFLAGS += -Wno-error + post-install: - rm ${PREFIX}/lib/gstreamer-1.0/*.a + rm ${PREFIX}/lib/gstreamer-1.0/*.{a,la} # don't install example binaries rm ${PREFIX}/bin/*-example diff --git a/net/libnice/distinfo b/net/libnice/distinfo index 8d0af813934..309a17af43e 100644 --- a/net/libnice/distinfo +++ b/net/libnice/distinfo @@ -1,2 +1,2 @@ -SHA256 (libnice-0.1.6.tar.gz) = 3jjjcJz12wnFjLmAGSQwPwioshHHFO0JYrgTI8yb2Sw= -SIZE (libnice-0.1.6.tar.gz) = 829225 +SHA256 (libnice-0.1.8.tar.gz) = nafwmQmQLVNTidkpw+TWkSlSj7GEOKbIVl7IEtmQTd8= +SIZE (libnice-0.1.8.tar.gz) = 881186 diff --git a/net/libnice/patches/patch-configure b/net/libnice/patches/patch-configure deleted file mode 100644 index 4c2543eb242..00000000000 --- a/net/libnice/patches/patch-configure +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-configure,v 1.2 2014/04/29 13:10:26 ajacoutot Exp $ ---- configure.orig Tue Apr 29 03:10:57 2014 -+++ configure Tue Apr 29 14:57:51 2014 -@@ -14076,7 +14076,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ - CFLAGS="$save_CFLAGS" - - if test "X$flag_ok" = Xyes ; then -- LIBNICE_CFLAGS="$LIBNICE_CFLAGS -Werror" -+ LIBNICE_CFLAGS="$LIBNICE_CFLAGS" - true - else - diff --git a/net/libnice/pkg/PLIST b/net/libnice/pkg/PLIST index b25a028e971..53c07f8465e 100644 --- a/net/libnice/pkg/PLIST +++ b/net/libnice/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.9 2014/04/29 13:10:26 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.10 2014/10/10 12:21:52 ajacoutot Exp $ @bin bin/stunbdc @bin bin/stund include/nice/ @@ -20,14 +20,16 @@ include/stun/usages/ice.h include/stun/usages/timer.h include/stun/usages/turn.h include/stun/win32_common.h -@comment lib/gstreamer-1.0/libgstnice.la +lib/girepository-1.0/Nice-0.1.typelib lib/gstreamer-1.0/libgstnice.so lib/libnice.a lib/libnice.la @lib lib/libnice.so.${LIBnice_VERSION} lib/pkgconfig/nice.pc +share/gir-1.0/Nice-0.1.gir share/gtk-doc/html/libnice/ share/gtk-doc/html/libnice/NiceAgent.html +share/gtk-doc/html/libnice/NiceCandidate.html share/gtk-doc/html/libnice/annotation-glossary.html share/gtk-doc/html/libnice/api-index-deprecated.html share/gtk-doc/html/libnice/api-index-full.html @@ -48,13 +50,13 @@ share/gtk-doc/html/libnice/ix08.html share/gtk-doc/html/libnice/ix09.html share/gtk-doc/html/libnice/ix10.html share/gtk-doc/html/libnice/ix11.html +share/gtk-doc/html/libnice/left-insensitive.png share/gtk-doc/html/libnice/left.png share/gtk-doc/html/libnice/libnice-Bind.html share/gtk-doc/html/libnice/libnice-Debug-messages.html share/gtk-doc/html/libnice/libnice-ICE.html share/gtk-doc/html/libnice/libnice-Network-interfaces-discovery.html share/gtk-doc/html/libnice/libnice-NiceAddress.html -share/gtk-doc/html/libnice/libnice-NiceCandidate.html share/gtk-doc/html/libnice/libnice-Pseudo-TCP-Socket.html share/gtk-doc/html/libnice/libnice-STUN-Constants.html share/gtk-doc/html/libnice/libnice-StunAgent.html @@ -66,6 +68,8 @@ share/gtk-doc/html/libnice/pt01.html share/gtk-doc/html/libnice/pt02.html share/gtk-doc/html/libnice/pt03.html share/gtk-doc/html/libnice/pt04.html +share/gtk-doc/html/libnice/right-insensitive.png share/gtk-doc/html/libnice/right.png share/gtk-doc/html/libnice/style.css +share/gtk-doc/html/libnice/up-insensitive.png share/gtk-doc/html/libnice/up.png