[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. 4d47840708d25f576039
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. 4d47840708d25f5760396233704b5f533b3c3e0c |
|
Date: |
Tue, 14 Sep 2010 11:23:12 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via 4d47840708d25f5760396233704b5f533b3c3e0c (commit)
via c8c7b4cc68c498a93836e6b090290030d7d6108e (commit)
via f9e882e4795b8e0c5c0d9751488cecf70b306c62 (commit)
via 47e96a4fc845d6814eb7f5a44420638795ffadf2 (commit)
via 1d834773aa04ac7e07066438f653cdceb3c43af8 (commit)
from b7a8678bc9c492cfd62b2fec5d26f4e84fef6f26 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=4d47840708d25f5760396233704b5f533b3c3e0c
commit 4d47840708d25f5760396233704b5f533b3c3e0c
Merge: c8c7b4c b7a8678
Author: Benjamin Wolsey <address@hidden>
Date: Tue Sep 14 12:51:34 2010 +0200
Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash
http://git.savannah.gnu.org/cgit//commit/?id=c8c7b4cc68c498a93836e6b090290030d7d6108e
commit c8c7b4cc68c498a93836e6b090290030d7d6108e
Author: Benjamin Wolsey <address@hidden>
Date: Tue Sep 14 12:11:39 2010 +0200
Fix mingw compile under Linux.
diff --git a/libbase/ClockTime.cpp b/libbase/ClockTime.cpp
index dede0c3..9bb2cd8 100644
--- a/libbase/ClockTime.cpp
+++ b/libbase/ClockTime.cpp
@@ -84,14 +84,12 @@ clocktime::getTimeZoneOffset()
#include <ctime> // for time_t, localtime
-#if !defined(HAVE_GETTIMEOFDAY) || (!defined(HAVE_TM_GMTOFF) &&
!defined(HAVE_TZSET))
#ifdef HAVE_FTIME
extern "C" {
-# include <sys/types.h> // for ftime()
-# include <sys/timeb.h> // for ftime()
+# include <sys/types.h>
+# include <sys/timeb.h>
}
#endif
-#endif
#if !defined(HAVE_TM_GMTOFF)
# ifdef HAVE_LONG_TIMEZONE
@@ -223,7 +221,7 @@ clocktime::getTimeZoneOffset(double time)
offset = -timezone / 60;
//gnash::log_debug("Using tzset. Offset is %d", offset);
-# elif defined(HAVE_GETTIMEOFDAY)
+# elif !defined(WIN32) && defined(HAVE_GETTIMEOFDAY)
// gettimeofday(3):
// "The use of the timezone structure is obsolete; the tz argument
http://git.savannah.gnu.org/cgit//commit/?id=f9e882e4795b8e0c5c0d9751488cecf70b306c62
commit f9e882e4795b8e0c5c0d9751488cecf70b306c62
Author: Benjamin Wolsey <address@hidden>
Date: Tue Sep 14 12:11:03 2010 +0200
Makefile cleanup, allow static linking of curl.
diff --git a/gui/Makefile.am b/gui/Makefile.am
index fb6cfcb..2922c4d 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -118,10 +118,12 @@ AM_LDFLAGS = \
$(PTHREAD_LIBS) \
$(NULL)
+
GNASH_LIBS = \
- $(top_builddir)/libmedia/libgnashmedia.la \
$(top_builddir)/libcore/libgnashcore.la \
+ $(top_builddir)/librender/libgnashrender.la \
$(top_builddir)/libsound/libgnashsound.la \
+ $(top_builddir)/libmedia/libgnashmedia.la \
$(top_builddir)/libbase/libgnashbase.la
if LIBLTDL2
diff --git a/gui/sdl/sdl.am b/gui/sdl/sdl.am
index 51400b3..eca9279 100644
--- a/gui/sdl/sdl.am
+++ b/gui/sdl/sdl.am
@@ -22,17 +22,17 @@ if BUILD_SDL_GUI
bin_PROGRAMS += sdl-gnash
sdl_gnash_CPPFLAGS = -DGUI_SDL -DGUI_CONFIG=\"SDL\" \
$(AM_CPPFLAGS) $(SDL_CFLAGS)
+
sdl_gnash_SOURCES = $(GUI_SRCS) \
sdl/gui_sdl.cpp \
sdl/sdl.cpp \
sdl/sdlsup.h \
sdl/sdl_glue.h
+
sdl_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
-#sdl_gnash_DEPENDENCIES = .configline
sdl_gnash_LDADD = \
- $(top_builddir)/librender/libgnashrender.la \
- $(MYSQL_LIBS) \
$(GNASH_LIBS) \
+ $(MYSQL_LIBS) \
$(AM_LDFLAGS) \
$(SDL_LIBS)
diff --git a/libcore/Makefile.am b/libcore/Makefile.am
index 9670940..d3407b9 100644
--- a/libcore/Makefile.am
+++ b/libcore/Makefile.am
@@ -287,11 +287,11 @@ instdir = $(includedir)/gnash/asobj
inst_HEADERS += $(EXTENSIONS_API)
libgnashcore_la_LIBADD = \
- $(top_builddir)/libbase/libgnashbase.la \
$(top_builddir)/libcore/parser/libgnashparser.la \
$(top_builddir)/libcore/vm/libgnashvm.la \
$(top_builddir)/libmedia/libgnashmedia.la \
$(top_builddir)/libsound/libgnashsound.la \
+ $(top_builddir)/libbase/libgnashbase.la \
$(BOOST_LIBS) \
$(PTHREAD_LIBS) \
$(FREETYPE2_LIBS) \
@@ -317,27 +317,6 @@ endif
#libserver_la_LIBDADD = address@hidden@
libgnashcore_la_LDFLAGS = -release $(VERSION) -export-dynamic
-# if WIN32
-# libgnashcore_la_LDFLAGS += -no-undefined
-# libgnashcore_la_LIBADD += \
-# $(top_builddir)/libmedia/libgnashmedia_la-MediaParser.lo \
-# $(top_builddir)/libmedia/libgnashmedia_la-MediaHandler.lo \
-# $(top_builddir)/libmedia/libgnashmedia_la-FLVParser.lo \
-# if USE_FFMPEG_ENGINE
-# $(top_builddir)/libmedia/libgnashmedia_la-AudioInput.lo \
-# endif
-# $(top_builddir)/libmedia/libgnashmedia_la-AudioDecoderNellymoser.lo \
-# $(top_builddir)/libmedia/libgnashmedia_la-AudioDecoderSimple.lo \
-# $(top_builddir)/libmedia/libgnashmedia_la-AudioResampler.lo
-# if HAVE_SPEEX
-# libgnashcore_la_LIBADD += \
-# $(top_builddir)/libmedia/libgnashmedia_la-AudioDecoderSpeex.lo
-# endif
-# else
-# libgnashcore_la_LIBADD += $(top_builddir)/libmedia/libgnashmedia.la \
-# $(top_builddir)/libsound/libgnashsound.la
-# endif
-
if HAIKU
libgnashcore_la_LIBADD += $(HAIKU_LIBS)
endif
diff --git a/libmedia/Makefile.am b/libmedia/Makefile.am
index 71a7d53..fdcde93 100644
--- a/libmedia/Makefile.am
+++ b/libmedia/Makefile.am
@@ -122,7 +122,7 @@ if USE_GST_ENGINE
libgnashmedia_la_LIBADD += \
-lgstbase-0.10 \
- $(GSTREAMER_APP_LIBS) \
+ $(GSTREAMER_APP_LIBS) \
$(GSTPBUTILS_LIBS) \
$(GSTREAMER_PLUGINS_BASE_LIBS) \
$(GSTREAMER_LIBS) \
diff --git a/librender/Makefile.am b/librender/Makefile.am
index f6f0165..fe11b0f 100644
--- a/librender/Makefile.am
+++ b/librender/Makefile.am
@@ -30,15 +30,15 @@ pluginsdir = $(libdir)/gnash/plugins
## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
AM_CPPFLAGS = -I.. \
- -I$(srcdir) \
- -I$(top_srcdir) \
- -I$(top_srcdir)/libcore \
- -I$(top_srcdir)/libcore/parser \
- -I$(top_srcdir)/libcore/swf \
- -I$(top_srcdir)/libbase \
+ -I$(srcdir) \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/libcore \
+ -I$(top_srcdir)/libcore/parser \
+ -I$(top_srcdir)/libcore/swf \
+ -I$(top_srcdir)/libbase \
-I$(top_srcdir)/librender \
$(PTHREAD_CFLAGS) \
- $(SDL_CFLAGS) \
+ $(SDL_CFLAGS) \
$(PANGO_CFLAGS) \
$(GLIB_CFLAGS) \
$(ATK_CFLAGS) \
@@ -53,8 +53,8 @@ AM_CPPFLAGS = -I.. \
$(NULL)
GNASH_LIBS = \
- $(top_builddir)/libbase/libgnashbase.la \
- $(top_builddir)/libcore/libgnashcore.la
+ $(top_builddir)/libcore/libgnashcore.la \
+ $(top_builddir)/libbase/libgnashbase.la
noinst_HEADERS = \
Renderer.h \
diff --git a/libsound/Makefile.am b/libsound/Makefile.am
index d950135..1f5fe62 100644
--- a/libsound/Makefile.am
+++ b/libsound/Makefile.am
@@ -30,8 +30,8 @@ libgnashsound_la_CPPFLAGS = \
$(NULL)
libgnashsound_la_LIBADD = \
- $(top_builddir)/libbase/libgnashbase.la \
$(top_builddir)/libmedia/libgnashmedia.la \
+ $(top_builddir)/libbase/libgnashbase.la \
$(BOOST_LIBS) \
$(PTHREAD_LIBS) \
$(SDL_LIBS) \
diff --git a/macros/curl.m4 b/macros/curl.m4
index e008cf7..56bb648 100644
--- a/macros/curl.m4
+++ b/macros/curl.m4
@@ -111,6 +111,10 @@ AC_DEFUN([GNASH_PATH_CURL],
CURL_CFLAGS=""
fi
+ if ${ENABLE_STATIC}; then
+ CURL_CFLAGS+=" -DCURL_STATICLIB"
+ fi
+
if test x"${ac_cv_path_curl_lib}" != x ; then
CURL_LIBS="${ac_cv_path_curl_lib}"
else
http://git.savannah.gnu.org/cgit//commit/?id=47e96a4fc845d6814eb7f5a44420638795ffadf2
commit 47e96a4fc845d6814eb7f5a44420638795ffadf2
Author: Benjamin Wolsey <address@hidden>
Date: Tue Sep 14 12:05:44 2010 +0200
Zero fds to fix w32 crash.
diff --git a/libbase/curl_adapter.cpp b/libbase/curl_adapter.cpp
index dbc3124..4604bee 100644
--- a/libbase/curl_adapter.cpp
+++ b/libbase/curl_adapter.cpp
@@ -74,7 +74,10 @@ NetworkAdapter::makeStream(const std::string& url,
#else // def USE_CURL
+extern "C" {
#include <curl/curl.h>
+}
+
#include "utility.h"
#include "GnashException.h"
#include "rc.h"
@@ -604,6 +607,10 @@ CurlStreamFile::fillCache(std::streamsize size)
}
fd_set readfd, writefd, exceptfd;
+ FD_ZERO(&readfd);
+ FD_ZERO(&writefd);
+ FD_ZERO(&exceptfd);
+
int maxfd;
CURLMcode mcode;
timeval tv;
@@ -673,7 +680,7 @@ CurlStreamFile::fillCache(std::streamsize size)
// select() will always fail on OS/2 and AmigaOS4 as we can't select
// on file descriptors, only on sockets
-#if !defined(__OS2__) && !defined(__amigaos4__)
+#if !defined(__OS2__) && !defined(__amigaos4__) && !defined(WIN32)
if ( ret == -1 )
{
if ( errno == EINTR )
http://git.savannah.gnu.org/cgit//commit/?id=1d834773aa04ac7e07066438f653cdceb3c43af8
commit 1d834773aa04ac7e07066438f653cdceb3c43af8
Author: Benjamin Wolsey <address@hidden>
Date: Mon Sep 13 14:15:37 2010 +0200
Link avformat first (needed in static linking).
diff --git a/macros/ffmpeg.m4 b/macros/ffmpeg.m4
index 15fa707..d8426ca 100644
--- a/macros/ffmpeg.m4
+++ b/macros/ffmpeg.m4
@@ -460,7 +460,7 @@ dnl AC_EGREP_HEADER(avcodec_decode_audio2, ${avcodec_h},
[avfound=yes], [avfou
if test x"${libavformat}" = x; then
if test -f ${top_lib_dir}/libavformat.a -o -f
${top_lib_dir}/libavformat.${shlibext}; then
- ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lavformat"
+ ac_cv_path_ffmpeg_lib="-lavformat ${ac_cv_path_ffmpeg_lib}"
AC_MSG_RESULT(${top_lib_dir}/libavformat)
else
AC_MSG_RESULT(no)
-----------------------------------------------------------------------
Summary of changes:
gui/Makefile.am | 4 +++-
gui/sdl/sdl.am | 6 +++---
libbase/ClockTime.cpp | 8 +++-----
libbase/curl_adapter.cpp | 9 ++++++++-
libcore/Makefile.am | 23 +----------------------
libmedia/Makefile.am | 2 +-
librender/Makefile.am | 18 +++++++++---------
libsound/Makefile.am | 2 +-
macros/curl.m4 | 4 ++++
macros/ffmpeg.m4 | 2 +-
10 files changed, 34 insertions(+), 44 deletions(-)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. 4d47840708d25f5760396233704b5f533b3c3e0c,
Benjamin Wolsey <=