summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authormrg <mrg@pkgsrc.org>2018-02-08 07:28:57 +0000
committermrg <mrg@pkgsrc.org>2018-02-08 07:28:57 +0000
commit82409302e866611eda4ba718bd5b6ad0a0c2699f (patch)
tree3f89c06f6a02e57b598817dec36020278d7b7fef /multimedia
parent9a3647909f9df534e17572a2a058d3e8d27ed0fe (diff)
downloadpkgsrc-82409302e866611eda4ba718bd5b6ad0a0c2699f.tar.gz
port these packages to GCC 6:
- audacity: GCC 6 wants std namespace, found via <cmath>. - smpeg2: don't initialise unsigned with "0-1". - libclucene/strigi: match GCC 6 (and 7, and 8, and 9.)
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/smpeg2/distinfo3
-rw-r--r--multimedia/smpeg2/patches/patch-audio_hufftable.cpp29
2 files changed, 31 insertions, 1 deletions
diff --git a/multimedia/smpeg2/distinfo b/multimedia/smpeg2/distinfo
index 86a046479b1..955c1517e01 100644
--- a/multimedia/smpeg2/distinfo
+++ b/multimedia/smpeg2/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 23:54:32 agc Exp $
+$NetBSD: distinfo,v 1.3 2018/02/08 07:28:58 mrg Exp $
SHA1 (smpeg2-2.0.0.tar.gz) = d0455466f61a8e55f83f4d7fd82f1c305bce6832
RMD160 (smpeg2-2.0.0.tar.gz) = 6c175111e38055d62064c6b6453d8c5e64945c09
SHA512 (smpeg2-2.0.0.tar.gz) = 80a779d01e7aa76778ef6ceea8041537db9e4b354df413214c4413c875cb98551891cef98fa0f057cc6a3222e4983da9ae65b86bdad2f87f9e2a6751837e2baf
Size (smpeg2-2.0.0.tar.gz) = 482322 bytes
+SHA1 (patch-audio_hufftable.cpp) = 20b8cf5f0491a7e50af14f526fc4d0b901b25499
diff --git a/multimedia/smpeg2/patches/patch-audio_hufftable.cpp b/multimedia/smpeg2/patches/patch-audio_hufftable.cpp
new file mode 100644
index 00000000000..fe621a85cfd
--- /dev/null
+++ b/multimedia/smpeg2/patches/patch-audio_hufftable.cpp
@@ -0,0 +1,29 @@
+$NetBSD: patch-audio_hufftable.cpp,v 1.1 2018/02/08 07:28:58 mrg Exp $
+
+don't initialise unsigned with "0-1".
+
+--- audio/hufftable.cpp.orig 2013-06-01 15:19:04.000000000 +0000
++++ audio/hufftable.cpp 2018-02-07 11:40:46.545617490 +0000
+@@ -550,11 +550,11 @@
+
+ const HUFFMANCODETABLE MPEGaudio::ht[HTN]=
+ {
+- { 0, 0-1, 0-1, 0, 0, htd33},
++ { 0, (unsigned)(0-1), (unsigned)(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},
++ { 4, (unsigned)(0-1), (unsigned)(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},
+@@ -564,7 +564,7 @@
+ {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},
++ {14, (unsigned)(0-1), (unsigned)(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},