Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (cd710f48894a3b27f86f996d7a09831b775dcd15)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (cd710f48894a3b27f86f996d7a09831b775dcd15)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (cd710f48894a3b27f86f996d7a09831b775dcd15)
  • Date: Tue, 7 Aug 2012 18:02:36 -0500
GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

graphics/gmic/BUILD | 1
graphics/gmic/DETAILS | 4 -
graphics/gmic/HISTORY | 6 +
graphics/gmic/INSTALL | 1
graphics/gmic/PRE_BUILD | 6 -
graphics/gmic/opencv-buildfix.patch | 32 ++++++++++
graphics/gmic/patch-configure | 113
------------------------------------
graphics/gmic/patch-src_Makefile | 56 -----------------
8 files changed, 44 insertions(+), 175 deletions(-)

New commits:
commit cd710f48894a3b27f86f996d7a09831b775dcd15
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

gmic 1.5.1.7

diff --git a/graphics/gmic/BUILD b/graphics/gmic/BUILD
new file mode 100755
index 0000000..c4011d5
--- /dev/null
+++ b/graphics/gmic/BUILD
@@ -0,0 +1 @@
+PATH=$PATH:/usr/bin/qt4 make -C src all
diff --git a/graphics/gmic/DETAILS b/graphics/gmic/DETAILS
index 71c635b..aeac322 100755
--- a/graphics/gmic/DETAILS
+++ b/graphics/gmic/DETAILS
@@ -1,9 +1,9 @@
SPELL=gmic
- VERSION=1.5.0.4
+ VERSION=1.5.1.7
SOURCE="${SPELL}_${VERSION}.tar.gz"
SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SOURCE}
SOURCE_URL[1]=$SOURCEFORGE_URL/project/${SPELL}/old/${SOURCE}
-
SOURCE_HASH=sha512:35b37dd257e0b9558ea04a3886f39af6adece219fe6390917a90fcbfedde356ddd8301e53f90bcff60d986de7822e79cf3c2372e06b997a4763cde3349c021c6
+
SOURCE_HASH=sha512:1ed7b7ea4e00e418d3fe37c9a04a5805bfbbc358b50fe213c02ca5d040af9e9cb6a6e4df7b32fa695f2988eda8a176933af9d6aabbe51d7418aee7a180f2a2d3
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 4b67b42..6d3e973 100644
--- a/graphics/gmic/HISTORY
+++ b/graphics/gmic/HISTORY
@@ -1,3 +1,9 @@
+2012-08-07 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.5.1.7
+ * patch-configure, patch-src_Makefile: removed
+ * PRE_BUILD, opencv-buildfix.patch: patch from Arch added
+ * BUILD, INSTALL: added
+
2011-10-31 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: added "old" url as SOURCE_URL[1]

diff --git a/graphics/gmic/INSTALL b/graphics/gmic/INSTALL
new file mode 100755
index 0000000..ed46188
--- /dev/null
+++ b/graphics/gmic/INSTALL
@@ -0,0 +1 @@
+make -C src install
diff --git a/graphics/gmic/PRE_BUILD b/graphics/gmic/PRE_BUILD
index 3347453..86b5bee 100755
--- a/graphics/gmic/PRE_BUILD
+++ b/graphics/gmic/PRE_BUILD
@@ -1,5 +1,3 @@
-default_pre_build &&
+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
+patch -p1 < ${SPELL_DIRECTORY}/opencv-buildfix.patch
diff --git a/graphics/gmic/opencv-buildfix.patch
b/graphics/gmic/opencv-buildfix.patch
new file mode 100644
index 0000000..da32314
--- /dev/null
+++ b/graphics/gmic/opencv-buildfix.patch
@@ -0,0 +1,32 @@
+diff -wbBur gmic-1.5.1.7/src/Makefile gmic-1.5.1.7.q/src/Makefile
+--- gmic-1.5.1.7/src/Makefile 2012-07-26 12:59:34.000000000 +0400
++++ gmic-1.5.1.7.q/src/Makefile 2012-08-03 14:03:10.000000000 +0400
+@@ -296,7 +296,7 @@
+
+ zart: lib
+ ifneq ($(OS),Darwin)
+- cd ../zart && qmake-qt4 zart.pro && $(MAKE) && strip zart
++ cd ../zart && qmake zart.pro && $(MAKE) && strip zart
+ else
+ cd ../zart && qmake zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS)
$(OPT_CFLAGS)" "LDFLAGS=$(STD_MACOSX_LDFLAGS) $(OPT_LDFLAGS)"
+ endif
+@@ -403,6 +403,7 @@
+ 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
++ if test -d /usr/share/bash-completion/completions; then mkdir -p
$(DESTDIR)/usr/share/bash-completion/completions/; cp -f
gmic_bashcompletion.sh $(DESTDIR)/usr/share/bash-completion/completions/gmic;
fi
+ if test -d /etc/bash_completion.d/; then mkdir -p
$(DESTDIR)/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh
$(DESTDIR)/etc/bash_completion.d/gmic; fi
+ if test -d /opt/local/etc/bash_completion.d/; then mkdir -p
$(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh
$(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi
+
+diff -wbBur gmic-1.5.1.7/zart/zart.pro gmic-1.5.1.7.q/zart/zart.pro
+--- gmic-1.5.1.7/zart/zart.pro 2012-07-26 12:59:33.000000000 +0400
++++ gmic-1.5.1.7.q/zart/zart.pro 2012-08-03 12:32:27.000000000 +0400
+@@ -34,7 +34,7 @@
+ FORMS = ui/MainWindow.ui ui/DialogAbout.ui ui/DialogLicence.ui
+
+ !macx {
+- LIBS += -lX11 ../src/libgmic.a -lcxcore -lcv -lml -lhighgui -lml
-lfftw3
++ LIBS += -lX11 ../src/libgmic.a `pkg-config --libs opencv`
-lopencv_core -lopencv_ml -lopencv_highgui -lfftw3
+ } else {
+ LIBS += -lX11 ../src/libgmic.a `pkg-config opencv --libs` -lfftw3
+ }
diff --git a/graphics/gmic/patch-configure b/graphics/gmic/patch-configure
deleted file mode 100644
index a74f447..0000000
--- a/graphics/gmic/patch-configure
+++ /dev/null
@@ -1,113 +0,0 @@
-$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
deleted file mode 100644
index c79fcd4..0000000
--- a/graphics/gmic/patch-src_Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-$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


  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (cd710f48894a3b27f86f996d7a09831b775dcd15), Ladislav Hagara, 08/07/2012

Archive powered by MHonArc 2.6.24.

Top of Page