Sunday, September 27, 2020

Re: [sparc64] Fix missing LIB_DEPENDS (and WANTLIB) in games/scummvm

On Sun, Sep 27, 2020 at 08:17:00PM -0400, Kurt Mosiejczuk wrote:
> I had scummvm fail to build on the current sparc64 build because it couldn't
> find a52.h
>
> audio/decoders/ac3.cpp:34:10: fatal error: a52dec/a52.h: No such file or directo
> ry
> #include <a52dec/a52.h>
> ^~~~~~~~~~~~~~
> compilation terminated.
>
> The diff below adds audio/liba52 to LIB_DEPENDS and adds a52 and iconv
> to WANTLIB. (The latter found when I was double checking
> port-lib-depends-check with the initial version of this diff).
>
> ok?

ac3 is apparently needed for zvision (later graphical zork) games so I'm ok
with this.

I do wonder why the configure test for a52 on sparc64 thinks it exists
though. On amd64 I see

Checking for liba52... no

config.h has '#undef USE_A52'
config.mk has '# USE_A52 = 1'

and audio/module.mk has ac3.o behind 'ifdef USE_A52'

The machine it failed on had liba52 installed when the build error
occurred?

>
> (cc MAINTAINER)
>
> --Kurt
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/scummvm/Makefile,v
> retrieving revision 1.85
> diff -u -p -r1.85 Makefile
> --- Makefile 13 Feb 2020 00:33:00 -0000 1.85
> +++ Makefile 28 Sep 2020 00:13:58 -0000
> @@ -5,6 +5,7 @@ V= 2.1.1
> DISTNAME= scummvm-${V}
> CATEGORIES= games x11 emulators
> MASTER_SITES= https://www.scummvm.org/frs/scummvm/${V}/
> +REVISION= 0
>
> HOMEPAGE= https://www.scummvm.org/
>
> @@ -13,7 +14,7 @@ MAINTAINER= Jonathan Gray <jsg@openbsd.o
> # GPLv2+
> PERMIT_PACKAGE= Yes
>
> -WANTLIB += FLAC SDL2 c faad freetype jpeg m mad png ogg sndio
> +WANTLIB += FLAC SDL2 a52 c faad freetype iconv jpeg m mad png ogg sndio
> WANTLIB += ${COMPILER_LIBCXX} theoradec vorbis vorbisfile z
>
> # GCC 4.2.1 miscompiles this on at least ppc, so play safe and
> @@ -22,7 +23,8 @@ COMPILER= base-clang ports-gcc
>
> RUN_DEPENDS= devel/desktop-file-utils \
> x11/gtk+3,-guic
> -LIB_DEPENDS= audio/libmad \
> +LIB_DEPENDS= audio/liba52 \
> + audio/libmad \
> audio/libvorbis \
> audio/flac \
> audio/faad>=2.7 \
>

No comments:

Post a Comment