On Fri, Jun 14, 2019 at 04:38:34PM +0100, Stuart Henderson wrote:
> On 2019/06/14 13:16, Raphael Graf wrote:
> > The change history is listed on this page:
> > https://soundtouch.surina.net/README.html
> >
> > Some of the changes look interesing, for example:
> > - Fixed potential buffer overwrite bugs in WavFile routines.
> > - Rewrote Beats-per-Minute analysis algorithm for more reliable BPM
> > detection
> > - Fixed issue that added brief sequence of silence to beginning of output
> > audio
> >
> > I have compile-tested the following ports:
> > - audio/audacity
> > - emulators/citra
> > - emulators/desmume
> > - multimedia/gstreamer-0.10/plugins-bad
> > - multimedia/gstreamer1/plugins-bad
> >
> > It works fine on amd64 and macppc.
> >
> > Any comments or ok?
> >
>
> The patched files have MS-DOS line endings, could you fix those up in
> post-extract and regen patches please? Here is one method:
>
> post-extract:
> @cd ${WRKSRC} && perl -i -pe 's/\r$$//' [whatever files]
>
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/audio/soundtouch/Makefile,v
> > retrieving revision 1.24
> > diff -u -p -u -p -r1.24 Makefile
> > --- Makefile 24 Oct 2018 14:27:58 -0000 1.24
> > +++ Makefile 14 Jun 2019 11:07:44 -0000
> > @@ -2,17 +2,17 @@
> >
> > COMMENT= tempo/pitch audio processing library
> >
> > -DISTNAME= soundtouch-1.9.2
> > -SHARED_LIBS += SoundTouch 3.0 # .0.0
> > +V= 2.1.2
> > +DISTNAME= soundtouch-${V}
> > +SHARED_LIBS= SoundTouch 4.0
> > CATEGORIES= audio devel
> > -REVISION = 3
> >
> > -HOMEPAGE= http://www.surina.net/soundtouch/
> > +HOMEPAGE= https://www.surina.net/soundtouch/
> >
> > # LGPLv2.1+
> > PERMIT_PACKAGE_CDROM= Yes
> >
> > -MASTER_SITES= ${HOMEPAGE}
> > +MASTER_SITES= https://gitlab.com/soundtouch/soundtouch/-/archive/${V}/
> >
> > WANTLIB= c m ${COMPILER_LIBCXX}
> >
> > @@ -22,10 +22,8 @@ BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS
> > ${MODGNU_AUTOMAKE_DEPENDS} \
> > devel/libtool
> >
> > -WRKDIST= ${WRKDIR}/soundtouch
> > -
> > -AUTOCONF_VERSION=2.61
> > -AUTOMAKE_VERSION=1.9
> > +AUTOCONF_VERSION=2.69
> > +AUTOMAKE_VERSION=1.16
> >
> > CONFIGURE_STYLE=gnu
> > CONFIGURE_ARGS= --disable-x86-optimizations
> > @@ -36,10 +34,11 @@ MAKE_FLAGS= AUTOCONF_VERSION=${AUTOCONF_
> >
> > pre-configure:
> > cd ${WRKSRC} && \
> > - touch NEWS README AUTHORS ChangeLog && \
> > AUTOCONF_VERSION=${AUTOCONF_VERSION} \
> > AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
> > PATH=${PORTPATH} \
> > ./bootstrap
>
> this can be tidied now;
>
> CONFIGURE_STYLE= autoreconf
> AUTORECONF= ./bootstrap
>
> and remove BUILD_DEPENDS and the AUTOxxxx_VERSION bits from MAKE_FLAGS.
>
> > +NO_TEST= Yes
>
> please zap the NO_TEST, that is for "there are no tests and it fails
> if you try to run them", but in this case removing the line just does
>
> $ make test
> ===> Regression tests for soundtouch-2.1.2
> Making check in include
> Making check in source
> Making check in SoundTouch
> Making check in SoundStretch
>
> which is fine.
>
Thanks for the comments!
Your proposed changes are applied in the new diff below.
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/soundtouch/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- Makefile 24 Oct 2018 14:27:58 -0000 1.24
+++ Makefile 14 Jun 2019 16:40:51 -0000
@@ -2,44 +2,34 @@
COMMENT= tempo/pitch audio processing library
-DISTNAME= soundtouch-1.9.2
-SHARED_LIBS += SoundTouch 3.0 # .0.0
+V= 2.1.2
+DISTNAME= soundtouch-${V}
+SHARED_LIBS= SoundTouch 4.0
CATEGORIES= audio devel
-REVISION = 3
-HOMEPAGE= http://www.surina.net/soundtouch/
+HOMEPAGE= https://www.surina.net/soundtouch/
# LGPLv2.1+
PERMIT_PACKAGE_CDROM= Yes
-MASTER_SITES= ${HOMEPAGE}
+MASTER_SITES= https://gitlab.com/soundtouch/soundtouch/-/archive/${V}/
WANTLIB= c m ${COMPILER_LIBCXX}
COMPILER = base-clang ports-gcc base-gcc
-BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
- ${MODGNU_AUTOMAKE_DEPENDS} \
- devel/libtool
+AUTOCONF_VERSION=2.69
+AUTOMAKE_VERSION=1.16
-WRKDIST= ${WRKDIR}/soundtouch
+CONFIGURE_STYLE=autoreconf
+CONFIGURE_ARGS= --disable-x86-optimizations
+AUTORECONF= ./bootstrap
-AUTOCONF_VERSION=2.61
-AUTOMAKE_VERSION=1.9
+MAKE_FLAGS= CXXFLAGS="${CXXFLAGS}"
-CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS= --disable-x86-optimizations
+post-extract:
+ @cd ${WRKSRC} && perl -i -pe 's/\r$$//' \
+ source/SoundStretch/Makefile.am source/SoundTouch/Makefile.am
-MAKE_FLAGS= AUTOCONF_VERSION=${AUTOCONF_VERSION} \
- AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
- CXXFLAGS="${CXXFLAGS}"
-
-pre-configure:
- cd ${WRKSRC} && \
- touch NEWS README AUTHORS ChangeLog && \
- AUTOCONF_VERSION=${AUTOCONF_VERSION} \
- AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
- PATH=${PORTPATH} \
- ./bootstrap
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/soundtouch/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo 3 Jan 2016 21:20:04 -0000 1.5
+++ distinfo 14 Jun 2019 16:40:51 -0000
@@ -1,2 +1,2 @@
-SHA256 (soundtouch-1.9.2.tar.gz) = yuuGUR6BQg7rRUy121P1bZa4RR032Jr25VsS602hxRM=
-SIZE (soundtouch-1.9.2.tar.gz) = 171369
+SHA256 (soundtouch-2.1.2.tar.gz) = KCYEni8077xMikfQDJNkmCKwwU4fKfVWmDVwSBRZBzI=
+SIZE (soundtouch-2.1.2.tar.gz) = 522003
Index: patches/patch-Makefile_am
===================================================================
RCS file: /cvs/ports/audio/soundtouch/patches/patch-Makefile_am,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-Makefile_am
--- patches/patch-Makefile_am 7 Jul 2015 09:29:37 -0000 1.5
+++ patches/patch-Makefile_am 14 Jun 2019 16:40:51 -0000
@@ -1,6 +1,9 @@
---- Makefile.am.orig Mon May 18 11:57:14 2015
-+++ Makefile.am Sun Jun 28 08:03:14 2015
-@@ -27,10 +27,11 @@ include $(top_srcdir)/config/am_include.mk
+$OpenBSD$
+
+Index: Makefile.am
+--- Makefile.am.orig
++++ Makefile.am
+@@ -23,10 +23,11 @@ include $(top_srcdir)/config/am_include.mk
SUBDIRS=include source
# list files that are documentation to be packaged in a release tarball and
installed
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- patches/patch-configure_ac 3 Jan 2016 21:20:04 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- configure.ac.orig Sun Sep 20 00:40:59 2015
-+++ configure.ac Sun Dec 27 03:53:30 2015
-@@ -28,7 +28,7 @@ AC_CONFIG_AUX_DIR(config)
- AC_CONFIG_MACRO_DIR([config/m4])
- AM_CONFIG_HEADER([config.h include/soundtouch_config.h])
- AM_INIT_AUTOMAKE
--AM_SILENT_RULES([yes])
-+m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
- #AC_DISABLE_SHARED dnl This makes libtool only build static libs
- AC_DISABLE_STATIC dnl This makes libtool only build shared libs
- #AC_GNU_SOURCE dnl enable posix extensions in glibc
Index: patches/patch-source_SoundStretch_Makefile_am
===================================================================
RCS file:
/cvs/ports/audio/soundtouch/patches/patch-source_SoundStretch_Makefile_am,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-source_SoundStretch_Makefile_am
--- patches/patch-source_SoundStretch_Makefile_am 7 Jul 2015 09:29:37
-0000 1.1
+++ patches/patch-source_SoundStretch_Makefile_am 14 Jun 2019 16:40:51
-0000
@@ -1,11 +1,14 @@
---- source/SoundStretch/Makefile.am.orig Sat Jul 4 10:00:23 2015
-+++ source/SoundStretch/Makefile.am Sat Jul 4 10:02:15 2015
-@@ -48,7 +48,7 @@ soundstretch_LDADD=../SoundTouch/libSoundTouch.la -lm
- #soundstretch_LDFLAGS=-s
-
- ## additional compiler flags
--soundstretch_CXXFLAGS=-O3 $(AM_CXXFLAGS)
-+soundstretch_CXXFLAGS=$(AM_CXXFLAGS)
-
- #clean-local:
- # -rm -f additional-files-to-remove-on-make-clean
+$OpenBSD$
+
+Index: source/SoundStretch/Makefile.am
+--- source/SoundStretch/Makefile.am.orig
++++ source/SoundStretch/Makefile.am
+@@ -44,7 +44,7 @@ soundstretch_LDADD=../SoundTouch/libSoundTouch.la -lm
+ #soundstretch_LDFLAGS=-s
+
+ ## additional compiler flags
+-soundstretch_CXXFLAGS=-O3 $(AM_CXXFLAGS)
++soundstretch_CXXFLAGS=$(AM_CXXFLAGS)
+
+ #clean-local:
+ # -rm -f additional-files-to-remove-on-make-clean
Index: patches/patch-source_SoundTouch_Makefile_am
===================================================================
RCS file:
/cvs/ports/audio/soundtouch/patches/patch-source_SoundTouch_Makefile_am,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-source_SoundTouch_Makefile_am
--- patches/patch-source_SoundTouch_Makefile_am 3 Jan 2016 21:20:04 -0000
1.6
+++ patches/patch-source_SoundTouch_Makefile_am 14 Jun 2019 16:40:51 -0000
@@ -1,17 +1,20 @@
---- source/SoundTouch/Makefile.am.orig Sun Sep 20 09:40:59 2015
-+++ source/SoundTouch/Makefile.am Tue Dec 29 22:50:08 2015
-@@ -34,7 +34,7 @@ libSoundTouch_la_SOURCES=AAFilter.cpp FIRFilter.cpp FI
- InterpolateShannon.cpp
-
- # Compiler flags
--AM_CXXFLAGS+=-O3
-+AM_CXXFLAGS+=
-
- # Compile the files that need MMX and SSE individually.
- libSoundTouch_la_LIBADD=libSoundTouchMMX.la libSoundTouchSSE.la
-@@ -72,4 +72,4 @@ libSoundTouch_la_LDFLAGS=-version-info @LIB_SONAME@
+$OpenBSD$
+
+Index: source/SoundTouch/Makefile.am
+--- source/SoundTouch/Makefile.am.orig
++++ source/SoundTouch/Makefile.am
+@@ -33,7 +33,7 @@ libSoundTouch_la_SOURCES=AAFilter.cpp FIRFilter.cpp FI
+ InterpolateShannon.cpp
+
+ # Compiler flags
+-AM_CXXFLAGS+=-O3
++AM_CXXFLAGS+=
+
+ # Compile the files that need MMX and SSE individually.
+ libSoundTouch_la_LIBADD=libSoundTouchMMX.la libSoundTouchSSE.la
+@@ -71,4 +71,4 @@ libSoundTouch_la_LDFLAGS=-version-info @LIB_SONAME@
# noinst_LTLIBRARIES = libSoundTouchOpt.la
- # libSoundTouch_la_LIBADD = libSoundTouchOpt.la
- # libSoundTouchOpt_la_SOURCES = mmx_optimized.cpp sse_optimized.cpp
--# libSoundTouchOpt_la_CXXFLAGS = -O3 -msse -fcheck-new -I../../include
-+# libSoundTouchOpt_la_CXXFLAGS = -msse -fcheck-new -I../../include
+ # libSoundTouch_la_LIBADD = libSoundTouchOpt.la
+ # libSoundTouchOpt_la_SOURCES = mmx_optimized.cpp sse_optimized.cpp
+-# libSoundTouchOpt_la_CXXFLAGS = -O3 -msse -fcheck-new -I../../include
++# libSoundTouchOpt_la_CXXFLAGS = -msse -fcheck-new -I../../include
