From 9010047840d810d9ccba3d00b7943a842e125291 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 6 Aug 2018 01:30:47 +0200 Subject: FreeBSD: Update for final release R14.0.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- freebsd/tdemultimedia/Makefile | 4 +++- freebsd/tdemultimedia/distinfo | 6 ++--- .../files/patch-bp000-fix-ftbfs-on-c++11.diff | 26 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 freebsd/tdemultimedia/files/patch-bp000-fix-ftbfs-on-c++11.diff (limited to 'freebsd/tdemultimedia') diff --git a/freebsd/tdemultimedia/Makefile b/freebsd/tdemultimedia/Makefile index a6c7adc38..aa31e85bc 100644 --- a/freebsd/tdemultimedia/Makefile +++ b/freebsd/tdemultimedia/Makefile @@ -7,7 +7,7 @@ PORTNAME= tdemultimedia-trinity COMMENT= Trinity multimedia apps -TDE_PREVERSION= ~pre13+12e51265 +TDE_PREVERSION= MASTER_SITE_SUBDIR= t/${PORTNAME} PORTREVISION= 0 CATEGORIES= x11 multimedia @@ -44,6 +44,8 @@ do-configure: tde-cmake-prepare do-build: tde-cmake-build +post-build: tde-cmake-check + do-install: tde-cmake-install .include diff --git a/freebsd/tdemultimedia/distinfo b/freebsd/tdemultimedia/distinfo index 3eb55e01d..68450665f 100644 --- a/freebsd/tdemultimedia/distinfo +++ b/freebsd/tdemultimedia/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1514726604 -SHA256 (TDE/tdemultimedia-trinity_14.0.5~pre13.orig.tar.xz) = e99db55682bee765d1816f99e9cfe17e50ab5a303daef8163ef44325cc921769 -SIZE (TDE/tdemultimedia-trinity_14.0.5~pre13.orig.tar.xz) = 4820492 +TIMESTAMP = 1533126401 +SHA256 (TDE/tdemultimedia-trinity_14.0.5.orig.tar.xz) = 0609cbc85a744ec41eab0daefe6c23c6ed08b8ba9f0e9c760327f6c81755479b +SIZE (TDE/tdemultimedia-trinity_14.0.5.orig.tar.xz) = 4817036 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)) { -- cgit v1.2.3