From patchwork Wed Jun 29 19:17:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 40434 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 13E7027BBEA; Thu, 30 Jun 2022 18:07:06 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 33D1F27BBE9 for ; Thu, 30 Jun 2022 18:07:05 +0100 (BST) Received: from localhost ([::1]:47726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6xdA-0008Lt-7r for patchwork@mira.cbaines.net; Thu, 30 Jun 2022 13:07:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48710) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6xbN-0005vI-1d for guix-patches@gnu.org; Thu, 30 Jun 2022 13:05:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41617) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o6xbM-00089g-Pi for guix-patches@gnu.org; Thu, 30 Jun 2022 13:05:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o6xbM-0000re-K8 for guix-patches@gnu.org; Thu, 30 Jun 2022 13:05:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54744] [PATCH staging v2 15/20] gnu: gst-plugins-good: Use new package style. References: <86bkxeop1g.fsf@163.com> In-Reply-To: <86bkxeop1g.fsf@163.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Jun 2022 17:05:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54744 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54744@debbugs.gnu.org Cc: Zhu Zihao Received: via spool by 54744-submit@debbugs.gnu.org id=B54744.16566087093261 (code B ref 54744); Thu, 30 Jun 2022 17:05:12 +0000 Received: (at 54744) by debbugs.gnu.org; 30 Jun 2022 17:05:09 +0000 Received: from localhost ([127.0.0.1]:35503 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o6xbH-0000qJ-NR for submit@debbugs.gnu.org; Thu, 30 Jun 2022 13:05:08 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:43961) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o6xad-0000lA-Ow for 54744@debbugs.gnu.org; Thu, 30 Jun 2022 13:04:28 -0400 Received: by mail-ej1-f66.google.com with SMTP id fw3so12577157ejc.10 for <54744@debbugs.gnu.org>; Thu, 30 Jun 2022 10:04:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:cc:content-transfer-encoding:message-id :mime-version; bh=uethakSmYVWJ46jIuSCwKrRHc1Wn5c0ewFiHEUk/7gA=; b=Q5Kd7lwObHHsU0+sbEu2CUsDG+bzKpVD7qssZjjHnmHSxZL3Ai/cweLuHcgw/Q2wKp KMtvFG3HdC/AcSWzCJh4hhE3QoqckqpltWz9IX6Awv+17DNfYDtPAPeHEjKoTDPhA2sy pXSyYcpgeS+3J3t/5gy7LZfe0JF6gdKu4OOL4R13GNSixR1Z/ubwSkbeEJrmtAje24tK k0sj6tgVJLA/smVEIaZX9IpbBXipXDEaqG0WWkTG6MSkYPj82ojIZZTjQZFjmn0qKb4V 51TRhIUBcrh/8qyc+HfJ5+v9Yy1SPpk+s9MC5XRQNq3uLINZHXxH/GEgDA6fIlpEoaZK uqYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:cc :content-transfer-encoding:message-id:mime-version; bh=uethakSmYVWJ46jIuSCwKrRHc1Wn5c0ewFiHEUk/7gA=; b=Xo15Ci+yyvVh36+GF7sM+9Q3ptXIeO2wsJiK8OleDBWjw1ukGeD8dYubrO8pXRs+Zf qMzCYNcdAi5eFNr2eq+90+1Sepkz1SqAkQb761TcgG+aJhIt4yFLOHKB81M2QpfJUdmO sW6rU4YweHSav0wt019NpxsVjScKXuCt7NmuunpsmSjSEpTXOcOmpe6z86zZB1o7kfdS eJLH/fbU7ukajXX3A5TSKA78Z/bIDR7D/Mf0PGMDU1V73qHhijDnhizQxaRhKPg+DCLW FIkCIIGu7kTKwQRkfICeRHgvW23aTCrTYWjwFGRaqLVPAckgkQjbLcFzIijXwxc5MCLZ UyWQ== X-Gm-Message-State: AJIora902DS5DBRGSCEjatDKfiA5/XGfmm4eLGe6kV0iy+Gnocs3PqtF UUxUk6Qze9HACaOL2JA2BBgeu0IvULE= X-Google-Smtp-Source: AGRyM1vc6FkVhfzp9xZTVpxkxyTp76IPwutoE5s34GT36ifqxP/jZJjDbx06szd5O9JfwBM3GiysEA== X-Received: by 2002:a17:906:6a25:b0:727:b02:4743 with SMTP id qw37-20020a1709066a2500b007270b024743mr9399733ejc.688.1656608662144; Thu, 30 Jun 2022 10:04:22 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id by27-20020a0564021b1b00b004356112a8a2sm13443872edb.15.2022.06.30.10.04.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jun 2022 10:04:21 -0700 (PDT) From: Liliana Marie Prikler Date: Wed, 29 Jun 2022 21:17:08 +0200 Message-ID: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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. --- gnu/packages/gstreamer.scm | 273 +++++++++++++++++++------------------ 1 file changed, 137 insertions(+), 136 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index da290cbf82..e806a4a7d4 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -532,72 +532,73 @@ (define-public gst-plugins-base "17rw8wj1x1bg153m9z76pdvgz5k93m3riyalfpzq00x7h7fv6c3y")))) (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 + (cons* glib ;required by gstreamer-sdp-1.0.pc + 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 + ;; 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))) + '() + (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))) + (list alsa-lib + cdparanoia + graphene + iso-codes + libgudev + libjpeg-turbo + libogg + libpng + libtheora + libvisual + libvorbis + libx11 + libxext + libxv + mesa + opus + pango + wayland-protocols + zlib)) (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 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") @@ -620,83 +621,83 @@ (define-public gst-plugins-good (base32 "1dv8b2md1xk6d45ir1wzbvqhxbvm6mxv881rjl0brnjwpw3c5wzq")))) (build-system meson-build-system) (arguments - `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas - #:phases - (modify-phases %standard-phases - ,@%common-gstreamer-phases - (add-after 'unpack 'absolutize-libsoup-library - (lambda* (#:key inputs #:allow-other-keys) - (define libsoup - (search-input-file inputs "lib/libsoup-3.0.so")) + (list + #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:phases + #~(modify-phases %standard-phases + #$@%common-gstreamer-phases + (add-after 'unpack 'absolutize-libsoup-library + (lambda* (#:key inputs #:allow-other-keys) + (define libsoup + (search-input-file inputs "lib/libsoup-3.0.so")) - (substitute* "ext/soup/gstsouploader.c" - (("(#define LIBSOUP_3_SONAME ).+$" _ prefix) - (string-append prefix "\"" libsoup "\"\n"))))) - (add-after 'unpack 'skip-failing-tests - (lambda _ - (substitute* "tests/check/meson.build" - ;; Reported as shaky upstream, see - ;; - (("\\[ 'elements/flvmux' \\]") "[ 'elements/flvmux', true ]")))) - (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") - #t))))) + (substitute* "ext/soup/gstsouploader.c" + (("(#define LIBSOUP_3_SONAME ).+$" _ prefix) + (string-append prefix "\"" libsoup "\"\n"))))) + (add-after 'unpack 'skip-failing-tests + (lambda _ + (substitute* "tests/check/meson.build" + ;; Reported as shaky upstream, see + ;; + (("\\[ 'elements/flvmux' \\]") "[ 'elements/flvmux', true ]")))) + (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")))))) (native-inputs - `(("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python-wrapper" ,python-wrapper) - ("xmllint" ,libxml2) - ("xorg-server" ,xorg-server-for-tests))) + (list gettext-minimal + `(,glib "bin") + gobject-introspection + gsettings-desktop-schemas + libxml2 + perl + pkg-config + python-wrapper + xorg-server-for-tests)) (inputs - `(("aalib" ,aalib) - ("bzip2" ,bzip2) - ("cairo" ,cairo) - ("flac" ,flac) - ("librsvg" ,(librsvg-for-system)) - ("glib" ,glib) - ("glib-networking" ,glib-networking) - ("glu" ,glu) - ("gtk+" ,gtk+) - ("jack" ,jack-2) - ("lame" ,lame) - ("libavc1394" ,libavc1394) - ("libcaca" ,libcaca) - ("libdv" ,libdv) - ("libgudev" ,libgudev) - ("libiec61883" ,libiec61883) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libshout" ,libshout) - ("libsoup" ,libsoup) - ("libvpx" ,libvpx) - ("libx11" ,libx11) - ("libxdamage" ,libxdamage) - ("libxfixes" ,libxfixes) - ("libxext" ,libxext) - ("libxshm" ,libxshmfence) - ("mesa" ,mesa) - ("mpg123" ,mpg123) - ("orc" ,orc) - ("pulseaudio" ,pulseaudio) - ("speex" ,speex) - ("taglib" ,taglib) - ("twolame" ,twolame) - ("v4l-utils" ,v4l-utils) - ("wavpack" ,wavpack) - ("zlib" ,zlib))) + (list aalib + bzip2 + cairo + flac + (librsvg-for-system) + glib + glib-networking + glu + gtk+ + jack-2 + lame + libavc1394 + libcaca + libdv + libgudev + libiec61883 + libjpeg-turbo + libpng + libshout + libsoup + libvpx + libx11 + libxdamage + libxfixes + libxext + libxshmfence + mesa + mpg123 + orc + pulseaudio + speex + taglib + twolame + v4l-utils + wavpack + zlib)) (propagated-inputs (list gstreamer gst-plugins-base)) (synopsis "GStreamer plugins and helper libraries")