# HG changeset patch
# User Bill Nagel <b1+slitaz@nagel.org>
# Date 1229002757 28800
# Node ID 88bf5a2b55c32949bf2a0dd8b72e49024a38fe82
# Parent  46784c9b72e7dedae1cfc0be004c21d2040b9892
Fix PROVIDE for nvidia-glx/mesa libgl conflict

diff -r 46784c9b72e7 -r 88bf5a2b55c3 freeglut/receipt
--- a/freeglut/receipt	Wed Dec 10 23:57:23 2008 -0800
+++ b/freeglut/receipt	Thu Dec 11 05:39:17 2008 -0800
@@ -5,16 +5,12 @@
 CATEGORY="x-window"
 SHORT_DESC="OpenGL utility toolkit."
 MAINTAINER="b1+slitaz@nagel.org"
+DEPENDS="xorg libgl libglu"
+BUILD_DEPENDS="xorg-dev xorg-dev-proto mesa-dev mesa"
 TARBALL="freeglut-$VERSION.tar.gz"
 WEB_SITE="http://freeglut.sourceforge.net/"
 WGET_URL="http://internap.dl.sourceforge.net/sourceforge/$PACKAGE/$TARBALL"
 
-# DEPENDS does not include mesa because libGL
-# might already be provided by a driver, and we do
-# not want mesa to clobber libGL
-DEPENDS="xorg mesa"
-BUILD_DEPENDS="xorg-dev xorg-dev-proto mesa-dev mesa"
-
 # Rules to configure and make the package.
 compile_rules()
 {
diff -r 46784c9b72e7 -r 88bf5a2b55c3 libglu-mesa/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libglu-mesa/receipt	Thu Dec 11 05:39:17 2008 -0800
@@ -0,0 +1,18 @@
+# SliTaz package receipt.
+
+PACKAGE="libglu-mesa"
+VERSION="7.0.3"
+CATEGORY="development"
+SHORT_DESC="OpenGL utility library"
+MAINTAINER="pascal.bellard@slitaz.org"
+WEB_SITE="http://www.mesa3d.org/"
+WANTED="mesa"
+DEPENDS="libgl"
+PROVIDE="libglu"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	mkdir -p $fs/usr/lib
+	cp -a $_pkg/usr/local/lib/libGLU* $fs/usr/lib
+}
diff -r 46784c9b72e7 -r 88bf5a2b55c3 mesa/receipt
--- a/mesa/receipt	Wed Dec 10 23:57:23 2008 -0800
+++ b/mesa/receipt	Thu Dec 11 05:39:17 2008 -0800
@@ -11,6 +11,7 @@
 TARBALL="${SOURCE}Lib-$VERSION.tar.bz2"
 WEB_SITE="http://www.mesa3d.org/"
 WGET_URL="$SF_MIRROR/mesa3d/$TARBALL"
+PROVIDE="libgl libglu"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 46784c9b72e7 -r 88bf5a2b55c3 nvidia-glx/receipt
--- a/nvidia-glx/receipt	Wed Dec 10 23:57:23 2008 -0800
+++ b/nvidia-glx/receipt	Thu Dec 11 05:39:17 2008 -0800
@@ -8,6 +8,7 @@
 DEPENDS="nvidia xorg xorg-server"
 WANTED="nvidia"
 WEB_SITE="http://www.nvidia.com"
+PROVIDE="libgl:nvidia"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()