Accepting request 350199 from home:msvec:branches:graphics

Update to gmic-1.6.8

OBS-URL: https://build.opensuse.org/request/show/350199
OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=6
This commit is contained in:
Ismail Dönmez 2015-12-22 11:12:29 +00:00 committed by Git OBS Bridge
parent 662b013d9c
commit 2755fcf4b6
10 changed files with 79 additions and 161 deletions

View File

@ -1,51 +1,39 @@
Index: gmic-1.6.5.0/src/Makefile
===================================================================
--- gmic-1.6.5.0.orig/src/Makefile
+++ gmic-1.6.5.0/src/Makefile
@@ -80,8 +80,9 @@ INCLUDE=include
NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"`date +%m%d%y`\\\""
diff -ru gmic-1.6.8.orig/src/Makefile gmic-1.6.8/src/Makefile
--- gmic-1.6.8.orig/src/Makefile 2015-12-09 13:49:16.000000000 +0100
+++ gmic-1.6.8/src/Makefile 2015-12-21 11:50:21.187411451 +0100
@@ -93,6 +93,7 @@
# Flags that are mandatory to compile 'gmic'.
MANDATORY_CFLAGS = -Dgmic_build -Dcimg_use_zlib -I$(USR)/$(INCLUDE) $(PRERELEASE_CFLAGS)
+MANDATORY_CFLAGS += $(CFLAGS)
MANDATORY_LIBS = -lz
ifndef NO_STDLIB
ifndef NO_SRIPDLIB
MANDATORY_CFLAGS += -std=c++11
endif
@@ -107,11 +108,11 @@ DEBUG_CFLAGS = -ansi -pedantic -Dcimg_ve
@@ -119,7 +120,7 @@
# Flags to enable optimizations.
ifeq ($(notdir $(CC)),g++)
ifeq ($(OS),Darwin)
-OPT_CFLAGS = -O2 -mtune=generic
+OPT_CFLAGS = -O2 # -mtune=generic
else
-OPT_CFLAGS = -O2 -fno-ipa-sra -mtune=generic
+OPT_CFLAGS = -O2 # -fno-ipa-sra # -mtune=generic
endif
else
ifeq ($(notdir $(CC)),icpc)
OPT_CFLAGS = -fast
@@ -139,15 +140,15 @@ OPENMP_LIBS = -lgomp
@@ -151,12 +152,12 @@
# (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
# This requires the presence of the X11 include and library files.
# (package 'libx11-dev' on Debian).
X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr
-X11_LIBS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr
+X11_LIBS = -L/usr/X11R6/$(LIB) -lX11 -lpthread #-lXrandr
# Flags to enable fast display, using XShm.
# This requires the presence of the X11 extension include and library files.
# (package 'libx11-dev' on Debian).
XSHM_CFLAGS = -Dcimg_use_xshm
-XSHM_LIBS = -L$(USR)/X11R6/lib -lXext
+XSHM_LIBS = -L$(USR)/X11R6/$(LIB) -lXext
# Flags to enable image display, using GDI32.
# This requires the presence of the GDI32 include and library files.
GDI32_CFLAGS = -Dcimg_display=2 -Dcimg_appname=\\\"gmic\\\"
@@ -248,9 +249,10 @@ endif
endif
@@ -244,7 +245,8 @@
# CLI interface: Static build.
#-----------------------------
@ -53,11 +41,9 @@ Index: gmic-1.6.5.0/src/Makefile
+#STATIC_CLI_PATH = $(USR)/${LIB}/x86_64-linux-gnu
+STATIC_CLI_PATH = $(USR)/${LIB}
STATIC_CLI_EXTRA =
STATIC_CLI_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) -Dcimg_display=0
STATIC_CLI_CFLAGS = $(MANDATORY_CFLAGS) $(CIMG_ABORT_CFLAGS) $(PARALLEL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) -Dcimg_display=0
STATIC_CLI_LIBS = $(PARALLEL_LIBS) \
$(STATIC_CLI_PATH)/libpng.a \
@@ -295,9 +297,9 @@ endif
@@ -291,7 +293,7 @@
# G'MIC Online interface: Standard build.
#----------------------------------------
STD_GMICOL_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) -Dcimg_display=0
@ -66,4 +52,5 @@ Index: gmic-1.6.5.0/src/Makefile
#--------------------------
# Define Makefile entries.
#--------------------------
Only in gmic-1.6.8/src: Makefile.orig
Only in gmic-1.6.8/src: Makefile.rej

View File

