Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv5063
Modified Files:
wine.info
Log Message:
dep on mesa rather than x11's GL safer for some versions of Apple's X11
Also shlibs policy stuff.
Index: wine.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/wine.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- wine.info 26 Sep 2006 07:44:08 -0000 1.3
+++ wine.info 30 Dec 2006 05:36:57 -0000 1.4
@@ -1,6 +1,6 @@
Package: wine
Version: 0.9.21
-Revision: 2
+Revision: 3
Description: Microsoft Windows compatibility layer
License: LGPL
Maintainer: Trevor Harmon <[EMAIL PROTECTED]>
@@ -12,29 +12,40 @@
# According to the Wine README, any GCC higher than 2.7.2 should work, but
only GCC 4.x has been tested.
# See Wine's documentation/PACKAGING file for more details about dependencies.
# I may have gone overboard on these dependencies, but better safe than sorry.
-BuildDepends: arts-dev, audiofile, bison, dbus-dev, esound, fontconfig2-dev,
flex (>= 2.5), fontforge, freeglut, freetype2-hinting-dev | freetype2-dev,
gcc4.0, giflib | libungif, glib2-dev, jack-dev, lcms, lcms-bin,
libgettext3-dev, libgl-dev, libiconv-dev, libicu32-dev, libjpeg, libusb,
libxml2, libxml2-bin, libxslt, libxslt-bin, openldap23-dev, openssl097-dev,
sane-backends-dev, x11-dev
-Depends: arts-shlibs, audiofile-shlibs, dbus-shlibs, esound-shlibs,
fontconfig2-shlibs, freeglut-shlibs, freetype2-hinting-shlibs |
freetype2-shlibs, giflib-shlibs | libungif-shlibs, glib2-shlibs, jack-shlibs,
lcms-shlibs, libgettext3-shlibs, libgl-shlibs, libiconv, libjpeg-shlibs,
libusb-shlibs, libxml2-shlibs, libxslt-shlibs, openldap23-shlibs,
openssl097-shlibs, sane-backends-shlibs, x11
+BuildDepends: arts-dev, audiofile, bison, dbus-dev, esound, fontconfig2-dev,
flex (>= 2.5), fontforge, freetype2-hinting-dev | freetype2-dev, gcc4.0, giflib
| libungif, glib2-dev, jack-dev, lcms, lcms-bin, libgettext3-dev, libiconv-dev,
libicu32-dev, libjpeg, libusb, libxml2, libxml2-bin, libxslt, libxslt-bin,
mesa, openldap23-dev, openssl097-dev, sane-backends-dev, x11-dev
+Depends: arts-shlibs, audiofile-shlibs, dbus-shlibs, esound-shlibs,
fontconfig2-shlibs, freetype2-hinting-shlibs | freetype2-shlibs, giflib-shlibs
| libungif-shlibs, glib2-shlibs, jack-shlibs, lcms-shlibs, libgettext3-shlibs,
libiconv, libjpeg-shlibs, libusb-shlibs, libxml2-shlibs, libxslt-shlibs,
mesa-shlibs, openldap23-shlibs, openssl097-shlibs, sane-backends-shlibs, x11
Source: mirror:sourceforge:%n/%n-%v.tar.bz2
Source-MD5: 4f9528529153399034ab807478887456
GCC: 4.0
+
+PatchScript: perl -pi -e 's,install_name.*/,install_name %p/lib/,' configure
NoSetCPPFLAGS: true
SetCPPFLAGS: -DDBUS_API_SUBJECT_TO_CHANGE
NoSetLDFLAGS: true
-SetLIBRARY_PATH: %p/lib
+SetLIBRARY_PATH: %p/lib/mesa:%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:/usr/X11R6/include:%p/include
+ export
CPATH=%p/include/dbus-1.0:%p/lib/dbus-1.0/include:%p/include/mesa:/usr/X11R6/include:%p/include
+ export X_CFLAGS=-I%p/include/mesa X_LIBS=-L%p/lib/mesa
./configure %c
+ # small safety measure: preventing libSystem from coming up too early in the
link line (and hence also in load commands)
+ # (specifically for wineesd.drv.so winearts.drv.so sane.ds.so and
msxml3.dll.so).
+ # For further safety, we can then as well remove the remaining -L%p/lib and
-I%p/include flags ...
+ perl -pi.bak -e 's,\-L%p/lib ,,g; s:\-I%p/include( |,):\1:g;
s,\-l(m|dl|pthread)([^a-z]),\2,g' config.status
+ ./config.status
make depend
make
<<
+Shlibs: %p/lib/libwine.1.dylib 1.0.0 %n (>= 0.9.21-3)
DocFiles: ANNOUNCE AUTHORS COPYING.LIB ChangeLog LICENSE README VERSION
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: <<
@@ -75,5 +86,5 @@
Package: %N-dev
Depends: %N (= %v-%r)
BuildDependsOnly: true
- Files: include
+ Files: include lib/libwine.dylib share/aclocal
<<
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
