[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r12248: Fix type so libintl actually
From: |
Rob Savoye |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r12248: Fix type so libintl actually gets linked into the gui. |
Date: |
Sat, 12 Jun 2010 15:39:55 -0600 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 12248 [merge]
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Sat 2010-06-12 15:39:55 -0600
message:
Fix type so libintl actually gets linked into the gui.
Add gles option to --enable-renderer= to enable currently non-existant
OpenGL-ES support. Currently works with Android and the Linux versions,
not enabled by default.
modified:
configure.ac
gui/Makefile.am
macros/opengl.m4
=== modified file 'configure.ac'
--- a/configure.ac 2010-06-03 15:19:48 +0000
+++ b/configure.ac 2010-06-12 20:37:26 +0000
@@ -696,13 +696,14 @@
fi
dnl By default, we want to to build all renderers
+build_gles=no
build_ogl=yes
build_agg=yes
build_cairo=yes
renderer_list="OpenGL AGG Cairo"
nrender=3
AC_ARG_ENABLE(renderer,
- AC_HELP_STRING([--enable-renderer=], [Enable support for the specified
renderers (ogl|cairo|agg|all, default=all)]),
+ AC_HELP_STRING([--enable-renderer=], [Enable support for the specified
renderers (ogl|gles|cairo|agg|all, default=all)]),
if test -n ${enableval}; then
if test "x${enableval}" != "xno" -o "x${enableval}" != "xnone" ; then
renderer_list="none"
@@ -715,6 +716,7 @@
renderer_list=""
nrender=0
build_ogl=no
+ build_gles=no
build_agg=no
build_cairo=no
while test -n "${enableval}" ; do
@@ -723,6 +725,7 @@
no*|NO*)
renderer_list="none"
build_ogl=no
+ build_gles=no
build_agg=no
build_cairo=no
nrender=1
@@ -736,9 +739,16 @@
;;
ogl|OGL|OpenGL|opengl)
renderer_list="${renderer_list} OpenGL"
+ build_gles=no
build_ogl=yes
nrender=$((nrender+1))
;;
+ gles|GLES|GL-ES|gl-es)
+ renderer_list="${renderer_list} OpenGL-ES"
+ build_gles=yes
+ build_ogl=no
+ nrender=$((nrender+1))
+ ;;
agg|AGG)
renderer_list="${renderer_list} AGG"
build_agg=yes
@@ -788,7 +798,7 @@
fi]
)
-if test x$build_ogl = xyes; then
+if test x"${build_ogl}" = xyes; then
dnl if test x$build_fb = xyes; then
dnl AC_MSG_ERROR([OpenGL renderer is not supported by FB gui. Use
--enable-renderer=AGG or --enable-gui=kde,gtk,sdl]);
dnl fi
@@ -801,6 +811,10 @@
AC_DEFINE([RENDERER_OPENGL], [], [Use OpenGL renderer])
fi
+if test x"${build_gles}" = xyes; then
+ AC_DEFINE([RENDERER_GLES], [], [Use OpenGL-ES renderer])
+fi
+
dnl 16 bit: RGB555, RGB565
dnl 24 bit: RGB24, BGR24
dnl 32 bit: RGBA32, BGRA32
@@ -1055,7 +1069,8 @@
AC_PATH_PROG(DEJAGNU, runtest)
-AM_CONDITIONAL(BUILD_OGL_RENDERER, [ test x$build_ogl = xyes ])
+AM_CONDITIONAL(BUILD_GLES_RENDERER, [ test x$build_gles = xyes ])
+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 ])
@@ -1428,6 +1443,7 @@
dnl build_gtk=yes
build_kde3=no
build_ogl=no
+ build_gles=no
build_agg=yes
fi
@@ -2083,6 +2099,10 @@
AM_CONDITIONAL(KPARTS3, [test x"${build_kparts3}" = xyes])
AM_CONDITIONAL(KPARTS4, [test x"${build_kparts4}" = xyes])
+if test x"${build_gles}" = xyes; then
+ GNASH_PATH_GLES
+fi
+
if test x"${build_ogl}" = xyes; then
GNASH_PATH_OPENGL
fi
@@ -2986,7 +3006,7 @@
dnl echo " ERROR: No VORBIS Vorbis development package installed!" >&3
dnl fi
-if test x"$opengl" = x"yes"; then
+if test x"${build_ogl}" = x"yes"; then
if test x"$OPENGL_LIBS" != x; then
if test x"$OPENGL_CFLAGS" != x; then
echo " OpenGL flags are: $OPENGL_CFLAGS"
@@ -3003,6 +3023,21 @@
fi
fi
+if test x"${build_gles}" = x"yes"; then
+ if test x"${has_gles}" != x; then
+ if test x"$GLES_CFLAGS" != x; then
+ echo " OpenGL-ES flags are: $GLES_CFLAGS"
+ else
+ echo " OpenGL-ES flags are: default include path"
+ fi
+ echo " OpenGL-ES libs are: $GLES_LIBS"
+ else
+ echo " ERROR: No OpenGL-ES development package installed!" >&3
+ echo " You need to install the this from source proobably"
>&3
+ echo " or use a different renderer with
--enable-renderer=" >&3
+ fi
+fi
+
dnl GLEXT is only needed for GTK/OpenGL
if test x$build_gtk = xyes -a x$build_ogl = xyes ; then
if test x"$GLEXT_LIBS" != x; then
=== modified file 'gui/Makefile.am'
--- a/gui/Makefile.am 2010-05-21 01:26:20 +0000
+++ b/gui/Makefile.am 2010-06-12 21:39:55 +0000
@@ -103,7 +103,7 @@
$(PNG_LIBS) \
$(LIRC_LIBS) \
$(MYSQL_LIBS) \
- $(INTLLIB) \
+ $(INTLLIBS) \
$(BOOST_LIBS) \
$(PTHREAD_LIBS) \
$(NULL)
=== modified file 'macros/opengl.m4'
--- a/macros/opengl.m4 2010-03-02 01:48:07 +0000
+++ b/macros/opengl.m4 2010-06-12 20:37:26 +0000
@@ -14,6 +14,104 @@
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+AC_DEFUN([GNASH_PATH_GLES],
+[
+ gles=yes
+
+ dnl the library has different names depending on the release
+ gleslist="GLESv2 GLES_CL GLESv1_CM GLESv1"
+
+ dnl add the default path to the Android NDK
+ newlist="${android_ndk}/usr/include ${incllist}"
+
+ dnl Look for the headers.
+ AC_ARG_WITH(gles_includes, AC_HELP_STRING([--with-gles-includes], [directory
where OpenGL-ES headers are]), with_gles_includes=${withval})
+ AC_CACHE_VAL(ac_cv_path_gles_includes,[
+ if test x"${with_gles_includes}" != x ; then
+ if test -f ${with_gles_includes}/GLES/egl.h -o -f
${with_gles_includes}/GLES2/gl2.h ; then
+ ac_cv_path_gles_includes="-I`(cd ${with_gles_includes}; pwd)`"
+ else
+ AC_MSG_ERROR([${with_gles_includes} directory doesn't contain egl.h or
gl2.h])
+ fi
+ fi
+ ])
+
+ if test x"${ac_cv_path_gles_includes}" = x; then
+ AC_MSG_CHECKING([for OpenGL-ES headers])
+ for i in ${newlist}; do
+ if test -f $i/GLES2/gl2.h; then
+ AC_DEFINE(HAVE_GLES2_GL2_H, [1], [Have OpenGL_ES version 2])
+ ac_cv_path_gles_includes="-I$i"
+ break;
+ else
+ if test -f $i/GLES/egl.h; then
+ AC_DEFINE(HAVE_GLES_EGL_H, [1], [Have OpenGL_ES version 1])
+ ac_cv_path_gles_includes="-I$i"
+ break;
+ fi
+ fi
+ done
+ fi
+ if test x"${ac_cv_path_gles_includes}" != x; then
+ AC_MSG_RESULT(${ac_cv_path_gles_includes})
+ fi
+
+ if test x"${ac_cv_path_gles_includes}" = x; then
+ AC_CHECK_HEADERS([GLES2/gl2.h], [ac_cv_path_gles_includes=""])
+ fi
+ if test x"${ac_cv_path_gles_includes}" = x; then
+ AC_CHECK_HEADERS([GLES/egl.h], [ac_cv_path_gles_includes=""])
+ fi
+
+ if test x"${ac_cv_path_gles_includes}" != x; then
+ GLES_CFLAGS="${ac_cv_path_gles_includes}"
+ else
+ GLES_CFLAGS=""
+ fi
+
+ dnl Look for the libraries.
+ AC_ARG_WITH(gles_lib, AC_HELP_STRING([--with-gles-lib], [directory where
OpenGL-ES libraries are]), with_gles_lib=${withval})
+ AC_CACHE_VAL(ac_cv_path_gles_lib,[
+ if test x"${with_gles_lib}" != x ; then
+ for j in $gleslist; do
+ if test -f ${with_gles_lib}/$i.a -o -f
${with_gles_lib}/$i.${shlibext}; then
+ ac_cv_path_gles_lib="-L`(cd ${with_gles_lib}; pwd)` -l$i"
+ break;
+ fi
+ done
+ fi
+ ])
+
+ dnl add the default path to the Android NDK
+ newlist="${android_ndk}/usr/lib ${libslist}"
+ if test x"${ac_cv_path_gles_lib}" = x; then
+ for dir in ${newlist}; do
+ for lib in ${gleslist}; do
+ if test -f ${dir}/lib${lib}.${shlibext} -o -f ${dir}/lib${lib}.a; then
+ has_gles="yes"
+ if test ! x"${dir}" = x"/usr/lib" -a ! x"${dir}" = x"/usr/lib64";
then
+ ac_cv_path_gles_lib="-L${dir} -l${lib}"
+ else
+ ac_cv_path_gles_lib="-l${lib}"
+ fi
+ break
+ fi
+ done
+ if test x"${ac_cv_path_gles_lib}" != x ; then
+ break
+ fi
+ done
+ fi
+
+ if test x"${ac_cv_path_gles_lib}" != x ; then
+ GLES_LIBS="${ac_cv_path_gles_lib}"
+ else
+ GLES_LIBS=""
+ fi
+
+ AC_SUBST(GLES_CFLAGS)
+ AC_SUBST(GLES_LIBS)
+])
AC_DEFUN([GNASH_PATH_OPENGL],
[
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r12248: Fix type so libintl actually gets linked into the gui.,
Rob Savoye <=