Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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 (eaaaf84c13f4e1856990319ae941be6dd6344097)
  • Date: Sun, 21 Apr 2013 12:34:11 -0500

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

graphics/gmic/DETAILS | 4 ++--
graphics/gmic/HISTORY | 4 ++++
graphics/gmic/opencv-buildfix.patch | 28 ++++++++--------------------
3 files changed, 14 insertions(+), 22 deletions(-)

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

gmic 1.5.5.2

diff --git a/graphics/gmic/DETAILS b/graphics/gmic/DETAILS
index aeac322..69f0109 100755
--- a/graphics/gmic/DETAILS
+++ b/graphics/gmic/DETAILS
@@ -1,9 +1,9 @@
SPELL=gmic
- VERSION=1.5.1.7
+ VERSION=1.5.5.2
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:1ed7b7ea4e00e418d3fe37c9a04a5805bfbbc358b50fe213c02ca5d040af9e9cb6a6e4df7b32fa695f2988eda8a176933af9d6aabbe51d7418aee7a180f2a2d3
+
SOURCE_HASH=sha512:a0f2175aef8d93fa56bbc923793d59c716399231afedf391fcb1a9525ac2397ccb6ce1a542928f5c08d12ebd06af26ac5aec17fe7ae0d4c04e215bfac4ca586e
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 6d3e973..450c1fe 100644
--- a/graphics/gmic/HISTORY
+++ b/graphics/gmic/HISTORY
@@ -1,3 +1,7 @@
+2013-04-21 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.5.5.2
+ * opencv-buildfix.patch: updated
+
2012-08-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.5.1.7
* patch-configure, patch-src_Makefile: removed
diff --git a/graphics/gmic/opencv-buildfix.patch
b/graphics/gmic/opencv-buildfix.patch
index da32314..ae6f714 100644
--- a/graphics/gmic/opencv-buildfix.patch
+++ b/graphics/gmic/opencv-buildfix.patch
@@ -2,31 +2,19 @@ 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)"
+ 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
+ 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
- }
+ 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
+



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (eaaaf84c13f4e1856990319ae941be6dd6344097), Ladislav Hagara, 04/21/2013

Archive powered by MHonArc 2.6.24.

Top of Page