CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/07/31 16:16:08
Modified files:
. : ChangeLog configure.ac
gui : gtk_glue_agg.h
Log message:
* configure.ac: add --enable-mit-shm
* gui/gtk_glue_agg.h: don't redefine ENABLE_MIT_SHM, use
definition
from config.h
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3883&r2=1.3884
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.384&r2=1.385
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_glue_agg.h?cvsroot=gnash&r1=1.11&r2=1.12
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3883
retrieving revision 1.3884
diff -u -b -r1.3883 -r1.3884
--- ChangeLog 31 Jul 2007 15:44:56 -0000 1.3883
+++ ChangeLog 31 Jul 2007 16:16:07 -0000 1.3884
@@ -1,3 +1,9 @@
+2007-07-31 Sandro Santilli <[EMAIL PROTECTED]>
+
+ * configure.ac: add --enable-mit-shm
+ * gui/gtk_glue_agg.h: don't redefine ENABLE_MIT_SHM, use definition
+ from config.h
+
2007-07-31 Udo Giacomozzi <[EMAIL PROTECTED]>
* gui/gtk_glue_agg.h: disable MIT-SHM by default (see bug #20301)
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -b -r1.384 -r1.385
--- configure.ac 30 Jul 2007 19:55:07 -0000 1.384
+++ configure.ac 31 Jul 2007 16:16:08 -0000 1.385
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.384 2007/07/30 19:55:07 strk Exp $
+dnl $Id: configure.ac,v 1.385 2007/07/31 16:16:08 strk Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -428,6 +428,21 @@
fi
dnl --------------------------------------------------------
+dnl Toggle support for MIT-SHM extension to the X server
+dnl --------------------------------------------------------
+
+AC_ARG_ENABLE(mit-shm,
+ AC_HELP_STRING([--enable-mit-shm], [Enable support for the MIT-SHM X
extension]),
+[case "${enableval}" in
+ yes) xmitshm=yes ;;
+ no) xmitshm=no ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-mit-shm option]) ;;
+esac],xmitshm=no)
+if test "x${xmitshm}" = "xyes"; then
+ AC_DEFINE(ENABLE_MIT_SHM, [1], [Use MIT-SHM X extension if available])
+fi
+
+dnl --------------------------------------------------------
dnl Select media handler
dnl --------------------------------------------------------
Index: gui/gtk_glue_agg.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk_glue_agg.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- gui/gtk_glue_agg.h 31 Jul 2007 15:44:56 -0000 1.11
+++ gui/gtk_glue_agg.h 31 Jul 2007 16:16:08 -0000 1.12
@@ -18,16 +18,14 @@
//
//
-// Define this macro to enable experimental support for MIT-SHM
-// see http://www.xfree86.org/current/mit-shm.html
-// currently has some problems, see https://savannah.gnu.org/bugs/?20301
-//#define ENABLE_MIT_SHM 1
-
#include "gtk_glue.h"
#include <gtk/gtk.h>
#include <gdk/gdk.h>
+// Experimental support for MIT-SHM
+// see http://www.xfree86.org/current/mit-shm.html
+// currently has some problems, see https://savannah.gnu.org/bugs/?20301
#ifdef ENABLE_MIT_SHM
#include <X11/extensions/XShm.h>
#endif
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
