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.

Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/wavpack/Makefile,v
retrieving revision 1.22
diff -p -u -r1.22 Makefile
--- Makefile    1 Feb 2017 22:06:14 -0000       1.22
+++ Makefile    14 May 2017 23:42:25 -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,9 @@ CONFIGURE_ENV =               CPPFLAGS="-I${LOCALBASE
                        LDFLAGS="-L${LOCALBASE}/lib"
 
 DOCDIR =               ${PREFIX}/share/doc/wavpack
+
+pre-configure:
+       sed -i 's,#include "md5.h",#include <md5.h>,' ${WRKSRC}/cli/*.c
 
 post-install:
        ${INSTALL_DATA_DIR} ${DOCDIR}
Index: patches/patch-cli_Makefile_in
===================================================================
RCS file: patches/patch-cli_Makefile_in
diff -N patches/patch-cli_Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-cli_Makefile_in       14 May 2017 23:42:25 -0000
@@ -0,0 +1,33 @@
+$OpenBSD$
+
+Index: cli/Makefile.in
+--- cli/Makefile.in.orig
++++ cli/Makefile.in
+@@ -107,7 +107,7 @@ am__wavpack_SOURCES_DIST = wavpack.c riff.c wave64.c c
+ am_wavpack_OBJECTS = wavpack-wavpack.$(OBJEXT) wavpack-riff.$(OBJEXT) \
+       wavpack-wave64.$(OBJEXT) wavpack-caff.$(OBJEXT) \
+       wavpack-dsdiff.$(OBJEXT) wavpack-dsf.$(OBJEXT) \
+-      wavpack-utils.$(OBJEXT) wavpack-md5.$(OBJEXT) \
++      wavpack-utils.$(OBJEXT) \
+       wavpack-import_id3.$(OBJEXT) $(am__objects_1)
+ wavpack_OBJECTS = $(am_wavpack_OBJECTS)
+ am__DEPENDENCIES_1 =
+@@ -144,8 +144,7 @@ wvtag_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTO
+       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(wvtag_CFLAGS) $(CFLAGS) \
+       $(wvtag_LDFLAGS) $(LDFLAGS) -o $@
+ am__wvtest_SOURCES_DIST = wvtest.c md5.c
+-@ENABLE_TESTS_TRUE@am_wvtest_OBJECTS = wvtest-wvtest.$(OBJEXT) \
+-@ENABLE_TESTS_TRUE@   wvtest-md5.$(OBJEXT)
++@ENABLE_TESTS_TRUE@am_wvtest_OBJECTS = wvtest-wvtest.$(OBJEXT)
+ wvtest_OBJECTS = $(am_wvtest_OBJECTS)
+ @ENABLE_TESTS_TRUE@wvtest_DEPENDENCIES =  \
+ @ENABLE_TESTS_TRUE@   $(top_builddir)/src/.libs/libwavpack.la \
+@@ -161,7 +160,7 @@ am_wvunpack_OBJECTS = wvunpack-wvunpack.$(OBJEXT) \
+       wvunpack-riff.$(OBJEXT) wvunpack-wave64.$(OBJEXT) \
+       wvunpack-caff.$(OBJEXT) wvunpack-dsdiff.$(OBJEXT) \
+       wvunpack-dsf.$(OBJEXT) wvunpack-utils.$(OBJEXT) \
+-      wvunpack-md5.$(OBJEXT) $(am__objects_4)
++      $(am__objects_4)
+ wvunpack_OBJECTS = $(am_wvunpack_OBJECTS)
+ wvunpack_DEPENDENCIES = $(top_builddir)/src/.libs/libwavpack.la \
+       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

Reply via email to