From owner-svn-ports-head@freebsd.org Sun Jun 24 04:06:03 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 729141015634; Sun, 24 Jun 2018 04:06:03 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2617A773C2; Sun, 24 Jun 2018 04:06:03 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 06AF819965; Sun, 24 Jun 2018 04:06:03 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5O4620A053275; Sun, 24 Jun 2018 04:06:02 GMT (envelope-from novel@FreeBSD.org) Received: (from novel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5O462OA053273; Sun, 24 Jun 2018 04:06:02 GMT (envelope-from novel@FreeBSD.org) Message-Id: <201806240406.w5O462OA053273@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: novel set sender to novel@FreeBSD.org using -f From: Roman Bogorodskiy Date: Sun, 24 Jun 2018 04:06:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473176 - in head/audio/mp3blaster: . files X-SVN-Group: ports-head X-SVN-Commit-Author: novel X-SVN-Commit-Paths: in head/audio/mp3blaster: . files X-SVN-Commit-Revision: 473176 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jun 2018 04:06:03 -0000 Author: novel Date: Sun Jun 24 04:06:02 2018 New Revision: 473176 URL: https://svnweb.freebsd.org/changeset/ports/473176 Log: audio/mp3blaster: un-break on powerpc64 Previously clang 6 narrowing errors were silenced by adding -Wno-narrowing to CXXFLAGS. However, the older gcc on powerpc64 (and probably some other Tier-2 platforms) does not support this flag, so un-break the build by removing this flag and fixing narrowing issues on the code level. Added: head/audio/mp3blaster/files/patch-mpegsound_huffmantable.cc (contents, props changed) Modified: head/audio/mp3blaster/Makefile Modified: head/audio/mp3blaster/Makefile ============================================================================== --- head/audio/mp3blaster/Makefile Sun Jun 24 03:17:45 2018 (r473175) +++ head/audio/mp3blaster/Makefile Sun Jun 24 04:06:02 2018 (r473176) @@ -13,11 +13,8 @@ COMMENT= MP3 console ncurses-based player LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_powerpc64= fails to configure: checking for main in -lm... no - USES= gmake localbase:ldflags ncurses GNU_CONFIGURE= yes -CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -Wno-narrowing" OPTIONS_DEFINE= DOCS ESOUND LIRC NAS SDL SIDPLAY VORBIS OPTIONS_DEFAULT= SIDPLAY VORBIS Added: head/audio/mp3blaster/files/patch-mpegsound_huffmantable.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/mp3blaster/files/patch-mpegsound_huffmantable.cc Sun Jun 24 04:06:02 2018 (r473176) @@ -0,0 +1,75 @@ +--- mpegsound/huffmantable.cc.orig 2018-06-23 16:00:52 UTC ++++ mpegsound/huffmantable.cc +@@ -550,38 +550,38 @@ htd33[ 31][2]={{ 16, 1},{ 8, 1},{ 4, 1},{ 2, 1} + + const HUFFMANCODETABLE Mpegtoraw::ht[HTN]= + { +- { 0, 0-1, 0-1, 0, 0, htd33}, +- { 1, 2-1, 2-1, 0, 7,htd01}, +- { 2, 3-1, 3-1, 0, 17,htd02}, +- { 3, 3-1, 3-1, 0, 17,htd03}, +- { 4, 0-1, 0-1, 0, 0, htd33}, +- { 5, 4-1, 4-1, 0, 31,htd05}, +- { 6, 4-1, 4-1, 0, 31,htd06}, +- { 7, 6-1, 6-1, 0, 71,htd07}, +- { 8, 6-1, 6-1, 0, 71,htd08}, +- { 9, 6-1, 6-1, 0, 71,htd09}, +- {10, 8-1, 8-1, 0,127,htd10}, +- {11, 8-1, 8-1, 0,127,htd11}, +- {12, 8-1, 8-1, 0,127,htd12}, +- {13,16-1,16-1, 0,511,htd13}, +- {14, 0-1, 0-1, 0, 0, htd33}, +- {15,16-1,16-1, 0,511,htd15}, +- {16,16-1,16-1, 1,511,htd16}, +- {17,16-1,16-1, 2,511,htd16}, +- {18,16-1,16-1, 3,511,htd16}, +- {19,16-1,16-1, 4,511,htd16}, +- {20,16-1,16-1, 6,511,htd16}, +- {21,16-1,16-1, 8,511,htd16}, +- {22,16-1,16-1,10,511,htd16}, +- {23,16-1,16-1,13,511,htd16}, +- {24,16-1,16-1, 4,512,htd24}, +- {25,16-1,16-1, 5,512,htd24}, +- {26,16-1,16-1, 6,512,htd24}, +- {27,16-1,16-1, 7,512,htd24}, +- {28,16-1,16-1, 8,512,htd24}, +- {29,16-1,16-1, 9,512,htd24}, +- {30,16-1,16-1,11,512,htd24}, +- {31,16-1,16-1,13,512,htd24}, +- {32, 1-1,16-1, 0, 31,htd32}, +- {33, 1-1,16-1, 0, 31,htd33} ++ { 0, 0-1U, 0-1U, 0, 0, htd33}, ++ { 1, 2-1U, 2-1U, 0, 7,htd01}, ++ { 2, 3-1U, 3-1U, 0, 17,htd02}, ++ { 3, 3-1U, 3-1U, 0, 17,htd03}, ++ { 4, 0-1U, 0-1U, 0, 0, htd33}, ++ { 5, 4-1U, 4-1U, 0, 31,htd05}, ++ { 6, 4-1U, 4-1U, 0, 31,htd06}, ++ { 7, 6-1U, 6-1U, 0, 71,htd07}, ++ { 8, 6-1U, 6-1U, 0, 71,htd08}, ++ { 9, 6-1U, 6-1U, 0, 71,htd09}, ++ {10, 8-1U, 8-1U, 0,127,htd10}, ++ {11, 8-1U, 8-1U, 0,127,htd11}, ++ {12, 8-1U, 8-1U, 0,127,htd12}, ++ {13,16-1U,16-1U, 0,511,htd13}, ++ {14, 0-1U, 0-1U, 0, 0, htd33}, ++ {15,16-1U,16-1U, 0,511,htd15}, ++ {16,16-1U,16-1U, 1,511,htd16}, ++ {17,16-1U,16-1U, 2,511,htd16}, ++ {18,16-1U,16-1U, 3,511,htd16}, ++ {19,16-1U,16-1U, 4,511,htd16}, ++ {20,16-1U,16-1U, 6,511,htd16}, ++ {21,16-1U,16-1U, 8,511,htd16}, ++ {22,16-1U,16-1U,10,511,htd16}, ++ {23,16-1U,16-1U,13,511,htd16}, ++ {24,16-1U,16-1U, 4,512,htd24}, ++ {25,16-1U,16-1U, 5,512,htd24}, ++ {26,16-1U,16-1U, 6,512,htd24}, ++ {27,16-1U,16-1U, 7,512,htd24}, ++ {28,16-1U,16-1U, 8,512,htd24}, ++ {29,16-1U,16-1U, 9,512,htd24}, ++ {30,16-1U,16-1U,11,512,htd24}, ++ {31,16-1U,16-1U,13,512,htd24}, ++ {32, 1-1U,16-1U, 0, 31,htd32}, ++ {33, 1-1U,16-1U, 0, 31,htd33} + };