From 58cf436418c3f44b1ee210a2347a336f2c8e555a Mon Sep 17 00:00:00 2001 From: Duncaen Date: Thu, 4 Aug 2016 15:56:46 +0200 Subject: [PATCH] libmill: update to 1.14. --- common/shlibs | 2 +- srcpkgs/libmill/patches/macro.patch | 19 +++++++++++++++++++ srcpkgs/libmill/template | 11 +++-------- 3 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/libmill/patches/macro.patch diff --git a/common/shlibs b/common/shlibs index ce2eb22a39f..92642ab8327 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2354,7 +2354,7 @@ libjim.so.0.76 jimtcl-0.76_2 libftdi1.so.2 libftdi1-1.2_1 libax25.so.0 libax25-0.0.12rc4_1 libax25io.so.0 libax25-0.0.12rc4_1 -libmill.so.17 libmill-1.13_1 +libmill.so.18 libmill-1.14_1 libges-1.0.so.0 gst1-editing-services-1.6.2_1 libges-0.10.so.0 gst-editing-services-0.10.1_1 libykneomgr.so.0 libykneomgr-0.1.8_1 diff --git a/srcpkgs/libmill/patches/macro.patch b/srcpkgs/libmill/patches/macro.patch new file mode 100644 index 00000000000..53efe1675c5 --- /dev/null +++ b/srcpkgs/libmill/patches/macro.patch @@ -0,0 +1,19 @@ +commit e9f88d39dad81b3dd25314e34fa0063aef0be59b +Author: Duncaen +Date: Thu Aug 4 15:50:07 2016 +0200 + + Fix mill_longjmp_ macro for other architectures than x86_64 + +diff --git libmill.h libmill.h +index b6d7f61..083985d 100644 +--- libmill.h ++++ libmill.h +@@ -191,7 +191,7 @@ MILL_EXPORT void mill_setcls_( + #else + #define mill_setjmp_(ctx) \ + sigsetjmp(*ctx, 0) +-#define mill_longjmp_(ctx, 1) \ ++#define mill_longjmp_(ctx) \ + siglongjmp(*ctx, 1) + #endif + diff --git a/srcpkgs/libmill/template b/srcpkgs/libmill/template index ffe16f0832a..0021b31d345 100644 --- a/srcpkgs/libmill/template +++ b/srcpkgs/libmill/template @@ -1,6 +1,6 @@ # Template file for 'libmill' pkgname=libmill -version=1.13 +version=1.14 revision=1 build_style=gnu-configure hostmakedepends="automake libtool" @@ -9,17 +9,12 @@ maintainer="Duncaen " license="MIT" homepage="http://libmill.org/" distfiles="https://github.com/sustrik/libmill/archive/${version}.tar.gz" -checksum=8b27c819d5d850d9f770ce28f4ddcd89895799f96ca9d1a6e0f8a6fecb79e257 +checksum=d5f03137d5ff644281ae2c3d1d928097a0dd2b711c2d70a055f562a8b4e640b8 pre_configure() { + export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=?/}" autoreconf -fi } - -do_configure() { - export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=?/}" - ./configure ${configure_args} -} - post_install() { vlicense COPYING }