From 6cbd6afc0bbeef26f58d73dc17a0ce2cee41dde2 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Thu, 3 Nov 2011 16:43:00 +0100
Subject: [PATCH] update for new net library

---
 common                      | 2 +-
 configure.ac                | 1 +
 gst/rtpmanager/Makefile.am  | 4 ++--
 gst/rtpmanager/rtpsession.c | 1 -
 gst/rtpmanager/rtpsession.h | 1 -
 gst/rtpmanager/rtpsource.h  | 2 +-
 gst/rtpmanager/rtpstats.h   | 2 +-
 gst/udp/Makefile.am         | 5 ++---
 gst/udp/gstdynudpsink.c     | 2 +-
 gst/udp/gstudp.c            | 2 +-
 gst/udp/gstudpsrc.c         | 2 +-
 11 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/common b/common
index 0546e5881d..762b6927ff 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 0546e5881d1ec7137c71d35247729e28c1a4ab66
+Subproject commit 762b6927ffdd1726cb4f4783f49b5cfaa9edd941
diff --git a/configure.ac b/configure.ac
index 0a4d9947a2..29dd4e047f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -214,6 +214,7 @@ AG_GST_CHECK_GST($GST_MAJORMINOR, [$GST_REQ], yes)
 AG_GST_CHECK_GST_BASE($GST_MAJORMINOR, [$GST_REQ], yes)
 AG_GST_CHECK_GST_GDP($GST_MAJORMINOR, [$GST_REQ], yes)
 AG_GST_CHECK_GST_CONTROLLER($GST_MAJORMINOR, [$GST_REQ], yes)
+AG_GST_CHECK_GST_NET($GST_MAJORMINOR, [$GST_REQ], yes)
 AG_GST_CHECK_GST_CHECK($GST_MAJORMINOR, [$GST_REQ], no)
 AG_GST_CHECK_GST_PLUGINS_BASE($GST_MAJORMINOR, [$GSTPB_REQ], yes)
 
diff --git a/gst/rtpmanager/Makefile.am b/gst/rtpmanager/Makefile.am
index f61099c1b6..bfcb02824f 100644
--- a/gst/rtpmanager/Makefile.am
+++ b/gst/rtpmanager/Makefile.am
@@ -36,9 +36,9 @@ noinst_HEADERS = gstrtpbin.h \
 		 gstrtpsession.h
 
 libgstrtpmanager_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
-	$(WARNING_CFLAGS) $(ERROR_CFLAGS)
+	$(GST_NET_CFLAGS) $(WARNING_CFLAGS) $(ERROR_CFLAGS)
 libgstrtpmanager_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-	-lgstnetbuffer-@GST_MAJORMINOR@ -lgstrtp-@GST_MAJORMINOR@ \
+	$(GST_NET_LIBS) -lgstrtp-@GST_MAJORMINOR@ \
 	$(GST_BASE_LIBS) $(GST_LIBS_LIBS)
 libgstrtpmanager_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstrtpmanager_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/gst/rtpmanager/rtpsession.c b/gst/rtpmanager/rtpsession.c
index 00261d5a43..930dc31a89 100644
--- a/gst/rtpmanager/rtpsession.c
+++ b/gst/rtpmanager/rtpsession.c
@@ -21,7 +21,6 @@
 
 #include <gst/rtp/gstrtpbuffer.h>
 #include <gst/rtp/gstrtcpbuffer.h>
-#include <gst/netbuffer/gstnetbuffer.h>
 
 #include "gstrtpbin-marshal.h"
 #include "rtpsession.h"
diff --git a/gst/rtpmanager/rtpsession.h b/gst/rtpmanager/rtpsession.h
index 6b827f60a1..4d43079da3 100644
--- a/gst/rtpmanager/rtpsession.h
+++ b/gst/rtpmanager/rtpsession.h
@@ -21,7 +21,6 @@
 #define __RTP_SESSION_H__
 
 #include <gst/gst.h>
