pool/gmic
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3f4d6eef0a
gmic/gmic-x11opts.diff

47 lines
2.8 KiB
Diff
Raw Normal View History

Accepting request 280593 from home:garloff:branches:graphics - Update to gmic-1.6.0.3: * New GIMP filters Degradation/Dirty, Rendering/Lightning, Layers/Colors to Layers * New commands rgb2int and int2rgb * New preferred .gmz image list file format * New -nlmeans denoising algorithm * Improvements to -bilateral, -peronamalik_flow, -apply_parallel, (= -ap), -split, -discard, -colormap, -displacement, vanvliet, -belnd_median * Bugfixes around -output codec, -eigen, -center3d, -normalize3d, -split3d, -label - Update to gmic-1.6.0.2: * New -peronamalik_flow (diffusion smoothing) * New -x_select_function1d and -x_color_curves * New --guided, -cumulate * New -apply_video, -video2files, -files2video, -average_video * New -dct and -idct * Improvements to -parallel * Improving -fitscreen and tiff -output * Improvements for -snapshot3d, -text, -fft, -ifft, -blur * Major ZArt update * Bugfixes for -deconvolve_fft, -bilateral, -gaussian, -srand - Update to gmic-1.6.0.1: * New: const(value) and button() typedefs to describe filters. * Filter return status can be a list now. * GIMP plug-in now has default capability to open display windows. * New -x_segment (Contours/Extract Foreground). * Double underscore vars are thread shared globals. * New -x_select_color, -x_select_palette, -input_gpl, -x_colorize * C++11 support in CImg, avoiding uneeded image copies OBS-URL: https://build.opensuse.org/request/show/280593 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=4
2015-01-09 16:02:09 +01:00
Index: gmic-1.6.0.3/src/Makefile
Accepting request 225522 from home:garloff:Photography Submit gmic package to openSUSE:Factory via the graphics Devel package. Sidenote: While I will continue to build the full gmic binary in my home:garloff:Photography project (and use MMX,SSE on i386) for continuity reasons, I follow upstream to only build gmic the float type for openSUSE submission, covering probably 99% of the use cases ... This is controlled by a %define in the specfile, so I can keep the packages in sync otherwise at least for the time being. OBS-URL: https://build.opensuse.org/request/show/225522 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=1
2014-03-11 06:52:11 +01:00
===================================================================
Accepting request 280593 from home:garloff:branches:graphics - Update to gmic-1.6.0.3: * New GIMP filters Degradation/Dirty, Rendering/Lightning, Layers/Colors to Layers * New commands rgb2int and int2rgb * New preferred .gmz image list file format * New -nlmeans denoising algorithm * Improvements to -bilateral, -peronamalik_flow, -apply_parallel, (= -ap), -split, -discard, -colormap, -displacement, vanvliet, -belnd_median * Bugfixes around -output codec, -eigen, -center3d, -normalize3d, -split3d, -label - Update to gmic-1.6.0.2: * New -peronamalik_flow (diffusion smoothing) * New -x_select_function1d and -x_color_curves * New --guided, -cumulate * New -apply_video, -video2files, -files2video, -average_video * New -dct and -idct * Improvements to -parallel * Improving -fitscreen and tiff -output * Improvements for -snapshot3d, -text, -fft, -ifft, -blur * Major ZArt update * Bugfixes for -deconvolve_fft, -bilateral, -gaussian, -srand - Update to gmic-1.6.0.1: * New: const(value) and button() typedefs to describe filters. * Filter return status can be a list now. * GIMP plug-in now has default capability to open display windows. * New -x_segment (Contours/Extract Foreground). * Double underscore vars are thread shared globals. * New -x_select_color, -x_select_palette, -input_gpl, -x_colorize * C++11 support in CImg, avoiding uneeded image copies OBS-URL: https://build.opensuse.org/request/show/280593 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=4
2015-01-09 16:02:09 +01:00
--- gmic-1.6.0.3.orig/src/Makefile
+++ gmic-1.6.0.3/src/Makefile
@@ -142,10 +142,10 @@ OPENMP_LIBS = -lgomp
# Flags to enable image display, using X11
Accepting request 248864 from home:garloff:branches:graphics Upgrade to 1.6.0.0 OBS-URL: https://build.opensuse.org/request/show/248864 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=3
2014-09-13 08:03:29 +02:00
# (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
+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.
Accepting request 280593 from home:garloff:branches:graphics - Update to gmic-1.6.0.3: * New GIMP filters Degradation/Dirty, Rendering/Lightning, Layers/Colors to Layers * New commands rgb2int and int2rgb * New preferred .gmz image list file format * New -nlmeans denoising algorithm * Improvements to -bilateral, -peronamalik_flow, -apply_parallel, (= -ap), -split, -discard, -colormap, -displacement, vanvliet, -belnd_median * Bugfixes around -output codec, -eigen, -center3d, -normalize3d, -split3d, -label - Update to gmic-1.6.0.2: * New -peronamalik_flow (diffusion smoothing) * New -x_select_function1d and -x_color_curves * New --guided, -cumulate * New -apply_video, -video2files, -files2video, -average_video * New -dct and -idct * Improvements to -parallel * Improving -fitscreen and tiff -output * Improvements for -snapshot3d, -text, -fft, -ifft, -blur * Major ZArt update * Bugfixes for -deconvolve_fft, -bilateral, -gaussian, -srand - Update to gmic-1.6.0.1: * New: const(value) and button() typedefs to describe filters. * Filter return status can be a list now. * GIMP plug-in now has default capability to open display windows. * New -x_segment (Contours/Extract Foreground). * Double underscore vars are thread shared globals. * New -x_select_color, -x_select_palette, -input_gpl, -x_colorize * C++11 support in CImg, avoiding uneeded image copies OBS-URL: https://build.opensuse.org/request/show/280593 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=4
2015-01-09 16:02:09 +01:00
# (package 'libx11-dev' on Debian).
@@ -234,20 +234,20 @@ BOARD_LIBS = -lboard
# Predefined sets of flags for different default configurations.
Accepting request 248864 from home:garloff:branches:graphics Upgrade to 1.6.0.0 OBS-URL: https://build.opensuse.org/request/show/248864 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=3
2014-09-13 08:03:29 +02:00
#----------------------------------------------------------------
# Unix : Standard build.
-STD_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(X11_CFLAGS) $(PNG_CFLAGS) \
+STD_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \
$(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) \
Accepting request 280593 from home:garloff:branches:graphics - Update to gmic-1.6.0.3: * New GIMP filters Degradation/Dirty, Rendering/Lightning, Layers/Colors to Layers * New commands rgb2int and int2rgb * New preferred .gmz image list file format * New -nlmeans denoising algorithm * Improvements to -bilateral, -peronamalik_flow, -apply_parallel, (= -ap), -split, -discard, -colormap, -displacement, vanvliet, -belnd_median * Bugfixes around -output codec, -eigen, -center3d, -normalize3d, -split3d, -label - Update to gmic-1.6.0.2: * New -peronamalik_flow (diffusion smoothing) * New -x_select_function1d and -x_color_curves * New --guided, -cumulate * New -apply_video, -video2files, -files2video, -average_video * New -dct and -idct * Improvements to -parallel * Improving -fitscreen and tiff -output * Improvements for -snapshot3d, -text, -fft, -ifft, -blur * Major ZArt update * Bugfixes for -deconvolve_fft, -bilateral, -gaussian, -srand - Update to gmic-1.6.0.1: * New: const(value) and button() typedefs to describe filters. * Filter return status can be a list now. * GIMP plug-in now has default capability to open display windows. * New -x_segment (Contours/Extract Foreground). * Double underscore vars are thread shared globals. * New -x_select_color, -x_select_palette, -input_gpl, -x_colorize * C++11 support in CImg, avoiding uneeded image copies OBS-URL: https://build.opensuse.org/request/show/280593 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=4
2015-01-09 16:02:09 +01:00
- $(EXR_CFLAGS) $(FFTW_CFLAGS) $(OPENCV_CFLAGS) # $(XSHM_CFLAGS) $(MAGICK_CFLAGS)
Accepting request 248864 from home:garloff:branches:graphics Upgrade to 1.6.0.0 OBS-URL: https://build.opensuse.org/request/show/248864 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=3
2014-09-13 08:03:29 +02:00
-STD_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) $(PNG_LIBS) \
Accepting request 280593 from home:garloff:branches:graphics - Update to gmic-1.6.0.3: * New GIMP filters Degradation/Dirty, Rendering/Lightning, Layers/Colors to Layers * New commands rgb2int and int2rgb * New preferred .gmz image list file format * New -nlmeans denoising algorithm * Improvements to -bilateral, -peronamalik_flow, -apply_parallel, (= -ap), -split, -discard, -colormap, -displacement, vanvliet, -belnd_median * Bugfixes around -output codec, -eigen, -center3d, -normalize3d, -split3d, -label - Update to gmic-1.6.0.2: * New -peronamalik_flow (diffusion smoothing) * New -x_select_function1d and -x_color_curves * New --guided, -cumulate * New -apply_video, -video2files, -files2video, -average_video * New -dct and -idct * Improvements to -parallel * Improving -fitscreen and tiff -output * Improvements for -snapshot3d, -text, -fft, -ifft, -blur * Major ZArt update * Bugfixes for -deconvolve_fft, -bilateral, -gaussian, -srand - Update to gmic-1.6.0.1: * New: const(value) and button() typedefs to describe filters. * Filter return status can be a list now. * GIMP plug-in now has default capability to open display windows. * New -x_segment (Contours/Extract Foreground). * Double underscore vars are thread shared globals. * New -x_select_color, -x_select_palette, -input_gpl, -x_colorize * C++11 support in CImg, avoiding uneeded image copies OBS-URL: https://build.opensuse.org/request/show/280593 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=4
2015-01-09 16:02:09 +01:00
+ $(EXR_CFLAGS) $(FFTW_CFLAGS) # $(OPENCV_CFLAGS) $(MAGICK_CFLAGS)
Accepting request 248864 from home:garloff:branches:graphics Upgrade to 1.6.0.0 OBS-URL: https://build.opensuse.org/request/show/248864 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=3
2014-09-13 08:03:29 +02:00
+STD_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) $(XSHM_LIBS) $(PNG_LIBS) \
$(JPEG_LIBS) $(TIFF_LIBS) $(ZLIB_LIBS) \
Accepting request 280593 from home:garloff:branches:graphics - Update to gmic-1.6.0.3: * New GIMP filters Degradation/Dirty, Rendering/Lightning, Layers/Colors to Layers * New commands rgb2int and int2rgb * New preferred .gmz image list file format * New -nlmeans denoising algorithm * Improvements to -bilateral, -peronamalik_flow, -apply_parallel, (= -ap), -split, -discard, -colormap, -displacement, vanvliet, -belnd_median * Bugfixes around -output codec, -eigen, -center3d, -normalize3d, -split3d, -label - Update to gmic-1.6.0.2: * New -peronamalik_flow (diffusion smoothing) * New -x_select_function1d and -x_color_curves * New --guided, -cumulate * New -apply_video, -video2files, -files2video, -average_video * New -dct and -idct * Improvements to -parallel * Improving -fitscreen and tiff -output * Improvements for -snapshot3d, -text, -fft, -ifft, -blur * Major ZArt update * Bugfixes for -deconvolve_fft, -bilateral, -gaussian, -srand - Update to gmic-1.6.0.1: * New: const(value) and button() typedefs to describe filters. * Filter return status can be a list now. * GIMP plug-in now has default capability to open display windows. * New -x_segment (Contours/Extract Foreground). * Double underscore vars are thread shared globals. * New -x_select_color, -x_select_palette, -input_gpl, -x_colorize * C++11 support in CImg, avoiding uneeded image copies OBS-URL: https://build.opensuse.org/request/show/280593 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=4
2015-01-09 16:02:09 +01:00
- $(EXR_LIBS) $(FFTW_LIBS) $(OPENCV_LIBS) # $(XSHM_LIBS) # $(MAGICK_LIBS)
+ $(EXR_LIBS) $(FFTW_LIBS) # $(OPENCV_LIBS) # $(MAGICK_LIBS)
Accepting request 248864 from home:garloff:branches:graphics Upgrade to 1.6.0.0 OBS-URL: https://build.opensuse.org/request/show/248864 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=3
2014-09-13 08:03:29 +02:00
# Unix : Minimal build.
-MINIMAL_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) \
Accepting request 280593 from home:garloff:branches:graphics - Update to gmic-1.6.0.3: * New GIMP filters Degradation/Dirty, Rendering/Lightning, Layers/Colors to Layers * New commands rgb2int and int2rgb * New preferred .gmz image list file format * New -nlmeans denoising algorithm * Improvements to -bilateral, -peronamalik_flow, -apply_parallel, (= -ap), -split, -discard, -colormap, -displacement, vanvliet, -belnd_median * Bugfixes around -output codec, -eigen, -center3d, -normalize3d, -split3d, -label - Update to gmic-1.6.0.2: * New -peronamalik_flow (diffusion smoothing) * New -x_select_function1d and -x_color_curves * New --guided, -cumulate * New -apply_video, -video2files, -files2video, -average_video * New -dct and -idct * Improvements to -parallel * Improving -fitscreen and tiff -output * Improvements for -snapshot3d, -text, -fft, -ifft, -blur * Major ZArt update * Bugfixes for -deconvolve_fft, -bilateral, -gaussian, -srand - Update to gmic-1.6.0.1: * New: const(value) and button() typedefs to describe filters. * Filter return status can be a list now. * GIMP plug-in now has default capability to open display windows. * New -x_segment (Contours/Extract Foreground). * Double underscore vars are thread shared globals. * New -x_select_color, -x_select_palette, -input_gpl, -x_colorize * C++11 support in CImg, avoiding uneeded image copies OBS-URL: https://build.opensuse.org/request/show/280593 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=4
2015-01-09 16:02:09 +01:00
- ${TIFF_CFLAGS} ${PNG_CFLAGS} $(ZLIB_CFLAGS) $(FFTW_CFLAGS) $(CHECKIMAGE_CFLAGS) $(OPENCV_CFLAGS)
Accepting request 248864 from home:garloff:branches:graphics Upgrade to 1.6.0.0 OBS-URL: https://build.opensuse.org/request/show/248864 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=3
2014-09-13 08:03:29 +02:00
-MINIMAL_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) \
Accepting request 280593 from home:garloff:branches:graphics - Update to gmic-1.6.0.3: * New GIMP filters Degradation/Dirty, Rendering/Lightning, Layers/Colors to Layers * New commands rgb2int and int2rgb * New preferred .gmz image list file format * New -nlmeans denoising algorithm * Improvements to -bilateral, -peronamalik_flow, -apply_parallel, (= -ap), -split, -discard, -colormap, -displacement, vanvliet, -belnd_median * Bugfixes around -output codec, -eigen, -center3d, -normalize3d, -split3d, -label - Update to gmic-1.6.0.2: * New -peronamalik_flow (diffusion smoothing) * New -x_select_function1d and -x_color_curves * New --guided, -cumulate * New -apply_video, -video2files, -files2video, -average_video * New -dct and -idct * Improvements to -parallel * Improving -fitscreen and tiff -output * Improvements for -snapshot3d, -text, -fft, -ifft, -blur * Major ZArt update * Bugfixes for -deconvolve_fft, -bilateral, -gaussian, -srand - Update to gmic-1.6.0.1: * New: const(value) and button() typedefs to describe filters. * Filter return status can be a list now. * GIMP plug-in now has default capability to open display windows. * New -x_segment (Contours/Extract Foreground). * Double underscore vars are thread shared globals. * New -x_select_color, -x_select_palette, -input_gpl, -x_colorize * C++11 support in CImg, avoiding uneeded image copies OBS-URL: https://build.opensuse.org/request/show/280593 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=4
2015-01-09 16:02:09 +01:00
- ${TIFF_LIBS} ${PNG_LIBS} $(ZLIB_LIBS) $(FFTW_LIBS) $(OPENCV_LIBS)
+MINIMAL_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) \
+ ${TIFF_CFLAGS} ${PNG_CFLAGS} $(ZLIB_CFLAGS) $(FFTW_CFLAGS) $(CHECKIMAGE_CFLAGS) # $(OPENCV_CFLAGS)
Accepting request 248864 from home:garloff:branches:graphics Upgrade to 1.6.0.0 OBS-URL: https://build.opensuse.org/request/show/248864 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=3
2014-09-13 08:03:29 +02:00
+MINIMAL_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) $(XSHM_LIBS) \
Accepting request 280593 from home:garloff:branches:graphics - Update to gmic-1.6.0.3: * New GIMP filters Degradation/Dirty, Rendering/Lightning, Layers/Colors to Layers * New commands rgb2int and int2rgb * New preferred .gmz image list file format * New -nlmeans denoising algorithm * Improvements to -bilateral, -peronamalik_flow, -apply_parallel, (= -ap), -split, -discard, -colormap, -displacement, vanvliet, -belnd_median * Bugfixes around -output codec, -eigen, -center3d, -normalize3d, -split3d, -label - Update to gmic-1.6.0.2: * New -peronamalik_flow (diffusion smoothing) * New -x_select_function1d and -x_color_curves * New --guided, -cumulate * New -apply_video, -video2files, -files2video, -average_video * New -dct and -idct * Improvements to -parallel * Improving -fitscreen and tiff -output * Improvements for -snapshot3d, -text, -fft, -ifft, -blur * Major ZArt update * Bugfixes for -deconvolve_fft, -bilateral, -gaussian, -srand - Update to gmic-1.6.0.1: * New: const(value) and button() typedefs to describe filters. * Filter return status can be a list now. * GIMP plug-in now has default capability to open display windows. * New -x_segment (Contours/Extract Foreground). * Double underscore vars are thread shared globals. * New -x_select_color, -x_select_palette, -input_gpl, -x_colorize * C++11 support in CImg, avoiding uneeded image copies OBS-URL: https://build.opensuse.org/request/show/280593 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=4
2015-01-09 16:02:09 +01:00
+ ${TIFF_LIBS} ${PNG_LIBS} $(ZLIB_LIBS) $(FFTW_LIBS) # $(OPENCV_LIBS)
Accepting request 248864 from home:garloff:branches:graphics Upgrade to 1.6.0.0 OBS-URL: https://build.opensuse.org/request/show/248864 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=3
2014-09-13 08:03:29 +02:00
# Unix : Static build.
Accepting request 280593 from home:garloff:branches:graphics - Update to gmic-1.6.0.3: * New GIMP filters Degradation/Dirty, Rendering/Lightning, Layers/Colors to Layers * New commands rgb2int and int2rgb * New preferred .gmz image list file format * New -nlmeans denoising algorithm * Improvements to -bilateral, -peronamalik_flow, -apply_parallel, (= -ap), -split, -discard, -colormap, -displacement, vanvliet, -belnd_median * Bugfixes around -output codec, -eigen, -center3d, -normalize3d, -split3d, -label - Update to gmic-1.6.0.2: * New -peronamalik_flow (diffusion smoothing) * New -x_select_function1d and -x_color_curves * New --guided, -cumulate * New -apply_video, -video2files, -files2video, -average_video * New -dct and -idct * Improvements to -parallel * Improving -fitscreen and tiff -output * Improvements for -snapshot3d, -text, -fft, -ifft, -blur * Major ZArt update * Bugfixes for -deconvolve_fft, -bilateral, -gaussian, -srand - Update to gmic-1.6.0.1: * New: const(value) and button() typedefs to describe filters. * Filter return status can be a list now. * GIMP plug-in now has default capability to open display windows. * New -x_segment (Contours/Extract Foreground). * Double underscore vars are thread shared globals. * New -x_select_color, -x_select_palette, -input_gpl, -x_colorize * C++11 support in CImg, avoiding uneeded image copies OBS-URL: https://build.opensuse.org/request/show/280593 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=4
2015-01-09 16:02:09 +01:00
#STATIC_PATH = $(USR)/${LIB}/x86_64-linux-gnu
STATIC_PATH=$(USR)/$(LIB)
Reference in New Issue Copy Permalink