unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* [PATCH v3] gnu: Add bullet.
@ 2014-12-11 22:21 Tomáš Čech
  2014-12-12  3:09 ` David Thompson
  0 siblings, 1 reply; 10+ messages in thread
From: Tomáš Čech @ 2014-12-11 22:21 UTC (permalink / raw)
  To: guix-devel

* gnu/packages/game-development.scm: New file
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
---
 gnu-system.am                     |  1 +
 gnu/packages/game-development.scm | 43 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 gnu/packages/game-development.scm

diff --git a/gnu-system.am b/gnu-system.am
index e923340..481a9a7 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -95,6 +95,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/freeipmi.scm			\
   gnu/packages/ftp.scm				\
   gnu/packages/fribidi.scm			\
+  gnu/packages/game-development.scm		\
   gnu/packages/games.scm			\
   gnu/packages/gawk.scm				\
   gnu/packages/gcal.scm				\
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
new file mode 100644
index 0000000..72e73dd
--- /dev/null
+++ b/gnu/packages/game-development.scm
@@ -0,0 +1,43 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Tomáš Čech <sleep_walker@suse.cz>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages game-development)
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system cmake)
+  #:use-module (gnu packages))
+
+(define-public bullet
+  (package
+    (name "bullet")
+    (version "2.82")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://bullet.googlecode.com/files/bullet-"
+                                  version "-r2704.tgz"))
+              (sha256
+               (base32 "1lnfksxa9b1slyfcxys313ymsllvbsnxh9np06azkbgpfvmwkr37"))))
+    (build-system cmake-build-system)
+    (arguments '(#:tests? #f)) ; no 'test' target
+    (home-page "http://bulletphysics.org/")
+    (synopsis "3D physics engine library")
+    (description
+     "Bullet is a physics engine library usable for collision detection.  It 
+is used in some video games and movies.")
+    (license zlib)))
-- 
2.0.4

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

* Re: [PATCH v3] gnu: Add bullet.
  2014-12-11 22:21 [PATCH v3] gnu: Add bullet Tomáš Čech
@ 2014-12-12  3:09 ` David Thompson
  2014-12-12  7:08   ` Tomas Cech
  0 siblings, 1 reply; 10+ messages in thread
From: David Thompson @ 2014-12-12  3:09 UTC (permalink / raw)
  To: Tomáš Čech, guix-devel

Hello again,

Missed one thing during my previous review.

Tomáš Čech <sleep_walker@suse.cz> writes:

> * gnu/packages/game-development.scm: New file
> * gnu-system.am (GNU_SYSTEM_MODULES): Add it.
> ---
>  gnu-system.am                     |  1 +
>  gnu/packages/game-development.scm | 43 +++++++++++++++++++++++++++++++++++++++
>  2 files changed, 44 insertions(+)
>  create mode 100644 gnu/packages/game-development.scm
>
> diff --git a/gnu-system.am b/gnu-system.am
> index e923340..481a9a7 100644
> --- a/gnu-system.am
> +++ b/gnu-system.am
> @@ -95,6 +95,7 @@ GNU_SYSTEM_MODULES =				\
>    gnu/packages/freeipmi.scm			\
>    gnu/packages/ftp.scm				\
>    gnu/packages/fribidi.scm			\
> +  gnu/packages/game-development.scm		\
>    gnu/packages/games.scm			\
>    gnu/packages/gawk.scm				\
>    gnu/packages/gcal.scm				\
> diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
> new file mode 100644
> index 0000000..72e73dd
> --- /dev/null
> +++ b/gnu/packages/game-development.scm
> @@ -0,0 +1,43 @@
[snip]
> +(define-public bullet
> +  (package
> +    (name "bullet")
> +    (version "2.82")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append "https://bullet.googlecode.com/files/bullet-"
> +                                  version "-r2704.tgz"))

I remember there being some discussion about dashes in version numbers,
and I can't remember the outcome.  If there's no issue, I think that the
"-r2704" should be part of the version number string.

> +              (sha256
> +               (base32 "1lnfksxa9b1slyfcxys313ymsllvbsnxh9np06azkbgpfvmwkr37"))))
> +    (build-system cmake-build-system)
> +    (arguments '(#:tests? #f)) ; no 'test' target
> +    (home-page "http://bulletphysics.org/")
> +    (synopsis "3D physics engine library")
> +    (description
> +     "Bullet is a physics engine library usable for collision detection.  It 
> +is used in some video games and movies.")
> +    (license zlib)))
> -- 
> 2.0.4
>
>

Thanks!

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

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

* Re: [PATCH v3] gnu: Add bullet.
  2014-12-12  3:09 ` David Thompson
