* [bug#71428] [PATCH] gnu: Add orfondl.
@ 2024-06-08 7:14 Liliana Marie Prikler
2024-06-08 7:14 ` [bug#71431] " Liliana Marie Prikler
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Liliana Marie Prikler @ 2024-06-08 7:14 UTC (permalink / raw)
To: 71428
* 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#71431] [PATCH] gnu: Add orfondl.
2024-06-08 7:14 [bug#71428] [PATCH] gnu: Add orfondl Liliana Marie Prikler
@ 2024-06-08 7:14 ` Liliana Marie Prikler
2024-06-11 9:28 ` bug#71428: " Sharlatan Hellseher
2024-06-11 9:30 ` bug#71431: " Sharlatan Hellseher
2 siblings, 0 replies; 4+ messages in thread
From: Liliana Marie Prikler @ 2024-06-08 7:14 UTC (permalink / raw)
To: 71431
* 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#71428: [PATCH] gnu: Add orfondl.
2024-06-08 7:14 [bug#71428] [PATCH] gnu: Add orfondl Liliana Marie Prikler
2024-06-08 7:14 ` [bug#71431] " Liliana Marie Prikler
@ 2024-06-11 9:28 ` Sharlatan Hellseher
2024-06-11 9:30 ` bug#71431: " Sharlatan Hellseher
2 siblings, 0 replies; 4+ messages in thread
From: Sharlatan Hellseher @ 2024-06-11 9:28 UTC (permalink / raw)
To: 71428-done
[-- Attachment #1: Type: text/plain, Size: 102 bytes --]
Hi,
Pushed as 693037101bbacb8de03457bbd3b231e1897c7b37 to master with minor
modifications.
--
Oleg
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* bug#71431: [PATCH] gnu: Add orfondl.
2024-06-08 7:14 [bug#71428] [PATCH] gnu: Add orfondl Liliana Marie Prikler
2024-06-08 7:14 ` [bug#71431] " Liliana Marie Prikler
2024-06-11 9:28 ` bug#71428: " Sharlatan Hellseher
@ 2024-06-11 9:30 ` Sharlatan Hellseher
2 siblings, 0 replies; 4+ messages in thread
From: Sharlatan Hellseher @ 2024-06-11 9:30 UTC (permalink / raw)
To: 71431-done
[-- Attachment #1: Type: text/plain, Size: 92 bytes --]
This is a duplicate of https://issues.guix.gnu.org/71428, closing as not applied.
--
Oleg
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-06-11 16:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-08 7:14 [bug#71428] [PATCH] gnu: Add orfondl Liliana Marie Prikler
2024-06-08 7:14 ` [bug#71431] " Liliana Marie Prikler
2024-06-11 9:28 ` bug#71428: " Sharlatan Hellseher
2024-06-11 9:30 ` bug#71431: " Sharlatan Hellseher
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).