From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id QL7/GnqxAl9TcwAA0tVLHw (envelope-from ) for ; Mon, 06 Jul 2020 05:07:06 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 8FfJFnqxAl8qZQAAbx9fmQ (envelope-from ) for ; Mon, 06 Jul 2020 05:07:06 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1746D940B30 for ; Mon, 6 Jul 2020 05:07:04 +0000 (UTC) Received: from localhost ([::1]:57514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsJLL-0005oc-SI for larch@yhetil.org; Mon, 06 Jul 2020 01:07:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51458) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsJLB-0005la-OV for guix-devel@gnu.org; Mon, 06 Jul 2020 01:06:53 -0400 Received: from knopi.disroot.org ([178.21.23.139]:46338) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsJL6-0000Ya-UL for guix-devel@gnu.org; Mon, 06 Jul 2020 01:06:53 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id D5ED155DE3; Mon, 6 Jul 2020 07:06:45 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xPN3SIi4y2da; Mon, 6 Jul 2020 07:06:41 +0200 (CEST) To: Danny Milosavljevic DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1594011999; bh=MdSKecklLvYFEcvmI/AcD/hb0+50CIsKFbDV+WBA5Vo=; h=To:Cc:References:From:Subject:Date:In-Reply-To; b=JCd6+KUN87te2L4WCha8PLqO9JTf1sAbCWuokT0VBUwvJi7Rbch8m5Q7nrG8/IL7Y JP4NKMGzBqmsR4lhkBIfWiwj5oAir6vIEafTULJJ5Nwn1i09nHS0dolz744r7hm/nx 4jiZyEGfpAxKABIZ1a8uavVThGqdwVDkUCvVBccYCjXs+7B8h+lkNepG0r//6qXNkH VzFhrYScWEwOCzpUjrpTILOsGfYZ3WSP19yiyjwYuGp/TFObn+dqx9RhqFMA3jmT5v hUmJ8/Ga8pnpMNvGDwzAgtggYif0iinGvxRjrxAgmbt8vcACI0hcHcIqKjnnV1ZoHY HWhRVjpnazPrg== References: <20200506051334.4558e7b3.raghavgururajan@disroot.org> <8c56bfdd-4080-9444-d3c2-7bd962c4c687@disroot.org> <49cc7f39-7bce-f5a1-55da-5f9bca203627@disroot.org> <7fc9e1ff-de86-56e0-386b-8e1eb9d54585@disroot.org> <1742d1f9-43ed-83a5-1354-bf1c94c2f679@disroot.org> <30888750-2c5b-d94f-6199-f8539b2d0de0@disroot.org> <73cb94f7-d7b4-ec0a-5942-e701a18bdf5c@disroot.org> <20200625004018.62dd2ac5@scratchpost.org> <8c2fb558-249e-e96c-d2b2-ef53d3adfd00@disroot.org> <20200705212515.711f6327@scratchpost.org> From: Raghav Gururajan Autocrypt: addr=raghavgururajan@disroot.org; keydata= mQENBF6yxWcBCAClEApjrOYs8fSzDl8GBwMFtUzF6VCOVrWaGun1vvPDvk4AFzbB3ZV6+Jn8 VfEuqh3OOvSJGHL2cJoR28Q5gVqeOwupyaMWVdEt6TmDrHISyxriF426KVaJnklfMjYwIi0l /7j8bs3pDRyyR6uFrY6sYL9t6HFvevtt7NwgWL1MAEVy6txKkriyrK1h+qc13wRRgVx3tzl7 dNwYEDWd3yUDn+LESoDOlawJ7TQbO8d1K4FFHaqwyQ/SyaIfLBnMAz9Qd18MUWpDkktLh/9u jRfctouFx5BUr+uGgCHAWcII5D60lt867y5m6vp3Ua75TkVQrYTt7KSF/wm7NZ7L02fTABEB AAG0M1JhZ2hhdiBHdXJ1cmFqYW4gKFJHKSA8cmFnaGF2Z3VydXJhamFuQGRpc3Jvb3Qub3Jn PokBTgQTAQgAOBYhBCdBLzSqkY3qQNKUKK5u8wRtb3tXBQJetePbAhsDBQsJCAcCBhUKCQgL AgQWAgMBAh4BAheAAAoJEK5u8wRtb3tXvWIH/3NiwaJfcrOoO/r4/reE0PmfgVWRpWP8uhdy ZiuBmcnyltxSmxZ1drlWpnbap5P7ssVyIlY6SrLTAeN7R0S70HAINkn7XvKpWajHShX0MR4b NeqjETNZg7gh2PTg6zfTnYD1UQqdNxnPMiJTSBZBLCAm/LhdEuigt559uoDA9ZEVLR5ycKh+ ny94NLUhmuRXpH/sb6Ey0FKmdMc47KNnkGQaySeGY88RwONgfv3/rriNbOJ1t12d2qsqkiOo znuxg5O3nT6obd7hCuq+EYwjzwSVrUZuMelO32UE4d2iePhiPBfiprVCNDGPFztJTe0Y+OQA ajj23CBgGIap/L1CpZ25AQ0EXrLFZwEIANGMTVaAiSGtpAbxRo9AHOc2kgatkAsH/ejtzNH0 mtGwtE0g5Gh0OKTI678KItanztmukKcZmBngPCwvUGGNQYzWWwsS+kBti5wJ3OForg+JtYuf /n9DjSAhnb7h1piL9Xi0drULl5ovVFRp/IPldkbT3R8pgc9VwAa0VVRP59dsgF6nPhoHjxfB p/XcA2QRnRfB2bN4BVCValJelPGYR0pSwkftFpmha4FRa0LrJtcMeh+PG20asPiKcE4sNGZT mH3keHkTfk5Tuds3ly5vlqmEKg7qY/zoS1yWQJj0j36JoX1/ravo+gUxszig80140a5bF2VU ERLcKO+Cp0lI4/8AEQEAAYkBNgQYAQgAIBYhBCdBLzSqkY3qQNKUKK5u8wRtb3tXBQJessVn AhsMAAoJEK5u8wRtb3tXqTIH/A9z70HLCZcAfnpluGj4APfi3haqdU7xvtrkN9eHJoPV7pwx y1luNRR8xg7YHkwcQ/9qEcvSicNIvhjRw5cSpyW9HGmOFyiZ7+KLf3XPUjC7pC5pIM+AAWyy D5GlyqakH1wBe8RC9/8vNyfZnmbV4PUvHoHvY/xZH+D/Afg1J2igdIebkQzzhFBC65TAKFeM NIWQkYIMKjq4u+nmv3sreqvRvlt8VYq0VSq24SFs0JJ+dEmuO3/s72122JIL0XEUS3ooGb/p 678RM2OpelLZcZSPG6vIIrQFKw6/NVjDtOY3DrNPtQ+h84UnFPUtaZyvQQwpGNjvtNzU/Ym+ NwsFm0Q= Subject: Re: [OUTREACHY]: Integration of desktop environments into GNU Guix Message-ID: Date: Mon, 6 Jul 2020 01:05:21 -0400 Mime-Version: 1.0 In-Reply-To: <20200705212515.711f6327@scratchpost.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="XTFfOToq240lIv54A7NadzpDPM8BBXDJn" Received-SPF: pass client-ip=178.21.23.139; envelope-from=raghavgururajan@disroot.org; helo=knopi.disroot.org X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/06 01:06:46 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: guix-devel@gnu.org Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=disroot.org header.s=mail header.b=JCd6+KUN; dmarc=fail reason="SPF not aligned (relaxed)" header.from=disroot.org (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Spam-Score: -1.51 X-TUID: 16A5njpNi+k5 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --XTFfOToq240lIv54A7NadzpDPM8BBXDJn Content-Type: multipart/mixed; boundary="hm5DgOR0xOCjcqVR6yJazhxFyCTc5gKXE"; protected-headers="v1" From: Raghav Gururajan To: Danny Milosavljevic Cc: guix-devel@gnu.org, =?UTF-8?Q?G=c3=a1bor_Boskovits?= , Tobias Geerinckx-Rice Message-ID: Subject: Re: [OUTREACHY]: Integration of desktop environments into GNU Guix References: <20200506051334.4558e7b3.raghavgururajan@disroot.org> <8c56bfdd-4080-9444-d3c2-7bd962c4c687@disroot.org> <49cc7f39-7bce-f5a1-55da-5f9bca203627@disroot.org> <7fc9e1ff-de86-56e0-386b-8e1eb9d54585@disroot.org> <1742d1f9-43ed-83a5-1354-bf1c94c2f679@disroot.org> <30888750-2c5b-d94f-6199-f8539b2d0de0@disroot.org> <73cb94f7-d7b4-ec0a-5942-e701a18bdf5c@disroot.org> <20200625004018.62dd2ac5@scratchpost.org> <8c2fb558-249e-e96c-d2b2-ef53d3adfd00@disroot.org> <20200705212515.711f6327@scratchpost.org> In-Reply-To: <20200705212515.711f6327@scratchpost.org> --hm5DgOR0xOCjcqVR6yJazhxFyCTc5gKXE Content-Type: multipart/mixed; boundary="------------2F68BB6CCB7583A7E4BDF99B" Content-Language: en-US This is a multi-part message in MIME format. --------------2F68BB6CCB7583A7E4BDF99B Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable @Danny I reply to your other comments soon. > openni2: Is it really necessary to have JRE and the JDK as REGULAR inpu= ts? Why? Ah, thanks for spotting that. It is only required during build. I have moved them to native-inputs now. > opesles: Did not review yet. Do we need that random commit ea5104b? I= s there a release to use instead? Unfortunately, this project neither does releases nor tags. They just bundle things in versioned folders. > >+ (license (license:non-copyleft "Refer individual files")))) > I don't think that's acceptable. If it were, we could just remove th= e "license" field of all packages--because that's always true. Makes sense! Fixed it now. Please find the attached patches that are to be applied between rust-imgref and gtk+-2 commits. Regards, RG. --------------2F68BB6CCB7583A7E4BDF99B Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-Add-openni2.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-Add-openni2.patch" =46rom 22d7b000cffa8a433ecf818858f591f90d69c93b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 6 Jul 2020 00:13:23 -0400 Subject: [PATCH 1/7] gnu: Add openni2. * gnu/packages/gstreamer.scm (openni2): New variable. --- gnu/packages/gstreamer.scm | 40 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 57593c860e..774137340d 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -54,9 +54,11 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages graphics) + #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages iso-codes) + #:use-module (gnu packages java) #:use-module (gnu packages libunwind) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) @@ -84,6 +86,44 @@ #:use-module (gnu packages assembly) #:use-module (gnu packages xml)) =20 +(define-public openni2 + (package + (name "openni2") + (version "2.2.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/occipital/OpenNI2.git") + (commit (string-append "v" version "-debian")))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0mfnyzpq53wnzgjfx91xcbx0nrl0lp1vrk1rk20a3gb3kshsr675"))= )) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; No target + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (native-inputs + `(("graphviz" ,graphviz) + ("doxygen" ,doxygen) + ("openjdk" ,openjdk14) + ("openjdk:jdk" ,openjdk14 "jdk") + ("python" ,python-wrapper))) + (inputs + `(("freeglut3" ,freeglut) + ("libudev" ,eudev) + ("libusb" ,libusb))) + (synopsis "Framework for sensor-based 'Natural Interaction") + (description "OpenNI is a framework for getting data to support +'Natural Interaction', i.e. skeleton tracking, gesture tracking, and sim= ilar +ways of getting data from humans. It provides the interface for physica= l devices +and for middleware components.") + (home-page "https://structure.io/openni") + (license license:asl2.0))) + (define-public libdc1394 (package (name "libdc1394") --=20 2.26.2 --------------2F68BB6CCB7583A7E4BDF99B Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-Add-opensles.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-gnu-Add-opensles.patch" =46rom bd946952cf81ddcbb7418a285b5d6cb89860fc8b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 6 Jul 2020 00:45:47 -0400 Subject: [PATCH 2/7] gnu: Add opensles. * gnu/packages/audio.scm (opensles): New variable. * gnu/packages/patches/opensles-add-license-file.patch: New file. * gnu/local.mk (opensles-add-license-file.patch): New reference. --- gnu/local.mk | 1 + gnu/packages/audio.scm | 62 +++++++++++++++++++ .../patches/opensles-add-license-file.patch | 45 ++++++++++++++ 3 files changed, 108 insertions(+) create mode 100644 gnu/packages/patches/opensles-add-license-file.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5c203f67d0..5c1eb7224f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1335,6 +1335,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/openssh-hurd.patch \ %D%/packages/patches/openresolv-restartcmd-guix.patch \ %D%/packages/patches/openscad-parser-boost-1.72.patch \ + %D%/packages/patches/opensles-add-license-file.patch \ %D%/packages/patches/openssl-runpath.patch \ %D%/packages/patches/openssl-1.1-c-rehash-in.patch \ %D%/packages/patches/openssl-c-rehash-in.patch \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 6be39e9445..166a0d5fe1 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -127,6 +127,68 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) =20 +(define-public opensles + (package + (name "opensles") + (version "1.1.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/KhronosGroup/OpenSL-ES-Registry.git") + (commit "ea5104b"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0j5bm7h3ahz66f23i9abwc0y10agfkpksnj6y078x2nichq66h4f"))= + (patches + (search-patches "opensles-add-license-file.patch")))) + (build-system copy-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'clean + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (mkdir-p (string-append out "/etc")) + (mkdir-p (string-append out "/include")) + (mkdir-p (string-append out "/share")) + (rename-file + (string-append out "/api/1.1/OpenSLES_IID.c") + (string-append out "/etc/OpenSLES_IID.c")) + (rename-file + (string-append out "/api/1.1/OpenSLES.h") + (string-append out "/include/OpenSLES.h")) + (rename-file + (string-append out "/api/1.1/OpenSLES_Platform.h") + (string-append out "/include/OpenSLES_Platform.h")) + (rename-file + (string-append out "/api/1.1/README.txt") + (string-append out "/share/README.txt")) + (rename-file + (string-append out "/LICENSE.txt") + (string-append out "/share/LICENSE.txt")) + (for-each delete-file-recursively + (list + (string-append out "/api") + (string-append out "/specs"))) + (for-each delete-file + (list + (string-append out "/CODE_OF_CONDUCT.md") + (string-append out "/index.php") + (string-append out "/README.md")))) + #t))))) + (synopsis "Embedded Audio Acceleration") + (description "OpenSLES is a royalty-free, cross-platform, +hardware-accelerated audio API tuned for embedded systems. It provides = a +standardized, high-performance, low-latency method to access audio +functionality for developers of native applications on embedded mobile +multimedia devices, enabling straightforward cross-platform deployment o= f +hardware and software audio capabilities, reducing implementation effort= , and +promoting the market for advanced audio.") + (home-page "https://www.khronos.org/opensles/") + (license (license:non-copyleft "file:///LICENSE.txt")))) + (define-public wildmidi (package (name "wildmidi") diff --git a/gnu/packages/patches/opensles-add-license-file.patch b/gnu/p= ackages/patches/opensles-add-license-file.patch new file mode 100644 index 0000000000..c638b3886a --- /dev/null +++ b/gnu/packages/patches/opensles-add-license-file.patch @@ -0,0 +1,45 @@ +From 3a78134a35b448d9d4136ffbc55175be7fab6644 Mon Sep 17 00:00:00 2001 +From: Raghav Gururajan +Date: Mon, 6 Jul 2020 00:34:20 -0400 +Subject: [PATCH] [PATCH]: Add license file. + +--- + LICENSE.txt | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + create mode 100644 LICENSE.txt + +diff --git a/LICENSE.txt b/LICENSE.txt +new file mode 100644 +index 0000000..0fce823 +--- /dev/null ++++ b/LICENSE.txt +@@ -0,0 +1,25 @@ ++/* ++ * Copyright (c) 2007-2011 The Khronos Group Inc. ++ * ++ * Permission is hereby granted, free of charge, to any person obtainin= g a copy of ++ * this software and /or associated documentation files (the "Materials= "), to ++ * deal in the Materials without restriction, including without limitat= ion the ++ * rights to use, copy, modify, merge, publish, distribute, sublicense,= and/or ++ * sell copies of the Materials, and to permit persons to whom the Mate= rials are ++ * furnished to do so, subject to ++ * the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be inclu= ded ++ * in all copies or substantial portions of the Materials. ++ * ++ * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EX= PRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL= ITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SH= ALL THE ++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTH= ER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARIS= ING FROM, ++ * OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALI= NGS IN THE ++ * MATERIALS. ++ * ++ * OpenSLES_IID.c - OpenSL ES version 1.1 ++ * ++ */ +\ No newline at end of file +--=20 +2.26.2 + --=20 2.26.2 --------------2F68BB6CCB7583A7E4BDF99B Content-Type: text/x-patch; charset=UTF-8; name="0003-gnu-gst-plugins-bad-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0003-gnu-gst-plugins-bad-Update-package-definition.patch" =46rom 92a47107253338aa2a75aae535a84f7d57a96fca Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 6 Jul 2020 00:49:41 -0400 Subject: [PATCH 3/7] gnu: gst-plugins-bad: Update package definition. * gnu/packages/gstreamer.scm (gst-plugins-base): Update package definitio= n. [outputs]: New output 'doc'. [arguments]<#:glib-or-gtk?>: New argument. <#:phases>['fix-build-errors]: New phase. ['patch-docbook-xml]: New phase. ['pre-check]: New phase. ['move-doc]: New phase. [native-inputs]: Add docbook-xml, gettext-minimal, gsettings-desktop-sche= mas, perl, libxml2 and xorg-server-for-tests. [inputs]: Add bzip2, cairo, ccextractor, chromaprint, directfb, faac, flite, glib, glib-networking, glu, gsm, iqa, lcms, libaom, libbs2b, libdc= 1394, libdca, libde265, libdrm, libexif, libfdk, libgme, libmfx, libmms, libmpc= dec, libnice, libofa, libopenmpt, libtiff, libva, libx11, libxcb, libxext, lib= xshm, lilv, lv2, mjpegtools, nettle, opencv, openh264, openni2, opensles, pango, rtmp= dump, sbc, sctp, spandsp, srt, svt-hevc, transcode, v4l-utils, vo-aacenc, vo-am= rwbenc, vulkan-headers, vulkan-loader, webrtc-audio-processing, wildmidi, wpebackend-fdo, zbar and zxing-cpp. [propagated-inputs]: Add gstreamer and gst-plugins-base. [synopsis]: Modify. [description]: Modify. --- gnu/packages/gstreamer.scm | 179 ++++++++++++++++++++++++++++--------- 1 file changed, 137 insertions(+), 42 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 774137340d..925e4fcbb0 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -35,6 +35,7 @@ #:use-module (guix build-system meson) #:use-module (guix utils) #:use-module (gnu packages) + #:use-module (gnu packages aidc) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages base) @@ -49,6 +50,7 @@ #:use-module (gnu packages flex) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) + #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -57,6 +59,7 @@ #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages image-processing) #:use-module (gnu packages iso-codes) #:use-module (gnu packages java) #:use-module (gnu packages libunwind) @@ -65,10 +68,13 @@ #:use-module (gnu packages maths) #:use-module (gnu packages mp3) #:use-module (gnu packages multiprecision) + #:use-module (gnu packages music) #:use-module (gnu packages ncurses) + #:use-module (gnu packages nettle) #:use-module (gnu packages networking) #:use-module (gnu packages ocr) #:use-module (gnu packages perl) + #:use-module (gnu packages photo) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages qt) #:use-module (gnu packages rdf) @@ -76,13 +82,17 @@ #:use-module (gnu packages shells) #:use-module (gnu packages video) #:use-module (gnu packages xorg) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages speech) #:use-module (gnu packages python) #:use-module (gnu packages ssh) #:use-module (gnu packages telephony) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) + #:use-module (gnu packages vulkan) + #:use-module (gnu packages webkit) #:use-module (gnu packages assembly) #:use-module (gnu packages xml)) =20 @@ -690,92 +700,177 @@ model to base your own plug-in on, here it is.") (package (name "gst-plugins-bad") (version "1.16.2") - (source (origin - (method url-fetch) - (uri (string-append "https://gstreamer.freedesktop.org/src= /" - name "/" name "-" version ".tar.xz")) - (sha256 - (base32 - "0x0y0hm0ga3zqi5q4090hw5sjh59y1ry9ak16qsaascm72i7mjzi"))= )) + (source + (origin + (method url-fetch) + (uri + (string-append "https://gstreamer.freedesktop.org/src/" + name "/" name "-" version ".tar.xz")) + (sha256 + (base32 "0x0y0hm0ga3zqi5q4090hw5sjh59y1ry9ak16qsaascm72i7mjzi"))= )) (build-system meson-build-system) (arguments - `(#:phases + `(#: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-b= ad/issues/1188 - `((add-after 'unpack 'disable-asfmux-test - (lambda _ - (substitute* "tests/check/meson.build" - (("\\[\\['elements/asfmux\\.c'\\]\\],") - "")) - #t))) - '()) - (add-after 'unpack 'disable-failing-test + (add-after 'unpack 'fix-build-errors + (lambda _ + (substitute* "ext/vulkan/vkerror.c" + (("VK_RESULT_BEGIN_RANGE") + "VK_RESULT_MAX_ENUM")) + #t)) + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs" + (substitute* '("libs/compiling.sgml" + "libs/gst-plugins-bad-libs-docs.sgml" + "plugins/gst-plugins-bad-plugins-docs.sgml= ") + (("http://www.oasis-open.org/docbook/xml/4.1.2/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t)) + (add-after 'unpack 'disable-failing-tests (lambda _ - ;; FIXME: Why is this failing. (substitute* "tests/check/meson.build" - ((".*elements/dash_mpd\\.c.*") + (("\\[\\['elements/msdkh264enc.c'\\], not have_msdk, \\[m= sdk_dep\\]\\],") + "") + (("\\[\\['elements/dash_mpd.c'\\], not xml2_dep.found\\(\= \), \\[xml2_dep\\]\\],") + "") + (("\\[\\['elements/shm.c'\\], not shm_enabled, shm_deps\\= ],") + "") + (("\\[\\['elements/webrtcbin.c'\\], not libnice_dep.found= \\(\\), \\[gstwebrtc_dep\\]\\],") "")) + #t)) + (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))))) - (propagated-inputs - `(("gst-plugins-base" ,gst-plugins-base))) (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. + `(("docbook-xml" ,docbook-xml-4.1.2) + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ;; TODO: Enable documentation for 1.18. - ;;("gtk-doc" ,gtk-doc) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("perl" ,perl) ("pkg-config" ,pkg-config) - ("python" ,python))) + ("python-wrapper" ,python-wrapper) + ("xorg-server" ,xorg-server-for-tests))) (inputs - ;; XXX: The following dependencies are missing: - ;; vo-amrwbenc, vo-aacenc, bs2b, chromaprint, directfb, daala, lib= dts, - ;; faac, flite, libgsm, libde265, libmms, libmimic, mjpegtools, - ;; mpeg2enc, libofa, opencv, openh264, openni2, libtimemmgr, wildm= idi, - ;; openspc, gme, sbc, schroedinger, zbar, librtmp, spandsp `(("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) - ;("qtbase" ,qtbase) - ;("qtdeclarative" ,qtdeclarative) - ;("qtx11extras" ,qtx11extras) + ("pango" ,pango) + ("rtmp" ,rtmpdump) + ("sbc" ,sbc) + ("sctp" ,lksctp-tools) ("soundtouch" ,soundtouch) + ("spandsp" ,spandsp) + ("srt" ,srt) + ("svthevcenc" ,svt-hevc) + ("tinyalsa" ,tinyalsa) + ("transcode" ,transcode) + ("v4l" ,v4l-utils) + ("voaacenc", vo-aacenc) + ("voamrwbenc" ,vo-amrwbenc) + ("vulkan-headers" ,vulkan-headers) + ("vulkan-loader" ,vulkan-loader) ("x265" ,x265) - ("wayland" ,wayland))) + ("wayland" ,wayland) + ("webrtcdsp" ,webrtc-audio-processing) + ("wildmidi" ,wildmidi) + ("wpebackend-fdo" ,wpebackend-fdo) + ;;("wpewebkit" ,wpewebkit) + ("zbar" ,zbar) + ("zxing" ,zxing-cpp))) + (propagated-inputs + `(("gstreamer" ,gstreamer) + ("gst-plugins-base" ,gst-plugins-base))) + (synopsis "GStreamer plugins and helper libraries") + (description "Gst-Plugins-Bad are Bad with a capital B. They look f= ine on +the outside, and might even appear to get the job done, but at the end o= f the +day they're a black sheep. Without a golden-haired angel to watch over = them, +they'll probably land in an unmarked grave at the final showdown.") (home-page "https://gstreamer.freedesktop.org/") - (synopsis "Plugins for the GStreamer multimedia library") - (description - "GStreamer Bad Plug-ins is a set of plug-ins whose quality aren't u= p to -par compared to the rest.") (license license:lgpl2.0+))) =20 (define-public gst-plugins-ugly --=20 2.26.2 --------------2F68BB6CCB7583A7E4BDF99B Content-Type: text/x-patch; charset=UTF-8; name="0004-gnu-gst-plugins-ugly-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0004-gnu-gst-plugins-ugly-Update-package-definition.patch" =46rom a3f1b80a855a6d4d9a532314761ced0b9441c997 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 6 Jul 2020 00:50:22 -0400 Subject: [PATCH 4/7] gnu: gst-plugins-ugly: Update package definition. * gnu/packages/gstreamer.scm (gst-plugins-ugly): Update package definitio= n. [arguments]<#:glib-or-gtk?>: New argument. <#:phases>['patch-docbook-xml]: New phase. ['pre-check]: New phase. [native-inputs]: Add docbook-xml, gettext-minimal, gsettings-desktop-sche= mas, perl and xorg-server-for-tests. [inputs]: Add glib, glib-networking and opencore-amr. Remove gst-plugins-= base. [propagated-inputs]: Add gstreamer and gst-plugins-base. [synopsis]: Modify. [description]: Modify. --- gnu/packages/gstreamer.scm | 67 ++++++++++++++++++++++++++++---------- 1 file changed, 49 insertions(+), 18 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 925e4fcbb0..e47b73bc87 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -880,35 +880,66 @@ they'll probably land in an unmarked grave at the f= inal showdown.") (source (origin (method url-fetch) - (uri (string-append "https://gstreamer.freedesktop.org/src/" - name "/" name "-" version ".tar.xz")) + (uri + (string-append "https://gstreamer.freedesktop.org/src/" + name "/" name "-" version ".tar.xz")) (sha256 - (base32 - "1jpvc32x6q01zjkfgh6gmq6aaikiyfwwnhj7bmvn52syhrdl202m")))) + (base32 "1jpvc32x6q01zjkfgh6gmq6aaikiyfwwnhj7bmvn52syhrdl202m"))= )) (build-system meson-build-system) (arguments - `(#:phases (modify-phases %standard-phases - ,@%common-gstreamer-phases))) + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs" + (substitute* "plugins/gst-plugins-ugly-plugins-docs.sgml"= + (("http://www.oasis-open.org/docbook/xml/4.1.2/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t)) + (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))))) + (native-inputs + `(("docbook-xml" ,docbook-xml-4.1.2) + ("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) + ("xorg-server" ,xorg-server-for-tests))) (inputs - `(("gst-plugins-base" ,gst-plugins-base) + `(("glib" ,glib) + ("glib-networking" ,glib-networking) ("liba52" ,liba52) ("libcdio" ,libcdio) + ("libdvdread" ,libdvdread) ("libmpeg2" ,libmpeg2) ("libdvdread" ,libdvdread) ("libx264" ,libx264) - ;; TODO: - ;; * opencore-amr (for the AMR-NB decoder and encoder and the - ;; AMR-WB decoder) + ("opencore-amr" ,opencore-amr) ("orc" ,orc))) - (native-inputs - `(("glib:bin" ,glib "bin") - ("pkg-config" ,pkg-config) - ("python-wrapper" ,python-wrapper))) + (propagated-inputs + `(("gstreamer" ,gstreamer) + ("gst-plugins-base" ,gst-plugins-base))) + (synopsis "GStreamer plugins and helper libraries") + (description "Gst-Plugins-Ugly are the ones that might have a patent= noose +around their neck, or a lock-up license, or any other problem that makes= you +think twice about shipping them.") (home-page "https://gstreamer.freedesktop.org/") - (synopsis "GStreamer plugins from the \"ugly\" set") - (description "GStreamer Ugly Plug-ins. This set contains those plug= -ins -which the developers consider to have good quality code but that might p= ose -distribution problems in some jurisdictions, e.g. due to patent threats.= ") (license license:lgpl2.0+))) =20 (define-public gst-libav --=20 2.26.2 --------------2F68BB6CCB7583A7E4BDF99B Content-Type: text/x-patch; charset=UTF-8; name="0005-gnu-gst-libav-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0005-gnu-gst-libav-Update-package-definition.patch" =46rom d28eb942c492db20db9cdfa2f38afd58246727f0 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 6 Jul 2020 00:51:06 -0400 Subject: [PATCH 5/7] gnu: gst-libav: Update package definition. * gnu/packages/gstreamer.scm (gst-libav): Update package definition. [arguments]<#:phases>['patch-docbook-xml]: New phase. [native-inputs]: Add docbook-xml, perl and ruby. [inputs]: Remove gst-plugins-base, orc and zlib. [propagated-inputs]: Add gstreamer and gst-plugins-base. [synopsis]: Modify. [description]: Modify. [license]: Change from gpl2+ to lgpl2.0+. --- gnu/packages/gstreamer.scm | 66 +++++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 26 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index e47b73bc87..b39113bea2 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -85,6 +85,7 @@ #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages ruby) #:use-module (gnu packages speech) #:use-module (gnu packages python) #:use-module (gnu packages ssh) @@ -928,7 +929,6 @@ they'll probably land in an unmarked grave at the fin= al showdown.") ("libcdio" ,libcdio) ("libdvdread" ,libdvdread) ("libmpeg2" ,libmpeg2) - ("libdvdread" ,libdvdread) ("libx264" ,libx264) ("opencore-amr" ,opencore-amr) ("orc" ,orc))) @@ -946,35 +946,49 @@ think twice about shipping them.") (package (name "gst-libav") (version "1.16.2") - (source (origin - (method url-fetch) - (uri (string-append - "https://gstreamer.freedesktop.org/src/" name "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1wpfilc98bad9nsv3y1qapxp35dvn2mvwvrmqwrsj58cf09gc967"))= - (modules '((guix build utils))) - (snippet - '(begin - ;; Drop bundled ffmpeg. - (delete-file-recursively "gst-libs/ext/libav") - #t)))) + (source + (origin + (method url-fetch) + (uri + (string-append + "https://gstreamer.freedesktop.org/src/" name "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "1wpfilc98bad9nsv3y1qapxp35dvn2mvwvrmqwrsj58cf09gc967"))= + (modules '((guix build utils))) + (snippet + '(begin + ;; Drop bundled ffmpeg. + (delete-file-recursively "gst-libs/ext/libav") + #t)))) (build-system meson-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs" + (substitute* "plugins/gst-libav-plugins-docs.sgml" + (("http://www.oasis-open.org/docbook/xml/4.1.2/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t))))) (native-inputs - `(("pkg-config" ,pkg-config) - ("python" ,python))) + `(("docbook-xml" ,docbook-xml-4.1.2) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("ruby" ,ruby))) (inputs - `(("gst-plugins-base" ,gst-plugins-base) - ("ffmpeg" ,ffmpeg) - ("orc" ,orc) - ("zlib" ,zlib))) + `(("ffmpeg" ,ffmpeg))) + (propagated-inputs + `(("gstreamer" ,gstreamer) + ("gst-plugins-base" ,gst-plugins-base))) + (synopsis "GStreamer plugins and helper libraries") + (description "Gst-Libav contains a GStreamer plugin for using the en= coders, +decoders, muxers, and demuxers provided by FFmpeg.") (home-page "https://gstreamer.freedesktop.org/") - (synopsis "Plugins for the GStreamer multimedia library") - (description - "This GStreamer plugin supports a large number of audio and video -compression formats through the use of the libav library.") - (license license:gpl2+))) + (license license:lgpl2.0+))) =20 (define-public gst-editing-services (package --=20 2.26.2 --------------2F68BB6CCB7583A7E4BDF99B-- --hm5DgOR0xOCjcqVR6yJazhxFyCTc5gKXE-- --XTFfOToq240lIv54A7NadzpDPM8BBXDJn Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEJ0EvNKqRjepA0pQorm7zBG1ve1cFAl8CsREACgkQrm7zBG1v e1cXhgf/ULfIqG1t/r9dyPOzzI5t5HT6yfiBbEf+xGbYbJwvD5NgSBnWPVDLRjsk oa4zxvHeLiUbZMXLC/9ZUH2/gq34gtrvafIKh5RfOZAsXTKQ8fWhZTxbxkLc+SZT dHsATWdSSsOdorqgxnZz2hDVmmWpP/VoqS30Jjx0zCOAKihwMWc+r5WAZHEyTAU9 z7Z56VexscvEQO58aVkSK/yhyrt1HJNtoi355EbgpZtl5a9/7EsbqQe5M7yhbyqx VH7Jl1YyWCtfM+YVKDvezl7h5pxM8oXk0c2iZl416uVPa7tkweyoaTYq119r/Ojd 50F2l1DDpNl3kiSobiEPC/eLYzunEQ== =bDp9 -----END PGP SIGNATURE----- --XTFfOToq240lIv54A7NadzpDPM8BBXDJn--