svn commit: r471431 - in head/graphics/leptonica: . files
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Sat Jun 2 22:27:43 UTC 2018
Author: sunpoet
Date: Sat Jun 2 22:27:42 2018
New Revision: 471431
URL: https://svnweb.freebsd.org/changeset/ports/471431
Log:
Fix and remove unnecessary CONFLICTS_BUILD=openjpeg15
The build fails if you have openjpeg15 installed.
It was caused by the order of include paths.
/usr/local/include/openjpeg.h (from openjpeg15) will be used instead of /usr/local/include/openjpeg-2.3/openjpeg.h (from openjpeg 2.3.0)
-I. -I.. -I/usr/local/include/libpng16 -I/usr/local/include -I/usr/local/include -I/usr/local/include -I/usr/local/include/openjpeg-2.3 -I/usr/local/include
Notified by: Walter Schwarzenfeld <w.schwarzenfeld at utanet.at>
Approved by: portmgr (blanket)
Added:
head/graphics/leptonica/files/
head/graphics/leptonica/files/patch-src-Makefile.am (contents, props changed)
Modified:
head/graphics/leptonica/Makefile
Modified: head/graphics/leptonica/Makefile
==============================================================================
--- head/graphics/leptonica/Makefile Sat Jun 2 22:27:30 2018 (r471430)
+++ head/graphics/leptonica/Makefile Sat Jun 2 22:27:42 2018 (r471431)
@@ -17,7 +17,6 @@ LIB_DEPENDS= libgif.so:graphics/giflib \
LICENSE_FILE= leptonica-license.txt
CONFLICTS= leptonlib-[0-9]*
-CONFLICTS_BUILD= openjpeg15
USES= autoreconf jpeg libtool pathfix pkgconfig
Added: head/graphics/leptonica/files/patch-src-Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/leptonica/files/patch-src-Makefile.am Sat Jun 2 22:27:42 2018 (r471431)
@@ -0,0 +1,9 @@
+--- src/Makefile.am.orig 2018-05-02 22:12:19 UTC
++++ src/Makefile.am
+@@ -1,5 +1,5 @@
+ AM_CFLAGS = $(DEBUG_FLAGS)
+-AM_CPPFLAGS = $(ZLIB_CFLAGS) $(LIBPNG_CFLAGS) $(JPEG_CFLAGS) $(LIBTIFF_CFLAGS) $(LIBWEBP_CFLAGS) $(LIBJP2K_CFLAGS)
++AM_CPPFLAGS = $(LIBJP2K_CFLAGS) $(ZLIB_CFLAGS) $(LIBPNG_CFLAGS) $(JPEG_CFLAGS) $(LIBTIFF_CFLAGS) $(LIBWEBP_CFLAGS)
+
+ lib_LTLIBRARIES = liblept.la
+ liblept_la_LIBADD = $(LIBM) $(ZLIB_LIBS) $(LIBPNG_LIBS) $(JPEG_LIBS) $(GIFLIB_LIBS) $(LIBTIFF_LIBS) $(LIBWEBP_LIBS) $(LIBJP2K_LIBS) $(GDI_LIBS)
More information about the svn-ports-all
mailing list