On Mar 13 13:08:09, j...@wxcvbn.org wrote:
> On Sun, Mar 11 2018, Jan Stary <h...@stare.cz> wrote:
> > This updates libsndfile to 1.0.28, the latest release.
> > Sorry for being so late; thanks to naddy@ for the nudge.
> >
> > * Add explicit ./configure --options (in --help order)
>
> Not ok with me, please see below.
Tweaked diff below; the -Wvla patch too, for completeness.
> > -CONFIGURE_ARGS= --disable-alsa \
> > +CONFIGURE_ARGS= --enable-option-checking \
> > + --disable-silent-rules \
> > + --disable-experimental \
> > + --disable-werror \
> > + --disable-cpu-clip \
> > + --disable-sqlite \
> > + --disable-alsa \
> > + --enable-external-libs \
> > --disable-octave \
> > - --disable-sqlite
> > + --enable-largefile \
>
> At least --enable-option-checking --disable-silent-rules
> and --enable-largefile are generic autoconf options, we should *not*
> have to specify them.
Are they on by default (in autoconf, in OpenBSD ports)?
I dropped them from the diff.
> --disable-alsa doesn't affect us, we have no alsa
> implementation in base or ports.
The point of adding this is to explicitly say we don't want it.
I don't expect ALSA to appear in OpenBSD ports of course,
but what's the problem with having the explicit option?
(audio/sox does the same with all audio drivers.)
> I'm not sure there's a point to
> overspecify options that upstream will probably not toggle, such
> as --disable-experimental, --disable-cpu-clip, --enable-external-libs.
I don't think it's overspecification.
Do we want FLACC, OGG, etc? Yes we do.
Therefore, --enable-external-libs
and similarly for others.
> --disable-werror I could understand, -Werror is a common source of
> gratuitous breakage in bulks.
Yes.
Slightly tweaked diff follows.
Jan
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/libsndfile/Makefile,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 Makefile
--- Makefile 7 Nov 2016 21:52:53 -0000 1.31
+++ Makefile 18 Mar 2018 11:43:43 -0000
@@ -2,11 +2,11 @@
COMMENT= library to handle various audio file formats
-DISTNAME= libsndfile-1.0.27
+DISTNAME= libsndfile-1.0.28
CATEGORIES= audio
HOMEPAGE= http://www.mega-nerd.com/libsndfile/
MAINTAINER= Jan Stary <h...@stare.cz>
-SHARED_LIBS += sndfile 5.0 # .1.27
+SHARED_LIBS += sndfile 6.0 # .1.28
# LGPLv2.1
PERMIT_PACKAGE_CDROM= Yes
@@ -16,9 +16,14 @@ MASTER_SITES= ${HOMEPAGE}files/
WANTLIB= c m sndio FLAC ogg vorbis vorbisenc
CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS= --disable-alsa \
- --disable-octave \
- --disable-sqlite
+CONFIGURE_ARGS= --disable-experimental \
+ --disable-werror \
+ --disable-cpu-clip \
+ --disable-sqlite \
+ --enable-external-libs \
+ --disable-octave
+
+CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include"
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/Cfg
LIB_DEPENDS= audio/flac \
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure 18 Mar 2018 11:43:43 -0000
@@ -0,0 +1,14 @@
+On some systems, the compiler cannot -Wvla
+
+Index: configure
+--- configure.orig
++++ configure
+@@ -20828,7 +20828,7 @@ rm -f core conftest.err conftest.$ac_objext \
+ common_flags="-Wcast-align -Wcast-qual -Wshadow -Wwrite-strings -Wundef
-Wuninitialized -Winit-self"
+
+ # -Winline -Wconversion "
+- CFLAGS="$CFLAGS $common_flags -Wbad-function-cast -Wnested-externs
-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
-Waggregate-return -Wvla"
++ CFLAGS="$CFLAGS $common_flags -Wbad-function-cast -Wnested-externs
-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
-Waggregate-return"
+ CXXFLAGS="$CXXFLAGS $common_flags -Wctor-dtor-privacy
-Wnon-virtual-dtor -Woverloaded-virtual -Wreorder -Wsign-promo"
+
+ if test "x$enable_gcc_opt" = "xno" ; then
