Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/proj: bump version to 9.2.1
@ 2023-08-02 17:54 Bernd Kuhls
  2023-08-05 17:00 ` Zoltan Gyarmati
  2023-08-06 12:12 ` Thomas Petazzoni via buildroot
  0 siblings, 2 replies; 3+ messages in thread
From: Bernd Kuhls @ 2023-08-02 17:54 UTC (permalink / raw)
  To: buildroot; +Cc: Zoltan Gyarmati, Samuel Martin

Release notes: https://github.com/OSGeo/PROJ/blob/master/NEWS

Switch package to cmake, add json-for-modern-cpp dependency.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 package/proj/Config.in |  7 ++++---
 package/proj/proj.hash |  6 +++---
 package/proj/proj.mk   | 14 +++++++-------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/package/proj/Config.in b/package/proj/Config.in
index 1952fc7d9a..d9a9918c43 100644
--- a/package/proj/Config.in
+++ b/package/proj/Config.in
@@ -1,9 +1,10 @@
 config BR2_PACKAGE_PROJ
 	bool "proj"
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # json-for-modern-cpp
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_JSON_FOR_MODERN_CPP
 	select BR2_PACKAGE_SQLITE
 	help
 	  proj.4 is a standard UNIX filter function which converts
@@ -14,7 +15,7 @@ config BR2_PACKAGE_PROJ
 
 	  http://proj4.org/
 
-comment "proj needs a toolchain w/ C++, gcc >= 4.7, threads, wchar"
+comment "proj needs a toolchain w/ C++, gcc >= 4.9, threads, wchar"
 	depends on !BR2_INSTALL_LIBSTDCPP || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
 		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
diff --git a/package/proj/proj.hash b/package/proj/proj.hash
index 96d94e458e..054499beca 100644
--- a/package/proj/proj.hash
+++ b/package/proj/proj.hash
@@ -1,5 +1,5 @@
-# Fetched from http://download.osgeo.org/proj/proj-8.1.1.tar.gz.md5
-md5  f017fd7d35311b0d65b2cf0503844690  proj-8.1.1.tar.gz
+# From http://download.osgeo.org/proj/proj-9.2.1.tar.gz.md5
+md5  c8e878049ef27330ac94624e1a75b0db  proj-9.2.1.tar.gz
 # Locally calculated
-sha256  82f1345e5fa530c407cb1fc0752e83f8d08d2b98772941bbdc7820241f7fada2  proj-8.1.1.tar.gz
+sha256  15ebf4afa8744b9e6fccb5d571fc9f338dc3adcf99907d9e62d1af815d4971a1  proj-9.2.1.tar.gz
 sha256  6a8f30793e877d32e3f88b972f0970a051a3b5a26cd057d3993cb51e21c43319  COPYING
diff --git a/package/proj/proj.mk b/package/proj/proj.mk
index bc924b41fb..641613a02a 100644
--- a/package/proj/proj.mk
+++ b/package/proj/proj.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-PROJ_VERSION = 8.1.1
+PROJ_VERSION = 9.2.1
 PROJ_SITE = http://download.osgeo.org/proj
 PROJ_LICENSE = MIT
 PROJ_LICENSE_FILES = COPYING
 PROJ_INSTALL_STAGING = YES
-PROJ_DEPENDENCIES = host-pkgconf host-sqlite sqlite
+PROJ_DEPENDENCIES = host-pkgconf host-sqlite json-for-modern-cpp sqlite
 
 PROJ_CFLAGS = $(TARGET_CFLAGS)
 PROJ_CXXFLAGS = $(TARGET_CXXFLAGS)
@@ -25,16 +25,16 @@ PROJ_CONF_ENV = \
 
 ifeq ($(BR2_PACKAGE_LIBCURL),y)
 PROJ_DEPENDENCIES += libcurl
-PROJ_CONF_OPTS += --with-curl=$(STAGING_DIR)/usr/bin/curl-config
+PROJ_CONF_OPTS += -DENABLE_CURL=ON
 else
-PROJ_CONF_OPTS += --without-curl
+PROJ_CONF_OPTS += -DENABLE_CURL=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_TIFF),y)
 PROJ_DEPENDENCIES += tiff
