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/libraries/libkdcraw/Makefile | 2 +- freebsd/libraries/libkdcraw/distinfo | 6 +- .../files/patch-bp000-fix-ftbfs-on-c++11.diff | 74 ++++++++++++++++++++++ 3 files changed, 78 insertions(+), 4 deletions(-) create mode 100644 freebsd/libraries/libkdcraw/files/patch-bp000-fix-ftbfs-on-c++11.diff (limited to 'freebsd/libraries/libkdcraw') diff --git a/freebsd/libraries/libkdcraw/Makefile b/freebsd/libraries/libkdcraw/Makefile index 1e3214bc1..71f09f293 100644 --- a/freebsd/libraries/libkdcraw/Makefile +++ b/freebsd/libraries/libkdcraw/Makefile @@ -7,7 +7,7 @@ PORTNAME= libkdcraw-trinity COMMENT= Trinity RAW picture decoding C++ library -TDE_PREVERSION= ~pre7+5a187761 +TDE_PREVERSION= MASTER_SITE_SUBDIR= libk/${PORTNAME} PORTREVISION= 0 CATEGORIES= graphics devel diff --git a/freebsd/libraries/libkdcraw/distinfo b/freebsd/libraries/libkdcraw/distinfo index 28b2419e4..96e2cf140 100644 --- a/freebsd/libraries/libkdcraw/distinfo +++ b/freebsd/libraries/libkdcraw/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1495992051 -SHA256 (TDE/libraries/libkdcraw-trinity_14.0.5~pre7.orig.tar.xz) = cc7e402f023f600fa5ed76b9232808324405b1e7e5cbcd020943d2e8145cfb0b -SIZE (TDE/libraries/libkdcraw-trinity_14.0.5~pre7.orig.tar.xz) = 525212 +TIMESTAMP = 1533394932 +SHA256 (TDE/libraries/libkdcraw-trinity_14.0.5.orig.tar.xz) = 978242c5a015bf2a60d035681e4ba9ea937359363d25f8713341a3bd78cc8b59 +SIZE (TDE/libraries/libkdcraw-trinity_14.0.5.orig.tar.xz) = 524936 diff --git a/freebsd/libraries/libkdcraw/files/patch-bp000-fix-ftbfs-on-c++11.diff b/freebsd/libraries/libkdcraw/files/patch-bp000-fix-ftbfs-on-c++11.diff new file mode 100644 index 000000000..f820774f8 --- /dev/null +++ b/freebsd/libraries/libkdcraw/files/patch-bp000-fix-ftbfs-on-c++11.diff @@ -0,0 +1,74 @@ +diff --git a/libkdcraw/libraw/internal/dcraw_common.cpp b/libkdcraw/libraw/internal/dcraw_common.cpp +index 868f676..13fa1df 100644 +--- a/libkdcraw/libraw/internal/dcraw_common.cpp ++++ b/libkdcraw/libraw/internal/dcraw_common.cpp +@@ -3595,28 +3595,28 @@ void CLASS lin_interpolate() + void CLASS vng_interpolate() + { + static const signed char *cp, terms[] = { +- -2,-2,+0,-1,0,0x01, -2,-2,+0,+0,1,0x01, -2,-1,-1,+0,0,0x01, +- -2,-1,+0,-1,0,0x02, -2,-1,+0,+0,0,0x03, -2,-1,+0,+1,1,0x01, +- -2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03, +- -2,+1,-1,+0,0,0x04, -2,+1,+0,-1,1,0x04, -2,+1,+0,+0,0,0x06, +- -2,+1,+0,+1,0,0x02, -2,+2,+0,+0,1,0x04, -2,+2,+0,+1,0,0x04, +- -1,-2,-1,+0,0,0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01, +- -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,0x88, -1,-1,+1,-2,0,0x40, +- -1,-1,+1,-1,0,0x22, -1,-1,+1,+0,0,0x33, -1,-1,+1,+1,1,0x11, +- -1,+0,-1,+2,0,0x08, -1,+0,+0,-1,0,0x44, -1,+0,+0,+1,0,0x11, +- -1,+0,+1,-2,1,0x40, -1,+0,+1,-1,0,0x66, -1,+0,+1,+0,1,0x22, +- -1,+0,+1,+1,0,0x33, -1,+0,+1,+2,1,0x10, -1,+1,+1,-1,1,0x44, +- -1,+1,+1,+0,0,0x66, -1,+1,+1,+1,0,0x22, -1,+1,+1,+2,0,0x10, +- -1,+2,+0,+1,0,0x04, -1,+2,+1,+0,1,0x04, -1,+2,+1,+1,0,0x04, +- +0,-2,+0,+0,1,0x80, +0,-1,+0,+1,1,0x88, +0,-1,+1,-2,0,0x40, +- +0,-1,+1,+0,0,0x11, +0,-1,+2,-2,0,0x40, +0,-1,+2,-1,0,0x20, +- +0,-1,+2,+0,0,0x30, +0,-1,+2,+1,1,0x10, +0,+0,+0,+2,1,0x08, +- +0,+0,+2,-2,1,0x40, +0,+0,+2,-1,0,0x60, +0,+0,+2,+0,1,0x20, +- +0,+0,+2,+1,0,0x30, +0,+0,+2,+2,1,0x10, +0,+1,+1,+0,0,0x44, +- +0,+1,+1,+2,0,0x10, +0,+1,+2,-1,1,0x40, +0,+1,+2,+0,0,0x60, +- +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,0x80, +- +1,-1,+1,+1,0,0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40, +- +1,+0,+2,+1,0,0x10 ++ -2,-2,+0,-1,0,'\x01', -2,-2,+0,+0,1,'\x01', -2,-1,-1,+0,0,'\x01', ++ -2,-1,+0,-1,0,'\x02', -2,-1,+0,+0,0,'\x03', -2,-1,+0,+1,1,'\x01', ++ -2,+0,+0,-1,0,'\x06', -2,+0,+0,+0,1,'\x02', -2,+0,+0,+1,0,'\x03', ++ -2,+1,-1,+0,0,'\x04', -2,+1,+0,-1,1,'\x04', -2,+1,+0,+0,0,'\x06', ++ -2,+1,+0,+1,0,'\x02', -2,+2,+0,+0,1,'\x04', -2,+2,+0,+1,0,'\x04', ++ -1,-2,-1,+0,0,'\x80', -1,-2,+0,-1,0,'\x01', -1,-2,+1,-1,0,'\x01', ++ -1,-2,+1,+0,1,'\x01', -1,-1,-1,+1,0,'\x88', -1,-1,+1,-2,0,'\x40', ++ -1,-1,+1,-1,0,'\x22', -1,-1,+1,+0,0,'\x33', -1,-1,+1,+1,1,'\x11', ++ -1,+0,-1,+2,0,'\x08', -1,+0,+0,-1,0,'\x44', -1,+0,+0,+1,0,'\x11', ++ -1,+0,+1,-2,1,'\x40', -1,+0,+1,-1,0,'\x66', -1,+0,+1,+0,1,'\x22', ++ -1,+0,+1,+1,0,'\x33', -1,+0,+1,+2,1,'\x10', -1,+1,+1,-1,1,'\x44', ++ -1,+1,+1,+0,0,'\x66', -1,+1,+1,+1,0,'\x22', -1,+1,+1,+2,0,'\x10', ++ -1,+2,+0,+1,0,'\x04', -1,+2,+1,+0,1,'\x04', -1,+2,+1,+1,0,'\x04', ++ +0,-2,+0,+0,1,'\x80', +0,-1,+0,+1,1,'\x88', +0,-1,+1,-2,0,'\x40', ++ +0,-1,+1,+0,0,'\x11', +0,-1,+2,-2,0,'\x40', +0,-1,+2,-1,0,'\x20', ++ +0,-1,+2,+0,0,'\x30', +0,-1,+2,+1,1,'\x10', +0,+0,+0,+2,1,'\x08', ++ +0,+0,+2,-2,1,'\x40', +0,+0,+2,-1,0,'\x60', +0,+0,+2,+0,1,'\x20', ++ +0,+0,+2,+1,0,'\x30', +0,+0,+2,+2,1,'\x10', +0,+1,+1,+0,0,'\x44', ++ +0,+1,+1,+2,0,'\x10', +0,+1,+2,-1,1,'\x40', +0,+1,+2,+0,0,'\x60', ++ +0,+1,+2,+1,0,'\x20', +0,+1,+2,+2,0,'\x10', +1,-2,+1,+0,0,'\x80', ++ +1,-1,+1,+1,0,'\x88', +1,+0,+1,+2,0,'\x08', +1,+0,+2,-1,0,'\x40', ++ +1,+0,+2,+1,0,'\x10' + }, chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 }; + ushort (*brow[5])[4], *pix; + int prow=7, pcol=1, *ip, *code[16][16], gval[8], gmin, gmax, sum[4]; +@@ -5950,7 +5950,8 @@ void CLASS adobe_coeff (char *p_make, char *p_model) + { + static const struct { + const char *prefix; +- short t_black, t_maximum, trans[12]; ++ unsigned short t_black, t_maximum; ++ short trans[12]; + } table[] = { + { "Apple QuickTake", 0, 0, /* DJC */ + { 17576,-3191,-3318,5210,6733,-1942,9031,1280,-124 } }, +@@ -8189,7 +8190,7 @@ void CLASS tiff_head (struct tiff_hdr *th, int full) + strncpy (th->t_desc, desc, 512); + strncpy (th->t_make, make, 64); + strncpy (th->t_model, model, 64); +- strcpy (th->soft, "dcraw v"VERSION); ++ strcpy (th->soft, "dcraw v" VERSION); + t = gmtime (×tamp); + sprintf (th->date, "%04d:%02d:%02d %02d:%02d:%02d", + t->tm_year+1900,t->tm_mon+1,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec); -- cgit v1.2.1