Sat Aug 1 23:44:06 2020 UTC ()
Don't set PKG_SUGGESTED_OPTIONS=mpg123-with-fpu on softfloat arm.

Fixes PR/54779.
Bump PKGREVISION to rebuild arm binaries.


(tsutsui)
diff -r1.58 -r1.59 pkgsrc/audio/mpg123/Makefile
diff -r1.5 -r1.6 pkgsrc/audio/mpg123/options.mk
cvs diff -r1.58 -r1.59 pkgsrc/audio/mpg123/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/mpg123/Makefile 2019/07/27 15:14:40 1.58
+++ pkgsrc/audio/mpg123/Makefile 2020/08/01 23:44:06 1.59
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.58 2019/07/27 15:14:40 nia Exp $ 1# $NetBSD: Makefile,v 1.59 2020/08/01 23:44:06 tsutsui Exp $
2 2
3PKGNAME= ${DISTNAME:C/[^[:alnum:]]*//} 3PKGNAME= ${DISTNAME:C/[^[:alnum:]]*//}
 4PKGREVISION= 1
4COMMENT= MPEG layer 1, 2, and 3 audio player 5COMMENT= MPEG layer 1, 2, and 3 audio player
5 6
6PKGCONFIG_OVERRIDE+= libmpg123.pc.in 7PKGCONFIG_OVERRIDE+= libmpg123.pc.in
7 8
8MAKE_ENV+= MPG123_PROGRAM=mpg123 9MAKE_ENV+= MPG123_PROGRAM=mpg123
9MAKE_ENV+= EXTRA_INSTALL_TARGETS="install-exec-am install-data-am" 10MAKE_ENV+= EXTRA_INSTALL_TARGETS="install-exec-am install-data-am"
10 11
11MPG123_BUILDING_BASE= # empty 12MPG123_BUILDING_BASE= # empty
12 13
13.include "../../mk/bsd.prefs.mk" 14.include "../../mk/bsd.prefs.mk"
14 15
15PLIST_VARS+= coreaudio oss sun 16PLIST_VARS+= coreaudio oss sun
16 17
cvs diff -r1.5 -r1.6 pkgsrc/audio/mpg123/options.mk (expand / switch to unified diff)

--- pkgsrc/audio/mpg123/options.mk 2018/07/14 17:12:56 1.5
+++ pkgsrc/audio/mpg123/options.mk 2020/08/01 23:44:06 1.6
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: options.mk,v 1.5 2018/07/14 17:12:56 tsutsui Exp $ 1# $NetBSD: options.mk,v 1.6 2020/08/01 23:44:06 tsutsui Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.mpg123 3PKG_OPTIONS_VAR= PKG_OPTIONS.mpg123
4PKG_OPTIONS_OPTIONAL_GROUPS= fpu 4PKG_OPTIONS_OPTIONAL_GROUPS= fpu
5PKG_SUPPORTED_OPTIONS= mpg123-fifo 5PKG_SUPPORTED_OPTIONS= mpg123-fifo
6PKG_SUGGESTED_OPTIONS+= mpg123-fifo 6PKG_SUGGESTED_OPTIONS+= mpg123-fifo
7 7
8.include "../../mk/bsd.fast.prefs.mk" 8.include "../../mk/bsd.fast.prefs.mk"
9 9
10.if (${MACHINE_ARCH} == "i386") 10.if (${MACHINE_ARCH} == "i386")
11. if empty(MACHINE_PLATFORM:MDarwin-11.*-i386) && \ 11. if empty(MACHINE_PLATFORM:MDarwin-11.*-i386) && \
12 empty(MACHINE_PLATFORM:MSunOS-*) && \ 12 empty(MACHINE_PLATFORM:MSunOS-*) && \
13 empty(MACHINE_PLATFORM:MNetBSD-[89]*-i386) 13 empty(MACHINE_PLATFORM:MNetBSD-[89]*-i386)
14PKG_OPTIONS_GROUP.fpu= mpg123-x86-dither mpg123-with-fpu 14PKG_OPTIONS_GROUP.fpu= mpg123-x86-dither mpg123-with-fpu
15PKG_SUGGESTED_OPTIONS+= mpg123-x86-dither 15PKG_SUGGESTED_OPTIONS+= mpg123-x86-dither
16. else 16. else
17PKG_OPTIONS_GROUP.fpu= mpg123-with-fpu 17PKG_OPTIONS_GROUP.fpu= mpg123-with-fpu
18PKG_SUGGESTED_OPTIONS+= mpg123-with-fpu 18PKG_SUGGESTED_OPTIONS+= mpg123-with-fpu
19. endif 19. endif
20.elif (${MACHINE_ARCH} == "arm") || (${MACHINE_ARCH} == "arm32") 20.elif !empty(MACHINE_ARCH:M*arm*) && empty(MACHINE_ARCH:M*hf*)
21PKG_OPTIONS_GROUP.fpu= mpg123-with-fpu  21PKG_OPTIONS_GROUP.fpu= mpg123-with-fpu
22.elif (${MACHINE_ARCH} == "aarch64") 22.elif (${MACHINE_ARCH} == "aarch64")
23PKG_OPTIONS_GROUP.fpu= mpg123-neon64 mpg123-aarch64 23PKG_OPTIONS_GROUP.fpu= mpg123-neon64 mpg123-aarch64
24PKG_SUGGESTED_OPTIONS+= mpg123-aarch64 24PKG_SUGGESTED_OPTIONS+= mpg123-aarch64
25.elif (${MACHINE_ARCH} == "powerpc") 25.elif (${MACHINE_ARCH} == "powerpc")
26PKG_OPTIONS_GROUP.fpu= mpg123-altivec mpg123-with-fpu 26PKG_OPTIONS_GROUP.fpu= mpg123-altivec mpg123-with-fpu
27PKG_SUGGESTED_OPTIONS+= mpg123-altivec 27PKG_SUGGESTED_OPTIONS+= mpg123-altivec
28.else 28.else
29PKG_OPTIONS_GROUP.fpu= mpg123-with-fpu 29PKG_OPTIONS_GROUP.fpu= mpg123-with-fpu
30PKG_SUGGESTED_OPTIONS+= mpg123-with-fpu 30PKG_SUGGESTED_OPTIONS+= mpg123-with-fpu
31.endif 31.endif
32 32
33.include "../../mk/bsd.options.mk" 33.include "../../mk/bsd.options.mk"