@ 2014-12-12  7:08   ` Tomas Cech
  2014-12-12 13:53     ` Mark H Weaver
  0 siblings, 1 reply; 10+ messages in thread
From: Tomas Cech @ 2014-12-12  7:08 UTC (permalink / raw)
  To: David Thompson; +Cc: guix-devel

Thanks again for your review.

At Thu, 11 Dec 2014 22:09:22 -0500,
David Thompson wrote:
> 
> Hello again,
> 
> Missed one thing during my previous review.
> 
> Tomáš Čech <sleep_walker@suse.cz> writes:
> 
> > * gnu/packages/game-development.scm: New file
> > * gnu-system.am (GNU_SYSTEM_MODULES): Add it.
> > ---
> >  gnu-system.am                     |  1 +
> >  gnu/packages/game-development.scm | 43 +++++++++++++++++++++++++++++++++++++++
> >  2 files changed, 44 insertions(+)
> >  create mode 100644 gnu/packages/game-development.scm
> >
> > diff --git a/gnu-system.am b/gnu-system.am
> > index e923340..481a9a7 100644
> > --- a/gnu-system.am
> > +++ b/gnu-system.am
> > @@ -95,6 +95,7 @@ GNU_SYSTEM_MODULES =				\
> >    gnu/packages/freeipmi.scm			\
> >    gnu/packages/ftp.scm				\
> >    gnu/packages/fribidi.scm			\
> > +  gnu/packages/game-development.scm		\
> >    gnu/packages/games.scm			\
> >    gnu/packages/gawk.scm				\
> >    gnu/packages/gcal.scm				\
> > diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
> > new file mode 100644
> > index 0000000..72e73dd
> > --- /dev/null
> > +++ b/gnu/packages/game-development.scm
> > @@ -0,0 +1,43 @@
> [snip]
> > +(define-public bullet
> > +  (package
> > +    (name "bullet")
> > +    (version "2.82")
> > +    (source (origin
> > +              (method url-fetch)
> > +              (uri (string-append "https://bullet.googlecode.com/files/bullet-"
> > +                                  version "-r2704.tgz"))
> 
> I remember there being some discussion about dashes in version numbers,
> and I can't remember the outcome.  If there's no issue, I think that the
> "-r2704" should be part of the version number string.

I'm pretty sure that this version is generally refered as '2.82' only, even on their own pages:
http://bulletphysics.org/wordpress/?p=393.

Gentoo has 2.82:
http://packages.gentoo.org/package/sci-physics/bullet


Debian is referring to that as 2.82-r2704:
https://packages.debian.org/source/sid/misc/bullet

openSUSE is not relevant as I made that package :b

Thanks,

S_W

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

* Re: [PATCH v3] gnu: Add bullet.
  2014-12-12  7:08   ` Tomas Cech
@ 2014-12-12 13:53     ` Mark H Weaver
  2014-12-13 12:41       ` Tomáš Čech
  0 siblings, 1 reply; 10+ messages in thread
From: Mark H Weaver @ 2014-12-12 13:53 UTC (permalink / raw)
  To: Tomas Cech; +Cc: guix-devel

Tomas Cech <tcech@suse.cz> writes:

> At Thu, 11 Dec 2014 22:09:22 -0500,
> David Thompson wrote:
>> 
>> Tomáš Čech <sleep_walker@suse.cz> writes:

[...]

>> > +(define-public bullet
>> > +  (package
>> > +    (name "bullet")
>> > +    (version "2.82")
>> > +    (source (origin
>> > +              (method url-fetch)
>> > +              (uri (string-append "https://bullet.googlecode.com/files/bullet-"
>> > +                                  version "-r2704.tgz"))
>> 
>> I remember there being some discussion about dashes in version numbers,
>> and I can't remember the outcome.  If there's no issue, I think that the
>> "-r2704" should be part of the version number string.
>
> I'm pretty sure that this version is generally refered as '2.82' only, even on their own pages:
> http://bulletphysics.org/wordpress/?p=393.
>
> Gentoo has 2.82:
> http://packages.gentoo.org/package/sci-physics/bullet
>
>
> Debian is referring to that as 2.82-r2704:
> https://packages.debian.org/source/sid/misc/bullet

I agree with David, and Debian.  The fact that they include "-r2704" in
their tarball name suggests that they might release a newer version
called "2.82-r2705", and I want Guix to be able to answer the question
"which version is newer?".  If 2.82-r2705 fixes a problem, I want to be
able to see if the version I have installed still has that problem.
Does that make sense?

    Regards,
      Mark

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

* Re: [PATCH v3] gnu: Add bullet.
  2014-12-12 13:53     ` Mark H Weaver
@ 2014-12-13 12:41       ` Tomáš Čech
  2014-12-13 12:41         ` [PATCH v4] " Tomáš Čech
  0 siblings, 1 reply; 10+ messages in thread
From: Tomáš Čech @ 2014-12-13 12:41 UTC (permalink / raw)
  To: guix-devel

OK, even though I disagree with version to be used, I adjusted it according
Mark's comment.

In the meantime I also added patch for building with -fPIC parameter which is
required for EFL.

Thanks in advance for your review.

Best regards,

Tomas Cech

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

* [PATCH v4] gnu: Add bullet.
  2014-12-13 12:41       ` Tomáš Čech
@ 2014-12-13 12:41         ` Tomáš Čech
  2014-12-13 15:58           ` David Thompson
  0 siblings, 1 reply; 10+ messages in thread
From: Tomáš Čech @ 2014-12-13 12:41 UTC (permalink / raw)
  To: guix-devel

* gnu/packages/game-development.scm: New file
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
* gnu/packages/patches/bullet-add-fPIC-into-flags.patch: New file
* gnu-system.am (dist_patch_DATA): Add it.
---
 gnu-system.am                                      |  2 +
 gnu/packages/game-development.scm                  | 44 ++++++++++++++++++++++
 .../patches/bullet-add-fPIC-into-flags.patch       | 13 +++++++
 3 files changed, 59 insertions(+)
 create mode 100644 gnu/packages/game-development.scm
 create mode 100644 gnu/packages/patches/bullet-add-fPIC-into-flags.patch

diff --git a/gnu-system.am b/gnu-system.am
index e828c01..d4c806e 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -96,6 +96,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/freeipmi.scm			\
   gnu/packages/ftp.scm				\
   gnu/packages/fribidi.scm			\
+  gnu/packages/game-development.scm		\
   gnu/packages/games.scm			\
   gnu/packages/gawk.scm				\
   gnu/packages/gcal.scm				\
@@ -334,6 +335,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/bigloo-gc-shebangs.patch			\
   gnu/packages/patches/binutils-ld-new-dtags.patch		\
   gnu/packages/patches/binutils-loongson-workaround.patch	\
+  gnu/packages/patches/bullet-add-fPIC-into-flags.patch		\
   gnu/packages/patches/cdparanoia-fpic.patch			\
   gnu/packages/patches/clucene-pkgconfig.patch			\
   gnu/packages/patches/cmake-fix-tests.patch			\
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
new file mode 100644
index 0000000..96a87e1
--- /dev/null
+++ b/gnu/packages/game-development.scm
@@ -0,0 +1,44 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Tomáš Čech <sleep_walker@suse.cz>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages game-development)
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system cmake)
+  #:use-module (gnu packages))
+
+(define-public bullet
+  (package
+    (name "bullet")
+    (version "2.82-r2704")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://bullet.googlecode.com/files/bullet-"
+                                  version ".tgz"))
+              (sha256
+               (base32 "1lnfksxa9b1slyfcxys313ymsllvbsnxh9np06azkbgpfvmwkr37"))
+              (patches (list (search-patch "bullet-add-fPIC-into-flags.patch")))))
+    (build-system cmake-build-system)
+    (arguments '(#:tests? #f)) ; no 'test' target
+    (home-page "http://bulletphysics.org/")
+    (synopsis "3D physics engine library")
+    (description
+     "Bullet is a physics engine library usable for collision detection.  It 
+is used in some video games and movies.")
+    (license zlib)))
diff --git a/gnu/packages/patches/bullet-add-fPIC-into-flags.patch b/gnu/packages/patches/bullet-add-fPIC-into-flags.patch
new file mode 100644
index 0000000..6e27660
--- /dev/null
+++ b/gnu/packages/patches/bullet-add-fPIC-into-flags.patch
@@ -0,0 +1,13 @@
+diff -up bullet-2.82-r2704/CMakeLists.txt.orig bullet-2.82-r2704/CMakeLists.txt
+--- bullet-2.82-r2704/CMakeLists.txt.orig	2014-12-13 00:09:49.648710180 +0100
++++ bullet-2.82-r2704/CMakeLists.txt	2014-12-13 00:10:44.205708986 +0100
+@@ -17,6 +17,9 @@ IF (NOT CMAKE_BUILD_TYPE)
+  SET(CMAKE_BUILD_TYPE "Release")
+ ENDIF (NOT CMAKE_BUILD_TYPE) 
+ 
++SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -fPIC")
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
++
+ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
+ #MESSAGE("CMAKE_CXX_FLAGS_DEBUG="+${CMAKE_CXX_FLAGS_DEBUG})
+ 
-- 
2.0.4

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

* Re: [PATCH v4] gnu: Add bullet.
  2014-12-13 12:41         ` [PATCH v4] " Tomáš Čech
@ 2014-12-13 15:58           ` David Thompson
  2014-12-15 10:48             ` Tomas Cech
  0 siblings, 1 reply; 10+ messages in thread
From: David Thompson @ 2014-12-13 15:58 UTC (permalink / raw)
  To: Tomáš Čech, guix-devel

Tomáš Čech <sleep_walker@suse.cz> writes:

> * gnu/packages/game-development.scm: New file
> * gnu-system.am (GNU_SYSTEM_MODULES): Add it.
> * gnu/packages/patches/bullet-add-fPIC-into-flags.patch: New file
> * gnu-system.am (dist_patch_DATA): Add it.
> ---
>  gnu-system.am                                      |  2 +
>  gnu/packages/game-development.scm                  | 44 ++++++++++++++++++++++
>  .../patches/bullet-add-fPIC-into-flags.patch       | 13 +++++++
>  3 files changed, 59 insertions(+)
>  create mode 100644 gnu/packages/game-development.scm
>  create mode 100644 gnu/packages/patches/bullet-add-fPIC-into-flags.patch
>
> diff --git a/gnu-system.am b/gnu-system.am
> index e828c01..d4c806e 100644
> --- a/gnu-system.am
> +++ b/gnu-system.am
> @@ -96,6 +96,7 @@ GNU_SYSTEM_MODULES =				\
>    gnu/packages/freeipmi.scm			\
>    gnu/packages/ftp.scm				\
>    gnu/packages/fribidi.scm			\
> +  gnu/packages/game-development.scm		\
>    gnu/packages/games.scm			\
>    gnu/packages/gawk.scm				\
>    gnu/packages/gcal.scm				\
> @@ -334,6 +335,7 @@ dist_patch_DATA =						\
>    gnu/packages/patches/bigloo-gc-shebangs.patch			\
>    gnu/packages/patches/binutils-ld-new-dtags.patch		\
>    gnu/packages/patches/binutils-loongson-workaround.patch	\
> +  gnu/packages/patches/bullet-add-fPIC-into-flags.patch		\
>    gnu/packages/patches/cdparanoia-fpic.patch			\
>    gnu/packages/patches/clucene-pkgconfig.patch			\
>    gnu/packages/patches/cmake-fix-tests.patch			\
> diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
> new file mode 100644
> index 0000000..96a87e1
> --- /dev/null
> +++ b/gnu/packages/game-development.scm
> @@ -0,0 +1,44 @@
> +;;; GNU Guix --- Functional package management for GNU
> +;;; Copyright © 2014 Tomáš Čech <sleep_walker@suse.cz>
> +;;;
> +;;; This file is part of GNU Guix.
> +;;;
> +;;; GNU Guix is free software; you can redistribute it and/or modify it
> +;;; under the terms of the GNU General Public License as published by
> +;;; the Free Software Foundation; either version 3 of the License, or (at
> +;;; your option) any later version.
> +;;;
> +;;; GNU Guix is distributed in the hope that it will be useful, but
> +;;; WITHOUT ANY WARRANTY; without even the implied warranty of
> +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +;;; GNU General Public License for more details.
> +;;;
> +;;; You should have received a copy of the GNU General Public License
> +;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
> +
> +(define-module (gnu packages game-development)
> +  #:use-module (guix licenses)
> +  #:use-module (guix packages)
> +  #:use-module (guix download)
> +  #:use-module (guix build-system cmake)
> +  #:use-module (gnu packages))
> +
> +(define-public bullet
> +  (package
> +    (name "bullet")
> +    (version "2.82-r2704")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append "https://bullet.googlecode.com/files/bullet-"
> +                                  version ".tgz"))
> +              (sha256
> +               (base32 "1lnfksxa9b1slyfcxys313ymsllvbsnxh9np06azkbgpfvmwkr37"))
> +              (patches (list (search-patch "bullet-add-fPIC-into-flags.patch")))))
> +    (build-system cmake-build-system)
> +    (arguments '(#:tests? #f)) ; no 'test' target
> +    (home-page "http://bulletphysics.org/")
> +    (synopsis "3D physics engine library")
> +    (description
> +     "Bullet is a physics engine library usable for collision detection.  It 
> +is used in some video games and movies.")
> +    (license zlib)))
> diff --git a/gnu/packages/patches/bullet-add-fPIC-into-flags.patch b/gnu/packages/patches/bullet-add-fPIC-into-flags.patch
> new file mode 100644
> index 0000000..6e27660
> --- /dev/null
> +++ b/gnu/packages/patches/bullet-add-fPIC-into-flags.patch
> @@ -0,0 +1,13 @@
> +diff -up bullet-2.82-r2704/CMakeLists.txt.orig bullet-2.82-r2704/CMakeLists.txt
> +--- bullet-2.82-r2704/CMakeLists.txt.orig	2014-12-13 00:09:49.648710180 +0100
> ++++ bullet-2.82-r2704/CMakeLists.txt	2014-12-13 00:10:44.205708986 +0100
> +@@ -17,6 +17,9 @@ IF (NOT CMAKE_BUILD_TYPE)
> +  SET(CMAKE_BUILD_TYPE "Release")
> + ENDIF (NOT CMAKE_BUILD_TYPE) 
> + 
> ++SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -fPIC")
> ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
> ++

Is the second 'SET' redundant?

Rather than using this patch file, you should instead add a new build
phase to the bullet package.  Add something like this to the arguments
field, after '#:tests? #f':

  #:phases (alist-cons-before
            'configure 'set-env-vars
            (lambda _
              (setenv "CMAKE_CXX_FLAGS"
                      (string-append (getenv "CMAKE_C_FLAGS")
            "-fPIC"))))

I don't know enough about cmake to know if this will work, but hopefully
it will give you an idea.
  
> + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
> + #MESSAGE("CMAKE_CXX_FLAGS_DEBUG="+${CMAKE_CXX_FLAGS_DEBUG})
> + 
> -- 
> 2.0.4
>
>

Things are looking good. :)

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

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

* Re: [PATCH v4] gnu: Add bullet.
  2014-12-13 15:58           ` David Thompson
@ 2014-12-15 10:48             ` Tomas Cech
  2014-12-15 10:50               ` [PATCH v5] " Tomáš Čech
  2014-12-15 13:14               ` [PATCH v4] " David Thompson
  0 siblings, 2 replies; 10+ messages in thread
From: Tomas Cech @ 2014-12-15 10:48 UTC (permalink / raw)
  To: David Thompson; +Cc: guix-devel

At Sat, 13 Dec 2014 10:58:44 -0500,
David Thompson wrote:
> 
> Tomáš Čech <sleep_walker@suse.cz> writes:
> > ...
> > @@ -0,0 +1,13 @@
> > +diff -up bullet-2.82-r2704/CMakeLists.txt.orig bullet-2.82-r2704/CMakeLists.txt
> > +--- bullet-2.82-r2704/CMakeLists.txt.orig	2014-12-13 00:09:49.648710180 +0100
> > ++++ bullet-2.82-r2704/CMakeLists.txt	2014-12-13 00:10:44.205708986 +0100
> > +@@ -17,6 +17,9 @@ IF (NOT CMAKE_BUILD_TYPE)
> > +  SET(CMAKE_BUILD_TYPE "Release")
> > + ENDIF (NOT CMAKE_BUILD_TYPE) 
> > + 
> > ++SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -fPIC")
> > ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
> > ++
> 
> Is the second 'SET' redundant?

Yes, it is wrong.

> Rather than using this patch file, you should instead add a new build
> phase to the bullet package.  Add something like this to the arguments
> field, after '#:tests? #f':
> 
>   #:phases (alist-cons-before
>             'configure 'set-env-vars
>             (lambda _
>               (setenv "CMAKE_CXX_FLAGS"
>                       (string-append (getenv "CMAKE_C_FLAGS")
>             "-fPIC"))))

