unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#27774] [PATCH] gnu: add libgeotiff
@ 2017-07-20 15:50 Björn Höfling
  2017-07-22 12:46 ` Marius Bakke
                   ` (2 more replies)
  0 siblings, 3 replies; 15+ messages in thread
From: Björn Höfling @ 2017-07-20 15:50 UTC (permalink / raw)
  To: 27774

From 4e96405382258d0aa3a1760ac77dd0ac72706786 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?=
 <bjoern.hoefling@bjoernhoefling.de>
Date: Tue, 24 Jan 2017 09:00:07 +0100
Subject: [PATCH] gnu: add libgeotiff

* gnu/packages/geo.scm (libgeotiff): New variable.
---
 gnu/packages/geo.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index d8d5490f3..019731158 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -25,9 +25,11 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
+  #:use-module (gnu packages compression)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages image)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages webkit)
   #:use-module (gnu packages xml))
@@ -133,6 +135,60 @@ and driving.")
     (home-page "https://wiki.gnome.org/Apps/Maps")
     (license license:gpl2+)))
 
+(define-public libgeotiff
+  (package
+   (name "libgeotiff")
+   (version "1.4.2")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append "http://download.osgeo.org/geotiff/libgeotiff/"
+                                "libgeotiff-"
+                                version ".tar.gz"))
+            (sha256
+             (base32
+              "0vjy3bwfhljjx66p9w999i4mdhsf7vjshx29yc3pn5livf5091xd"))))
+   (build-system gnu-build-system)
+   (arguments
+    `(#:configure-flags
+      `( ,(string-append "--with-zlib")
+         ,(string-append "--with-jpeg")
+         ,(string-append "--with-libtiff="
+                         (assoc-ref %build-inputs "libtiff")))
+    #:phases
+    (modify-phases %standard-phases
+      (add-after
+          'unpack 'delete-nonfree-files
+        (lambda _
+          ;; Remove .csv-files, distributed from
+          ;; EPSG under a restricted license.
+          ;; See LICENSE.txt for full license text.
+          (for-each delete-file (find-files "." "\\.csv$"))
+          ;; Now that we remove the csv-files, we need to modify the Makefile:
+          (substitute* "Makefile.in"
+            (("all-am: Makefile \\$\\(LTLIBRARIES\\) \\$\\(DATA\\) \\$\\(HEADERS\\) geo_config.h")
+             "all-am: Makefile $(LTLIBRARIES) $(HEADERS) geo_config.h")
+            (("install-data-am: install-dist_csvDATA install-includeHEADERS")
+             "install-data-am: install-includeHEADERS"))
+          #t)))))
+   (inputs `(("libjpeg" ,libjpeg)
+             ("libtiff" ,libtiff)
+             ("proj.4" ,proj.4)
+             ("zlib" ,zlib)))
+   (synopsis "Library for handling GeoTIFF (geographic enabled TIFF)")
+   (description
+    "Libgeotiff is a library on top of libtiff for reading and writing
+GeoTIFF information tags.")
+   ;; This is a mixture of various contributions under different licenses
+   ;; Not that the EPSG database is NOT "free to use" as the LICENSE file
+   ;; states, as its commercial redistribution is restricted.
+   ;; We thus remove it from the package.
+   (license (list license:public-domain
+                  license:x11
+                  license:bsd-3
+                  (license:non-copyleft "file://LICENSE"
+                                  "See LICENSE in the distribution.")))
+   (home-page "https://trac.osgeo.org/geotiff/")))
+
 (define-public proj.4
   (package
     (name "proj.4")
-- 
2.12.2

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [bug#27774] [PATCH] gnu: add libgeotiff
  2017-07-20 15:50 [bug#27774] [PATCH] gnu: add libgeotiff Björn Höfling
@ 2017-07-22 12:46 ` Marius Bakke
  2017-07-22 13:48   ` Arun Isaac
                     ` (2 more replies)
  2017-07-25  6:58 ` Arun Isaac
  2018-01-03 16:55 ` [bug#27774] [PATCH 0/1] Add libgeotiff Arun Isaac
  2 siblings, 3 replies; 15+ messages in thread
From: Marius Bakke @ 2017-07-22 12:46 UTC (permalink / raw)
  To: Björn Höfling, 27774

[-- Attachment #1: Type: text/plain, Size: 2334 bytes --]

Hi Björn!

Björn Höfling <bjoern.hoefling@bjoernhoefling.de> writes:

> From 4e96405382258d0aa3a1760ac77dd0ac72706786 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?=
>  <bjoern.hoefling@bjoernhoefling.de>
> Date: Tue, 24 Jan 2017 09:00:07 +0100
> Subject: [PATCH] gnu: add libgeotiff
>
> * gnu/packages/geo.scm (libgeotiff): New variable.

[...]
  
> +(define-public libgeotiff
> +  (package
> +   (name "libgeotiff")
> +   (version "1.4.2")
> +   (source (origin
> +            (method url-fetch)
> +            (uri (string-append "http://download.osgeo.org/geotiff/libgeotiff/"
> +                                "libgeotiff-"
> +                                version ".tar.gz"))
> +            (sha256
> +             (base32
> +              "0vjy3bwfhljjx66p9w999i4mdhsf7vjshx29yc3pn5livf5091xd"))))
> +   (build-system gnu-build-system)
> +   (arguments
> +    `(#:configure-flags
> +      `( ,(string-append "--with-zlib")
> +         ,(string-append "--with-jpeg")
> +         ,(string-append "--with-libtiff="
> +                         (assoc-ref %build-inputs "libtiff")))

I think this can be reduced to...

#:configure-flags
(list "--with-zlib" "--with-jpeg"
      (string-append "--with-libtiff" (assoc-ref ....)))

> +    #:phases
> +    (modify-phases %standard-phases
> +      (add-after
> +          'unpack 'delete-nonfree-files
> +        (lambda _
> +          ;; Remove .csv-files, distributed from
> +          ;; EPSG under a restricted license.
> +          ;; See LICENSE.txt for full license text.
> +          (for-each delete-file (find-files "." "\\.csv$"))
> +          ;; Now that we remove the csv-files, we need to modify the Makefile:
> +          (substitute* "Makefile.in"
> +            (("all-am: Makefile \\$\\(LTLIBRARIES\\) \\$\\(DATA\\) \\$\\(HEADERS\\) geo_config.h")
> +             "all-am: Makefile $(LTLIBRARIES) $(HEADERS) geo_config.h")
> +            (("install-data-am: install-dist_csvDATA install-includeHEADERS")
> +             "install-data-am: install-includeHEADERS"))
> +          #t)))))

Thanks for finding this. Can you move this section to a 'snippet'
instead? Otherwise these restricted files will show up in `guix build -S
libgeotiff`, which we can not allow.

The rest LGTM!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#27774] [PATCH] gnu: add libgeotiff
  2017-07-22 12:46 ` Marius Bakke
@ 2017-07-22 13:48   ` Arun Isaac
  2017-07-23 11:22   ` Björn Höfling
       [not found]   ` <0c9f175f.AEQANc_cQw0AAAAAAAAAAAPYhrgAAAACwQwAAAAAAAW9WABZc1em@mailjet.com>
  2 siblings, 0 replies; 15+ messages in thread
From: Arun Isaac @ 2017-07-22 13:48 UTC (permalink / raw)
  To: Marius Bakke; +Cc: 27774


>> +   (arguments
>> +    `(#:configure-flags
>> +      `( ,(string-append "--with-zlib")
>> +         ,(string-append "--with-jpeg")
>> +         ,(string-append "--with-libtiff="
>> +                         (assoc-ref %build-inputs "libtiff")))

I'm asking this out of ignorance more than anything else. Is this
(assoc-ref %build-inputs "libtiff") call required for "--with-libtiff",
when it is not required for "--with-zlib" and "--with-jpeg"?

Also, can we build this package with libjpeg-turbo, instead of libjpeg?
libjpeg-turbo claims to be faster, and many packages in Arch and
Parabola are built using libjpeg-turbo.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#27774] [PATCH] gnu: add libgeotiff
  2017-07-22 12:46 ` Marius Bakke
  2017-07-22 13:48   ` Arun Isaac
@ 2017-07-23 11:22   ` Björn Höfling
       [not found]   ` <0c9f175f.AEQANc_cQw0AAAAAAAAAAAPYhrgAAAACwQwAAAAAAAW9WABZc1em@mailjet.com>
  2 siblings, 0 replies; 15+ messages in thread
From: Björn Höfling @ 2017-07-23 11:22 UTC (permalink / raw)
  To: Marius Bakke; +Cc: 27774

On Sat, 22 Jul 2017 14:46:24 +0200
Marius Bakke <mbakke@fastmail.com> wrote:

> Hi Björn!
> 
> Björn Höfling <bjoern.hoefling@bjoernhoefling.de> writes:
> 
> > From 4e96405382258d0aa3a1760ac77dd0ac72706786 Mon Sep 17 00:00:00
> > 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?=
> >  <bjoern.hoefling@bjoernhoefling.de>
> > Date: Tue, 24 Jan 2017 09:00:07 +0100
> > Subject: [PATCH] gnu: add libgeotiff
> >
> > * gnu/packages/geo.scm (libgeotiff): New variable.  
> 
> [...]
>   
> > +(define-public libgeotiff
> > +  (package
> > +   (name "libgeotiff")
> > +   (version "1.4.2")
> > +   (source (origin
> > +            (method url-fetch)
> > +            (uri (string-append
> > "http://download.osgeo.org/geotiff/libgeotiff/"
> > +                                "libgeotiff-"
> > +                                version ".tar.gz"))
> > +            (sha256
> > +             (base32
> > +
> > "0vjy3bwfhljjx66p9w999i4mdhsf7vjshx29yc3pn5livf5091xd"))))
> > +   (build-system gnu-build-system)
> > +   (arguments
> > +    `(#:configure-flags
> > +      `( ,(string-append "--with-zlib")
> > +         ,(string-append "--with-jpeg")
> > +         ,(string-append "--with-libtiff="
> > +                         (assoc-ref %build-inputs "libtiff")))  
> 
> I think this can be reduced to...
> 
> #:configure-flags
> (list "--with-zlib" "--with-jpeg"
>       (string-append "--with-libtiff" (assoc-ref ....)))

Of cause!


> > +    #:phases
> > +    (modify-phases %standard-phases
> > +      (add-after
> > +          'unpack 'delete-nonfree-files
> > +        (lambda _
> > +          ;; Remove .csv-files, distributed from
> > +          ;; EPSG under a restricted license.
> > +          ;; See LICENSE.txt for full license text.
> > +          (for-each delete-file (find-files "." "\\.csv$"))
> > +          ;; Now that we remove the csv-files, we need to modify
> > the Makefile:
> > +          (substitute* "Makefile.in"
> > +            (("all-am: Makefile \\$\\(LTLIBRARIES\\) \\$\\(DATA\\)
> > \\$\\(HEADERS\\) geo_config.h")
> > +             "all-am: Makefile $(LTLIBRARIES) $(HEADERS)
> > geo_config.h")
> > +            (("install-data-am: install-dist_csvDATA
> > install-includeHEADERS")
> > +             "install-data-am: install-includeHEADERS"))
> > +          #t)))))  
> 
> Thanks for finding this. Can you move this section to a 'snippet'
> instead? Otherwise these restricted files will show up in `guix build
> -S libgeotiff`, which we can not allow.

I didn't know of the 'snippet' until now. I will rework it with a origin->snippet
and send it in again.

> The rest LGTM!

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#27774] [PATCH] gnu: add libgeotiff
       [not found]   ` <0c9f175f.AEQANc_cQw0AAAAAAAAAAAPYhrgAAAACwQwAAAAAAAW9WABZc1em@mailjet.com>
@ 2017-07-23 11:27     ` Björn Höfling
  2017-07-23 15:36       ` Arun Isaac
  2017-09-08 15:53       ` Ludovic Courtès
  0 siblings, 2 replies; 15+ messages in thread
From: Björn Höfling @ 2017-07-23 11:27 UTC (permalink / raw)
  To: Arun Isaac; +Cc: 27774

Hi Arun,

On Sat, 22 Jul 2017 19:18:17 +0530
Arun Isaac <arunisaac@systemreboot.net> wrote:

> >> +   (arguments
> >> +    `(#:configure-flags
> >> +      `( ,(string-append "--with-zlib")
> >> +         ,(string-append "--with-jpeg")
> >> +         ,(string-append "--with-libtiff="
> >> +                         (assoc-ref %build-inputs "libtiff")))  
> 
> I'm asking this out of ignorance more than anything else. Is this
> (assoc-ref %build-inputs "libtiff") call required for
> "--with-libtiff", when it is not required for "--with-zlib" and
> "--with-jpeg"?

Yes:

If I leave it out (which was my first try anyway) I get this error message:

/gnu/store/k7029k5va68lkapbzcycdzj7m5bjb4b8-bash-4.4.12/bin/bash ../libtool
 --tag=CC   --mode=link gcc -I../ -Iyes -DHAVE_TIFF=1  -g -O2 -O3 -DNDEBUG
   -o libxtiff.la  xtiff.lo  -lproj -Lyes -ltiff -ljpeg -lz -lm  
../libtool: line 6000: cd: yes: No such file or directory

It seams the semantics for --with-libtiff is different than for the other
libraries.


> 
> Also, can we build this package with libjpeg-turbo, instead of
> libjpeg? libjpeg-turbo claims to be faster, and many packages in Arch
> and Parabola are built using libjpeg-turbo.

Good catch. It should be API-compatible, available on all plattforms and
Arch and Ubuntu (checked these) use is as dependency for libgeotiff.

I will give it a try and hopefully will also pack a minimal version of
GDAL to really make use of the library.

Thanks,

Björn

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#27774] [PATCH] gnu: add libgeotiff
  2017-07-23 11:27     ` Björn Höfling
@ 2017-07-23 15:36       ` Arun Isaac
  2017-09-08 15:53       ` Ludovic Courtès
  1 sibling, 0 replies; 15+ messages in thread
From: Arun Isaac @ 2017-07-23 15:36 UTC (permalink / raw)
  To: Björn Höfling; +Cc: 27774


Björn Höfling writes:

> On Sat, 22 Jul 2017 19:18:17 +0530
> Arun Isaac <arunisaac@systemreboot.net> wrote:
>
>> >> +   (arguments
>> >> +    `(#:configure-flags
>> >> +      `( ,(string-append "--with-zlib")
>> >> +         ,(string-append "--with-jpeg")
>> >> +         ,(string-append "--with-libtiff="
>> >> +                         (assoc-ref %build-inputs "libtiff")))  
>> 
>> I'm asking this out of ignorance more than anything else. Is this
>> (assoc-ref %build-inputs "libtiff") call required for
>> "--with-libtiff", when it is not required for "--with-zlib" and
>> "--with-jpeg"?
>
> Yes:
>
> If I leave it out (which was my first try anyway) I get this error message:
>
> /gnu/store/k7029k5va68lkapbzcycdzj7m5bjb4b8-bash-4.4.12/bin/bash ../libtool
>  --tag=CC   --mode=link gcc -I../ -Iyes -DHAVE_TIFF=1  -g -O2 -O3 -DNDEBUG
>    -o libxtiff.la  xtiff.lo  -lproj -Lyes -ltiff -ljpeg -lz -lm  
> ../libtool: line 6000: cd: yes: No such file or directory
>
> It seams the semantics for --with-libtiff is different than for the other
> libraries.

Ok.

>> Also, can we build this package with libjpeg-turbo, instead of
>> libjpeg? libjpeg-turbo claims to be faster, and many packages in Arch
>> and Parabola are built using libjpeg-turbo.
>
> Good catch. It should be API-compatible, available on all plattforms and
> Arch and Ubuntu (checked these) use is as dependency for libgeotiff.
>
> I will give it a try and hopefully will also pack a minimal version of
> GDAL to really make use of the library.

That's great!

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#27774] [PATCH] gnu: add libgeotiff
  2017-07-20 15:50 [bug#27774] [PATCH] gnu: add libgeotiff Björn Höfling
  2017-07-22 12:46 ` Marius Bakke
@ 2017-07-25  6:58 ` Arun Isaac
  2018-01-03 16:55 ` [bug#27774] [PATCH 0/1] Add libgeotiff Arun Isaac
  2 siblings, 0 replies; 15+ messages in thread
From: Arun Isaac @ 2017-07-25  6:58 UTC (permalink / raw)
  To: Björn Höfling; +Cc: 27774


> +   ;; This is a mixture of various contributions under different licenses
> +   ;; Not that the EPSG database is NOT "free to use" as the LICENSE file
> +   ;; states, as its commercial redistribution is restricted.
> +   ;; We thus remove it from the package.
> +   (license (list license:public-domain
> +                  license:x11
> +                  license:bsd-3
> +                  (license:non-copyleft "file://LICENSE"
> +                                  "See LICENSE in the distribution.")))

I think it might also be worthwhile mentioning (as comments) which files
are under which license.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#27774] [PATCH] gnu: add libgeotiff
  2017-07-23 11:27     ` Björn Höfling
  2017-07-23 15:36       ` Arun Isaac
@ 2017-09-08 15:53       ` Ludovic Courtès
  2017-09-13  6:55         ` Björn Höfling
  1 sibling, 1 reply; 15+ messages in thread
From: Ludovic Courtès @ 2017-09-08 15:53 UTC (permalink / raw)
  To: Björn Höfling; +Cc: 27774

Hello Björn,

Björn Höfling <bjoern.hoefling@bjoernhoefling.de> skribis:

> I will give it a try and hopefully will also pack a minimal version of
> GDAL to really make use of the library.

Any update on this patch?

TIA,
Ludo’.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#27774] [PATCH] gnu: add libgeotiff
  2017-09-08 15:53       ` Ludovic Courtès
@ 2017-09-13  6:55         ` Björn Höfling
  2017-10-18 21:20           ` Ricardo Wurmus
  0 siblings, 1 reply; 15+ messages in thread
From: Björn Höfling @ 2017-09-13  6:55 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: 27774

On Fri, 08 Sep 2017 17:53:08 +0200
ludo@gnu.org (Ludovic Courtès) wrote:

> Hello Björn,
> 
> Björn Höfling <bjoern.hoefling@bjoernhoefling.de> skribis:
> 
> > I will give it a try and hopefully will also pack a minimal version
> > of GDAL to really make use of the library.  
> 
> Any update on this patch?
> 
> TIA,
> Ludo’.


Sorry, I was on vacation and forgot to mention that to you.

Yes, had some progress but at some point built failed, need to bisect.

Hope to fix it within a week.

Björn

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#27774] [PATCH] gnu: add libgeotiff
  2017-09-13  6:55         ` Björn Höfling
@ 2017-10-18 21:20           ` Ricardo Wurmus
  0 siblings, 0 replies; 15+ messages in thread
From: Ricardo Wurmus @ 2017-10-18 21:20 UTC (permalink / raw)
  To: Björn Höfling; +Cc: 27774


Hi Björn,

> On Fri, 08 Sep 2017 17:53:08 +0200
> ludo@gnu.org (Ludovic Courtès) wrote:
>
>> Hello Björn,
>> 
>> Björn Höfling <bjoern.hoefling@bjoernhoefling.de> skribis:
>> 
>> > I will give it a try and hopefully will also pack a minimal version
>> > of GDAL to really make use of the library.  
>> 
>> Any update on this patch?
>> 
>> TIA,
>> Ludo’.
>
>
> Sorry, I was on vacation and forgot to mention that to you.
>
> Yes, had some progress but at some point built failed, need to bisect.
>
> Hope to fix it within a week.

How’s it going? :)
Do you need help with this patch?

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#27774] [PATCH 0/1] Add libgeotiff
  2017-07-20 15:50 [bug#27774] [PATCH] gnu: add libgeotiff Björn Höfling
  2017-07-22 12:46 ` Marius Bakke
  2017-07-25  6:58 ` Arun Isaac
@ 2018-01-03 16:55 ` Arun Isaac
  2018-01-03 16:56   ` [bug#27774] [PATCH 1/1] gnu: " Arun Isaac
  2018-01-03 18:24   ` [bug#27774] [PATCH 0/1] " Leo Famulari
  2 siblings, 2 replies; 15+ messages in thread
From: Arun Isaac @ 2018-01-03 16:55 UTC (permalink / raw)
  To: 27774

I am unsure if Bjorn is coming back. So, I have completed the patch. Let me
know if everything is fine. I'll push it.

Björn Höfling (1):
  gnu: Add libgeotiff.

 gnu/packages/geo.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

-- 
2.15.1

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#27774] [PATCH 1/1] gnu: Add libgeotiff.
  2018-01-03 16:55 ` [bug#27774] [PATCH 0/1] Add libgeotiff Arun Isaac
@ 2018-01-03 16:56   ` Arun Isaac
  2018-01-27 20:07     ` Björn Höfling
  2018-01-03 18:24   ` [bug#27774] [PATCH 0/1] " Leo Famulari
  1 sibling, 1 reply; 15+ messages in thread
From: Arun Isaac @ 2018-01-03 16:56 UTC (permalink / raw)
  To: 27774

From: Björn Höfling <bjoern.hoefling@bjoernhoefling.de>

* gnu/packages/geo.scm (libgeotiff): New variable.

Signed-off-by: Arun Isaac <arunisaac@systemreboot.net>
---
 gnu/packages/geo.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 7bf1562ba..c3a62c641 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -25,9 +25,11 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
+  #:use-module (gnu packages compression)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages image)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages webkit)
   #:use-module (gnu packages xml))
@@ -137,6 +139,55 @@ and driving.")
     (home-page "https://wiki.gnome.org/Apps/Maps")
     (license license:gpl2+)))
 
+(define-public libgeotiff
+  (package
+    (name "libgeotiff")
+    (version "1.4.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "0vjy3bwfhljjx66p9w999i4mdhsf7vjshx29yc3pn5livf5091xd"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           ;; Remove .csv files, distributed from EPSG under a restricted
+           ;; license. See LICENSE for full license text.
+           (for-each delete-file (find-files "." "\\.csv$"))
+           ;; Now that we have removed the csv files, we need to modify the Makefile.
+           (substitute* "Makefile.in"
+             (("^all-am: .*$")
+              "all-am: Makefile $(LTLIBRARIES) $(HEADERS) geo_config.h\n")
+             (("^install-data-am: .*$")
+              "install-data-am: install-includeHEADERS"))))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("libjpeg-turbo" ,libjpeg-turbo)
+       ("libtiff" ,libtiff)
+       ("proj.4" ,proj.4)
+       ("zlib" ,zlib)))
+    (arguments
+     `(#:configure-flags
+       (list (string-append "--with-zlib")
+             (string-append "--with-jpeg")
+             (string-append "--with-libtiff=" (assoc-ref %build-inputs "libtiff")))))
+    (synopsis "Library for handling GeoTIFF (geographic enabled TIFF)")
+    (description "libgeotiff is a library on top of libtiff for reading and
+writing GeoTIFF information tags.")
+    (home-page "https://trac.osgeo.org/geotiff/")
+    ;; This is a mixture of various contributions under different licenses.
+    ;; Note that the EPSG database is NOT "free to use" as the LICENSE file
+    ;; states, as its commercial redistribution is restricted. Hence, we have
+    ;; removed it from the package.
+    (license (list license:public-domain
+                   license:x11
+                   license:bsd-3
+                   (license:non-copyleft "file://LICENSE"
+                                         "See LICENSE in the distribution.")))))
+
 (define-public proj.4
   (package
     (name "proj.4")
-- 
2.15.1

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [bug#27774] [PATCH 0/1] Add libgeotiff
  2018-01-03 16:55 ` [bug#27774] [PATCH 0/1] Add libgeotiff Arun Isaac
  2018-01-03 16:56   ` [bug#27774] [PATCH 1/1] gnu: " Arun Isaac
@ 2018-01-03 18:24   ` Leo Famulari
  2018-01-04  6:55     ` bug#27774: " Arun Isaac
  1 sibling, 1 reply; 15+ messages in thread
From: Leo Famulari @ 2018-01-03 18:24 UTC (permalink / raw)
  To: Arun Isaac; +Cc: 27774

[-- Attachment #1: Type: text/plain, Size: 232 bytes --]

On Wed, Jan 03, 2018 at 10:25:59PM +0530, Arun Isaac wrote:
> I am unsure if Bjorn is coming back. So, I have completed the patch. Let me
> know if everything is fine. I'll push it.

Thanks Arun! The updated patch looks good to me.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 15+ messages in thread

* bug#27774: [PATCH 0/1] Add libgeotiff
  2018-01-03 18:24   ` [bug#27774] [PATCH 0/1] " Leo Famulari
@ 2018-01-04  6:55     ` Arun Isaac
  0 siblings, 0 replies; 15+ messages in thread
From: Arun Isaac @ 2018-01-04  6:55 UTC (permalink / raw)
  To: Leo Famulari; +Cc: 27774-done

Leo Famulari <leo@famulari.name> writes:

> On Wed, Jan 03, 2018 at 10:25:59PM +0530, Arun Isaac wrote:
>> I am unsure if Bjorn is coming back. So, I have completed the patch. Let me
>> know if everything is fine. I'll push it.
>
> Thanks Arun! The updated patch looks good to me.

Pushed, thanks!

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#27774] [PATCH 1/1] gnu: Add libgeotiff.
  2018-01-03 16:56   ` [bug#27774] [PATCH 1/1] gnu: " Arun Isaac
@ 2018-01-27 20:07     ` Björn Höfling
  0 siblings, 0 replies; 15+ messages in thread
From: Björn Höfling @ 2018-01-27 20:07 UTC (permalink / raw)
  To: Arun Isaac; +Cc: 27774

Hi Arun,

thanks for finishing that. I messed my git repository and then forgot
about it because of other things.

Björn


On Wed,  3 Jan 2018 22:26:00 +0530
Arun Isaac <arunisaac@systemreboot.net> wrote:

> From: Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
> 
> * gnu/packages/geo.scm (libgeotiff): New variable.
> 
> Signed-off-by: Arun Isaac <arunisaac@systemreboot.net>
> ---
>  gnu/packages/geo.scm | 51
> +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed,
> 51 insertions(+)
> 
> diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
> index 7bf1562ba..c3a62c641 100644
> --- a/gnu/packages/geo.scm
> +++ b/gnu/packages/geo.scm
> @@ -25,9 +25,11 @@
>    #:use-module ((guix licenses) #:prefix license:)
>    #:use-module (guix packages)
>    #:use-module (guix utils)
> +  #:use-module (gnu packages compression)
>    #:use-module (gnu packages glib)
>    #:use-module (gnu packages gnome)
>    #:use-module (gnu packages gtk)
> +  #:use-module (gnu packages image)
>    #:use-module (gnu packages pkg-config)
>    #:use-module (gnu packages webkit)
>    #:use-module (gnu packages xml))
> @@ -137,6 +139,55 @@ and driving.")
>      (home-page "https://wiki.gnome.org/Apps/Maps")
>      (license license:gpl2+)))
>  
> +(define-public libgeotiff
> +  (package
> +    (name "libgeotiff")
> +    (version "1.4.2")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append
> "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-"
> +                           version ".tar.gz"))
> +       (sha256
> +        (base32
> +         "0vjy3bwfhljjx66p9w999i4mdhsf7vjshx29yc3pn5livf5091xd"))
> +       (modules '((guix build utils)))
> +       (snippet
> +        '(begin
> +           ;; Remove .csv files, distributed from EPSG under a
> restricted
> +           ;; license. See LICENSE for full license text.
> +           (for-each delete-file (find-files "." "\\.csv$"))
> +           ;; Now that we have removed the csv files, we need to
> modify the Makefile.
> +           (substitute* "Makefile.in"
> +             (("^all-am: .*$")
> +              "all-am: Makefile $(LTLIBRARIES) $(HEADERS)
> geo_config.h\n")
> +             (("^install-data-am: .*$")
> +              "install-data-am: install-includeHEADERS"))))))
> +    (build-system gnu-build-system)
> +    (inputs
> +     `(("libjpeg-turbo" ,libjpeg-turbo)
> +       ("libtiff" ,libtiff)
> +       ("proj.4" ,proj.4)
> +       ("zlib" ,zlib)))
> +    (arguments
> +     `(#:configure-flags
> +       (list (string-append "--with-zlib")
> +             (string-append "--with-jpeg")
> +             (string-append "--with-libtiff=" (assoc-ref
> %build-inputs "libtiff")))))
> +    (synopsis "Library for handling GeoTIFF (geographic enabled
> TIFF)")
> +    (description "libgeotiff is a library on top of libtiff for
> reading and +writing GeoTIFF information tags.")
> +    (home-page "https://trac.osgeo.org/geotiff/")
> +    ;; This is a mixture of various contributions under different
> licenses.
> +    ;; Note that the EPSG database is NOT "free to use" as the
> LICENSE file
> +    ;; states, as its commercial redistribution is restricted.
> Hence, we have
> +    ;; removed it from the package.
> +    (license (list license:public-domain
> +                   license:x11
> +                   license:bsd-3
> +                   (license:non-copyleft "file://LICENSE"
> +                                         "See LICENSE in the
> distribution."))))) +
>  (define-public proj.4
>    (package
>      (name "proj.4")

^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2018-01-27 20:08 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-20 15:50 [bug#27774] [PATCH] gnu: add libgeotiff Björn Höfling
2017-07-22 12:46 ` Marius Bakke
2017-07-22 13:48   ` Arun Isaac
2017-07-23 11:22   ` Björn Höfling
     [not found]   ` <0c9f175f.AEQANc_cQw0AAAAAAAAAAAPYhrgAAAACwQwAAAAAAAW9WABZc1em@mailjet.com>
2017-07-23 11:27     ` Björn Höfling
2017-07-23 15:36       ` Arun Isaac
2017-09-08 15:53       ` Ludovic Courtès
2017-09-13  6:55         ` Björn Höfling
2017-10-18 21:20           ` Ricardo Wurmus
2017-07-25  6:58 ` Arun Isaac
2018-01-03 16:55 ` [bug#27774] [PATCH 0/1] Add libgeotiff Arun Isaac
2018-01-03 16:56   ` [bug#27774] [PATCH 1/1] gnu: " Arun Isaac
2018-01-27 20:07     ` Björn Höfling
2018-01-03 18:24   ` [bug#27774] [PATCH 0/1] " Leo Famulari
2018-01-04  6:55     ` bug#27774: " Arun Isaac

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).