diff options
author | Leo Famulari <leo@famulari.name> | 2020-04-30 17:50:16 -0400 |
---|---|---|
committer | Leo Famulari <leo@famulari.name> | 2020-04-30 21:31:15 -0400 |
commit | 5af110868cf3460da705242370eeb652bd1c5646 (patch) | |
tree | 6c7520e01fbd76b0ee7efe3b13d80271425b7988 /gnu | |
parent | 65fd3f0ac367747086abb6997f1aa27957c9b65b (diff) | |
download | patches-5af110868cf3460da705242370eeb652bd1c5646.tar patches-5af110868cf3460da705242370eeb652bd1c5646.tar.gz |
gnu: VLC: Update to 3.0.10.
* gnu/packages/patches/vlc-fix-test_libvlc_slaves.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
* gnu/packages/video.scm (vlc): Update to 3.0.10.
[source]: Remove obsolete patch.
[arguments]: Remove obsolete workarounds for libssh and fribidi
compatibility issues in 'patch-source' phase.
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/local.mk | 1 | ||||
-rw-r--r-- | gnu/packages/patches/vlc-fix-test_libvlc_slaves.patch | 35 | ||||
-rw-r--r-- | gnu/packages/video.scm | 24 |
3 files changed, 2 insertions, 58 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 9426ee30a0..26d26ee215 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1519,7 +1519,6 @@ dist_patch_DATA = \ %D%/packages/patches/vinagre-newer-freerdp.patch \ %D%/packages/patches/vinagre-newer-rdp-parameters.patch \ %D%/packages/patches/virglrenderer-CVE-2017-6386.patch \ - %D%/packages/patches/vlc-fix-test_libvlc_slaves.patch \ %D%/packages/patches/vorbis-tools-CVE-2014-9638+CVE-2014-9639.patch \ %D%/packages/patches/vorbis-tools-CVE-2014-9640.patch \ %D%/packages/patches/vorbis-tools-CVE-2015-6749.patch \ diff --git a/gnu/packages/patches/vlc-fix-test_libvlc_slaves.patch b/gnu/packages/patches/vlc-fix-test_libvlc_slaves.patch deleted file mode 100644 index 9bc6d35f18..0000000000 --- a/gnu/packages/patches/vlc-fix-test_libvlc_slaves.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4186c94104ee528abd6860611b49515f3e6ec644 Mon Sep 17 00:00:00 2001 -From: Thomas Guillem <thomas@gllm.fr> -Date: Fri, 18 Oct 2019 10:34:07 +0200 -Subject: [PATCH] input/item: sort before attaching slaves - -The order of readdir() is completely filesystem dependent. - -Slaves should be attached using the same order across multiple OSses/access -modules. - -This fixes the test_libvlc_slaves on some system when the entry order from -readdir() is different. - -This patch need to be backported to VLC 3.0. ---- - src/input/item.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/input/item.c b/src/input/item.c -index e8db39ca28..fbd74cc95f 100644 ---- a/src/input/item.c -+++ b/src/input/item.c -@@ -1809,8 +1809,8 @@ void vlc_readdir_helper_finish(struct vlc_readdir_helper *p_rdh, bool b_success) - { - if (b_success) - { -- rdh_attach_slaves(p_rdh, p_rdh->p_node); - rdh_sort(p_rdh->p_node); -+ rdh_attach_slaves(p_rdh, p_rdh->p_node); - } - free(p_rdh->psz_ignored_exts); - --- -2.20.1 - diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e3d145a840..dbea0afcf6 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1191,7 +1191,7 @@ videoformats depend on the configuration flags of ffmpeg.") (define-public vlc (package (name "vlc") - (version "3.0.8") + (version "3.0.10") (source (origin (method url-fetch) (uri (string-append @@ -1200,13 +1200,7 @@ videoformats depend on the configuration flags of ffmpeg.") "/vlc-" version ".tar.xz")) (sha256 (base32 - "1xmxjpyzdhabchwncz6lvx3kzvl7fz9c42bkv3nbj68albs9w570")) - (patches - (search-patches - ;; TODO: The test "libvlc_slaves" fails. Applied upstream as - ;; <https://git.videolan.org/?p=vlc.git;a=commit;h=4186c94104ee528abd6860611b49515f3e6ec644>. - ;; Try removing it in 3.0.9. - "vlc-fix-test_libvlc_slaves.patch")))) + "0cackl1084hcmg4myf3kvjvd6sjxmzn0c0qkmanz6brvgzyanrm9")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) @@ -1311,20 +1305,6 @@ videoformats depend on the configuration flags of ffmpeg.") ;; which fails in our sandboxed build system (substitute* "test/run_vlc.sh" (("./vlc --ignore-config") "echo")) - - ;; modules/text_renderer/freetype/text_layout.c uses a - ;; now-deprecated interface 'fribidi_get_par_embedding_levels' - ;; from fribidi.h, so for now we enable the use of deprecated - ;; fribidi interfaces from this file. - ;; FIXME: Try removing this for vlc >= 3.0.3. - (substitute* "modules/text_renderer/freetype/text_layout.c" - (("# define FRIBIDI_NO_DEPRECATED 1") "")) - - ;; Fix build with libssh2 > 1.8.0: - ;; <https://trac.videolan.org/vlc/ticket/22060> - ;; <https://git.videolan.org/?p=vlc.git;a=commit;h=11449b5cd8b415768e010d9b7c1d6ba3cea21f82> - (substitute* "modules/access/sftp.c" - (("010801") "010900")) #t))) (add-after 'strip 'regenerate-plugin-cache (lambda* (#:key outputs #:allow-other-keys) |