wtay gst-plugins-bad: gst-plugins-bad/ gst-plugins-bad/gst/pcapparse/

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-bad
Changes by:     wtay
Date:           Mon Dec 29 2008  15:54:58 UTC

Log message:
Patch by: Damien Lespiau <damien dot lespiau at gmail dot com>
* gst/pcapparse/Makefile.am:
* gst/pcapparse/gstpcapparse.c:
Patch to make gstpcapparse compile with mingw32 gcc. Fixes #565439.

Modified files:
    .               : ChangeLog
    gst/pcapparse   : Makefile.am gstpcapparse.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3836&r2=1.3837
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/pcapparse/Makefile.am.diff?r1=1.2&r2=1.3
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/pcapparse/gstpcapparse.c.diff?r1=1.4&r2=1.5

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v
retrieving revision 1.3836
retrieving revision 1.3837
diff -u -d -r1.3836 -r1.3837
--- ChangeLog	29 Dec 2008 15:49:35 -0000	1.3836
+++ ChangeLog	29 Dec 2008 15:54:43 -0000	1.3837
@@ -1,5 +1,13 @@
 2008-12-29  Wim Taymans  <[email protected]>
 
+	Patch by: Damien Lespiau <damien dot lespiau at gmail dot com>
+
+	* gst/pcapparse/Makefile.am:
+	* gst/pcapparse/gstpcapparse.c:
+	Patch to make gstpcapparse compile with mingw32 gcc. Fixes #565439.
+2008-12-29  Wim Taymans  <[email protected]>
 	* gst/rtpmanager/gstrtpsession.c:
 	(gst_rtp_session_getcaps_send_rtp):
 	Use method to get the internal SSRC.
Index: Makefile.am
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/pcapparse/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	4 Nov 2008 12:42:15 -0000	1.2
+++ Makefile.am	29 Dec 2008 15:54:44 -0000	1.3
@@ -1,5 +1,12 @@
 plugin_LTLIBRARIES = libgstpcapparse.la
+# when compiling for windows we need to link with the winsock library
+if HAVE_WINSOCK2_H
+  WINSOCK2_LIBS = -lws2_32
+else
+  WINSOCK2_LIBS = 
+endif
 libgstpcapparse_la_SOURCES = \
 	gstpcapparse.c
@@ -7,7 +14,7 @@
 	gstpcapparse.h
 libgstpcapparse_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS)
-libgstpcapparse_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS)
+libgstpcapparse_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(WINSOCK2_LIBS)
 libgstpcapparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstpcapparse_la_LIBTOOLFLAGS = --tag=disable-static
Index: gstpcapparse.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/pcapparse/gstpcapparse.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gstpcapparse.c	15 Sep 2008 09:39:00 -0000	1.4
+++ gstpcapparse.c	29 Dec 2008 15:54:44 -0000	1.5
@@ -48,7 +48,7 @@
 #include <string.h>
-#ifndef _MSC_VER
+#ifndef G_OS_WIN32
 #include <arpa/inet.h>
 #include <netinet/in.h>

------------------------------------------------------------------------------