I liked that idea and used that approach. Updated patch is following...

Thanks for your review and patience.

Best regards,

S_W

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

* [PATCH v5] gnu: Add bullet.
  2014-12-15 10:48             ` Tomas Cech
@ 2014-12-15 10:50               ` Tomáš Čech
  2014-12-15 13:14               ` [PATCH v4] " David Thompson
  1 sibling, 0 replies; 10+ messages in thread
From: Tomáš Čech @ 2014-12-15 10:50 UTC (permalink / raw)
  To: guix-devel

* gnu/packages/game-development.scm: New file
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
---
 gnu-system.am                     |  1 +
 gnu/packages/game-development.scm | 47 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 gnu/packages/game-development.scm

diff --git a/gnu-system.am b/gnu-system.am
index e828c01..36913e1 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -96,6 +96,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/freeipmi.scm			\
   gnu/packages/ftp.scm				\
   gnu/packages/fribidi.scm			\
+  gnu/packages/game-development.scm		\
   gnu/packages/games.scm			\
   gnu/packages/gawk.scm				\
   gnu/packages/gcal.scm				\
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
new file mode 100644
index 0000000..460a351
--- /dev/null
+++ b/gnu/packages/game-development.scm
@@ -0,0 +1,47 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Tomáš Čech <sleep_walker@suse.cz>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages game-development)
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system cmake)
+  #:use-module (gnu packages))
+
+(define-public bullet
+  (package
+    (name "bullet")
+    (version "2.82-r2704")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://bullet.googlecode.com/files/bullet-"
+                                  version ".tgz"))
+              (sha256
+               (base32 "1lnfksxa9b1slyfcxys313ymsllvbsnxh9np06azkbgpfvmwkr37"))))
+    (build-system cmake-build-system)
+    (arguments '(#:tests? #f ; no 'test' target
+                 #:configure-flags (list
+                                    (string-append
+                                     "-DCMAKE_CXX_FLAGS=-fPIC "
+                                     (or (getenv "CXXFLAGS") "")))))
+    (home-page "http://bulletphysics.org/")
+    (synopsis "3D physics engine library")
+    (description
+     "Bullet is a physics engine library usable for collision detection.  It 
+is used in some video games and movies.")
+    (license zlib)))
-- 
2.0.4

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

* Re: [PATCH v4] gnu: Add bullet.
  2014-12-15 10:48             ` Tomas Cech
  2014-12-15 10:50               ` [PATCH v5] " Tomáš Čech
@ 2014-12-15 13:14               ` David Thompson
  1 sibling, 0 replies; 10+ messages in thread
From: David Thompson @ 2014-12-15 13:14 UTC (permalink / raw)
  To: Tomas Cech; +Cc: guix-devel

Tomas Cech <sleep_walker@suse.cz> writes:

> I liked that idea and used that approach. Updated patch is
> following...

Pushed, thanks!

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

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

end of thread, other threads:[~2014-12-15 13:14 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-11 22:21 [PATCH v3] gnu: Add bullet Tomáš Čech
2014-12-12  3:09 ` David Thompson
2014-12-12  7:08   ` Tomas Cech
2014-12-12 13:53     ` Mark H Weaver
2014-12-13 12:41       ` Tomáš Čech
2014-12-13 12:41         ` [PATCH v4] " Tomáš Čech
2014-12-13 15:58           ` David Thompson
2014-12-15 10:48             ` Tomas Cech
2014-12-15 10:50               ` [PATCH v5] " Tomáš Čech
2014-12-15 13:14               ` [PATCH v4] " David Thompson

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).