From 8de62b0292c911f56210ccd609ef35966cb19226 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Wed, 28 Feb 2018 07:17:09 -0300 Subject: [PATCH] libepoxy: update to 1.5.0. Closes: #11988 [via git-merge-pr] --- srcpkgs/libepoxy/patches/fix-test-musl.patch | 38 ++++++++++++++++++++ srcpkgs/libepoxy/template | 15 ++++---- 2 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/libepoxy/patches/fix-test-musl.patch diff --git a/srcpkgs/libepoxy/patches/fix-test-musl.patch b/srcpkgs/libepoxy/patches/fix-test-musl.patch new file mode 100644 index 00000000000..823fb599454 --- /dev/null +++ b/srcpkgs/libepoxy/patches/fix-test-musl.patch @@ -0,0 +1,38 @@ +Source: OpenEmbedded +Upstream: No +Reason: Fixes musl compilation + +--- meson_options.txt ++++ meson_options.txt +@@ -1,6 +1,9 @@ + option('docs', + type: 'boolean', value: false, + description: 'Enable generating the Epoxy API reference (depends on Doxygen)') ++option('has-dlvsym', ++ type: 'boolean', value: true, ++ description: 'Whether dlvsym() is available (it is not when using musl C library)') + option('glx', + type: 'combo', + choices: [ 'auto', 'yes', 'no' ], +--- test/meson.build ++++ test/meson.build +@@ -92,8 +92,8 @@ if build_glx + [ 'glx_has_extension_nocontext', [ 'glx_has_extension_nocontext.c' ], [], [], true ], + [ 'glx_static', [ 'glx_static.c' ], [ '-DNEEDS_TO_BE_STATIC'], [ '-static' ], libtype == 'static' ], + [ 'glx_shared_znow', [ 'glx_static.c', ], [], [ '-Wl,-z,now' ], has_znow ], +- [ 'glx_alias_prefer_same_name', [ 'glx_alias_prefer_same_name.c', 'dlwrap.c', 'dlwrap.h' ], [], [ '-rdynamic' ], not build_apple ], +- [ 'glx_gles2', [ 'glx_gles2.c', 'dlwrap.c', 'dlwrap.h' ], [], [ '-rdynamic' ], not build_apple ], ++ [ 'glx_alias_prefer_same_name', [ 'glx_alias_prefer_same_name.c', 'dlwrap.c', 'dlwrap.h' ], [], [ '-rdynamic' ], not build_apple and get_option('has-dlvsym') == true ], ++ [ 'glx_gles2', [ 'glx_gles2.c', 'dlwrap.c', 'dlwrap.h' ], [], [ '-rdynamic' ], not build_apple and get_option('has-dlvsym') == true ], + ] + + foreach test: glx_tests +@@ -114,7 +114,7 @@ if build_glx + endif + endforeach + +- if not build_apple ++ if not build_apple and get_option('has-dlvsym') == true + # GLX/EGL tests + if build_egl + glx_egl_sources = [ diff --git a/srcpkgs/libepoxy/template b/srcpkgs/libepoxy/template index d9baaff3cf5..7ca3f4a9ffb 100644 --- a/srcpkgs/libepoxy/template +++ b/srcpkgs/libepoxy/template @@ -1,20 +1,21 @@ # Template file for 'libepoxy' pkgname=libepoxy -version=1.4.3 +version=1.5.0 revision=1 -build_style=gnu-configure -hostmakedepends="automake libtool pkg-config python xorg-util-macros" +build_style=meson +hostmakedepends="pkg-config python xorg-util-macros" makedepends="libX11-devel MesaLib-devel" short_desc="Library for handling OpenGL function pointer management for you" maintainer="Juan RP " license="MIT" homepage="https://github.com/anholt/libepoxy" distfiles="https://github.com/anholt/libepoxy/archive/${version}.tar.gz" -checksum=7f18518ba0036f7670f837a510bb25be4b3e7fba97d75193b24f7220de55b515 +checksum=76c18bf8a8c48c804f4ce64f533c6631b3b19357735bf0b2f6fb4abe752fd2e9 + +case "$XBPS_TARGET_MACHINE" in + *-musl) configure_args+=" -Dhas-dlvsym=false" ;; +esac -pre_configure() { - autoreconf -fi -} post_install() { vlicense COPYING }