From 18e56ad7eba42b23e338dfc77cd057bf8a076f19 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Fri, 3 Aug 2018 13:52:13 +0200 Subject: gnu: aegisub: Fix build. * gnu/packages/patches/aegisub-icu59-include-unistr.patch: New file. * gnu/lokal.mk (dist_patch_DATA): Register it. * gnu/packages/video.scm (aegisub)[source]: Use patch. [arguments]: Add CXXFLAGS, Return #t from fix-ldflags phase. Signed-off-by: Leo Famulari --- gnu/packages/video.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 2a1391c049..510122ab3b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2018 Brendan Tildesley ;;; Copyright © 2018 Arun Isaac +;;; Copyright © 2018 Björn Höfling ;;; ;;; This file is part of GNU Guix. ;;; @@ -2738,21 +2739,24 @@ programmers to access a standard API to open and decompress media files.") name "-" version ".tar.xz")) (sha256 (base32 - "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5")))) + "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5")) + (patches (search-patches "aegisub-icu59-include-unistr.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list "--disable-update-checker" "--without-portaudio" "--without-openal" - "--without-oss") + "--without-oss" + "CXXFLAGS=-DU_USING_ICU_NAMESPACE=1") ;; tests require busted, a lua package we don't have yet #:tests? #f #:phases (modify-phases %standard-phases (add-before 'configure 'fix-ldflags (lambda _ - (setenv "LDFLAGS" "-pthread")))))) + (setenv "LDFLAGS" "-pthread") + #t))))) (inputs `(("boost" ,boost) ("desktop-file-utils" ,desktop-file-utils) -- cgit 1.4.1 From fac39b99a5b02d21182ccd0e12e3bfc09ba34a8f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 11 Aug 2018 15:31:15 +0200 Subject: gnu: libx264: Update to 20180810-2245. * gnu/packages/video.scm (libx264): Update to 20180810-2245. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 510122ab3b..6c10348c1d 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -258,14 +258,14 @@ television and DVD. It is also known as AC-3.") (define-public libx264 (package (name "libx264") - (version "20180219-2245") + (version "20180810-2245") (source (origin (method url-fetch) (uri (string-append "https://download.videolan.org/pub/x264/snapshots/" "x264-snapshot-" version "-stable.tar.bz2")) (sha256 (base32 - "1x0cg8l30wp84mr7q0ddp06jclm0kjrszazrx87d4k7js3qxjy8m")))) + "0f25f39imas9pcqm7lnaa0shhjmf42hdx7jxzcnvxc7qsb7lh1bv")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit 1.4.1 From 5f9a9945b5747e5ec284f8b116b2e8cc1b9064d7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Aug 2018 17:05:13 +0200 Subject: gnu: vlc: Fix build with recent versions of libx264. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Reported by Clément Lassieur . * gnu/packages/video.scm (%vlc-libx264-compat.patch): New variable. (vlc)[source](patches): New field. --- gnu/packages/video.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 6c10348c1d..8cd08efc72 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -850,6 +850,17 @@ thumbnailer uses ffmpeg to decode frames from the video files, so supported videoformats depend on the configuration flags of ffmpeg.") (license license:gpl2+))) +;; Fix build with newer x264. +(define %vlc-libx264-compat.patch + (origin + (method url-fetch) + (uri (string-append "https://git.videolan.org/?p=vlc.git;a=patch;h=" + "a8953ba707cca1f2de372ca24513296bcfcdaaa8")) + (file-name "vlc-libx264-compat.patch") + (sha256 + (base32 + "04igckbdp3sbp8vh0ihmhcf3yjyyk9r3cd5dm9mn9j6vipi1dg3g")))) + (define-public vlc (package (name "vlc") @@ -860,6 +871,7 @@ videoformats depend on the configuration flags of ffmpeg.") "https://download.videolan.org/pub/videolan/vlc/" (car (string-split version #\-)) "/vlc-" version ".tar.xz")) + (patches (list %vlc-libx264-compat.patch)) (sha256 (base32 "1p7qvdvg9w4lz8vckzhn6bswfkq3qw7fqkgvwjcskdgc266xx7dw")))) -- cgit 1.4.1