@ -1,20 +1,16 @@
Index: gmic-1.6.5.0/src/Makefile
===================================================================
--- gmic-1.6.5.0.orig/src/Makefile
+++ gmic-1.6.5.0/src/Makefile
@@ -70,8 +70,9 @@ EXE = .exe
endif
LIB=lib
BIN=bin
INCLUDE=include
diff -ru gmic-1.6.8.orig/src/Makefile gmic-1.6.8/src/Makefile
--- gmic-1.6.8.orig/src/Makefile 2015-12-09 13:49:16.000000000 +0100
+++ gmic-1.6.8/src/Makefile 2015-12-21 11:55:14.917445432 +0100
@@ -71,6 +71,7 @@
PLUGINDIR = `gimptool-2.0 --gimpplugindir`/plug-ins
USR = /usr
WGET = wget --quiet -O
+DOCDIR=$(USR)/share/doc
#----------------------------------
# Define flags to customize builds.
#----------------------------------
@@ -438,9 +439,9 @@ uninstall:
rm -f $(DESTDIR)$(USR)/$(INCLUDE)/gmic.h
rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1.6.5
endif
ifeq ($(OSTYPE),msys)
EXE = .exe
@@ -480,7 +483,7 @@
rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1.6.8
rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1
rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so
- rm -rf $(DESTDIR)$(USR)/share/doc/gmic/
@ -22,4 +18,3 @@ Index: gmic-1.6.5.0/src/Makefile
rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
rm -f $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
distclean: clean

View File

@ -1,11 +1,9 @@
Index: gmic-1.6.5.0/src/Makefile
===================================================================
--- gmic-1.6.5.0.orig/src/Makefile
+++ gmic-1.6.5.0/src/Makefile
@@ -132,11 +132,13 @@ endif
ifneq ($(OS),Darwin)
CHECKIMAGE_CFLAGS = -Dgmic_check_image
endif
diff -ru gmic-1.6.8.orig3/src/Makefile gmic-1.6.8/src/Makefile
--- gmic-1.6.8.orig3/src/Makefile 2015-12-21 12:24:21.000000000 +0100
+++ gmic-1.6.8/src/Makefile 2015-12-21 12:30:42.152075848 +0100
@@ -145,9 +145,11 @@
# (may slow down the code a little bit).
CIMG_ABORT_CFLAGS = -Dcimg_use_abort
+ifndef NO_OPENMP
# Flags to enable parallelization using OpenMP.
@ -15,4 +13,3 @@ Index: gmic-1.6.5.0/src/Makefile
# Flags to enable image display, using X11
# (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
# This requires the presence of the X11 include and library files.

View File

