diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2018-08-06 01:30:47 +0200 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2018-08-06 01:31:02 +0200 |
commit | 9010047840d810d9ccba3d00b7943a842e125291 (patch) | |
tree | 7698717495c9bc52be2bc8ab526071f3063b466d /freebsd/tdemultimedia/files/patch-bp000-fix-ftbfs-on-c++11.diff | |
parent | b4f5663d87c16e08aaef66346f4b22eba2de80bd (diff) | |
download | tde-packaging-9010047840d810d9ccba3d00b7943a842e125291.tar.gz tde-packaging-9010047840d810d9ccba3d00b7943a842e125291.zip |
FreeBSD: Update for final release R14.0.5r14.0.5
Additional patches due to stricter C++11 in Clang
A new mkspec for Clang is used to build TQt
Akode is now part of the TDE repository
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'freebsd/tdemultimedia/files/patch-bp000-fix-ftbfs-on-c++11.diff')
-rw-r--r-- | freebsd/tdemultimedia/files/patch-bp000-fix-ftbfs-on-c++11.diff | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/freebsd/tdemultimedia/files/patch-bp000-fix-ftbfs-on-c++11.diff b/freebsd/tdemultimedia/files/patch-bp000-fix-ftbfs-on-c++11.diff new file mode 100644 index 000000000..e4360656f --- /dev/null +++ b/freebsd/tdemultimedia/files/patch-bp000-fix-ftbfs-on-c++11.diff @@ -0,0 +1,26 @@ +diff --git a/arts/midi/rawmidiport_impl.cc b/arts/midi/rawmidiport_impl.cc +index 3d82d8b..f8311bd 100644 +--- a/arts/midi/rawmidiport_impl.cc ++++ b/arts/midi/rawmidiport_impl.cc +@@ -289,7 +289,7 @@ public: + } + void processCommand(const MidiCommand& command) + { +- char message[3] = { command.status, command.data1, command.data2 }; ++ unsigned char message[3] = { command.status, command.data1, command.data2 }; + + int len = midiMsgLen(command.status); + if(midiMsgLen(command.status)) +diff --git a/mpeglib/lib/mpegplay/mpegVideoStream.cpp b/mpeglib/lib/mpegplay/mpegVideoStream.cpp +index 5e16b11..a37288e 100644 +--- a/mpeglib/lib/mpegplay/mpegVideoStream.cpp ++++ b/mpeglib/lib/mpegplay/mpegVideoStream.cpp +@@ -81,7 +81,7 @@ int MpegVideoStream::isStartCode(unsigned int data) { + case SEQUENCE_ERROR_CODE: + case SYSTEM_HEADER_START_CODE: + case ISO_11172_END_CODE: +- case EOF: ++ case (0U | EOF): + return true; + } + if ((SLICE_MIN_START_CODE < data) && (data < SLICE_MAX_START_CODE)) { |