On Thu, May 14, 2020 at 06:19:48AM -0600, Frederic Cambus wrote:
> CVSROOT: /cvs
> Module name: ports
> Changes by: fcam...@cvs.openbsd.org 2020/05/14 06:19:48
>
> Modified files:
> audio/adplug : Makefile distinfo
> audio/adplug/patches: patch-Makefile_in
> patch-adplugdb_adplugdb_cpp
> audio/adplug/pkg: PLIST
> Removed files:
> audio/adplug/patches: patch-src_herad_cpp patch-src_herad_h
>
> Log message:
> Update adplug to 2.3.2.
This broke audio/adplay
===> adplay-1.8p1 depends on: bzip2-* -> bzip2-1.0.8
===> adplay-1.8p1 depends on: adplug-* -> adplug-2.3.2
===> adplay-1.8p1 depends on: libbinio-* -> libbinio-1.5
===> adplay-1.8p1 depends on: sdl2-* -> sdl2-2.0.12
===> Verifying specs: c++ c++abi pthread SDL2 adplug binio c m samplerate
sndio usbhid
===> found c++.4.0 c++abi.2.1 pthread.26.1 SDL2.0.8 adplug.2.0 binio.0.0
c.96.0 m.10.1 samplerate.2.1 sndio.7.1 usbhid.7.0
===> Checking files for adplay-1.8p1
`/hack/cvs/ports/distfiles/adplay-1.8.tar.bz2' is up to date.
>> (SHA256) adplay-1.8.tar.bz2: OK
===> Extracting for adplay-1.8p1
===> Patching for adplay-1.8p1
===> Applying OpenBSD patch patch-configure
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$OpenBSD: patch-configure,v 1.1 2018/04/26 10:16:46 fcambus Exp $
|
|Stop hardcoding -lstdc++.
|
|Index: configure
|--- configure.orig
|+++ configure
--------------------------
Patching file configure using Plan A...
Hunk #1 succeeded at 17017.
done
rm /hack/objdirs/pobj/adplay-1.8/adplay-1.8/src/getopt.h
===> Compiler link: clang -> /usr/bin/clang
===> Compiler link: clang++ -> /usr/bin/clang++
===> Compiler link: cc -> /usr/bin/cc
===> Compiler link: c++ -> /usr/bin/c++
===> Generating configure for adplay-1.8p1
===> Configuring for adplay-1.8p1
Using /hack/objdirs/pobj/adplay-1.8/config.site (generated)
configure: WARNING: unrecognized options: --disable-gtk-doc
configure: loading site script /hack/objdirs/pobj/adplay-1.8/config.site
checking build system type... x86_64-unknown-openbsd6.7
checking host system type... x86_64-unknown-openbsd6.7
checking target system type... x86_64-unknown-openbsd6.7
checking for a BSD-compatible install...
/hack/objdirs/pobj/adplay-1.8/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... mkdir -p
checking for gawk... (cached) awk
checking whether make sets $(MAKE)... (cached) yes
checking whether make supports nested variables... yes
checking how to print strings... print -r
checking for style of include used by make... GNU
checking for gcc... cc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... (cached) o
checking whether we are using the GNU C compiler... (cached) yes
checking whether cc accepts -g... (cached) yes
checking for cc option to accept ISO C89... none needed
checking whether cc understands -c and -o together... yes
checking dependency style of cc... gcc3
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for grep that handles long lines and -e... (cached) /usr/bin/grep
checking for egrep... (cached) /usr/bin/egrep
checking for fgrep... (cached) /usr/bin/fgrep
checking for ld used by cc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... (cached) 131072
checking how to convert x86_64-unknown-openbsd6.7 file names to
x86_64-unknown-openbsd6.7 format... func_convert_file_noop
checking how to convert x86_64-unknown-openbsd6.7 file names to toolchain
format... func_convert_file_noop
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... match_pattern
/lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$
checking for dlltool... no
checking how to associate runtime and link libraries... print -r --
checking for ar... (cached) ar
checking for archiver @FILE support... @
checking for strip... (cached) strip
checking for ranlib... (cached) ranlib
checking command to parse /usr/bin/nm -B output from cc object... ok
checking for sysroot... no
checking for a working dd... /bin/dd
checking how to truncate binary pipes... /bin/dd bs=4096 count=1
checking for mt... mt
checking if mt is a manifest tool... no
checking how to run the C preprocessor... cc -E
checking for ANSI C header files... (cached) yes
checking for sys/types.h... (cached) yes
checking for sys/stat.h... (cached) yes
checking for stdlib.h... (cached) yes
checking for string.h... (cached) yes
checking for memory.h... (cached) yes
checking for strings.h... (cached) yes
checking for inttypes.h... (cached) yes
checking for stdint.h... (cached) yes
checking for unistd.h... (cached) yes
checking for dlfcn.h... (cached) yes
checking for objdir... .libs
checking if cc supports -fno-rtti -fno-exceptions... yes
checking for cc option to produce PIC... -fPIC -DPIC
checking if cc PIC flag -fPIC -DPIC works... yes
checking if cc static flag -static works... yes
checking if cc supports -c -o file.o... yes
checking if cc supports -c -o file.o... (cached) yes
checking whether the cc linker (/usr/bin/ld) supports shared libraries... yes
checking whether -lc should be explicitly linked in... yes
checking dynamic linker characteristics... openbsd6.7 ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... yes
checking whether to build static libraries... yes
checking for gcc... (cached) cc
checking whether we are using the GNU C compiler... (cached) yes
checking whether cc accepts -g... (cached) yes
checking for cc option to accept ISO C89... (cached) none needed
checking whether cc understands -c and -o together... (cached) yes
checking dependency style of cc... (cached) gcc3
checking whether we are using the GNU C++ compiler... (cached) yes
checking whether c++ accepts -g... (cached) yes
checking dependency style of c++... gcc3
checking how to run the C++ preprocessor... c++ -E
checking for ld used by c++... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking whether the c++ linker (/usr/bin/ld) supports shared libraries... yes
checking for c++ option to produce PIC... -fPIC -DPIC
checking if c++ PIC flag -fPIC -DPIC works... yes
checking if c++ static flag -static works... yes
checking if c++ supports -c -o file.o... yes
checking if c++ supports -c -o file.o... (cached) yes
checking whether the c++ linker (/usr/bin/ld) supports shared libraries... yes
checking dynamic linker characteristics... openbsd6.7 ld.so
checking how to hardcode library paths into programs... immediate
checking how to run the C preprocessor... cc -E
checking how to run the C++ preprocessor... c++ -E
checking for pkg-config... /usr/bin/pkg-config
checking pkg-config is at least version 0.9.0... yes
checking for adplug >= 2.0... yes
checking for getopt.h... (cached) yes
checking whether AdPlug is linked correctly... yes
checking whether AdPlug supports the getsubsong() method... yes
checking whether AdPlug supports the surround/harmonic synth... yes
checking whether AdPlug supports the NukedOPL synth... yes
checking for QSA headers... not found -- QSA output disabled
checking for sdl2-config... /usr/local/bin/sdl2-config
checking for SDL - version >= 2.0.0... yes
checking that generated files are newer than configure... done
configure: creating ./config.status
config.status: creating Makefile
config.status: creating src/Makefile
config.status: creating doc/Makefile
config.status: creating src/config.h
config.status: executing depfiles commands
config.status: executing libtool commands
configure: WARNING: unrecognized options: --disable-gtk-doc
Configuration:
Install path: /usr/local
Build output mechanisms:
OSS output (oss): no
Null output (null): yes
Disk writer (disk): yes
EsounD output (esound): no
QSA output (qsa): no
SDL output (sdl): yes
ALSA output (alsa): no
Libao output (ao): no
SDL version: 2.0.12
===> Building for adplay-1.8p1
Making all in src
make all-am
c++ -DHAVE_CONFIG_H -I. -I/usr/local/include -I/usr/local/include/SDL2
-I/usr/X11R6/include -D_REENTRANT -I/usr/X11R6/include
-DADPLUG_DATA_DIR=\"/usr/local/com/adplug\" -O2 -pipe -I/usr/local/include
-I/usr/local/include/libbinio -MT adplay.o -MD -MP -MF .deps/adplay.Tpo -c -o
adplay.o adplay.cc
adplay.cc:410:17: error: no matching constructor for initialization of
'CSurroundopl'
opl = new CSurroundopl(a, b, cfg.bits == 16);
^ ~~~~~~~~~~~~~~~~~~~~
/usr/local/include/adplug/surroundopl.h:67:3: note: candidate constructor not
viable: no known conversion from 'Copl *' to 'COPLprops *' for 1st argument
CSurroundopl(COPLprops *a, COPLprops *b, bool output16bit);
^
/usr/local/include/adplug/surroundopl.h:51:7: note: candidate constructor (the
implicit copy constructor) not viable: requires 1 argument, but 3 were provided
class CSurroundopl: public Copl
^
adplay.cc:431:17: error: no matching constructor for initialization of
'CSurroundopl'
opl = new CSurroundopl(a, b, cfg.bits == 16);
^ ~~~~~~~~~~~~~~~~~~~~
/usr/local/include/adplug/surroundopl.h:67:3: note: candidate constructor not
viable: no known conversion from 'Copl *' to 'COPLprops *' for 1st argument
CSurroundopl(COPLprops *a, COPLprops *b, bool output16bit);
^
/usr/local/include/adplug/surroundopl.h:51:7: note: candidate constructor (the
implicit copy constructor) not viable: requires 1 argument, but 3 were provided
class CSurroundopl: public Copl
^
adplay.cc:448:17: error: no matching constructor for initialization of
'CSurroundopl'
opl = new CSurroundopl(a, b, cfg.bits == 16);
^ ~~~~~~~~~~~~~~~~~~~~
/usr/local/include/adplug/surroundopl.h:67:3: note: candidate constructor not
viable: no known conversion from 'Copl *' to 'COPLprops *' for 1st argument
CSurroundopl(COPLprops *a, COPLprops *b, bool output16bit);
^
/usr/local/include/adplug/surroundopl.h:51:7: note: candidate constructor (the
implicit copy constructor) not viable: requires 1 argument, but 3 were provided
class CSurroundopl: public Copl
^
3 errors generated.
*** Error 1 in src (Makefile:493 'adplay.o')
*** Error 2 in src (Makefile:351 'all')
*** Error 1 in /hack/objdirs/pobj/adplay-1.8/adplay-1.8 (Makefile:429
'all-recursive': @fail=; if (target_option=k; case ${target_option-} ...)
*** Error 2 in . (/hack/cvs/ports/infrastructure/mk/bsd.port.mk:2907
'/hack/objdirs/pobj/adplay-1.8/.build_done': @cd /hack/objdirs/pobj/adp...)
*** Error 2 in /usr/ports/audio/adplay
(/hack/cvs/ports/infrastructure/mk/bsd.port.mk:2573 'all': @lock=adplay-1.8p1;
export _LOCKS_HELD=" ...)
--
Antoine