@ -1,53 +1,13 @@
Index: gmic-1.6.5.0/src/Makefile
===================================================================
--- gmic-1.6.5.0.orig/src/Makefile
+++ gmic-1.6.5.0/src/Makefile
@@ -329,9 +329,9 @@ endif
endif
cli:
$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic
- strip gmic$(EXE)
+ strip -S gmic$(EXE)
gimp:
$(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS)" gmic_gimp
@@ -339,13 +339,13 @@ lib:
$(MAKE) "CFLAGS+=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_LIB_LIBS)" libgmic
gmicol:
$(MAKE) "CFLAGS+=$(STD_GMICOL_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GMICOL_LIBS)" gmic
- strip gmic$(EXE)
+ strip -S gmic$(EXE)
static:
$(MAKE) "CFLAGS+=$(STATIC_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STATIC_CLI_LIBS)" gmic
- strip gmic$(EXE)
+ strip -S gmic$(EXE)
debug:
$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(DEBUG_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic
@@ -354,9 +354,9 @@ QMAKE = qmake
zart: lib
ifeq ($(OS),Darwin)
cd ../zart && $(QMAKE) zart.pro && $(MAKE) "CFLAGS=$(OPT_CFLAGS)" "SUBLIBS=$(OPT_LIBS)" && strip zart.app/Contents/MacOS/zart
diff -ru gmic-1.6.8.orig.zart/src/Makefile gmic-1.6.8.orig.zart2/src/Makefile
--- gmic-1.6.8.orig.zart/src/Makefile 2015-12-21 12:53:02.221328809 +0100
+++ gmic-1.6.8.orig.zart2/src/Makefile 2015-12-21 12:55:39.754415197 +0100
@@ -81,7 +81,8 @@
ifdef NOSTRIP
STRIP=echo skip strip
else
- cd ../zart && $(QMAKE) zart.pro && $(MAKE) && strip zart
+ cd ../zart && $(QMAKE) zart.pro && $(MAKE) && strip -S zart
-STRIP=strip
+#STRIP=strip
+STRIP=strip -S
endif
# Internal rules to build compilation modules.
libgmic.o: gmic.cpp gmic.h gmic_def.h CImg.h
@@ -375,9 +375,9 @@ gmic_gimp.o: gmic.cpp gmic.h gmic_def.h
$(CC) -o gmic_gimp.o -c gmic.cpp -Dgmic_gimp $(CFLAGS)
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 -S gmic_gimp$(EXE)
gmic: gmic.cpp gmic.h gmic_def.h CImg.h
$(CC) -o gmic gmic.cpp -Dgmic_main $(CFLAGS) $(LIBS)
QMAKE=qmake

View File

@ -1,12 +1,10 @@
Index: gmic-1.6.5.0/src/Makefile
===================================================================
--- gmic-1.6.5.0.orig/src/Makefile
+++ gmic-1.6.5.0/src/Makefile
@@ -140,10 +140,10 @@ OPENMP_LIBS = -lgomp
diff -ru gmic-1.6.8.orig2/src/Makefile gmic-1.6.8/src/Makefile
--- gmic-1.6.8.orig2/src/Makefile 2015-12-21 12:22:46.000000000 +0100
+++ gmic-1.6.8/src/Makefile 2015-12-21 12:24:21.301442314 +0100
@@ -152,8 +152,8 @@
# Flags to enable image display, using X11
# (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
# This requires the presence of the X11 include and library files.
# (package 'libx11-dev' on Debian).
-X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr
-X11_LIBS = -L/usr/X11R6/$(LIB) -lX11 -lpthread #-lXrandr
+X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include -Dcimg_use_xrandr
@ -14,10 +12,8 @@ Index: gmic-1.6.5.0/src/Makefile
# Flags to enable fast display, using XShm.
# This requires the presence of the X11 extension include and library files.
# (package 'libx11-dev' on Debian).
@@ -236,10 +236,10 @@ BOARD_LIBS = -lboard
#-------------------------------
STD_CLI_CFLAGS = $(MANDATORY_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(CURL_CFLAGS) $(FFTW_CFLAGS)
@@ -232,8 +232,8 @@
STD_CLI_CFLAGS = $(MANDATORY_CFLAGS) $(CIMG_ABORT_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(CURL_CFLAGS) $(FFTW_CFLAGS)
STD_CLI_LIBS = $(MANDATORY_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS) $(CURL_LIBS) $(FFTW_LIBS)
ifeq ($(OS),Unix) # Unix.
-STD_CLI_CFLAGS += $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(X11_CFLAGS) $(EXR_CFLAGS) $(OPENCV_CFLAGS) # $(XSHM_CFLAGS) $(MAGICK_CFLAGS)
@ -26,11 +22,9 @@ Index: gmic-1.6.5.0/src/Makefile
+STD_CLI_LIBS += $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) $(XSHM_LIBS) $(EXR_LIBS) $(OPENCV_LIBS) # $(MAGICK_LIBS)
else
ifeq ($(OS),Darwin) # MacOSX.
STD_CLI_CFLAGS += $(X11_CFLAGS) $(EXR_CFLAGS)
STD_CLI_LIBS += $(X11_LIBS) $(EXR_LIBS) $(OPT_LIBS)
@@ -266,10 +266,10 @@ STATIC_CLI_LIBS = $(PARALLEL_LIBS) \
#--------------------------------
STD_GIMP_CFLAGS = $(MANDATORY_CFLAGS) $(PNG_CFLAGS) $(CURL_CFLAGS) $(FFTW_CFLAGS) -Dcimg_use_rng
STD_CLI_CFLAGS += $(PARALLEL_CFLAGS) $(X11_CFLAGS) $(EXR_CFLAGS)
@@ -262,8 +262,8 @@
STD_GIMP_CFLAGS = $(MANDATORY_CFLAGS) $(CIMG_ABORT_CFLAGS) $(PNG_CFLAGS) $(CURL_CFLAGS) $(FFTW_CFLAGS) -Dcimg_use_rng
STD_GIMP_LIBS = $(MANDATORY_LIBS) $(PNG_LIBS) $(CURL_LIBS) $(FFTW_LIBS)
ifeq ($(OS),Unix) # Unix.
-STD_GIMP_CFLAGS += $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(X11_CFLAGS)
@ -39,5 +33,4 @@ Index: gmic-1.6.5.0/src/Makefile
+STD_GIMP_LIBS += $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) $(XSHM_LIBS)
else
ifeq ($(OS),Darwin) # MaxOSX.
STD_GIMP_CFLAGS += $(X11_CFLAGS)
STD_GIMP_LIBS += $(X11_LIBS)
STD_GIMP_CFLAGS += $(PARALLEL_CFLAGS) $(X11_CFLAGS)

View File

@ -1,43 +1,23 @@
Index: gmic-1.6.5.0/src/Makefile
===================================================================
--- gmic-1.6.5.0.orig/src/Makefile
+++ gmic-1.6.5.0/src/Makefile
@@ -348,13 +348,15 @@ static:
debug:
$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(DEBUG_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic
+QMAKE = qmake
+
zart: lib
ifeq ($(OS),Darwin)
- cd ../zart && qmake zart.pro && $(MAKE) "CFLAGS=$(OPT_CFLAGS)" "SUBLIBS=$(OPT_LIBS)" && strip zart.app/Contents/MacOS/zart
+ cd ../zart && $(QMAKE) zart.pro && $(MAKE) "CFLAGS=$(OPT_CFLAGS)" "SUBLIBS=$(OPT_LIBS)" && strip zart.app/Contents/MacOS/zart
diff -ru gmic-1.6.8.orig/src/Makefile gmic-1.6.8.orig.zart/src/Makefile
--- gmic-1.6.8.orig/src/Makefile 2015-12-09 13:49:16.000000000 +0100
+++ gmic-1.6.8.orig.zart/src/Makefile 2015-12-21 12:53:02.221328809 +0100
@@ -83,6 +83,7 @@
else
- cd ../zart && qmake zart.pro && $(MAKE) && strip zart
+ cd ../zart && $(QMAKE) zart.pro && $(MAKE) && strip zart
STRIP=strip
endif
+QMAKE=qmake
#----------------------------------
# Define flags to customize builds.
@@ -341,9 +342,9 @@
zart:
ifeq ($(OS),Darwin)
- cd ../zart && qmake zart.pro && $(MAKE) && $(STRIP) zart.app/Contents/MacOS/zart
+ cd ../zart && $(QMAKE) zart.pro && $(MAKE) && $(STRIP) zart.app/Contents/MacOS/zart
else
- cd ../zart && qmake zart.pro && $(MAKE) && $(STRIP) zart
+ cd ../zart && $(QMAKE) zart.pro && $(MAKE) && $(STRIP) zart
endif
# Internal rules to build compilation modules.
libgmic.o: gmic.cpp gmic.h gmic_def.h CImg.h
Index: gmic-1.6.5.0/zart/zart.pro
===================================================================
--- gmic-1.6.5.0.orig/zart/zart.pro
+++ gmic-1.6.5.0/zart/zart.pro
@@ -83,14 +83,14 @@ system(pkg-config opencv --libs > /dev/n
# LIBS += -lX11 ../src/libgmic.a `pkg-config opencv --libs` -lfftw3 -lfftw3_threads
OPENCVLIBS = $$system(pkg-config opencv --libs)
OPENCVLIBS = $$replace( OPENCVLIBS, -lcvaux, )
# LIBS += -lX11 ../src/libgmic.a $$OPENCVLIBS -lfftw3 -lfftw3_threads -lz -Dcimg_use_openmp -fopenmp
-LIBS += -lX11 ../src/libgmic.a $$OPENCVLIBS -lfftw3 -lfftw3_threads -lz -ljpeg -lpng -ltiff -lX11 -lcurl
+LIBS += -lX11 ../src/libgmic.a -lXrandr $$OPENCVLIBS -lfftw3 -lfftw3_threads -lz -ljpeg -lpng -ltiff -lX11 -lcurl
!macx {
LIBS += -Dcimg_use_openmp -fopenmp
}
} else {
- LIBS += -lX11 ../src/libgmic.a -lopencv_core -lopencv_highgui -lfftw3 -lfftw3_threads -lz -ljpeg -lpng -ltiff -lX11 -lcurl -lopencv_imgproc -lopencv_objdetect -Dcimg_use_openmp -fopenmp
+ LIBS += -lX11 ../src/libgmic.a -lXrandr -lopencv_core -lopencv_highgui -lfftw3 -lfftw3_threads -lz -ljpeg -lpng -ltiff -lX11 -lcurl -lopencv_imgproc -lopencv_objdetect -Dcimg_use_openmp -fopenmp
# LIBS += -lX11 ../src/libgmic.a -lcxcore -lcv -lml -lhighgui -lfftw3 -lfftw3_threads
}
PRE_TARGETDEPS +=

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Dec 21 11:48:48 UTC 2015 - msvec@suse.com
- Update to gmic-1.6.8
* https://discuss.pixls.us/t/release-of-gmic-1-6-8/470
-------------------------------------------------------------------
Mon Jul 6 18:04:16 CEST 2015 - kurt@garloff.de

View File

@ -26,7 +26,7 @@
%endif
Name: gmic
Version: 1.6.5.0
Version: 1.6.8
Release: 0
Group: Productivity/Graphics/Bitmap Editors
URL: http://gmic.sourceforge.net/

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:28476dbe04ffcf5566a6864fd5281425f4735b4b8b2a635c314b1c874a734920
size 2475523

3
gmic_1.6.8.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3d7e44a36b70bc5d462436f2d0c8cc7902b01454e42509d9d591a45ac3b95458
size 2638619