| Message ID | 20230313050938.9860-1-fido_max@inbox.ru |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v3,1/1] package/gdal: bump version to 3.6.2 | expand |
Maxim, All, On 2023-03-13 08:09 +0300, Maxim Kochetkov via buildroot spake thusly: > Release notes: https://github.com/OSGeo/gdal/blob/v3.6.2/NEWS.md > License changes: https://github.com/OSGeo/gdal/commit/a394f9cb299b2c3c2159098483d1fece3a464fda > > ISC License is added for FlatGeobuf and Flatbush > Apache-2.0 is added for flatbuffers > > Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru> Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/gdal/gdal.hash | 8 ++++---- > package/gdal/gdal.mk | 4 ++-- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/package/gdal/gdal.hash b/package/gdal/gdal.hash > index ab77d7840d..d0b08b4535 100644 > --- a/package/gdal/gdal.hash > +++ b/package/gdal/gdal.hash > @@ -1,6 +1,6 @@ > -# md5 from: https://download.osgeo.org/gdal/3.5.2/gdal-3.5.2.tar.xz.md5, sha256 locally computed: > -md5 821b3b0637ebada5d20dbefb2e3ec964 gdal-3.5.2.tar.xz > -sha256 0874dfdeb9ac42e53c37be4184b19350be76f0530e1f4fa8004361635b9030c2 gdal-3.5.2.tar.xz > +# md5 from: https://download.osgeo.org/gdal/3.6.2/gdal-3.6.2.tar.gz.md5, sha256 locally computed: > +md5 6f22ffdbd8e00059ddb2b825c5920c4c gdal-3.6.2.tar.xz > +sha256 35f40d2e08061b342513cdcddc2b997b3814ef8254514f0ef1e8bc7aa56cf681 gdal-3.6.2.tar.xz > > # Hashes of license files: > -sha256 fac0116e799ca4de79b076ee04863b5e2b69541ea3664b9bb108c81a5355f16a LICENSE.TXT > +sha256 1dae3468e81d00da56e2936f74d33b8b3ad09d726437f19ce209a5dabea41f77 LICENSE.TXT > diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk > index a3b11c53af..ce67399c32 100644 > --- a/package/gdal/gdal.mk > +++ b/package/gdal/gdal.mk > @@ -4,10 +4,10 @@ > # > ################################################################################ > > -GDAL_VERSION = 3.5.2 > +GDAL_VERSION = 3.6.2 > GDAL_SITE = https://download.osgeo.org/gdal/$(GDAL_VERSION) > GDAL_SOURCE = gdal-$(GDAL_VERSION).tar.xz > -GDAL_LICENSE = MIT, many others > +GDAL_LICENSE = Apache-2.0, ISC, MIT, many others > GDAL_LICENSE_FILES = LICENSE.TXT > GDAL_CPE_ID_VENDOR = osgeo > GDAL_INSTALL_STAGING = YES > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
Maxim, All, I've already applied this patch, but please see below... On 2023-03-13 08:09 +0300, Maxim Kochetkov via buildroot spake thusly: > Release notes: https://github.com/OSGeo/gdal/blob/v3.6.2/NEWS.md > License changes: https://github.com/OSGeo/gdal/commit/a394f9cb299b2c3c2159098483d1fece3a464fda > > ISC License is added for FlatGeobuf and Flatbush > Apache-2.0 is added for flatbuffers > > Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru> [--SNIP--] > diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk > index a3b11c53af..ce67399c32 100644 > --- a/package/gdal/gdal.mk > +++ b/package/gdal/gdal.mk > @@ -4,10 +4,10 @@ > # > ################################################################################ > > -GDAL_VERSION = 3.5.2 > +GDAL_VERSION = 3.6.2 There is a comment a few lines below, which I'll reproduce there: 17 # Using 'make' with CMake's Makefile generator will not work, as 18 # 'make' uses GNUmakefile first, but GNUmakefile is provided by 19 # autotools in gdal. We need to force 'make' to use the Makefile, 20 # which is generated by CMake. GNUmakefile and autoconf are dropped in 21 # 3.6 so this can be dropped in future version. 22 GDAL_MAKE_OPTS += -f Makefile That was added by you in 2b43579e9453 (package/gdal: switch to cmake build to fix libgeotiff detection). Can you check what to do: either the comment ir correct, and the GDAL_MAKE_OPTS should be removed (with the comment), or the comment is wrong and it must be updated. Thanks! Regards, Yann E. MORIN. > GDAL_SITE = https://download.osgeo.org/gdal/$(GDAL_VERSION) > GDAL_SOURCE = gdal-$(GDAL_VERSION).tar.xz > -GDAL_LICENSE = MIT, many others > +GDAL_LICENSE = Apache-2.0, ISC, MIT, many others > GDAL_LICENSE_FILES = LICENSE.TXT > GDAL_CPE_ID_VENDOR = osgeo > GDAL_INSTALL_STAGING = YES > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
diff --git a/package/gdal/gdal.hash b/package/gdal/gdal.hash index ab77d7840d..d0b08b4535 100644 --- a/package/gdal/gdal.hash +++ b/package/gdal/gdal.hash @@ -1,6 +1,6 @@ -# md5 from: https://download.osgeo.org/gdal/3.5.2/gdal-3.5.2.tar.xz.md5, sha256 locally computed: -md5 821b3b0637ebada5d20dbefb2e3ec964 gdal-3.5.2.tar.xz -sha256 0874dfdeb9ac42e53c37be4184b19350be76f0530e1f4fa8004361635b9030c2 gdal-3.5.2.tar.xz +# md5 from: https://download.osgeo.org/gdal/3.6.2/gdal-3.6.2.tar.gz.md5, sha256 locally computed: +md5 6f22ffdbd8e00059ddb2b825c5920c4c gdal-3.6.2.tar.xz +sha256 35f40d2e08061b342513cdcddc2b997b3814ef8254514f0ef1e8bc7aa56cf681 gdal-3.6.2.tar.xz # Hashes of license files: -sha256 fac0116e799ca4de79b076ee04863b5e2b69541ea3664b9bb108c81a5355f16a LICENSE.TXT +sha256 1dae3468e81d00da56e2936f74d33b8b3ad09d726437f19ce209a5dabea41f77 LICENSE.TXT diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index a3b11c53af..ce67399c32 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -4,10 +4,10 @@ # ################################################################################ -GDAL_VERSION = 3.5.2 +GDAL_VERSION = 3.6.2 GDAL_SITE = https://download.osgeo.org/gdal/$(GDAL_VERSION) GDAL_SOURCE = gdal-$(GDAL_VERSION).tar.xz -GDAL_LICENSE = MIT, many others +GDAL_LICENSE = Apache-2.0, ISC, MIT, many others GDAL_LICENSE_FILES = LICENSE.TXT GDAL_CPE_ID_VENDOR = osgeo GDAL_INSTALL_STAGING = YES
Release notes: https://github.com/OSGeo/gdal/blob/v3.6.2/NEWS.md License changes: https://github.com/OSGeo/gdal/commit/a394f9cb299b2c3c2159098483d1fece3a464fda ISC License is added for FlatGeobuf and Flatbush Apache-2.0 is added for flatbuffers Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru> --- package/gdal/gdal.hash | 8 ++++---- package/gdal/gdal.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)