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.info 2008-04-14 11:25:51.000000000 +0100 +++ /sw/fink/10.4/local/main/finkinfo/crypto/wine.info 2008-04-15 21:28:30.000000000 +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.000000000 -0400 >>> +++ Mesa-7.0.2/configs/default 2008-02-27 14:54:21.000000000 -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 Medicine fax: >>> (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
