Update of /cvsroot/fink/experimental/fangism/finkinfo In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv3014
Modified Files: snes9x-gtk.info Log Message: crashes 10.4/10.6, trying to uses non-framework OpenGL, use flag-sort to link right Index: snes9x-gtk.info =================================================================== RCS file: /cvsroot/fink/experimental/fangism/finkinfo/snes9x-gtk.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- snes9x-gtk.info 11 Sep 2010 00:50:39 -0000 1.3 +++ snes9x-gtk.info 11 Sep 2010 17:49:34 -0000 1.4 @@ -16,6 +16,7 @@ # many are inherited build depends from gtk+2 with pangocairo BuildDepends: << fink-package-precedence, + flag-sort, atk1, cairo, fontconfig2-dev, @@ -51,6 +52,7 @@ #!/bin/sh -ev # need nicer sed for some fancier operations, hold/get sequence sed=%p/bin/sed + darwin_vers=`uname -r | cut -d. -f1` # function call should have been conditional (should patch upstream) file=gtk/src/gtk_display.cpp mv $file $file.orig @@ -78,6 +80,8 @@ mv $f $f.orig $sed -e '/#include/s|sys/soundcard\.h|liboss/soundcard.h|' $f.orig > $f done + if false + then # want the OpenGL.framework gl.h, not /usr/X11R6/include file='gtk/src/gtk_s9xwindow.h gtk/src/gtk_display_driver_opengl.h' for f in $file @@ -92,14 +96,24 @@ $file.orig > $file # configure clobbers LIBS, so we have to hack this ourselves # need explicit -lX11 for XResetScreenSaver + # also, don't assume ELF library format, duh! + fi file=gtk/Makefile.in mv $file $file.orig - $sed '/^LIBS =/a \ + $sed -e '/^LIBS =/a \ LIBS += -L/usr/X11R6/lib -lX11' \ + -e '/NASM/s|-f elf -DELF|-f macho -DMACHO|' \ $file.orig > $file << -SetCPPFLAGS: -I/System/Library/Frameworks/OpenGL.framework/Headers -DLIBOSS_INTERNAL -SetLDFLAGS: -Wl,-framework,OpenGL -L%p/lib +GCC: 4.0 +SetCXX: flag-sort g++ +SetCPPFLAGS: -DLIBOSS_INTERNAL +# pointing to /usr/X11R6 screws up fontconfig2 link... +SetLDFLAGS: -L%p/lib -L/usr/X11R6/lib +# SetCPPFLAGS: -I/System/Library/Frameworks/OpenGL.framework/Headers -DLIBOSS_INTERNAL +# SetLDFLAGS: -L/System/Library/Frameworks/OpenGL.framework/Libraries -L%p/lib +# SetLDFLAGS: -Wl,-framework,OpenGL -L%p/lib +# -framework doesn't work on darwin10? # -L/usr/X11R6/lib # SetLIBS: -lX11 # LIBS gets clobbered/ignored by the configure script :( ------------------------------------------------------------------------------ Start uncovering the many advantages of virtual appliances and start using them to simplify application deployment and accelerate your shift to cloud computing http://p.sf.net/sfu/novell-sfdev2dev _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs