From 35189c0f80d0737e83f195db21ad4154599cacd1 Mon Sep 17 00:00:00 2001 From: cr6git Date: Thu, 25 Jan 2018 10:01:37 +0100 Subject: [PATCH] ddcutil: update to 0.8.6. Closes: #11068 [via git-merge-pr] --- srcpkgs/ddcutil/patches/musl.patch | 38 ------------------------------ srcpkgs/ddcutil/template | 12 ++++++++-- 2 files changed, 10 insertions(+), 40 deletions(-) diff --git a/srcpkgs/ddcutil/patches/musl.patch b/srcpkgs/ddcutil/patches/musl.patch index 1b6b93bf321..2e21b9eb370 100644 --- a/srcpkgs/ddcutil/patches/musl.patch +++ b/srcpkgs/ddcutil/patches/musl.patch @@ -1,41 +1,3 @@ ---- src/util/debug_util.c.orig 2017-11-16 07:13:16.000000000 +0100 -+++ src/util/debug_util.c 2017-11-18 21:39:20.788717791 +0100 -@@ -26,7 +26,10 @@ - */ - - /** \cond */ -+#include -+#ifdef __GLIBC__ - #include -+#endif - #include - #include - #include -@@ -89,16 +92,22 @@ - if (debug) - printf("(%s) Starting. stack_adjust = %d\n", __func__, stack_adjust); - -- int j, nptrs; -+ int j, nptrs = 0; -+#ifdef __GLIBC__ - const int MAX_ADDRS = 100; - void *buffer[MAX_ADDRS]; -- char **strings; -+#endif -+ char **strings = NULL; - -+#ifdef __GLIBC__ - nptrs = backtrace(buffer, MAX_ADDRS); -+#endif - if (debug) - printf("(%s) backtrace() returned %d addresses\n", __func__, nptrs); - -+#ifdef __GLIBC__ - strings = backtrace_symbols(buffer, nptrs); -+#endif - if (strings == NULL) { - perror("backtrace_symbols unavailable"); - } --- src/util/edid.h.orig 2017-11-16 07:13:16.000000000 +0100 +++ src/util/edid.h 2017-11-17 21:29:05.725854175 +0100 @@ -36,6 +36,7 @@ diff --git a/srcpkgs/ddcutil/template b/srcpkgs/ddcutil/template index 36f4f05f675..250b19db385 100644 --- a/srcpkgs/ddcutil/template +++ b/srcpkgs/ddcutil/template @@ -1,6 +1,6 @@ # Template file for 'ddcutil' pkgname=ddcutil -version=0.8.5 +version=0.8.6 revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" @@ -11,7 +11,15 @@ maintainer="cr6git " homepage="http://www.ddcutil.com" license="GPL-2" distfiles="https://github.com/rockowitz/ddcutil/archive/v${version}.tar.gz" -checksum=cb67719967ce813161a0f8a55fae1499e7d9d4c418820ad0930ef028e0fa66d5 +checksum=9c32dd346c8afd6b30713c557773e5b756a09d0d8d62e3ea207f658ff59c50c6 + +case "$XBPS_TARGET_MACHINE" in + *-musl) makedepends+=" libexecinfo-devel" + post_extract() { + sed -i -e "/AM_CFLAGS += -Wpedantic/d" src/app_sysenv/Makefile.am + } + ;; +esac pre_configure() { NOCONFIGURE=1 ./autogen.sh