[PATCH 0/2] Update x42-plugins and use new package style.

  • Done
  • quality assurance status badge
Details
2 participants
  • kiasoc5
  • Christopher Baines
Owner
unassigned
Submitted by
kiasoc5
Severity
normal
K
K
kiasoc5 wrote on 29 Dec 2022 00:36
(address . guix-patches@gnu.org)(name . kiasoc5)(address . kiasoc5@disroot.org)
20221228233618.53956-1-kiasoc5@disroot.org
kiasoc5 (2):
gnu: x42-plugins: Update to 20221119.
gnu: x42-plugins: Use new package style.

gnu/packages/music.scm | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)


base-commit: 4ca649e978f08335fcabdcef693a7049082b5373
--
2.39.0
K
K
kiasoc5 wrote on 29 Dec 2022 00:38
[PATCH 1/2] gnu: x42-plugins: Update to 20221119.
(address . 60391@debbugs.gnu.org)(name . kiasoc5)(address . kiasoc5@disroot.org)
20221228233813.54822-1-kiasoc5@disroot.org
* gnu/packages/music.scm (x42-plugins): Update to 20221119.
---
gnu/packages/music.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 5be767a138..58419bc954 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -5928,7 +5928,7 @@ (define-public spectacle-analyzer
(define-public x42-plugins
(package
(name "x42-plugins")
- (version "20211016")
+ (version "20221119")
(source
(origin
(method url-fetch)
@@ -5936,7 +5936,7 @@ (define-public x42-plugins
(string-append "https://gareus.org/misc/x42-plugins/x42-plugins-"
version ".tar.xz"))
(sha256
- (base32 "11bf6q42ihyk4qxwf83y0847zzyl65kwpbk3hmyz0f0ykil5fsb7"))))
+ (base32 "128h9x7yzhy6q6l0fqk2zd6l48wgs2lhf2pzbiba6h3n6l9n555b"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no "check" target
--
2.39.0
K
K
kiasoc5 wrote on 29 Dec 2022 00:38
[PATCH 2/2] gnu: x42-plugins: Use new package style.
(address . 60391@debbugs.gnu.org)(name . kiasoc5)(address . kiasoc5@disroot.org)
20221228233813.54822-2-kiasoc5@disroot.org
* gnu/packages/music.scm (x42-plugins)[arguments]: Use g-expressions. Remove
references to %outputs and %build-inputs.
[inputs]: Add font-dejavu.
---
gnu/packages/music.scm | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)

Toggle diff (41 lines)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 58419bc954..4784e8ca2e 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -5939,21 +5939,23 @@ (define-public x42-plugins
(base32 "128h9x7yzhy6q6l0fqk2zd6l48wgs2lhf2pzbiba6h3n6l9n555b"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; no "check" target
- #:make-flags
- (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
- "LIBZITACONVOLVER=-lzita-convolver"
- (string-append "FONTFILE="
- (assoc-ref %build-inputs "font-dejavu")
- "/share/fonts/truetype/DejaVuSans-Bold.ttf")
- (string-append "CC=" ,(cc-for-target)))
- #:phases
- (modify-phases %standard-phases
- (delete 'configure))))
+ (list
+ #:tests? #f ; no "check" target
+ #:make-flags
+ #~(list (string-append "PREFIX=" #$output)
+ "LIBZITACONVOLVER=-lzita-convolver"
+ (string-append "FONTFILE="
+ #$(this-package-input "font-dejavu")
+ "/share/fonts/truetype/DejaVuSans-Bold.ttf")
+ (string-append "CC=" #$(cc-for-target)))
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure))))
(inputs
(list cairo
fftwf
ftgl
+ font-dejavu
glib
glu
hicolor-icon-theme
--
2.39.0
C
C
Christopher Baines wrote on 31 Jan 15:25 +0100
Re: [bug#60391] [PATCH 0/2] Update x42-plugins and use new package style.
(name . kiasoc5)(address . kiasoc5@disroot.org)
87y1pi3hkx.fsf@cbaines.net
kiasoc5 via Guix-patches via <guix-patches@gnu.org> writes:

Toggle quote (7 lines)
> kiasoc5 (2):
> gnu: x42-plugins: Update to 20221119.
> gnu: x42-plugins: Use new package style.
>
> gnu/packages/music.scm | 28 +++++++++++++++-------------
> 1 file changed, 15 insertions(+), 13 deletions(-)

Thanks, I've pushed these to master as
8781ab4057692c854c91ac71c660a229ac2d8ae5.

In the second patch, I switched this-package-input to
this-package-native-input to avoid the need to have font-dejavu as both
an input and native-input.

Thanks again,

Chris
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmPZJT5fFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XdNABAAsqXXhG36cDWCYM/j49XGlMWbA6Fpqa/f
EMhasqJlSQiWgWBckwTxk9ZD/lBYTI6qPLMd3EX6NhdKXNsGyMcHzlXYGeGi4IdG
19C44JEVa8IKL8ifkdlXRDIt3QDyobDLe0EN/Sm+5tZ/dXKCpdFMb4JWr7Kblv5k
SdISiFTlqGWmH3fsZignyR26+xVIqDU548tFttZwJ3ozBHZY3Wk75ikjdTmPOrMg
9uKkmp8exh3OcviW+ICKCHA7I+N0PpiJVW1ErDsRC+1/jr/7yMs+C8wCuyAEyHlh
zqn4Cxa03gu0FI++AG4Qtz5V5jve5oNnks+oFiJoPtBfUxiOyFmt5uZouUu4W6lY
ruXZrIUg6MfZa4Xal0Giyv8Hm12XzhSPS+fqmYzoGoLNhKJSyiY4Uq2wQQbLOWnd
WdG1Bac/YA3IpsbLZ4DLrWLg0BJ9G63D0nQnEEDMryzb8ni4RMLCPC6zolX8LP3m
CE+K2sBx1WOUS/n+MfGEdYCgIPKrpdAFefTKxvUt6wvFBJR+skmxCIorPsthxCT4
MjYx3Yd4KCrxQLvsWwpc6wnFP5FOzlt6bzbkKqR70mUbiUkGGAmv0aBIRWGdSdeg
Ovf6VYvKOfAG8dGsP1AAG8OXvjSDRX4f0pjDiV5/SjByhl41FDT/SWhgMgmR0bZ3
cZz1WlsKd5Y=
=5yii
-----END PGP SIGNATURE-----

?