From patchwork Wed Jun 29 19:18:06 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: 40439 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 385B827BBEA; Thu, 30 Jun 2022 18:08:55 +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 5D2ED27BBE9 for ; Thu, 30 Jun 2022 18:08:54 +0100 (BST) Received: from localhost ([::1]:50072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6xev-0001nw-Hy for patchwork@mira.cbaines.net; Thu, 30 Jun 2022 13:08:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48664) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6xbH-0005sQ-RP for guix-patches@gnu.org; Thu, 30 Jun 2022 13:05:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41603) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o6xbH-00088R-IT for guix-patches@gnu.org; Thu, 30 Jun 2022 13:05:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o6xbH-0000q8-Bl for guix-patches@gnu.org; Thu, 30 Jun 2022 13:05:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54744] [PATCH staging v2 16/20] gnu: gst-plugins-bad: 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:07 +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.16566086913103 (code B ref 54744); Thu, 30 Jun 2022 17:05:07 +0000 Received: (at 54744) by debbugs.gnu.org; 30 Jun 2022 17:04:51 +0000 Received: from localhost ([127.0.0.1]:35478 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o6xb0-0000nq-9U for submit@debbugs.gnu.org; Thu, 30 Jun 2022 13:04:50 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:33424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o6xaZ-0000kX-3c for 54744@debbugs.gnu.org; Thu, 30 Jun 2022 13:04:24 -0400 Received: by mail-ej1-f65.google.com with SMTP id mf9so40313606ejb.0 for <54744@debbugs.gnu.org>; Thu, 30 Jun 2022 10:04:23 -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=x1Rz5bJQU1o/EDknEOR1w2QZ+5vBpP0QLA2EFHznwR8=; b=SN75f0H9uWvEUZPbzuhnCnc7ld3pCGr09qC3Bpsdwdsp6nc1nTnZr1kiFxkhxk6bs8 xgOR5znw91Inx0uv98FsIrzkoANP0ljlxcEZ+DHJyXRyt9tNWT/jWJnoz4ooUqovLU0Y Sjk5vlmnq222KNymPFGu2pA1oip0vbNq1E2pTJJOoucJeBt7fg8eUlQ9MbtUaSgwriZJ QiXWLYz8DvKpRRqcModPQLnfgR8mCsjUB1WOEvv2RhoRV2ZdOejolHYsFE9cF2B48qCK Obgw6Nxyhyw/s2ldTNAktGMNVQ+vLMTgY5rA2Zb3Cr0tby9Hmltt3me5bIjxT9ejPpSf d2ng== 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=x1Rz5bJQU1o/EDknEOR1w2QZ+5vBpP0QLA2EFHznwR8=; b=tT0kRGNlfzbRf7NcTIZf3byL4nsRxlfLt6NZjFYcc0wybZR6Wsoi6MJMWLPqLYZ01w zJ0PYjRExsKHOB0PegBcEJ3ZLIcQPPeQFz0AWDqgKg6YHC2zkjwc3visZj1DeOF9wd6p c5Ixtq3AZuqlGVF4rjNJwSJ6Ai1RjJzsAs+FK/6V/RFnFhUz1NTiYqTNEqIKtBPOKWFP 3rV7MTe6VF9HZGz/JUC/ulo519A8lDZ+NQxddGJofpcXalrsbWtdiwHJvwW0/F/KEXqX T3Q/fq7Qz+bEvyQLZIKMmoO22gwWe6Z+x3dLkJKuSW+ICybklSSnGAqMtoxJPN7RzMzP KL5Q== X-Gm-Message-State: AJIora8UP6m3x1ZmZPSd37jRPYgfl/mBzXveut8npwLhn36l0rHdOD1W PrvHZm9CKBlHbIX/mEiQOOdt3RYufQ0= X-Google-Smtp-Source: AGRyM1tw/tjnISDtAy5MRpM7O4EPKASaNygLBmZy50ARq3PgH0aqeF6JH4Xt9HbenZdm829Fw9pzdw== X-Received: by 2002:a17:906:9451:b0:726:93a8:bcc with SMTP id z17-20020a170906945100b0072693a80bccmr9530950ejx.361.1656608662726; 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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jun 2022 10:04:22 -0700 (PDT) From: Liliana Marie Prikler Date: Wed, 29 Jun 2022 21:18:06 +0200 Message-ID: <0e8d128f5e73ebf56362e9c21d3434d5444d119b.camel@gmail.com> 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-bad)[arguments]: Convert to list of G-Expressions. [native-inputs, inputs]: Drop labels. --- gnu/packages/gstreamer.scm | 323 +++++++++++++++++++------------------ 1 file changed, 162 insertions(+), 161 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index e806a4a7d4..fad155519c 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -727,175 +727,176 @@ (define-public gst-plugins-bad (delete-file-recursively "ext/sctp/usrsctp"))))) (build-system meson-build-system) (arguments - `(#:configure-flags '("-Dsctp-internal-usrsctp=disabled") - #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas - #:phases - (modify-phases %standard-phases - ,@%common-gstreamer-phases - ,@(if (string-prefix? "arm" (or (%current-target-system) - (%current-system))) - ;; Disable test that fails on ARMv7. - ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/1188 - `((add-after 'unpack 'disable-asfmux-test - (lambda _ - (substitute* "tests/check/meson.build" - (("\\[\\['elements/asfmux\\.c'\\]\\],") - ""))))) - '()) - (add-after 'unpack 'adjust-tests - (lambda* (#:key native-inputs inputs #:allow-other-keys) - (let ((gst-plugins-good (assoc-ref (or native-inputs inputs) - "gst-plugins-good"))) - (substitute* "tests/check/meson.build" - ;; Make gst-plugin-good available for tests, see - ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1426 - (("'GST_PLUGIN_SYSTEM_PATH_1_0', ''") - (string-append "'GST_PLUGIN_SYSTEM_PATH_1_0', '" - gst-plugins-good "/lib/gstreamer-1.0'")) + (list + #:configure-flags #~(list "-Dsctp-internal-usrsctp=disabled") + #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:phases + #~(modify-phases %standard-phases + #$@%common-gstreamer-phases + #$@(if (string-prefix? "arm" (or (%current-target-system) + (%current-system))) + ;; Disable test that fails on ARMv7. + ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/1188 + `((add-after 'unpack 'disable-asfmux-test + (lambda _ + (substitute* "tests/check/meson.build" + (("\\[\\['elements/asfmux\\.c'\\]\\],") + ""))))) + '()) + (add-after 'unpack 'adjust-tests + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (let ((gst-plugins-good (assoc-ref (or native-inputs inputs) + "gst-plugins-good"))) + (substitute* "tests/check/meson.build" + ;; Make gst-plugin-good available for tests, see + ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1426 + (("'GST_PLUGIN_SYSTEM_PATH_1_0', ''") + (string-append "'GST_PLUGIN_SYSTEM_PATH_1_0', '" + gst-plugins-good "/lib/gstreamer-1.0'")) - ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1136 - ((".*elements/msdkh264enc\\.c.*") "") - ((".*elements/svthevcenc\\.c.*") "") + ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1136 + ((".*elements/msdkh264enc\\.c.*") "") + ((".*elements/svthevcenc\\.c.*") "") - ;; The 'elements_shm.test_shm_live' test sometimes times out - ;; (see: - ;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/790). - ((".*'elements/shm\\.c'.*") "") + ;; The 'elements_shm.test_shm_live' test sometimes times out + ;; (see: + ;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/790). + ((".*'elements/shm\\.c'.*") "") - ;; FIXME: Why is this failing. - ((".*elements/dash_mpd\\.c.*") "") + ;; FIXME: Why is this failing. + ((".*elements/dash_mpd\\.c.*") "") - ;; These tests are flaky and occasionally time out: - ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/932 - ((".*elements/curlhttpsrc\\.c.*") "") - ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1412 - ((".*elements/dtls\\.c.*") "")) - (substitute* "tests/check/elements/zxing.c" - ;; zxing 1.2.0 seemingly changed the type representation of - ;; the EAN_13 structure; disable it. - ((".*\"EAN_13\".*") - ""))))) - (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")))))) + ;; These tests are flaky and occasionally time out: + ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/932 + ((".*elements/curlhttpsrc\\.c.*") "") + ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1412 + ((".*elements/dtls\\.c.*") "")) + (substitute* "tests/check/elements/zxing.c" + ;; zxing 1.2.0 seemingly changed the type representation of + ;; the EAN_13 structure; disable it. + ((".*\"EAN_13\".*") + ""))))) + (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")))))) (propagated-inputs (list gstreamer gst-plugins-base)) (native-inputs - `(("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") ; for glib-mkenums, etc. - ("gobject-introspection" ,gobject-introspection) - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("gst-plugins-good" ,gst-plugins-good) ;for tests - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("xorg-server" ,xorg-server-for-tests))) + (list gettext-minimal + `(,glib "bin") ; for glib-mkenums, etc. + gobject-introspection + gsettings-desktop-schemas + gst-plugins-good ;for tests + perl + pkg-config + python-wrapper + xorg-server-for-tests)) (inputs - `(("bluez" ,bluez) - ("bzip2" ,bzip2) - ("cairo" ,cairo) - ;; ("ccextractor" ,ccextractor) - ("chromaprint" ,chromaprint) - ("curl" ,curl) - ("directfb" ,directfb) - ;;("dssim" ,dssim) - ("faac" ,faac) - ("faad2" ,faad2) - ("flite" ,flite) - ("fluidsynth" ,fluidsynth) - ("glib" ,glib) - ("glib-networking" ,glib-networking) - ("glu" ,glu) - ("gsm" ,gsm) - ("gtk+" ,gtk+) - ("iqa" ,iqa) - ("ladspa" ,ladspa) - ("lcms" ,lcms) - ("libaom" ,libaom) - ("libass" ,libass) - ("libbs2b" ,libbs2b) - ("libdc1394" ,libdc1394) - ("libdca" ,libdca) - ("libde265" ,libde265) - ("libdrm" ,libdrm) - ("libdvdnav" ,libdvdnav) - ("libdvdread" ,libdvdread) - ("libexif" ,libexif) - ("libfdk" ,libfdk) - ("libgcrypt" ,libgcrypt) - ("libgme" ,libgme) - ("libgudev" ,libgudev) - ("libkate" ,libkate) - ("libmfx" ,mediasdk) - ("libmms" ,libmms) - ("libmodplug" ,libmodplug) - ("libmpcdec" ,libmpcdec) - ("libnice" ,libnice) - ("libofa" ,libofa) - ("libopenmpt" ,libopenmpt) - ("librsvg" ,librsvg) - ("libsndfile" ,libsndfile) - ("libsrtp" ,libsrtp) - ("libssh2" ,libssh2) - ("libtiff" ,libtiff) - ("libusb" ,libusb) - ("libva" ,libva) - ("libvdpau" ,libvdpau) - ("libwebp" ,libwebp) - ("libx11" ,libx11) - ("libxcb" ,libxcb) - ("libxext" ,libxext) - ("libxkbcommon" ,libxkbcommon) - ("libxml2" ,libxml2) - ("libxshm" ,libxshmfence) - ("lilv" ,lilv) - ("lrdf" ,lrdf) - ("lv2" ,lv2) - ("mesa" ,mesa) - ("mjpegtools" ,mjpegtools) - ("neon" ,neon) - ("nettle" ,nettle) - ("openal" ,openal) - ;; ("opencv" ,opencv) - ("openexr" ,openexr) - ("openh264" ,openh264) - ("openjpeg" ,openjpeg) - ;; ("openni2" ,openni2) - ("opensles" ,opensles) - ("openssl" ,openssl) - ("opus" ,opus) - ("orc" ,orc) - ("pango" ,pango) - ("rtmp" ,rtmpdump) - ("sbc" ,sbc) - ("sctp" ,lksctp-tools) - ("soundtouch" ,soundtouch) - ("spandsp" ,spandsp) - ("srt" ,srt) - ("svthevcenc" ,svt-hevc) - ("tinyalsa" ,tinyalsa) - ("transcode" ,transcode) - ("usrsctp" ,usrsctp) - ("v4l" ,v4l-utils) - ("voaacenc" ,vo-aacenc) - ("voamrwbenc" ,vo-amrwbenc) - ("vulkan-headers" ,vulkan-headers) - ("vulkan-loader" ,vulkan-loader) - ("x265" ,x265) - ("wayland" ,wayland) - ("webrtcdsp" ,webrtc-audio-processing) - ("wildmidi" ,wildmidi) - ("wpebackend-fdo" ,wpebackend-fdo) - ("zbar" ,zbar) - ("zxing" ,zxing-cpp-1.2))) + (list bluez + bzip2 + cairo + ;; ccextractor + chromaprint + curl + directfb + ;; dssim + faac + faad2 + flite + fluidsynth + glib + glib-networking + glu + gsm + gtk+ + iqa + ladspa + lcms + libaom + libass + libbs2b + libdc1394 + libdca + libde265 + libdrm + libdvdnav + libdvdread + libexif + libfdk + libgcrypt + libgme + libgudev + libkate + mediasdk + libmms + libmodplug + libmpcdec + libnice + libofa + libopenmpt + librsvg + libsndfile + libsrtp + libssh2 + libtiff + libusb + libva + libvdpau + libwebp + libx11 + libxcb + libxext + libxkbcommon + libxml2 + libxshmfence + lilv + lrdf + lv2 + mesa + mjpegtools + neon + nettle + openal + ;; opencv + openexr + openh264 + openjpeg + ;; openni2 + opensles + openssl + opus + orc + pango + rtmpdump + sbc + lksctp-tools + soundtouch + spandsp + srt + svt-hevc + tinyalsa + transcode + usrsctp + v4l-utils + vo-aacenc + vo-amrwbenc + vulkan-headers + vulkan-loader + x265 + wayland + webrtc-audio-processing + wildmidi + wpebackend-fdo + zbar + zxing-cpp-1.2)) (home-page "https://gstreamer.freedesktop.org/") (synopsis "Plugins for the GStreamer multimedia library") (description