SF.net SVN: gar:[25605] csw/mgar/pkg/xastir/trunk

[cgrzemba at users.sourceforge.net]

Revision: 25605
          http://sourceforge.net/p/gar/code/25605
Author:   cgrzemba
Date:     2016-03-11 14:38:45 +0000 (Fri, 11 Mar 2016)
Log Message:
-----------
xastir/trunk: use graphicsmagick

Modified Paths:
--------------
    csw/mgar/pkg/xastir/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/xastir/trunk/files/0002-acinclude.patch
    csw/mgar/pkg/xastir/trunk/files/0003-map-graphicsmagick-linkerror.patch

Modified: csw/mgar/pkg/xastir/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xastir/trunk/Makefile	2016-03-11 11:15:14 UTC (rev 25604)
+++ csw/mgar/pkg/xastir/trunk/Makefile	2016-03-11 14:38:45 UTC (rev 25605)
@@ -12,29 +12,36 @@
 DISTFILES  = $(DISTNAME).tar.gz
 
 # studio ignores inline statement
-GARCOMPILER = GCC5
+GARCOMPILER = GCC4
 
-PATCHFILES = 0001-acinclude.m4.patch
+PATCHFILES += 0001-acinclude.m4.patch
+PATCHFILES += 0002-acinclude.patch
+PATCHFILES += 0003-map-graphicsmagick-linkerror.patch
 
-RUNTIME_DEP_PKGS_CSWxastir += CSWlibgdal1
+BUILD_DEP_PKGS += CSWgraphicsmagick-dev
+BUILD_DEP_PKGS += CSWliblcms2-dev
+BUILD_DEP_PKGS += CSWlibfreetype-dev
+BUILD_DEP_PKGS += CSWliblzma-dev
+
+RUNTIME_DEP_PKGS_CSWxastir += CSWlibgraphicsmagick-q16-3
 RUNTIME_DEP_PKGS_CSWxastir += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWxastir += CSWlibpcre1
 RUNTIME_DEP_PKGS_CSWxastir += CSWlibxpm4
 RUNTIME_DEP_PKGS_CSWxastir += CSWperl
 RUNTIME_DEP_PKGS_CSWxastir += CSWlibcurl4
-RUNTIME_DEP_PKGS_CSWxastir += CSWlibmagickcore6q16hdri2
 
 # use libdb-5 of database/berkeleydb-5, Solaris11
 CHECKPKG_OVERRIDES_CSWxastir += soname-not-found|libdb-5.3.so|is|needed|by|opt/csw/bin/xastir
 CHECKPKG_OVERRIDES_CSWxastir += discouraged-path-in-pkgmap|/opt/csw/share/doc/xastir/README.CVS
 
 CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --without-imagemagick
 
 include gar/category.mk
 
 pre-configure:
-	cd $(WORKSRC) && aclocal-1.13 \
+	cd $(WORKSRC) && aclocal-1.12 \
 	&& autoconf --force \
-	&& automake-1.13 -a -c -f \
+	&& automake-1.12 -a -c -f \
 	&& autoheader
 	@$(MAKECOOKIE)

Added: csw/mgar/pkg/xastir/trunk/files/0002-acinclude.patch
===================================================================
--- csw/mgar/pkg/xastir/trunk/files/0002-acinclude.patch	                        (rev 0)
+++ csw/mgar/pkg/xastir/trunk/files/0002-acinclude.patch	2016-03-11 14:38:45 UTC (rev 25605)
@@ -0,0 +1,11 @@
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -561,7 +561,7 @@ if test "${use_graphicsmagick}" = "yes"; then
+   if test "${use_graphicsmagick}" = "no"; then
+     AC_MSG_WARN(*** Cannot find GraphicsMagick include files: Building w/o GraphicsMagick support. ***)
+   else
+-    AC_CHECK_LIB([GraphicsMagick], [WriteImage], AC_DEFINE(HAVE_GRAPHICSMAGICK, 1, [GraphicsMagick image library]), use_graphicsmagick="no")
++    AC_CHECK_LIB([GraphicsMagick], [GmWriteImage], AC_DEFINE(HAVE_GRAPHICSMAGICK, 1, [GraphicsMagick image library]), use_graphicsmagick="no")
+     if test "${use_graphicsmagick}" = "no"; then
+       AC_MSG_WARN(*** Cannot find GraphicsMagick library files: Building w/o GraphicsMagick support. ***)
+     fi

Added: csw/mgar/pkg/xastir/trunk/files/0003-map-graphicsmagick-linkerror.patch
===================================================================
--- csw/mgar/pkg/xastir/trunk/files/0003-map-graphicsmagick-linkerror.patch	                        (rev 0)
+++ csw/mgar/pkg/xastir/trunk/files/0003-map-graphicsmagick-linkerror.patch	2016-03-11 14:38:45 UTC (rev 25605)
@@ -0,0 +1,33 @@
+--- a/src/map_OSM.c
++++ b/src/map_OSM.c
+@@ -1570,7 +1570,7 @@ void draw_OSM_map (Widget w,
+     image = ReadImage(image_info, &exception);
+ 
+     if (image == (Image *) NULL) {
+-        MagickWarning(exception.severity, exception.reason, exception.description);
++        _MagickWarning(exception.severity, exception.reason, exception.description);
+         //fprintf(stderr,"MagickWarning\n");
+ 
+ #ifdef USE_MAP_CACHE
+--- a/src/map_WMS.c
++++ b/src/map_WMS.c
+@@ -646,7 +646,7 @@ void draw_WMS_map (Widget w,
+     image = ReadImage(image_info, &exception);
+ 
+     if (image == (Image *) NULL) {
+-        MagickWarning(exception.severity, exception.reason, exception.description);
++        _MagickWarning(exception.severity, exception.reason, exception.description);
+         //fprintf(stderr,"MagickWarning\n");
+ 
+ #ifdef USE_MAP_CACHE
+--- a/src/map_tiger.c
++++ b/src/map_tiger.c
+@@ -591,7 +591,7 @@ void draw_tiger_map (Widget w,
+     image = ReadImage(image_info, &exception);
+ 
+     if (image == (Image *) NULL) {
+-        MagickWarning(exception.severity, exception.reason, exception.description);
++        _MagickWarning(exception.severity, exception.reason, exception.description);
+         //fprintf(stderr,"MagickWarning\n");
+ 
+ #ifdef USE_MAP_CACHE

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.