[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1334-gc8ec6d2 |
|
Date: |
Mon, 12 Dec 2011 01:40:57 +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 c8ec6d24e4ecbd6e9238c3045582a22581dbaa9c (commit)
via 37a434385c375b08067467b3603a3515fd33e276 (commit)
via 2d4abc8b259ab76052b8f04d3f13a73bcf01401f (commit)
via 2fda9a6703a9867891f19162749230ff15c13b40 (commit)
via 372cd16cde77b3b8b4b2bcdba6cb517bf1161328 (commit)
via fbf1bc7efa6d0c05cbd63aaedbd016621dc81cff (commit)
via 7d6ccb673434dc1ddd2ddd679e807476cc25bdbd (commit)
via 6f9e7295c189bf8de7d57624b14c159f75dcf165 (commit)
via 4faf15c160512065ab98f2eed60569823903e23b (commit)
via 76e6d26d033f1bd2ac8ead18677523cf69afdeb2 (commit)
via 9bd5e7afd97e7cfcaf5d18804214fed02ef261b6 (commit)
from ab931a106bb3aa93e5e07ba6a9168e1da66ba60b (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=c8ec6d24e4ecbd6e9238c3045582a22581dbaa9c
commit c8ec6d24e4ecbd6e9238c3045582a22581dbaa9c
Author: Rob Savoye <address@hidden>
Date: Sun Dec 11 18:37:14 2011 -0700
add lingnashrender to the link
diff --git a/testsuite/libbase.all/Makefile.am
b/testsuite/libbase.all/Makefile.am
index f0c0a81..3730387 100644
--- a/testsuite/libbase.all/Makefile.am
+++ b/testsuite/libbase.all/Makefile.am
@@ -18,7 +18,9 @@
AUTOMAKE_OPTIONS = dejagnu
-LDADD = $(top_builddir)/libbase/libgnashbase.la \
+LDADD = \
+ $(top_builddir)/libbase/libgnashbase.la \
+ $(top_builddir)/librender/libgnashrender.la \
$(LIBINTL)
# AM_CPPFLAGS isn't right here since per-program *_CPPFLAGS override global
http://git.savannah.gnu.org/cgit//commit/?id=37a434385c375b08067467b3603a3515fd33e276
commit 37a434385c375b08067467b3603a3515fd33e276
Author: Rob Savoye <address@hidden>
Date: Sun Dec 11 18:27:10 2011 -0700
only build developer tests when specified.
diff --git a/libdevice/Makefile.am b/libdevice/Makefile.am
index 614c228..27e2482 100644
--- a/libdevice/Makefile.am
+++ b/libdevice/Makefile.am
@@ -53,10 +53,6 @@ AM_CPPFLAGS = -I.. \
$(CAIRO_CFLAGS) \
$(NULL)
-# GNASH_LIBS = \
-# $(top_builddir)/libbase/libgnashbase.la \
-# $(NULL)
-
instdir = $(includedir)/gnash
noinst_HEADERS = \
@@ -124,7 +120,9 @@ if BUILD_DIRECTFB_DEVICE
include directfb/directfb.am
endif
+if ENABLE_DEVELOPER_TESTS
if BUILD_X11_DEVICE
+
check_PROGRAMS += test_x11
test_x11_SOURCES = x11/test_x11.cpp
test_x11_CPPFLAGS = $(AM_CPPFLAGS) $(X11_CFLAGS)
@@ -133,6 +131,7 @@ test_x11_LDADD = \
$(X11_LIBS) \
$(GNASH_LIBS)
endif
+endif
if BUILD_VAAPI_DEVICE
include vaapi/vaapi.am
diff --git a/libdevice/rawfb/rawfb.am b/libdevice/rawfb/rawfb.am
index d116d1c..d3511f2 100644
--- a/libdevice/rawfb/rawfb.am
+++ b/libdevice/rawfb/rawfb.am
@@ -10,6 +10,8 @@ libgnashdevice_la_LIBADD += \
$(TSLIB_LIBS) \
$(EXTRA_EGL_LIBS)
+
+if ENABLE_DEVELOPER_TESTS
check_PROGRAMS += test_rawfb
# this tests the low level EGL interface, used by OpenVG, OpenGLES1,
@@ -21,4 +23,4 @@ test_rawfb_LDADD = \
$(TS_LIBS) \
$(GNASH_LIBS)
endif
-
+endif
\ No newline at end of file
diff --git a/libdevice/vaapi/vaapi.am b/libdevice/vaapi/vaapi.am
index 4bfb519..4e9e602 100644
--- a/libdevice/vaapi/vaapi.am
+++ b/libdevice/vaapi/vaapi.am
@@ -92,6 +92,7 @@ libgnashdevice_la_CPPFLAGS += $(VAAPI_CFLAGS)
# vaapi/VaapiDevice.h
libgnashdevice_la_LIBADD += $(VAAPI_LIBS)
+if ENABLE_DEVELOPER_TESTS
check_PROGRAMS += test_vaapi
test_vaapi_SOURCES = vaapi/test_vaapi.cpp
test_vaapi_CPPFLAGS = $(AM_CPPFLAGS) $(VAAPI_CFLAGS)
@@ -99,4 +100,4 @@ test_vaapi_LDADD = \
libgnashdevice.la \
$(VAAPI_LIBS) \
$(GNASH_LIBS)
-
+endif
\ No newline at end of file
http://git.savannah.gnu.org/cgit//commit/?id=2d4abc8b259ab76052b8f04d3f13a73bcf01401f
commit 2d4abc8b259ab76052b8f04d3f13a73bcf01401f
Author: Rob Savoye <address@hidden>
Date: Sun Dec 11 18:12:10 2011 -0700
add GNASH_LIBS to AM_LDFLAGS
diff --git a/utilities/Makefile.am b/utilities/Makefile.am
index c7a5ec5..7661ec1 100644
--- a/utilities/Makefile.am
+++ b/utilities/Makefile.am
@@ -36,6 +36,7 @@ AM_LDFLAGS = \
$(LIBINTL) \
$(LIBADD_DL) \
$(PTHREAD_LIBS) \
+ $(GNASH_LIBS) \
$(NULL)
localedir = $(datadir)/locale
http://git.savannah.gnu.org/cgit//commit/?id=2fda9a6703a9867891f19162749230ff15c13b40
commit 2fda9a6703a9867891f19162749230ff15c13b40
Author: Rob Savoye <address@hidden>
Date: Sun Dec 11 17:46:23 2011 -0700
use the right conditional
diff --git a/libdevice/egl/egl.am b/libdevice/egl/egl.am
index c09f161..d776379 100644
--- a/libdevice/egl/egl.am
+++ b/libdevice/egl/egl.am
@@ -27,7 +27,7 @@ eglinfo_LDADD = \
$(EGL_LIBS) \
$(NULL)
-if ENABLE_INPUT_DEVICES
+if ENABLE_DEVELOPER_TESTS
# this tests the low level EGL interface, used by OpenVG, OpenGLES1, and
OpenGLES2.
bin_PROGRAMS += test_egl
test_egl_SOURCES = egl/test_egl.cpp
@@ -40,6 +40,7 @@ test_egl_LDADD = \
$(EGL_LIBS) \
$(GNASH_LIBS) \
$(LTDL_LIBS) \
+ $(top_builddir)/libbase/libgnashbase.la \
$(NULL)
libgnashdevice_la_CPPFLAGS += $(EGL_CFLAGS)
http://git.savannah.gnu.org/cgit//commit/?id=372cd16cde77b3b8b4b2bcdba6cb517bf1161328
commit 372cd16cde77b3b8b4b2bcdba6cb517bf1161328
Author: Rob Savoye <address@hidden>
Date: Sun Dec 11 17:44:18 2011 -0700
drop dependency on libgnashbase.la
diff --git a/libdevice/Makefile.am b/libdevice/Makefile.am
index 5e6d468..614c228 100644
--- a/libdevice/Makefile.am
+++ b/libdevice/Makefile.am
@@ -53,9 +53,9 @@ AM_CPPFLAGS = -I.. \
$(CAIRO_CFLAGS) \
$(NULL)
-GNASH_LIBS = \
- $(top_builddir)/libbase/libgnashbase.la \
- $(NULL)
+# GNASH_LIBS = \
+# $(top_builddir)/libbase/libgnashbase.la \
+# $(NULL)
instdir = $(includedir)/gnash
http://git.savannah.gnu.org/cgit//commit/?id=fbf1bc7efa6d0c05cbd63aaedbd016621dc81cff
commit fbf1bc7efa6d0c05cbd63aaedbd016621dc81cff
Author: Rob Savoye <address@hidden>
Date: Sun Dec 11 17:43:54 2011 -0700
only build EGL tests when specified
diff --git a/libdevice/egl/egl.am b/libdevice/egl/egl.am
index a340041..c09f161 100644
--- a/libdevice/egl/egl.am
+++ b/libdevice/egl/egl.am
@@ -27,6 +27,7 @@ eglinfo_LDADD = \
$(EGL_LIBS) \
$(NULL)
+if ENABLE_INPUT_DEVICES
# this tests the low level EGL interface, used by OpenVG, OpenGLES1, and
OpenGLES2.
bin_PROGRAMS += test_egl
test_egl_SOURCES = egl/test_egl.cpp
@@ -48,3 +49,4 @@ libgnashdevice_la_SOURCES += \
egl/configTemplates.h \
$(NULL)
libgnashdevice_la_LIBADD += $(EGL_LIBS)
+endif
http://git.savannah.gnu.org/cgit//commit/?id=7d6ccb673434dc1ddd2ddd679e807476cc25bdbd
commit 7d6ccb673434dc1ddd2ddd679e807476cc25bdbd
Author: Rob Savoye <address@hidden>
Date: Sun Dec 11 17:24:47 2011 -0700
cygnal needs libgnashrender if vaap is built.
diff --git a/cygnal/Makefile.am b/cygnal/Makefile.am
index 14b5876..d49acab 100644
--- a/cygnal/Makefile.am
+++ b/cygnal/Makefile.am
@@ -53,6 +53,7 @@ AM_LDFLAGS = \
$(top_builddir)/libcore/libgnashcore.la \
$(top_builddir)/libmedia/libgnashmedia.la \
$(top_builddir)/libsound/libgnashsound.la \
+ $(top_builddir)/librender/libgnashrender.la \
$(GLIB_LIBS) \
$(LIBINTL) \
$(CURL_LIBS) \
http://git.savannah.gnu.org/cgit//commit/?id=6f9e7295c189bf8de7d57624b14c159f75dcf165
commit 6f9e7295c189bf8de7d57624b14c159f75dcf165
Author: Rob Savoye <address@hidden>
Date: Sun Dec 11 17:17:28 2011 -0700
add GnashVaapiTexture.cpp back into the build.
diff --git a/libbase/Makefile.am b/libbase/Makefile.am
index 8aa4193..a68aca8 100644
--- a/libbase/Makefile.am
+++ b/libbase/Makefile.am
@@ -143,6 +143,7 @@ libgnashbase_la_SOURCES += \
GnashVaapiImage.cpp \
GnashVaapiImage.h \
GnashVaapiImageProxy.h \
+ GnashVaapiTexture.cpp \
$(NULL)
endif
@@ -162,6 +163,7 @@ libgnashbase_la_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\" \
$(BOOST_CFLAGS) \
$(OPENGL_CFLAGS) \
$(LTDL_CFLAGS) \
+ -I$(top_srcdir)/librender \
$(NULL)
if ANDROID
http://git.savannah.gnu.org/cgit//commit/?id=4faf15c160512065ab98f2eed60569823903e23b
commit 4faf15c160512065ab98f2eed60569823903e23b
Author: Rob Savoye <address@hidden>
Date: Sun Dec 11 17:08:17 2011 -0700
use correct path to vaapi headers and library
diff --git a/gui/Makefile.am b/gui/Makefile.am
index d5d401f..f6a1b63 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -71,7 +71,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/librender/opengl \
-I$(top_srcdir)/libmedia \
-I$(top_srcdir)/libsound \
- -I$(top_srcdir)/libvaapi \
-DLOCALEDIR=\"$(localedir)\" \
-DPLUGINSDIR=\"$(pluginsdir)\" \
-DLIBAVCODEC_IDENT=\"$(LIBAVCODEC_IDENT)\" \
@@ -123,7 +122,7 @@ GNASH_LIBS = \
if HAVE_VAAPI
GNASH_LIBS += \
- $(top_builddir)/libvaapi/libgnashvaapi.la \
+ $(top_builddir)/libdevice/libgnashvaapi.la \
$(LIBVA_LIBS) \
$(LIBVA_X11_LIBS)
if BUILD_OGL_RENDERER
diff --git a/gui/pythonmod/Makefile.am b/gui/pythonmod/Makefile.am
index e3e3427..0b86da1 100644
--- a/gui/pythonmod/Makefile.am
+++ b/gui/pythonmod/Makefile.am
@@ -35,7 +35,7 @@ GNASH_INCLUDES = \
-I$(top_srcdir)/libcore/parser \
-I$(top_srcdir)/libcore/asobj \
-I$(top_srcdir)/libmedia \
- -I$(top_srcdir)/libvaapi \
+ -I$(top_srcdir)/libdevice/vaapi \
-I$(top_srcdir)/libsound
INCLUDES = \
diff --git a/libbase/Makefile.am b/libbase/Makefile.am
index 7487a16..8aa4193 100644
--- a/libbase/Makefile.am
+++ b/libbase/Makefile.am
@@ -258,15 +258,15 @@ libgnashbase_la_DEPENDENCIES =
if HAVE_VAAPI
libgnashbase_la_CPPFLAGS += \
- -I$(top_srcdir)/libvaapi \
+ -I$(top_srcdir)/libdevice/vaapi \
$(NULL)
libgnashbase_la_LIBADD += \
- $(top_builddir)/libvaapi/libgnashvaapi.la \
+ $(top_builddir)/libdevice/libgnashvaapi.la \
$(NULL)
libgnashbase_la_DEPENDENCIES += \
- $(top_builddir)/libvaapi/libgnashvaapi.la \
+ $(top_builddir)/libdevice/libgnashvaapi.la \
$(NULL)
endif
diff --git a/libdevice/Makefile.am b/libdevice/Makefile.am
index 2138af3..5e6d468 100644
--- a/libdevice/Makefile.am
+++ b/libdevice/Makefile.am
@@ -54,7 +54,6 @@ AM_CPPFLAGS = -I.. \
$(NULL)
GNASH_LIBS = \
- $(top_builddir)/libmedia/libgnashmedia.la \
$(top_builddir)/libbase/libgnashbase.la \
$(NULL)
diff --git a/libdevice/vaapi/vaapi.am b/libdevice/vaapi/vaapi.am
index ac9d7c5..4bfb519 100644
--- a/libdevice/vaapi/vaapi.am
+++ b/libdevice/vaapi/vaapi.am
@@ -87,9 +87,9 @@ noinst_HEADERS += \
EXTRA_DIST = $(SRCS) $(noinst_HEADERS)
libgnashdevice_la_CPPFLAGS += $(VAAPI_CFLAGS)
-libgnashdevice_la_SOURCES += \
- vaapi/VaapiDevice.cpp \
- vaapi/VaapiDevice.h
+# libgnashdevice_la_SOURCES += \
+# vaapi/VaapiDevice.cpp \
+# vaapi/VaapiDevice.h
libgnashdevice_la_LIBADD += $(VAAPI_LIBS)
check_PROGRAMS += test_vaapi
diff --git a/libmedia/Makefile.am b/libmedia/Makefile.am
index f81015d..9478c89 100644
--- a/libmedia/Makefile.am
+++ b/libmedia/Makefile.am
@@ -155,7 +155,7 @@ endif
if HAVE_VAAPI
libgnashmedia_la_CPPFLAGS += \
- -I$(top_srcdir)/libvaapi \
+ -I$(top_srcdir)/libdevice/vaapi \
$(NULL)
endif
@@ -194,7 +194,7 @@ endif
if HAVE_VAAPI
libgnashmedia_la_LIBADD += \
- $(top_builddir)/libvaapi/libgnashvaapi.la \
+ $(top_builddir)/libdevice/libgnashvaapi.la \
$(NULL)
endif
http://git.savannah.gnu.org/cgit//commit/?id=76e6d26d033f1bd2ac8ead18677523cf69afdeb2
commit 76e6d26d033f1bd2ac8ead18677523cf69afdeb2
Author: Rob Savoye <address@hidden>
Date: Sun Dec 11 17:07:32 2011 -0700
build libdevice before libbase so the vaapi support gets built first
diff --git a/Makefile.am b/Makefile.am
index 86825d2..07d5ea5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -69,11 +69,11 @@ endif
SUBDIRS = \
desktop \
+ $(DEVICES_DIR) \
libbase \
libmedia \
libsound \
libcore \
- $(DEVICES_DIR) \
librender \
gui \
plugin \
http://git.savannah.gnu.org/cgit//commit/?id=9bd5e7afd97e7cfcaf5d18804214fed02ef261b6
commit 9bd5e7afd97e7cfcaf5d18804214fed02ef261b6
Author: Rob Savoye <address@hidden>
Date: Sun Dec 11 17:06:51 2011 -0700
eliminate compiler warnings
diff --git a/libdevice/x11/X11Device.cpp b/libdevice/x11/X11Device.cpp
index d6d7be9..b812f18 100644
--- a/libdevice/x11/X11Device.cpp
+++ b/libdevice/x11/X11Device.cpp
@@ -273,7 +273,7 @@ X11Device::eventLoop(size_t passes)
if (reshape) {
width = event.xconfigure.width;
height = event.xconfigure.height;
- reshape(event.xconfigure.width, event.xconfigure.height);
+ reshape(width, height);
}
break;
case KeyPress:
diff --git a/libdevice/x11/X11Device.h b/libdevice/x11/X11Device.h
index 65b2c56..ed93eee 100644
--- a/libdevice/x11/X11Device.h
+++ b/libdevice/x11/X11Device.h
@@ -56,6 +56,8 @@ class X11Device : public GnashDevice
dtype_t getType() { return X11; };
+ size_t getStride() { return 0; };
+
// Initialize X11 Device layer
bool initDevice(int argc, char *argv[]);
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 2 +-
cygnal/Makefile.am | 1 +
gui/Makefile.am | 3 +--
gui/pythonmod/Makefile.am | 2 +-
libbase/Makefile.am | 8 +++++---
libdevice/Makefile.am | 8 +++-----
libdevice/egl/egl.am | 3 +++
libdevice/rawfb/rawfb.am | 4 +++-
libdevice/vaapi/vaapi.am | 9 +++++----
libdevice/x11/X11Device.cpp | 2 +-
libdevice/x11/X11Device.h | 2 ++
libmedia/Makefile.am | 4 ++--
testsuite/libbase.all/Makefile.am | 4 +++-
utilities/Makefile.am | 1 +
14 files changed, 32 insertions(+), 21 deletions(-)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1334-gc8ec6d2,
Rob Savoye <=