Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=8080fdeb06aa3b51324d31a80bdbd8e810eb25d9
commit 8080fdeb06aa3b51324d31a80bdbd8e810eb25d9
Author: Michel Hermier <herm...@frugalware.org>
Date: Sun Aug 14 11:19:33 2011 +0200
mesa-7.10.3-4-i686
* Little of maintenance.
* Introduce USE_EGL.
* New khr-headers, it is used for 3 subpackages so it's more easy this
way even if it conains a single file for now.
diff --git a/source/x11/mesa/FrugalBuild b/source/x11/mesa/FrugalBuild
index 553d117..a093d0a 100644
--- a/source/x11/mesa/FrugalBuild
+++ b/source/x11/mesa/FrugalBuild
@@ -3,13 +3,14 @@
# Contributor: crazy <cr...@frugalware.org>
USE_DEVEL=${USE_DEVEL:-"n"}
+USE_EGL=${USE_EGL:-"y"}
USE_GALLIUM=${USE_GALLIUM:-"y"}
pkgname=mesa
origname=Mesa
_F_archive_name="MesaLib"
pkgver=7.10.3
-pkgrel=3
+pkgrel=4
pkgdesc="Mesa is a 3D graphics library"
url="http://mesa3d.sourceforge.net/";
up2date="Flasttar ftp://ftp.freedesktop.org/pub/$pkgname/current/";
@@ -23,7 +24,7 @@ rodepends=('libgl' 'libglu' 'libglw')
archs=('i686' 'x86_64' 'ppc' 'arm')
groups=('x11' 'xorg-core' 'xorg-libs')
-if Fuse $USE_DEVEL; then
+if Fuse DEVEL; then
unset source sha1sums
pkgver=$pkgver.1.g6e00627
pkgrel=0
@@ -57,17 +58,7 @@ subconflicts=('fglrx nvidia' 'nvidia')
subdepends=('libdrm>=2.4.20 libxcb>=1.3 libxdamage>=1.1.1-3 libxi libxmu
libxxf86vm>=1.0.2' 'dri2proto>=2.0 glproto>=1.4.9')
subrodepends=("libdri libgl-headers-mesa>=$pkgver-$pkgrel libglx" '')
subgroups=('x11' 'x11')
-subarchs=('i686 x86_64 ppc arm' 'i686 x86_64 ppc arm')
-
-subpkgs=("${subpkgs[@]}" 'libegl')
-subdescs=("${subdescs[@]}" 'Mesa OpenEGL library.')
-subprovides=("${subprovides[@]}" 'libegl-mesa')
-subreplaces=("${subreplaces[@]}" '')
-subconflicts=("${subconflicts[@]}" '')
-subdepends=("${subdepends[@]}" '')
-subrodepends=("${subrodepends[@]}" 'libgl')
-subgroups=("${subgroups[@]}" 'x11')
-subarchs=("${subarchs[@]}" 'i686 x86_64 ppc arm')
+subarchs=("${archs[*]}" "${archs[*]}")
subpkgs=("${subpkgs[@]}" 'libgles')
subdescs=("${subdescs[@]}" 'Mesa OpenGL ES1/ES2 libraries.')
@@ -75,9 +66,9 @@ subprovides=("${subprovides[@]}" 'libgles-mesa')
subreplaces=("${subreplaces[@]}" '')
subconflicts=("${subconflicts[@]}" '')
subdepends=("${subdepends[@]}" '')
-subrodepends=("${subrodepends[@]}" '')
+subrodepends=("${subrodepends[@]}" 'khr-headers')
subgroups=("${subgroups[@]}" 'x11')
-subarchs=("${subarchs[@]}" 'i686 x86_64 ppc arm')
+subarchs=("${subarchs[@]}" "${archs[*]}")
subpkgs=("${subpkgs[@]}" 'libglu')
subdescs=("${subdescs[@]}" 'Mesa OpenGL Utility library.')
@@ -87,27 +78,49 @@ subconflicts=("${subconflicts[@]}" '')
subdepends=("${subdepends[@]}" '')
subrodepends=("${subrodepends[@]}" 'libgl')
subgroups=("${subgroups[@]}" 'x11')
-subarchs=("${subarchs[@]}" 'i686 x86_64 ppc arm')
+subarchs=("${subarchs[@]}" "${archs[*]}")
-subpkgs=("${subpkgs[@]}" 'libvg')
-subdescs=("${subdescs[@]}" 'Mesa OpenVG library.')
-subprovides=("${subprovides[@]}" 'libvg-mesa')
+subpkgs=("${subpkgs[@]}" 'libglw')
+subdescs=("${subdescs[@]}" 'Mesa Xt/Motif OpenGL drawing area widget library.')
+subprovides=("${subprovides[@]}" 'libglw-mesa')
subreplaces=("${subreplaces[@]}" '')
subconflicts=("${subconflicts[@]}" '')
subdepends=("${subdepends[@]}" '')
subrodepends=("${subrodepends[@]}" 'libgl')
subgroups=("${subgroups[@]}" 'x11')
-subarchs=("${subarchs[@]}" 'i686 x86_64 ppc arm')
+subarchs=("${subarchs[@]}" "${archs[*]}")
-subpkgs=("${subpkgs[@]}" 'libglw')
-subdescs=("${subdescs[@]}" 'Mesa Xt/Motif OpenGL drawing area widget library.')
+subpkgs=("${subpkgs[@]}" 'khr-headers')
+subdescs=("${subdescs[@]}" 'Khronos generic header.')
subprovides=("${subprovides[@]}" 'libglw-mesa')
subreplaces=("${subreplaces[@]}" '')
subconflicts=("${subconflicts[@]}" '')
subdepends=("${subdepends[@]}" '')
-subrodepends=("${subrodepends[@]}" 'libgl')
+subrodepends=("${subrodepends[@]}" '')
subgroups=("${subgroups[@]}" 'x11')
-subarchs=("${subarchs[@]}" 'i686 x86_64 ppc arm')
+subarchs=("${subarchs[@]}" "${archs[*]}")
+
+if Fuse EGL; then
+ subpkgs=("${subpkgs[@]}" 'libegl')
+ subdescs=("${subdescs[@]}" 'Mesa OpenEGL library.')
+ subprovides=("${subprovides[@]}" 'libegl-mesa')
+ subreplaces=("${subreplaces[@]}" '')
+ subconflicts=("${subconflicts[@]}" '')
+ subdepends=("${subdepends[@]}" '')
+ subrodepends=("${subrodepends[@]}" 'libgl khr-headers')
+ subgroups=("${subgroups[@]}" 'x11')
+ subarchs=("${subarchs[@]}" "${archs[*]}")
+
+ subpkgs=("${subpkgs[@]}" 'libvg')
+ subdescs=("${subdescs[@]}" 'Mesa OpenVG library.')
+ subprovides=("${subprovides[@]}" 'libvg-mesa')
+ subreplaces=("${subreplaces[@]}" '')
+ subconflicts=("${subconflicts[@]}" '')
+ subdepends=("${subdepends[@]}" '')
+ subrodepends=("${subrodepends[@]}" 'libgl khr-headers')
+ subgroups=("${subgroups[@]}" 'x11')
+ subarchs=("${subarchs[@]}" "${archs[*]}")
+fi
# NOTE: If you bump version (major or minor) you need to review the symlinking
at the end of this
# file !!!! On minor bump last number will be changed.
@@ -115,7 +128,7 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 ppc arm')
# Check: src/mesa/main/version.h for mesa proper version need for symlink.
build() {
- if Fuse $USE_DEVEL; then
+ if Fuse DEVEL; then
Funpack_scm
./autogen.sh
fi
@@ -128,19 +141,29 @@ build() {
Fsed "savage sis tdfx" "savage tdfx" configure*
fi
- if Fuse $USE_GALLIUM; then
- Fconfopts="$Fconfopts --disable-gallium-llvm
--enable-gallium-nouveau --enable-gallium-radeon \
- --enable-gallium-r600 --enable-openvg
--with-state-trackers=dri,egl,glx,vega"
+ if Fuse EGL; then
+ EGL_PLATFORMS="drm,x11"
+ Fconfopts="$Fconfopts --with-egl-platforms=$EGL_PLATFORMS"
+ Fconfopts="$Fconfopts --enable-egl"
+ Fconfopts="$Fconfopts --enable-openvg"
+ else
+ Fconfopts="$Fconfopts --disable-egl"
+ Fconfopts="$Fconfopts --disable-openvg"
+ fi
+
+ if Fuse GALLIUM; then
+ Fconfopts="$Fconfopts --disable-gallium-llvm"
+ Fconfopts="$Fconfopts --enable-gallium-nouveau"
+ Fconfopts="$Fconfopts --enable-gallium-radeon
--enable-gallium-r600"
+ Fconfopts="$Fconfopts --with-state-trackers=dri,egl,glx,vega"
else
- Fconfopts="$Fconfopts --disable-gallium --disable-openvg"
+ Fconfopts="$Fconfopts --disable-gallium"
fi
Fconf --with-driver=dri \
--with-dri-driverdir=/usr/lib/dri \
--with-dri-drivers=yes \
- --with-egl-platforms=drm,x11 \
--disable-glut \
- --enable-egl \
--enable-gles1 \
--enable-gles2 \
--enable-glx-tls \
@@ -184,13 +207,7 @@ build() {
Fsplit libgl-headers-mesa usr/include/GL/{gl.h,glext.h,glx.h,glxext.h}
Fsplit libgl-headers-mesa usr/include/GL/internal
- Fsplit libegl usr/include/EGL/
- Fsplit libegl usr/lib/libEGL.*
- Fsplit libegl usr/lib/egl/
- Fsplit libegl usr/lib/pkgconfig/egl.pc
-
Fsplit libgles usr/include/GLES*/
- Fsplit libgles usr/include/KHR/
Fsplit libgles usr/lib/libGLES*
Fsplit libgles usr/lib/pkgconfig/gles*.pc
@@ -198,17 +215,26 @@ build() {
Fsplit libglu usr/lib/libGLU.*
Fsplit libglu usr/lib/pkgconfig/glu.pc
- Fsplit libvg usr/include/VG/
- Fsplit libvg usr/lib/libOpenVG.*
- Fsplit libvg usr/lib/pkgconfig/vg.pc
-
Fsplit libglw usr/include/GL/GLw*
Fsplit libglw usr/lib/libGLw.*
Fsplit libglw usr/lib/pkgconfig/glw.pc
+ Fsplit khr-headers usr/include/KHR/
+
# Fsplit xf86-video-gles usr/include/xorg/
# Fsplit xf86-video-gles usr/lib/xorg/modules/drivers/
+ if Fuse EGL; then
+ Fsplit libegl usr/include/EGL/
+ Fsplit libegl usr/lib/libEGL.*
+ Fsplit libegl usr/lib/egl/
+ Fsplit libegl usr/lib/pkgconfig/egl.pc
+
+ Fsplit libvg usr/include/VG/
+ Fsplit libvg usr/lib/libOpenVG.*
+ Fsplit libvg usr/lib/pkgconfig/vg.pc
+ fi
+
Frm var
}
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
