From ce64bfa20f1aa8fb7c209d4e4826df7215ea67a2 Mon Sep 17 00:00:00 2001 From: drochner Date: Mon, 9 Aug 2010 09:53:30 +0000 Subject: split libnice into two pkgs, to get dependencies sorted and stop abuse of the options framework being here, update to 0.0.13 changes: - Add support for IPv6 - Fix crc32 function conflict with libz.so - Various bug fixing and code cleaning - Validate the remote candidate address before adding it --- net/libnice/Makefile | 8 +++----- net/libnice/PLIST | 3 +-- net/libnice/distinfo | 11 ++++++----- net/libnice/options.mk | 17 ----------------- net/libnice/patches/patch-ac | 13 +++++++++++-- net/libnice/patches/patch-ad | 23 +++++++++++++++++++++++ 6 files changed, 44 insertions(+), 31 deletions(-) delete mode 100644 net/libnice/options.mk create mode 100644 net/libnice/patches/patch-ad (limited to 'net/libnice') diff --git a/net/libnice/Makefile b/net/libnice/Makefile index e8b8e4f9ab9..2a237c03840 100644 --- a/net/libnice/Makefile +++ b/net/libnice/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:11 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2010/08/09 09:53:30 drochner Exp $ # -DISTNAME= libnice-0.0.11 -PKGREVISION= 1 +DISTNAME= libnice-0.0.13 CATEGORIES= net devel MASTER_SITES= http://nice.freedesktop.org/releases/ @@ -13,11 +12,10 @@ LICENSE= gnu-lgpl-v2.1 OR mpl-1.1 PKG_DESTDIR_SUPPORT= user-destdir -.include "options.mk" - GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config +CONFIGURE_ARGS+= --without-gstreamer PKGCONFIG_OVERRIDE+= nice/nice.pc.in diff --git a/net/libnice/PLIST b/net/libnice/PLIST index df6d302da77..2cc280f16a4 100644 --- a/net/libnice/PLIST +++ b/net/libnice/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2010/05/02 11:45:35 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2010/08/09 09:53:30 drochner Exp $ bin/stunbdc bin/stund include/nice/address.h @@ -17,7 +17,6 @@ include/stun/usages/ice.h include/stun/usages/timer.h include/stun/usages/turn.h include/stun/win32_common.h -${PLIST.gstreamer}lib/gstreamer-0.10/libgstnice.la lib/libnice.la lib/pkgconfig/nice.pc share/gtk-doc/html/libnice/NiceAgent.html diff --git a/net/libnice/distinfo b/net/libnice/distinfo index a0df0d35cec..51918f68445 100644 --- a/net/libnice/distinfo +++ b/net/libnice/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.4 2010/05/02 11:45:35 wiz Exp $ +$NetBSD: distinfo,v 1.5 2010/08/09 09:53:30 drochner Exp $ -SHA1 (libnice-0.0.11.tar.gz) = 357ce736c106b0b11fd37c13675640a884f42413 -RMD160 (libnice-0.0.11.tar.gz) = 02c6949c7cb09fc92db89a3c0f221acfe3f9a6c5 -Size (libnice-0.0.11.tar.gz) = 636299 bytes -SHA1 (patch-ac) = 1dd3664f86b331067eddecf82bedfc56bd62ff1b +SHA1 (libnice-0.0.13.tar.gz) = 703b03fbb20da693c057d3fe5074b182a17c7364 +RMD160 (libnice-0.0.13.tar.gz) = 0a20d03c4ed0fb1677149b2d9595a6111e958a15 +Size (libnice-0.0.13.tar.gz) = 635783 bytes +SHA1 (patch-ac) = 908988e65c637db9bf6ca35f912a841055369e07 +SHA1 (patch-ad) = bb8161468e0875b6ca69d699c4119821a26d4532 diff --git a/net/libnice/options.mk b/net/libnice/options.mk deleted file mode 100644 index a412f37f59e..00000000000 --- a/net/libnice/options.mk +++ /dev/null @@ -1,17 +0,0 @@ -# $NetBSD: options.mk,v 1.1.1.1 2009/08/17 21:10:28 wiz Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.libnice -PKG_SUPPORTED_OPTIONS= gstreamer -PKG_SUGGESTED_OPTIONS= gstreamer - -.include "../../mk/bsd.options.mk" - -PLIST_VARS+= gstreamer - -.if !empty(PKG_OPTIONS:Mgstreamer) -.include "../../multimedia/gstreamer0.10/buildlink3.mk" -.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" -PLIST.gstreamer= yes -.else -CONFIGURE_ARGS+= --without-gstreamer -.endif diff --git a/net/libnice/patches/patch-ac b/net/libnice/patches/patch-ac index 699655708cd..59df2db3467 100644 --- a/net/libnice/patches/patch-ac +++ b/net/libnice/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.2 2010/05/02 11:45:35 wiz Exp $ +$NetBSD: patch-ac,v 1.3 2010/08/09 09:53:30 drochner Exp $ ---- agent/interfaces.c.orig 2010-03-18 20:57:10.000000000 +0000 +--- agent/interfaces.c.orig 2010-07-20 21:54:40.000000000 +0000 +++ agent/interfaces.c @@ -49,6 +49,7 @@ #include @@ -10,3 +10,12 @@ $NetBSD: patch-ac,v 1.2 2010/05/02 11:45:35 wiz Exp $ #ifdef HAVE_GETIFADDRS +@@ -198,7 +199,7 @@ nice_interfaces_get_local_ips (gboolean + struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)ifa->ifa_addr; + + /* Skip link-local addresses, they require a scope */ +- if (IN6_IS_ADDR_LINKLOCAL (sa6->sin6_addr.s6_addr)) ++ if (IN6_IS_ADDR_LINKLOCAL (&sa6->sin6_addr)) + continue; + + if (inet_ntop (AF_INET6, &sa6->sin6_addr, addr_as_string, diff --git a/net/libnice/patches/patch-ad b/net/libnice/patches/patch-ad new file mode 100644 index 00000000000..f506c92bba6 --- /dev/null +++ b/net/libnice/patches/patch-ad @@ -0,0 +1,23 @@ +$NetBSD: patch-ad,v 1.1 2010/08/09 09:53:30 drochner Exp $ + +--- gst/Makefile.in.orig 2010-07-20 21:57:29.000000000 +0000 ++++ gst/Makefile.in +@@ -76,8 +76,7 @@ am__base_list = \ + am__installdirs = "$(DESTDIR)$(gstplugindir)" + LTLIBRARIES = $(gstplugin_LTLIBRARIES) + am__DEPENDENCIES_1 = +-am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \ +- $(top_builddir)/nice/libnice.la ++am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) + libgstnice_la_DEPENDENCIES = $(am__DEPENDENCIES_2) + am_libgstnice_la_OBJECTS = gstnicesrc.lo gstnicesink.lo gstnice.lo + libgstnice_la_OBJECTS = $(am_libgstnice_la_OBJECTS) +@@ -242,7 +241,7 @@ AM_CFLAGS = $(LIBNICE_CFLAGS) \ + + COMMON_LDADD = \ + $(GST_LIBS) \ +- $(top_builddir)/nice/libnice.la ++ $(prefix)/lib/libnice.la + + + # libgstnice -- cgit v1.2.3