Convert package to the new template format (C-W range).

2013-04-12 09:01:46 +02:00
parent 9c87483ea8
commit e85691880c
54 changed files with 587 additions and 556 deletions
--- a/srcpkgs/MesaLib/MesaLib-devel.template
+++ b/srcpkgs/MesaLib/MesaLib-devel.template
@@ -1,15 +0,0 @@
-# Template file for 'MesaLib-devel'.
-#
-noarch=yes
-depends="glproto dri2proto>=2.1 libXext-devel libXxf86vm-devel libXdamage-devel
- libXfixes-devel libX11-devel libxcb-devel libdrm-devel>=2.4.39 expat-devel
- libGL-${version}_${revision} libOpenVG-${version}_${revision}
- libGLES-${version}_${revision} libEGL-${version}_${revision}
- libOSMesa-${version}_${revision} libgbm-${version}_${revision}
- libwayland-egl-${version}_${revision} ${sourcepkg}-${version}_${revision}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}
--- a/srcpkgs/MesaLib/libEGL.template
+++ b/srcpkgs/MesaLib/libEGL.template
@@ -1,8 +0,0 @@
-# Template file for 'libEGL'.
-#
-short_desc="Free implementation of the EGL API - runtime"
-replaces="MesaLib<7.11_2"
-
-do_install() {
-	vmove "usr/lib/libEGL*.so*" usr/lib
-}
--- a/srcpkgs/MesaLib/libGL.template
+++ b/srcpkgs/MesaLib/libGL.template
@@ -1,10 +0,0 @@
-# Template file for 'libGL'.
-#
-short_desc="Free implementation of the OpenGL API - GLX runtime"
-replaces="MesaLib<7.11_2"
-
-do_install() {
-	vmove "usr/lib/libGL.so*" usr/lib
-	rm -f ${DESTDIR}/usr/lib/libGL.so{,.1}
-	mv ${DESTDIR}/usr/lib/libGL.so.1.2.0 ${DESTDIR}/usr/lib/libGL-mesa.so.1.2.0
-}
--- a/srcpkgs/MesaLib/libGLES.template
+++ b/srcpkgs/MesaLib/libGLES.template
@@ -1,8 +0,0 @@
-# Template file for 'libGLES'.
-#
-short_desc="Free implementation of the OpenGL|ES 1.x and 2.x API"
-replaces="MesaLib<7.11_2"
-
-do_install() {
-	vmove "usr/lib/libGLES*.so*" usr/lib
-}
--- a/srcpkgs/MesaLib/libOSMesa.template
+++ b/srcpkgs/MesaLib/libOSMesa.template
@@ -1,8 +0,0 @@
-# Template file for 'libOSMesa'.
-#
-short_desc="Mesa Off-Screen interface library"
-replaces="MesaLib<7.11_2"
-
-do_install() {
-	vmove "usr/lib/libOSMesa.so*" usr/lib
-}
--- a/srcpkgs/MesaLib/libOpenVG.template
+++ b/srcpkgs/MesaLib/libOpenVG.template
@@ -1,8 +0,0 @@
-# Template file for 'libOpenVG'.
-#
-short_desc="Free implementation of the OpenVG API - runtime"
-replaces="MesaLib<7.11_2"
-
-do_install() {
-	vmove "usr/lib/libOpenVG.so*" usr/lib
-}
--- a/srcpkgs/MesaLib/libgbm.template
+++ b/srcpkgs/MesaLib/libgbm.template
@@ -1,9 +0,0 @@
-# Template file for 'libgbm'.
-#
-short_desc="generic buffer management API -- runtime"
-replaces="MesaLib<9.0.2"
-
-do_install() {
-	vmove "usr/lib/libgbm.so*" usr/lib
-	vmove usr/lib/gbm/gbm_gallium_drm.so usr/lib/gbm
-}
--- a/srcpkgs/MesaLib/libglapi.template
+++ b/srcpkgs/MesaLib/libglapi.template
@@ -1,8 +0,0 @@
-# Template file for 'libglapi'.
-#
-short_desc="Free implementation of the GL API - shared library"
-replaces="MesaLib<7.11_2"
-
-do_install() {
-	vmove "usr/lib/libglapi.so*" usr/lib
-}
--- a/srcpkgs/MesaLib/libwayland-egl.template
+++ b/srcpkgs/MesaLib/libwayland-egl.template
@@ -1,8 +0,0 @@
-# Template file for 'libwayland-egl'.
-#
-short_desc="Free implementation of the EGL API - wayland runtime"
-
-do_install() {
-	vmove "usr/lib/libwayland-egl.*" usr/lib
-	vmove usr/lib/egl usr/lib
-}
--- a/srcpkgs/MesaLib/mesa-ati-dri.template
+++ b/srcpkgs/MesaLib/mesa-ati-dri.template
@@ -1,13 +0,0 @@
-# Template file for 'mesa-ati-dri'.
-#
-short_desc="Mesa DRI drivers for ATI GPUs"
-replaces="MesaLib<9.0.2"
-
-do_install() {
-	vmove "usr/lib/libXvMCr[36]00.so*" usr/lib
-	vmove "usr/lib/vdpau/libvdpau_r[36]00.so*" usr/lib/vdpau
-	#vmove "usr/lib/vdpau/libvdpau_radeon*.so*" usr/lib/vdpau
-	vmove "usr/lib/xorg/modules/dri/radeon*" usr/lib/xorg/modules/dri
-	vmove "usr/lib/xorg/modules/dri/r[236]00*" usr/lib/xorg/modules/dri
-	vmove "usr/lib/gallium-pipe/pipe_r[36]00.so" usr/lib/gallium-pipe
-}
--- a/srcpkgs/MesaLib/mesa-intel-dri.template
+++ b/srcpkgs/MesaLib/mesa-intel-dri.template
@@ -1,7 +0,0 @@
-# Template file for 'mesa-intel-dri'.
-#
-short_desc="Mesa DRI drivers for Intel GPUs"
-
-do_install() {
-	vmove "usr/lib/xorg/modules/dri/i9[16]5_dri.*" usr/lib/xorg/modules/dri
-}
--- a/srcpkgs/MesaLib/mesa-nouveau-dri.template
+++ b/srcpkgs/MesaLib/mesa-nouveau-dri.template
@@ -1,11 +0,0 @@
-# Template file for 'mesa-nouveau-dri'.
-#
-short_desc="Mesa DRI drivers for NVIDIA GPUs (nouveau dri)"
-replaces="MesaLib<9.0.2"
-
-do_install() {
-	vmove "usr/lib/libXvMCnouveau.so*" usr/lib
-	vmove "usr/lib/vdpau/libvdpau_nouveau.so*" usr/lib/vdpau
-	vmove "usr/lib/xorg/modules/dri/nouveau*" usr/lib/xorg/modules/dri
-	vmove usr/lib/gallium-pipe/pipe_nouveau.so usr/lib/gallium-pipe
-}
--- a/srcpkgs/MesaLib/mesa-swraster-dri.template
+++ b/srcpkgs/MesaLib/mesa-swraster-dri.template
@@ -1,11 +0,0 @@
-# Template file for 'mesa-swraster-dri'.
-#
-short_desc="Mesa DRI drivers for the Software Rasterizer"
-replaces="MesaLib<9.0.2"
-
-do_install() {
-	vmove "usr/lib/libXvMCsoftpipe.so*" usr/lib
-	vmove "usr/lib/vdpau/libvdpau_softpipe.so*" usr/lib/vdpau
-	vmove "usr/lib/xorg/modules/dri/swrast*" usr/lib/xorg/modules/dri
-	vmove "usr/lib/gallium-pipe/pipe_swrast.so" usr/lib/gallium-pipe
-}
--- a/srcpkgs/MesaLib/mesa-vmwgfx-dri.template
+++ b/srcpkgs/MesaLib/mesa-vmwgfx-dri.template
@@ -1,9 +0,0 @@
-# Template file for 'mesa-vmwgfx-dri'.
-#
-short_desc="Mesa DRI drivers for VMware"
-replaces="MesaLib<9.0.2"
-
-do_install() {
-	vmove "usr/lib/xorg/modules/dri/vmwgfx*" usr/lib/xorg/modules/dri
-	vmove usr/lib/gallium-pipe/pipe_vmwgfx.so usr/lib/gallium-pipe
-}
--- a/srcpkgs/MesaLib/template
+++ b/srcpkgs/MesaLib/template
@@ -1,7 +1,7 @@
 # Template build file for 'MesaLib'.
 pkgname=MesaLib
 version=9.1.1
