[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, openvg, updated. a22b5e0a78c4222ce935
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, openvg, updated. a22b5e0a78c4222ce93573f09ccde06cad9b6adc |
|
Date: |
Thu, 16 Dec 2010 05:10:44 +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 a22b5e0a78c4222ce93573f09ccde06cad9b6adc (commit)
via d6bb08cd8618172bd81f992f1fcba6366146d5bc (commit)
via 997a6514b2ea89f49dfbcc9829ed24370c9f0fd1 (commit)
via 96d3fd3d2c6fc080cbd913e3d876c1a8a5aac3aa (commit)
via 8b94dcfbb0813cced6330a49129aec82f94a870d (commit)
via 96464d81c294ccbdbacf1d6f4b3a1707552e22b4 (commit)
via 1dac3379ba34b14bc6b84390a8c2e0fb2ede5e1b (commit)
via b5275530838d442c6021933e405c779c3e5422f4 (commit)
via 919a15d53945c661b6e0cda31a77ea852870e35c (commit)
via df3d77576c91502bd5a38927ae2012bafb653cb0 (commit)
from 0e70385951cc848def30068acb7fb51276b13ad0 (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=a22b5e0a78c4222ce93573f09ccde06cad9b6adc
commit a22b5e0a78c4222ce93573f09ccde06cad9b6adc
Author: Rob Savoye <address@hidden>
Date: Wed Dec 15 22:09:45 2010 -0700
add memory access accesors
diff --git a/libdevice/GnashDevice.h b/libdevice/GnashDevice.h
index 2c68136..bd39923 100644
--- a/libdevice/GnashDevice.h
+++ b/libdevice/GnashDevice.h
@@ -113,8 +113,8 @@ struct GnashDevice
/// Is this renderering natively
virtual bool isNativeRender() = 0;
- virtual boost::uint8_t *getFBMemory() { };
- virtual size_t getFBMemSize() { };
+ virtual boost::uint8_t *getFBMemory() { return 0; };
+ virtual size_t getFBMemSize() { return 0; };
};
} // namespace renderer
http://git.savannah.gnu.org/cgit//commit/?id=d6bb08cd8618172bd81f992f1fcba6366146d5bc
commit d6bb08cd8618172bd81f992f1fcba6366146d5bc
Author: Rob Savoye <address@hidden>
Date: Wed Dec 15 22:09:11 2010 -0700
apply patch from master to disable libltdl
diff --git a/libbase/extension.cpp b/libbase/extension.cpp
index 619af2d..877c598 100644
--- a/libbase/extension.cpp
+++ b/libbase/extension.cpp
@@ -22,18 +22,6 @@
#include "gnashconfig.h"
#endif
-// #if defined(_WIN32) || defined(WIN32)
-// # define lock(lib_mutex);
-// # define scoped_lock ;
-// #define PLUGINSDIR "./" //hack
-// #define USE_DIRENT 1
-// #else
-// # include <boost/detail/lightweight_mutex.hpp>
-// using boost::detail::lightweight_mutex;
-// # define scoped_lock lightweight_mutex::scoped_lock
-// static lightweight_mutex lib_mutex;
-// #endif
-
#if defined(WIN32) || defined(_WIN32)
#define LIBLTDL_DLL_IMPORT 1
#endif
@@ -95,7 +83,9 @@ Extension::Extension()
}
log_debug("Plugins path: %s", _pluginsdir);
+#ifdef HAVE_LTDL
lt_dlsetsearchpath(_pluginsdir.c_str());
+#endif
}
Extension::Extension(const std::string& dir)
@@ -106,7 +96,9 @@ Extension::Extension(const std::string& dir)
// gnash_mutex_seterror, gnash_mutex_geterror);
#endif
_pluginsdir = dir;
+#ifdef HAVE_LTDL
lt_dlsetsearchpath(_pluginsdir.c_str());
+#endif
}
Extension::~Extension()
@@ -119,7 +111,9 @@ Extension::scanAndLoad(const std::string& dir, as_object
&obj)
{
// GNASH_REPORT_FUNCTION;
+#ifdef HAVE_LTDL
lt_dlsetsearchpath(_pluginsdir.c_str());
+#endif
_pluginsdir = dir;
return scanAndLoad(obj);
diff --git a/libbase/sharedlib.cpp b/libbase/sharedlib.cpp
index 1fd7e2d..c0b87f5 100644
--- a/libbase/sharedlib.cpp
+++ b/libbase/sharedlib.cpp
@@ -30,7 +30,6 @@
#include <unistd.h>
#include <string>
-#include <iostream>
#include <cstdlib>
#if defined(WIN32) || defined(_WIN32)
@@ -73,11 +72,14 @@ SharedLib::SharedLib(const std::string& filespec, const
std::string& envvar)
scoped_lock lock(_libMutex);
// Initialize libtool's dynamic library loader
+#ifdef HAVE_LTDL
int errors = lt_dlinit ();
if (errors) {
log_error (_("Couldn't initialize ltdl: %s"), lt_dlerror());
}
-
+#else
+# warning "libltdl not enabled in build".
+#endif
std::string pluginsdir;
char *env = std::getenv (envvar.c_str());
if (env) {
@@ -95,7 +97,11 @@ SharedLib::~SharedLib()
bool
SharedLib::closeLib()
{
+#ifdef HAVE_LTDL
return lt_dlclose(_dlhandle);
+#else
+ return true;
+#endif
}
bool
@@ -111,6 +117,8 @@ SharedLib::openLib (const std::string& filespec)
scoped_lock lock(_libMutex);
log_debug ("Trying to open shared library \"%s\"", filespec);
+
+#ifdef HAVE_LTDL
_dlhandle = lt_dlopenext (filespec.c_str());
if (_dlhandle == NULL) {
@@ -120,6 +128,7 @@ SharedLib::openLib (const std::string& filespec)
// Make this module unloadable
lt_dlmakeresident(_dlhandle);
+#endif
log_debug (_("Opened dynamic library \"%s\""), filespec);
@@ -136,6 +145,7 @@ SharedLib::getInitEntry (const std::string& symbol)
scoped_lock lock(_libMutex);
+#ifdef HAVE_LTDL
run = lt_dlsym (_dlhandle, symbol.c_str());
if (run == NULL) {
@@ -144,6 +154,9 @@ SharedLib::getInitEntry (const std::string& symbol)
} else {
log_debug (_("Found symbol %s @ %p"), symbol, (void *)run);
}
+#else
+ (void)symbol;
+#endif
return (initentry*)(run);
}
@@ -157,7 +170,9 @@ SharedLib::getDllSymbol(const std::string& symbol)
scoped_lock lock(_libMutex);
+#ifdef HAVE_LTDL
run = lt_dlsym (_dlhandle, symbol.c_str());
+#endif
/*
Realistically, we should never get a valid pointer with a value of 0
http://git.savannah.gnu.org/cgit//commit/?id=997a6514b2ea89f49dfbcc9829ed24370c9f0fd1
commit 997a6514b2ea89f49dfbcc9829ed24370c9f0fd1
Author: Rob Savoye <address@hidden>
Date: Wed Dec 15 22:08:32 2010 -0700
for now always build test cases.
diff --git a/libdevice/Makefile.am b/libdevice/Makefile.am
index 0b84476..d59a7e6 100644
--- a/libdevice/Makefile.am
+++ b/libdevice/Makefile.am
@@ -65,6 +65,7 @@ pkglib_LTLIBRARIES = libgnashdevice.la
libgnashdevice_la_CPPFLAGS = $(AM_CPPFLAGS)
libgnashdevice_la_LIBADD = \
+ $(CURL_LIBS) \
$(LIBVA_LIBS) \
$(LIBVA_X11_LIBS) \
$(LIBVA_GLX_LIBS) \
@@ -97,11 +98,11 @@ libgnashdevice_la_LIBADD += $(VAAPI_LIBS)
endif
# if BUILD_X11_DEVICE
-libgnashdevice_la_CPPFLAGS += $(X11_CFLAGS)
-libgnashdevice_la_SOURCES += \
- x11/X11Device.cpp \
- x11/X11Device.h
-libgnashdevice_la_LIBADD += $(X11_LIBS)
+# libgnashdevice_la_CPPFLAGS += $(X11_CFLAGS)
+# libgnashdevice_la_SOURCES += \
+# x11/X11Device.cpp \
+# x11/X11Device.h
+# libgnashdevice_la_LIBADD += $(X11_LIBS)
# endif
# Rebuild with GCC 4.x Mudflap support
@@ -116,27 +117,28 @@ if ENABLE_PCH
AM_CXXFLAGS = $(PCH_FLAGS)
endif
-check_PROGRAMS =
+bin_PROGRAMS =
if BUILD_RAWFB_DEVICE
include rawfb/rawfb.am
endif
if BUILD_EGL_DEVICE
-check_PROGRAMS += test_egl
+bin_PROGRAMS += test_egl
# this tests the low level EGL interface, used by OpenVG, OpenGLES1,
# and OpenGLES2.
test_egl_SOURCES = egl/test_egl.cpp
test_egl_CPPFLAGS = $(AM_CPPFLAGS)
test_egl_LDADD = \
- ../librender/libgnashrender.la \
libgnashdevice.la \
+ $(EXTRA_EGL_LIBS) \
+ $(CURL_LIBS) \
$(EGL_LIBS) \
$(GNASH_LIBS)
endif
if BUILD_VAAPI_DEVICE
-check_PROGRAMS += test_vaapi
+bin_PROGRAMS += test_vaapi
test_vaapi_SOURCES = vaapi/test_vaapi.cpp
test_vaapi_CPPFLAGS = $(AM_CPPFLAGS) $(VAAPI_CFLAGS)
test_vaapi_LDADD = \
@@ -146,7 +148,7 @@ test_vaapi_LDADD = \
endif
if BUILD_DIRECTFB_DEVICE
-check_PROGRAMS += test_dfb
+bin_PROGRAMS += test_dfb
test_dfb_SOURCES = directfb/test_dfb.cpp
test_dfb_CPPFLAGS = $(AM_CPPFLAGS) $(DIRECTFB_CFLAGS)
test_dfb_LDADD = \
@@ -156,13 +158,13 @@ test_dfb_LDADD = \
endif
# if BUILD_X11_DEVICE
-check_PROGRAMS += test_x11
-test_x11_SOURCES = x11/test_x11.cpp
-test_x11_CPPFLAGS = $(AM_CPPFLAGS) $(X11_CFLAGS)
-test_x11_LDADD = \
- libgnashdevice.la \
- $(X11_LIBS) \
- $(GNASH_LIBS)
+# bin_PROGRAMS += test_x11
+# test_x11_SOURCES = x11/test_x11.cpp
+# test_x11_CPPFLAGS = $(AM_CPPFLAGS) $(X11_CFLAGS)
+# test_x11_LDADD = \
+# libgnashdevice.la \
+# $(X11_LIBS) \
+# $(GNASH_LIBS)
# endif
include vaapi/vaapi.am
http://git.savannah.gnu.org/cgit//commit/?id=96d3fd3d2c6fc080cbd913e3d876c1a8a5aac3aa
commit 96d3fd3d2c6fc080cbd913e3d876c1a8a5aac3aa
Author: Rob Savoye <address@hidden>
Date: Wed Dec 15 22:07:12 2010 -0700
don't try to link librender to the test.
diff --git a/libdevice/rawfb/rawfb.am b/libdevice/rawfb/rawfb.am
index f954216..06aa9bf 100644
--- a/libdevice/rawfb/rawfb.am
+++ b/libdevice/rawfb/rawfb.am
@@ -6,16 +6,17 @@ libgnashdevice_la_CPPFLAGS += \
libgnashdevice_la_SOURCES += \
rawfb/RawFBDevice.cpp \
rawfb/RawFBDevice.h
-libgnashdevice_la_LIBADD += $(TSLIB_LIBS)
+libgnashdevice_la_LIBADD += \
+ $(TSLIB_LIBS) \
+ $(EXTRA_EGL_LIBS)
-check_PROGRAMS += test_rawfb
+bin_PROGRAMS += test_rawfb
# this tests the low level EGL interface, used by OpenVG, OpenGLES1,
# and OpenGLES2.
test_rawfb_SOURCES = rawfb/test_rawfb.cpp
test_rawfb_CPPFLAGS = $(AM_CPPFLAGS)
test_rawfb_LDADD = \
- ../librender/libgnashrender.la \
libgnashdevice.la \
$(GNASH_LIBS)
endif
http://git.savannah.gnu.org/cgit//commit/?id=8b94dcfbb0813cced6330a49129aec82f94a870d
commit 8b94dcfbb0813cced6330a49129aec82f94a870d
Author: Rob Savoye <address@hidden>
Date: Wed Dec 15 22:06:30 2010 -0700
minor tweaks
diff --git a/librender/openvg/Renderer_ovg.cpp
b/librender/openvg/Renderer_ovg.cpp
index 89e2c8c..0ab298c 100644
--- a/librender/openvg/Renderer_ovg.cpp
+++ b/librender/openvg/Renderer_ovg.cpp
@@ -45,13 +45,13 @@
#include "swf/ShapeRecord.h"
#include "CachedBitmap.h"
-#include <VG/openvg.h>
#include <VG/vgu.h>
#ifdef OPENVG_VERSION_1_1
# include <VG/ext.h>
#else
# include <VG/vgext.h>
#endif
+#include <VG/openvg.h>
#define GNASH_IMAGE_QUALITY VG_IMAGE_QUALITY_FASTER
#define GNASH_RENDER_QUALITY VG_RENDERING_QUALITY_FASTER
diff --git a/librender/openvg/Renderer_ovg.h b/librender/openvg/Renderer_ovg.h
index 41ec028..bd40005 100644
--- a/librender/openvg/Renderer_ovg.h
+++ b/librender/openvg/Renderer_ovg.h
@@ -32,6 +32,7 @@
//#include "directfb/DirectFBDevice.h"
#include "GnashDevice.h"
#include "CachedBitmap.h"
+
#include <VG/vgu.h>
#ifdef OPENVG_VERSION_1_1
# include <VG/ext.h>
http://git.savannah.gnu.org/cgit//commit/?id=96464d81c294ccbdbacf1d6f4b3a1707552e22b4
commit 96464d81c294ccbdbacf1d6f4b3a1707552e22b4
Author: Rob Savoye <address@hidden>
Date: Wed Dec 15 22:06:00 2010 -0700
ifdef out a few tests that don't deem to exists on ltib
diff --git a/librender/testr.cpp b/librender/testr.cpp
index 0426e47..c8e481e 100644
--- a/librender/testr.cpp
+++ b/librender/testr.cpp
@@ -345,13 +345,15 @@ test_renderer(Renderer *renderer, const std::string &type)
} else {
runtest.fail("Couldn't get description!");
}
-
+
+#if 0
if (renderer->getBitsPerPixel()) {
runtest.pass("getBitsPerPixel()");
} else {
runtest.fail("getBitsPerPixel()");
}
-
+#endif
+
image::GnashImage *frame1 = new image::ImageRGBA(10, 10);
std::auto_ptr<image::GnashImage> im1(frame1);
CachedBitmap *cb = renderer->createCachedBitmap(im1);
@@ -382,6 +384,7 @@ test_renderer(Renderer *renderer, const std::string &type)
ovg->attachWindow(*(reinterpret_cast<EGLNativeWindowType *>(canvas)));
}
#else
+#if 0
// Initializes the renderer for off-screen rendering used by the testsuite.
if (renderer->initTestBuffer(10, 10)) {
runtest.pass("initTestBuffer()");
@@ -389,6 +392,7 @@ test_renderer(Renderer *renderer, const std::string &type)
runtest.fail("initTestBuffer()");
}
#endif
+#endif
/// @coords an array of 16-bit signed integer coordinates. Even indices
/// (and 0) are x coordinates, while uneven ones are y coordinates.
@@ -583,7 +587,7 @@ test_iterators(Renderer *renderer, const std::string &type)
runtest.fail("getFirstRenderImage()");
}
-
+#if 0
geometry::Point2d a(1, 2);
geometry::Point2d c(3, 4);
Renderer::RenderImage image;
@@ -596,6 +600,7 @@ test_iterators(Renderer *renderer, const std::string &type)
renderer->addRenderImage(image);
// image.reset(new gnash::GnashVaapiImageProxy(foo, a.x, a.y, c.x - a.x,
c.y - a.y));
renderer->addRenderImage(image);
+#endif
fit = renderer->getFirstRenderImage();
lit = renderer->getLastRenderImage();
http://git.savannah.gnu.org/cgit//commit/?id=1dac3379ba34b14bc6b84390a8c2e0fb2ede5e1b
commit 1dac3379ba34b14bc6b84390a8c2e0fb2ede5e1b
Author: Rob Savoye <address@hidden>
Date: Wed Dec 15 22:05:29 2010 -0700
fix OpenVG headers
diff --git a/librender/testr_gtk.cpp b/librender/testr_gtk.cpp
index 6a4bb36..b7769bf 100644
--- a/librender/testr_gtk.cpp
+++ b/librender/testr_gtk.cpp
@@ -34,25 +34,28 @@
# include <gdk/gdk.h>
#endif
#ifdef RENDERER_AGG
-#include "agg/Renderer_agg.h"
+# include "agg/Renderer_agg.h"
#endif
#ifdef RENDERER_OPENGL
-#include "opengl/Renderer_ogl.h"
+# include "opengl/Renderer_ogl.h"
#endif
#ifdef RENDERER_OPENVG
-#include "openvg/Renderer_ovg.h"
-//#include <VG/openvg.h>
-#include <VG/vgu.h>
-#include <VG/ext.h>
+# include <VG/vgu.h>
+# ifdef OPENVG_VERSION_1_1
+# include <VG/ext.h>
+# else
+# include <VG/vgext.h>
+# endif
+# include <VG/openvg.h>
#endif
#ifdef RENDERER_GLES1
-#include "opengles1/Renderer_gles1.h"
-#endif
-#ifdef RENDERER_GLES2
-#include "opengles2/Renderer_gles2.h"
+# include "opengles1/Renderer_gles1.h"
#endif
+# ifdef RENDERER_GLES2
+# include "opengles2/Renderer_gles2.h"
+# endif
#ifdef RENDERER_CAIRO
-#include "cairo/Renderer_cairo.h"
+# include "cairo/Renderer_cairo.h"
#endif
#ifdef BUILD_EGL_DEVICE
http://git.savannah.gnu.org/cgit//commit/?id=b5275530838d442c6021933e405c779c3e5422f4
commit b5275530838d442c6021933e405c779c3e5422f4
Author: Rob Savoye <address@hidden>
Date: Wed Dec 15 22:04:45 2010 -0700
reenable testr test case again
diff --git a/librender/Makefile.am b/librender/Makefile.am
index 6908a5f..dc110aa 100644
--- a/librender/Makefile.am
+++ b/librender/Makefile.am
@@ -109,7 +109,8 @@ if BUILD_OVG_RENDERER
libgnashrender_la_CPPFLAGS += $(OPENVG_CFLAGS)
libgnashrender_la_SOURCES += \
openvg/Renderer_ovg.cpp \
- openvg/Renderer_ovg.h
+ openvg/Renderer_ovg.h \
+ openvg/Renderer_ovg_bitmap.h
libgnashrender_la_LIBADD += $(OPENVG_LIBS)
endif
@@ -157,21 +158,23 @@ if BUILD_OGL_RENDERER
$(NULL)
endif
-# bin_PROGRAMS = testr
-
-# testr_SOURCES = testr.cpp testr_gtk.cpp
-# testr_CPPFLAGS = \
-# $(AM_CPPFLAGS) \
-# $(EGL_CFLAGS) \
-# $(GLES1_CFLAGS) \
-# $(GLES2_CFLAGS)
-# $(OPENVG_CFLAGS) \
-# $(DIRECTFB_CFLAGS)
-# testr_LDADD = \
-# libgnashrender.la \
-# ../libdevice/libgnashdevice.la \
-# $(GNASH_LIBS) \
-# $(GTK2_LIBS) \
-# $(OPENVG_LIBS) \
-# $(GLES1_LIBS) \
-# $(GLES2_LIBS)
+bin_PROGRAMS = testr
+
+testr_SOURCES = testr.cpp # testr_gtk.cpp
+testr_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ $(EGL_CFLAGS) \
+ $(OPENVG_CFLAGS) \
+ $(GLES1_CFLAGS) \
+ $(GLES2_CFLAGS)
+ $(DIRECTFB_CFLAGS)
+testr_LDADD = \
+ libgnashrender.la \
+ ../libdevice/libgnashdevice.la \
+ $(GTK2_LIBS) \
+ $(EXTRA_EGL_LIBS) \
+ $(EGL_LIBS) \
+ $(GNASH_LIBS) \
+ $(OPENVG_LIBS) \
+ $(GLES1_LIBS) \
+ $(GLES2_LIBS)
http://git.savannah.gnu.org/cgit//commit/?id=919a15d53945c661b6e0cda31a77ea852870e35c
commit 919a15d53945c661b6e0cda31a77ea852870e35c
Author: Rob Savoye <address@hidden>
Date: Wed Dec 15 20:49:27 2010 -0700
currently when cross compiling for ltib with an external toolchain, more
libraries need to be added at link time
diff --git a/macros/openvg.m4 b/macros/openvg.m4
index f3f8327..c0d3b3e 100644
--- a/macros/openvg.m4
+++ b/macros/openvg.m4
@@ -86,12 +86,27 @@ AC_DEFUN([GNASH_PATH_OPENVG],
if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
ac_cv_path_openvg_lib="-L$i -lOpenVG"
break
- else
+ else
ac_cv_path_openvg_lib="-lOpenVG"
break
- fi
+ fi
fi
done
+ dnl The Babbage board wants libgsl too. We put this in a separate
+ dnl vatiable because all the executables need it when statically
+ dnl linking. With Ltib, when cross compiling, these are needed at
+ dnl link time.
+ if test -f $i/libgsl.${shlibext} -o -f $i/libgsl.a; then
+ EXTRA_EGL_LIBS="${EXTRA_EGL_LIBS} -lgsl"
+ fi
+ dnl The Babbage board wants libssl too because libcurl
+ dnl is statically linked.
+ if test -f $i/libssl.${shlibext} -o -f $i/libssl.a; then
+ EXTRA_EGL_LIBS="${EXTRA_EGL_LIBS} -lssl"
+ fi
+ if test -f $i/libcrypto.${shlibext} -o -f $i/libcrypto.a; then
+ EXTRA_EGL_LIBS="${EXTRA_EGL_LIBS} -lcrypto"
+ fi
fi
if test x"${ac_cv_path_openvg_lib}" = x; then
AC_CHECK_LIB([OpenVG], [vgClear], [ac_cv_path_openvg_lib="-lOpenVG"])
@@ -104,6 +119,7 @@ AC_DEFUN([GNASH_PATH_OPENVG],
OPENVG_LIBS=""
fi
+ AC_SUBST(EXTRA_EGL_LIBS)
AC_SUBST(OPENVG_CFLAGS)
AC_SUBST(OPENVG_LIBS)
])
http://git.savannah.gnu.org/cgit//commit/?id=df3d77576c91502bd5a38927ae2012bafb653cb0
commit df3d77576c91502bd5a38927ae2012bafb653cb0
Author: Rob Savoye <address@hidden>
Date: Wed Dec 15 20:48:11 2010 -0700
fix typo in libgnashrender_la_CPPFLAGS
diff --git a/librender/Makefile.am b/librender/Makefile.am
index bad2d74..6908a5f 100644
--- a/librender/Makefile.am
+++ b/librender/Makefile.am
@@ -106,7 +106,7 @@ libgnashrender_la_LIBADD += $(AGG_LIBS) $(LIBVA)
endif
if BUILD_OVG_RENDERER
-libgnashrender_la_CPPFLAGS += $(OVG_CFLAGS)
+libgnashrender_la_CPPFLAGS += $(OPENVG_CFLAGS)
libgnashrender_la_SOURCES += \
openvg/Renderer_ovg.cpp \
openvg/Renderer_ovg.h
@@ -135,41 +135,6 @@ libgnashrender_la_SOURCES += \
libgnashrender_la_LIBADD += $(CAIRO_LIBS)
endif
-# libgnashdevice_la_CPPFLAGS = $(AM_CPPFLAGS)
-# libgnashdevice_la_LIBADD = \
-# $(LIBVA_LIBS) \
-# $(LIBVA_X11_LIBS) \
-# $(LIBVA_GLX_LIBS) \
-# $(GNASH_LIBS)
-# libgnashdevice_la_LDFLAGS = -release $(VERSION)
-# libgnashdevice_la_SOURCES =
-
-# if BUILD_EGL_DEVICE
-# libgnashdevice_la_CPPFLAGS += $(EGL_CFLAGS)
-# libgnashdevice_la_SOURCES += eglDevice.cpp
-# libgnashdevice_la_LIBADD += $(EGL_LIBS)
-# endif
-
-# if BUILD_DIRECTFB_DEVICE
-# libgnashdevice_la_CPPFLAGS += $(DIRECTFB_CFLAGS)
-# libgnashdevice_la_SOURCES += directfb/DirectFBDevice.cpp
-# libgnashdevice_la_LIBADD += $(DIRECTFB_LIBS)
-# endif
-
-# if BUILD_VAAPI_DEVICE
-# libgnashdevice_la_CPPFLAGS += $(VAAPI_CFLAGS)
-# libgnashdevice_la_SOURCES += \
-# vaapi/VaapiDevice.cpp \
-# vaapi/VaapiSurface.cpp
-# libgnashdevice_la_LIBADD += $(VAAPI_LIBS)
-# endif
-
-# # if BUILD_X11_DEVICE
-# libgnashdevice_la_CPPFLAGS += $(X11_CFLAGS)
-# libgnashdevice_la_SOURCES += x11/X11Device.cpp
-# libgnashdevice_la_LIBADD += $(X11_LIBS)
-# endif
-
# Rebuild with GCC 4.x Mudflap support
mudflap:
@echo "Rebuilding with GCC Mudflap support"
@@ -192,15 +157,21 @@ if BUILD_OGL_RENDERER
$(NULL)
endif
-check_PROGRAMS = testr
-
-testr_SOURCES = testr.cpp testr_gtk.cpp
-testr_CPPFLAGS = $(AM_CPPFLAGS) $(DIRECTFB_CFLAGS) # -DUSE_TESTSUITE
-testr_LDADD = \
- libgnashrender.la \
- ../libdevice/libgnashdevice.la \
- $(GNASH_LIBS) \
- $(GTK2_LIBS) \
- $(OPENVG_LIBS) \
- $(GLES1_LIBS) \
- $(GLES2_LIBS)
+# bin_PROGRAMS = testr
+
+# testr_SOURCES = testr.cpp testr_gtk.cpp
+# testr_CPPFLAGS = \
+# $(AM_CPPFLAGS) \
+# $(EGL_CFLAGS) \
+# $(GLES1_CFLAGS) \
+# $(GLES2_CFLAGS)
+# $(OPENVG_CFLAGS) \
+# $(DIRECTFB_CFLAGS)
+# testr_LDADD = \
+# libgnashrender.la \
+# ../libdevice/libgnashdevice.la \
+# $(GNASH_LIBS) \
+# $(GTK2_LIBS) \
+# $(OPENVG_LIBS) \
+# $(GLES1_LIBS) \
+# $(GLES2_LIBS)
-----------------------------------------------------------------------
Summary of changes:
libbase/extension.cpp | 18 ++++--------
libbase/sharedlib.cpp | 19 +++++++++++-
libdevice/GnashDevice.h | 4 +-
libdevice/Makefile.am | 36 ++++++++++++-----------
libdevice/rawfb/rawfb.am | 7 ++--
librender/Makefile.am | 56 ++++++++++---------------------------
librender/openvg/Renderer_ovg.cpp | 2 +-
librender/openvg/Renderer_ovg.h | 1 +
librender/testr.cpp | 11 +++++--
librender/testr_gtk.cpp | 25 +++++++++-------
macros/openvg.m4 | 20 ++++++++++++-
11 files changed, 105 insertions(+), 94 deletions(-)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, openvg, updated. a22b5e0a78c4222ce93573f09ccde06cad9b6adc,
Rob Savoye <=