Subject: Re: buildlinking for OpenGL apps: current situation
To: Michal Pasternak <michal@pasternak.w.lub.pl>
From: Michal Pasternak <michal@pasternak.w.lub.pl>
List: tech-pkg
Date: 12/21/2003 15:21:25
--RASg3xLB4tUQ4RcS
Content-Type: text/plain; charset=iso-8859-2
Content-Disposition: inline

I've forgot the patches, sorry!

Here they are:

-- 
m

--RASg3xLB4tUQ4RcS
Content-Type: text/plain; charset=iso-8859-2
Content-Disposition: attachment; filename=MESA_DIFFS

--- buildlink2.mk.orig	Sat Dec 20 15:12:52 2003
+++ buildlink2.mk	Sun Dec 21 14:48:31 2003
@@ -3,6 +3,10 @@
 .if !defined(MESALIB_BUILDLINK2_MK)
 MESALIB_BUILDLINK2_MK=	# defined
 
+.if exists(/usr/X11R6/include/GL)
+.include "../../wip/XFree86-libs/buildlink2.mk"
+BUILDLINK_PREFIX.MesaLib=/usr/X11R6
+.else
 .include "../../graphics/Mesa/version.mk"
 
 BUILDLINK_DEPENDS.MesaLib?=	MesaLib>=${MESA_VERSION}
@@ -38,5 +42,6 @@
 	lafile="${BUILDLINK_DIR}/lib/libGL.la";				\
 	libpattern="${BUILDLINK_PREFIX.MesaLib}/lib/libGL.*";		\
 	${BUILDLINK_FAKE_LA}
+.endif
 
 .endif	# MESALIB_BUILDLINK2_MK

--RASg3xLB4tUQ4RcS
Content-Type: text/plain; charset=iso-8859-2
Content-Disposition: attachment; filename="libGL.la"

# libGL.la - a libtool library file
# Generated by ltmain.sh - GNU libtool 1.4a (1.641.2.255 2001/05/22 10:39:30)
#
# Please DO NOT delete this file!
# It is necessary for linking the library.

# The name that we can dlopen(3).
dlname='libGL.so.1'

# Names of this library.
library_names='libGL.so.1 libGL.so'

# The name of the static archive.
old_library='libGL.a'

# Libraries that this one depends upon.
dependency_libs=' -L/usr/X11R6/lib -lSM -lICE -lXmu -lXext -lXi -lX11'

# Version information for libGL.
current=1
age=0
revision=0

# Is this an already installed library?
installed=yes

# Files to dlopen/dlpreopen
dlopen=''
dlpreopen=''

# Directory that this library needs to be installed in:
libdir='/usr/X11R6/lib'

# This file has been modified by buildlink2.

--RASg3xLB4tUQ4RcS--