-PROJ_CONF_OPTS += --enable-tiff
+PROJ_CONF_OPTS += -DENABLE_TIFF=ON
 else
-PROJ_CONF_OPTS += --disable-tiff
+PROJ_CONF_OPTS += -DENABLE_TIFF=OFF
 endif
 
-$(eval $(autotools-package))
+$(eval $(cmake-package))
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/proj: bump version to 9.2.1
  2023-08-02 17:54 [Buildroot] [PATCH 1/1] package/proj: bump version to 9.2.1 Bernd Kuhls
@ 2023-08-05 17:00 ` Zoltan Gyarmati
  2023-08-06 12:12 ` Thomas Petazzoni via buildroot
  1 sibling, 0 replies; 3+ messages in thread
From: Zoltan Gyarmati @ 2023-08-05 17:00 UTC (permalink / raw)
  To: buildroot

Dear Bernd,

 thanks for working on this!

Test-compiled the package, and  if  BR2_PACKAGE_LIBCURL is not enabled, the 
the configuration fails with:

> -- PROJ_LIBRARIES                 = proj
> CMake Error at src/apps/CMakeLists.txt:80 (message):
> projsync requires Curl
>

It seems unfortunately we need sth like:

> diff --git a/package/proj/proj.mk b/package/proj/proj.mk
> index 641613a02a..ef1ba567f2 100644
> --- a/package/proj/proj.mk
> +++ b/package/proj/proj.mk
> @@ -28,6 +28,7 @@ PROJ_DEPENDENCIES += libcurl
> 
>  PROJ_CONF_OPTS += -DENABLE_CURL=ON
>  else
>  PROJ_CONF_OPTS += -DENABLE_CURL=OFF
> +PROJ_CONF_OPTS += -DBUILD_PROJSYNC=OFF
> 
>  endif
>  
>  ifeq ($(BR2_PACKAGE_TIFF),y)


Regards,

 

