diff --git a/srcpkgs/libGL/patches/remove-libpthread-stubs.patch b/srcpkgs/libGL/patches/remove-libpthread-stubs.patch new file mode 100644 index 00000000000..d02d97087ed --- /dev/null +++ b/srcpkgs/libGL/patches/remove-libpthread-stubs.patch @@ -0,0 +1,13 @@ +--- configure.ac 2016-05-25 15:37:44.191643017 +0200 ++++ configure.ac 2016-05-25 15:42:20.861654709 +0200 +@@ -813,10 +813,6 @@ + dnl pkgconfig files. + test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread" + +-PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs) +-AC_SUBST(PTHREADSTUBS_CFLAGS) +-AC_SUBST(PTHREADSTUBS_LIBS) +- + dnl SELinux awareness. + AC_ARG_ENABLE([selinux], + [AS_HELP_STRING([--enable-selinux], diff --git a/srcpkgs/libGL/template b/srcpkgs/libGL/template index 3339d06b37b..babef9d5215 100644 --- a/srcpkgs/libGL/template +++ b/srcpkgs/libGL/template @@ -1,7 +1,7 @@ # Template build file for 'libGL'. pkgname=libGL -version=11.2.2 -revision=2 +version=12.0.1 +revision=1 wrksrc="mesa-${version}" build_style=gnu-configure configure_args="--enable-shared-glapi --enable-gbm @@ -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}/mesa-${version}.tar.xz" -checksum=40e148812388ec7c6d7b6657d5a16e2e8dabba8b97ddfceea5197947647bdfb4 +distfiles="https://mesa.freedesktop.org/archive/${version}/mesa-${version}.tar.xz" +checksum=bab24fb79f78c876073527f515ed871fc9c81d816f66c8a0b051d8d653896389 hostmakedepends=" automake libtool flex pkg-config llvm python-Mako libxml2-python wayland-devel" @@ -27,6 +27,7 @@ conf_files="/etc/drirc" # Set subpackages manually to set proper rdeps in 32bit pkgs. subpackages="libglapi libgbm libEGL libGLES libOSMesa libwayland-egl" +# XXX intel vulkan support: vulkan-icd-loader needs to be packaged. case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) # Enable all x86 drivers. @@ -72,20 +73,9 @@ pre_configure() { libtoolize -f NOCONFIGURE=1 ./autogen.sh } - post_install() { vmkdir usr/lib/xorg/modules/extensions ln -s libglx-xorg.so ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx.so - case "$XBPS_TARGET_MACHINE" in - i686*|x86_64*) - for f in r200 r300 r600 radeonsi svga nouveau; do - ln -s gallium_drv_video.so ${DESTDIR}/usr/lib/dri/${f}_drv_video.so - done - ;; - armv[67]l*) - ln -s gallium_drv_video.so ${DESTDIR}/usr/lib/dri/vc4_drv_video.so - ;; - esac } libglapi_package() { @@ -183,7 +173,6 @@ mesa-vmwgfx-dri_package() { pkg_install() { vmove "usr/lib/xorg/modules/drivers/vmwgfx*" vmove usr/lib/gallium-pipe/pipe_vmwgfx.so - vmove usr/lib/dri/svga* } } mesa-vc4-dri_package() {