From 6c100caa1b942be01250a3ff060921ca3ee2fc8c Mon Sep 17 00:00:00 2001 From: maxice8 Date: Wed, 25 Apr 2018 11:17:03 -0300 Subject: [PATCH] libepoxy: update to 1.5.1. Closes: #13844 [via git-merge-pr] --- srcpkgs/libepoxy/patches/fix-test-musl.patch | 38 -------------------- srcpkgs/libepoxy/template | 8 ++--- 2 files changed, 4 insertions(+), 42 deletions(-) delete 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 deleted file mode 100644 index 823fb59945..0000000000 --- a/srcpkgs/libepoxy/patches/fix-test-musl.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 7ca3f4a9ff..e4de297cc0 100644 --- a/srcpkgs/libepoxy/template +++ b/srcpkgs/libepoxy/template @@ -1,16 +1,16 @@ # Template file for 'libepoxy' pkgname=libepoxy -version=1.5.0 +version=1.5.1 revision=1 build_style=meson hostmakedepends="pkg-config python xorg-util-macros" -makedepends="libX11-devel MesaLib-devel" +makedepends="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=76c18bf8a8c48c804f4ce64f533c6631b3b19357735bf0b2f6fb4abe752fd2e9 +checksum=f53a35db484341c0a77f1bb0eb04cc9389e3049d2437bcf5915a1cebd2c04ff7 case "$XBPS_TARGET_MACHINE" in *-musl) configure_args+=" -Dhas-dlvsym=false" ;; @@ -25,7 +25,7 @@ libepoxy-devel_package() { depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib/*.so + vmove "usr/lib/*.so" vmove usr/lib/pkgconfig } }