<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d8cc25e3fe2b164b4adaf529d72eb69ff86edb1f">https://github.com/macports/macports-ports/commit/d8cc25e3fe2b164b4adaf529d72eb69ff86edb1f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d8cc25e3fe2 libcaca: remove need for compiler blacklist
</span>d8cc25e3fe2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d8cc25e3fe2b164b4adaf529d72eb69ff86edb1f
</span>Author: Evan Miller <emmiller@gmail.com>
AuthorDate: Sat Nov 6 10:29:43 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> libcaca: remove need for compiler blacklist
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/cacalabs/libcaca/issues/59
</span>---
graphics/libcaca/Portfile | 16 +---------------
graphics/libcaca/files/patch-fix-implicit-function.diff | 13 -------------
graphics/libcaca/files/patch-libcaca-common-image.diff | 14 ++++++++++++++
3 files changed, 15 insertions(+), 28 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libcaca/Portfile b/graphics/libcaca/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index af710fae919..584884d779c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libcaca/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libcaca/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,6 @@
</span>
PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compiler_blacklist_versions 1.0
</span>
name libcaca
categories graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,26 +54,13 @@ depends_build port:pkgconfig
</span> depends_lib port:ncurses port:zlib
# temporary patch to fix use of implcitily declared function
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-fix-implicit-function.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-libcaca-common-image.diff
</span>
use_autoconf yes
# these dependencies are removed by use_autoconf, so add them after
depends_build-append port:libtool port:autoconf port:automake
autoconf.cmd ./bootstrap
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fix link errors on 10.8 and 10.9:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Undefined symbols for architecture x86_64:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# "__caca_alloc2d", referenced from:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# _load_image in img2txt-common-image.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Undefined symbols for architecture x86_64:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# "__caca_alloc2d", referenced from:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# _load_image in cacaview-common-image.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ld: symbol(s) not found for architecture x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {clang < 900}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # require C++11 for CppUnit API
compiler.cxx_standard 2011
configure.cxxflags-append -std=gnu++11
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libcaca/files/patch-fix-implicit-function.diff b/graphics/libcaca/files/patch-fix-implicit-function.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bc94a49f48c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libcaca/files/patch-fix-implicit-function.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/common-image.c b/src/common-image.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7059bf4..530e265 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/common-image.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/common-image.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,7 +22,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "caca.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "caca_internals.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "common-image.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if !defined(USE_IMLIB2)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libcaca/files/patch-libcaca-common-image.diff b/graphics/libcaca/files/patch-libcaca-common-image.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e02a85fa0a8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libcaca/files/patch-libcaca-common-image.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+_caca_alloc2d is an internal function and not exported to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+the image viewer. It is basically a glorified call to malloc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/common-image.c.orig 2021-11-06 10:15:28.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/common-image.c 2021-11-06 10:15:59.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -161,7 +161,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t depth = (bpp + 7) / 8;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Allocate the pixel buffer */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- im->pixels = _caca_alloc2d(im->w, im->h, depth);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ im->pixels = malloc(im->w * im->h * depth);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!im->pixels)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ caca_file_close(f);
</span></pre><pre style='margin:0'>
</pre>