unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Marius Bakke <mbakke@fastmail.com>
To: 32155@debbugs.gnu.org
Subject: [bug#32155] [PATCH 1/4] gnu: sfml: Update to 2.5.0.
Date: Sat, 14 Jul 2018 16:43:52 +0200	[thread overview]
Message-ID: <20180714144355.31152-1-mbakke@fastmail.com> (raw)
In-Reply-To: <20180714144121.30906-1-mbakke@fastmail.com>

* gnu/packages/game-development.scm (sfml): Update to 2.5.0.
[arguments]: Specify pkg-config dir in #:configure-flags.
[native-inputs]: Add PKG-CONFIG.
[inputs]: Move FLAC, FREETYPE, LIBVORBIS and OPENAL ...
[propagated-inputs]: ... here.  New field.
---
 gnu/packages/game-development.scm | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index fde139c0b..4610e389b 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -440,7 +440,7 @@ clone.")
 (define-public sfml
   (package
     (name "sfml")
-    (version "2.3.2")
+    (version "2.5.0")
     (source (origin
               (method url-fetch)
               ;; Do not fetch the archives from
@@ -451,24 +451,29 @@ clone.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0k2fl5xk3ni2q8bsxl0551inx26ww3w6cp6hssvww0wfjdjcirsm"))))
+                "1x3yvhdrln5b6h4g5r4mds76gq8zsxw6icxqpwqkmxsqcq5yviab"))))
     (build-system cmake-build-system)
     (arguments
      '(#:configure-flags
-       (list "-DSFML_INSTALL_PKGCONFIG_FILES=TRUE")
+       (list "-DSFML_INSTALL_PKGCONFIG_FILES=TRUE"
+             "-DSFML_OS_PKGCONFIG_DIR=lib/pkgconfig")
        #:tests? #f)) ; no tests
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
     (inputs
      `(("mesa" ,mesa)
        ("glew" ,glew)
-       ("flac" ,flac)
-       ("libvorbis" ,libvorbis)
        ("libx11" ,libx11)
        ("xcb-util-image" ,xcb-util-image)
        ("libxrandr" ,libxrandr)
        ("eudev" ,eudev)
-       ("freetype" ,freetype)
        ("libjpeg" ,libjpeg)
-       ("libsndfile" ,libsndfile)
+       ("libsndfile" ,libsndfile)))
+    (propagated-inputs
+     ;; In Requires.private of pkg-config files.
+     `(("flac" ,flac)
+       ("freetype" ,freetype)
+       ("libvorbis" ,libvorbis)
        ("openal" ,openal)))
     (home-page "https://www.sfml-dev.org")
     (synopsis "Simple and Fast Multimedia Library")
-- 
2.18.0

  reply	other threads:[~2018-07-14 14:45 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-14 14:41 [bug#32155] [PATCH 0/4] sfml updates Marius Bakke
2018-07-14 14:43 ` Marius Bakke [this message]
2018-07-14 14:43   ` [bug#32155] [PATCH 2/4] gnu: Add stb-image Marius Bakke
2018-07-14 14:43   ` [bug#32155] [PATCH 3/4] gnu: Add stb-image-write Marius Bakke
2018-07-14 14:43   ` [bug#32155] [PATCH 4/4] gnu: sfml: Remove all bundled dependencies Marius Bakke
2018-07-14 14:47     ` Marius Bakke
2018-07-17 21:16 ` [bug#32155] [PATCH 0/4] sfml updates Ludovic Courtès
2018-07-17 23:18   ` bug#32155: " Marius Bakke

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180714144355.31152-1-mbakke@fastmail.com \
    --to=mbakke@fastmail.com \
    --cc=32155@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).