-revision=2
+revision=3
 wrksrc="Mesa-${version}"
 build_style=gnu-configure
 configure_args="--enable-glx-tls --enable-shared-glapi --enable-gallium-g3dvl
@@ -18,18 +18,156 @@ license="MIT, LGPL-2.1"
 distfiles="ftp://ftp.freedesktop.org/pub/mesa/$version/$pkgname-$version.tar.bz2"
 checksum=3ae5741918a26ce6457b4427663b9e0ed31a3cae1b10b9009e55769a52e9adeb

-conf_files="/etc/drirc"
-depends="mesa-swraster-dri-${version}_${revision}"
-
 makedepends="automake libtool flex pkg-config glproto dri2proto>=2.1
 libXext-devel libXxf86vm-devel libXdamage-devel libudev-devel>=183
 libdrm-devel expat-devel talloc-devel libxml2-python
 libvdpau-devel libXvMC-devel>=1.0.6 wayland-devel llvm>=3.2"

-subpackages="libgbm libEGL libglapi libGLES libGL libOpenVG libOSMesa
- MesaLib-devel mesa-ati-dri mesa-intel-dri mesa-nouveau-dri mesa-swraster-dri
- mesa-vmwgfx-dri libwayland-egl"
-
 pre_configure() {
 	./autogen.sh
 }
