[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, hwaccel, updated. release_0_8_9_final
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, hwaccel, updated. release_0_8_9_final-1092-g5b796da |
|
Date: |
Tue, 09 Aug 2011 15:53:11 +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, hwaccel has been updated
via 5b796da4bca1d07cfe5719c87d91f86bd296d3f6 (commit)
via dd08b020fb4cbef3153c7dfb5616637548738960 (commit)
via 5324fb820d6c96f1e3c6510d0e70f6c3d819e672 (commit)
via a0952f3a0afc737c8e83f8729e16bc33af1a27b2 (commit)
via 16b1b9473f7bf9612a51aeda7147f1823b9f9899 (commit)
via ee0106554c615a0083fd5f0433826955f585fc8c (commit)
via 847a18489c5e68570c24f0aecebd52f851e57f3d (commit)
via 2012b4187a57b3f2e5217f46c22d29ebb306a92d (commit)
via e0e325f1acb7d386814921591c161720629b6873 (commit)
via e8d9ed923d48dc30204f4c4a9d43a9017776c5ec (commit)
via 39c795df171c7584b6da982e5ab8ca963d1d674f (commit)
via c17786a6aa9506f048b3bb19ee6dd1eff789eb01 (commit)
via bbee1c848e94af320b17302e9ac4763109c96a17 (commit)
from a77b2d1eeb200062e1da7cea6ed1de622cb872de (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=5b796da4bca1d07cfe5719c87d91f86bd296d3f6
commit 5b796da4bca1d07cfe5719c87d91f86bd296d3f6
Author: Rob Savoye <address@hidden>
Date: Tue Aug 9 09:52:35 2011 -0600
update the copyright date.
diff --git a/librender/openvg/OpenVGStyle.h b/librender/openvg/OpenVGStyle.h
index 9e2a2f2..ac79f80 100644
--- a/librender/openvg/OpenVGStyle.h
+++ b/librender/openvg/OpenVGStyle.h
@@ -1,5 +1,6 @@
//
-// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
+// Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
http://git.savannah.gnu.org/cgit//commit/?id=dd08b020fb4cbef3153c7dfb5616637548738960
commit dd08b020fb4cbef3153c7dfb5616637548738960
Author: Rob Savoye <address@hidden>
Date: Tue Aug 9 09:38:38 2011 -0600
adjust the order of variable initialization in the constructors. Update the
copyright date, and get rid of a few compiler warnings.
diff --git a/librender/openvg/OpenVGBitmap.cpp
b/librender/openvg/OpenVGBitmap.cpp
index 1bcb20b..b9e96b3 100644
--- a/librender/openvg/OpenVGBitmap.cpp
+++ b/librender/openvg/OpenVGBitmap.cpp
@@ -1,5 +1,6 @@
//
-// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
+// Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -37,13 +38,14 @@ static const int NUM_STOPS = 10;
/// @param vgpaint the VG paint context
OpenVGBitmap::OpenVGBitmap(VGPaint paint)
- : _vgimage(VG_INVALID_HANDLE),
+ :
#ifdef BUILD_X11_DEVICE
- _pixel_format(VG_sARGB_8888),
+ _pixel_format(VG_sARGB_8888),
#else
- _pixel_format(VG_sRGB_565),
+ _pixel_format(VG_sRGB_565),
#endif
- _vgpaint(paint)
+ _vgimage(VG_INVALID_HANDLE),
+ _vgpaint(paint)
{
// GNASH_REPORT_FUNCTION;
}
@@ -53,13 +55,14 @@ OpenVGBitmap::OpenVGBitmap(VGPaint paint)
/// @param bitmap A CachedBitmap
/// @param vgpaint the VG paint context
OpenVGBitmap::OpenVGBitmap(CachedBitmap *bitmap, VGPaint vgpaint)
- : _vgimage(VG_INVALID_HANDLE),
+ :
#ifdef BUILD_X11_DEVICE
_pixel_format(VG_sARGB_8888),
#else
_pixel_format(VG_sRGB_565),
#endif
- _vgpaint(vgpaint)
+ _vgimage(VG_INVALID_HANDLE),
+ _vgpaint(vgpaint)
{
// GNASH_REPORT_FUNCTION;
@@ -106,13 +109,13 @@ OpenVGBitmap::OpenVGBitmap(CachedBitmap *bitmap, VGPaint
vgpaint)
/// only the GnashImage is cached.
OpenVGBitmap::OpenVGBitmap(image::GnashImage *image, VGPaint vgpaint)
: _image(image),
- _vgimage(VG_INVALID_HANDLE),
#ifdef BUILD_X11_DEVICE
_pixel_format(VG_sARGB_8888),
#else
_pixel_format(VG_sRGB_565),
#endif
- _vgpaint(vgpaint)
+ _vgimage(VG_INVALID_HANDLE),
+ _vgpaint(vgpaint)
{
// GNASH_REPORT_FUNCTION;
}
@@ -125,15 +128,6 @@ OpenVGBitmap::~OpenVGBitmap()
vgDestroyImage(_vgimage);
}
-image::GnashImage&
-OpenVGBitmap::image()
-{
- // GNASH_REPORT_FUNCTION;
- if (_image) {
- return *_image;
- }
-}
-
/// Create a radial gradient and paint it to the context
///
/// @param x0 The X coordinate of the origin point
@@ -156,7 +150,7 @@ OpenVGBitmap *
OpenVGBitmap::createRadialBitmap(float cx, float cy, float fx, float fy,
float radial, const rgba &incolor,
const GradientFill::GradientRecords &records,
- const SWFCxForm& cxform,
+ const SWFCxForm& /* cxform */,
VGPaint paint)
{
// GNASH_REPORT_FUNCTION;
diff --git a/librender/openvg/OpenVGBitmap.h b/librender/openvg/OpenVGBitmap.h
index 5b0741b..b5c1343 100644
--- a/librender/openvg/OpenVGBitmap.h
+++ b/librender/openvg/OpenVGBitmap.h
@@ -1,5 +1,6 @@
//
-// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
+// Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -49,7 +50,10 @@ public:
void dispose() { _image.reset(); }
bool disposed() const { return !_image.get(); }
- image::GnashImage& image();
+ image::GnashImage& image() {
+ assert(!disposed());
+ return *_image;
+ };
VGPaint &vgimage() { return _vgimage; };
// Accessors for the GnashImage internal data
http://git.savannah.gnu.org/cgit//commit/?id=5324fb820d6c96f1e3c6510d0e70f6c3d819e672
commit 5324fb820d6c96f1e3c6510d0e70f6c3d819e672
Author: Rob Savoye <address@hidden>
Date: Tue Aug 9 09:37:07 2011 -0600
update the copyright date.
diff --git a/gui/fb/fb_glue_ovg.cpp b/gui/fb/fb_glue_ovg.cpp
index b1a5442..5920876 100644
--- a/gui/fb/fb_glue_ovg.cpp
+++ b/gui/fb/fb_glue_ovg.cpp
@@ -1,6 +1,6 @@
//
-// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-// Foundation, Inc
+// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
+// Free Software Foundation, Inc
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -42,7 +42,7 @@ namespace gnash {
namespace gui {
-FBOvgGlue::FBOvgGlue(int fd)
+FBOvgGlue::FBOvgGlue(int /* fd */)
: _stride(0)
{
// GNASH_REPORT_FUNCTION;
@@ -171,7 +171,7 @@ FBOvgGlue::setInvalidatedRegions(const InvalidatedRanges&
/* ranges */)
}
void
-FBOvgGlue::prepDrawingArea(void *drawing_area)
+FBOvgGlue::prepDrawingArea(void * /*drawing_area */)
{
// GNASH_REPORT_FUNCTION;
http://git.savannah.gnu.org/cgit//commit/?id=a0952f3a0afc737c8e83f8729e16bc33af1a27b2
commit a0952f3a0afc737c8e83f8729e16bc33af1a27b2
Author: Rob Savoye <address@hidden>
Date: Tue Aug 9 09:36:51 2011 -0600
update the copyright date.
diff --git a/gui/fb/fb_glue_ovg.h b/gui/fb/fb_glue_ovg.h
index fb07d05..53d1242 100644
--- a/gui/fb/fb_glue_ovg.h
+++ b/gui/fb/fb_glue_ovg.h
@@ -92,7 +92,6 @@ private:
//Rectangle _bounds;
std::vector< geometry::Range2d<int> > _drawbounds;
geometry::Range2d<int> _validbounds;
-
// EGL needs it's own display device, as that's how it stays platform
// independent. For a Framebuffer we use that, and on the desktop,
http://git.savannah.gnu.org/cgit//commit/?id=16b1b9473f7bf9612a51aeda7147f1823b9f9899
commit 16b1b9473f7bf9612a51aeda7147f1823b9f9899
Author: Rob Savoye <address@hidden>
Date: Tue Aug 9 09:36:25 2011 -0600
update the copyright date.
diff --git a/libdevice/directfb/DirectFBDevice.cpp
b/libdevice/directfb/DirectFBDevice.cpp
index 253aeb1..edcd0fc 100644
--- a/libdevice/directfb/DirectFBDevice.cpp
+++ b/libdevice/directfb/DirectFBDevice.cpp
@@ -1,6 +1,6 @@
//
-// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-// Foundation, Inc
+// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
+// Free Software Foundation, Inc
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/libdevice/rawfb/RawFBDevice.cpp b/libdevice/rawfb/RawFBDevice.cpp
index 81e06c5..bd19b72 100644
--- a/libdevice/rawfb/RawFBDevice.cpp
+++ b/libdevice/rawfb/RawFBDevice.cpp
@@ -1,6 +1,6 @@
//
-// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-// Foundation, Inc
+// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
+// Free Software Foundation, Inc
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
http://git.savannah.gnu.org/cgit//commit/?id=ee0106554c615a0083fd5f0433826955f585fc8c
commit ee0106554c615a0083fd5f0433826955f585fc8c
Author: Rob Savoye <address@hidden>
Date: Tue Aug 9 09:35:57 2011 -0600
fixed unused compiler warnings and update the copyright date.
diff --git a/librender/openvg/OpenVGRenderer.cpp
b/librender/openvg/OpenVGRenderer.cpp
index e8a4ab6..ba2f3db 100644
--- a/librender/openvg/OpenVGRenderer.cpp
+++ b/librender/openvg/OpenVGRenderer.cpp
@@ -1,6 +1,6 @@
//
-// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010,
-// 2011 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
+// Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -65,8 +65,6 @@ static const int TwipsPerInch = 1440;
namespace gnash {
-static int tex_size;
-
typedef std::vector<Path> PathVec;
typedef std::vector<geometry::Range2d<int> > ClipBounds;
@@ -815,7 +813,7 @@ Renderer_ovg::analyze_paths(const PathVec &paths, bool&
have_shape,
}
void
-Renderer_ovg::apply_fill_style(const FillStyle& style, const SWFMatrix& mat,
+Renderer_ovg::apply_fill_style(const FillStyle& style, const SWFMatrix& /* mat
*/,
const SWFCxForm& cx)
{
// GNASH_REPORT_FUNCTION;
http://git.savannah.gnu.org/cgit//commit/?id=847a18489c5e68570c24f0aecebd52f851e57f3d
commit 847a18489c5e68570c24f0aecebd52f851e57f3d
Author: Rob Savoye <address@hidden>
Date: Tue Aug 9 09:21:41 2011 -0600
add README explaining the DirectFB code needs to be fully implemented.
diff --git a/libdevice/directfb/README b/libdevice/directfb/README
new file mode 100644
index 0000000..097758a
--- /dev/null
+++ b/libdevice/directfb/README
@@ -0,0 +1,6 @@
+The DirectFB GUI code is for running in a raw framebuffer. Currently
+Gnash uses it's own framebuffer code to handle everything. Using
+DirectFB would reduce the amount of code that needs to be in Gnash
+that deals with devices and the framebuffer. At this time thought this
+is only partially implemented, mostly to make sure the GnashDevice API
+would support DirectFB if this was ever fully implemented.
http://git.savannah.gnu.org/cgit//commit/?id=2012b4187a57b3f2e5217f46c22d29ebb306a92d
commit 2012b4187a57b3f2e5217f46c22d29ebb306a92d
Author: Rob Savoye <address@hidden>
Date: Tue Aug 9 09:09:39 2011 -0600
eliminate compiler warnings
diff --git a/libdevice/directfb/DirectFBDevice.cpp
b/libdevice/directfb/DirectFBDevice.cpp
index 1970eb7..253aeb1 100644
--- a/libdevice/directfb/DirectFBDevice.cpp
+++ b/libdevice/directfb/DirectFBDevice.cpp
@@ -109,14 +109,14 @@ DirectFBDevice::initDevice(int argc, char *argv[])
{
GNASH_REPORT_FUNCTION;
- DFBResult result;
+ DFBResult result = DFB_FAILURE;
- if ((result = DirectFBInit(&argc, &argv)) != DR_OK) {
+ if ((result = DirectFBInit(&argc, &argv)) != DFB_OK) {
log_error("DirectFBInit(): %s", getErrorString(result));
return false;
}
- if ((result = DirectFBCreate(&_dfb)) != DR_OK) {
+ if ((result = DirectFBCreate(&_dfb)) != DFB_OK) {
log_error("DirectFBCreate(): %s", getErrorString(result));
return false;
}
@@ -143,7 +143,7 @@ DirectFBDevice::initDevice(int argc, char *argv[])
// dsc.caps = static_cast<DFBSurfaceCapabilities>(DSCAPS_PRIMARY |
DSCAPS_DOUBLE | DSCAPS_VIDEOONLY);
dsc.caps = static_cast<DFBSurfaceCapabilities>(DSCAPS_PRIMARY |
DSCAPS_FLIPPING);
- if ((result = _dfb->CreateSurface(_dfb, &dsc, &_surface)) != DR_OK) {
+ if ((result = _dfb->CreateSurface(_dfb, &dsc, &_surface)) != DFB_OK) {
log_error("CreateSurface(): %s", getErrorString(result));
return false;
}
@@ -191,9 +191,11 @@ DirectFBDevice::initDevice(int argc, char *argv[])
}
bool
-DirectFBDevice::attachWindow(GnashDevice::native_window_t window)
+DirectFBDevice::attachWindow(GnashDevice::native_window_t /* window */)
{
GNASH_REPORT_FUNCTION;
+
+ return false;
}
void
@@ -492,7 +494,7 @@ DirectFBDevice::printFBScreen(IDirectFBScreen *screen)
{
std::stringstream ss;
- DFBResult result;
+ DFBResult result = DFB_FAILURE;
if (screen) {
// get the screen ID
@@ -1191,7 +1193,7 @@
DirectFBDevice::printSurfacePixelFormat(DFBSurfacePixelFormat format)
}
void
-DirectFBDevice::printColor(DFBColor color)
+DirectFBDevice::printColor(DFBColor /* color */)
{
std::stringstream ss;
@@ -1212,10 +1214,8 @@
DirectFBDevice::printFBSurfaceHintFlags(DFBSurfaceHintFlags flags)
void
DirectFBDevice::printFBFont(IDirectFBFont *font)
{
- std::stringstream ss;
-
+ std::stringstream ss;
int ivalue;
- const char *cvalue;
if (font) {
_font->GetHeight(_font, &ivalue);
@@ -1237,10 +1237,9 @@ DirectFBDevice::printFBFont(IDirectFBFont *font)
/// print the data in a DirectFBInputDevice
void
-DirectFBDevice::printFBInputDevice(IDirectFBInputDevice *input)
+DirectFBDevice::printFBInputDevice(IDirectFBInputDevice * /*input */)
{
std::stringstream ss;
-
std::cerr << ss.str() << std::endl;
}
diff --git a/libdevice/egl/test_egl.cpp b/libdevice/egl/test_egl.cpp
index 711ffe5..76dd153 100644
--- a/libdevice/egl/test_egl.cpp
+++ b/libdevice/egl/test_egl.cpp
@@ -408,9 +408,6 @@ test_egl(EGLDevice &egl, GnashDevice::rtype_t rtype, int
argc, char *argv[])
// runtest.fail("EGLDevice::operator[]()");
// }
- EGLSurface surf2 = egl.createPbuffer(300, 300);
- EGLSurface surf3 = egl.createPbuffer(400, 400);
-
if (hwinit) {
if (egl.totalPbuffers() == 3) {
runtest.pass("EGLDevice::totalPbuffers(2)");
diff --git a/libdevice/rawfb/RawFBDevice.cpp b/libdevice/rawfb/RawFBDevice.cpp
index 6f4d6c5..81e06c5 100644
--- a/libdevice/rawfb/RawFBDevice.cpp
+++ b/libdevice/rawfb/RawFBDevice.cpp
@@ -51,7 +51,7 @@ RawFBDevice::RawFBDevice()
// dbglogfile.setVerbosity();
}
-RawFBDevice::RawFBDevice(int vid)
+RawFBDevice::RawFBDevice(int /* vid */)
: _fd(0),
_fbmem(0)
{
@@ -64,7 +64,7 @@ RawFBDevice::RawFBDevice(int vid)
}
}
-RawFBDevice::RawFBDevice(int argc, char *argv[])
+RawFBDevice::RawFBDevice(int /* argc */ , char ** /* argv */)
: _fd(0),
_fbmem(0)
{
@@ -99,7 +99,7 @@ RawFBDevice::initDevice(int /* argc */, char **/* argv[] */)
{
GNASH_REPORT_FUNCTION;
- char *devname = 0;
+ const char *devname = 0;
// Open the framebuffer device
#ifdef ENABLE_FAKE_FRAMEBUFFER
_fd = open(FAKEFB, O_RDWR);
@@ -212,19 +212,21 @@ RawFBDevice::attachWindow(GnashDevice::native_window_t
window)
// Return a string with the error code as text, instead of a numeric value
const char *
-RawFBDevice::getErrorString(int error)
+RawFBDevice::getErrorString(int /* error */)
{
+ return 0;
}
// Create an RAWFB window to render in. This is only used by testing
void
-RawFBDevice::createWindow(const char *name, int x, int y, int width, int
height)
+RawFBDevice::createWindow(const char * /* name */, int /* x */,
+ int /* y */, int /* width */, int /* height */)
{
GNASH_REPORT_FUNCTION;
}
void
-RawFBDevice::eventLoop(size_t passes)
+RawFBDevice::eventLoop(size_t /* passes */)
{
GNASH_REPORT_FUNCTION;
}
http://git.savannah.gnu.org/cgit//commit/?id=e0e325f1acb7d386814921591c161720629b6873
commit e0e325f1acb7d386814921591c161720629b6873
Author: Rob Savoye <address@hidden>
Date: Tue Aug 9 08:55:51 2011 -0600
eliminate warnings, even though this is just a debugging app for developers.
diff --git a/libdevice/egl/eglinfo.c b/libdevice/egl/eglinfo.c
index 14620a9..08c6d2a 100644
--- a/libdevice/egl/eglinfo.c
+++ b/libdevice/egl/eglinfo.c
@@ -35,6 +35,12 @@
#define MAX_MODES 1000
#define MAX_SCREENS 10
+/* Avoid warning: `ident' defined but not used */
+#ifdef __GNUC__
+# define UNUSED __attribute__ (( unused ))
+#else
+# define UNUSED
+#endif
/**
* Print table of all available configurations.
@@ -105,7 +111,7 @@ PrintConfigs(EGLDisplay d)
* Print table of all available configurations.
*/
static void
-PrintModes(EGLDisplay d)
+PrintModes(EGLDisplay d UNUSED)
{
#ifdef EGL_MESA_screen_surface
const char *extensions = eglQueryString(d, EGL_EXTENSIONS);
@@ -143,7 +149,7 @@ PrintModes(EGLDisplay d)
int
-main(int argc, char *argv[])
+main(int argc UNUSED, char **argv UNUSED)
{
int maj, min;
EGLDisplay d = eglGetDisplay(EGL_DEFAULT_DISPLAY);
http://git.savannah.gnu.org/cgit//commit/?id=e8d9ed923d48dc30204f4c4a9d43a9017776c5ec
commit e8d9ed923d48dc30204f4c4a9d43a9017776c5ec
Author: Rob Savoye <address@hidden>
Date: Mon Aug 8 16:48:54 2011 -0600
Use OPENVG_* instead of OVG_* for debug message
diff --git a/Makefile.am b/Makefile.am
index 5fbbd4e..e1ee521 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -346,8 +346,8 @@ if BUILD_OGL_RENDERER
@echo " OPENGL_LIBS is $(OPENGL_LIBS)"
endif
if BUILD_OVG_RENDERER
- @echo " OVG_CFLAGS is $(OVG_CFLAGS)"
- @echo " OVG_LIBS is $(OVG_LIBS)"
+ @echo " OPENVG_CFLAGS is $(OPENVG_CFLAGS)"
+ @echo " OPENVG_LIBS is $(OPENVG_LIBS)"
endif
if BUILD_GLES1_RENDERER
@echo " GLES1_CFLAGS is $(GLES1_CFLAGS)"
http://git.savannah.gnu.org/cgit//commit/?id=39c795df171c7584b6da982e5ab8ca963d1d674f
commit 39c795df171c7584b6da982e5ab8ca963d1d674f
Author: Rob Savoye <address@hidden>
Date: Mon Aug 8 16:48:21 2011 -0600
handle the user error of openvg being specified, but not having any dev
files.
diff --git a/configure.ac b/configure.ac
index fc6de86..514f589 100644
--- a/configure.ac
+++ b/configure.ac
@@ -986,6 +986,16 @@ AC_ARG_ENABLE(renderer,
done
)
+if test x"${build_ovg}" = xyes; then
+ GNASH_PATH_OPENVG
+ dnl If OpenVG isn't installed, disable it
+ if test x"${has_openvg}" = xno; then
+ AC_MSG_WARN([OpenVG specified but no development files found!])
+ renderer_list=`echo ${renderer_list} | sed -e 's/ openvg//' `
+ nrender=$((nrender-1))
+ fi
+fi
+
dnl 16 bit: RGB555, RGB565
dnl 24 bit: RGB24, BGR24
dnl 32 bit: RGBA32, BGRA32
@@ -1072,15 +1082,6 @@ if test x"${build_ogl}" != xno; then # yes or auto
fi
fi
-if test x"${build_ovg}" = xyes; then
- GNASH_PATH_OPENVG
- dnl If OpenVG isn't installed, disable it
- if test x"${has_openvg}" = xno; then
- build_ovg=no
- AC_MSG_WARN([OpenVG specified but no development files found!])
- fi
-fi
-
AM_CONDITIONAL(BUILD_OVG_RENDERER, [ test x${build_ovg} = xyes ])
AM_CONDITIONAL(BUILD_GLES1_RENDERER, [ test x${build_gles1} = xyes ])
AM_CONDITIONAL(BUILD_GLES2_RENDERER, [ test x${build_gles2} = xyes ])
@@ -1088,7 +1089,7 @@ AM_CONDITIONAL(BUILD_OGL_RENDERER, [ test x${build_ogl}
= xyes])
AM_CONDITIONAL(BUILD_AGG_RENDERER, [ test x${build_agg} = xyes ])
AM_CONDITIONAL(BUILD_CAIRO_RENDERER, [ test x${build_cairo} = xyes ])
-if test x"${build_ovg}" = xyes; then
+if test x"${has_openvg}" = xyes; then
AC_DEFINE([RENDERER_OPENVG], [1], [Use OpenVG renderer])
fi
@@ -3264,12 +3265,8 @@ else
fi
if test x"${build_ovg}" = x"yes"; then
- if test x"$OPENVG_LIBS" != x; then
- if test x"$OPENVG_CFLAGS" != x; then
- echo " OpenVG flags are: $OPENVG_CFLAGS"
- else
- echo " OpenVG flags are: default include path"
- fi
+ if test x"${has_openvg}" = xyes; then
+ echo " OpenVG flags are: $OPENVG_CFLAGS"
echo " OpenVG libs are: $OPENVG_LIBS"
else
echo " ERROR: No OpenVG development package installed!" >&3
diff --git a/macros/openvg.m4 b/macros/openvg.m4
index 5179ee8..1fbc095 100644
--- a/macros/openvg.m4
+++ b/macros/openvg.m4
@@ -16,7 +16,7 @@ dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
MA 02110-1301 USA
AC_DEFUN([GNASH_PATH_OPENVG],
[
- has_openvg=yes
+ has_openvg=no
mesavg=no
dnl Look for the headers.
AC_ARG_WITH(openvg_includes, AC_HELP_STRING([--with-openvg-includes],
[directory where Openvg headers are]), with_openvg_includes=${withval})
@@ -39,11 +39,12 @@ AC_DEFUN([GNASH_PATH_OPENVG],
if test -f $i/VG/vgext.h; then
AC_DEFINE(HAVE_VG_VGEXT_H, 1, [Have LibMESA OpenVG])
mesavg=yes
- else
- if test -f $i/VG/ext.h; then
- AC_DEFINE(HAVE_VG_EXT_H, 1, [Have Freescale OpenVG])
- fi
+ else
+ if test -f $i/VG/ext.h; then
+ AC_DEFINE(HAVE_VG_EXT_H, 1, [Have Freescale OpenVG])
+ fi
fi
+ has_openvg=yes
if test x"$i" != x"/usr/include"; then
ac_cv_path_openvg_includes="-I$i"
break
@@ -55,14 +56,16 @@ AC_DEFUN([GNASH_PATH_OPENVG],
done
fi
- if test x"${ac_cv_path_openvg_includes}" = x; then
- AC_CHECK_HEADERS([VG/openvg.h], [ac_cv_path_openvg_includes=""])
- fi
+ dnl if test x"${has_openvg}" = xno; then
+ dnl AC_CHECK_HEADER([VG/openvg.h], [ac_cv_path_openvg_includes=""])
+ dnl fi
if test x"${mesavg}" = xyes; then
OPENVG_CFLAGS="${ac_cv_path_openvg_includes}"
else
- OPENVG_CFLAGS="-DOPENVG_STATIC_LIBRARY ${ac_cv_path_openvg_includes}"
+ if test x"${ac_cv_header_openvg_includes}" != x; then
+ OPENVG_CFLAGS="-DOPENVG_STATIC_LIBRARY ${ac_cv_path_openvg_includes}"
+ fi
fi
AC_MSG_RESULT(${ac_cv_path_openvg_includes})
@@ -76,7 +79,7 @@ AC_DEFUN([GNASH_PATH_OPENVG],
fi
])
- if test x"${ac_cv_path_openvg_lib}" = x; then
+ if test x"${ac_cv_path_openvg_lib}" -o x"${has_openvg}" = xyes; then
for i in $libslist; do
if test -f $i/libOpenVG.${shlibext} -o -f $i/libOpenVG.a; then
if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
@@ -103,9 +106,10 @@ AC_DEFUN([GNASH_PATH_OPENVG],
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"])
+ if test x"${ac_cv_path_openvg_lib}" = x; then
+ AC_CHECK_LIB([OpenVG], [vgClear], [ac_cv_path_openvg_lib="-lOpenVG"],
+ [ac_cv_path_openvg_lib=""])
+ fi
fi
if test x"${ac_cv_path_openvg_lib}" != x ; then
http://git.savannah.gnu.org/cgit//commit/?id=c17786a6aa9506f048b3bb19ee6dd1eff789eb01
commit c17786a6aa9506f048b3bb19ee6dd1eff789eb01
Author: Rob Savoye <address@hidden>
Date: Mon Aug 8 13:13:13 2011 -0600
remove commented out code blocks
diff --git a/gui/fb/fb.cpp b/gui/fb/fb.cpp
index 6f3b0dd..b2ab1ad 100644
--- a/gui/fb/fb.cpp
+++ b/gui/fb/fb.cpp
@@ -232,7 +232,6 @@ FBGui::init(int argc, char *** argv)
_height = agg->height();
log_debug("Width:%d, Height:%d", _width, _height);
_renderer.reset(agg->createRenderHandler());
- // _renderer.reset(create_Renderer_agg(0));
// Renderer_agg_base *rend = reinterpret_cast<Renderer_agg_base
*>(_renderer.get());
// rend->init(_width, _height);
}
@@ -323,18 +322,7 @@ FBGui::init(int argc, char *** argv)
#endif
_validbounds.setTo(0, 0, _width - 1, _height - 1);
-
- // if (renderer == "openvg") {
- // _renderer.reset(renderer::openvg::create_handler(0));
- // renderer::openvg::Renderer_ovg *rend = reinterpret_cast
- // <renderer::openvg::Renderer_ovg *>(_renderer.get());
- // rend->init(_width, _height);
- // }
- // if (renderer == "agg") {
- // _renderer.reset(create_Renderer_agg(0));
- // }
-
return true;
}
@@ -352,14 +340,6 @@ FBGui::run()
// let the GUI recompute the x/y scale factors to best fit the whole screen
resize_view(_validbounds.width(), _validbounds.height());
-#if 1
- // FIXME: debug only !!!
- if (_runResources.renderer() == 0) {
- fprintf(stderr, "\nNo renderer initialized!\n\n");
-// return false;
- }
-#endif
-
// This loops endlessly at the frame rate
while (!terminate_request) {
// wait the "heartbeat" inteval
http://git.savannah.gnu.org/cgit//commit/?id=bbee1c848e94af320b17302e9ac4763109c96a17
commit bbee1c848e94af320b17302e9ac4763109c96a17
Author: Rob Savoye <address@hidden>
Date: Mon Aug 8 13:12:34 2011 -0600
don't build OpenVG support if no dev files found.
diff --git a/configure.ac b/configure.ac
index 785c6dd..fc6de86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1072,6 +1072,15 @@ if test x"${build_ogl}" != xno; then # yes or auto
fi
fi
+if test x"${build_ovg}" = xyes; then
+ GNASH_PATH_OPENVG
+ dnl If OpenVG isn't installed, disable it
+ if test x"${has_openvg}" = xno; then
+ build_ovg=no
+ AC_MSG_WARN([OpenVG specified but no development files found!])
+ fi
+fi
+
AM_CONDITIONAL(BUILD_OVG_RENDERER, [ test x${build_ovg} = xyes ])
AM_CONDITIONAL(BUILD_GLES1_RENDERER, [ test x${build_gles1} = xyes ])
AM_CONDITIONAL(BUILD_GLES2_RENDERER, [ test x${build_gles2} = xyes ])
@@ -2480,10 +2489,6 @@ AM_CONDITIONAL(BUILD_DIRECTFB_DEVICE, [ test
x${build_directfb_device} = xyes])
AM_CONDITIONAL(BUILD_RAWFB_DEVICE, [ test x${build_rawfb_device} = xyes])
AM_CONDITIONAL(BUILD_X11_DEVICE, [test x${build_x11_device} = xyes])
-if test x"${build_ovg}" = xyes; then
- GNASH_PATH_OPENVG
-fi
-
if test x"${build_gtk}" = xyes; then
AC_ARG_ENABLE(ghelp,
AC_HELP_STRING([--enable-ghelp], [Enable support for the GNOME help
system]),
diff --git a/macros/openvg.m4 b/macros/openvg.m4
index ce500bf..5179ee8 100644
--- a/macros/openvg.m4
+++ b/macros/openvg.m4
@@ -16,6 +16,7 @@ dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
MA 02110-1301 USA
AC_DEFUN([GNASH_PATH_OPENVG],
[
+ has_openvg=yes
mesavg=no
dnl Look for the headers.
AC_ARG_WITH(openvg_includes, AC_HELP_STRING([--with-openvg-includes],
[directory where Openvg headers are]), with_openvg_includes=${withval})
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 4 ++--
configure.ac | 24 +++++++++++++-----------
gui/fb/fb.cpp | 20 --------------------
gui/fb/fb_glue_ovg.cpp | 8 ++++----
gui/fb/fb_glue_ovg.h | 1 -
libdevice/directfb/DirectFBDevice.cpp | 27 +++++++++++++--------------
libdevice/directfb/README | 6 ++++++
libdevice/egl/eglinfo.c | 10 ++++++++--
libdevice/egl/test_egl.cpp | 3 ---
libdevice/rawfb/RawFBDevice.cpp | 18 ++++++++++--------
librender/openvg/OpenVGBitmap.cpp | 32 +++++++++++++-------------------
librender/openvg/OpenVGBitmap.h | 8 ++++++--
librender/openvg/OpenVGRenderer.cpp | 8 +++-----
librender/openvg/OpenVGStyle.h | 3 ++-
macros/openvg.m4 | 29 +++++++++++++++++------------
15 files changed, 97 insertions(+), 104 deletions(-)
create mode 100644 libdevice/directfb/README
hooks/post-receive
--
Gnash
- [Gnash-commit] [SCM] Gnash branch, hwaccel, updated. release_0_8_9_final-1092-g5b796da,
Rob Savoye <=