Update to 0.0.22:

    Version 0.0.22
    Disable the test for changing the DTMF PT for now
    python: Require pygobject 2.16 to build
    rtpconference: The ptime/maxptime in caps are actually uints, not strings
    Update common and tabify Makefiles
    gitignore: Hide shm test
    readme: bump -bad requirement for shm plugin
    tests: Whitelist shm plugin
    tests: Clear GError* between tests
    shmtrans: Don't try to unref NULL pointer on error
    configure: Require GLib 2.16 for GIO
    GIO is required by the shm example, require it.
    tests shm: check that prepared is called
    shmtrans: Sync downstream element states before linking them
    shmtrans: Add debug
    shmtrans: Release teepad before stopping downstream elements
    shmtrans: Emit local candidate with new path
    shmstreamtrans: Set the sending in set property (not get)
    shmtrans: Set do-timestamp and is-live to true on shmsrc
    shmstreamtransmitter: Emit local-candidates-prepared
    shm: Document shm stream transmitter
    shmstream: Also ignore usernames that are empty
    shm: Replace base_ip with username
    simplecall: Add shm version of simple-call
    shm: Verify the success of state changes
    tests: Add tests for the shm transmitter
    shm: Implement shm transmitter
    shm: Add empty transmitter
    tests: Unlock lock in all cases
    fsplugin: Release lock on errors
    elementaddednotifier: Don't abort on elements that have no factory
    rtpsession: Use copy of codec because mutex has been unlocked
    Can't use the ca pointer because it is part of a list that
    has been unlocked.
    tests: Skip theora reception test if theora is not detected

6 files changed, 25 insertions, 68 deletions

diff --git a/multimedia/farsight2/Makefile b/multimedia/farsight2/Makefile
index eee8f93d314..f755a420063 100644
--- a/multimedia/farsight2/Makefile
+++ b/multimedia/farsight2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2010/11/15 22:58:03 abs Exp $
+# $NetBSD: Makefile,v 1.13 2010/11/23 18:02:02 wiz Exp $
 #
 
-DISTNAME=	farsight2-0.0.21
-PKGREVISION=	2
+DISTNAME=	farsight2-0.0.22
 CATEGORIES=	chat multimedia
 MASTER_SITES=	http://farsight.freedesktop.org/releases/farsight2/
 
diff --git a/multimedia/farsight2/distinfo b/multimedia/farsight2/distinfo
index ee920cc93b5..6a77c185a5e 100644
--- a/multimedia/farsight2/distinfo
+++ b/multimedia/farsight2/distinfo
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.10 2010/08/09 11:09:24 wiz Exp $
+$NetBSD: distinfo,v 1.11 2010/11/23 18:02:02 wiz Exp $
 
-SHA1 (farsight2-0.0.21.tar.gz) = baf51f52eeeb81214b376ce1b9f33a22ccac7298
-RMD160 (farsight2-0.0.21.tar.gz) = 198feb04be765cae836c09cc3492842e1788e56b
-Size (farsight2-0.0.21.tar.gz) = 1090456 bytes
-SHA1 (patch-aa) = 90420855ee86544ae438bcbb258fe36fecc3fb33
+SHA1 (farsight2-0.0.22.tar.gz) = 315509c30c494ab7fb179d5222a996f52651428d
+RMD160 (farsight2-0.0.22.tar.gz) = 433d59500f6cfde1b7da6cad898ff59158382615
+Size (farsight2-0.0.22.tar.gz) = 1117646 bytes
+SHA1 (patch-aa) = 01fb41113ce9ccfdd685400bebb187db8d0d116f
 SHA1 (patch-ab) = 27fd12ad2d1774cbeb7c11a4cee5b40e5ea97853
-SHA1 (patch-ac) = 144e76f2b5e0be37ab4d62b2ae3c133cedcc3d78
-SHA1 (patch-ad) = 4d3fc010e102f726c6e832b0e4de4962d157fa94
-SHA1 (patch-ae) = 5f16f2602f72598980852bb08df8066be8c90b5d
 SHA1 (patch-ai) = 6459729f80f592a2a333d683b05a139b499f46c6
 SHA1 (patch-aj) = c8f92433243a5741403721bb248e4471a23583eb
 SHA1 (patch-ak) = 591ab7b6afefc84443280b01c765492007686ff6
diff --git a/multimedia/farsight2/patches/patch-aa b/multimedia/farsight2/patches/patch-aa
index 8180a98b8c8..9f0f3046097 100644
--- a/multimedia/farsight2/patches/patch-aa
+++ b/multimedia/farsight2/patches/patch-aa
@@ -1,15 +1,21 @@
-$NetBSD: patch-aa,v 1.4 2010/08/06 10:15:14 drochner Exp $
+$NetBSD: patch-aa,v 1.5 2010/11/23 18:02:02 wiz Exp $
 
