[Gnash-commit] gnash macros/opengl.m4 configure.ac ChangeLog

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  08/06/13 23:51:04

Modified files:
        macros         : opengl.m4 
        .              : configure.ac ChangeLog 

Log message:
        Update on OGL

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/opengl.m4?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.546&r2=1.547
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6926&r2=1.6927

Patches:
Index: macros/opengl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/opengl.m4,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- macros/opengl.m4    21 Mar 2008 22:43:01 -0000      1.39
+++ macros/opengl.m4    13 Jun 2008 23:51:03 -0000      1.40
@@ -1,5 +1,5 @@
 dnl  
-dnl    Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl    Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 dnl  
 dnl  This program is free software; you can redistribute it and/or modify
 dnl  it under the terms of the GNU General Public License as published by
@@ -133,6 +133,7 @@
   
   if test x"${darwin}" = xyes; then
          OPENGL_LIBS="${OPENGL_LIBS} -dylib_file 
/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries/libGL.dylib"
+         LDFLAGS="$LDFLAGS 
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries/libGL.dylib"
   fi
 
   AC_SUBST(OPENGL_CFLAGS)

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.546
retrieving revision 1.547
diff -u -b -r1.546 -r1.547
--- configure.ac        13 Jun 2008 23:40:40 -0000      1.546
+++ configure.ac        13 Jun 2008 23:51:03 -0000      1.547
@@ -1906,10 +1906,6 @@
   [strict=no]
 )
 
-if test x"$darwin" = x"yes" -a x$build_ogl = xyes; then
-       LDFLAGS="$LDFLAGS 
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
-fi
-
 if test x"$strict" = x"yes" -a x$build_agg = xyes; then
    AC_MSG_ERROR([agg renderer will fail with --enable-strict.]);       
 fi

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6926
retrieving revision 1.6927
diff -u -b -r1.6926 -r1.6927
--- ChangeLog   13 Jun 2008 23:40:40 -0000      1.6926
+++ ChangeLog   13 Jun 2008 23:51:03 -0000      1.6927
@@ -2,7 +2,7 @@
 
        * libmedia/ffmpeg/AudioDecoderFfmpeg.cpp: Fixed typecasting for 
          std::max().
-       * configure.ac: Fix for Leopard and OGL, see:
+       * macros/opengl.m4: Fix for Leopard and OGL, see:
          
http://wiki.finkproject.org/index.php/Fink:Packaging:Preparing_for_10.5#OpenGL_Bug
  
 2008-06-13 Benjamin Wolsey <address@hidden>