+
+post_install() {
+	rm -f ${DESTDIR}/usr/lib/libGL.so{,.1}
+	mv ${DESTDIR}/usr/lib/libGL.so.1.2.0 ${DESTDIR}/usr/lib/libGL-mesa.so.1.2.0
+}
+
+libgbm_package() {
+	short_desc="generic buffer management API -- runtime"
+	replaces="MesaLib<9.0.2"
+	pkg_install() {
+		vmove "usr/lib/libgbm.so*"
+		vmove usr/lib/gbm/gbm_gallium_drm.so
+	}
+}
+
+libEGL_package() {
+	short_desc="Free implementation of the EGL API - runtime"
+	replaces="MesaLib<7.11_2"
+	pkg_install() {
+		vmove "usr/lib/libEGL*.so*"
+	}
+}
+
+libglapi_package() {
+	short_desc="Free implementation of the GL API - shared library"
+	replaces="MesaLib<7.11_2"
+	pkg_install() {
+		vmove "usr/lib/libglapi.so*"
+	}
+}
+
+libGLES_package() {
+	short_desc="Free implementation of the OpenGL|ES 1.x and 2.x API"
+	replaces="MesaLib<7.11_2"
+	pkg_install() {
+		vmove "usr/lib/libGLES*.so*"
+	}
+}
+
+libGL_package() {
+	short_desc="Free implementation of the OpenGL API - GLX runtime"
+	replaces="MesaLib<7.11_2"
+	pkg_install() {
+		vmove "usr/lib/libGL*.so*"
+	}
+}
+
+libOpenVG_package() {
+	short_desc="Free implementation of the OpenVG API - runtime"
+	replaces="MesaLib<7.11_2"
+	pkg_install() {
+		vmove "usr/lib/libOpenVG.so*"
+	}
+}
+
+libOSMesa_package() {
+	short_desc="Mesa Off-Screen interface library"
+	replaces="MesaLib<7.11_2"
+	pkg_install() {
+		vmove "usr/lib/libOSMesa.so*"
+	}
+}
+
+MesaLib-devel_package() {
+	depends="glproto dri2proto>=2.1 libXext-devel libXxf86vm-devel libXdamage-devel
+		libXfixes-devel libX11-devel libxcb-devel libdrm-devel>=2.4.39 expat-devel
+		libGL-${version}_${revision} libOpenVG-${version}_${revision}
+		libGLES-${version}_${revision} libEGL-${version}_${revision}
+		libOSMesa-${version}_${revision} libgbm-${version}_${revision}
+		libwayland-egl-${version}_${revision}
+		${sourcepkg}-${version}_${revision}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+mesa-ati-dri_package() {
+	short_desc="Mesa DRI drivers for ATI GPUs"
+	replaces="MesaLib<9.0.2"
+	pkg_install() {
+		vmove "usr/lib/libXvMCr[36]00.so*"
+		vmove "usr/lib/vdpau/libvdpau_r[36]00.so*"
+		#vmove "usr/lib/vdpau/libvdpau_radeon*.so*"
+		vmove "usr/lib/xorg/modules/dri/radeon*"
+		vmove "usr/lib/xorg/modules/dri/r[236]00*"
+		vmove "usr/lib/gallium-pipe/pipe_r[36]00.so"
+	}
+}
+
+mesa-intel-dri_package() {
+	short_desc="Mesa DRI drivers for Intel GPUs"
+	pkg_install() {
+		vmove "usr/lib/xorg/modules/dri/i9[16]5_dri.*"
+	}
+}
+
+mesa-nouveau-dri_package() {
+	short_desc="Mesa DRI drivers for NVIDIA GPUs (nouveau dri)"
+	replaces="MesaLib<9.0.2"
+	pkg_install() {
+		vmove "usr/lib/libXvMCnouveau.so*"
+		vmove "usr/lib/vdpau/libvdpau_nouveau.so*"
+		vmove "usr/lib/xorg/modules/dri/nouveau*"
+		vmove usr/lib/gallium-pipe/pipe_nouveau.so
+	}
+}
+
+mesa-swraster-dri_package() {
+	short_desc="Mesa DRI drivers for the Software Rasterizer"
+	replaces="MesaLib<9.0.2"
+	pkg_install() {
+		vmove "usr/lib/libXvMCsoftpipe.so*"
+		vmove "usr/lib/vdpau/libvdpau_softpipe.so*"
+		vmove "usr/lib/xorg/modules/dri/swrast*"
+		vmove "usr/lib/gallium-pipe/pipe_swrast.so"
+	}
+}
+
+mesa-vmwgfx-dri_package() {
+	short_desc="Mesa DRI drivers for VMware"
+	replaces="MesaLib<9.0.2"
+	pkg_install() {
+		vmove "usr/lib/xorg/modules/dri/vmwgfx*"
+		vmove usr/lib/gallium-pipe/pipe_vmwgfx.so
+	}
+}
+
+libwayland-egl_package() {
+	short_desc="Free implementation of the EGL API - wayland runtime"
+	pkg_install() {
+		vmove "usr/lib/libwayland-egl.*"
+		vmove usr/lib/egl
+	}
+}
+
+MesaLib_package() {
+	conf_files="/etc/drirc"
+	depends="mesa-swraster-dri-${version}_${revision}"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}