From 2be2f280a25609e0235a9cffb67fda249d962b8e Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Mon, 4 Apr 2022 12:02:30 +0800 Subject: [PATCH 03/10] gnu: gst-plugins-base: Update to 1.20.1. * gnu/packages/gstreamer.scm (gst-plugins-base): Update to 1.20.1. [version]: Use `%gstreamer-version` variable. [propagated-inputs]: Propagates libgudev. Use label-less style inputs. [inputs]: Use label-less style inputs. [native-inputs]: Ditto. [arguments]: Use G-expressions. --- gnu/packages/gstreamer.scm | 145 +++++++++++++++++++------------------ 1 file changed, 73 insertions(+), 72 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 02972f4e1a..aabed346a6 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -533,86 +533,87 @@ (define-public gstreamer (define-public gst-plugins-base (package (name "gst-plugins-base") - (version "1.18.5") + (version %gstreamer-version) (source (origin - (method url-fetch) - (uri (string-append "https://gstreamer.freedesktop.org/src/" name "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "18vg8kk7p2p8za8zaqg0v7z6898yw5a3b12vvl7xn02pb3s7l2wn")))) + (method url-fetch) + (uri (string-append "https://gstreamer.freedesktop.org/src/" name "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0162ly7pscymq6bsf1d5fva2k9s16zvfwyi1q6z4yfd97d0sdn4n")))) (build-system meson-build-system) (propagated-inputs - `(("glib" ,glib) ;required by gstreamer-sdp-1.0.pc - ("gstreamer" ,gstreamer) ;required by gstreamer-plugins-base-1.0.pc - ;; wayland-client.h is referred to in - ;; include/gstreamer-1.0/gst/gl/wayland/gstgldisplay_wayland.h - ("wayland" ,wayland) - ;; XXX: Do not enable Orc optimizations on ARM systems because - ;; it leads to two test failures. - ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/issues/683 - ,@(if (string-prefix? "arm" (or (%current-target-system) - (%current-system))) - '() - `(("orc" ,orc))))) ;required by gstreamer-audio-1.0.pc + (append + ;; FIXME: propagates all package referenced in .pc files. + (list glib ;required by gstreamer-sdp-1.0.pc + gstreamer ;required by gstreamer-plugins-base-1.0.pc + libgudev ;required by gstreamer-gl-1.0.pc + ;; wayland-client.h is referred to in + ;; include/gstreamer-1.0/gst/gl/wayland/gstgldisplay_wayland.h + wayland) + ;; XXX: Do not enable Orc optimizations on ARM systems because + ;; it leads to two test failures. + (if (string-prefix? "arm" + (or (%current-target-system) + (%current-system))) + '() + (list orc)))) ;required by gstreamer-audio-1.0.pc (inputs ;; TODO: Add libvorbisidec - `(("cdparanoia" ,cdparanoia) - ("pango" ,pango) - ("libogg" ,libogg) - ("libtheora" ,libtheora) - ("libvorbis" ,libvorbis) - ("libx11" ,libx11) - ("zlib" ,zlib) - ("libXext" ,libxext) - ("libxv" ,libxv) - ("alsa-lib" ,alsa-lib) - ("opus" ,opus) - ("graphene" ,graphene) - ("iso-codes" ,iso-codes) - ("libgudev" ,libgudev) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libvisual" ,libvisual) - ("mesa" ,mesa) - ("wayland-protocols" ,wayland-protocols))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("python-wrapper" ,python-wrapper) - ("gettext" ,gettext-minimal) - ("xorg-server" ,xorg-server-for-tests))) + (list cdparanoia + pango + libogg + libtheora + libvorbis + libx11 + zlib + libxext + libxv + alsa-lib + opus + graphene + iso-codes + libgudev + libjpeg-turbo + libpng + libvisual + mesa + wayland-protocols)) + (native-inputs (list pkg-config + `(,glib "bin") + gobject-introspection + python-wrapper + gettext-minimal + xorg-server-for-tests)) (arguments - `(#:phases - (modify-phases %standard-phases - ,@%common-gstreamer-phases - (add-after 'unpack 'disable-problematic-tests - (lambda _ - (substitute* "tests/check/meson.build" - ;; This test causes nondeterministic failures (see: - ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/950). - ((".*'elements/appsrc.c'.*") - "")))) - (add-before 'configure 'patch - (lambda _ - (substitute* "tests/check/libs/pbutils.c" - (("/bin/sh") (which "sh"))))) - (add-before 'check 'pre-check - (lambda _ - ;; Tests require a running X server. - (system "Xvfb :1 +extension GLX &") - (setenv "DISPLAY" ":1") - ;; Tests write to $HOME. - (setenv "HOME" (getcwd)) - ;; Tests look for $XDG_RUNTIME_DIR. - (setenv "XDG_RUNTIME_DIR" (getcwd)) - ;; For missing '/etc/machine-id'. - (setenv "DBUS_FATAL_WARNINGS" "0")))))) + (list + #:phases + #~(modify-phases %standard-phases + #$@%common-gstreamer-phases + (add-after 'unpack 'disable-problematic-tests + (lambda _ + (substitute* "tests/check/meson.build" + ;; This test causes nondeterministic failures (see: + ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/950). + ((".*'elements/appsrc.c'.*") "")))) + (add-before 'configure 'patch + (lambda _ + (substitute* "tests/check/libs/pbutils.c" + (("/bin/sh") (which "sh"))))) + (add-before 'check 'pre-check + (lambda _ + ;; Tests require a running X server. + (system "Xvfb :1 +extension GLX &") + (setenv "DISPLAY" ":1") + ;; Tests write to $HOME. + (setenv "HOME" (getcwd)) + ;; Tests look for $XDG_RUNTIME_DIR. + (setenv "XDG_RUNTIME_DIR" (getcwd)) + ;; For missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0")))))) (home-page "https://gstreamer.freedesktop.org/") - (synopsis - "Plugins for the GStreamer multimedia library") + (synopsis "Plugins for the GStreamer multimedia library") (description "This package provides an essential exemplary set of plug-ins for the GStreamer multimedia library.") (license license:lgpl2.0+))) -- 2.34.0