-https://bugs.freedesktop.org/show_bug.cgi?id=23378
+Fix compilation problem on NetBSD:
+  CC     libshm_transmitter_la-fs-shm-stream-transmitter.lo
+In file included from fs-shm-transmitter.c:56:
+/usr/include/netinet/ip.h:67: error: field 'ip_src' has incomplete type
+/usr/include/netinet/ip.h:67: error: field 'ip_dst' has incomplete type
+/usr/include/netinet/ip.h:149: error: expected specifier-qualifier-list before 'n_time'
+/usr/include/netinet/ip.h:187: error: field 'ippseudo_src' has incomplete type
+/usr/include/netinet/ip.h:188: error: field 'ippseudo_dst' has incomplete type
 
---- configure.orig	2010-06-01 21:12:47.000000000 +0000
-+++ configure
-@@ -14450,7 +14450,7 @@ rm -f core conftest.err conftest.$ac_obj
- $as_echo "$flag_ok" >&6; }
+--- transmitters/shm/fs-shm-transmitter.c.orig	2010-09-21 21:22:33.000000000 +0000
++++ transmitters/shm/fs-shm-transmitter.c
+@@ -53,7 +53,6 @@
+ #else /*G_OS_WIN32*/
+ # include <netdb.h>
+ # include <sys/socket.h>
+-# include <netinet/ip.h>
+ # include <arpa/inet.h>
+ #endif /*G_OS_WIN32*/
  
- 
--        if test "x$ERROR_CFLAGS" == "x"
-+        if test "x$ERROR_CFLAGS" = "x"
-     then
- 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -errwarn=%all" >&5
diff --git a/multimedia/farsight2/patches/patch-ac b/multimedia/farsight2/patches/patch-ac
deleted file mode 100644
index 08a27cb8d55..00000000000
--- a/multimedia/farsight2/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2010/08/06 10:15:14 drochner Exp $
-
-https://bugs.freedesktop.org/show_bug.cgi?id=23378
-
---- common/glib-gen.mak.orig	2010-05-18 21:07:38.000000000 +0000
-+++ common/glib-gen.mak
-@@ -26,7 +26,7 @@ enum_headers=$(foreach h,$(glib_enum_hea
- 	$^ > $@
- 
- %-enumtypes.c: $(glib_enum_headers)
--	@if test "x$(glib_enum_headers)" == "x"; then echo "ERROR: glib_enum_headers is empty, please fix Makefile"; exit 1; fi
-+	@if test "x$(glib_enum_headers)" = "x"; then echo "ERROR: glib_enum_headers is empty, please fix Makefile"; exit 1; fi
- 	$(AM_V_GEN)glib-mkenums \
- 	--fhead "#include \"$*-enumtypes.h\"\n$(enum_headers)" \
- 	--fprod "\n/* enumerations from \"@filename@\" */" \
diff --git a/multimedia/farsight2/patches/patch-ad b/multimedia/farsight2/patches/patch-ad
deleted file mode 100644
index f5132c268b1..00000000000
--- a/multimedia/farsight2/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2010/08/09 11:09:24 wiz Exp $
-
-gmake-3.82 allows no code outside of targets.
-
---- python/Makefile.in.orig	2010-07-16 23:00:59.000000000 +0000
-+++ python/Makefile.in
-@@ -677,7 +677,7 @@ uninstall-am: uninstall-pyfarsightLTLIBR
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- 	tags uninstall uninstall-am uninstall-pyfarsightLTLIBRARIES
- 
--[ -z "$PYDEFS" && PYDEFS=`pkg-config --variable=defsdir pygtk-2.0`]
-+PYDEFS=`pkg-config --variable=defsdir pygtk-2.0`
- 
- pyfarsight.c: pyfarsight.override pyfarsight.defs
- 	$(PYCODEGEN)						\
diff --git a/multimedia/farsight2/patches/patch-ae b/multimedia/farsight2/patches/patch-ae
deleted file mode 100644
index 75122724877..00000000000
--- a/multimedia/farsight2/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2010/08/09 11:09:24 wiz Exp $
-
-Whitespace fix for gmake-3.82.
-
---- docs/libs/Makefile.in.orig	2010-07-16 23:00:58.000000000 +0000
-+++ docs/libs/Makefile.in
-@@ -766,7 +766,7 @@ dist-hook: dist-check-gtkdoc dist-hook-l
- 	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
- 	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
- 	cd $(distdir) && rm -f $(DISTCLEANFILES)
--        -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
-+	-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
- 
- .PHONY : dist-hook-local docs
-