mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
Compare commits
2 commits
aa432fe1f6
...
641dbfdbd4
Author | SHA1 | Date | |
---|---|---|---|
|
641dbfdbd4 | ||
|
630bb7e2bb |
4 changed files with 47 additions and 3 deletions
|
@ -1871,6 +1871,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/mpc123-initialize-ao.patch \
|
||||
%D%/packages/patches/mpg321-CVE-2019-14247.patch \
|
||||
%D%/packages/patches/mpg321-gcc-10.patch \
|
||||
%D%/packages/patches/mpv-0.40.0-fix-ffmpeg-8.0.patch \
|
||||
%D%/packages/patches/modglue-fix-build.patch \
|
||||
%D%/packages/patches/modem-manager-fix-test-wrapper.patch \
|
||||
%D%/packages/patches/module-init-tools-moduledir.patch \
|
||||
|
|
|
@ -38082,14 +38082,14 @@ offers access to an XPath \"interpreter\".")
|
|||
(define-public r-xml2
|
||||
(package
|
||||
(name "r-xml2")
|
||||
(version "1.3.8")
|
||||
(version "1.4.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "xml2" version))
|
||||
(sha256
|
||||
(base32
|
||||
"01qhmlr5rhsn25ddb8cm3vl9vyqk5c5cgpc6c0krs9wccd1j4pbj"))))
|
||||
"0qnw4id8bknm3anvd9dlpg344s18dnxzm8lhbyqkcpgqfya84bhc"))))
|
||||
(properties
|
||||
;; Avoid dependency cycle.
|
||||
'((updater-ignored-native-inputs . ("r-httr"))))
|
||||
|
|
40
gnu/packages/patches/mpv-0.40.0-fix-ffmpeg-8.0.patch
Normal file
40
gnu/packages/patches/mpv-0.40.0-fix-ffmpeg-8.0.patch
Normal file
|
@ -0,0 +1,40 @@
|
|||
Patch obtained from https://github.com/mpv-player/mpv/commit/26b29fba02a2782f68e2906f837d21201fc6f1b9
|
||||
See https://github.com/mpv-player/mpv/issues/16176 for discussion. Next version
|
||||
of mpv will have this fixed, but upstream is not planning to release a patch
|
||||
release.
|
||||
|
||||
From 26b29fba02a2782f68e2906f837d21201fc6f1b9 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <kasper93@gmail.com>
|
||||
Date: Fri, 28 Mar 2025 19:12:01 +0100
|
||||
Subject: [PATCH] demux_mkv: fix compilation after deprecated definitions
|
||||
removal
|
||||
|
||||
See: https://github.com/FFmpeg/FFmpeg/commit/822432769868da325ba03774df1084aa78b9a5a0
|
||||
---
|
||||
demux/demux_mkv.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
|
||||
index 135edcc23d82b..cc7ce3e98f4f6 100644
|
||||
--- a/demux/demux_mkv.c
|
||||
+++ b/demux/demux_mkv.c
|
||||
@@ -2200,16 +2200,16 @@ static int demux_mkv_open_sub(demuxer_t *demuxer, mkv_track_t *track)
|
||||
// [0x30..0x37] are component tags utilized for
|
||||
// non-mobile captioning service ("profile A").
|
||||
if (component_tag >= 0x30 && component_tag <= 0x37)
|
||||
- lav->profile = FF_PROFILE_ARIB_PROFILE_A;
|
||||
+ lav->profile = AV_PROFILE_ARIB_PROFILE_A;
|
||||
break;
|
||||
case 0x0012:
|
||||
// component tag 0x87 signifies a mobile/partial reception
|
||||
// (1seg) captioning service ("profile C").
|
||||
if (component_tag == 0x87)
|
||||
- lav->profile = FF_PROFILE_ARIB_PROFILE_C;
|
||||
+ lav->profile = AV_PROFILE_ARIB_PROFILE_C;
|
||||
break;
|
||||
}
|
||||
- if (lav->profile == FF_PROFILE_UNKNOWN)
|
||||
+ if (lav->profile == AV_PROFILE_UNKNOWN)
|
||||
MP_WARN(demuxer, "ARIB caption profile %02x / %04x not supported.\n",
|
||||
component_tag, data_component_id);
|
||||
}
|
|
@ -2700,7 +2700,10 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0w0qk61ll0mddbkiwavqfx048sacyvp6fwglms58ypw869rh7iy7"))))
|
||||
(base32 "0w0qk61ll0mddbkiwavqfx048sacyvp6fwglms58ypw869rh7iy7"))
|
||||
(patches
|
||||
(search-patches
|
||||
"mpv-0.40.0-fix-ffmpeg-8.0.patch"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue