[Buildroot] [PATCH 1/3] add new package proj

[Buildroot] [PATCH 1/3] add new package proj

[Zoltan Gyarmati]

Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
---
 package/Config.in      |  1 +
 package/proj/Config.in | 13 +++++++++++++
 package/proj/proj.hash |  2 ++
 package/proj/proj.mk   | 13 +++++++++++++
 4 files changed, 29 insertions(+)
 create mode 100644 package/proj/Config.in
 create mode 100644 package/proj/proj.hash
 create mode 100644 package/proj/proj.mk

diff --git a/package/Config.in b/package/Config.in
index e7435eb..1423147 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1594,6 +1594,7 @@ menu "Miscellaneous"
 	source "package/linux-syscall-support/Config.in"
 	source "package/mcrypt/Config.in"
 	source "package/mobile-broadband-provider-info/Config.in"
+	source "package/proj/Config.in"
 	source "package/qemu/Config.in"
 	source "package/qpdf/Config.in"
 	source "package/shared-mime-info/Config.in"
diff --git a/package/proj/Config.in b/package/proj/Config.in
new file mode 100644
index 0000000..0dd92cc
--- /dev/null
+++ b/package/proj/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_PROJ
+	bool "proj"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  proj.4 is a standard UNIX filter function which converts geographic 
+	  longitude and latitude coordinates into cartesian coordinates
+	  (and vice versa), and it is a C API for software developers to include
+	  coordinate transformation in their own software.
+
+	  http://proj4.org/
+
+comment "proj needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/proj/proj.hash b/package/proj/proj.hash
new file mode 100644
index 0000000..5b1d28d
--- /dev/null
+++ b/package/proj/proj.hash
@@ -0,0 +1,2 @@
+# Fetched from http://download.osgeo.org/proj/proj-4.9.3.tar.gz.md5
+md5 d598336ca834742735137c5674b214a1 proj-4.9.3.tar.gz
diff --git a/package/proj/proj.mk b/package/proj/proj.mk
new file mode 100644
index 0000000..6a00c5c
--- /dev/null
+++ b/package/proj/proj.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# proj
+#
+################################################################################
+
+PROJ_VERSION = 4.9.3
+PROJ_SOURCE = proj-$(PROJ_VERSION).tar.gz
+PROJ_SITE = http://download.osgeo.org/proj
+PROJ_LICENSE = MIT
+PROJ_INSTALL_STAGING = YES
+
+$(eval $(cmake-package))
-- 
2.7.4

[Buildroot] [PATCH 2/3] add myself as maintainer for the proj package

[Zoltan Gyarmati]

Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
---
 DEVELOPERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/DEVELOPERS b/DEVELOPERS
index 63674d7..f820b97 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1889,6 +1889,7 @@ F:	utils/scanpypi
 N:	Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
 F:	package/crudini/
 F:	package/grantlee/
+F:	package/proj/
 F:	package/python-configobj/
 F:	package/python-iniparse/
 F:	package/qjson/
-- 
2.7.4

[Buildroot] [PATCH 3/3] package/shapelib: version bump, use the new autotools build config and add new dependency on proj

[Zoltan Gyarmati]

Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
---
 package/shapelib/Config.in     |  5 +++++
 package/shapelib/shapelib.hash |  2 +-
 package/shapelib/shapelib.mk   | 17 +++--------------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/package/shapelib/Config.in b/package/shapelib/Config.in
