diff --git a/.gitignore b/.gitignore index 5f34515..9f4a723 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,5 @@ /mapnik-vector-tile-1.2.1.tar.gz /clipper-ac8d6bf2517f46c05647b5c19cac113fb180ffb4.tar.gz /mapnik-vector-tile-1.2.2.tar.gz +/mapnik-vector-tile-1.3.0.tar.gz +/geometry-test-data-b61dc6ed3f340483850883504a3030abbc1156fa.tar.gz diff --git a/nodejs-mapnik-vector-tile-dependencies.patch b/nodejs-mapnik-vector-tile-dependencies.patch index d2320f4..58b4105 100644 --- a/nodejs-mapnik-vector-tile-dependencies.patch +++ b/nodejs-mapnik-vector-tile-dependencies.patch @@ -1,33 +1,29 @@ -commit 69202bb7186c3b2c8a56f2cfae638850be584813 +commit 0d7c64a14ee4539138bf52afbd24fb6039a1572e Author: Tom Hughes Date: Mon Nov 23 00:12:59 2015 +0000 Patch out attempts to clone various dependencies diff --git a/Makefile b/Makefile -index 5989923..92743aa 100755 +index 1af04da..5ed8984 100755 --- a/Makefile +++ b/Makefile -@@ -1,23 +1,10 @@ - MAPNIK_PLUGINDIR := $(shell mapnik-config --input-plugins) +@@ -1,18 +1,10 @@ +-MAPNIK_PLUGINDIR = $(shell mason_packages/.link/bin/mapnik-config --input-plugins) ++MAPNIK_PLUGINDIR = $(shell mapnik-config --input-plugins) BUILDTYPE ?= Release --CLIPPER_REVISION=ac8d6bf2517f46c05647b5c19cac113fb180ffb4 --PROTOZERO_REVISION=v1.4.2 -GYP_REVISION=3464008 - all: libvtile +-mason_packages/.link/bin/mapnik-config: +- ./install_mason.sh +- -./deps/gyp: - git clone https://chromium.googlesource.com/external/gyp.git ./deps/gyp && cd ./deps/gyp && git checkout $(GYP_REVISION) - --./deps/protozero: -- git clone https://github.com/mapbox/protozero.git ./deps/protozero && cd ./deps/protozero && git checkout $(PROTOZERO_REVISION) -- --./deps/clipper: -- git clone https://github.com/mapnik/clipper.git -b r496-mapnik ./deps/clipper && cd ./deps/clipper && git checkout $(CLIPPER_REVISION) && ./cpp/fix_members.sh -- --build/Makefile: ./deps/gyp ./deps/clipper ./deps/protozero gyp/build.gyp test/* +-build/Makefile: mason_packages/.link/bin/mapnik-config ./deps/gyp gyp/build.gyp test/* - deps/gyp/gyp gyp/build.gyp --depth=. -DMAPNIK_PLUGINDIR=\"$(MAPNIK_PLUGINDIR)\" -Goutput_dir=. --generator-output=./build -f make +build/Makefile: gyp/build.gyp test/* + gyp gyp/build.gyp --depth=. -DMAPNIK_PLUGINDIR=\"$(MAPNIK_PLUGINDIR)\" -Goutput_dir=. --generator-output=./build -f make @@ -35,69 +31,128 @@ index 5989923..92743aa 100755 libvtile: build/Makefile Makefile @$(MAKE) -C build/ BUILDTYPE=$(BUILDTYPE) V=$(V) diff --git a/gyp/build.gyp b/gyp/build.gyp -index 98db069..dcbb93b 100644 +index 4da8b20..8bc32ed 100644 --- a/gyp/build.gyp +++ b/gyp/build.gyp -@@ -42,7 +42,7 @@ +@@ -38,17 +38,18 @@ ], 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/', -- '../deps/protozero/include' + '/usr/include/protozero' ], 'cflags_cc' : [ '-D_THREAD_SAFE', -@@ -61,7 +61,7 @@ +- '= 3.0.12 -BuildRequires: mapnik-static >= 3.0.12 -BuildRequires: protozero-devel >= 1.4.2 +BuildRequires: mapnik-devel >= 3.0.13 +BuildRequires: mapnik-static >= 3.0.13 +BuildRequires: protozero-devel >= 1.5.1 +BuildRequires: protozero-static >= 1.5.1 +BuildRequires: geometry-hpp-devel >= 0.9.1 +BuildRequires: geometry-hpp-static >= 0.9.1 +BuildRequires: wagyu-devel >= 0.4.2 +BuildRequires: wagyu-static >= 0.4.2 BuildRequires: boost-devel BuildRequires: cairo-devel BuildRequires: libtiff-devel BuildRequires: libxml2-devel BuildRequires: libicu-devel -BuildRequires: protobuf-lite-devel +BuildRequires: protobuf-lite-devel >= 2.6.1 %description A high performance library for working with vector tiles from the @@ -52,9 +55,7 @@ and rendering vector tiles into images. %prep %autosetup -p 1 -n mapnik-vector-tile-%{version} mkdir -p deps/clipper -tar --extract --file=%{SOURCE1} --gunzip --strip-components=1 --directory=deps/clipper -./deps/clipper/cpp/fix_members.sh -tar --extract --file=%{SOURCE2} --gunzip --strip-components=1 --directory=test/geometry-test-data +tar --extract --file=%{SOURCE1} --gunzip --strip-components=1 --directory=test/geometry-test-data rm -rf node_modules @@ -79,6 +80,9 @@ make %{?_smp_mflags} test %changelog +* Wed May 3 2017 Tom Hughes - 1.3.0-1 +- Update to 1.3.0 upstream release + * Fri Feb 10 2017 Fedora Release Engineering - 1.2.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 1aef59c..3c21b15 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -b9059223ff3c2c67d82c9d1e875530e0 mapnik-vector-tile-1.2.2.tar.gz -0065841407fcca685c0db821cc9f60a6 clipper-ac8d6bf2517f46c05647b5c19cac113fb180ffb4.tar.gz -906b6aac0c707df206ced87cfa6ed1cb geometry-test-data-65abcf0600d25aefebfe77c62261d4c1d7ac4d31.tar.gz +SHA512 (mapnik-vector-tile-1.3.0.tar.gz) = d1df2598147108a29a811f9640e3fc4099ee68f59bbb7df767be16491208a8653cc6334fb6e403c8bc808f22c9acd2c0ce3ceec217b5d57ef2b2982e9eb85405 +SHA512 (geometry-test-data-b61dc6ed3f340483850883504a3030abbc1156fa.tar.gz) = c028485abd939d21e7aba69ad5906fab4ac39b017247027495f7dfe9789e40bee3c2a3ef041c97f07e2590b95a8b2f158312da19b9dac05d3b76870c221132ca