Skip to content

Commit 8478e49

Browse files
committed
libcaca: remove need for compiler blacklist
See: cacalabs/libcaca#59
1 parent 1b58ab9 commit 8478e49

File tree

3 files changed

+15
-28
lines changed

3 files changed

+15
-28
lines changed

graphics/libcaca/Portfile

+1-15
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
PortSystem 1.0
44
PortGroup github 1.0
5-
PortGroup compiler_blacklist_versions 1.0
65

76
name libcaca
87
categories graphics
@@ -55,26 +54,13 @@ depends_build port:pkgconfig
5554
depends_lib port:ncurses port:zlib
5655

5756
# temporary patch to fix use of implcitily declared function
58-
59-
patchfiles-append patch-fix-implicit-function.diff
60-
patch.pre_args -p1
57+
patchfiles-append patch-libcaca-common-image.diff
6158

6259
use_autoconf yes
6360
# these dependencies are removed by use_autoconf, so add them after
6461
depends_build-append port:libtool port:autoconf port:automake
6562
autoconf.cmd ./bootstrap
6663

67-
# Fix link errors on 10.8 and 10.9:
68-
# Undefined symbols for architecture x86_64:
69-
# "__caca_alloc2d", referenced from:
70-
# _load_image in img2txt-common-image.o
71-
# Undefined symbols for architecture x86_64:
72-
# "__caca_alloc2d", referenced from:
73-
# _load_image in cacaview-common-image.o
74-
# ld: symbol(s) not found for architecture x86_64
75-
compiler.blacklist-append \
76-
{clang < 900}
77-
7864
# require C++11 for CppUnit API
7965
compiler.cxx_standard 2011
8066
configure.cxxflags-append -std=gnu++11

graphics/libcaca/files/patch-fix-implicit-function.diff

-13
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
_caca_alloc2d is an internal function and not exported to
2+
the image viewer. It is basically a glorified call to malloc.
3+
4+
--- src/common-image.c.orig 2021-11-06 10:15:28.000000000 -0400
5+
+++ src/common-image.c 2021-11-06 10:15:59.000000000 -0400
6+
@@ -161,7 +161,7 @@
7+
uint32_t depth = (bpp + 7) / 8;
8+
9+
/* Allocate the pixel buffer */
10+
- im->pixels = _caca_alloc2d(im->w, im->h, depth);
11+
+ im->pixels = malloc(im->w * im->h * depth);
12+
if (!im->pixels)
13+
{
14+
caca_file_close(f);

0 commit comments

Comments
 (0)