Date: Tue, 22 Mar 2016 21:57:05 +0000 (UTC) From: Ruslan Makhmatkhanov <rm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411677 - in head/graphics/gimp-gmic-plugin: . files Message-ID: <201603222157.u2MLv51e077838@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rm Date: Tue Mar 22 21:57:05 2016 New Revision: 411677 URL: https://svnweb.freebsd.org/changeset/ports/411677 Log: graphics/gimp-gmic-plugin: update to 1.6.9 This update also solving problem with presets downloading, mentioned in PR. PR: 205257 MFH: 2016Q1 Added: head/graphics/gimp-gmic-plugin/files/patch-gmic__gimp.cpp (contents, props changed) Modified: head/graphics/gimp-gmic-plugin/Makefile head/graphics/gimp-gmic-plugin/distinfo head/graphics/gimp-gmic-plugin/files/patch-Makefile Modified: head/graphics/gimp-gmic-plugin/Makefile ============================================================================== --- head/graphics/gimp-gmic-plugin/Makefile Tue Mar 22 21:14:56 2016 (r411676) +++ head/graphics/gimp-gmic-plugin/Makefile Tue Mar 22 21:57:05 2016 (r411677) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= gmic -PORTVERSION= 1.6.0.0 -PORTREVISION= 4 +PORTVERSION= 1.6.9 CATEGORIES= graphics MASTER_SITES= http://gmic.eu/files/source/ PKGNAMEPREFIX= gimp- @@ -14,6 +13,7 @@ COMMENT= GREYC's Magic Image Converter LIB_DEPENDS= libGraphicsMagick++.so:${PORTSDIR}/graphics/GraphicsMagick \ libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ + libopencv_legacy.so:${PORTSDIR}/graphics/opencv \ libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick \ libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ libfftw3.so:${PORTSDIR}/math/fftw3 \ @@ -25,32 +25,40 @@ BASH_RUN_DEPENDS= bash:${PORTSDIR}/shell WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src -USES= gmake localbase pkgconfig +USES= dos2unix gmake localbase pkgconfig USE_GCC= yes USE_GNOME= gtk20 USE_XORG= x11 xext xrandr +DOS2UNIX_FILES= Makefile PLUGIN_DIR?= libexec/gimp/2.2/plug-ins PLIST_SUB+= PLUGIN_DIR=${PLUGIN_DIR} CFLAGS:= ${CFLAGS:N-O*:N-pipe} CXXFLAGS:= ${CXXFLAGS:N-O*:N-pipe} +DOTLESS_VER= ${PORTVERSION:S/.//g} PLIST_FILES= bin/gmic \ man/man1/gmic.1.gz \ - %%BASH%%etc/bash_completion.d/gmic_bashcompletion.sh \ - %%PLUGIN_DIR%%/gmic_gimp + %%BASH%%etc/bash_completion.d/gmic \ + %%PLUGIN_DIR%%/gmic_gimp \ + %%PLUGIN_DIR%%/cli_update${DOTLESS_VER}.gmic \ + %%PLUGIN_DIR%%/gimp_update${DOTLESS_VER}.gmic EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} PORTEXAMPLES= gmic_in_script.scm gmic_use_lib.cpp post-patch: @${REINPLACE_CMD} -e 's#/usr/X11R6#${PREFIX}#g' \ + -e 's#/usr/local#${LOCALBASE}#g' \ ${WRKSRC}/Makefile do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${PLUGIN_DIR} ${INSTALL_PROGRAM} ${WRKSRC}/gmic_gimp ${STAGEDIR}${PREFIX}/${PLUGIN_DIR} + ${INSTALL_DATA} ${WRKSRC}/../resources/cli_update${DOTLESS_VER}.gmic \ + ${WRKSRC}/../resources/gimp_update${DOTLESS_VER}.gmic \ + ${STAGEDIR}${PREFIX}/${PLUGIN_DIR} ${INSTALL_PROGRAM} ${WRKSRC}/gmic ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/../man/gmic.1.gz ${STAGEDIR}${MAN1PREFIX}/man/man1 @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} @@ -58,6 +66,6 @@ do-install: do-install-BASH-on: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d ${INSTALL_SCRIPT} ${WRKSRC}/../resources/gmic_bashcompletion.sh \ - ${STAGEDIR}${PREFIX}/etc/bash_completion.d + ${STAGEDIR}${PREFIX}/etc/bash_completion.d/gmic .include <bsd.port.mk> Modified: head/graphics/gimp-gmic-plugin/distinfo ============================================================================== --- head/graphics/gimp-gmic-plugin/distinfo Tue Mar 22 21:14:56 2016 (r411676) +++ head/graphics/gimp-gmic-plugin/distinfo Tue Mar 22 21:57:05 2016 (r411677) @@ -1,2 +1,2 @@ -SHA256 (gmic_1.6.0.0.tar.gz) = 2aa53ebab4c361c5401e23142a31b06a38ef565c533d1326d31f985f5c0c2da5 -SIZE (gmic_1.6.0.0.tar.gz) = 2818394 +SHA256 (gmic_1.6.9.tar.gz) = 8b836b4ac02a2d3963384951b6e00f2d8e19ede0b49ee93b041ef227cf9dd794 +SIZE (gmic_1.6.9.tar.gz) = 3278273 Modified: head/graphics/gimp-gmic-plugin/files/patch-Makefile ============================================================================== --- head/graphics/gimp-gmic-plugin/files/patch-Makefile Tue Mar 22 21:14:56 2016 (r411676) +++ head/graphics/gimp-gmic-plugin/files/patch-Makefile Tue Mar 22 21:57:05 2016 (r411677) @@ -1,64 +1,56 @@ ---- Makefile.orig 2014-08-21 07:47:10 UTC +--- Makefile.orig 2016-03-22 21:02:38 UTC +++ Makefile -@@ -48,7 +48,7 @@ - # Set correct variables and paths. - #---------------------------------- - OS := $(shell uname) --CC = g++ -+CC = $(CXX) - ifeq ($(OS),Linux) - OS = Unix - endif -@@ -63,7 +63,7 @@ - USR = /opt/local +@@ -158,14 +158,14 @@ OPENMP_LIBS = -lgomp + # This requires the presence of the X11 include and library files. + ifneq ($(OS),Darwin) + X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" `pkg-config --cflags x11 || echo -I/usr/X11R6/include` #-Dcimg_use_xrandr +-X11_LIBS = `pkg-config --libs x11 || echo -L/usr/X11R6/lib -lX11` -lpthread #`pkg-config --libs xrandr || echo -lXrandr` ++X11_LIBS = `pkg-config --libs x11 || echo -L/usr/X11R6/lib -lX11` $(PTHREAD_LIBS) #`pkg-config --libs xrandr || echo -lXrandr` + else + ifeq (,$(wildcard /usr/X11R6)) + X11_CFLAGS = -Dcimg_display=0 -Dcimg_appname=\\\"gmic\\\" #-Dcimg_use_xrandr +-X11_LIBS = -lpthread #`pkg-config --libs xrandr || echo -lXrandr` ++X11_LIBS = $(PTHREAD_LIBS) #`pkg-config --libs xrandr || echo -lXrandr` else - PLUGINDIR = `gimptool-2.0 --gimpplugindir`/plug-ins --USR = /usr -+USR = /usr/X11R6 - endif - ifeq ($(OSTYPE),msys) - EXE = .exe -@@ -136,7 +136,7 @@ - # 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 + 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_LIBS = -L/usr/X11R6/lib -lX11 $(PTHREAD_LIBS) #`pkg-config --libs xrandr || echo -lXrandr` + endif + endif + # Flags to enable fast display, using XShm. +@@ -287,7 +287,7 @@ STD_GIMP_CFLAGS += $(PARALLEL_CFLAGS) $( + STD_GIMP_LIBS += $(PARALLEL_LIBS) $(X11_LIBS) + else # Windows. + STD_GIMP_CFLAGS += $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(GDI32_CFLAGS) +-STD_GIMP_LIBS += -mwindows $(PARALLEL_LIBS) $(OPENMP_LIBS) $(GDI32_LIBS) -lpthread -DPSAPI_VERSION=1 -lpsapi ++STD_GIMP_LIBS += -mwindows $(PARALLEL_LIBS) $(OPENMP_LIBS) $(GDI32_LIBS) $(PTHREAD_LIBS) -DPSAPI_VERSION=1 -lpsapi + endif + endif - # Flags to enable image display, using GDI32. - # This requires the presence of the GDI32 include and library files. -@@ -293,6 +293,12 @@ +@@ -323,7 +323,7 @@ ifeq ($(OS),Unix) @echo "**" - $(MAKE) linux gimp lib # zart + @echo "** Start building G'MIC with default Unix configuration." + @echo "**" +- $(MAKE) cli gimp lib zart ++ $(MAKE) cli gimp else -+ifeq ($(OS),FreeBSD) -+ @echo "**" -+ @echo "** FreeBSD configuration" -+ @echo "**" -+ $(MAKE) freebsd gimp -+else ifeq ($(OS),Darwin) @echo "**" - @echo "** MacOSX configuration." -@@ -305,9 +311,10 @@ - $(MAKE) windows gimp +@@ -339,7 +339,7 @@ endif endif + + cli: +- $(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic ++ $(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic + $(STRIP) gmic$(EXE) + + cli_s: +@@ -349,7 +349,7 @@ ifeq ($(OS),Darwin) endif -+endif gimp: -- $(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS) $(OPT_LIBS)" "STRIP_EXE=1" gmic_gimp -+ $(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS)" "LIBS=$(STD_GIMP_LIBS)" "STRIP_EXE=1" gmic_gimp +- $(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS)" gmic_gimp ++ $(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS)" gmic_gimp lib: - $(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_LIB_LIBS) $(OPT_LIBS)" gmic_lib -@@ -323,6 +330,9 @@ - linux: - $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS)" "STRIP_EXE=1" gmic - -+freebsd: -+ $(MAKE) "CFLAGS+=$(STD_UNIX_CFLAGS)" "LIBS=$(STD_UNIX_LIBS)" "STRIP_EXE=1" gmic -+ - solaris: - $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic - + $(MAKE) "CFLAGS+=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_LIB_LIBS)" libgmic Added: head/graphics/gimp-gmic-plugin/files/patch-gmic__gimp.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gimp-gmic-plugin/files/patch-gmic__gimp.cpp Tue Mar 22 21:57:05 2016 (r411677) @@ -0,0 +1,13 @@ +--- gmic_gimp.cpp.orig 2016-02-05 13:45:21 UTC ++++ gmic_gimp.cpp +@@ -2724,10 +2724,6 @@ void process_image(const char *const com + PROCESS_MEMORY_COUNTERS pmc; + if (GetProcessMemoryInfo(GetCurrentProcess(),&pmc,sizeof(pmc))) + used_memory = (unsigned long)(pmc.WorkingSetSize/1024/1024); +-#elif cimg_OS==1 // #if cimg_OS==2 +- CImg<char> st; st.load_raw("/proc/self/status",512); st.back() = 0; +- const char *const s = std::strstr(st,"VmRSS:"); +- if (s && cimg_sscanf(s + 7,"%u",&used_memory)==1) used_memory/=1024; + #endif // #if cimg_OS==2 + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603222157.u2MLv51e077838>