Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=b26f9d7fe9d22219950afe007e2b9b7670e1e0f6
commit b26f9d7fe9d22219950afe007e2b9b7670e1e0f6 Author: Michel Hermier <[email protected]> Date: Wed Nov 23 08:43:15 2011 +0100 mesa-7.11-3-i686 * Separate libglu build code, will be removed from mesa soon. diff --git a/source/x11/mesa/FrugalBuild b/source/x11/mesa/FrugalBuild index a02fa90..42bcc33 100644 --- a/source/x11/mesa/FrugalBuild +++ b/source/x11/mesa/FrugalBuild @@ -5,6 +5,7 @@ USE_DEVEL=${USE_DEVEL:-"n"} USE_EGL=${USE_EGL:-"y"} USE_GALLIUM=${USE_GALLIUM:-"y"} +USE_GLU=${USE_GLU:-"y"} USE_GLW=${USE_GLW:-"y"} USE_WAYLAND_EGL=${USE_WAYLAND_EGL:-"n"} @@ -21,7 +22,7 @@ up2date="Flasttar ftp://ftp.freedesktop.org/pub/$pkgname/current/" depends=() makedepends=('makedepend') # should be mesa-*=$pkgver but apps should not depends on mesa anymore first, unless specific to mesa -rodepends=('libgl' 'libglu') +rodepends=('libgl') archs=('i686' 'x86_64' 'ppc' 'arm') groups=('x11' 'xorg-core' 'xorg-libs') @@ -104,16 +105,6 @@ subrodepends=("${subrodepends[@]}" 'libdrm libglapi khr-headers') subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") -subpkgs=("${subpkgs[@]}" 'libglu') -subdescs=("${subdescs[@]}" 'Mesa OpenGL Utility library.') -subprovides=("${subprovides[@]}" 'libglu-mesa') -subreplaces=("${subreplaces[@]}" '') -subconflicts=("${subconflicts[@]}" '') -subdepends=("${subdepends[@]}" '') -subrodepends=("${subrodepends[@]}" 'libgl') -subgroups=("${subgroups[@]}" 'x11') -subarchs=("${subarchs[@]}" "${archs[*]}") - subpkgs=("${subpkgs[@]}" 'khr-headers') subdescs=("${subdescs[@]}" 'Khronos generic header.') subprovides=("${subprovides[@]}" '') @@ -158,6 +149,18 @@ if Fuse EGL; then fi fi +if Fuse GLU; then + subpkgs=("${subpkgs[@]}" 'libglu') + subdescs=("${subdescs[@]}" 'Mesa OpenGL Utility library.') + subprovides=("${subprovides[@]}" 'libglu-mesa') + subreplaces=("${subreplaces[@]}" '') + subconflicts=("${subconflicts[@]}" '') + subdepends=("${subdepends[@]}" '') + subrodepends=("${subrodepends[@]}" 'libgl') + subgroups=("${subgroups[@]}" 'x11') + subarchs=("${subarchs[@]}" "${archs[*]}") +fi + if Fuse GLW; then subpkgs=("${subpkgs[@]}" 'libglw') subdescs=("${subdescs[@]}" 'Mesa Xt/Motif OpenGL drawing area widget library.') @@ -220,6 +223,18 @@ build() { Fconfopts="$Fconfopts --disable-gallium" fi + if Fuse GLU; then + Fconfopts="$Fconfopts --enable-glu" + else + Fconfopts="$Fconfopts --disable-glu" + fi + + if Fuse GLW; then + Fconfopts="$Fconfopts --enable-glw" + else + Fconfopts="$Fconfopts --disable-glw" + fi + Fconf --with-driver=dri \ --with-dri-driverdir=/usr/lib/dri \ --with-dri-drivers=yes \ @@ -245,9 +260,7 @@ build() { $Fdestdir/usr/share/doc/$pkgname-$pkgver/ || Fdie # Install our .la files with r-xr-xr-x rights - Finstall 0555 lib{GL,GLU}.la /usr/lib/ - - Fln libGLU.so.1.3.071100 /usr/lib/libGLU.so.1.3 + Finstall 0555 libGL.la /usr/lib/ # Remove to avoid a conflict with libosmesa Frm libosmesa usr/include/GL/osmesa.h @@ -277,10 +290,6 @@ build() { Fsplit libgles usr/lib/libGLES* Fsplit libgles usr/lib/pkgconfig/gles*.pc - Fsplit libglu usr/include/GL/glu.h - Fsplit libglu usr/lib/libGLU.* - Fsplit libglu usr/lib/pkgconfig/glu.pc - Fsplit khr-headers usr/include/KHR/ # Fsplit xf86-video-gles usr/include/xorg/ @@ -302,6 +311,15 @@ build() { fi fi + if Fuse GLU; then + Finstall 0555 libGLU.la /usr/lib/ + Fln libGLU.so.1.3.071200 /usr/lib/libGLU.so.1.3 + + Fsplit libglu usr/include/GL/glu.h + Fsplit libglu usr/lib/libGLU.* + Fsplit libglu usr/lib/pkgconfig/glu.pc + fi + if Fuse GLW; then Fsplit libglw usr/include/GL/GLw* Fsplit libglw usr/lib/libGLw.* _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
