wok-4.x rev 1837

Fix PROVIDE for nvidia-glx/mesa libgl conflict
author Bill Nagel <b1+slitaz@nagel.org>
date Thu Dec 11 05:39:17 2008 -0800 (2008-12-11)
parents 46784c9b72e7
children e064f1c86673
files freeglut/receipt libglu-mesa/receipt mesa/receipt nvidia-glx/receipt
line diff
     1.1 --- a/freeglut/receipt	Wed Dec 10 23:57:23 2008 -0800
     1.2 +++ b/freeglut/receipt	Thu Dec 11 05:39:17 2008 -0800
     1.3 @@ -5,16 +5,12 @@
     1.4  CATEGORY="x-window"
     1.5  SHORT_DESC="OpenGL utility toolkit."
     1.6  MAINTAINER="b1+slitaz@nagel.org"
     1.7 +DEPENDS="xorg libgl libglu"
     1.8 +BUILD_DEPENDS="xorg-dev xorg-dev-proto mesa-dev mesa"
     1.9  TARBALL="freeglut-$VERSION.tar.gz"
    1.10  WEB_SITE="http://freeglut.sourceforge.net/"
    1.11  WGET_URL="http://internap.dl.sourceforge.net/sourceforge/$PACKAGE/$TARBALL"
    1.12  
    1.13 -# DEPENDS does not include mesa because libGL
    1.14 -# might already be provided by a driver, and we do
    1.15 -# not want mesa to clobber libGL
    1.16 -DEPENDS="xorg mesa"
    1.17 -BUILD_DEPENDS="xorg-dev xorg-dev-proto mesa-dev mesa"
    1.18 -
    1.19  # Rules to configure and make the package.
    1.20  compile_rules()
    1.21  {
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/libglu-mesa/receipt	Thu Dec 11 05:39:17 2008 -0800
     2.3 @@ -0,0 +1,18 @@
     2.4 +# SliTaz package receipt.
     2.5 +
     2.6 +PACKAGE="libglu-mesa"
     2.7 +VERSION="7.0.3"
     2.8 +CATEGORY="development"
     2.9 +SHORT_DESC="OpenGL utility library"
    2.10 +MAINTAINER="pascal.bellard@slitaz.org"
    2.11 +WEB_SITE="http://www.mesa3d.org/"
    2.12 +WANTED="mesa"
    2.13 +DEPENDS="libgl"
    2.14 +PROVIDE="libglu"
    2.15 +
    2.16 +# Rules to gen a SliTaz package suitable for Tazpkg.
    2.17 +genpkg_rules()
    2.18 +{
    2.19 +	mkdir -p $fs/usr/lib
    2.20 +	cp -a $_pkg/usr/local/lib/libGLU* $fs/usr/lib
    2.21 +}
     3.1 --- a/mesa/receipt	Wed Dec 10 23:57:23 2008 -0800
     3.2 +++ b/mesa/receipt	Thu Dec 11 05:39:17 2008 -0800
     3.3 @@ -11,6 +11,7 @@
     3.4  TARBALL="${SOURCE}Lib-$VERSION.tar.bz2"
     3.5  WEB_SITE="http://www.mesa3d.org/"
     3.6  WGET_URL="$SF_MIRROR/mesa3d/$TARBALL"
     3.7 +PROVIDE="libgl libglu"
     3.8  
     3.9  # Rules to configure and make the package.
    3.10  compile_rules()
     4.1 --- a/nvidia-glx/receipt	Wed Dec 10 23:57:23 2008 -0800
     4.2 +++ b/nvidia-glx/receipt	Thu Dec 11 05:39:17 2008 -0800
     4.3 @@ -8,6 +8,7 @@
     4.4  DEPENDS="nvidia xorg xorg-server"
     4.5  WANTED="nvidia"
     4.6  WEB_SITE="http://www.nvidia.com"
     4.7 +PROVIDE="libgl:nvidia"
     4.8  
     4.9  # Rules to gen a SliTaz package suitable for Tazpkg.
    4.10  genpkg_rules()