[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-1511-gd40781c |
Date: |
Mon, 03 Sep 2012 15:13:03 +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 d40781c692a7eca985d08af7e1af2bcc33865f8f (commit)
from 5f3dd9bd93da55fc09536c7a9fbc77cbd58a41d5 (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=d40781c692a7eca985d08af7e1af2bcc33865f8f
commit d40781c692a7eca985d08af7e1af2bcc33865f8f
Author: Rob Savoye <address@hidden>
Date: Mon Sep 3 09:11:43 2012 -0600
Test for the EGLNativeWindowType, which can be void * or int depending on
the platform. Fixes bug #37245
diff --git a/configure.ac b/configure.ac
index 94b53ed..5da7aae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1173,12 +1173,26 @@ if test x"${build_egl_device}" = xyes; then
if test xyes = x"${has_EGL}"; then
AC_DEFINE(BUILD_EGL_DEVICE, [ 1 ],
[Build the EGL device for OpenVG, OpenGLES1&2, and X11/Mesa])
- device_list="${device_list} EGL"
- ndevice=$((ndevice+1))
else
AC_MSG_WARN(["EGL requested but development package not found!"])
build_egl_device=no
fi
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Wall -Werror"
+ native_window_type=none
+ AC_MSG_CHECKING([For EGLNativeWindowType type])
+ AC_TRY_COMPILE([#include <EGL/eglplatform.h>], [
+ EGLNativeWindowType foo = 1;
+ int bar = foo;
+ bar++; ],
+ native_window_type=int,
+ native_window_type=void
+ )
+ CFLAGS="$save_CFLAGS"
+ AC_MSG_RESULT([${native_window_type}])
+ if test x"${native_window_type}" = x"int"; then
+ AC_DEFINE([EGL_NATIVE_WINDOW_INT], [1], [EGLNativeWindowType type])
+ fi
fi
if test ${ndevice} -eq 0; then
diff --git a/libdevice/egl/eglDevice.cpp b/libdevice/egl/eglDevice.cpp
index 263361b..5f9894a 100644
--- a/libdevice/egl/eglDevice.cpp
+++ b/libdevice/egl/eglDevice.cpp
@@ -380,7 +380,11 @@ EGLDevice::attachWindow(GnashDevice::native_window_t
window)
if (!window) {
throw GnashException("bogus window handle!");
} else {
+#ifdef EGL_NATIVE_WINDOW_INT
_nativeWindow = static_cast<EGLNativeWindowType>(window);
+#else
+ _nativeWindow = reinterpret_cast<EGLNativeWindowType>(window);
+#endif
}
if (_eglSurface != EGL_NO_SURFACE) {
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 18 ++++++++++++++++--
libdevice/egl/eglDevice.cpp | 4 ++++
2 files changed, 20 insertions(+), 2 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-1511-gd40781c,
Rob Savoye <=