From 67b391434cc3d2da08571cf04f11a2fc573fb642 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 8 Dec 2014 08:58:12 +0100 Subject: [PATCH] MesaLib: renamed to libGL and updated to 10.3.5. libGL is now the main pkg and replaces MesaLib and mesa-swraster-dri. --- srcpkgs/MesaLib-devel | 2 +- srcpkgs/libEGL | 2 +- srcpkgs/libGL | 1 - srcpkgs/libGL/libglapi | 1 + srcpkgs/{MesaLib => libGL}/template | 37 +++++++---------------------- srcpkgs/libGLES | 2 +- srcpkgs/libOSMesa | 2 +- srcpkgs/libgbm | 2 +- srcpkgs/libglapi | 2 +- srcpkgs/libwayland-egl | 2 +- srcpkgs/libxatracker | 2 +- srcpkgs/mesa-ati-dri | 2 +- srcpkgs/mesa-intel-dri | 2 +- srcpkgs/mesa-nouveau-dri | 2 +- srcpkgs/mesa-opencl | 2 +- srcpkgs/mesa-swraster-dri | 1 - srcpkgs/mesa-vmwgfx-dri | 2 +- 17 files changed, 22 insertions(+), 44 deletions(-) delete mode 120000 srcpkgs/libGL create mode 120000 srcpkgs/libGL/libglapi rename srcpkgs/{MesaLib => libGL}/template (85%) delete mode 120000 srcpkgs/mesa-swraster-dri diff --git a/srcpkgs/MesaLib-devel b/srcpkgs/MesaLib-devel index 8bf5fbea217..5ef01dc565e 120000 --- a/srcpkgs/MesaLib-devel +++ b/srcpkgs/MesaLib-devel @@ -1 +1 @@ -MesaLib \ No newline at end of file +libGL \ No newline at end of file diff --git a/srcpkgs/libEGL b/srcpkgs/libEGL index 8bf5fbea217..5ef01dc565e 120000 --- a/srcpkgs/libEGL +++ b/srcpkgs/libEGL @@ -1 +1 @@ -MesaLib \ No newline at end of file +libGL \ No newline at end of file diff --git a/srcpkgs/libGL b/srcpkgs/libGL deleted file mode 120000 index 8bf5fbea217..00000000000 --- a/srcpkgs/libGL +++ /dev/null @@ -1 +0,0 @@ -MesaLib \ No newline at end of file diff --git a/srcpkgs/libGL/libglapi b/srcpkgs/libGL/libglapi new file mode 120000 index 00000000000..930ef655a03 --- /dev/null +++ b/srcpkgs/libGL/libglapi @@ -0,0 +1 @@ +libglapi \ No newline at end of file diff --git a/srcpkgs/MesaLib/template b/srcpkgs/libGL/template similarity index 85% rename from srcpkgs/MesaLib/template rename to srcpkgs/libGL/template index a7ef7d5ad5e..bbab7ff1e75 100644 --- a/srcpkgs/MesaLib/template +++ b/srcpkgs/libGL/template @@ -1,6 +1,6 @@ -# Template build file for 'MesaLib'. -pkgname=MesaLib -version=10.3.4 +# Template build file for 'libGL'. +pkgname=libGL +version=10.3.5 revision=1 wrksrc="Mesa-${version}" build_style=gnu-configure @@ -12,8 +12,8 @@ short_desc="Graphics library similar to SGI's OpenGL" maintainer="Juan RP " homepage="http://www.mesa3d.org/" license="MIT, LGPL-2.1" -distfiles="ftp://ftp.freedesktop.org/pub/mesa/${version}/${pkgname}-${version}.tar.bz2" -checksum=e6373913142338d10515daf619d659433bfd2989988198930c13b0945a15e98a +distfiles="ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2" +checksum=eb75d2790f1606d59d50a6acaa637b6c75f2155b3e0eca3d5099165c0d9556ae hostmakedepends=" automake libtool flex pkg-config llvm libxml2-python wayland-devel" @@ -22,9 +22,11 @@ makedepends=" libudev-devel libdrm-devel expat-devel talloc-devel libvdpau-devel libXdamage-devel libXvMC-devel>=1.0.6 libxshmfence-devel wayland-devel elfutils-devel ncurses-devel zlib-devel libffi-devel" +replaces="MesaLib>=0 mesa-swraster-dri>=0" +conf_files="/etc/drirc" # Set subpackages manually to set proper rdeps in 32bit pkgs. -subpackages="libglapi libgbm libEGL libGL libGLES libOSMesa libwayland-egl mesa-swraster-dri" +subpackages="libglapi libgbm libEGL libGLES libOSMesa libwayland-egl" case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) @@ -53,7 +55,6 @@ case "$XBPS_TARGET_MACHINE" in *) configure_args+=" --with-dri-driverdir=/usr/lib/xorg/modules/drivers";; esac -conf_files="/etc/drirc" pre_configure() { NOCONFIGURE=1 ./autogen.sh @@ -91,14 +92,6 @@ libGLES_package() { vmove "usr/lib/libGLES*.so.*" } } -libGL_package() { - depends="libudev" - short_desc="Free implementation of the OpenGL API - GLX runtime" - pkg_install() { - vmove "usr/lib/libGL.so*" - vmove usr/lib/xorg/modules/extensions - } -} libOSMesa_package() { short_desc="Mesa Off-Screen interface library" pkg_install() { @@ -129,20 +122,6 @@ MesaLib-devel_package() { vmove "usr/lib/*.so" } } -mesa-swraster-dri_package() { - short_desc="Mesa DRI drivers for the Software Rasterizer" - pkg_install() { - vmove "usr/lib/xorg/modules/drivers/swrast*" - vmove usr/lib/xorg/modules/drivers/kms_swrast_dri.so - # XXX - case "$XBPS_TARGET_MACHINE" in - i686*|x86_64*) - vmove "usr/lib/gallium-pipe/pipe_swrast.so" - ;; - esac - - } -} libxatracker_package() { short_desc="Mesa XA tracker interface library" pkg_install() { diff --git a/srcpkgs/libGLES b/srcpkgs/libGLES index 8bf5fbea217..5ef01dc565e 120000 --- a/srcpkgs/libGLES +++ b/srcpkgs/libGLES @@ -1 +1 @@ -MesaLib \ No newline at end of file +libGL \ No newline at end of file diff --git a/srcpkgs/libOSMesa b/srcpkgs/libOSMesa index 8bf5fbea217..5ef01dc565e 120000 --- a/srcpkgs/libOSMesa +++ b/srcpkgs/libOSMesa @@ -1 +1 @@ -MesaLib \ No newline at end of file +libGL \ No newline at end of file diff --git a/srcpkgs/libgbm b/srcpkgs/libgbm index 8bf5fbea217..5ef01dc565e 120000 --- a/srcpkgs/libgbm +++ b/srcpkgs/libgbm @@ -1 +1 @@ -MesaLib \ No newline at end of file +libGL \ No newline at end of file diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi index 8bf5fbea217..5ef01dc565e 120000 --- a/srcpkgs/libglapi +++ b/srcpkgs/libglapi @@ -1 +1 @@ -MesaLib \ No newline at end of file +libGL \ No newline at end of file diff --git a/srcpkgs/libwayland-egl b/srcpkgs/libwayland-egl index 8bf5fbea217..5ef01dc565e 120000 --- a/srcpkgs/libwayland-egl +++ b/srcpkgs/libwayland-egl @@ -1 +1 @@ -MesaLib \ No newline at end of file +libGL \ No newline at end of file diff --git a/srcpkgs/libxatracker b/srcpkgs/libxatracker index 8bf5fbea217..5ef01dc565e 120000 --- a/srcpkgs/libxatracker +++ b/srcpkgs/libxatracker @@ -1 +1 @@ -MesaLib \ No newline at end of file +libGL \ No newline at end of file diff --git a/srcpkgs/mesa-ati-dri b/srcpkgs/mesa-ati-dri index 8bf5fbea217..5ef01dc565e 120000 --- a/srcpkgs/mesa-ati-dri +++ b/srcpkgs/mesa-ati-dri @@ -1 +1 @@ -MesaLib \ No newline at end of file +libGL \ No newline at end of file diff --git a/srcpkgs/mesa-intel-dri b/srcpkgs/mesa-intel-dri index 8bf5fbea217..5ef01dc565e 120000 --- a/srcpkgs/mesa-intel-dri +++ b/srcpkgs/mesa-intel-dri @@ -1 +1 @@ -MesaLib \ No newline at end of file +libGL \ No newline at end of file diff --git a/srcpkgs/mesa-nouveau-dri b/srcpkgs/mesa-nouveau-dri index 8bf5fbea217..5ef01dc565e 120000 --- a/srcpkgs/mesa-nouveau-dri +++ b/srcpkgs/mesa-nouveau-dri @@ -1 +1 @@ -MesaLib \ No newline at end of file +libGL \ No newline at end of file diff --git a/srcpkgs/mesa-opencl b/srcpkgs/mesa-opencl index 8bf5fbea217..5ef01dc565e 120000 --- a/srcpkgs/mesa-opencl +++ b/srcpkgs/mesa-opencl @@ -1 +1 @@ -MesaLib \ No newline at end of file +libGL \ No newline at end of file diff --git a/srcpkgs/mesa-swraster-dri b/srcpkgs/mesa-swraster-dri deleted file mode 120000 index 8bf5fbea217..00000000000 --- a/srcpkgs/mesa-swraster-dri +++ /dev/null @@ -1 +0,0 @@ -MesaLib \ No newline at end of file diff --git a/srcpkgs/mesa-vmwgfx-dri b/srcpkgs/mesa-vmwgfx-dri index 8bf5fbea217..5ef01dc565e 120000 --- a/srcpkgs/mesa-vmwgfx-dri +++ b/srcpkgs/mesa-vmwgfx-dri @@ -1 +1 @@ -MesaLib \ No newline at end of file +libGL \ No newline at end of file