diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-04-23 13:33:09 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-23 13:33:09 +0200 |
| commit | 030f6f489fe9544f35ebaf95135acd1dd67ce63f (patch) | |
| tree | f1d5d1f1b68de81daec6f05d032a0410a475d960 /gnu/packages/video.scm | |
| parent | 95c14929a7fbd3c55c5e8756953c2f257625e2b7 (diff) | |
| parent | 938df0de739aa13c2fb483f440ec1db281a52aaa (diff) | |
| download | guix-030f6f489fe9544f35ebaf95135acd1dd67ce63f.tar.gz | |
Merge branch 'master' into core-updates
Conflicts: etc/news.scm gnu/local.mk gnu/packages/bootloaders.scm gnu/packages/linphone.scm gnu/packages/linux.scm gnu/packages/tls.scm gnu/system.scm
Diffstat (limited to 'gnu/packages/video.scm')
| -rw-r--r-- | gnu/packages/video.scm | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 947598d289..fbc4610ffc 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2020 Josh Holland <josh@inv.alid.pw> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> +;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -2437,7 +2438,7 @@ be used for realtime video capture via Linux-specific APIs.") (define-public obs (package (name "obs") - (version "24.0.4") + (version "25.0.7") (source (origin (method git-fetch) (uri (git-reference @@ -2446,7 +2447,7 @@ be used for realtime video capture via Linux-specific APIs.") (file-name (git-file-name name version)) (sha256 (base32 - "0m15ch2ix9qrdf1a9mj7wcpl72z3h13zx60c9q72sb1435id2g1q")))) + "02ppkp1j5yxnxv663nz5wv4vbcg3k53l43xq94d1p1b3j4wxwq8b")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no tests @@ -3921,3 +3922,31 @@ work-in-progress, aiming to support video-on-demand and live streaming applications. It only supports Intel-compatible CPUs (x86).") (home-page "https://github.com/OpenVisualCloud/SVT-AV1") (license license:bsd-2))) + +(define-public w-scan + (package + (name "w-scan") + (version "20170107") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.gen2vdr.de/wirbel/w_scan/w_scan-" + version ".tar.bz2")) + (sha256 + (base32 "1zkgnj2sfvckix360wwk1v5s43g69snm45m0drnzyv7hgf5g7q1q")))) + (build-system gnu-build-system) + (synopsis "Scan ATSC/DVB-C/DVB-S/DVB-T channels") + (description + "This is a small command line utility used to perform frequency scans for +DVB and ATSC transmissions without initial tuning data. It can print the +result in several formats: +@itemize +@item VDR channels.conf, +@item czap/tzap/xine/mplayer channels.conf, +@item Gstreamer dvbsrc plugin, +@item VLC xspf playlist, +@item XML, +@item initial tuning data for scan or dvbv5-scan. +@end itemize\n") + (home-page "https://www.gen2vdr.de/wirbel/w_scan/index2.html") + (license license:gpl2+))) |