graphics/gmic: version 1.5.0.4

6 files changed, 184 insertions, 4 deletions

diff --git a/graphics/gmic/DEPENDS b/graphics/gmic/DEPENDS
index 24dd326f44..05924ff9e8 100755
--- a/graphics/gmic/DEPENDS
+++ b/graphics/gmic/DEPENDS
@@ -1,3 +1,2 @@
 depends gimp &&
-depends graphicsmagick &&
-depends opencv
+depends graphicsmagick
diff --git a/graphics/gmic/DETAILS b/graphics/gmic/DETAILS
index 4b6dbdc151..6023eef67a 100755
--- a/graphics/gmic/DETAILS
+++ b/graphics/gmic/DETAILS
@@ -1,8 +1,8 @@
            SPELL=gmic
-         VERSION=1.4.5.2
+         VERSION=1.5.0.4
           SOURCE="${SPELL}_${VERSION}.tar.gz"
    SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:bf1e804d3137e8f7690c35b45fdc6655a1789ac889e60b5ed58ef0a865762615a145b5a305b7eb82dbffab61a54f77351267aebfe24daf4c9211975620400580
+     SOURCE_HASH=sha512:35b37dd257e0b9558ea04a3886f39af6adece219fe6390917a90fcbfedde356ddd8301e53f90bcff60d986de7822e79cf3c2372e06b997a4763cde3349c021c6
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://gmic.sourceforge.net/"
       LICENSE[0]="CeCILL"
diff --git a/graphics/gmic/HISTORY b/graphics/gmic/HISTORY
index 073c25f27f..f3cbd134de 100644
--- a/graphics/gmic/HISTORY
+++ b/graphics/gmic/HISTORY
@@ -1,3 +1,10 @@
+2011-10-15 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* DETAILS: version 1.5.0.4
+	* DEPENDS: removed dependency on opencv since gmic doesn't compile
+	  with our version of opencv
+	* PRE_BUILD, patch-configure, patch-src_Makefile: adapted patches
+	  from FreeBSD to fix a compile error
+
 2010-11-20 Bor Kraljič <pyrobor@ver.si>
 	* CONFLICTS: added greycstoration-gimp-plugin & greycstoration (deprecated)
 	* DEPENDS, DETAILS: spell created, cleaned keywords, added LICENSE
