CVS commit: pkgsrc/audio/mpg123

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sat Jul 14 17:12:56 UTC 2018

Modified Files:
        pkgsrc/audio/mpg123: Makefile options.mk

Log Message:
mpg123: fix mpg123-pulse build failure on NetBSD/i386 8.0_RC2.

Fixes PR pkg/53433 by disabling x86 asm that causes text relocations
in libmpg123.so.  Ok'ed by martin@.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/audio/mpg123/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/mpg123/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/mpg123/Makefile
diff -u pkgsrc/audio/mpg123/Makefile:1.56 pkgsrc/audio/mpg123/Makefile:1.57
--- pkgsrc/audio/mpg123/Makefile:1.56   Tue May 22 22:50:25 2018
+++ pkgsrc/audio/mpg123/Makefile        Sat Jul 14 17:12:56 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2018/05/22 22:50:25 jmcneill Exp $
+# $NetBSD: Makefile,v 1.57 2018/07/14 17:12:56 tsutsui Exp $
 
 PKGNAME=       ${DISTNAME:C/[^[:alnum:]]*//}
-PKGREVISION=   1
+PKGREVISION=   2
 COMMENT=       MPEG layer 1, 2, and 3 audio player
 
 PKGCONFIG_OVERRIDE+=   libmpg123.pc.in

Index: pkgsrc/audio/mpg123/options.mk
diff -u pkgsrc/audio/mpg123/options.mk:1.4 pkgsrc/audio/mpg123/options.mk:1.5
--- pkgsrc/audio/mpg123/options.mk:1.4  Tue May 22 22:50:25 2018
+++ pkgsrc/audio/mpg123/options.mk      Sat Jul 14 17:12:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2018/05/22 22:50:25 jmcneill Exp $
+# $NetBSD: options.mk,v 1.5 2018/07/14 17:12:56 tsutsui Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.mpg123
 PKG_OPTIONS_OPTIONAL_GROUPS=   fpu
@@ -9,7 +9,8 @@ PKG_SUGGESTED_OPTIONS+=         mpg123-fifo
 
 .if (${MACHINE_ARCH} == "i386")
 .  if empty(MACHINE_PLATFORM:MDarwin-11.*-i386) && \
-      empty(MACHINE_PLATFORM:MSunOS-*)
+      empty(MACHINE_PLATFORM:MSunOS-*) && \
+      empty(MACHINE_PLATFORM:MNetBSD-[89]*-i386)
 PKG_OPTIONS_GROUP.fpu=         mpg123-x86-dither mpg123-with-fpu
 PKG_SUGGESTED_OPTIONS+=                mpg123-x86-dither
 .  else