On 2023. augusztus 2., szerda 19:54:07 CEST Bernd Kuhls wrote:
> Release notes: https://github.com/OSGeo/PROJ/blob/master/NEWS
> 
> Switch package to cmake, add json-for-modern-cpp dependency.
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
>  package/proj/Config.in |  7 ++++---
>  package/proj/proj.hash |  6 +++---
>  package/proj/proj.mk   | 14 +++++++-------
>  3 files changed, 14 insertions(+), 13 deletions(-)
> 
> diff --git a/package/proj/Config.in b/package/proj/Config.in
> index 1952fc7d9a..d9a9918c43 100644
> --- a/package/proj/Config.in
> +++ b/package/proj/Config.in
> @@ -1,9 +1,10 @@
>  config BR2_PACKAGE_PROJ
>  	bool "proj"
>  	depends on BR2_INSTALL_LIBSTDCPP
> -	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11
> +	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # json-for-modern-cpp
>  	depends on BR2_TOOLCHAIN_HAS_THREADS
>  	depends on BR2_USE_WCHAR
> +	select BR2_PACKAGE_JSON_FOR_MODERN_CPP
>  	select BR2_PACKAGE_SQLITE
>  	help
>  	  proj.4 is a standard UNIX filter function which converts
> @@ -14,7 +15,7 @@ config BR2_PACKAGE_PROJ
> 
>  	  http://proj4.org/
> 
> -comment "proj needs a toolchain w/ C++, gcc >= 4.7, threads, wchar"
> +comment "proj needs a toolchain w/ C++, gcc >= 4.9, threads, wchar"
>  	depends on !BR2_INSTALL_LIBSTDCPP || \
> -		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \
> +		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
>  		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
> diff --git a/package/proj/proj.hash b/package/proj/proj.hash
> index 96d94e458e..054499beca 100644
> --- a/package/proj/proj.hash
> +++ b/package/proj/proj.hash
> @@ -1,5 +1,5 @@
> -# Fetched from http://download.osgeo.org/proj/proj-8.1.1.tar.gz.md5
> -md5  f017fd7d35311b0d65b2cf0503844690  proj-8.1.1.tar.gz
> +# From http://download.osgeo.org/proj/proj-9.2.1.tar.gz.md5
> +md5  c8e878049ef27330ac94624e1a75b0db  proj-9.2.1.tar.gz
>  # Locally calculated
> -sha256  82f1345e5fa530c407cb1fc0752e83f8d08d2b98772941bbdc7820241f7fada2 
> proj-8.1.1.tar.gz +sha256 
> 15ebf4afa8744b9e6fccb5d571fc9f338dc3adcf99907d9e62d1af815d4971a1 
> proj-9.2.1.tar.gz sha256 
> 6a8f30793e877d32e3f88b972f0970a051a3b5a26cd057d3993cb51e21c43319  COPYING
> diff --git a/package/proj/proj.mk b/package/proj/proj.mk
> index bc924b41fb..641613a02a 100644
> --- a/package/proj/proj.mk
> +++ b/package/proj/proj.mk
> @@ -4,12 +4,12 @@
>  #
>  ###########################################################################
> #####
> 
> -PROJ_VERSION = 8.1.1
> +PROJ_VERSION = 9.2.1
>  PROJ_SITE = http://download.osgeo.org/proj
>  PROJ_LICENSE = MIT
>  PROJ_LICENSE_FILES = COPYING
>  PROJ_INSTALL_STAGING = YES
> -PROJ_DEPENDENCIES = host-pkgconf host-sqlite sqlite
> +PROJ_DEPENDENCIES = host-pkgconf host-sqlite json-for-modern-cpp sqlite
> 
>  PROJ_CFLAGS = $(TARGET_CFLAGS)
>  PROJ_CXXFLAGS = $(TARGET_CXXFLAGS)
> @@ -25,16 +25,16 @@ PROJ_CONF_ENV = \
> 
>  ifeq ($(BR2_PACKAGE_LIBCURL),y)
>  PROJ_DEPENDENCIES += libcurl
> -PROJ_CONF_OPTS += --with-curl=$(STAGING_DIR)/usr/bin/curl-config
> +PROJ_CONF_OPTS += -DENABLE_CURL=ON
>  else
> -PROJ_CONF_OPTS += --without-curl
> +PROJ_CONF_OPTS += -DENABLE_CURL=OFF
>  endif
> 
>  ifeq ($(BR2_PACKAGE_TIFF),y)
>  PROJ_DEPENDENCIES += tiff
> -PROJ_CONF_OPTS += --enable-tiff
> +PROJ_CONF_OPTS += -DENABLE_TIFF=ON
>  else
> -PROJ_CONF_OPTS += --disable-tiff
> +PROJ_CONF_OPTS += -DENABLE_TIFF=OFF
>  endif
> 
> -$(eval $(autotools-package))
> +$(eval $(cmake-package))


-- 
Zoltan Gyarmati
https://zgyarmati.de


_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/proj: bump version to 9.2.1
  2023-08-02 17:54 [Buildroot] [PATCH 1/1] package/proj: bump version to 9.2.1 Bernd Kuhls
  2023-08-05 17:00 ` Zoltan Gyarmati
@ 2023-08-06 12:12 ` Thomas Petazzoni via buildroot
  1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-08-06 12:12 UTC (permalink / raw)
  To: Bernd Kuhls; +Cc: Zoltan Gyarmati, Samuel Martin, buildroot

On Wed,  2 Aug 2023 19:54:07 +0200
Bernd Kuhls <bernd@kuhls.net> wrote:

> Release notes: https://github.com/OSGeo/PROJ/blob/master/NEWS
> 
> Switch package to cmake, add json-for-modern-cpp dependency.
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
>  package/proj/Config.in |  7 ++++---
>  package/proj/proj.hash |  6 +++---
>  package/proj/proj.mk   | 14 +++++++-------
>  3 files changed, 14 insertions(+), 13 deletions(-)

Marked as Changes Requested following the feedback from Zoltan.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-08-06 12:13 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-02 17:54 [Buildroot] [PATCH 1/1] package/proj: bump version to 9.2.1 Bernd Kuhls
2023-08-05 17:00 ` Zoltan Gyarmati
2023-08-06 12:12 ` Thomas Petazzoni via buildroot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox