[patch] changes from files/gmic-1.6.5.1-makefile.patch

xpatch (text/plain), 4.02 KB, created by Jouni Kosonen on 2015-09-25 12:49:14 UTC

--- files/gmic-1.6.5.1-makefile.patch	2015-09-06 19:04:08.895853701 +0300
+++ files/gmic-1.6.6.1-makefile.patch	2015-09-25 15:33:31.548122665 +0300
@@ -1,5 +1,5 @@
---- gmic-1.6.5.1/src/Makefile
-+++ gmic-1.6.5.1/src/Makefile
-@@ -85,7 +85,6 @@
- ifndef NO_STDLIB
+--- gmic-1.6.6.1/src/Makefile
++++ gmic-1.6.6.1/src/Makefile
+@@ -93,7 +93,6 @@
+ ifndef NO_SRIPDLIB
  MANDATORY_CFLAGS += -std=c++11
@@ -10,3 +10,3 @@
  MANDATORY_LIBS += -lm
-@@ -138,13 +137,13 @@
+@@ -146,13 +145,13 @@
  # Flags to enable image display, using X11
@@ -27,3 +27,3 @@
  # This requires the presence of the GDI32 include and library files.
-@@ -168,8 +167,8 @@
+@@ -176,8 +175,8 @@
  
@@ -38,3 +38,3 @@
  # ( http://curl.haxx.se/libcurl/ )
-@@ -308,7 +307,6 @@
+@@ -316,7 +315,6 @@
  
@@ -42,3 +42,3 @@
  	$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic
--	strip gmic$(EXE)
+-	$(STRIP) gmic$(EXE)
  
@@ -46,3 +46,3 @@
  	$(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS)" gmic_gimp
-@@ -318,11 +316,9 @@
+@@ -326,11 +324,9 @@
  
@@ -50,3 +50,3 @@
  	$(MAKE) "CFLAGS+=$(STD_GMICOL_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GMICOL_LIBS)" gmic
--	strip gmic$(EXE)
+-	$(STRIP) gmic$(EXE)
  
@@ -54,3 +54,3 @@
  	$(MAKE) "CFLAGS+=$(STATIC_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STATIC_CLI_LIBS)" gmic
--	strip gmic$(EXE)
+-	$(STRIP) gmic$(EXE)
  
@@ -58,4 +58,4 @@
  	$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(DEBUG_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic
-@@ -338,24 +334,22 @@
- libgmic.o: gmic.cpp gmic.h gmic_def.h CImg.h
+@@ -346,24 +342,22 @@
+ libgmic.o: gmic.cpp gmic.h gmic_stdlib.h CImg.h
  	$(CC) -o libgmic.o -c gmic.cpp -fPIC $(CFLAGS)
@@ -75,11 +75,11 @@
  
- gmic_gimp.o: gmic.cpp gmic.h gmic_def.h CImg.h
+ gmic_gimp.o: gmic.cpp gmic.h gmic_stdlib.h CImg.h
  	$(CC) -o gmic_gimp.o -c gmic.cpp -Dgmic_gimp $(CFLAGS)
  
- gmic_gimp : gmic_gimp.o gmic_gimp.cpp
+ gmic_gimp: gmic_gimp.o gmic_gimp.cpp
 -	$(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` $(CFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS)
--	strip gmic_gimp$(EXE)
+-	$(STRIP) gmic_gimp$(EXE)
 +	$(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` $(CFLAGS) $(LDFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS)
  
- gmic: gmic.cpp gmic.h gmic_def.h CImg.h
+ gmic: gmic.cpp gmic.h gmic_stdlib.h CImg.h
 -	$(CC) -o gmic gmic.cpp -Dgmic_main $(CFLAGS) $(LIBS)
@@ -87,5 +87,5 @@
  
- gmic_def.h:
- 	@wget --quiet -O gmic_def.h http://gmic.eu/gmic_def.h
-@@ -380,38 +374,43 @@
+ gmic_stdlib.h:
+ 	@echo "> Retrieve G'MIC Standard Library...\r"
+@@ -436,38 +430,43 @@
  # Generate bash completion script (requires 'gmic' to be installed first).
@@ -93,4 +93,4 @@
  	@mkdir -p ../resources
--	@\gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh
-+	@./gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh
+-	@\gmic -v - gmic_stdlib.gmic raw:gmic_stdlib.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh
++	@./gmic -v - gmic_stdlib.gmic raw:gmic_stdlib.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh
  
@@ -99,5 +99,5 @@
  	@mkdir -p ../man
--	@\gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -__help man 2> ../man/gmic.1
+-	@\gmic -v - gmic_stdlib.gmic raw:gmic_stdlib.gmic,uchar -__help man 2> ../man/gmic.1
 -	@gzip -f ../man/gmic.1
-+	@./gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -__help man 2> ../man/gmic.1
++	@./gmic -v - gmic_stdlib.gmic raw:gmic_stdlib.gmic,uchar -__help man 2> ../man/gmic.1
  
@@ -120,4 +120,4 @@
  	mkdir -p $(DESTDIR)$(USR)/$(LIB)
- 	cp -f libgmic.so $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1.6.5
- 	ln -fs libgmic.so.1.6.5 $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1
+ 	cp -f libgmic.so $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1.6.6
+ 	ln -fs libgmic.so.1.6.6 $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1
  	ln -fs libgmic.so.1 $(DESTDIR)$(USR)/$(LIB)/libgmic.so
@@ -143,3 +143,3 @@
  	rm -f $(DESTDIR)$(USR)/$(BIN)/gmic
-@@ -421,8 +420,7 @@
+@@ -477,8 +476,7 @@
  	rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1