From patchwork Sat Jun 8 07:14:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 65244 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 8BE8027BBE2; Sat, 8 Jun 2024 08:20:25 +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 1485F27BBE9 for ; Sat, 8 Jun 2024 08:20:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sFqMf-0001DB-QE; Sat, 08 Jun 2024 03:19:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sFqMd-0001CY-JY for guix-patches@gnu.org; Sat, 08 Jun 2024 03:19:47 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sFqMd-00049J-BM for guix-patches@gnu.org; Sat, 08 Jun 2024 03:19:47 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sFqMs-00026U-T2 for guix-patches@gnu.org; Sat, 08 Jun 2024 03:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71428] [PATCH] gnu: Add orfondl. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 08 Jun 2024 07:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71428@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17178311637949 (code B ref -1); Sat, 08 Jun 2024 07:20:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Jun 2024 07:19:23 +0000 Received: from localhost ([127.0.0.1]:51776 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sFqMC-00023v-RQ for submit@debbugs.gnu.org; Sat, 08 Jun 2024 03:19:22 -0400 Received: from lists.gnu.org ([209.51.188.17]:38144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sFqMA-00023Z-D7 for submit@debbugs.gnu.org; Sat, 08 Jun 2024 03:19:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sFqLu-0000av-CM for guix-patches@gnu.org; Sat, 08 Jun 2024 03:19:02 -0400 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sFqLs-00044r-K6 for guix-patches@gnu.org; Sat, 08 Jun 2024 03:19:02 -0400 Received: by mail-ej1-x641.google.com with SMTP id a640c23a62f3a-a63359aaaa6so415967666b.2 for ; Sat, 08 Jun 2024 00:19:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717831137; x=1718435937; darn=gnu.org; h=mime-version:to:subject:date:from:message-id:from:to:cc:subject :date:message-id:reply-to; bh=k3Zw9Nxp50yClSWw/GInVYMNjv9rNp1MDuSPT55qlsU=; b=RpVF8PNFgOqw4AeqVS3uibzzGrS5CyJqEvLgPiWEyj6LZEI3UMD0k8MRNpxcZTMxQ0 8lVTnylQ/baMNYrzgScrwuhMA9w595mHuJiee+crMmo0YrwNBZdL/CanNoeOaT2SkdLH A8KG+z0WqceOq2GPPMgMkS/QlIWiqJCej/SWfI1DG2gapG5XSBRkmTjKdpXLHTdRDxqp bPYkgjrKLk6ZRGO1eF9JybCjuSjeziwie/fbhmV5WFAPH/xxCdwooXdmdZouX+R6V6T9 mCoHMIGWmh0HSuI3vDdptRUUIUK+jeNHQJxH0CogBAg092L0Vmzy1cTJVneZ4Caj1Zdl Yl9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717831137; x=1718435937; h=mime-version:to:subject:date:from:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=k3Zw9Nxp50yClSWw/GInVYMNjv9rNp1MDuSPT55qlsU=; b=wKFye/K39pZ9jQVsiLcqF/Rndk+G18RGvSZlO96hT80Uq2VKTa02KkmPFVAi0oBf5U 0qXDSD3CKFJU44tnSnfBjix3aoE474DKyO3RX8nCLt7cKpyc+QRjKdVBb6WJYmPmHeDB XzHcscuDrlErQqjjXXOkdhIH77AALalWsJ40nP/95miMN59w8uJRl9CpINZ/aXYitL4T lzdKshLelWU09nvfyiErfjKNCOiebdHCTYvLnD87RelxhzAhluQitQLyvUySrofixTAi u8O5YxznZ/RIIbgniC4MKAvvrPe8MQjACd9eczW0rpoYP/OU9bkkv4V80pxFOOHp7Ne/ DXBw== X-Gm-Message-State: AOJu0YyTdRMrHCVNRnNwGOgSYA8XPTiHbZQiymrkYsAwc16f+IP28548 4nipvohPC+ML04BRbXiEHJz0cAqhRXtSqo8Qc5zYjQj2LC00YFsihroTHJFh X-Google-Smtp-Source: AGHT+IEx7VuqM5lJCRnUwARxoahvAhh31iEGW76UxcQg8yLm8aTe4SP3rUqJiZbE4uNVzil0BtK2Dg== X-Received: by 2002:a17:907:784e:b0:a6f:678:416a with SMTP id a640c23a62f3a-a6f06784235mr36278066b.62.1717831137279; Sat, 08 Jun 2024 00:18:57 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a6c8072ac1fsm349609666b.222.2024.06.08.00.18.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jun 2024 00:18:56 -0700 (PDT) Message-ID: <5a1d8c1400cf561f7ec9f92d41fd8b993b3d2856.1717831035.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Sat, 8 Jun 2024 09:14:42 +0200 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::641; envelope-from=liliana.prikler@gmail.com; helo=mail-ej1-x641.google.com X-Spam_score_int: 4 X-Spam_score: 0.4 X-Spam_bar: / X-Spam_report: (0.4 / 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, FREEMAIL_FROM=0.001, MALFORMED_FREEMAIL=2.533, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/video.scm (orfondl): New variable. (orf-dl): Deprecate in favor of orfondl. --- gnu/packages/video.scm | 74 +++++++++++++++++++++++++----------------- 1 file changed, 44 insertions(+), 30 deletions(-) base-commit: b8780f7397dd46b5e382e48db87b8648f769d738 diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 0960410498..b75ac958c1 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -100,6 +100,7 @@ (define-module (gnu packages video) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) + #:use-module (guix build-system go) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system meson) #:use-module (guix build-system perl) @@ -147,6 +148,7 @@ (define-module (gnu packages video) #:use-module (gnu packages gnome) #:use-module (gnu packages gnunet) #:use-module (gnu packages gnupg) + #:use-module (gnu packages golang) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages haskell-xyz) @@ -2962,37 +2964,49 @@ (define libvpx/fixed (patches (search-patches "libvpx-CVE-2016-2818.patch" "libvpx-CVE-2023-5217.patch")))))) -(define-public orf-dl - (let ((commit "2dbbe7ef4e0efe0f3c1d59c503108e22d9065999") - (revision "1")) - (package - (name "orf-dl") - (version (git-version "0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tpoechtrager/orf_dl") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1w413miy01cm7rzb5c6wwfdnc2sqv87cvxwikafgrkswpimvdjsk")))) - (build-system copy-build-system) - (arguments - (list #:install-plan #~`(("orf_dl.php" "bin/orf-dl")) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "orf_dl.php" - (("ffmpeg") - (search-input-file inputs "bin/ffmpeg")))))))) - (inputs (list php ffmpeg)) - (home-page "https://github.com/tpoechtrager/orf_dl") - (synopsis "Download videos from tvthek.orf.at") - (description "This package provides a PHP-based command line application +(define-public orfondl + (package + (name "orfondl") + (version "1.0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/badlogic/orfondl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0h1zcxxhvshbc3gkmr33npki6sdjh79haack1cci9k40a0gk144v")))) + (build-system go-build-system) + (arguments + (list #:go go-1.19 + #:import-path "github.com/badlogic/orfondl" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key inputs import-path #:allow-other-keys) + (substitute* (string-append "src/" import-path "/main.go") + (("\"ffmpeg\"") + (string-append "\"" + (search-input-file inputs "bin/ffmpeg") + "\""))))) + (replace 'build + (lambda* (#:key import-path #:allow-other-keys #:rest args) + (with-directory-excursion (string-append "src/" import-path) + (apply (assoc-ref %standard-phases 'build) args)))) + (replace 'check + (lambda* (#:key import-path #:allow-other-keys #:rest args) + (with-directory-excursion (string-append "src/" import-path) + (apply (assoc-ref %standard-phases 'check) args))))))) + (inputs (list ffmpeg)) + (home-page "https://github.com/tpoechtrager/orf_dl") + (synopsis "Download videos from ORF ON") + (description "This package provides a Go-based command line application to download videos from Austria's national television broadcaster.") - (license license:gpl2+)))) + (license license:bsd-3))) + +(define-public orf-dl + (deprecated-package "orf-dl" orfondl)) (define-public yle-dl (package