On 2017/05/15 02:23, Tim van der Molen wrote: > Tim van der Molen (2017-05-15 00:38 +0200): > > Graham Stephens (2017-05-14 23:57 +0200): > > > > On 2017/05/14 14:38, Graham Stephens wrote: > > > > > Tested and working/matching against JF's sample. > > > > > > > > Thanks. > > > > > > > > > Err... however - and I apologise for not thinking ahead and > > > > > mentioning it > > > > > earlier - but there's also a wvunpack program in the same package > > > > > (with the > > > > > opposite functionality). It was only when I came to test it against > > > > > itself > > > > > that I realised this might also be an issue. :( > > > > > > > > In theory my diff should have fixed both wavpack and wvunpack. > > > > > > > > > > I can see in the diff you sent that wavpack and wvunpack both have md5.c > > > removed from the sources, but alas wvunpack -m fails with the same error > > > that struck wavpack originally. > > > > Could you send a new backtrace please? > > It seems Juan Francisco has already found the problem. Please try this > diff.
Ah good catch, here's a cleaner diff, let's just patch the automake input files instead. Index: Makefile =================================================================== RCS file: /cvs/ports/audio/wavpack/Makefile,v retrieving revision 1.22 diff -u -p -r1.22 Makefile --- Makefile 1 Feb 2017 22:06:14 -0000 1.22 +++ Makefile 15 May 2017 08:14:32 -0000 @@ -3,6 +3,7 @@ COMMENT = audio codec for lossless, lossy and hybrid compression DISTNAME = wavpack-5.1.0 +REVISION = 0 CATEGORIES = audio HOMEPAGE = http://www.wavpack.com/ @@ -28,6 +29,17 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE LDFLAGS="-L${LOCALBASE}/lib" DOCDIR = ${PREFIX}/share/doc/wavpack + +BUILD_DEPENDS = devel/libtool \ + ${MODGNU_AUTOCONF_DEPENDS} \ + ${MODGNU_AUTOMAKE_DEPENDS} +AUTOMAKE_VERSION = 1.14 +AUTOCONF_VERSION = 2.69 + +pre-configure: + sed -i 's,#include "md5.h",#include <md5.h>,' ${WRKSRC}/cli/*.c + cd ${WRKSRC}; AUTOCONF_VERSION=${AUTOCONF_VERSION} \ + AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoreconf -fi post-install: ${INSTALL_DATA_DIR} ${DOCDIR} Index: patches/patch-cli_Makefile_am =================================================================== RCS file: patches/patch-cli_Makefile_am diff -N patches/patch-cli_Makefile_am --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-cli_Makefile_am 15 May 2017 08:14:32 -0000 @@ -0,0 +1,34 @@ +$OpenBSD$ + +Defer to libc's md5 functions, the internal version fails on +strict-alignment architectures. + +Index: cli/Makefile.am +--- cli/Makefile.am.orig ++++ cli/Makefile.am +@@ -1,6 +1,6 @@ + bin_PROGRAMS = wavpack wvunpack wvgain wvtag + +-wavpack_SOURCES = wavpack.c riff.c wave64.c caff.c dsdiff.c dsf.c utils.c md5.c import_id3.c ++wavpack_SOURCES = wavpack.c riff.c wave64.c caff.c dsdiff.c dsf.c utils.c import_id3.c + if WINDOWS_HOST + wavpack_SOURCES += win32_unicode_support.c + endif +@@ -10,7 +10,7 @@ wavpack_LDFLAGS = -rpath $(libdir) + endif + wavpack_LDADD = $(AM_LDADD) $(top_builddir)/src/.libs/libwavpack.la $(LIBM) $(ICONV_LIBS) + +-wvunpack_SOURCES = wvunpack.c riff.c wave64.c caff.c dsdiff.c dsf.c utils.c md5.c ++wvunpack_SOURCES = wvunpack.c riff.c wave64.c caff.c dsdiff.c dsf.c utils.c + if WINDOWS_HOST + wvunpack_SOURCES += win32_unicode_support.c + endif +@@ -42,7 +42,7 @@ wvtag_LDADD = $(AM_LDADD) $(top_builddir)/src/.libs/li + + if ENABLE_TESTS + bin_PROGRAMS += wvtest +-wvtest_SOURCES = wvtest.c md5.c ++wvtest_SOURCES = wvtest.c + wvtest_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include + if ENABLE_RPATH + wvtest_LDFLAGS = -rpath $(libdir)
