Re: [Fink-devel] mesa and libglw
With regards to wine and opengl there is a nice thread of discussion on here: http://bugs.winehq.org/show_bug.cgi?id=10184 It looks like there's a bug in xquartz that is preventing opengl from working properly (although mesa works fine). Hopefully an updated version of xquartz will solve this problem. On a different note, it may be nice to get rid of the freetype/fontconfig 219 dependencies if we can use the ones from xquartz - unless this is a bad idea for a reason I don't yet know. Looking into this. Cheers, Damian Damian Dimmich wrote: The build works well, but sadly wine still only uses the mesa renderer, it would be awesome if there where a way to get it to use the accelerated GL library that comes with the newer X11. Will have to investigate some more. glxgears and glxinfo which come with xquartz seem to run fine, and otool -L says they use /usr/X11/lib/libGL.1.dylib Wine's configure also detects that library /usr/X11/lib/libGL.1.dylib when it looks for gl related libraries. Not sure why it isn't able to use the accelerated libraries. Might require some more configure parameter fiddling... Cheers, Damian [EMAIL PROTECTED] wrote: Many thanks for maintaining the package. This is the patch (for the info files): $ diff -urN /sw/fink/10.4/unstable/crypto/finkinfo/wine.info /sw/fink/10.4/local/main/finkinfo/crypto/wine.info --- /sw/fink/10.4/unstable/crypto/finkinfo/wine.info2008-04-14 11:25:51.0 +0100 +++ /sw/fink/10.4/local/main/finkinfo/crypto/wine.info2008-04-15 21:28:30.0 +0100 @@ -1,6 +1,6 @@ Package: wine Version: 0.9.59 -Revision: 1 +Revision: 2 Description: Microsoft Windows compatibility layer License: LGPL Maintainer: Robert Cusick [EMAIL PROTECTED] @@ -20,15 +20,13 @@ arts-dev, audiofile, bison, dbus-dev, esound, fontconfig2-dev, flex (= 2.5), fontforge, freetype219-shlibs, freetype219, gcc4.0, giflib | libungif, glib2-dev, jack-dev, lcms, lcms-bin, libgettext3-dev, libiconv-dev, libicu32-dev | libicu36-dev, - libjpeg, libusb, libxml2, libxml2-bin, libxslt, libxslt-bin, mesa (= 6.5.2-1), - openldap23-dev, openssl097-dev, sane-backends-dev, x11-dev, libgphoto2 + libjpeg, libusb, libxml2, libxml2-bin, libxslt, libxslt-bin, openldap23-dev, openssl097-dev, sane-backends-dev, x11-dev, libgphoto2 Depends: arts-shlibs, audiofile-shlibs, dbus-shlibs, esound-shlibs, fontconfig2-shlibs, freetype219-shlibs, giflib-shlibs | libungif-shlibs, glib2-shlibs, jack-shlibs, lcms-shlibs, libgettext3-shlibs, libiconv, libjpeg-shlibs, - libusb-shlibs, libxml2-shlibs, libxslt-shlibs, mesa-shlibs (= 6.5.2-1), - openldap23-shlibs, openssl097-shlibs, sane-backends-shlibs, x11, libgphoto2-shlibs + libusb-shlibs, libxml2-shlibs, libxslt-shlibs, openldap23-shlibs, openssl097-shlibs, sane-backends-shlibs, x11, libgphoto2-shlibs Recommends: msttcorefonts @@ -39,12 +37,12 @@ NoSetCPPFLAGS: true SetCPPFLAGS: -DDBUS_API_SUBJECT_TO_CHANGE NoSetLDFLAGS: true -SetLIBRARY_PATH: %p/lib/mesa:%p/lib +SetLIBRARY_PATH: /usr/X11/lib:%p/lib # A custom CompileScript is necessary for the extra make depend step CompileScript: #!/bin/sh -ev - export CPATH=%p/include/dbus-1.0:%p/lib/dbus-1.0/include:%p/include/mesa:%p/include:/usr/X11R6/include - export X_CFLAGS=-I%p/include/mesa X_LIBS=-L%p/lib/mesa + export CPATH=%p/include/dbus-1.0:%p/lib/dbus-1.0/include:%p/include:/usr/X11R6/include + export X_CFLAGS=-I/usr/X11/include X_LIBS=-L/usr/X11/lib/ export LDFLAGS=-L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib export LD_LIBRARY_PATH=%p/lib export PATH=%p/lib/freetype219/bin:$PATH @@ -66,8 +64,6 @@ DescPort: Didn't find dbus/dbus.h : added %p/include/dbus-1.0:%p/lib/dbus-1.0/include to search path, and required CPPFLAGS fontconfig.h : added /usr/X11R6/include -Use mesa because GL/gl.h in some versions of Apple's X11 is too old. But then to be safe mesa has also -to substitute for the glut or freeglut dep; thus put mesa in every path before %p and before /usr/X11R6. DescDetail: On 16 Apr 2008, at 00:14, Damian Dimmich wrote: Hi, That sounds like a good idea - i've been planning to see if I could get wine to build against apples (XQuartz's) gl libraries but hadn't gotten around to it yet. I believe the tiger version of X would probably still need the mesa dependency though, as tigers X was quite old and not that great. Leopards X support is totally awesome in comparison. This may even allow wines directx/gl emulation to work - i haven't managed to get any directx/gl apps to run yet, not that I've tested very heavily, but I can imagine that they could work if built against XQuartz's libraries. I can make a new wine.info file at some point when I get around to it that doesn't use mesa. Cheers, Damian [EMAIL PROTECTED] wrote: I edited the mesa.info file to use the apple/ Xquartz (at
Re: [Fink-devel] mesa and libglw
Damian Dimmich wrote: With regards to wine and opengl there is a nice thread of discussion on here: http://bugs.winehq.org/show_bug.cgi?id=10184 It looks like there's a bug in xquartz that is preventing opengl from working properly (although mesa works fine). Hopefully an updated version of xquartz will solve this problem. On a different note, it may be nice to get rid of the freetype/fontconfig 219 dependencies if we can use the ones from xquartz - unless this is a bad idea for a reason I don't yet know. Looking into this. Freetype219 is still needed on Tiger. On Leopard, the X11-supplied freetype2 is actually newer than Fink's and should be preferred. But this would mean that you would need to make different packages for 10.4 and 10.5. OTOH, solving the libGL problems might involve such a distinction, too. -- Martin - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ Fink-devel mailing list Fink-devel@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.devel
Re: [Fink-devel] mesa and libglw
Hi Martin, How does one make a distinct package for 10.4? From what I can see on my system the 10.5 directory is a symlink to 10.4 which to me implies that there is no distinction. Would it make sense to have wine-10.4.info and a wine-10.5.info package? I'm quite happy to create/maintain these packages, but I do not have a 10.4 system readily available to test on. Cheers, Damian Martin Costabel wrote: Damian Dimmich wrote: With regards to wine and opengl there is a nice thread of discussion on here: http://bugs.winehq.org/show_bug.cgi?id=10184 It looks like there's a bug in xquartz that is preventing opengl from working properly (although mesa works fine). Hopefully an updated version of xquartz will solve this problem. On a different note, it may be nice to get rid of the freetype/fontconfig 219 dependencies if we can use the ones from xquartz - unless this is a bad idea for a reason I don't yet know. Looking into this. Freetype219 is still needed on Tiger. On Leopard, the X11-supplied freetype2 is actually newer than Fink's and should be preferred. But this would mean that you would need to make different packages for 10.4 and 10.5. OTOH, solving the libGL problems might involve such a distinction, too. - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ Fink-devel mailing list Fink-devel@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.devel
Re: [Fink-devel] mesa and libglw
Damian Dimmich wrote: Hi Martin, How does one make a distinct package for 10.4? From what I can see on my system the 10.5 directory is a symlink to 10.4 which to me implies that there is no distinction. Would it make sense to have wine-10.4.info and a wine-10.5.info package? I'm quite happy to create/maintain these packages, but I do not have a 10.4 system readily available to test on. There are a couple of packages (example: gnucash2) that have distinct versions for 10.4 and 10.5. The usual procedure is as follows: You leave the current version of foo.info as it is and then make foo-10.5.info with the same Package name and (at first) the same Version, but a higher Revision (adding 100, for example) and a line Distribution: 10.5. -- Martin - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ Fink-devel mailing list Fink-devel@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.devel
Re: [Fink-devel] mesa and libglw
Many thanks Jack. :-) We will leave 7.0.x series in Fink till it gets into Xquartz, just in case, for the sake of completion. http://lists.apple.com/archives/X11-users/2008/Feb/msg00329.html On 15 Apr 2008, at 19:40, Jack Howarth wrote: Murali, The X11 from Apple is built from the same X.org sources as that on http://trac.macosforge.org/projects/xquartz. In fact that X11 package on macosforge.org is the basis for the changes in X11 introduced in Mac OS X 10.5.2 (like the full depreciation of libGLw and its associated headers since Mac OS X doesn't come with motif installed). The X11 GL support is based on the Mesa 6.5.1 source code (with patches to add direct rendering acceleration support). A future X11 release on macosforge.org will be based on the Mesa 7.X source code when they get around to it. I am very puzzled on why we want a full mesa package in fink since Mesa 6.5.1 should effectively be present in the stock X11. What exactly doesn't compile against the standard X11 GL headers? Unless you explicity need some features from Mesa 7.0.x, one should be able to build any OpenGL program with the stock X11. In fact, I can't find anything in fink 10.4/10.5 unstable which builds against mesa. With regard to the package name mesa-libglw, this is exactly how Fedora linux packages libglw. The mesa name makes sense because it is built from the mesa source code but is the only part of mesa that is built. Jack ps If you can show me some packaging that requires mesa, I'll see if it can be patched to build against the stock mesa-based GL in Apple's X11. pps. Also, why can't you just patch the mesa build to not build libGLw and add a Depends on mesa-libglw for the mesa package. We can keep the two packages building from the same source release. This approach would eliminate the need for folks to build all of mesa when they just need libglw. Also, note that if you look at the contents of /usr/X11R6/include/GL/gl.h on 10.5.2, you will see... /* * Mesa 3-D graphics library * Version: 6.5.1 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. On Tue, Apr 15, 2008 at 03:11:27PM +0100, [EMAIL PROTECTED] wrote: Dear Jack, Agreed. I thought the X11 GL that comes with 10.5 or macosforge Xquartz project already uses hardware acceleration, does it not? Many thanks. Best, Murali. On 15 Apr 2008, at 15:01, Jack Howarth wrote: Murali, You are asking for a Mesa7 package though. The whole point of a Mesa7 package is to provide an alternative libGL (which would have to use software rendering). What is missing from my mesa-libglw package from Mesa 7 that you need? The X.org developers do plan to eventually build X11 for Leopard using the Mesa 7 source code with modifications so that the X11 libGL will use direct rendering. It would be far better to wait for this than to downgrade the X11 performance of programs by making them use an OpenGL that uses software rendering. Jack On Tue, Apr 15, 2008 at 02:40:35PM +0100, [EMAIL PROTECTED] wrote: Dear Jack, I do not want to have a full mesa package. We can still make mesa- libglw a split off of mesa, if you want to; and keep mesa-libglw linking to the system GL (providing hardware acceleration). I just proposed additional changes to the naming conventions and possibly having also a full mesa package just to go with my proposed changes to the naming conventions, i.e., 1. why call it mesa-libglw while linking to system GL? Shall we call it libglw* instead? 2. Can we also have a mesa-libglw linking to mesa GL, just for the sake of completion and be consistent in the naming as I proposed earlier. Hope I have made it clear. Please let me know what you want to do with mesa and mesa-libglw, even if it is just carrying like it is now. Many thanks. Best regards, Murali. On 15 Apr 2008, at 14:27, Jack Howarth wrote: Murali, Why exactly do we want to have a full mesa package in fink? You do realize that mesa will use software rendering for its OpenGL and thus be much slower than the system version of OpenGL. Jack On Tue, Apr 15, 2008 at 12:28:05PM +0100, [EMAIL PROTECTED] wrote: Dear Jack, As you can see below, JFM suggests that we merge mesa and mesa- libglw, and then create splitoffs. Alex and I think its a good suggestion as well. Moreover, I have the following suggestions: I think there should be two packages as follows, 1. mesa.info with splitoffs mesa-shlibs, mesa-libglw, mesa- libglw- shlibs 2. rename your mesa-libglw* to just libglw*, because you are building the libglw* packages against the system GL and not mesa- GL. mesa- libglw* from above would be built against mesa-GL [OR] There should be one package with the following splitoffs, mesa.info with splitoffs mesa-shlibs, libglw (or mesa-libglw) and libglw-shlibs (or mesa-libglw-shlibs). Here all *libglw* tuff would
Re: [Fink-devel] mesa and libglw
I edited the mesa.info file to use the apple/ Xquartz (at macosforge) provided GL and libOSMEsa files. It seems to work fine. On 15 Apr 2008, at 21:13, Jack Howarth wrote: On Tue, Apr 15, 2008 at 08:09:30PM +0100, [EMAIL PROTECTED] wrote: Many thanks Jack. :-) We will leave 7.0.x series in Fink till it gets into Xquartz, just in case, for the sake of completion. http://lists.apple.com/archives/X11-users/2008/Feb/msg00329.html Murali, The only package JF could find that uses mesa is wine. The comments in wine.info indicate that mesa was used because some versions of Mac OS X had too old of a mesa in X11. I strongly suspect this is no longer true for 10.4/10.5 branch. Could you check /usr/X11R6/include/GL/gl.h on a Mac OS X 10.4.10 box and see what version of mesa is used. We should probably ping the maintainer of the fink wine package to eliminate the use of mesa in favor of Apple's copy in Tiger and Leopard. In any case, I think you should just modify the mesa package to have --- Mesa-7.0.2/configs/default.orig 2007-11-01 11:30:52.0 -0400 +++ Mesa-7.0.2/configs/default 2008-02-27 14:54:21.0 -0500 @@ -55,12 +55,12 @@ # GLw widget sources (Append GLwMDrawA.c here and add -lXm to GLW_LIB_DEPS in # order to build the Motif widget too) GLW_SOURCES = GLwDrawA.c # Directories to build LIB_DIR = lib -SRC_DIRS = mesa glu glut/glx glw +SRC_DIRS = mesa glu glut/glx GLU_DIRS = sgi DRIVER_DIRS = x11 osmesa # Which subdirs under $(TOP)/progs/ to enter: ...and then add a Depends on mesa-libglw to mesa.info. Alternatively, you could just keep building glw if it is always buried in a mesa subdirectory in %p/include and %p/lib. Jack -- Jack W. Howarth, Ph.D.231 Albert Sabin Way NMR Facility Director Cincinnati, Ohio 45267-0524 Dept. of Molecular Genetics phone: (513) 558-4420 Univ. of Cincinnati College of Medicinefax: (513) 558-8474 - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ Fink-devel mailing list Fink-devel@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.devel
Re: [Fink-devel] mesa and libglw
Hi, That sounds like a good idea - i've been planning to see if I could get wine to build against apples (XQuartz's) gl libraries but hadn't gotten around to it yet. I believe the tiger version of X would probably still need the mesa dependency though, as tigers X was quite old and not that great. Leopards X support is totally awesome in comparison. This may even allow wines directx/gl emulation to work - i haven't managed to get any directx/gl apps to run yet, not that I've tested very heavily, but I can imagine that they could work if built against XQuartz's libraries. I can make a new wine.info file at some point when I get around to it that doesn't use mesa. Cheers, Damian [EMAIL PROTECTED] wrote: I edited the mesa.info file to use the apple/ Xquartz (at macosforge) provided GL and libOSMEsa files. It seems to work fine. On 15 Apr 2008, at 21:13, Jack Howarth wrote: On Tue, Apr 15, 2008 at 08:09:30PM +0100, [EMAIL PROTECTED] wrote: Many thanks Jack. :-) We will leave 7.0.x series in Fink till it gets into Xquartz, just in case, for the sake of completion. http://lists.apple.com/archives/X11-users/2008/Feb/msg00329.html Murali, The only package JF could find that uses mesa is wine. The comments in wine.info indicate that mesa was used because some versions of Mac OS X had too old of a mesa in X11. I strongly suspect this is no longer true for 10.4/10.5 branch. Could you check /usr/X11R6/include/GL/gl.h on a Mac OS X 10.4.10 box and see what version of mesa is used. We should probably ping the maintainer of the fink wine package to eliminate the use of mesa in favor of Apple's copy in Tiger and Leopard. In any case, I think you should just modify the mesa package to have --- Mesa-7.0.2/configs/default.orig 2007-11-01 11:30:52.0 -0400 +++ Mesa-7.0.2/configs/default 2008-02-27 14:54:21.0 -0500 @@ -55,12 +55,12 @@ # GLw widget sources (Append GLwMDrawA.c here and add -lXm to GLW_LIB_DEPS in # order to build the Motif widget too) GLW_SOURCES = GLwDrawA.c # Directories to build LIB_DIR = lib -SRC_DIRS = mesa glu glut/glx glw +SRC_DIRS = mesa glu glut/glx GLU_DIRS = sgi DRIVER_DIRS = x11 osmesa # Which subdirs under $(TOP)/progs/ to enter: ...and then add a Depends on mesa-libglw to mesa.info. Alternatively, you could just keep building glw if it is always buried in a mesa subdirectory in %p/include and %p/lib. Jack -- Jack W. Howarth, Ph.D.231 Albert Sabin Way NMR Facility Director Cincinnati, Ohio 45267-0524 Dept. of Molecular Genetics phone: (513) 558-4420 Univ. of Cincinnati College of Medicinefax: (513) 558-8474 - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ Fink-devel mailing list Fink-devel@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.devel - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ Fink-devel mailing list Fink-devel@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.devel
Re: [Fink-devel] mesa and libglw
Many thanks for maintaining the package. This is the patch (for the info files): $ diff -urN /sw/fink/10.4/unstable/crypto/finkinfo/wine.info /sw/fink/ 10.4/local/main/finkinfo/crypto/wine.info --- /sw/fink/10.4/unstable/crypto/finkinfo/wine.info2008-04-14 11:25:51.0 +0100 +++ /sw/fink/10.4/local/main/finkinfo/crypto/wine.info 2008-04-15 21:28:30.0 +0100 @@ -1,6 +1,6 @@ Package: wine Version: 0.9.59 -Revision: 1 +Revision: 2 Description: Microsoft Windows compatibility layer License: LGPL Maintainer: Robert Cusick [EMAIL PROTECTED] @@ -20,15 +20,13 @@ arts-dev, audiofile, bison, dbus-dev, esound, fontconfig2-dev, flex (= 2.5), fontforge, freetype219-shlibs, freetype219, gcc4.0, giflib | libungif, glib2-dev, jack-dev, lcms, lcms-bin, libgettext3-dev, libiconv-dev, libicu32-dev | libicu36-dev, - libjpeg, libusb, libxml2, libxml2-bin, libxslt, libxslt-bin, mesa (= 6.5.2-1), - openldap23-dev, openssl097-dev, sane-backends-dev, x11-dev, libgphoto2 + libjpeg, libusb, libxml2, libxml2-bin, libxslt, libxslt-bin, openldap23-dev, openssl097-dev, sane-backends-dev, x11-dev, libgphoto2 Depends: arts-shlibs, audiofile-shlibs, dbus-shlibs, esound-shlibs, fontconfig2-shlibs, freetype219-shlibs, giflib-shlibs | libungif-shlibs, glib2-shlibs, jack-shlibs, lcms-shlibs, libgettext3-shlibs, libiconv, libjpeg-shlibs, - libusb-shlibs, libxml2-shlibs, libxslt-shlibs, mesa-shlibs (= 6.5.2-1), - openldap23-shlibs, openssl097-shlibs, sane-backends-shlibs, x11, libgphoto2-shlibs + libusb-shlibs, libxml2-shlibs, libxslt-shlibs, openldap23-shlibs, openssl097-shlibs, sane-backends-shlibs, x11, libgphoto2-shlibs Recommends: msttcorefonts @@ -39,12 +37,12 @@ NoSetCPPFLAGS: true SetCPPFLAGS: -DDBUS_API_SUBJECT_TO_CHANGE NoSetLDFLAGS: true -SetLIBRARY_PATH: %p/lib/mesa:%p/lib +SetLIBRARY_PATH: /usr/X11/lib:%p/lib # A custom CompileScript is necessary for the extra make depend step CompileScript: #!/bin/sh -ev - export CPATH=%p/include/dbus-1.0:%p/lib/dbus-1.0/include:%p/include/ mesa:%p/include:/usr/X11R6/include - export X_CFLAGS=-I%p/include/mesa X_LIBS=-L%p/lib/mesa + export CPATH=%p/include/dbus-1.0:%p/lib/dbus-1.0/include:%p/include:/ usr/X11R6/include + export X_CFLAGS=-I/usr/X11/include X_LIBS=-L/usr/X11/lib/ export LDFLAGS=-L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib export LD_LIBRARY_PATH=%p/lib export PATH=%p/lib/freetype219/bin:$PATH @@ -66,8 +64,6 @@ DescPort: Didn't find dbus/dbus.h : added %p/include/dbus-1.0:%p/lib/ dbus-1.0/include to search path, and required CPPFLAGS fontconfig.h : added /usr/X11R6/include -Use mesa because GL/gl.h in some versions of Apple's X11 is too old. But then to be safe mesa has also -to substitute for the glut or freeglut dep; thus put mesa in every path before %p and before /usr/X11R6. DescDetail: On 16 Apr 2008, at 00:14, Damian Dimmich wrote: Hi, That sounds like a good idea - i've been planning to see if I could get wine to build against apples (XQuartz's) gl libraries but hadn't gotten around to it yet. I believe the tiger version of X would probably still need the mesa dependency though, as tigers X was quite old and not that great. Leopards X support is totally awesome in comparison. This may even allow wines directx/gl emulation to work - i haven't managed to get any directx/gl apps to run yet, not that I've tested very heavily, but I can imagine that they could work if built against XQuartz's libraries. I can make a new wine.info file at some point when I get around to it that doesn't use mesa. Cheers, Damian [EMAIL PROTECTED] wrote: I edited the mesa.info file to use the apple/ Xquartz (at macosforge) provided GL and libOSMEsa files. It seems to work fine. On 15 Apr 2008, at 21:13, Jack Howarth wrote: On Tue, Apr 15, 2008 at 08:09:30PM +0100, [EMAIL PROTECTED] wrote: Many thanks Jack. :-) We will leave 7.0.x series in Fink till it gets into Xquartz, just in case, for the sake of completion. http://lists.apple.com/archives/X11-users/2008/Feb/msg00329.html Murali, The only package JF could find that uses mesa is wine. The comments in wine.info indicate that mesa was used because some versions of Mac OS X had too old of a mesa in X11. I strongly suspect this is no longer true for 10.4/10.5 branch. Could you check /usr/X11R6/include/GL/gl.h on a Mac OS X 10.4.10 box and see what version of mesa is used. We should probably ping the maintainer of the fink wine package to eliminate the use of mesa in favor of Apple's copy in Tiger and Leopard. In any case, I think you should just modify the mesa package to have --- Mesa-7.0.2/configs/default.orig 2007-11-01 11:30:52.0 -0400 +++ Mesa-7.0.2/configs/default 2008-02-27 14:54:21.0 -0500 @@ -55,12 +55,12 @@ # GLw widget sources (Append GLwMDrawA.c here and add -lXm to
Re: [Fink-devel] mesa and libglw
The build works well, but sadly wine still only uses the mesa renderer, it would be awesome if there where a way to get it to use the accelerated GL library that comes with the newer X11. Will have to investigate some more. glxgears and glxinfo which come with xquartz seem to run fine, and otool -L says they use /usr/X11/lib/libGL.1.dylib Wine's configure also detects that library /usr/X11/lib/libGL.1.dylib when it looks for gl related libraries. Not sure why it isn't able to use the accelerated libraries. Might require some more configure parameter fiddling... Cheers, Damian [EMAIL PROTECTED] wrote: Many thanks for maintaining the package. This is the patch (for the info files): $ diff -urN /sw/fink/10.4/unstable/crypto/finkinfo/wine.info /sw/fink/10.4/local/main/finkinfo/crypto/wine.info --- /sw/fink/10.4/unstable/crypto/finkinfo/wine.info2008-04-14 11:25:51.0 +0100 +++ /sw/fink/10.4/local/main/finkinfo/crypto/wine.info2008-04-15 21:28:30.0 +0100 @@ -1,6 +1,6 @@ Package: wine Version: 0.9.59 -Revision: 1 +Revision: 2 Description: Microsoft Windows compatibility layer License: LGPL Maintainer: Robert Cusick [EMAIL PROTECTED] @@ -20,15 +20,13 @@ arts-dev, audiofile, bison, dbus-dev, esound, fontconfig2-dev, flex (= 2.5), fontforge, freetype219-shlibs, freetype219, gcc4.0, giflib | libungif, glib2-dev, jack-dev, lcms, lcms-bin, libgettext3-dev, libiconv-dev, libicu32-dev | libicu36-dev, - libjpeg, libusb, libxml2, libxml2-bin, libxslt, libxslt-bin, mesa (= 6.5.2-1), - openldap23-dev, openssl097-dev, sane-backends-dev, x11-dev, libgphoto2 + libjpeg, libusb, libxml2, libxml2-bin, libxslt, libxslt-bin, openldap23-dev, openssl097-dev, sane-backends-dev, x11-dev, libgphoto2 Depends: arts-shlibs, audiofile-shlibs, dbus-shlibs, esound-shlibs, fontconfig2-shlibs, freetype219-shlibs, giflib-shlibs | libungif-shlibs, glib2-shlibs, jack-shlibs, lcms-shlibs, libgettext3-shlibs, libiconv, libjpeg-shlibs, - libusb-shlibs, libxml2-shlibs, libxslt-shlibs, mesa-shlibs (= 6.5.2-1), - openldap23-shlibs, openssl097-shlibs, sane-backends-shlibs, x11, libgphoto2-shlibs + libusb-shlibs, libxml2-shlibs, libxslt-shlibs, openldap23-shlibs, openssl097-shlibs, sane-backends-shlibs, x11, libgphoto2-shlibs Recommends: msttcorefonts @@ -39,12 +37,12 @@ NoSetCPPFLAGS: true SetCPPFLAGS: -DDBUS_API_SUBJECT_TO_CHANGE NoSetLDFLAGS: true -SetLIBRARY_PATH: %p/lib/mesa:%p/lib +SetLIBRARY_PATH: /usr/X11/lib:%p/lib # A custom CompileScript is necessary for the extra make depend step CompileScript: #!/bin/sh -ev - export CPATH=%p/include/dbus-1.0:%p/lib/dbus-1.0/include:%p/include/mesa:%p/include:/usr/X11R6/include - export X_CFLAGS=-I%p/include/mesa X_LIBS=-L%p/lib/mesa + export CPATH=%p/include/dbus-1.0:%p/lib/dbus-1.0/include:%p/include:/usr/X11R6/include + export X_CFLAGS=-I/usr/X11/include X_LIBS=-L/usr/X11/lib/ export LDFLAGS=-L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib export LD_LIBRARY_PATH=%p/lib export PATH=%p/lib/freetype219/bin:$PATH @@ -66,8 +64,6 @@ DescPort: Didn't find dbus/dbus.h : added %p/include/dbus-1.0:%p/lib/dbus-1.0/include to search path, and required CPPFLAGS fontconfig.h : added /usr/X11R6/include -Use mesa because GL/gl.h in some versions of Apple's X11 is too old. But then to be safe mesa has also -to substitute for the glut or freeglut dep; thus put mesa in every path before %p and before /usr/X11R6. DescDetail: On 16 Apr 2008, at 00:14, Damian Dimmich wrote: Hi, That sounds like a good idea - i've been planning to see if I could get wine to build against apples (XQuartz's) gl libraries but hadn't gotten around to it yet. I believe the tiger version of X would probably still need the mesa dependency though, as tigers X was quite old and not that great. Leopards X support is totally awesome in comparison. This may even allow wines directx/gl emulation to work - i haven't managed to get any directx/gl apps to run yet, not that I've tested very heavily, but I can imagine that they could work if built against XQuartz's libraries. I can make a new wine.info file at some point when I get around to it that doesn't use mesa. Cheers, Damian [EMAIL PROTECTED] wrote: I edited the mesa.info file to use the apple/ Xquartz (at macosforge) provided GL and libOSMEsa files. It seems to work fine. On 15 Apr 2008, at 21:13, Jack Howarth wrote: On Tue, Apr 15, 2008 at 08:09:30PM +0100, [EMAIL PROTECTED] wrote: Many thanks Jack. :-) We will leave 7.0.x series in Fink till it gets into Xquartz, just in case, for the sake of completion. http://lists.apple.com/archives/X11-users/2008/Feb/msg00329.html Murali, The only package JF could find that uses mesa is wine. The comments in wine.info indicate that mesa was used because some versions of Mac OS X had too old of a mesa in X11. I strongly
