CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/07/26 22:07:28
Modified files:
. : ChangeLog configure.ac
Log message:
* configure.ac: don't assume that if GTK gui is used only the
GTK-pixelformat is needed (other GUIs might be built).
Fixes bug #20586.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3839&r2=1.3840
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.369&r2=1.370
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3839
retrieving revision 1.3840
diff -u -b -r1.3839 -r1.3840
--- ChangeLog 26 Jul 2007 19:48:38 -0000 1.3839
+++ ChangeLog 26 Jul 2007 22:07:27 -0000 1.3840
@@ -1,5 +1,8 @@
2007-07-26 Sandro Santilli <[EMAIL PROTECTED]>
+ * configure.ac: don't assume that if GTK gui is used only the
+ GTK-pixelformat is needed (other GUIs might be built).
+ Fixes bug #20586.
* gui/Player.{cpp,h}: Be more verbose on gui initialization error.
* gui/kde.cpp (createWindow): return false if renderer creation
failed.
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -b -r1.369 -r1.370
--- configure.ac 26 Jul 2007 15:40:35 -0000 1.369
+++ configure.ac 26 Jul 2007 22:07:28 -0000 1.370
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.369 2007/07/26 15:40:35 strk Exp $
+dnl $Id: configure.ac,v 1.370 2007/07/26 22:07:28 strk Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -392,17 +392,19 @@
if test x$pixelformat = xall; then
if test x$build_agg = xyes; then
- if test x$build_gtk = xyes; then
- AC_DEFINE(PIXELFORMAT_RGB24, [1], [RGB24 pixel format])
- pixelformat="RGB24"
- else
+ ### The fact that we're building GTK doesn't mean we're not also
+ ### building KDE or SDL, each needing its own pixel format !
+ #if test x$build_gtk = xyes; then
+ # AC_DEFINE(PIXELFORMAT_RGB24, [1], [RGB24 pixel format])
+ # pixelformat="RGB24"
+ #else
AC_DEFINE(PIXELFORMAT_RGB555, [1], [RGB555 pixel format])
AC_DEFINE(PIXELFORMAT_RGB565, [1], [RGB565 pixel format])
AC_DEFINE(PIXELFORMAT_RGB24, [1], [RGB24 pixel format])
AC_DEFINE(PIXELFORMAT_BGR24, [1], [BGR24 pixel format])
AC_DEFINE(PIXELFORMAT_RGBA32, [1], [RGBA32 pixel format])
AC_DEFINE(PIXELFORMAT_BGRA32, [1], [BGRA32 pixel format])
- fi
+ #fi
fi
fi
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
