[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. cd69f4433aa7e6dd1818
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. cd69f4433aa7e6dd1818170197d41dcd5dc116b4 |
Date: |
Wed, 20 Oct 2010 20:59:24 +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 cd69f4433aa7e6dd1818170197d41dcd5dc116b4 (commit)
via 103eb326917bdd9d2c26f9759ef71a118f39eda1 (commit)
via 6ccb659f41d6afc4ce46c87a6ba1d4f1a0c71fa2 (commit)
via 8040fe5f787323cd30058972a2d9b3ef31f4d16d (commit)
from 731befc1cd9a4dbf4066aa980ae7dadaafbd5059 (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=cd69f4433aa7e6dd1818170197d41dcd5dc116b4
commit cd69f4433aa7e6dd1818170197d41dcd5dc116b4
Merge: 103eb32 731befc
Author: Sandro Santilli <address@hidden>
Date: Wed Oct 20 22:59:19 2010 +0200
Merge branch 'master' of ssh://address@hidden/srv/git/gnash
http://git.savannah.gnu.org/cgit//commit/?id=103eb326917bdd9d2c26f9759ef71a118f39eda1
commit 103eb326917bdd9d2c26f9759ef71a118f39eda1
Author: Sandro Santilli <address@hidden>
Date: Wed Oct 20 22:50:40 2010 +0200
Get "lateness" right (positive number is late, negative is early)
diff --git a/libsound/sound_handler.cpp b/libsound/sound_handler.cpp
index 62c5dc2..a55b112 100644
--- a/libsound/sound_handler.cpp
+++ b/libsound/sound_handler.cpp
@@ -556,7 +556,7 @@ sound_handler::fetchSamples (boost::int16_t* to, unsigned
int nSamples)
boost::uint32_t tt = timerTotal.elapsed();
boost::uint32_t exptime = fetched*1000/88200;
log_debug("Samples fetch frequency: %d KHz (%dms late)",
- floor(fetched*500.0/tt)/1000, (long)exptime-tt);
+ floor(fetched*500.0/tt)/1000, (long)tt-exptime);
timerLocal.restart();
}
#endif
http://git.savannah.gnu.org/cgit//commit/?id=6ccb659f41d6afc4ce46c87a6ba1d4f1a0c71fa2
commit 6ccb659f41d6afc4ce46c87a6ba1d4f1a0c71fa2
Author: Sandro Santilli <address@hidden>
Date: Wed Oct 20 20:02:26 2010 +0200
Use LDADD, not LDFLAGS, for gnash libs and other (as done by gtk). Should
fix dependency computation when doing static linking
diff --git a/gui/am-frag/dump.am b/gui/am-frag/dump.am
index 7766e0b..33f5d3c 100644
--- a/gui/am-frag/dump.am
+++ b/gui/am-frag/dump.am
@@ -24,8 +24,7 @@ bin_PROGRAMS += dump-gnash
dump_gnash_SOURCES = $(GUI_SRCS) gui_dump.cpp dump.cpp dump.h
dump_gnash_CPPFLAGS = -DGUI_DUMP -DGUI_CONFIG=\"DUMP\" \
$(AM_CPPFLAGS) $(DUMP_CFLAGS) $(AGG_CFLAGS)
-dump_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS) \
- $(top_builddir)/librender/libgnashrender.la \
- $(GNASH_LIBS) $(DUMP_LIBS) $(AGG_LIBS) $(CAIRO_LIBS)
+dump_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
+dump_gnash_LDADD = $(GNASH_LIBS) $(DUMP_LIBS) $(AGG_LIBS) $(CAIRO_LIBS)
endif # BUILD_AGG_RENDERER
endif # BUILD_DUMP_GUI
http://git.savannah.gnu.org/cgit//commit/?id=8040fe5f787323cd30058972a2d9b3ef31f4d16d
commit 8040fe5f787323cd30058972a2d9b3ef31f4d16d
Author: Sandro Santilli <address@hidden>
Date: Wed Oct 20 20:01:46 2010 +0200
libgnashrender.la is already part of GNASH_LIBS
diff --git a/gui/gtk/gtk.am b/gui/gtk/gtk.am
index e352601..11398b2 100644
--- a/gui/gtk/gtk.am
+++ b/gui/gtk/gtk.am
@@ -41,8 +41,7 @@ endif # BUILD_OGL_RENDERER
if BUILD_AGG_RENDERER
gtk_gnash_CPPFLAGS += $(AGG_CFLAGS)
gtk_gnash_SOURCES += gtk/gtk_glue_agg.cpp gtk/gtk_glue_agg.h
-gtk_gnash_LDADD = $(top_builddir)/librender/libgnashrender.la \
- $(GNASH_LIBS) $(GTK_LIBS) $(AGG_LIBS) $(CAIRO_LIBS)
+gtk_gnash_LDADD = $(GNASH_LIBS) $(GTK_LIBS) $(AGG_LIBS) $(CAIRO_LIBS)
if HAVE_VAAPI
noinst_HEADERS += gtk/gtk_glue_agg_vaapi.h
-----------------------------------------------------------------------
Summary of changes:
gui/am-frag/dump.am | 5 ++---
gui/gtk/gtk.am | 3 +--
libsound/sound_handler.cpp | 2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
hooks/post-receive
--
Gnash
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. cd69f4433aa7e6dd1818170197d41dcd5dc116b4,
Sandro Santilli <=