index aa2297b..97ca403 100644
--- a/package/shapelib/Config.in
+++ b/package/shapelib/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_SHAPELIB
 	bool "shapelib"
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_PROJ
 	help
 	  The Shapefile C Library provides the ability to write simple
 	  C programs for reading, writing and updating (to a limited
@@ -7,3 +9,6 @@ config BR2_PACKAGE_SHAPELIB
 	  (.dbf).
 
 	  http://shapelib.maptools.org/
+
+comment "shapelib needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP 
diff --git a/package/shapelib/shapelib.hash b/package/shapelib/shapelib.hash
index f3f812e..4f51392 100644
--- a/package/shapelib/shapelib.hash
+++ b/package/shapelib/shapelib.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 23d474016158ab5077db2f599527631706ba5c0dc7c4178a6a1d685bb014f68f  shapelib-1.3.0.tar.gz
+sha256 a4c94817365761a3a4c21bb3ca1c680a6bdfd3edd61df9fdd291d3e7645923b3  shapelib-1.4.1.tar.gz
diff --git a/package/shapelib/shapelib.mk b/package/shapelib/shapelib.mk
index 34b6253..d6217ff 100644
--- a/package/shapelib/shapelib.mk
+++ b/package/shapelib/shapelib.mk
@@ -4,22 +4,11 @@
 #
 ################################################################################
 
-SHAPELIB_VERSION = 1.3.0
+SHAPELIB_VERSION = 1.4.1
 SHAPELIB_SITE = http://download.osgeo.org/shapelib
 SHAPELIB_LICENSE = MIT or LGPL-2.0
 SHAPELIB_LICENSE_FILES = web/license.html LICENSE.LGPL
 SHAPELIB_INSTALL_STAGING = YES
+SHAPELIB_DEPENDENCIES = proj
 
-define SHAPELIB_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
-endef
-
-define SHAPELIB_INSTALL_STAGING_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(STAGING_DIR)/usr/ lib_install
-endef
-
-define SHAPELIB_INSTALL_TARGET_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(TARGET_DIR)/usr/ bin_install
-endef
-
-$(eval $(generic-package))
+$(eval $(autotools-package))
-- 
2.7.4

[Buildroot] [PATCH 3/3] package/shapelib: version bump, use the new autotools build config and add new dependency on proj

[Baruch Siach]

Hi Zoltan,

On Sun, Dec 17, 2017 at 12:53:01AM +0100, Zoltan Gyarmati wrote:
> Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
> ---
>  package/shapelib/Config.in     |  5 +++++
>  package/shapelib/shapelib.hash |  2 +-
>  package/shapelib/shapelib.mk   | 17 +++--------------
>  3 files changed, 9 insertions(+), 15 deletions(-)
> 
> diff --git a/package/shapelib/Config.in b/package/shapelib/Config.in
> index aa2297b..97ca403 100644
> --- a/package/shapelib/Config.in
> +++ b/package/shapelib/Config.in
> @@ -1,5 +1,7 @@
>  config BR2_PACKAGE_SHAPELIB
>  	bool "shapelib"
> +	depends on BR2_INSTALL_LIBSTDCPP
> +	select BR2_PACKAGE_PROJ

You need to propagate here the threads dependency of proj.

baruch

>  	help
>  	  The Shapefile C Library provides the ability to write simple
>  	  C programs for reading, writing and updating (to a limited
> @@ -7,3 +9,6 @@ config BR2_PACKAGE_SHAPELIB
>  	  (.dbf).
>  
>  	  http://shapelib.maptools.org/

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -

[Buildroot] [PATCH 3/3] package/shapelib: version bump, use the new autotools build config and add new dependency on proj

[Thomas Petazzoni]

Hello,

On Sun, 17 Dec 2017 00:53:01 +0100, Zoltan Gyarmati wrote:
> Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
> ---
>  package/shapelib/Config.in     |  5 +++++
>  package/shapelib/shapelib.hash |  2 +-
>  package/shapelib/shapelib.mk   | 17 +++--------------
>  3 files changed, 9 insertions(+), 15 deletions(-)

I've applied, after adding the thread dependency (as noticed by Baruch)
and tweaking the commit log (your commit title was too long).

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 3/3] package/shapelib: version bump, use the new autotools build config and add new dependency on proj

[Zoltan Gyarmati]

Dear Thomas&Baruch,

great, thanks for the review and the tweaks!


Regards,

Zoltan Gyarmati
https://zgyarmati.de

On 12/17/2017 10:32 AM, Thomas Petazzoni wrote:
> Hello,
>
> On Sun, 17 Dec 2017 00:53:01 +0100, Zoltan Gyarmati wrote:
>> Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
>> ---
>>  package/shapelib/Config.in     |  5 +++++
>>  package/shapelib/shapelib.hash |  2 +-
>>  package/shapelib/shapelib.mk   | 17 +++--------------
>>  3 files changed, 9 insertions(+), 15 deletions(-)
> I've applied, after adding the thread dependency (as noticed by Baruch)
> and tweaking the commit log (your commit title was too long).
>
> Thanks!
>
> Thomas


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20171217/c3541d62/attachment.asc>

[Buildroot] [PATCH 1/3] add new package proj

[Thomas Petazzoni]

Hello,

I've applied your patch, after doing a number of changes. First of all,
I've renamed it to "proj: new package", which is the convention when
adding new package. Then, the DEVELOPERS change has been squashed in
the patch adding the package.

On Sun, 17 Dec 2017 00:52:59 +0100, Zoltan Gyarmati wrote:

> diff --git a/package/proj/Config.in b/package/proj/Config.in
> new file mode 100644
> index 0000000..0dd92cc
> --- /dev/null
> +++ b/package/proj/Config.in
> @@ -0,0 +1,13 @@
> +config BR2_PACKAGE_PROJ
> +	bool "proj"
> +	depends on BR2_TOOLCHAIN_HAS_THREADS
> +	help
> +	  proj.4 is a standard UNIX filter function which converts geographic 
> +	  longitude and latitude coordinates into cartesian coordinates
> +	  (and vice versa), and it is a C API for software developers to include
> +	  coordinate transformation in their own software.

Lines too long and trailing whitespace here, I've fixed this up.

> +# Fetched from http://download.osgeo.org/proj/proj-4.9.3.tar.gz.md5
> +md5 d598336ca834742735137c5674b214a1 proj-4.9.3.tar.gz

A md5 hash alone is not sufficient, so I've added a sha256 hash. While
I was at it, I've added a hash for the license file as well.

> +PROJ_VERSION = 4.9.3
> +PROJ_SOURCE = proj-$(PROJ_VERSION).tar.gz
> +PROJ_SITE = http://download.osgeo.org/proj
> +PROJ_LICENSE = MIT

I've added PROJ_LICENSE_FILES

> +PROJ_INSTALL_STAGING = YES
> +
> +$(eval $(cmake-package))

Last but not least, I've switched to using the provided autotools build
system, because it correctly handled building a static library. Indeed,
your package using CMake was failing to build in static-only
configurations.

Applied with those fixes. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com