diff --git a/graphics/gmic/PRE_BUILD b/graphics/gmic/PRE_BUILD
new file mode 100755
index 0000000000..3347453588
--- /dev/null
+++ b/graphics/gmic/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build      &&
+cd ${SOURCE_DIRECTORY} &&
+sedit 's:-lcv -lhighgui:-lopencv_legacy:' configure &&
+patch -p0 < ${SCRIPT_DIRECTORY}/patch-configure &&
+patch -p0 < ${SCRIPT_DIRECTORY}/patch-src_Makefile
diff --git a/graphics/gmic/patch-configure b/graphics/gmic/patch-configure
new file mode 100644
index 0000000000..a74f447e84
--- /dev/null
+++ b/graphics/gmic/patch-configure
@@ -0,0 +1,113 @@
+$FreeBSD: ports/graphics/gimp-gmic-plugin/files/patch-configure,v 1.3 2011/09/04 15:59:39 crees Exp $
+
+Unfortunately we can't do the usual patch configure.ac and run autoconf -- the
+tarball doesn't contain the autotools sources ><
+
+--- configure.orig	2011-08-23 18:18:22.000000000 +0400
++++ configure	2011-08-30 22:27:42.000000000 +0400
+@@ -5104,105 +5104,6 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cvSobel in -lcv" >&5
+-$as_echo_n "checking for cvSobel in -lcv... " >&6; }
+-if test "${ac_cv_lib_cv_cvSobel+set}" = set; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcv  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char cvSobel ();
+-int
+-main ()
+-{
+-return cvSobel ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_cv_cvSobel=yes
+-else
+-  ac_cv_lib_cv_cvSobel=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cv_cvSobel" >&5
+-$as_echo "$ac_cv_lib_cv_cvSobel" >&6; }
+-if test "x$ac_cv_lib_cv_cvSobel" = x""yes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBCV 1
+-_ACEOF
+-
+-  LIBS="-lcv $LIBS"
+-
+-else
+-
+-    echo "***"
+-    echo "** Fatal Error : Header or library files for 'OpenCV (core)' are missing but are mandatory to compile G'MIC. **"
+-    echo "***"
+-    exit -1
+-
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lhighgui" >&5
+-$as_echo_n "checking for main in -lhighgui... " >&6; }
+-if test "${ac_cv_lib_highgui_main+set}" = set; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lhighgui  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-
+-int
+-main ()
+-{
+-return main ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_highgui_main=yes
+-else
+-  ac_cv_lib_highgui_main=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_highgui_main" >&5
+-$as_echo "$ac_cv_lib_highgui_main" >&6; }
+-if test "x$ac_cv_lib_highgui_main" = x""yes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBHIGHGUI 1
+-_ACEOF
+-
+-  LIBS="-lhighgui $LIBS"
+-
+-else
+-
+-    echo "***"
+-    echo "** Fatal Error : Header or library files for 'OpenCV (highgui)' are missing but are mandatory to compile G'MIC. **"
+-    echo "***"
+-    exit -1
+-
+-fi
+-
+-
+ # Checks for header files.
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
diff --git a/graphics/gmic/patch-src_Makefile b/graphics/gmic/patch-src_Makefile
new file mode 100644
index 0000000000..c79fcd495b
--- /dev/null
+++ b/graphics/gmic/patch-src_Makefile
@@ -0,0 +1,56 @@
+$FreeBSD: ports/graphics/gimp-gmic-plugin/files/patch-src_Makefile,v 1.3 2011/09/04 15:59:39 crees Exp $
+
+--- src/Makefile.orig	2011-08-23 18:18:27.000000000 +0400
++++ src/Makefile	2011-08-30 22:32:02.000000000 +0400
+@@ -142,15 +142,6 @@
+ ZLIB_CFLAGS = -Dcimg_use_zlib
+ ZLIB_LDFLAGS = -lz
+ 
+-# Flags to enable native support of webcams, using the OpenCV library.
+-OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include/opencv
+-ifeq ($(OS),Darwin)
+-OPENCV_LDFLAGS = -lopencv_core -lopencv_highgui   # Use this for OpenCV 2.2.0 !
+-else
+-OPENCV_LDFLAGS = -lcv -lhighgui
+-# OPENCV_LDFLAGS = -lopencv_core -lopencv_highgui   # Use this for OpenCV 2.2.0 !
+-endif
+-
+ # Flags to enable native support of most classical image file formats, using the GraphicsMagick++ library.
+ MAGICK_CFLAGS = -Dcimg_use_magick -I$(USR)/include/GraphicsMagick
+ ifeq ($(OS),Darwin)
+@@ -236,6 +227,14 @@
+ 	$(MAKE) gimp
+ 	$(MAKE) lib
+ else
++ifeq ($(OS),FreeBSD)
++	@echo "**"
++	@echo "** FreeBSD configuration"
++	@echo "**"
++	$(MAKE) freebsd
++	$(MAKE) bashcompletion
++	$(MAKE) gimp
++else
+ ifeq ($(OS),Darwin)
+ 	@echo "**"
+ 	@echo "** MacOSX configuration"
+@@ -252,9 +251,10 @@
+ 	$(MAKE) gimp
+ endif
+ endif
++endif
+ 
+ gimp:
+-	$(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" "STRIP_EXE=1" gmic_gimp
++	$(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS)" "STRIP_EXE=1" gmic_gimp
+ 
+ lib:
+ 	$(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS)" gmic_lib
+@@ -269,6 +269,9 @@
+ linux:
+ 	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
+ 
++freebsd:
++	$(MAKE) "CFLAGS+=$(STD_UNIX_CFLAGS)" "LDFLAGS+=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
++
+ custom:
+ 	$(MAKE) "CFLAGS=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(CUST_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic