Archived
1
0
Fork 0

gnu: gst-plugins-good: Use new package style.

* gnu/packages/gstreamer.scm (gst-plugins-good)[arguments]: Convert to list of
G-Expressions.
[propagated-inputs, native-inputs]: Drop labels.
[inputs]: Drop labels, also sort alphabetically.
This commit is contained in:
Liliana Marie Prikler 2022-06-29 21:17:08 +02:00
parent 4d08f984e9
commit f1b70e156a
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87

View file

@ -532,72 +532,73 @@ This package provides the core library and elements.")
"17rw8wj1x1bg153m9z76pdvgz5k93m3riyalfpzq00x7h7fv6c3y")))) "17rw8wj1x1bg153m9z76pdvgz5k93m3riyalfpzq00x7h7fv6c3y"))))
(build-system meson-build-system) (build-system meson-build-system)
(propagated-inputs (propagated-inputs
`(("glib" ,glib) ;required by gstreamer-sdp-1.0.pc (cons* glib ;required by gstreamer-sdp-1.0.pc
("gstreamer" ,gstreamer) ;required by gstreamer-plugins-base-1.0.pc gstreamer ;required by gstreamer-plugins-base-1.0.pc
;; wayland-client.h is referred to in ;; wayland-client.h is referred to in
;; include/gstreamer-1.0/gst/gl/wayland/gstgldisplay_wayland.h ;; include/gstreamer-1.0/gst/gl/wayland/gstgldisplay_wayland.h
("wayland" ,wayland) wayland
;; XXX: Do not enable Orc optimizations on ARM systems because ;; XXX: Do not enable Orc optimizations on ARM systems because
;; it leads to two test failures. ;; it leads to two test failures.
;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/issues/683 ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/issues/683
,@(if (string-prefix? "arm" (or (%current-target-system) (if (string-prefix? "arm" (or (%current-target-system)
(%current-system))) (%current-system)))
'() '()
`(("orc" ,orc))))) ;required by gstreamer-audio-1.0.pc (list orc)))) ;required by gstreamer-audio-1.0.pc
(inputs (inputs
;; TODO: Add libvorbisidec ;; TODO: Add libvorbisidec
`(("cdparanoia" ,cdparanoia) (list alsa-lib
("pango" ,pango) cdparanoia
("libogg" ,libogg) graphene
("libtheora" ,libtheora) iso-codes
("libvorbis" ,libvorbis) libgudev
("libx11" ,libx11) libjpeg-turbo
("zlib" ,zlib) libogg
("libXext" ,libxext) libpng
("libxv" ,libxv) libtheora
("alsa-lib" ,alsa-lib) libvisual
("opus" ,opus) libvorbis
("graphene" ,graphene) libx11
("iso-codes" ,iso-codes) libxext
("libgudev" ,libgudev) libxv
("libjpeg" ,libjpeg-turbo) mesa
("libpng" ,libpng) opus
("libvisual" ,libvisual) pango
("mesa" ,mesa) wayland-protocols
("wayland-protocols" ,wayland-protocols))) zlib))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) (list pkg-config
("glib:bin" ,glib "bin") `(,glib "bin")
("gobject-introspection" ,gobject-introspection) gobject-introspection
("python-wrapper" ,python-wrapper) python-wrapper
("gettext" ,gettext-minimal) gettext-minimal
("xorg-server" ,xorg-server-for-tests))) xorg-server-for-tests))
(arguments (arguments
`(#:phases (list
(modify-phases %standard-phases #:phases
,@%common-gstreamer-phases #~(modify-phases %standard-phases
(add-after 'unpack 'disable-problematic-tests #$@%common-gstreamer-phases
(lambda _ (add-after 'unpack 'disable-problematic-tests
(substitute* "tests/check/meson.build" (lambda _
;; This test causes nondeterministic failures (see: (substitute* "tests/check/meson.build"
;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/950). ;; This test causes nondeterministic failures (see:
((".*'elements/appsrc.c'.*") ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/950).
"")))) ((".*'elements/appsrc.c'.*")
(add-before 'configure 'patch ""))))
(lambda _ (add-before 'configure 'patch
(substitute* "tests/check/libs/pbutils.c" (lambda _
(("/bin/sh") (which "sh"))))) (substitute* "tests/check/libs/pbutils.c"
(add-before 'check 'pre-check (("/bin/sh") (which "sh")))))
(lambda _ (add-before 'check 'pre-check
;; Tests require a running X server. (lambda _
(system "Xvfb :1 +extension GLX &") ;; Tests require a running X server.
(setenv "DISPLAY" ":1") (system "Xvfb :1 +extension GLX &")
;; Tests write to $HOME. (setenv "DISPLAY" ":1")
(setenv "HOME" (getcwd)) ;; Tests write to $HOME.
;; Tests look for $XDG_RUNTIME_DIR. (setenv "HOME" (getcwd))
(setenv "XDG_RUNTIME_DIR" (getcwd)) ;; Tests look for $XDG_RUNTIME_DIR.
;; For missing '/etc/machine-id'. (setenv "XDG_RUNTIME_DIR" (getcwd))
(setenv "DBUS_FATAL_WARNINGS" "0")))))) ;; For missing '/etc/machine-id'.
(setenv "DBUS_FATAL_WARNINGS" "0"))))))
(home-page "https://gstreamer.freedesktop.org/") (home-page "https://gstreamer.freedesktop.org/")
(synopsis (synopsis
"Plugins for the GStreamer multimedia library") "Plugins for the GStreamer multimedia library")
@ -620,83 +621,83 @@ for the GStreamer multimedia library.")
(base32 "1dv8b2md1xk6d45ir1wzbvqhxbvm6mxv881rjl0brnjwpw3c5wzq")))) (base32 "1dv8b2md1xk6d45ir1wzbvqhxbvm6mxv881rjl0brnjwpw3c5wzq"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas (list
#:phases #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
(modify-phases %standard-phases #:phases
,@%common-gstreamer-phases #~(modify-phases %standard-phases
(add-after 'unpack 'absolutize-libsoup-library #$@%common-gstreamer-phases
(lambda* (#:key inputs #:allow-other-keys) (add-after 'unpack 'absolutize-libsoup-library
(define libsoup (lambda* (#:key inputs #:allow-other-keys)
(search-input-file inputs "lib/libsoup-3.0.so")) (define libsoup
(search-input-file inputs "lib/libsoup-3.0.so"))
(substitute* "ext/soup/gstsouploader.c" (substitute* "ext/soup/gstsouploader.c"
(("(#define LIBSOUP_3_SONAME ).+$" _ prefix) (("(#define LIBSOUP_3_SONAME ).+$" _ prefix)
(string-append prefix "\"" libsoup "\"\n"))))) (string-append prefix "\"" libsoup "\"\n")))))
(add-after 'unpack 'skip-failing-tests (add-after 'unpack 'skip-failing-tests
(lambda _ (lambda _
(substitute* "tests/check/meson.build" (substitute* "tests/check/meson.build"
;; Reported as shaky upstream, see ;; Reported as shaky upstream, see
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/785> ;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/785>
(("\\[ 'elements/flvmux' \\]") "[ 'elements/flvmux', true ]")))) (("\\[ 'elements/flvmux' \\]") "[ 'elements/flvmux', true ]"))))
(add-before 'check 'pre-check (add-before 'check 'pre-check
(lambda _ (lambda _
;; Tests require a running X server. ;; Tests require a running X server.
(system "Xvfb :1 +extension GLX &") (system "Xvfb :1 +extension GLX &")
(setenv "DISPLAY" ":1") (setenv "DISPLAY" ":1")
;; Tests write to $HOME. ;; Tests write to $HOME.
(setenv "HOME" (getcwd)) (setenv "HOME" (getcwd))
;; Tests look for $XDG_RUNTIME_DIR. ;; Tests look for $XDG_RUNTIME_DIR.
(setenv "XDG_RUNTIME_DIR" (getcwd)) (setenv "XDG_RUNTIME_DIR" (getcwd))
;; For missing '/etc/machine-id'. ;; For missing '/etc/machine-id'.
(setenv "DBUS_FATAL_WARNINGS" "0") (setenv "DBUS_FATAL_WARNINGS" "0"))))))
#t)))))
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) (list gettext-minimal
("glib:bin" ,glib "bin") `(,glib "bin")
("gobject-introspection" ,gobject-introspection) gobject-introspection
("gsettings-desktop-schemas" ,gsettings-desktop-schemas) gsettings-desktop-schemas
("perl" ,perl) libxml2
("pkg-config" ,pkg-config) perl
("python-wrapper" ,python-wrapper) pkg-config
("xmllint" ,libxml2) python-wrapper
("xorg-server" ,xorg-server-for-tests))) xorg-server-for-tests))
(inputs (inputs
`(("aalib" ,aalib) (list aalib
("bzip2" ,bzip2) bzip2
("cairo" ,cairo) cairo
("flac" ,flac) flac
("librsvg" ,(librsvg-for-system)) (librsvg-for-system)
("glib" ,glib) glib
("glib-networking" ,glib-networking) glib-networking
("glu" ,glu) glu
("gtk+" ,gtk+) gtk+
("jack" ,jack-2) jack-2
("lame" ,lame) lame
("libavc1394" ,libavc1394) libavc1394
("libcaca" ,libcaca) libcaca
("libdv" ,libdv) libdv
("libgudev" ,libgudev) libgudev
("libiec61883" ,libiec61883) libiec61883
("libjpeg" ,libjpeg-turbo) libjpeg-turbo
("libpng" ,libpng) libpng
("libshout" ,libshout) libshout
("libsoup" ,libsoup) libsoup
("libvpx" ,libvpx) libvpx
("libx11" ,libx11) libx11
("libxdamage" ,libxdamage) libxdamage
("libxfixes" ,libxfixes) libxfixes
("libxext" ,libxext) libxext
("libxshm" ,libxshmfence) libxshmfence
("mesa" ,mesa) mesa
("mpg123" ,mpg123) mpg123
("orc" ,orc) orc
("pulseaudio" ,pulseaudio) pulseaudio
("speex" ,speex) speex
("taglib" ,taglib) taglib
("twolame" ,twolame) twolame
("v4l-utils" ,v4l-utils) v4l-utils
("wavpack" ,wavpack) wavpack
("zlib" ,zlib))) zlib))
(propagated-inputs (propagated-inputs
(list gstreamer gst-plugins-base)) (list gstreamer gst-plugins-base))
(synopsis "GStreamer plugins and helper libraries") (synopsis "GStreamer plugins and helper libraries")