all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: 71428@debbugs.gnu.org
Subject: [bug#71428] [PATCH] gnu: Add orfondl.
Date: Sat, 8 Jun 2024 09:14:42 +0200	[thread overview]
Message-ID: <5a1d8c1400cf561f7ec9f92d41fd8b993b3d2856.1717831035.git.liliana.prikler@gmail.com> (raw)

* 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(-)

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

base-commit: b8780f7397dd46b5e382e48db87b8648f769d738
-- 
2.45.1





WARNING: multiple messages have this Message-ID (diff)
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: 71431@debbugs.gnu.org
Subject: [bug#71431] [PATCH] gnu: Add orfondl.
Date: Sat, 8 Jun 2024 09:14:42 +0200	[thread overview]
Message-ID: <5a1d8c1400cf561f7ec9f92d41fd8b993b3d2856.1717831035.git.liliana.prikler@gmail.com> (raw)
Message-ID: <20240608071442.UeDGjhwrV2ERJuqN3LiZ_fbU1sojRx3X0TTbqoW2a6U@z> (raw)

* 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(-)

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

base-commit: b8780f7397dd46b5e382e48db87b8648f769d738
-- 
2.45.1





             reply	other threads:[~2024-06-08  7:20 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-08  7:14 Liliana Marie Prikler [this message]
2024-06-08  7:14 ` [bug#71431] [PATCH] gnu: Add orfondl Liliana Marie Prikler
2024-06-11  9:28 ` bug#71428: " Sharlatan Hellseher
2024-06-11  9:30 ` bug#71431: " Sharlatan Hellseher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5a1d8c1400cf561f7ec9f92d41fd8b993b3d2856.1717831035.git.liliana.prikler@gmail.com \
    --to=liliana.prikler@gmail.com \
    --cc=71428@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.