cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

audio/mp3blaster: un-break on powerpc64

Browse Source 
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.
This commit is contained in:
Roman Bogorodskiy 2018-06-24 04:06:02 +00:00
parent f57ce64a3a
commit 376c305df4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=473176
2 changed files with 75 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
audio/mp3blaster/Makefile
View File

@ -13,11 +13,8 @@ COMMENT= MP3 console ncurses-based player
LICENSE= GPLv2+ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN_powerpc64= fails to configure: checking for main in -lm... no
USES= gmake localbase:ldflags ncurses USES= gmake localbase:ldflags ncurses
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -Wno-narrowing"
OPTIONS_DEFINE= DOCS ESOUND LIRC NAS SDL SIDPLAY VORBIS OPTIONS_DEFINE= DOCS ESOUND LIRC NAS SDL SIDPLAY VORBIS
OPTIONS_DEFAULT= SIDPLAY VORBIS OPTIONS_DEFAULT= SIDPLAY VORBIS

75
audio/mp3blaster/files/patch-mpegsound_huffmantable.cc Normal file
View File

@ -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}
};