Re: [PATCH] gnu: Add soil.

2015-05-04 Thread David Thompson
Ludovic Courtès l...@gnu.org writes:

 David Thompson dthomps...@worcester.edu skribis:

 Andreas Enge andr...@enge.fr writes:

 [...]

 +  ;; No versioned archive available.
 +  (uri http://www.lonesock.net/files/soil.zip;)

 Normally, this would not work: As soon as a new version comes out, we would
 lose the old one, except for a copy on hydra that might be garbage 
 collected.
 So I think it would be preferable to use an svn checkout.

 In this particular case, since there are no new releases, the argument
 becomes moot...

 Yeah, dunno what to do here.  I could use the SVN checkout, but that
 really sucks.

 Either way is fine.  If the project is inactive, soil.zip won’t get
 updated anyway I guess.

Thanks.  Pushed as-is.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate



Re: [PATCH] gnu: Add soil.

2015-04-30 Thread Ludovic Courtès
David Thompson dthomps...@worcester.edu skribis:

 Andreas Enge andr...@enge.fr writes:

[...]

 +  ;; No versioned archive available.
 +  (uri http://www.lonesock.net/files/soil.zip;)

 Normally, this would not work: As soon as a new version comes out, we would
 lose the old one, except for a copy on hydra that might be garbage collected.
 So I think it would be preferable to use an svn checkout.

 In this particular case, since there are no new releases, the argument
 becomes moot...

 Yeah, dunno what to do here.  I could use the SVN checkout, but that
 really sucks.

Either way is fine.  If the project is inactive, soil.zip won’t get
updated anyway I guess.

Ludo’.



Re: [PATCH] gnu: Add soil.

2015-04-28 Thread David Thompson
Andreas Enge andr...@enge.fr writes:

 On Sun, Apr 26, 2015 at 05:52:44PM -0400, David Thompson wrote:
 +(define-public soil

 First a provocative question: The project has been created in 2007 and
 apparently abandoned in 2008. Is it still worth packaging, or would it
 not be preferable to look for a suitable replacement?

I am packaging it because it's a dependency for at least one big
project.  The example I know of is Dolphin, a video game console
emulator.

 +  ;; No versioned archive available.
 +  (uri http://www.lonesock.net/files/soil.zip;)

 Normally, this would not work: As soon as a new version comes out, we would
 lose the old one, except for a copy on hydra that might be garbage collected.
 So I think it would be preferable to use an svn checkout.

 In this particular case, since there are no new releases, the argument
 becomes moot...

Yeah, dunno what to do here.  I could use the SVN checkout, but that
really sucks.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate



Re: [PATCH] gnu: Add soil.

2015-04-28 Thread Andreas Enge
On Sun, Apr 26, 2015 at 05:52:44PM -0400, David Thompson wrote:
 +(define-public soil

First a provocative question: The project has been created in 2007 and
apparently abandoned in 2008. Is it still worth packaging, or would it
not be preferable to look for a suitable replacement?

 +  ;; No versioned archive available.
 +  (uri http://www.lonesock.net/files/soil.zip;)

Normally, this would not work: As soon as a new version comes out, we would
lose the old one, except for a copy on hydra that might be garbage collected.
So I think it would be preferable to use an svn checkout.

In this particular case, since there are no new releases, the argument
becomes moot...

Andreas




[PATCH] gnu: Add soil.

2015-04-26 Thread David Thompson
From c218a8f88eb623da01baa7b1693805f4ec1c67de Mon Sep 17 00:00:00 2001
From: David Thompson dthomps...@worcester.edu
Date: Sun, 26 Apr 2015 16:41:25 -0400
Subject: [PATCH] gnu: Add soil.

* gnu/packages/gl.scm (soil): New variable.
---
 gnu/packages/gl.scm | 45 -
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index e640f83..f4ca157 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -37,7 +37,8 @@
   #:use-module (gnu packages xml)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages guile)
-  #:use-module (gnu packages xdisorg))
+  #:use-module (gnu packages xdisorg)
+  #:use-module (gnu packages zip))
 
 (define-public glu
   (package
@@ -475,3 +476,45 @@ OpenGL graphics API.)
 (description
  A library for handling OpenGL function pointer management.)
 (license l:x11)))
+
+(define-public soil
+  (package
+(name soil)
+(version 1.0.7)
+(source (origin
+  (method url-fetch)
+  ;; No versioned archive available.
+  (uri http://www.lonesock.net/files/soil.zip;)
+  (sha256
+   (base32
+00gpwp9dldzhsdhksjvmbhsd2ialraqbv6v6dpikdmpncj6mnc52
+(build-system gnu-build-system)
+(arguments
+ '(#:tests? #f ; no tests
+   #:phases (modify-phases %standard-phases
+  (delete 'configure)
+  (add-before 'build 'init-build
+(lambda* (#:key outputs #:allow-other-keys)
+  (let ((out (assoc-ref outputs out)))
+(setenv CFLAGS -fPIC) ; needed for shared library
+;; Use alternate Makefile
+(copy-file projects/makefile/alternate Makefile.txt
+   src/Makefile)
+(chdir src)
+(substitute* '(Makefile)
+  ((INCLUDEDIR = /usr/include/SOIL)
+   (string-append INCLUDEDIR =  out /include/SOIL))
+  ((LIBDIR = /usr/lib)
+   (string-append LIBDIR =  out /lib))
+  ;; Remove these flags from 'install' commands.
+  ((-o root -g root) 
+(native-inputs
+ `((unzip ,unzip)))
+(inputs
+ `((mesa ,mesa)))
+(home-page http://www.lonesock.net/soil.html;)
+(synopsis OpenGL texture loading library)
+(description
+ SOIL is a tiny C library used primarily for uploading textures into
+OpenGL.)
+(license l:public-domain)))
-- 
2.1.4


-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate