git: 4fb035a886d9 - main - multimedia/smpeg: fix incorrect warning suppression flag.

[Dimitry Andric]

The branch main has been updated by dim (src committer):

URL: https://cgit.FreeBSD.org/ports/commit/?id=4fb035a886d9d247742f983fdd0afb703cabd975

commit 4fb035a886d9d247742f983fdd0afb703cabd975
Author:     Dimitry Andric <dim at FreeBSD.org>
AuthorDate: 2021-05-11 11:37:28 +0000
Commit:     Dimitry Andric <dim at FreeBSD.org>
CommitDate: 2021-05-29 14:08:18 +0000

    multimedia/smpeg: fix incorrect warning suppression flag.
    
    During an exp-run for llvm 12 (see bug 255570), it turned out that
    multimedia/smpeg does not build with clang 12.0.0:
    
    libtool: compile:  c++ -DPACKAGE=\"smpeg\" -DVERSION=\"0.4.4\" -I. -I. -O2 -pipe -Wno-error-narrowing -fstack-protector-strong -fno-strict-aliasing -I/usr/local/include/SDL -I/usr/local/include -D_REENTRANT -D_THREAD_SAFE -DTHREADED_AUDIO -DNDEBUG -I.. -DNOCONTROLS -I.. -I../audio -I../video -fno-exceptions -fno-rtti -c huffmantable.cpp  -fPIC -DPIC -o .libs/huffmantable.o
    warning: unknown -Werror warning specifier: '-Wno-error-narrowing' [-Wunknown-warning-option]
    In file included from huffmantable.cpp:12:
    ../MPEGaudio.h:129:7: warning: 'register' storage class specifier is deprecated and incompatible with C++17 [-Wdeprecated-register]
          register int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1;
          ^~~~~~~~~
    ../MPEGaudio.h:135:7: warning: 'register' storage class specifier is deprecated and incompatible with C++17 [-Wdeprecated-register]
          register unsigned short a;
          ^~~~~~~~~
    huffmantable.cpp:553:8: error: constant expression evaluates to -1 which cannot be narrowed to type 'unsigned int' [-Wc++11-narrowing]
      { 0, 0-1, 0-1, 0,  0, htd33},
           ^~~
    huffmantable.cpp:553:8: note: insert an explicit cast to silence this issue
      { 0, 0-1, 0-1, 0,  0, htd33},
           ^~~
    [... more of these ...]
    
    The Makefile attempts to suppress these warnings by adding
    -Wno-error-narrowing to CFLAGS, in case clang is used, but this warning
    suppression flag does not exist. It is called -Wno-c++11-narrowing
    instead, and the attached patch renames the flag.
    
    Approved by:    maintainer timeout (2 weeks)
    PR:             255796
    MFH:            2021Q2
---
 multimedia/smpeg/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile
index b61c0b14f8e3..5327f969c50b 100644
--- a/multimedia/smpeg/Makefile
+++ b/multimedia/smpeg/Makefile
@@ -27,7 +27,7 @@ CONFIGURE_ARGS=	--disable-opengl-player \
 		--disable-gtk-player \
 		--enable-mmx
 CFLAGS+=	${CFLAGS_${CHOSEN_COMPILER_TYPE}}
-CFLAGS_clang=	-Wno-error-narrowing
+CFLAGS_clang=	-Wno-c++11-narrowing
 LDFLAGS_i386=	-Wl,-znotext
 MAKE_ARGS=	LIBTOOL=${LOCALBASE}/bin/libtool
 INSTALL_TARGET=	install-strip