sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gmic: update makefile.patch

Browse Source
This commit is contained in:
Leonid Pliushch 2021-02-07 18:44:41 +00:00
parent 1aafee6130
commit 1786f1b631
No known key found for this signature in database
GPG Key ID: 45F2964132545795
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
packages/gmic/Makefile.patch
View File

@ -1,6 +1,7 @@
--- ./src/Makefile.orig 2020-03-28 14:25:12.000000000 +0100 diff -uNr gmic-2.9.5/src/Makefile gmic-2.9.5.mod/src/Makefile
+++ ./src/Makefile 2020-04-03 21:01:21.744145133 +0200 --- gmic-2.9.5/src/Makefile 2021-02-05 19:46:00.000000000 +0000
@@ -206,7 +206,7 @@ +++ gmic-2.9.5.mod/src/Makefile 2021-02-07 18:21:18.932681182 +0000
@@ -207,7 +207,7 @@
# Enable multi-threading support. # Enable multi-threading support.
PARALLEL_CFLAGS = -Dgmic_is_parallel PARALLEL_CFLAGS = -Dgmic_is_parallel
ifneq ($(OS),Windows) ifneq ($(OS),Windows)
@ -9,9 +10,9 @@
endif endif
# Enable parallelization in CImg, using OpenMP. # Enable parallelization in CImg, using OpenMP.
@@ -346,8 +346,8 @@ @@ -347,8 +347,8 @@
GMIC_CLI_CFLAGS = $(MANDATORY_CFLAGS) $(ABORT_CFLAGS) $(PARALLEL_CFLAGS) $(EIGEN_CFLAGS) $(FFTW_CFLAGS) $(CURL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(TIFF_CFLAGS) GMIC_CLI_CFLAGS = $(MANDATORY_CFLAGS) $(ABORT_CFLAGS) $(PARALLEL_CFLAGS) $(FFTW_CFLAGS) $(CURL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(TIFF_CFLAGS)
GMIC_CLI_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(EIGEN_LIBS) $(FFTW_LIBS) $(CURL_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS) GMIC_CLI_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(FFTW_LIBS) $(CURL_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS)
ifeq ($(OS),Unix) # Unix ifeq ($(OS),Unix) # Unix
-GMIC_CLI_CFLAGS += $(OPENMP_CFLAGS) $(X11_CFLAGS) $(OPENEXR_CFLAGS) $(OPENCV_CFLAGS) # $(XSHM_CFLAGS) # $(MAGICK_CFLAGS) -GMIC_CLI_CFLAGS += $(OPENMP_CFLAGS) $(X11_CFLAGS) $(OPENEXR_CFLAGS) $(OPENCV_CFLAGS) # $(XSHM_CFLAGS) # $(MAGICK_CFLAGS)
-GMIC_CLI_LIBS += $(OPENMP_LIBS) $(X11_LIBS) $(OPENEXR_LIBS) $(OPENCV_LIBS) # $(XSHM_LIBS) # $(MAGICK_LIBS) -GMIC_CLI_LIBS += $(OPENMP_LIBS) $(X11_LIBS) $(OPENEXR_LIBS) $(OPENCV_LIBS) # $(XSHM_LIBS) # $(MAGICK_LIBS)
@ -20,7 +21,7 @@
else else
ifeq ($(OS),Darwin) # MacOSX ifeq ($(OS),Darwin) # MacOSX
GMIC_CLI_CFLAGS += $(X11_CFLAGS) $(OPENEXR_CFLAGS) $(OPENCV_CFLAGS) GMIC_CLI_CFLAGS += $(X11_CFLAGS) $(OPENEXR_CFLAGS) $(OPENCV_CFLAGS)
@@ -360,13 +360,15 @@ @@ -361,7 +361,7 @@
cli: cli:
$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) $(OPT_CLI_CFLAGS)" "LIBS+=$(GMIC_CLI_LIBS) $(OPT_LIBS)" _cli $(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) $(OPT_CLI_CFLAGS)" "LIBS+=$(GMIC_CLI_LIBS) $(OPT_LIBS)" _cli
@ -29,11 +30,17 @@
debug: debug:
$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) $(DEBUG_CFLAGS)" "LIBS+=$(GMIC_CLI_LIBS)" _cli $(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) $(DEBUG_CFLAGS)" "LIBS+=$(GMIC_CLI_LIBS)" _cli
@@ -370,8 +370,12 @@
$(MAKE) "CFLAGS+=$(MANDATORY_CFLAGS) $(ABORT_CFLAGS) $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(X11_CFLAGS) $(OPENEXR_CFLAGS) -Dcimg_use_half -I/usr/include/OpenEXR -Dgmic_pixel_type=half" \
"LIBS+=$(MANDATORY_LIBS) $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) $(OPENEXR_LIBS)" _cli
_cli: gmic_cli.o gmic.cpp gmic.h gmic_stdlib.h CImg.h -_cli: gmic_cli.o gmic.cpp gmic.h gmic_stdlib.h CImg.h
+_cli: gmic_cli_gm.o gmic_cli.o gmic.cpp gmic.h gmic_stdlib.h CImg.h
$(CXX) -o gmic gmic_cli.cpp gmic_cli.o $(CFLAGS) $(LIBS) $(CXX) -o gmic gmic_cli.cpp gmic_cli.o $(CFLAGS) $(LIBS)
+ $(CXX) -o gmic_cli_gm.o -c gmic.cpp $(CFLAGS) $(MAGICK_CFLAGS)
+ $(CXX) -o gmic-gm gmic_cli.cpp gmic_cli_gm.o $(CFLAGS) $(MAGICK_CFLAGS) $(LIBS) $(MAGICK_LIBS) + $(CXX) -o gmic-gm gmic_cli.cpp gmic_cli_gm.o $(CFLAGS) $(MAGICK_CFLAGS) $(LIBS) $(MAGICK_LIBS)
+
+gmic_cli_gm.o: gmic.cpp gmic.h gmic_stdlib.h CImg.h
+ $(CXX) -o gmic_cli_gm.o -c gmic.cpp $(CFLAGS) $(MAGICK_CFLAGS)
gmic_cli.o: gmic.cpp gmic.h gmic_stdlib.h CImg.h gmic_cli.o: gmic.cpp gmic.h gmic_stdlib.h CImg.h
$(CXX) -o gmic_cli.o -c gmic.cpp $(CFLAGS) $(CXX) -o gmic_cli.o -c gmic.cpp $(CFLAGS)