Skip to content

Commit 15d3d04

Browse files
dg0ytdg0yt
committed
Update and debianize geos, libzip, protobuf
1 parent 404594b commit 15d3d04

File tree

4 files changed

+105
-33
lines changed

4 files changed

+105
-33
lines changed

‎gdal-3.1.3+dfsg.cmake‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ superbuild_package(
8888
common-licenses
8989
curl
9090
expat
91+
geos
9192
giflib
9293
libiconv
9394
libjpeg
@@ -132,6 +133,7 @@ superbuild_package(
132133
--with-threads
133134
"--with-curl=${CURL_CONFIG}"
134135
"--with-expat=${EXPAT_DIR}"
136+
--with-geos
135137
--with-gif
136138
--with-jpeg
137139
--with-liblzma
@@ -144,7 +146,6 @@ superbuild_package(
144146
--with-png
145147
--with-proj
146148
"--with-sqlite3=${SQLITE3_DIR}"
147-
--without-geos
148149
--without-java
149150
--without-jpeg12
150151
--without-libkml

‎geos.3.8.1.cmake‎ renamed to ‎geos-3.8.1.cmake‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is part of OpenOrienteering.
22

3-
# Copyright 2016-2020 Kai Pastor
3+
# Copyright 2020 Kai Pastor
44
#
55
# Redistribution and use is allowed according to the terms of the BSD license:
66
#
@@ -27,33 +27,51 @@
2727
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
2828
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929

30-
# https://tracker.debian.org/pkg/gdal
30+
# https://tracker.debian.org/pkg/geos
3131

3232
set(version 3.8.1)
33-
set(download_hash SHA256=605df3f99056b7bb9c48f20d67e90e539f5a9ca5b2c7896d58ba06e3217dc106)
34-
set(patch_version ${version})
35-
set(base_url https://github.com/libgeos/geos/archive/)
33+
set(download_hash SHA256=4258af4308deb9dbb5047379026b4cd9838513627cb943a44e16c40e42ae17f7)
34+
set(patch_version ${version}-1)
35+
set(patch_hash SHA256=ce8fc7d892db748c695fb30133a38e100e363374ca9eca140484f1966a0541ce)
36+
set(base_url https://snapshot.debian.org/archive/debian/20200321T211113Z/pool/main/g/geos/)
37+
38+
superbuild_package(
39+
NAME geos-patches
40+
VERSION ${patch_version}
41+
42+
SOURCE
43+
URL ${base_url}geos_${patch_version}.debian.tar.xz
44+
URL_HASH ${patch_hash}
45+
)
3646

3747
superbuild_package(
3848
NAME geos
3949
VERSION ${patch_version}
4050
DEPENDS
51+
source:geos-patches-${patch_version}
4152
common-licenses
4253

4354
SOURCE
44-
URL ${base_url}${version}.tar.gz
55+
URL ${base_url}geos_${version}.orig.tar.bz2
4556
URL_HASH ${download_hash}
57+
PATCH_COMMAND
58+
"${CMAKE_COMMAND}"
59+
-Dpackage=geos-patches-${patch_version}
60+
-P "${APPLY_PATCHES_SERIES}"
4661

47-
USING patch_version extra_cflags extra_cxxflags
62+
USING patch_version
4863
BUILD [[
4964
CMAKE_ARGS
5065
"-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}"
5166
"-DCMAKE_BUILD_TYPE:STRING=$<CONFIG>"
5267
-DBUILD_SHARED_LIBS=ON
5368
-DBUILD_TESTING=ON
5469
-DDISABLE_GEOS_INLINE=ON
55-
$<$<NOT:$<OR:$<BOOL:@CMAKE_CROSSCOMPILING@>,$<BOOL:@MSYS@>>>:
5670
INSTALL_COMMAND
5771
"${CMAKE_COMMAND}" --build . --target install/strip/fast
72+
COMMAND
73+
"${CMAKE_COMMAND}" -E copy
74+
"<SOURCE_DIR>/../geos-patches-${patch_version}/copyright"
75+
"${DESTDIR}${CMAKE_STAGING_PREFIX}/share/doc/copyright/geos-${patch_version}.txt"
5876
]]
5977
)

‎libzip.1.7.3.cmake‎ renamed to ‎libzip-1.6.1.cmake‎

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is part of OpenOrienteering.
22

3-
# Copyright 2016-2020 Kai Pastor
3+
# Copyright 2020 Kai Pastor
44
#
55
# Redistribution and use is allowed according to the terms of the BSD license:
66
#
@@ -27,32 +27,52 @@
2727
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
2828
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929

30-
# https://tracker.debian.org/pkg/gdal
30+
# https://tracker.debian.org/pkg/libzip
3131

32-
set(version 1.7.3)
33-
set(download_hash SHA256=c0a086901dfc8bda0fb8695f2d3c8050ed140b7899536b9348bcc72b47b2f307)
34-
set(patch_version ${version})
35-
set(base_url https://github.com/nih-at/libzip/archive/)
32+
set(version 1.6.1)
33+
set(download_hash SHA256=705dac7a671b3f440181481e607b0908129a9cf1ddfcba75d66436c0e7d33641)
34+
set(patch_version ${version}-3)
35+
set(patch_hash SHA256=7e39740727ccddda9a5d072d070488d78ea2e1522894d3ccbaa1b4c3c42b8431)
36+
set(base_url https://snapshot.debian.org/archive/debian/20200428T152315Z/pool/main/libz/libzip/)
37+
38+
superbuild_package(
39+
NAME libzip-patches
40+
VERSION ${patch_version}
41+
42+
SOURCE
43+
URL ${base_url}libzip_${patch_version}.debian.tar.xz
44+
URL_HASH ${patch_hash}
45+
)
3646

3747
superbuild_package(
3848
NAME libzip
3949
VERSION ${patch_version}
4050
DEPENDS
51+
source:libzip-patches-${patch_version}
4152
common-licenses
53+
liblzma
54+
zlib
4255

4356
SOURCE
44-
URL ${base_url}v${version}.tar.gz
57+
URL ${base_url}libzip_${version}.orig.tar.xz
4558
URL_HASH ${download_hash}
59+
PATCH_COMMAND
60+
"${CMAKE_COMMAND}"
61+
-Dpackage=libzip-patches-${patch_version}
62+
-P "${APPLY_PATCHES_SERIES}"
4663

47-
USING patch_version extra_cflags extra_cxxflags
64+
USING patch_version
4865
BUILD [[
4966
CMAKE_ARGS
5067
"-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}"
5168
"-DCMAKE_BUILD_TYPE:STRING=$<CONFIG>"
5269
"-DBUILD_SHARED_LIBS=ON"
53-
"-DCMAKE_C_STANDARD_LIBRARIES:STRING=-latomic -lm -lc"
54-
$<$<NOT:$<OR:$<BOOL:@CMAKE_CROSSCOMPILING@>,$<BOOL:@MSYS@>>>:
70+
#"-DCMAKE_C_STANDARD_LIBRARIES:STRING=-latomic -lm -lc"
5571
INSTALL_COMMAND
5672
"${CMAKE_COMMAND}" --build . --target install/strip/fast
73+
COMMAND
74+
"${CMAKE_COMMAND}" -E copy
75+
"<SOURCE_DIR>/../libzip-patches-${patch_version}/copyright"
76+
"${DESTDIR}${CMAKE_STAGING_PREFIX}/share/doc/copyright/libzip-${patch_version}.txt"
5777
]]
5878
)

‎protobuf.3.6.1.cmake‎ renamed to ‎protobuf-3.6.1.cmake‎

Lines changed: 47 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is part of OpenOrienteering.
22

3-
# Copyright 2016-2020 Kai Pastor
3+
# Copyright 2020 Kai Pastor
44
#
55
# Redistribution and use is allowed according to the terms of the BSD license:
66
#
@@ -27,35 +27,68 @@
2727
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
2828
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929

30-
# https://tracker.debian.org/pkg/gdal
30+
# https://tracker.debian.org/pkg/protobuf
31+
32+
set(version 3.12.3)
33+
set(download_hash SHA256=71030a04aedf9f612d2991c1c552317038c3c5a2b578ac4745267a45e7037c29)
34+
set(patch_version ${version}-2)
35+
set(patch_hash SHA256=953cbd01d0e3aadb978658d939f68008ca249ce7fdba7c41267022fb7c872a0c)
36+
set(base_url https://snapshot.debian.org/archive/debian/20200708T024852Z/pool/main/p/protobuf/)
3137

32-
set(version 3.6.1)
33-
set(download_hash SHA256=3d4e589d81b2006ca603c1ab712c9715a76227293032d05b26fca603f90b3f5b)
34-
set(patch_version ${version})
35-
set(base_url https://github.com/protocolbuffers/protobuf/archive/)
3638

3739
superbuild_package(
38-
NAME protobuf
40+
NAME protobuf-patches
41+
VERSION ${patch_version}
42+
43+
SOURCE
44+
URL ${base_url}protobuf_${patch_version}.debian.tar.xz
45+
URL_HASH ${patch_hash}
46+
)
47+
48+
superbuild_package(
49+
NAME protobuf-source
3950
VERSION ${patch_version}
4051
DEPENDS
41-
common-licenses
42-
zlib
52+
source:protobuf-patches-${patch_version}
4353

4454
SOURCE
45-
URL ${base_url}v${version}/protobuf-cpp-${version}.tar.gz
55+
URL ${base_url}protobuf_${version}.orig.tar.gz
4656
URL_HASH ${download_hash}
57+
PATCH_COMMAND
58+
"${CMAKE_COMMAND}"
59+
-Dpackage=protobuf-patches-${patch_version}
60+
-P "${APPLY_PATCHES_SERIES}"
61+
)
62+
63+
add_custom_target(protobuf-${patch_version}-source)
64+
set_property(TARGET protobuf-${patch_version}-source
65+
PROPERTY SB_SOURCE_DIR "${PROJECT_BINARY_DIR}/source/protobuf-source-${patch_version}/cmake"
66+
)
67+
68+
superbuild_package(
69+
NAME protobuf
70+
VERSION ${patch_version}
71+
DEPENDS
72+
source:protobuf-source-${patch_version}
73+
common-licenses
74+
zlib
4775

48-
USING patch_version extra_cflags extra_cxxflags
76+
USING patch_version
4977
BUILD [[
5078
CMAKE_ARGS
5179
"-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}"
5280
"-DCMAKE_BUILD_TYPE:STRING=$<CONFIG>"
5381
-DBUILD_SHARED_LIBS=ON
5482
-Dprotobuf_BUILD_TESTS=OFF
55-
"-DANDROID_LINKER_FLAGS=-landroid -llog"
56-
${SOURCE_DIR}/cmake
57-
83+
$<$<BOOL:@ANDROID@>:
84+
# https://github.com/protocolbuffers/protobuf/issues/2719
85+
"-DANDROID_LINKER_FLAGS=-llog"
86+
>
5887
INSTALL_COMMAND
5988
"${CMAKE_COMMAND}" --build . --target install/strip/fast
89+
COMMAND
90+
"${CMAKE_COMMAND}" -E copy
91+
"<SOURCE_DIR>/../../protobuf-patches-${patch_version}/copyright"
92+
"${DESTDIR}${CMAKE_STAGING_PREFIX}/share/doc/copyright/protobuf-${patch_version}.txt"
6093
]]
6194
)

0 commit comments

Comments
 (0)