From 4c3794f82d0e6a847d14d50d85ae0411e9cfd8c8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 18 Jan 2024 16:00:15 -0500 Subject: gnu: libplacebo: Propagate lcms, shaderc and vulkan-loader. * gnu/packages/video.scm (libplacebo) [inputs]: Move lcms, shaderc and vulkan-loader to... [propagated-inputs]: ... here. Change-Id: If426be3b4e32632bb775485e0a8c517e09ccbeaf --- gnu/packages/video.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 7f98e2ca5b..042e7e3018 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1564,13 +1564,10 @@ libebml is a C++ library to read and write EBML files.") "/share/vulkan/registry/vk.xml")))) (native-inputs (list glad python python-mako pkg-config)) - (inputs - (list lcms - libepoxy - mesa - shaderc - vulkan-headers - vulkan-loader)) + (inputs (list libepoxy mesa vulkan-headers)) + ;; These are propagated as they are listed in 'Requires.private' of + ;; libplacebo.pc. + (propagated-inputs (list lcms shaderc vulkan-loader)) (home-page "https://code.videolan.org/videolan/libplacebo") (synopsis "GPU-accelerated image/video processing library") (description "libplacebo is, in a nutshell, the core rendering algorithms -- cgit v1.2.3 From 119f4cad81977b9fe0af9812767b1f00f434b329 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 18 Jan 2024 16:08:48 -0500 Subject: gnu: libdvdnav: Propagate libdvdread. * gnu/packages/video.scm (libdvdnav) [inputs]: Move libdvdread to... [propagated-inputs]: ... here. Change-Id: Ifea887985f27ed1dec2c56ce2f5291862f011bed --- gnu/packages/video.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 042e7e3018..88b6636a7b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3329,10 +3329,8 @@ MPEG-2 stream containing VOB packets.") (base32 "0cv7j8irsv1n2dadlnhr6i1b8pann2ah6xpxic41f04my6ba6rp5")))) (build-system gnu-build-system) - (native-inputs - (list pkg-config)) - (inputs - (list libdvdread)) + (native-inputs (list pkg-config)) + (propagated-inputs (list libdvdread)) ;in 'Requires.private' of dvdnav.pc (home-page "http://dvdnav.mplayerhq.hu/") (synopsis "Library for video DVD navigation features") (description -- cgit v1.2.3 From f3fdb4e041cb5740ba0b38b9ad017571f8414d33 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 18 Jan 2024 20:30:57 -0500 Subject: gnu: mpv: Propagate most libraries. This is needed when packages lookup the mpv library via pkg-config, such as done by plasmatube. Prior to this change, the following would fail (this is what CMake's 'pkg_check_modules' does): $ guix shell --pure pkg-config mpv \ -- pkg-config --print-errors --short-errors --exists mpv Package 'wayland-client', required by 'mpv', not found * gnu/packages/video.scm (mpv) [inputs]: Move alsa-lib, ffmpeg, jack-1, libass, libbluray, libcaca, libcdio-paranoia, libdvdnav, libjpeg-turbo, libplacebo, libva, libvdpau, libx11, libxext, libxinerama, libxpresent, libxrandr, libxscrnsaver, lua-5.2, mesa, pulseaudio, shaderc, wayland, wayland-protocols, zimg and zlib to... [propagated-inputs]: ... here. Change-Id: Ia0cd4e33a8b4df4b060546c979d00be0b2b3977e --- gnu/packages/video.scm | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 88b6636a7b..90b3bdb585 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2639,31 +2639,43 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") "-Ddvdnav=enabled" "-Dbuild-date=false"))) (native-inputs - (list perl ; for zsh completion file - pkg-config python-docutils python-wrapper)) + (list perl ;for zsh completion file + pkg-config + python-docutils + python-wrapper)) ;; Missing features: libguess, V4L2. (inputs + (list enca + ladspa + lcms + libbs2b + mpg123 + rsound + vulkan-headers + vulkan-loader + yt-dlp)) + ;; XXX: These are propagated for the mpv pkg-config package, as they are + ;; listed in Requires.private and would break 'pkg-config --exists mpv' if + ;; unavailable. + (propagated-inputs (list alsa-lib - enca ffmpeg jack-1 - ladspa - lcms libass libbluray libcaca - libbs2b libcdio-paranoia - libdvdread + libdrm libdvdnav + libdvdread libjpeg-turbo libplacebo libva libvdpau libx11 libxext - libxkbcommon libxinerama + libxkbcommon libxpresent libxrandr libxscrnsaver @@ -2671,15 +2683,10 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") ;; XXX: lua > 5.2 is not currently supported; see meson.build lua-5.2 mesa - mpg123 pulseaudio - rsound shaderc - vulkan-headers - vulkan-loader wayland wayland-protocols - yt-dlp zimg zlib)) (home-page "https://mpv.io/") -- cgit v1.2.3 From 14db6616e8e4a8d8cca3772d3aeb710bc5088081 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Sat, 3 Dec 2022 10:34:03 +0100 Subject: gnu: Add h264bitstream. * gnu/packages/video.scm (h264bitstream): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/video.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 90b3bdb585..cca0217e61 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4545,6 +4545,39 @@ of modern, widely supported codecs.") ;; Combination under GPLv2. See LICENSE. (license license:gpl2))) +(define-public h264bitstream + ;; Used as submodule in https://github.com/moonlight-stream/moonlight-qt + (let ((commit "34f3c58afa3c47b6cf0a49308a68cbf89c5e0bff") + (revision "1")) + (package + (name "h264bitstream") + (version (git-version "0.2.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aizvorski/h264bitstream") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0rrhzckz2a89q0chw2bfl4g89yiv9a0dcqcj80lcpdr3a1ix8q85")))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f ;no test suite + #:phases #~(modify-phases %standard-phases + (add-after 'install 'fix-include-bs-h + (lambda _ + (symlink (string-append #$output + "/include/h264bitstream/bs.h") + (string-append #$output "/include/bs.h"))))))) + (native-inputs (list autoconf automake libtool pkg-config)) + (inputs (list ffmpeg)) + (synopsis "Library to read and write H.264 video bitstreams") + (description + "This package provides the GameStream code shared between Moonlight clients.") + (home-page "https://github.com/aizvorski/h264bitstream") + (license license:lgpl2.1+)))) + (define-public intel-vaapi-driver (package (name "intel-vaapi-driver") -- cgit v1.2.3 From d52d4b833ae39eb7b202fa1d6bc868532f0bf74b Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Mon, 22 Jan 2024 06:05:01 +0300 Subject: gnu: h264bitstream: Update to 0.2.0-1.ae72f73. * gnu/packages/video.scm (h264bitstream): Update to 0.2.0-1.ae72f73. Change-Id: I0aa9422f236995086275c492a2093f2acb894ab1 --- gnu/packages/video.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index cca0217e61..b182b2d9f3 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -34,7 +34,7 @@ ;;; Copyright © 2019 Timo Eisenmann ;;; Copyright © 2019 Arne Babenhauserheide ;;; Copyright © 2019 Riku Viitanen -;;; Copyright © 2020, 2021, 2023 Oleg Pykhalov +;;; Copyright © 2020, 2021, 2023, 2024 Oleg Pykhalov ;;; Copyright © 2020 Josh Holland ;;; Copyright © 2020, 2021 Brice Waegeneire ;;; Copyright © 2020 Vincent Legoll @@ -4547,7 +4547,7 @@ of modern, widely supported codecs.") (define-public h264bitstream ;; Used as submodule in https://github.com/moonlight-stream/moonlight-qt - (let ((commit "34f3c58afa3c47b6cf0a49308a68cbf89c5e0bff") + (let ((commit "ae72f7395f328876199a7e928d3b4a6dc6a7ce14") (revision "1")) (package (name "h264bitstream") @@ -4560,7 +4560,7 @@ of modern, widely supported codecs.") (file-name (git-file-name name version)) (sha256 (base32 - "0rrhzckz2a89q0chw2bfl4g89yiv9a0dcqcj80lcpdr3a1ix8q85")))) + "0pqzfzkgqk5zjh5ywc7l7mffs2vh6wlzssvq2jxildygvqxs3pjp")))) (build-system gnu-build-system) (arguments (list #:tests? #f ;no test suite -- cgit v1.2.3 From ee20e6fa2ee7c607eac9095f5e2fd00c0aa3d7ab Mon Sep 17 00:00:00 2001 From: Josselin Poiret Date: Wed, 27 Dec 2023 11:15:22 +0100 Subject: gnu: mpv-mpris: Switch to gnu-build-system. * gnu/packages/video.scm (mpv-mpris)[build-system]: Use gnu-build-system again. [arguments]<#:phases>: Run tests. [native-inputs]: Add dbus, jq, playerctl, socat, sound-theme-freedesktop, xorg-server-for-tests, xvfb-run. Change-Id: I9de4ade633388ec42ac30019feb133ca98811ad9 Signed-off-by: Hilton Chain --- gnu/packages/video.scm | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b182b2d9f3..ef69c1dcc8 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -154,6 +154,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages iso-codes) + #:use-module (gnu packages libcanberra) #:use-module (gnu packages libidn) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) @@ -2785,18 +2786,35 @@ images and image hosting sites.") (file-name (git-file-name name version)) (sha256 (base32 "1384y8n3l0xk8hbad1nsj9ljzb1h02g3ln3jysd8bd6shbl0x4mx")))) - (build-system copy-build-system) + (build-system gnu-build-system) (arguments - '(#:install-plan - '(("mpris.so" "lib/")) - #:phases - (modify-phases %standard-phases - (add-before 'install 'build - (lambda _ - (setenv "CC" (which "gcc")) - (invoke "make")))))) + (list + #:make-flags + #~(list (string-append "SCRIPTS_DIR=" #$output "/lib") + (string-append "CC=" #$(cc-for-target))) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (replace 'check + (lambda* (#:key inputs native-inputs tests? #:allow-other-keys) + (if tests? + (begin + (setenv + "MPV_MPRIS_TEST_PLAY" + (search-input-file + (or native-inputs inputs) + "share/sounds/freedesktop/stereo/alarm-clock-elapsed.oga")) + (invoke "make" "test")) + (format #t "test suite not run~%"))))))) (native-inputs - (list pkg-config)) + (list dbus + jq + pkg-config + playerctl + socat + sound-theme-freedesktop + xorg-server-for-tests + xvfb-run)) (inputs (list ffmpeg glib mpv)) (home-page "https://github.com/hoyon/mpv-mpris") -- cgit v1.2.3