me/guix
Archived
1
0
Fork 0
Code Activity

gnu: grfcodec: Update to latest commit.

Browse source 
* gnu/packages/game-development.scm (grfcodec): Update to latest commit.
This commit is contained in:
Julien Lepiller 2023-04-17 22:34:22 +02:00
parent dd9b1a1c25
commit 319078cb0a
No known key found for this signature in database
GPG key ID: 53D457B2D636EE82
1 changed files with 58 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
gnu/packages/game-development.scm
View file

@ -280,24 +280,36 @@ DeuTex has functions such as merging wads, etc.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public grfcodec (define-public grfcodec
;; Latest release 6.0.6 requires an older boost and does not build with our
;; newer GCC.
(let ((commit "7ded8ebd1447bd2e7c0f4b587be0c0510397bdd0")
(revision "0"))
(package (package
(name "grfcodec") (name "grfcodec")
(version "6.0.6") (version (git-version "6.0.6" revision commit))
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://binaries.openttd.org/extra/" (uri (git-reference
name "/" version "/" name "-" version (url "https://github.com/OpenTTD/grfcodec")
"-source.tar.xz")) (commit commit)))
(patches (search-patches "grfcodec-gcc-compat.patch")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "08admgnpqcsifpicbm56apgv360fxapqpbbsp10qyk8i22w1ivsk")))) (base32 "12bf5y7d83plrlssdlcj83w4yxmg5jp1w2p8570l92hy9mkcfmb9"))
(build-system gnu-build-system) (modules '((guix build utils)))
(snippet
`(begin
;; The sources are not a git repository
(substitute* "generate_version.cmake"
(("\\$\\{GIT.*describe.*") (string-append "echo \"" ,version "\"\n"))
(("\\$\\{GIT.*show.*") "echo \"Not shown for reproducibility.\"\n"))
(substitute* "CMakeLists.txt"
(("find_package\\(Git REQUIRED\\)") ""))))))
(build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f ;no check target '(#:tests? #f ;no check target
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) ;no configure script
(replace 'install ;no install target (replace 'install ;no install target
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -307,6 +319,7 @@ DeuTex has functions such as merging wads, etc.")
(for-each (lambda (file) (for-each (lambda (file)
(install-file file bin)) (install-file file bin))
'("grfcodec" "grfid" "grfstrip" "nforenum")) '("grfcodec" "grfid" "grfstrip" "nforenum"))
(with-directory-excursion "../source"
(install-file "COPYING" doc) (install-file "COPYING" doc)
(with-directory-excursion "docs" (with-directory-excursion "docs"
(for-each (lambda (file) (for-each (lambda (file)
@ -315,7 +328,7 @@ DeuTex has functions such as merging wads, etc.")
"readme" "readme.rpn")) "readme" "readme.rpn"))
(for-each (lambda (file) (for-each (lambda (file)
(install-file file man)) (install-file file man))
(find-files "." "\\.1"))))))))) (find-files "." "\\.1"))))))))))
(inputs (inputs
(list boost libpng zlib)) (list boost libpng zlib))
(synopsis "GRF development tools") (synopsis "GRF development tools")
@ -334,7 +347,7 @@ necessary.
;; GRFCodec, GRFID, and GRFStrip are exclusively under the GPL2. ;; GRFCodec, GRFID, and GRFStrip are exclusively under the GPL2.
;; NFORenum is under the GPL2+. ;; NFORenum is under the GPL2+.
;; The MD5 implementation contained in GRFID is under the zlib license. ;; The MD5 implementation contained in GRFID is under the zlib license.
(license (list license:gpl2 license:gpl2+ license:zlib)))) (license (list license:gpl2 license:gpl2+ license:zlib)))))
(define-public catcodec (define-public catcodec
(package (package