diff options
| author | Damien Lespiau <damien.lespiau@gmail.com> | 2008-07-04 16:06:09 +0000 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2008-07-04 16:06:09 +0000 |
| commit | 1f25b18c45770894988fa8914e6cd905c4f81fa3 (patch) | |
| tree | c4b79236648e0aaf1e2f898ee6fb2a6ab63a3097 | |
| parent | 4e2dcf4015d952f8311a019f06fc85765089886b (diff) | |
| download | gst-plugins-bad-1f25b18c45770894988fa8914e6cd905c4f81fa3.tar.gz gst-plugins-bad-1f25b18c45770894988fa8914e6cd905c4f81fa3.tar.bz2 gst-plugins-bad-1f25b18c45770894988fa8914e6cd905c4f81fa3.zip | |
Fix built of the festival plugin with mingw32 by linking to ws2_32.dll and including winsock headers. Fixes bug #541522.
Original commit message from CVS:
Patch by: Damien Lespiau <damien dot lespiau at gmail dot com>
* configure.ac:
* gst/festival/Makefile.am:
* gst/festival/gstfestival.c:
Fix built of the festival plugin with mingw32 by linking to ws2_32.dll
and including winsock headers. Fixes bug #541522.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | gst/festival/Makefile.am | 9 | ||||
| -rw-r--r-- | gst/festival/gstfestival.c | 7 |
4 files changed, 28 insertions, 1 deletions
@@ -1,3 +1,13 @@ +2008-07-04 Sebastian Dröge <sebastian.droege@collabora.co.uk> + + Patch by: Damien Lespiau <damien dot lespiau at gmail dot com> + + * configure.ac: + * gst/festival/Makefile.am: + * gst/festival/gstfestival.c: + Fix built of the festival plugin with mingw32 by linking to ws2_32.dll + and including winsock headers. Fixes bug #541522. + 2008-07-03 Peter Kjellerstedt <pkj@axis.com> * ChangeLog: diff --git a/configure.ac b/configure.ac index c6cf3527..ab215942 100644 --- a/configure.ac +++ b/configure.ac @@ -303,6 +303,9 @@ dnl FIXME: maybe move to sys, or make work with winsock2 AC_CHECK_HEADERS([sys/socket.h], HAVE_SYS_SOCKET_H=yes) AC_CHECK_HEADERS([winsock2.h], HAVE_WINSOCK2_H=yes) +dnl needed for festival +AM_CONDITIONAL(HAVE_WINSOCK2_H, test "x$HAVE_WINSOCK2_H" = "xyes") + if test "x$HAVE_SYS_SOCKET_H" != "xyes"; then AG_GST_DISABLE_PLUGIN(librfb) fi diff --git a/gst/festival/Makefile.am b/gst/festival/Makefile.am index 45994420..8200d065 100644 --- a/gst/festival/Makefile.am +++ b/gst/festival/Makefile.am @@ -1,11 +1,18 @@ plugin_LTLIBRARIES = libgstfestival.la +if HAVE_WINSOCK2_H +WINSOCK2_LIBS = -lws2_32 +else +WINSOCK2_LIBS = +endif + libgstfestival_la_SOURCES = gstfestival.c libgstfestival_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) # we use net connection now... perhaps use the lib later # libgstfestival_la_LIBADD = $(FESTIVAL_LIBS) -libgstfestival_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-0.10 +libgstfestival_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) \ + -lgstaudio-0.10 $(WINSOCK2_LIBS) libgstfestival_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstfestival.h diff --git a/gst/festival/gstfestival.c b/gst/festival/gstfestival.c index f6f0a7b0..f2ce45a6 100644 --- a/gst/festival/gstfestival.c +++ b/gst/festival/gstfestival.c @@ -79,16 +79,23 @@ #include "config.h" #endif +#include <glib.h> /* Needed for G_OS_XXXX macros */ + #include <stdio.h> #include <stdlib.h> #include <unistd.h> #include <ctype.h> #include <string.h> #include <sys/types.h> +#ifdef G_OS_WIN32 +#include <winsock2.h> +#include <ws2tcpip.h> +#else #include <sys/socket.h> #include <netdb.h> #include <netinet/in.h> #include <arpa/inet.h> +#endif #include "gstfestival.h" #include <gst/audio/audio.h> |