svn commit: r459997 - in head/audio/libsidplay: . files

[Jan Beich]

Author: jbeich
Date: Fri Jan 26 14:39:15 2018
New Revision: 459997
URL: https://svnweb.freebsd.org/changeset/ports/459997

Log:
  audio/libsidplay: unbreak build with Clang 6 (C++14 by default)
  
  configure:4036: c++ -o conftest -O2 -pipe -O3 -fno-strict-aliasing -fno-omit-frame-pointer -march=native -fstack-protector    -fstack-protector conftest.cc  >&5
  In file included from conftest.cc:32:
  In file included from /usr/include/c++/v1/stdlib.h:94:
  /usr/include/stdlib.h:97:1: error: function declared '[[noreturn]]' after its first declaration
  _Noreturn void   exit(int);
  ^
  /usr/include/sys/cdefs.h:280:22: note: expanded from macro '_Noreturn'
   #define _Noreturn               [[noreturn]]
                                     ^
  conftest.cc:11:6: note: declaration missing '[[noreturn]]' attribute is here
  void exit (int);
       ^
  [...]
  configure:4053: error: cannot compute sizeof (char), 77
  
  samples.cpp:80:2: error: constant expression evaluates to 128 which cannot be narrowed to type 'sbyte' (aka 'signed char') [-Wc++11-narrowing]
          0x80,0x91,0xa2,0xb3,0xc4,0xd5,0xe6,0xf7,
          ^~~~
  samples.cpp:80:2: note: insert an explicit cast to silence this issue
          0x80,0x91,0xa2,0xb3,0xc4,0xd5,0xe6,0xf7,
          ^~~~
          static_cast<sbyte>( )
  
  PR:		224947
  Reported by:	pkg-fallout (blocks 8 ports)
  Submitted by:	tijl (autoreconf)
  Approved by:	portmgr blanket

Added:
  head/audio/libsidplay/files/
  head/audio/libsidplay/files/patch-src_samples.cpp   (contents, props changed)
Modified:
  head/audio/libsidplay/Makefile   (contents, props changed)

Modified: head/audio/libsidplay/Makefile
==============================================================================
--- head/audio/libsidplay/Makefile	Fri Jan 26 14:39:00 2018	(r459996)
+++ head/audio/libsidplay/Makefile	Fri Jan 26 14:39:15 2018	(r459997)
@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	sid_cv_have_ios_binary=yes
 INSTALL_TARGET=	install-strip
-USES=		libtool tar:tgz
+USES=		autoreconf libtool tar:tgz
 USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>

Added: head/audio/libsidplay/files/patch-src_samples.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/libsidplay/files/patch-src_samples.cpp	Fri Jan 26 14:39:15 2018	(r459997)
@@ -0,0 +1,31 @@
+samples.cpp:80:2: error: constant expression evaluates to 128 which cannot be narrowed to type 'sbyte' (aka 'signed char') [-Wc++11-narrowing]
+        0x80,0x91,0xa2,0xb3,0xc4,0xd5,0xe6,0xf7,
+        ^~~~
+samples.cpp:80:2: note: insert an explicit cast to silence this issue
+        0x80,0x91,0xa2,0xb3,0xc4,0xd5,0xe6,0xf7,
+        ^~~~
+        static_cast<sbyte>( )
+
+--- src/samples.cpp.orig	2002-05-22 17:38:18 UTC
++++ src/samples.cpp
+@@ -77,7 +77,7 @@ sampleChannel ch4, ch5;
+ 
+ const sbyte galwayNoiseTab1[16] =
+ {
+-	0x80,0x91,0xa2,0xb3,0xc4,0xd5,0xe6,0xf7,
++	(sbyte)0x80,(sbyte)0x91,(sbyte)0xa2,(sbyte)0xb3,(sbyte)0xc4,(sbyte)0xd5,(sbyte)0xe6,(sbyte)0xf7,
+ 	0x08,0x19,0x2a,0x3b,0x4c,0x5d,0x6e,0x7f
+ };
+ 
+@@ -86,9 +86,9 @@ sbyte galwayNoiseSamTab[16];
+ 
+ const sbyte sampleConvertTab[16] =
+ {
+-//  0x81,0x99,0xaa,0xbb,0xcc,0xdd,0xee,0xff,
++//  (sbyte)0x81,(sbyte)0x99,(sbyte)0xaa,(sbyte)0xbb,(sbyte)0xcc,(sbyte)0xdd,(sbyte)0xee,(sbyte)0xff,
+ //  0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x7f
+-	0x81,0x90,0xa0,0xb0,0xc0,0xd0,0xe0,0xf0,
++	(sbyte)0x81,(sbyte)0x90,(sbyte)0xa0,(sbyte)0xb0,(sbyte)0xc0,(sbyte)0xd0,(sbyte)0xe0,(sbyte)0xf0,
+ 	0x00,0x10,0x20,0x30,0x40,0x50,0x60,0x70
+ };
+