Merge branch 'master' into 'master'

nongnu: Add libreelec-firmware.

See merge request nonguix/nonguix!756

nongnu/packages/firmware.scm

@@ -310,3 +310,26 @@ patjak's facetimehd wiki} for more information.")
     (home-page "https://support.apple.com/kb/DL1837")
     (license (nonfree "https://www.apple.com/legal"))
     (supported-systems '("i686-linux" "x86_64-linux"))))
+
+(define-public libreelec-firmware
+  (let ((commit "88e46425ef489513c0b8bf7c2747d262367be1cc")
+        (revision "0"))
+    (package
+      (name "libreelec-firmware")
+      (version (git-version "0.0.0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                       (url "https://github.com/LibreELEC/brcmfmac_sdio-firmware")
+                       (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "071b55kmm37csvqamijw4gd231gvw9ha3qxq75i1k9p7i34bad2m"))))
+      (build-system copy-build-system)
+      (arguments
+       `(#:install-plan '(("./" "lib/firmware/brcm/"))))
+      (home-page "https://github.com/LibreELEC/brcmfmac_sdio-firmware")
+      (synopsis "Firmware used in the LibreELEC Kodi distribution")
+      (description "Broadcom SDIO firmware used for LibreElec distribution.")
+      (license (nonfree "unknown")))))

nongnu/packages/video.scm

@@ -47,14 +47,6 @@
   (package
     (inherit ffmpeg)
     (name "ffmpeg-nvenc")
-    (version "6.1.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
-                                  version ".tar.xz"))
-              (sha256
-               (base32
-                "0f2fr8ywchhlkdff88lr4d4vscqzsi1ndjh3r5jwbkayf94lcqiv"))))
     (inputs
      (modify-inputs
          (package-inputs ffmpeg)