Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 440590 Details for
Bug 581206
media-plugins/gimp-gmic-1.7.1 version bump
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
gmic-1.7.4-makefile.patch
gmic-1.7.4-makefile.patch (text/plain), 6.73 KB, created by
DrSlony
on 2016-07-13 17:00:11 UTC
(
hide
)
Description:
gmic-1.7.4-makefile.patch
Filename:
MIME Type:
Creator:
DrSlony
Created:
2016-07-13 17:00:11 UTC
Size:
6.73 KB
patch
obsolete
>diff --git src/Makefile src/Makefile >index 8720236..21d6193 100644 >--- src/Makefile >+++ src/Makefile >@@ -108,6 +108,7 @@ SO = .dll > PIC = > endif > >+$(info $$NOSTRIP is [${NOSTRIP}]) > ifdef NOSTRIP > STRIP = echo skip strip > else >@@ -127,7 +128,7 @@ MANDATORY_LIBS = `pkg-config --libs zlib || echo -lz` > ifndef NO_SRIPDLIB > MANDATORY_CFLAGS += -std=c++11 > endif >-MANDATORY_LIBS += -L$(USR)/$(LIB) >+#MANDATORY_LIBS += -L$(USR)/$(LIB) > ifeq ($(notdir $(CXX)),g++) > MANDATORY_CFLAGS += -Wall -Wextra > MANDATORY_LIBS += -lm >@@ -188,14 +189,14 @@ ifeq (,$(wildcard /usr/X11R6)) > X11_CFLAGS = -Dcimg_display=0 -Dcimg_appname=\\\"gmic\\\" #-Dcimg_use_xrandr > X11_LIBS = -lpthread #`pkg-config --libs xrandr || echo -lXrandr` > else >-X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" `pkg-config --cflags x11 || echo -I/usr/X11R6/include` #-Dcimg_use_xrandr >-X11_LIBS = -L/usr/X11R6/lib -lX11 -lpthread #`pkg-config --libs xrandr || echo -lXrandr` >+X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" #`pkg-config --cflags x11 || echo -I/usr/X11R6/include` #-Dcimg_use_xrandr >+X11_LIBS = -lX11 -lpthread #`pkg-config --libs xrandr || echo -lXrandr` > endif > endif > # Flags to enable fast display, using XShm. > # This requires the presence of the X11 extension include and library files. >-XSHM_CFLAGS = -Dcimg_use_xshm `pkg-config --cflags xcb-shm` >-XSHM_LIBS = `pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib -lXext` >+XSHM_CFLAGS = -Dcimg_use_xshm #`pkg-config --cflags xcb-shm` >+XSHM_LIBS = -lXext #`pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib -lXext` > > # Flags to enable image display, using GDI32. > # This requires the presence of the GDI32 include and library files (Windows only). >@@ -229,8 +230,8 @@ TIFF_LIBS = `pkg-config --libs libtiff-4 || echo -ltiff` > > # Flags to enable native support for MINC2 image files, using the MINC2 library. > # ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide ) >-MINC2_CFLAGS = -Dcimg_use_minc2 -I${HOME}/local/include >-MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib >+MINC2_CFLAGS = -Dcimg_use_minc2 #-I${HOME}/local/include >+MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz #-L${HOME}/local/lib > > # Flags to enable native support for downloading files from the network. > # ( http://curl.haxx.se/libcurl/ ) >@@ -449,13 +450,13 @@ endif > > libgmic.o: gmic.cpp gmic.h gmic_stdlib.h CImg.h > $(CXX) -o libgmic.o -c gmic.cpp $(PIC) $(CFLAGS) >-libgmic: libgmic.o use_libgmic.cpp >- ar rcs libgmic.a libgmic.o >+libgmic: libgmic.o #use_libgmic.cpp >+ $(AR) rcs libgmic.a libgmic.o > ifeq ($(OS),Darwin) > $(CXX) -shared -o libgmic.so libgmic.o $(LIBS) > else >- $(CXX) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so libgmic.o $(LIBS) >- $(CXX) -o use_libgmic use_libgmic.cpp -L. -lgmic $(LIBS) >+ $(CXX) $(LDFLAGS) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so libgmic.o $(LIBS) >+ #$(CXX) -o use_libgmic use_libgmic.cpp -L. -lgmic $(LIBS) > endif > > libcgmic.o: gmic.cpp gmic.h gmic_stdlib.h CImg.h >@@ -504,12 +505,12 @@ else > $(CXX) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` $(subst -L/opt/local,-L/tmp/skl/Gimp.app/Contents/Resources,$(shell gimptool-2.0$(EXE) --libs) $(CFLAGS) $(LIBS)) > endif > else >- $(CXX) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` `gimptool-2.0$(EXE) --libs` $(CFLAGS) $(LIBS) >+ $(CXX) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` $(CFLAGS) $(LDFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS) > endif > $(STRIP) gmic_gimp$(EXE) > > gmic: gmic.cpp gmic.h gmic_stdlib.h CImg.h >- $(CXX) -o gmic gmic.cpp -Dgmic_main $(CFLAGS) $(LIBS) >+ $(CXX) -o gmic gmic.cpp -Dgmic_main $(CFLAGS) $(LDFLAGS) $(LIBS) > > gmic_stdlib.h: > @echo -n "> Retrieve G'MIC Standard Library..." >@@ -582,21 +583,25 @@ stdlib: > # Generate bash completion script (requires 'gmic' to be installed first). > bashcompletion: > @mkdir -p ../resources >- @\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 > > # Generate man page (requires 'gmic' to be installed). > man: > @mkdir -p ../man >- @\gmic -v - gmic_stdlib.gmic raw:gmic_stdlib.gmic,uchar -__help man 2> ../man/gmic.1 >- @gzip -f ../man/gmic.1 >+ @./gmic -v - gmic_stdlib.gmic raw:gmic_stdlib.gmic,uchar -__help man 2> ../man/gmic.1 >+ #@gzip -f ../man/gmic.1 > > # Install/uninstall/clean procedures. >-install: >+install-gimp: > mkdir -p $(DESTDIR)$(PLUGINDIR)/ > cp -f gmic_gimp $(DESTDIR)$(PLUGINDIR)/ > cp -f ../resources/gmic_film_cluts.gmz $(DESTDIR)$(PLUGINDIR)/ >+ >+install-bin: > mkdir -p $(DESTDIR)$(USR)/$(BIN)/ > cp -f gmic $(DESTDIR)$(USR)/$(BIN)/ >+ >+install-lib: > mkdir -p $(DESTDIR)$(USR)/$(INCLUDE)/ > cp -f gmic.h $(DESTDIR)$(USR)/$(INCLUDE)/ > cp -f gmic_libc.h $(DESTDIR)$(USR)/$(INCLUDE)/ >@@ -610,15 +615,20 @@ ifneq ($(OS),Darwin) > cp -f libcgmic.so $(DESTDIR)$(USR)/$(LIB)/libcgmic.so.1.7.4 > ln -fs libcgmic.so.1.7.4 $(DESTDIR)$(USR)/$(LIB)/libcgmic.so.1 > ln -fs libcgmic.so.1 $(DESTDIR)$(USR)/$(LIB)/libcgmic.so >- cp -f ../zart/zart $(DESTDIR)$(USR)/$(BIN)/ >+ #cp -f ../zart/zart $(DESTDIR)$(USR)/$(BIN)/ > endif >+ >+install-man: > mkdir -p $(DESTDIR)$(USR)/share/man/ > mkdir -p $(DESTDIR)$(USR)/share/man/man1/ >- mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/ >- cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz >- cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz >+ #mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/ >+ #cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz >+ #cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz >+ cp -f ../man/gmic.1 $(DESTDIR)$(USR)/share/man/man1/gmic.1 >+ >+install-bash: > if [ -d /etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; fi >- if [ -d /opt/local/etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi >+ #if [ -d /opt/local/etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi > > uninstall: > rm -f $(DESTDIR)$(USR)/$(BIN)/gmic >@@ -631,8 +641,9 @@ uninstall: > rm -f $(DESTDIR)$(USR)/$(LIB)/libcgmic.so.1 > rm -f $(DESTDIR)$(USR)/$(LIB)/libcgmic$(SO) > rm -rf $(DESTDIR)$(USR)/share/doc/gmic/ >- rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz >- rm -f $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz >+ #rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz >+ #rm -f $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz >+ rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1 > > distclean: clean >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 581206
:
436296
|
436298
|
440588
| 440590