[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: |
Gabriele Giacone |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1819-g716915b |
|
Date: |
Thu, 12 Dec 2013 16:31:09 +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 716915b9d7f859e7ab1eaffe173a84a8e614f256 (commit)
via 21a3317105421bc46f4b106ff11c7b86e2d09a67 (commit)
via e866d841be0fd02354be0b22d3941d393ab2a60d (commit)
from 69306c72b930f0493d557f3b869728cfd49dd9fb (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=716915b9d7f859e7ab1eaffe173a84a8e614f256
commit 716915b9d7f859e7ab1eaffe173a84a8e614f256
Author: Gabriele Giacone <address@hidden>
Date: Thu Dec 12 17:23:53 2013 +0100
Include header for FIONREAD on Solaris.
Fix build on Debian GNU/kOpenSolaris.
diff --git a/libcore/ExternalInterface.cpp b/libcore/ExternalInterface.cpp
index 212c07a..54b749f 100644
--- a/libcore/ExternalInterface.cpp
+++ b/libcore/ExternalInterface.cpp
@@ -28,6 +28,10 @@
#include <boost/scoped_array.hpp>
#include <algorithm>
+#ifdef SOLARIS_HOST
+# include <sys/filio.h> // for FIONREAD
+#endif
+
#include "GnashSystemNetHeaders.h"
#include "GnashSystemFDHeaders.h"
http://git.savannah.gnu.org/cgit//commit/?id=21a3317105421bc46f4b106ff11c7b86e2d09a67
commit 21a3317105421bc46f4b106ff11c7b86e2d09a67
Author: Gabriele Giacone <address@hidden>
Date: Thu Dec 12 17:21:04 2013 +0100
Add PTHREAD_CFLAGS to cygnal and extersions.
Fix build on Debian GNU/kOpenSolaris.
diff --git a/cygnal/cgi-bin/echo/Makefile.am b/cygnal/cgi-bin/echo/Makefile.am
index f8f0327..841a203 100644
--- a/cygnal/cgi-bin/echo/Makefile.am
+++ b/cygnal/cgi-bin/echo/Makefile.am
@@ -38,7 +38,8 @@ INCLUDES = \
-I$(top_srcdir)/cygnal \
-I$(top_srcdir)/cygnal/libamf \
-I$(top_srcdir)/cygnal/libnet \
- $(BOOST_CFLAGS)
+ $(BOOST_CFLAGS) \
+ $(PTHREAD_CFLAGS)
echo_la_SOURCES = echo.cpp echo.h
echo_la_LDFLAGS = -module -avoid-version -no-undefined
diff --git a/cygnal/cgi-bin/oflaDemo/Makefile.am
b/cygnal/cgi-bin/oflaDemo/Makefile.am
index 32d202f..e24a9fe 100644
--- a/cygnal/cgi-bin/oflaDemo/Makefile.am
+++ b/cygnal/cgi-bin/oflaDemo/Makefile.am
@@ -38,7 +38,8 @@ INCLUDES = \
-I$(top_srcdir)/cygnal \
-I$(top_srcdir)/cygnal/libamf \
-I$(top_srcdir)/cygnal/libnet \
- $(BOOST_CFLAGS)
+ $(BOOST_CFLAGS) \
+ $(PTHREAD_CFLAGS)
oflaDemo_la_SOURCES = oflaDemo.cpp oflaDemo.h
oflaDemo_la_LDFLAGS = -module -avoid-version -no-undefined
diff --git a/extensions/lirc/Makefile.am b/extensions/lirc/Makefile.am
index 0169a35..c2dd1f8 100644
--- a/extensions/lirc/Makefile.am
+++ b/extensions/lirc/Makefile.am
@@ -32,6 +32,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libcore/asobj \
-I$(top_srcdir)/cygnal/libnet \
$(BOOST_CFLAGS) \
+ $(PTHREAD_CFLAGS) \
$(NULL)
lirc_la_SOURCES = lirc_ext.cpp lirc_ext.h
diff --git a/extensions/mysql/Makefile.am b/extensions/mysql/Makefile.am
index 8956870..58c19de 100644
--- a/extensions/mysql/Makefile.am
+++ b/extensions/mysql/Makefile.am
@@ -31,6 +31,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libcore/vm \
-I$(top_srcdir)/libcore/asobj \
$(BOOST_CFLAGS) \
+ $(PTHREAD_CFLAGS) \
$(MYSQL_CFLAGS) \
$(NULL)
http://git.savannah.gnu.org/cgit//commit/?id=e866d841be0fd02354be0b22d3941d393ab2a60d
commit e866d841be0fd02354be0b22d3941d393ab2a60d
Author: Gabriele Giacone <address@hidden>
Date: Thu Dec 12 17:18:40 2013 +0100
Rename NODEV device type to GNASH_NODEV.
Fix build on Debian GNU/kOpenSolaris.
diff --git a/gui/fb/fb_glue_ovg.cpp b/gui/fb/fb_glue_ovg.cpp
index 13e2175..42e1c0e 100644
--- a/gui/fb/fb_glue_ovg.cpp
+++ b/gui/fb/fb_glue_ovg.cpp
@@ -67,7 +67,7 @@ FBOvgGlue::init(int argc, char **argv[])
boost::shared_array<renderer::GnashDevice::dtype_t> devs = probeDevices();
if (devs) {
int i = 0;
- while (devs[i] != renderer::GnashDevice::NODEV) {
+ while (devs[i] != renderer::GnashDevice::GNASH_NODEV) {
switch (devs[i++]) {
case renderer::GnashDevice::EGL:
log_debug(_("Probing found an EGL display device"));
@@ -85,7 +85,7 @@ FBOvgGlue::init(int argc, char **argv[])
log_debug(_("Probing found a DirectFB display device"));
dfb = true;
break;
- case renderer::GnashDevice::NODEV:
+ case renderer::GnashDevice::GNASH_NODEV:
default:
log_error(_("No display devices found by probing!"));
break;
diff --git a/gui/gtk/gtk_glue_ovg.cpp b/gui/gtk/gtk_glue_ovg.cpp
index d2f2ba9..df4b4e1 100644
--- a/gui/gtk/gtk_glue_ovg.cpp
+++ b/gui/gtk/gtk_glue_ovg.cpp
@@ -82,7 +82,7 @@ GtkOvgGlue::init(int /*argc*/, char ** /*argv*/[])
boost::shared_array<renderer::GnashDevice::dtype_t> devs = probeDevices();
if (devs) {
int i = 0;
- while (devs[i] != renderer::GnashDevice::NODEV) {
+ while (devs[i] != renderer::GnashDevice::GNASH_NODEV) {
switch (devs[i++]) {
case renderer::GnashDevice::EGL:
log_debug(_("Probing found an EGL display device"));
@@ -100,7 +100,7 @@ GtkOvgGlue::init(int /*argc*/, char ** /*argv*/[])
log_debug(_("Probing found a DirectFB display device"));
dfb = true;
break;
- case renderer::GnashDevice::NODEV:
+ case renderer::GnashDevice::GNASH_NODEV:
default:
log_error(_("No display devices found by probing!"));
break;
diff --git a/libdevice/DeviceGlue.h b/libdevice/DeviceGlue.h
index a855cf4..37c51cc 100644
--- a/libdevice/DeviceGlue.h
+++ b/libdevice/DeviceGlue.h
@@ -65,7 +65,7 @@ public:
boost::shared_array<renderer::GnashDevice::dtype_t> devs
(new renderer::GnashDevice::dtype_t[total]);
// terminate the list so it can easily be walked through later.
- devs[--total] = renderer::GnashDevice::NODEV;
+ devs[--total] = renderer::GnashDevice::GNASH_NODEV;
#ifdef BUILD_X11_DEVICE
devs[--total] = renderer::GnashDevice::X11;
#endif
@@ -90,7 +90,7 @@ public:
if (_device) {
return _device->getType();
}
- return renderer::GnashDevice::NODEV;
+ return renderer::GnashDevice::GNASH_NODEV;
}
/// Set the display device for later use. After this is called,
diff --git a/libdevice/GnashDevice.h b/libdevice/GnashDevice.h
index fe6ab63..24254e0 100644
--- a/libdevice/GnashDevice.h
+++ b/libdevice/GnashDevice.h
@@ -45,7 +45,7 @@ struct GnashDevice
/// The list of supported renders that use devices
typedef enum {OPENVG, OPENGL, OPENGLES1, OPENGLES2, XORG, VAAPI} rtype_t;
/// The list of supported device types
- typedef enum {NODEV, EGL, DIRECTFB, X11, RAWFB} dtype_t;
+ typedef enum {GNASH_NODEV, EGL, DIRECTFB, X11, RAWFB} dtype_t;
GnashDevice(int argc, char *argv[]);
GnashDevice() { };
diff --git a/librender/testr.cpp b/librender/testr.cpp
index 18ec26e..986cb1e 100644
--- a/librender/testr.cpp
+++ b/librender/testr.cpp
@@ -321,7 +321,7 @@ test_device(Renderer *renderer, const std::string &type)
}
// Be default, there should be no device associated with this
// renderer yet.
- if (renderer->getDevice() == GnashDevice::NODEV) {
+ if (renderer->getDevice() == GnashDevice::GNASH_NODEV) {
runtest.pass("Renderer::getDevice()");
} else {
runtest.fail("Renderer::getDevice()");
-----------------------------------------------------------------------
Summary of changes:
cygnal/cgi-bin/echo/Makefile.am | 3 ++-
cygnal/cgi-bin/oflaDemo/Makefile.am | 3 ++-
extensions/lirc/Makefile.am | 1 +
extensions/mysql/Makefile.am | 1 +
gui/fb/fb_glue_ovg.cpp | 4 ++--
gui/gtk/gtk_glue_ovg.cpp | 4 ++--
libcore/ExternalInterface.cpp | 4 ++++
libdevice/DeviceGlue.h | 4 ++--
libdevice/GnashDevice.h | 2 +-
librender/testr.cpp | 2 +-
10 files changed, 18 insertions(+), 10 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-1819-g716915b,
Gabriele Giacone <=