[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, openvg, updated. 94879a29f26dcd063d7f
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, openvg, updated. 94879a29f26dcd063d7f31a06ec947781fe321be |
|
Date: |
Sun, 19 Dec 2010 17:33:49 +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, openvg has been updated
via 94879a29f26dcd063d7f31a06ec947781fe321be (commit)
via 38d9d855aa69a50bbc5ea59fba42f4b17dfddd0a (commit)
via 20e2540156efdaa81b04844998187d3a392ac58a (commit)
via a5b417b32a1c2e072eda1bd8520a7ef2b579b5e2 (commit)
via 725afa6d828ad064bf04d797f6eee7c9b8a6b66b (commit)
from 10f3f42a8efcda4327658079dee4a06ed837335b (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=94879a29f26dcd063d7f31a06ec947781fe321be
commit 94879a29f26dcd063d7f31a06ec947781fe321be
Author: Rob Savoye <address@hidden>
Date: Sun Dec 19 10:22:47 2010 -0700
make some tests only build with --enable-devtests
diff --git a/gui/Makefile.am b/gui/Makefile.am
index 4bcdbe1..0ff4f55 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -301,15 +301,17 @@ clean-hook:
# done
# endif
+if ENABLE_DEVELOPER_TESTS
check_PROGRAMS = test_glue
-test_glue_SOURCES = test_glue.cpp fb/fb_glue_agg.cpp
+test_glue_SOURCES = \
+ test_glue.cpp \
+ fb/fb_glue_agg.cpp \
+ fb/fb_glue_ovg.cpp
test_glue_CPPFLAGS = \
-DFAKEFB=\"$(FAKEFB)\" \
$(AM_CPPFLAGS) \
$(DIRECTFB_CFLAGS)
# -DUSE_TESTSUITE
-test_glue_LDADD = \
- ../librender/libgnashrender.la \
- ../libdevice/libgnashdevice.la \
- $(GNASH_LIBS)
+test_glue_LDADD = $(GNASH_LIBS)
+endif
\ No newline at end of file
diff --git a/libdevice/events/events.am b/libdevice/events/events.am
index 0f0f075..b4bd0c0 100644
--- a/libdevice/events/events.am
+++ b/libdevice/events/events.am
@@ -40,6 +40,7 @@ libgnashdevice_la_SOURCES += events/EventDevice.cpp
endif
endif
+if ENABLE_DEVELOPER_TESTS
check_PROGRAMS += test_events
test_events_SOURCES = events/test_events.cpp
test_events_CPPFLAGS = $(AM_CPPFLAGS)
@@ -50,4 +51,4 @@ test_events_LDADD = \
$(CURL_LIBS) \
$(EVENTS_LIBS) \
$(GNASH_LIBS)
-
+endif
\ No newline at end of file
diff --git a/librender/Makefile.am b/librender/Makefile.am
index dc110aa..2cb6048 100644
--- a/librender/Makefile.am
+++ b/librender/Makefile.am
@@ -158,7 +158,8 @@ if BUILD_OGL_RENDERER
$(NULL)
endif
-bin_PROGRAMS = testr
+if ENABLE_DEVELOPER_TESTS
+check_PROGRAMS = testr
testr_SOURCES = testr.cpp # testr_gtk.cpp
testr_CPPFLAGS = \
@@ -178,3 +179,4 @@ testr_LDADD = \
$(OPENVG_LIBS) \
$(GLES1_LIBS) \
$(GLES2_LIBS)
+endif
http://git.savannah.gnu.org/cgit//commit/?id=38d9d855aa69a50bbc5ea59fba42f4b17dfddd0a
commit 38d9d855aa69a50bbc5ea59fba42f4b17dfddd0a
Author: Rob Savoye <address@hidden>
Date: Sun Dec 19 10:21:35 2010 -0700
fix spelling of --enable-input option. Add --enable-devtests, which enables
developer only tests.
diff --git a/configure.ac b/configure.ac
index 9f0561c..ae44046 100644
--- a/configure.ac
+++ b/configure.ac
@@ -714,6 +714,19 @@ if test x"${fakefb}" != x; then
AC_DEFINE(ENABLE_FAKE_FRAMEBUFFER, [1], [Enable using a file instead of a
real framebuffer])
fi
+dnl This enable a small handful of tests that aren't designed to be
+dnl run as part of "make check", as they are either incomplete, or
+dnl can only be run interactively. These are all primarily oriented
+dnl towards code development and debugging, instead of regression
+dnl or unit testing.
+AC_ARG_ENABLE(devtests, AC_HELP_STRING([--enable-devtests],
+ [Developer only tests, not to be included in make check]),
+[case "${enableval}" in
+ yes) devtests=yes ;;
+ no) devtests=no ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for enable-devtests option]) ;;
+esac], devtests=yes)
+AM_CONDITIONAL(ENABLE_DEVELOPER_TESTS, [test x${devtests} = xyes])
dnl --------------------------------------------------------
dnl Sound handler selection
@@ -824,10 +837,10 @@ dnl By default, don't build any of these, as they are
only for the
dnl Framebuffer running without X11.
if test x"${build_fb}" = xyes -a x"${linux}" = xyes; then
build_ps2mouse=yes
- build_ps2keyboard=no
+ build_ps2keyboard=yes
build_input_events=yes
build_tslib=yes
- input_events="PS/2 Mouse, Input Devices, Touchscreen via Tslib"
+ input_events="PS/2 Mouse, PS/2 Keyboard, Input Devices, Touchscreen via
Tslib"
else
build_ps2mouse=no
build_ps2keyboard=no
@@ -836,7 +849,7 @@ else
input_events=
fi
AC_ARG_ENABLE(input,
- AC_HELP_STRING([--enable-input=], [Enable support for the specified input
devices for the framebuffer GUI
(default=ps2mouse|ps2keyboard|events|touchscreen)]),
+ AC_HELP_STRING([--enable-input], [Enable support for the specified input
devices for the framebuffer GUI
(default=ps2mouse|ps2keyboard|events|touchscreen)]),
[if test -n ${enableval}; then
enableval=`echo ${enableval} | tr '\054' ' ' `
fi
@@ -859,6 +872,13 @@ AC_ARG_ENABLE(input,
build_tslib=yes
input_events="${input_events}, Touchscreen"
;;
+ a*) dnl all
+ build_ps2mouse=yes
+ build_ps2keyboard=yes
+ build_input_events=yes
+ build_tslib=yes
+ input_events="PS/2 Mouse, PS/2 Keyboard, Input Devices, Touchscreen
via Tslib"
+ ;;
*) AC_MSG_ERROR([invalid input device list! ${enableval} given (accept:
ps2mouse|keyboard|events,touchscreen)])
;;
esac
@@ -873,7 +893,7 @@ if test x"${build_tslib}" = xyes; then
AC_DEFINE(USE_TSLIB, [1], [Use a tslib supported touchscreen])
GNASH_PKG_FIND(ts, [tslib.h], [Touchscreen library], ts_config)
fi
-AM_CONDITIONAL(ENABLE_TSLIB, [test x${ac_cv_header_tslib_h} != xno])
+AM_CONDITIONAL(ENABLE_TSLIB, [test x${ac_cv_header_tslib_h} = xyes])
if test x"${build_ps2mouse}" = xyes; then
AC_DEFINE(USE_MOUSE_PS2, [1], [Add support for a directly using a PS/2
Mouse])
@@ -1106,12 +1126,12 @@ dnl instead of the OGL (OpenGL) one.
build_vaapi_device=no
build_openmax_device=no
+build_x11_device=no
build_directfb_device=no
-build_x11_device=yes
build_egl_device=yes
build_rawfb_device=yes
-device_list="EGL RawFB X11"
-ndevice=3
+device_list="EGL RawFB"
+ndevice=2
AC_ARG_ENABLE(device,
AC_HELP_STRING([--enable-device], [Specify which hardware abstraction to use
to support to enable (none,openmax,egl,directfb,rawfb,x11,vaapi)]),
if test -z ${enableval}; then
http://git.savannah.gnu.org/cgit//commit/?id=20e2540156efdaa81b04844998187d3a392ac58a
commit 20e2540156efdaa81b04844998187d3a392ac58a
Author: Rob Savoye <address@hidden>
Date: Sun Dec 19 09:21:46 2010 -0700
add the gui namespace
diff --git a/gui/fb/fb_glue_gles1.cpp b/gui/fb/fb_glue_gles1.cpp
index a6e7659..ef0652d 100644
--- a/gui/fb/fb_glue_gles1.cpp
+++ b/gui/fb/fb_glue_gles1.cpp
@@ -44,8 +44,9 @@
#include "log.h"
#include "fb_glue_gles1.h"
-namespace gnash
-{
+namespace gnash {
+
+namespace gui {
FBgles1Glue::FBgles1Glue(int fd)
: _fd (fd),
@@ -202,6 +203,7 @@ FBgles1Glue::render_to_display () {
eglMakeCurrent(_display, _surface, _surface, _context);
}
+} // end of namespace gui
} // namespace gnash
// Local Variables:
diff --git a/gui/fb/fb_glue_gles1.h b/gui/fb/fb_glue_gles1.h
index 1d39200..02d0132 100644
--- a/gui/fb/fb_glue_gles1.h
+++ b/gui/fb/fb_glue_gles1.h
@@ -47,8 +47,10 @@
#include "fbsup.h"
-namespace gnash
-{
+namespace gnash {
+
+namespace gui {
+
class Renderer;
class FBgles1Glue: public FBGlue
@@ -82,6 +84,7 @@ private:
EGLSurface _pbuffer;
};
+} // end of namespace gui
} // namespace gnash
#endif // FB_GLUE_GLES1_H
diff --git a/gui/fb/fb_glue_gles2.cpp b/gui/fb/fb_glue_gles2.cpp
index a3e5f77..0777dbf 100644
--- a/gui/fb/fb_glue_gles2.cpp
+++ b/gui/fb/fb_glue_gles2.cpp
@@ -44,8 +44,9 @@
#include "log.h"
#include "fb_glue_gles2.h"
-namespace gnash
-{
+namespace gnash {
+
+namespace gui {
FBgles2Glue::FBgles2Glue(int fd)
: _fd(fd)
@@ -93,6 +94,7 @@ void
FBgles2Glue::render_to_display () {
}
+} // end of namespace gui
} // namespace gnash
// Local Variables:
diff --git a/gui/fb/fb_glue_gles2.h b/gui/fb/fb_glue_gles2.h
index 1cca514..7045aeb 100644
--- a/gui/fb/fb_glue_gles2.h
+++ b/gui/fb/fb_glue_gles2.h
@@ -45,10 +45,11 @@
#include "fbsup.h"
-namespace gnash
-{
+namespace gnash {
+
+namespace gui {
- class FBgles2Glue: public FBGlue // , public OglGlue
+class FBgles2Glue: public FBGlue // , public OglGlue
{
public:
FBgles2Glue(int fd);
@@ -72,6 +73,7 @@ protected:
private:
};
+} // end of namespace gui
} // namespace gnash
#endif // FB_GLUE__GLES2_H
http://git.savannah.gnu.org/cgit//commit/?id=a5b417b32a1c2e072eda1bd8520a7ef2b579b5e2
commit a5b417b32a1c2e072eda1bd8520a7ef2b579b5e2
Author: Rob Savoye <address@hidden>
Date: Sat Dec 18 18:19:38 2010 -0700
mostly just reformatting
diff --git a/gui/Makefile.am b/gui/Makefile.am
index a22fca9..4bcdbe1 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -118,7 +118,7 @@ AM_LDFLAGS = \
$(LIRC_LIBS) \
$(MYSQL_LIBS) \
$(INTLLIBS) \
- $(TS_LIBS)
+ $(TS_LIBS) \
$(BOOST_LIBS) \
$(PTHREAD_LIBS) \
$(NULL)
@@ -192,12 +192,6 @@ gnash: gnash.in
cp $< $@
chmod +x $@
-# Always include the device files in the source tarball
-EXTRA_DIST += \
- fb/TouchDevice.cpp \
- fb/MouseDevice.cpp \
- fb/EventDevice.cpp
-
GUI_SRCS = gnash.cpp \
gui.cpp gui.h \
Player.cpp Player.h \
diff --git a/gui/fb/fb.am b/gui/fb/fb.am
index 5d0c595..ff43fd3 100644
--- a/gui/fb/fb.am
+++ b/gui/fb/fb.am
@@ -24,7 +24,10 @@ fb_gnash_SOURCES = $(GUI_SRCS) \
fb/fb.cpp \
fb/fbsup.h \
fb/fb_glue.h
-fb_gnash_CPPFLAGS = -DGUI_FB -DGUI_CONFIG=\"FB\" -DFAKEFB=\"$(FAKEFB)\" \
+fb_gnash_CPPFLAGS = \
+ -DGUI_FB \
+ -DGUI_CONFIG=\"FB\" \
+ -DFAKEFB=\"$(FAKEFB)\" \
$(AM_CPPFLAGS)
fb_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
fb_gnash_LDADD = \
@@ -42,7 +45,9 @@ endif # BUILD_AGG_RENDERER
# Build support for OpenVG.
if BUILD_OVG_RENDERER
fb_gnash_SOURCES += fb/fb_glue_ovg.cpp fb/fb_glue_ovg.h
-fb_gnash_CPPFLAGS += $(OPENVG_CFLAGS) $(EGL_CFLAGS)
+fb_gnash_CPPFLAGS += \
+ $(OPENVG_CFLAGS) \
+ $(EGL_CFLAGS)
fb_gnash_LDADD += $(OPENVG_LIBS) $(EGL_LIBS)
endif # BUILD_OVG_RENDERER
http://git.savannah.gnu.org/cgit//commit/?id=725afa6d828ad064bf04d797f6eee7c9b8a6b66b
commit 725afa6d828ad064bf04d797f6eee7c9b8a6b66b
Author: Rob Savoye <address@hidden>
Date: Sat Dec 18 17:58:31 2010 -0700
add TS_LIBS so we can use a touchscreen
diff --git a/gui/fb/fb.am b/gui/fb/fb.am
index 2db221c..5d0c595 100644
--- a/gui/fb/fb.am
+++ b/gui/fb/fb.am
@@ -28,9 +28,9 @@ fb_gnash_CPPFLAGS = -DGUI_FB -DGUI_CONFIG=\"FB\"
-DFAKEFB=\"$(FAKEFB)\" \
$(AM_CPPFLAGS)
fb_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
fb_gnash_LDADD = \
- $(top_builddir)/librender/libgnashrender.la \
- $(BOOST_LIBS) \
- $(GNASH_LIBS)
+ $(GNASH_LIBS) \
+ $(TS_LIBS) \
+ $(BOOST_LIBS)
# Build support for AntiGrain.
if BUILD_AGG_RENDERER
diff --git a/gui/gtk/gtk.am b/gui/gtk/gtk.am
index dd292e3..f9ce9cf 100644
--- a/gui/gtk/gtk.am
+++ b/gui/gtk/gtk.am
@@ -30,10 +30,10 @@ gtk_gnash_CPPFLAGS = -DGUI_GTK -DGUI_CONFIG=\"GTK\" \
$(AM_CPPFLAGS) $(GTK_CFLAGS) $(X11_CFLAGS)
gtk_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
gtk_gnash_LDADD = \
- $(top_builddir)/librender/libgnashrender.la \
- $(GNASH_LIBS) \
$(GTK_LIBS) \
- $(BOOST_LIBS)
+ $(GNASH_LIBS) \
+ $(BOOST_LIBS) \
+ $(TS_LIBS)
#gtk_gnash_DEPENDENCIES = .configline
if BUILD_OGL_RENDERER
@@ -66,7 +66,9 @@ endif # BUILD_AGG_RENDERER
if BUILD_OVG_RENDERER
gtk_gnash_CPPFLAGS += $(OPENVG_CFLAGS) $(EGL_CFLAGS)
gtk_gnash_SOURCES += gtk/gtk_glue_egl.cpp gtk/gtk_glue_egl.h
-gtk_gnash_LDADD += $(OPENVG_LIBS) $(EGL_LIBS)
+gtk_gnash_LDADD += \
+ $(OPENVG_LIBS) \
+ $(EGL_LIBS)
endif # BUILD_OVG_RENDERER
if BUILD_CAIRO_RENDERER
diff --git a/libdevice/Makefile.am b/libdevice/Makefile.am
index 9c68cf9..fa34d0f 100644
--- a/libdevice/Makefile.am
+++ b/libdevice/Makefile.am
@@ -72,6 +72,7 @@ libgnashdevice_la_LIBADD = \
$(LIBVA_LIBS) \
$(LIBVA_X11_LIBS) \
$(LIBVA_GLX_LIBS) \
+ $(TS_LIBS) \
$(GNASH_LIBS)
libgnashdevice_la_LDFLAGS = -release $(VERSION)
libgnashdevice_la_SOURCES =
@@ -81,7 +82,9 @@ libgnashdevice_la_CPPFLAGS += $(X11_CFLAGS)
libgnashdevice_la_SOURCES += \
x11/X11Device.cpp \
x11/X11Device.h
-libgnashdevice_la_LIBADD += $(X11_LIBS)
+libgnashdevice_la_LIBADD += \
+ $(TS_LIBS) \
+ $(X11_LIBS)
endif
# Rebuild with GCC 4.x Mudflap support
@@ -128,4 +131,4 @@ endif
if BUILD_VAAPI_DEVICE
include vaapi/vaapi.am
-endif
\ No newline at end of file
+endif
diff --git a/libdevice/directfb/directfb.am b/libdevice/directfb/directfb.am
index 28141fb..d04827a 100644
--- a/libdevice/directfb/directfb.am
+++ b/libdevice/directfb/directfb.am
@@ -27,5 +27,6 @@ test_dfb_SOURCES = directfb/test_dfb.cpp
test_dfb_CPPFLAGS = $(AM_CPPFLAGS) $(DIRECTFB_CFLAGS)
test_dfb_LDADD = \
libgnashdevice.la \
+ $(TS_LIBS) \
$(DIRECTFB_LIBS) \
$(GNASH_LIBS)
diff --git a/libdevice/egl/egl.am b/libdevice/egl/egl.am
index 9bfa9c1..1a5d98b 100644
--- a/libdevice/egl/egl.am
+++ b/libdevice/egl/egl.am
@@ -32,6 +32,7 @@ test_egl_CPPFLAGS = $(AM_CPPFLAGS)
test_egl_LDADD = \
libgnashdevice.la \
$(EXTRA_EGL_LIBS) \
+ $(TS_LIBS) \
$(CURL_LIBS) \
$(EGL_LIBS) \
$(GNASH_LIBS)
diff --git a/libdevice/events/events.am b/libdevice/events/events.am
index 71e2392..0f0f075 100644
--- a/libdevice/events/events.am
+++ b/libdevice/events/events.am
@@ -26,11 +26,14 @@ libgnashdevice_la_SOURCES += events/InputDevice.cpp
events/InputDevice.h
# Touchscreen
if ENABLE_TSLIB
libgnashdevice_la_SOURCES += events/TouchDevice.cpp
+libgnashdevice_la_LIBADD += $(TS_LIBS)
endif
+
# PS/2 Mouse
if ENABLE_MOUSE
libgnashdevice_la_SOURCES += events/MouseDevice.cpp
endif
+
# Linux input events
if ENABLE_INPUT_EVENTS
libgnashdevice_la_SOURCES += events/EventDevice.cpp
@@ -43,6 +46,7 @@ test_events_CPPFLAGS = $(AM_CPPFLAGS)
test_events_LDADD = \
libgnashdevice.la \
$(EXTRA_EVENTS_LIBS) \
+ $(TS_LIBS) \
$(CURL_LIBS) \
$(EVENTS_LIBS) \
$(GNASH_LIBS)
diff --git a/libdevice/rawfb/rawfb.am b/libdevice/rawfb/rawfb.am
index 06aa9bf..d116d1c 100644
--- a/libdevice/rawfb/rawfb.am
+++ b/libdevice/rawfb/rawfb.am
@@ -10,7 +10,7 @@ libgnashdevice_la_LIBADD += \
$(TSLIB_LIBS) \
$(EXTRA_EGL_LIBS)
-bin_PROGRAMS += test_rawfb
+check_PROGRAMS += test_rawfb
# this tests the low level EGL interface, used by OpenVG, OpenGLES1,
# and OpenGLES2.
@@ -18,6 +18,7 @@ test_rawfb_SOURCES = rawfb/test_rawfb.cpp
test_rawfb_CPPFLAGS = $(AM_CPPFLAGS)
test_rawfb_LDADD = \
libgnashdevice.la \
+ $(TS_LIBS) \
$(GNASH_LIBS)
endif
diff --git a/libdevice/vaapi/vaapi.am b/libdevice/vaapi/vaapi.am
index 94b0b1d..c00e514 100644
--- a/libdevice/vaapi/vaapi.am
+++ b/libdevice/vaapi/vaapi.am
@@ -82,3 +82,18 @@ noinst_HEADERS += \
$(NULL)
EXTRA_DIST = $(SRCS) $(noinst_HEADERS)
+
+libgnashdevice_la_CPPFLAGS += $(VAAPI_CFLAGS)
+libgnashdevice_la_SOURCES += \
+ vaapi/VaapiDevice.cpp \
+ vaapi/VaapiDevice.h
+libgnashdevice_la_LIBADD += $(VAAPI_LIBS)
+
+check_PROGRAMS += test_vaapi
+test_vaapi_SOURCES = vaapi/test_vaapi.cpp
+test_vaapi_CPPFLAGS = $(AM_CPPFLAGS) $(VAAPI_CFLAGS)
+test_vaapi_LDADD = \
+ libgnashdevice.la \
+ $(VAAPI_LIBS) \
+ $(GNASH_LIBS)
+
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 34 +++++++++++++++++++++++++++-------
gui/Makefile.am | 20 ++++++++------------
gui/fb/fb.am | 15 ++++++++++-----
gui/fb/fb_glue_gles1.cpp | 6 ++++--
gui/fb/fb_glue_gles1.h | 7 +++++--
gui/fb/fb_glue_gles2.cpp | 6 ++++--
gui/fb/fb_glue_gles2.h | 8 +++++---
gui/gtk/gtk.am | 10 ++++++----
libdevice/Makefile.am | 7 +++++--
libdevice/directfb/directfb.am | 1 +
libdevice/egl/egl.am | 1 +
libdevice/events/events.am | 7 ++++++-
libdevice/rawfb/rawfb.am | 3 ++-
libdevice/vaapi/vaapi.am | 15 +++++++++++++++
librender/Makefile.am | 4 +++-
15 files changed, 102 insertions(+), 42 deletions(-)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, openvg, updated. 94879a29f26dcd063d7f31a06ec947781fe321be,
Rob Savoye <=