-#include <gst/netbuffer/gstnetbuffer.h>
 
 #include "rtpsource.h"
 
diff --git a/gst/rtpmanager/rtpsource.h b/gst/rtpmanager/rtpsource.h
index 6db0a6a678..398634c231 100644
--- a/gst/rtpmanager/rtpsource.h
+++ b/gst/rtpmanager/rtpsource.h
@@ -22,7 +22,7 @@
 
 #include <gst/gst.h>
 #include <gst/rtp/gstrtcpbuffer.h>
-#include <gst/netbuffer/gstnetbuffer.h>
+#include <gst/net/gstnetaddressmeta.h>
 
 #include "rtpstats.h"
 
diff --git a/gst/rtpmanager/rtpstats.h b/gst/rtpmanager/rtpstats.h
index 4560595edb..bbaf5d9477 100644
--- a/gst/rtpmanager/rtpstats.h
+++ b/gst/rtpmanager/rtpstats.h
@@ -21,7 +21,7 @@
 #define __RTP_STATS_H__
 
 #include <gst/gst.h>
-#include <gst/netbuffer/gstnetbuffer.h>
+#include <gst/net/gstnetaddressmeta.h>
 
 /**
  * RTPSenderReport:
diff --git a/gst/udp/Makefile.am b/gst/udp/Makefile.am
index 71a5971c50..3e2bdbf949 100644
--- a/gst/udp/Makefile.am
+++ b/gst/udp/Makefile.am
@@ -17,9 +17,8 @@ libgstudp_la_SOURCES = gstudp.c gstudpsrc.c gstudpsink.c gstmultiudpsink.c gstdy
 
 # adding -D_GNU_SOURCE to get non-POSIX extensions like EAI_ADDRFAMILY
 # with glibc >= 2.8 when including netdb.h (see glibc sources bug 6452)
-libgstudp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) -D_GNU_SOURCE
-libgstudp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstnetbuffer-@GST_MAJORMINOR@ \
-			$(GST_BASE_LIBS) $(WIN32_LIBS)
+libgstudp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_NET_CFLAGS) $(GST_CFLAGS) -D_GNU_SOURCE
+libgstudp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_NET_LIBS) $(WIN32_LIBS)
 libgstudp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstudp_la_LIBTOOLFLAGS = --tag=disable-static
 
diff --git a/gst/udp/gstdynudpsink.c b/gst/udp/gstdynudpsink.c
index 42f13bdae1..e92cc5b091 100644
--- a/gst/udp/gstdynudpsink.c
+++ b/gst/udp/gstdynudpsink.c
@@ -36,7 +36,7 @@
 #include <sys/time.h>
 #endif
 #include <sys/types.h>
-#include <gst/netbuffer/gstnetbuffer.h>
+#include <gst/net/gstnetaddressmeta.h>
 
 GST_DEBUG_CATEGORY_STATIC (dynudpsink_debug);
 #define GST_CAT_DEFAULT (dynudpsink_debug)
diff --git a/gst/udp/gstudp.c b/gst/udp/gstudp.c
index 2ea852a359..b95213e8c3 100644
--- a/gst/udp/gstudp.c
+++ b/gst/udp/gstudp.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include <gst/netbuffer/gstnetbuffer.h>
+#include <gst/net/gstnetaddressmeta.h>
 
 #include "gstudpsrc.h"
 #include "gstmultiudpsink.h"
diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c
index c7ecc8f314..12ca578697 100644
--- a/gst/udp/gstudpsrc.c
+++ b/gst/udp/gstudpsrc.c
@@ -116,7 +116,7 @@
 #include <io.h>
 #endif
 
-#include <gst/netbuffer/gstnetbuffer.h>
+#include <gst/net/gstnetaddressmeta.h>
 
 #ifdef HAVE_FIONREAD_IN_SYS_FILIO
 #include <sys/filio.h>