pool/mapserver
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 281992 from home:tzotsos:Application:Geo

Browse Source 
Thanks to Tigerfoot: fixed build failure for 13.2 and cleanup

OBS-URL: https://build.opensuse.org/request/show/281992
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/mapserver?expand=0&rev=98
This commit is contained in:
Angelos Tzotsos 2015-01-19 21:21:14 +00:00 committed by Git OBS Bridge
parent ba1eb1e111
commit 4ee2647d06
4 changed files with 348 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
4875-incorrect-blending-tif.patch Normal file
View File

@ -0,0 +1,67 @@
From bc5c58296f29f0fabb117c9111ca73b723a642d0 Mon Sep 17 00:00:00 2001
From: Thomas Bonfort <thomas.bonfort@gmail.com>
Date: Tue, 25 Feb 2014 15:14:23 +0100
Subject: [PATCH 1/2] Fix blending of semi-opaque pixels in average and
bilinear resamplers (#4875)
---
mapresample.c | 2 +-
maputil.c | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/mapresample.c b/mapresample.c
index 419d07b..7980355 100644
--- a/mapresample.c
+++ b/mapresample.c
@@ -671,7 +671,7 @@ msAverageRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb,
alpha = (unsigned char)
MAX(0,MIN(255,255*dfAlpha01+0.5));
- RB_SET_PIXEL(dst_rb,nDstX,nDstY,
+ RB_MIX_PIXEL(dst_rb,nDstX,nDstY,
red, green, blue, alpha );
}
#ifdef USE_GD
diff --git a/maputil.c b/maputil.c
index ef0d309..34ead4d 100644
--- a/maputil.c
+++ b/maputil.c
@@ -2096,19 +2096,19 @@ void msAlphaBlendPM( unsigned char red_src, unsigned char green_src,
/* Cases with actual blending. */
/* -------------------------------------------------------------------- */
if(!alpha_dst || *alpha_dst == 255) {
- int weight_dst = 256 - alpha_src;
+ int weight_dst = 255 - alpha_src;
- *red_dst = (256 * red_src + *red_dst * weight_dst) >> 8;
- *green_dst = (256 * green_src + *green_dst * weight_dst) >> 8;
- *blue_dst = (256 * blue_src + *blue_dst * weight_dst) >> 8;
+ *red_dst = (alpha_src * red_src + *red_dst * weight_dst) >> 8;
+ *green_dst = (alpha_src * green_src + *green_dst * weight_dst) >> 8;
+ *blue_dst = (alpha_src * blue_src + *blue_dst * weight_dst) >> 8;
} else {
- int weight_dst = (256 - alpha_src);
+ int weight_dst = (255 - alpha_src);
- *red_dst = (256 * red_src + *red_dst * weight_dst) >> 8;
- *green_dst = (256 * green_src + *green_dst * weight_dst) >> 8;
- *blue_dst = (256 * blue_src + *blue_dst * weight_dst) >> 8;
+ *red_dst = (alpha_src * red_src + *red_dst * weight_dst) >> 8;
+ *green_dst = (alpha_src * green_src + *green_dst * weight_dst) >> 8;
+ *blue_dst = (alpha_src * blue_src + *blue_dst * weight_dst) >> 8;
- *alpha_dst = (256 * alpha_src + *alpha_dst * weight_dst) >> 8;
+ *alpha_dst = (255 * alpha_src + *alpha_dst * weight_dst) >> 8;
}
}
From 9aacff0d49f9dd4ea300e9e2dc68792f21159d88 Mon Sep 17 00:00:00 2001
From: Thomas Bonfort <thomas.bonfort@gmail.com>
Date: Tue, 25 Feb 2014 16:05:20 +0100
Subject: [PATCH 2/2] update submodule
---
msautotest | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

114
4912-php56-php-input.patch Normal file
View File

@ -0,0 +1,114 @@
From 1a0a11f2690b079eb53db982f1d7cdf9e3ecf80f Mon Sep 17 00:00:00 2001
From: Bas Couwenberg <sebastic@xs4all.nl>
Date: Sat, 26 Apr 2014 13:46:41 +0200
Subject: [PATCH 1/2] Use php://input instead of raw_post_data to support PHP
5.6.
php_stream handling largely taken from PECL HTTP:
http://git.php.net/?p=pecl/http/pecl_http.git;a=blob;f=php_http_env.c;h=30ee32d7c68b3341aeaeb24c909b102537caccdf;hb=8ec2c825719482e62222163a300b0e18319591d0#l229
Copyright (c) 2004-2014, Michael Wallner <mike@iworks.at>.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Bug-Debian: https://bugs.debian.org/745600
---
mapscript/php/owsrequest.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/mapscript/php/owsrequest.c b/mapscript/php/owsrequest.c
index 428c8dd..8fa48c7 100644
--- a/mapscript/php/owsrequest.c
+++ b/mapscript/php/owsrequest.c
@@ -32,6 +32,7 @@
#include "php_mapscript.h"
#include "SAPI.h"
#include "php_variables.h"
+#include "php_streams.h"
char *owsrequest_getenv(const char *name, void *thread_context);
@@ -193,9 +194,29 @@ PHP_METHOD(OWSRequestObj, loadParams)
cgirequestObj_loadParams(php_owsrequest->cgirequest, owsrequest_getenv, NULL, 0, thread_context);
}
} else {
+ php_stream *s = php_stream_temp_new();
+#if PHP_VERSION_ID >= 50600
+ php_stream *input = php_stream_open_wrapper("php://input", "r", 0, NULL);
+
+ /* php://input does not support stat */
+ php_stream_copy_to_stream_ex(input, s, -1, NULL);
+ php_stream_close(input);
+
+ php_stream_rewind(s);
+
+ char *raw_post_data = NULL;
+ long raw_post_data_length = 0;
+
+ raw_post_data_length = php_stream_copy_to_mem(s, raw_post_data, -1, 0);
+
+ cgirequestObj_loadParams(php_owsrequest->cgirequest, owsrequest_getenv,
+ raw_post_data,
+ raw_post_data_length, thread_context);
+#else
cgirequestObj_loadParams(php_owsrequest->cgirequest, owsrequest_getenv,
SG(request_info).raw_post_data,
SG(request_info).raw_post_data_length, thread_context);
+#endif
}
}
From 0ed9072658a0262f1273ba8ee74dad30229597ec Mon Sep 17 00:00:00 2001
From: Bas Couwenberg <sebastic@xs4all.nl>
Date: Sat, 26 Apr 2014 16:26:34 +0200
Subject: [PATCH 2/2] Minor fixes incorporating Thomas' feedback.
---
mapscript/php/owsrequest.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/mapscript/php/owsrequest.c b/mapscript/php/owsrequest.c
index 8fa48c7..f01d361 100644
--- a/mapscript/php/owsrequest.c
+++ b/mapscript/php/owsrequest.c
@@ -32,7 +32,9 @@
#include "php_mapscript.h"
#include "SAPI.h"
#include "php_variables.h"
+#if PHP_VERSION_ID >= 50600
#include "php_streams.h"
+#endif
char *owsrequest_getenv(const char *name, void *thread_context);
@@ -194,8 +196,8 @@ PHP_METHOD(OWSRequestObj, loadParams)
cgirequestObj_loadParams(php_owsrequest->cgirequest, owsrequest_getenv, NULL, 0, thread_context);
}
} else {
- php_stream *s = php_stream_temp_new();
#if PHP_VERSION_ID >= 50600
+ php_stream *s = php_stream_temp_new();
php_stream *input = php_stream_open_wrapper("php://input", "r", 0, NULL);
/* php://input does not support stat */

15
mapserver.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Sat Aug 30 18:34:09 UTC 2014 - bruno@ioda-net.ch
- packaging spec-cleaner
- fixed compilation error with php 5.6.0
upstream patch 4912-php56-php-input.patch
supported also php 5.5x
- fixed blending tif error
upstream patch 4875-incorrect-blending-tif.patch
-------------------------------------------------------------------
Sun Mar 30 18:52:41 UTC 2014 - bruno@ioda-net.ch
- use correct ruby rpm macros
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 2 20:30:07 UTC 2014 - bruno@ioda-net.ch Thu Jan 2 20:30:07 UTC 2014 - bruno@ioda-net.ch

155
mapserver.spec
View File

@ -3,9 +3,9 @@
# this build respect python,java,perl,php package naming convention under # this build respect python,java,perl,php package naming convention under
# openSUSE. # openSUSE.
# #
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 Ioda-Net Sàrl, Charmoille, Switzerland. Bruno Friedmann (tigerfoot) # Copyright (c) 2014 Ioda-Net Sàrl, Charmoille, Switzerland. Bruno Friedmann (tigerfoot)
# Copyright (c) 2013 Angelos Tzotsos (kalxas) # Copyright (c) 2015 Angelos Tzotsos (kalxas)
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -18,80 +18,77 @@
# #
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# We only build for 12.3 and up
# #
Name: mapserver
%define fileversion 6.4.1 %define fileversion 6.4.1
%define libname libmapserver1 %define libname libmapserver1
%define python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
%define _cgibindir /srv/www/cgi-bin
Name: mapserver
Version: 6.4.1 Version: 6.4.1
Release: 1 Release: 0
Summary: Environment for building spatially-enabled internet applications
License: MIT License: MIT
#see http://www.mapserver.org/copyright.html#license #see http://www.mapserver.org/copyright.html#license
Group: Productivity/Networking/Web/Servers Group: Productivity/Networking/Web/Servers
Source: %{name}-%{fileversion}.tar.gz
Url: http://www.mapserver.org Url: http://www.mapserver.org
Source: %{name}-%{fileversion}.tar.gz
#wget https://github.com/mapserver/mapserver/pull/#PATCH.patch #wget https://github.com/mapserver/mapserver/pull/#PATCH.patch
Patch1: 4788.patch Patch1: 4788.patch
Patch2: 4788-php-mapscript.patch Patch2: 4788-php-mapscript.patch
Patch3: 4788-python-mapscript.patch Patch3: 4788-python-mapscript.patch
Summary: Environment for building spatially-enabled internet applications Patch4: 4875-incorrect-blending-tif.patch
#@TODO : we should normally only require client & libs for database Patch5: 4912-php56-php-input.patch
Requires: postgresql >= 9.1 BuildRequires: FastCGI-devel
Requires: mysql BuildRequires: apache2-devel
Requires: FastCGI BuildRequires: autoconf
Requires: apache2 BuildRequires: cairo-devel
Requires: librsvg BuildRequires: chrpath
Requires: fribidi BuildRequires: cmake >= 2.4
#Added proj due to missing espg tools for shp2img for example BuildRequires: freetype2
Requires: proj BuildRequires: freetype2-devel
Requires: %{libname} = %{version}-%{release} BuildRequires: fribidi-devel
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: gd-devel >= 2.0.16
BuildRequires: giflib-devel
BuildRequires: krb5-devel
BuildRequires: libexpat-devel
BuildRequires: libgcj-devel
BuildRequires: libgdal-devel >= 1.10
BuildRequires: libgeos-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libproj-devel
BuildRequires: libtiff-devel
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: mysql-devel
BuildRequires: openjpeg2-devel
BuildRequires: pam
BuildRequires: pam-devel
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: postgresql-devel >= 9.1
BuildRequires: proj
BuildRequires: readline-devel
BuildRequires: rpm
BuildRequires: swig
BuildRequires: update-alternatives
BuildRequires: zlib-devel
%if 0%{?suse_version} != 1010 %if 0%{?suse_version} != 1010
BuildRequires: xorg-x11-libXpm-devel BuildRequires: xorg-x11-libXpm-devel
%endif %endif
BuildRequires: rpm Requires: %{libname} = %{version}-%{release}
BuildRequires: gcc Requires: FastCGI
BuildRequires: gcc-c++ Requires: apache2
BuildRequires: chrpath Requires: fribidi
BuildRequires: autoconf Requires: librsvg
BuildRequires: cmake >= 2.4 Requires: proj
BuildRequires: pam Requires: mysql
BuildRequires: pam-devel Requires: postgresql >= 9.1
BuildRequires: postgresql-devel >= 9.1 BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libexpat-devel
BuildRequires: mysql-devel
BuildRequires: giflib-devel
BuildRequires: libgeos-devel
BuildRequires: libproj-devel
BuildRequires: libgdal-devel >= 1.10
#BuildRequires: libjpeg8-devel I've normally use that one ?
BuildRequires: openjpeg2-devel
BuildRequires: readline-devel
BuildRequires: freetype2-devel
BuildRequires: freetype2
BuildRequires: FastCGI-devel
BuildRequires: fribidi-devel
BuildRequires: cairo-devel
BuildRequires: gd-devel >= 2.0.16
BuildRequires: krb5-devel
BuildRequires: zlib-devel
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libtiff-devel
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: proj
BuildRequires: swig
BuildRequires: update-alternatives
BuildRequires: apache2-devel
BuildRequires: krb5-devel
BuildRequires: libgcj-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
%define _cgibindir /srv/www/cgi-bin
%description %description
Mapserver is an internet mapping program that converts GIS data to Mapserver is an internet mapping program that converts GIS data to
@ -107,14 +104,16 @@ Group: Development/Libraries/C and C++
Mapserver library for mapserver or mapscript module. you need this lib to run mapserver Mapserver library for mapserver or mapscript module. you need this lib to run mapserver
or any of the mapscript module (php, java, python, ruby) or any of the mapscript module (php, java, python, ruby)
# We don't require apache2_mod-php5 users could have php5 running # We don't require apache2_mod-php5 users could have php5 running
# with other modes (cgi, php-fpm etc) # with other modes (cgi, php-fpm etc)
%package -n php-mapscript %package -n php-mapscript
Summary: PHP/Mapscript map making extensions to PHP Summary: PHP/Mapscript map making extensions to PHP
Group: Development/Libraries/PHP Group: Development/Libraries/PHP
Requires: %{libname} = %{version}-%{release} Requires: %{libname} = %{version}-%{release}
Requires: apache2 Requires: apache2
Provides: php-mapserver = %{version}-%{release}
Obsoletes: php-mapserver < %{version}-%{release}
%if 0%{?sles_version} >= 11 %if 0%{?sles_version} >= 11
BuildRequires: php53-devel BuildRequires: php53-devel
Requires: php53 Requires: php53
@ -124,8 +123,6 @@ BuildRequires: php-devel
Requires: php Requires: php
Requires: php-gd Requires: php-gd
%endif %endif
Provides: php-mapserver = %{version}-%{release}
Obsoletes: php-mapserver < %{version}-%{release}
%description -n php-mapscript %description -n php-mapscript
The PHP/Mapscript extension provides full map customization capabilities within the PHP scripting language. The PHP/Mapscript extension provides full map customization capabilities within the PHP scripting language.
@ -133,8 +130,8 @@ The PHP/Mapscript extension provides full map customization capabilities within
%package -n perl-mapscript %package -n perl-mapscript
Summary: Perl/Mapscript map making extensions to Perl Summary: Perl/Mapscript map making extensions to Perl
Group: Development/Languages/Perl Group: Development/Languages/Perl
BuildRequires: perl-base
BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl-base
Requires: %{libname} = %{version}-%{release} Requires: %{libname} = %{version}-%{release}
Requires: perl-base Requires: perl-base
Provides: mapserver-perl = %{version}-%{release} Provides: mapserver-perl = %{version}-%{release}
@ -160,14 +157,9 @@ within the Python programming language.
%package -n libjavamapscript %package -n libjavamapscript
Summary: Java/Mapscript map making extensions to Java Summary: Java/Mapscript map making extensions to Java
Group: Development/Languages/Java Group: Development/Languages/Java
BuildRequires: java-devel >= 1.6
BuildRequires: java >= 1.6 BuildRequires: java >= 1.6
BuildRequires: java-devel >= 1.6
BuildRequires: swig BuildRequires: swig
%if 0%{?sles_version} == 10
%ifarch i586
BuildRequires: java-1_5_0-ibm-alsa
%endif
%endif
Requires: %{libname} = %{version}-%{release} Requires: %{libname} = %{version}-%{release}
Requires: java >= 1.6 Requires: java >= 1.6
Requires: swig Requires: swig
@ -175,6 +167,11 @@ Provides: java-mapscript = %{version}-%{release}
Provides: mapserver-java = %{version}-%{release} Provides: mapserver-java = %{version}-%{release}
Obsoletes: mapserver-java < %{version}-%{release} Obsoletes: mapserver-java < %{version}-%{release}
Obsoletes: java-mapscript < %{version}-%{release} Obsoletes: java-mapscript < %{version}-%{release}
%if 0%{?sles_version} == 10
%ifarch i586
BuildRequires: java-1_5_0-ibm-alsa
%endif
%endif
%description -n libjavamapscript %description -n libjavamapscript
The Java/Mapscript extension provides full map customization capabilities The Java/Mapscript extension provides full map customization capabilities
@ -183,10 +180,10 @@ within the Java programming language.
%package -n ruby-mapscript %package -n ruby-mapscript
Summary: Ruby/Mapscript map making extensions to Ruby Summary: Ruby/Mapscript map making extensions to Ruby
Group: Development/Languages/Ruby Group: Development/Languages/Ruby
Requires: ruby
BuildRequires: ruby-devel BuildRequires: ruby-devel
BuildRequires: ruby-macros BuildRequires: ruby-macros
Requires: %{libname} = %{version}-%{release} Requires: %{libname} = %{version}-%{release}
Requires: ruby
Provides: mapserver-ruby = %{version}-%{release} Provides: mapserver-ruby = %{version}-%{release}
Obsoletes: mapserver-ruby < %{version}-%{release} Obsoletes: mapserver-ruby < %{version}-%{release}
@ -208,6 +205,8 @@ against the C Mapserver library.
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
%patch5 -p1
%build -n %{name}-%{fileversion} %build -n %{name}-%{fileversion}
@ -217,8 +216,8 @@ cd build
#Pre export the PREFIX ( having it on the command line doesn't expand correctly for #Pre export the PREFIX ( having it on the command line doesn't expand correctly for
#dynamic postgresql location #dynamic postgresql location
export CMAKE_PREFIX_PATH="%{_includedir}:%{_includedir}/fastcgi:%(pg_config --includedir):%(pg_config --includedir-server):%(pg_config --libdir)" export CMAKE_PREFIX_PATH="%{_includedir}:%{_includedir}/fastcgi:%(pg_config --includedir):%(pg_config --includedir-server):%(pg_config --libdir)"
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CFLAGS="%{optflags} -fno-strict-aliasing"
export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CXXFLAGS="%{optflags} -fno-strict-aliasing"
#specify all options and play with true/false #specify all options and play with true/false
#so we always know which option are included in our build. #so we always know which option are included in our build.
@ -390,12 +389,8 @@ rm -rf %{buildroot}
%defattr(-,root,root) %defattr(-,root,root)
%doc mapscript/ruby/README %doc mapscript/ruby/README
%doc mapscript/ruby/examples %doc mapscript/ruby/examples
#@todo fix that by using a proper way ? %{rb_sitearchdir}/mapscript.so
%ifarch x86_64
%{_libdir}/ruby/site_ruby/%{rb_ver}/x86_64-linux/mapscript.so
%else
%{_libdir}/ruby/site_ruby/%{rb_ver}/i586-linux/mapscript.so
%endif
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)