From a315485e7e71e06cb7f6809efde85044ba65ae25 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 8 Jan 2013 11:07:44 +0100 Subject: [PATCH] MesaLib-devel: make it depend on libwayland-egl too. --- srcpkgs/MesaLib/MesaLib-devel.template | 5 +---- srcpkgs/MesaLib/libEGL.template | 9 --------- srcpkgs/MesaLib/libGL.template | 8 -------- srcpkgs/MesaLib/libGLES.template | 10 ---------- srcpkgs/MesaLib/libOSMesa.template | 7 ------- srcpkgs/MesaLib/libOpenVG.template | 7 ------- srcpkgs/MesaLib/libgbm.template | 5 ----- srcpkgs/MesaLib/libglapi.template | 4 ---- srcpkgs/MesaLib/libwayland-egl.template | 6 ------ srcpkgs/MesaLib/mesa-ati-dri.template | 2 -- srcpkgs/MesaLib/mesa-intel-dri.template | 2 -- srcpkgs/MesaLib/mesa-nouveau-dri.template | 2 -- srcpkgs/MesaLib/mesa-swraster-dri.template | 2 -- srcpkgs/MesaLib/mesa-vmwgfx-dri.template | 2 -- srcpkgs/MesaLib/template | 9 +-------- 15 files changed, 2 insertions(+), 78 deletions(-) diff --git a/srcpkgs/MesaLib/MesaLib-devel.template b/srcpkgs/MesaLib/MesaLib-devel.template index 3457ef7e4de..696f9f2bf49 100644 --- a/srcpkgs/MesaLib/MesaLib-devel.template +++ b/srcpkgs/MesaLib/MesaLib-devel.template @@ -6,11 +6,8 @@ depends="glproto dri2proto>=2.1 libXext-devel libXxf86vm-devel libXdamage-devel libXt-devel libGL-${version}_${revision} libOpenVG-${version}_${revision} libGLES-${version}_${revision} libEGL-${version}_${revision} libOSMesa-${version}_${revision} libgbm-${version}_${revision} - ${sourcepkg}-${version}_${revision}" + libwayland-egl-${version}_${revision} ${sourcepkg}-${version}_${revision}" short_desc="${short_desc} - development files" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." do_install() { vmove usr/include usr diff --git a/srcpkgs/MesaLib/libEGL.template b/srcpkgs/MesaLib/libEGL.template index 59d47927d3e..12ed6f9b94d 100644 --- a/srcpkgs/MesaLib/libEGL.template +++ b/srcpkgs/MesaLib/libEGL.template @@ -1,15 +1,6 @@ # Template file for 'libEGL'. # short_desc="Free implementation of the EGL API - runtime" -long_desc=" - This package contains the EGL native platform graphics interface library. - EGL provides a platform-agnostic mechanism for creating rendering surfaces - for use with other graphics libraries, such as OpenGL|ES and OpenVG. - - This package contains modules to interface with the existing system GLX or - DRI2 drivers to provide OpenGL via EGL. The MesaLib package provides drivers - to provide hardware-accelerated OpenGL|ES and OpenVG support." - replaces="MesaLib<7.11_2" do_install() { diff --git a/srcpkgs/MesaLib/libGL.template b/srcpkgs/MesaLib/libGL.template index 00c44c41d5e..1a53f5d24a6 100644 --- a/srcpkgs/MesaLib/libGL.template +++ b/srcpkgs/MesaLib/libGL.template @@ -1,14 +1,6 @@ # Template file for 'libGL'. # short_desc="Free implementation of the OpenGL API - GLX runtime" -long_desc=" - This version of Mesa provides GLX and DRI capabilities: it is capable of both - direct and indirect rendering. For direct rendering, it can use DRI modules - from the MesaLib package to accelerate drawing. - - This package does not include the modules themselves: these can be found in - the MesaLib package." - replaces="MesaLib<7.11_2" do_install() { diff --git a/srcpkgs/MesaLib/libGLES.template b/srcpkgs/MesaLib/libGLES.template index be6aa2bd29b..6d62a73607c 100644 --- a/srcpkgs/MesaLib/libGLES.template +++ b/srcpkgs/MesaLib/libGLES.template @@ -1,16 +1,6 @@ # Template file for 'libGLES'. # short_desc="Free implementation of the OpenGL|ES 1.x and 2.x API" -long_desc=" - OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on - embedded systems - including consoles, phones, appliances and vehicles. - It contains a subset of OpenGL plus a number of extensions for the special - needs of embedded systems. - - OpenGL|ES 1.x provides an API for fixed-function hardware. - OpenGL|ES 2.x provides an API for programmable hardware including vertex - and fragment shaders." - replaces="MesaLib<7.11_2" do_install() { diff --git a/srcpkgs/MesaLib/libOSMesa.template b/srcpkgs/MesaLib/libOSMesa.template index c5bc4b92abe..bc2be6a380a 100644 --- a/srcpkgs/MesaLib/libOSMesa.template +++ b/srcpkgs/MesaLib/libOSMesa.template @@ -1,13 +1,6 @@ # Template file for 'libOSMesa'. # short_desc="Mesa Off-Screen interface library" -long_desc=" - Mesa's off-screen rendering interface is used for rendering into user-allocated - blocks of memory. That is, the GL_FRONT colorbuffer is actually a buffer in - main memory, rather than a window on your display. There are no window system - or operating system dependencies. One potential application is to use Mesa as - an off-line, batch-style renderer." - replaces="MesaLib<7.11_2" do_install() { diff --git a/srcpkgs/MesaLib/libOpenVG.template b/srcpkgs/MesaLib/libOpenVG.template index 2ae8e851bac..50ce64cca2b 100644 --- a/srcpkgs/MesaLib/libOpenVG.template +++ b/srcpkgs/MesaLib/libOpenVG.template @@ -1,13 +1,6 @@ # Template file for 'libOpenVG'. # short_desc="Free implementation of the OpenVG API - runtime" -long_desc=" - This package contains the mesa implementation of the OpenVG 2D acceleration - library. OpenVG provides a device independent and vendor-neutral interface - for sophisticated 2D graphical applications, while allowing device - manufacturers to provide hardware acceleration on devices ranging from wrist - watches to full microprocessor-based desktop and server machines." - replaces="MesaLib<7.11_2" do_install() { diff --git a/srcpkgs/MesaLib/libgbm.template b/srcpkgs/MesaLib/libgbm.template index 6d75ff2e756..6ed7e1e4c04 100644 --- a/srcpkgs/MesaLib/libgbm.template +++ b/srcpkgs/MesaLib/libgbm.template @@ -1,11 +1,6 @@ # Template file for 'libgbm'. # short_desc="generic buffer management API -- runtime" -long_desc=" - This package contains the GBM buffer management library. It provides a - mechanism for allocating buffers for graphics rendering tied to Mesa. - - GBM is intended to be used as a native platform for EGL on drm or openwfd." do_install() { vmove "usr/lib/libgbm.so*" usr/lib diff --git a/srcpkgs/MesaLib/libglapi.template b/srcpkgs/MesaLib/libglapi.template index 8c049105f7c..1cd515703ac 100644 --- a/srcpkgs/MesaLib/libglapi.template +++ b/srcpkgs/MesaLib/libglapi.template @@ -1,10 +1,6 @@ # Template file for 'libglapi'. # short_desc="Free implementation of the GL API - shared library" -long_desc=" - The Mesa GL API module is responsible for dispatching all the gl* functions. - It is intended to be mainly used by both the libGLES package." - replaces="MesaLib<7.11_2" do_install() { diff --git a/srcpkgs/MesaLib/libwayland-egl.template b/srcpkgs/MesaLib/libwayland-egl.template index 39029621718..dbb6a643b47 100644 --- a/srcpkgs/MesaLib/libwayland-egl.template +++ b/srcpkgs/MesaLib/libwayland-egl.template @@ -1,12 +1,6 @@ # Template file for 'libwayland-egl'. # short_desc="Free implementation of the EGL API - wayland runtime" -long_desc=" - This package contains the EGL native platform graphics interface library. - EGL provides a platform-agnostic mechanism for creating rendering surfaces - for use with other graphics libraries, such as OpenGL|ES and OpenVG. - - This package contains the wayland EGL backend." do_install() { vmove "usr/lib/libwayland-egl.*" usr/lib diff --git a/srcpkgs/MesaLib/mesa-ati-dri.template b/srcpkgs/MesaLib/mesa-ati-dri.template index c6f84f14be9..aac6ff45791 100644 --- a/srcpkgs/MesaLib/mesa-ati-dri.template +++ b/srcpkgs/MesaLib/mesa-ati-dri.template @@ -1,8 +1,6 @@ # Template file for 'mesa-ati-dri'. # short_desc="Mesa DRI drivers for ATI GPUs" -long_desc=" - This package contains the ${short_desc}." do_install() { vmove "usr/lib/libXvMCr[36]00.so*" usr/lib diff --git a/srcpkgs/MesaLib/mesa-intel-dri.template b/srcpkgs/MesaLib/mesa-intel-dri.template index 3efcc730819..29538ae9dec 100644 --- a/srcpkgs/MesaLib/mesa-intel-dri.template +++ b/srcpkgs/MesaLib/mesa-intel-dri.template @@ -1,8 +1,6 @@ # Template file for 'mesa-intel-dri'. # short_desc="Mesa DRI drivers for Intel GPUs" -long_desc=" - This package contains the ${short_desc}." do_install() { vmove "usr/lib/xorg/modules/dri/i9[16]5_dri.*" usr/lib/xorg/modules/dri diff --git a/srcpkgs/MesaLib/mesa-nouveau-dri.template b/srcpkgs/MesaLib/mesa-nouveau-dri.template index 674f5a4d9c5..3f61d2d66e6 100644 --- a/srcpkgs/MesaLib/mesa-nouveau-dri.template +++ b/srcpkgs/MesaLib/mesa-nouveau-dri.template @@ -1,8 +1,6 @@ # Template file for 'mesa-nouveau-dri'. # short_desc="Mesa DRI drivers for NVIDIA GPUs (nouveau dri)" -long_desc=" - This package contains the ${short_desc}." do_install() { vmove "usr/lib/libXvMCnouveau.so*" usr/lib diff --git a/srcpkgs/MesaLib/mesa-swraster-dri.template b/srcpkgs/MesaLib/mesa-swraster-dri.template index 839a3c3c232..5a29f82776e 100644 --- a/srcpkgs/MesaLib/mesa-swraster-dri.template +++ b/srcpkgs/MesaLib/mesa-swraster-dri.template @@ -1,8 +1,6 @@ # Template file for 'mesa-swraster-dri'. # short_desc="Mesa DRI drivers for the Software Rasterizer" -long_desc=" - This package contains the ${short_desc}." do_install() { vmove "usr/lib/libXvMCsoftpipe.so*" usr/lib diff --git a/srcpkgs/MesaLib/mesa-vmwgfx-dri.template b/srcpkgs/MesaLib/mesa-vmwgfx-dri.template index a2504a80438..a85035012e9 100644 --- a/srcpkgs/MesaLib/mesa-vmwgfx-dri.template +++ b/srcpkgs/MesaLib/mesa-vmwgfx-dri.template @@ -1,8 +1,6 @@ # Template file for 'mesa-vmwgfx-dri'. # short_desc="Mesa DRI drivers for VMware" -long_desc=" - This package contains the ${short_desc}." do_install() { vmove "usr/lib/xorg/modules/dri/vmwgfx*" usr/lib/xorg/modules/dri diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template index 61cf57ce2f1..34ecf82ac7e 100644 --- a/srcpkgs/MesaLib/template +++ b/srcpkgs/MesaLib/template @@ -1,7 +1,7 @@ # Template build file for 'MesaLib'. pkgname=MesaLib version=9.0.1 -revision=5 +revision=6 wrksrc="Mesa-${version}" build_style=gnu-configure configure_args="--enable-glx-tls --enable-shared-glapi --enable-gallium-g3dvl @@ -17,15 +17,8 @@ homepage="http://www.mesa3d.org/" license="MIT, LGPL-2.1" distfiles="ftp://ftp.freedesktop.org/pub/mesa/$version/$pkgname-$version.tar.bz2" checksum=57a7ba83bace3f3a7dc0929fe026ef5f0ad454234ec4ad8a3e0d31650a75db6f -long_desc=" - MesaLib is a 3-D graphics library with an API which is very similar to - that of OpenGL*. To the extent that Mesa utilizes the OpenGL command syntax - or state machine, it is being used with authorization from Silicon Graphics, - Inc. However, the author makes no claim that Mesa is in any way a - compatible replacement for OpenGL or associated with Silicon Graphics, Inc." conf_files="/etc/drirc" - depends="mesa-swraster-dri-${version}_${revision}" makedepends="automake perl flex pkg-config glproto dri2proto>=2.1 makedepend