me
/
guix
Archived
1
0
Fork 0
Code

gnu: x265: Update to 3.5. 

* gnu/packages/video.scm (x265): Update to 3.5.
[source]: Update to new upstream URI.
[arguments]: Adjust custom 'prepare-build phase due to changes in the
codebase. Remove trailing #t from phases and shorten find-files.
master
Efraim Flashner 2022-06-30 19:51:34 +03:00
parent 9829f53a3f
commit 857c9ce360
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gnu/packages/video.scm
View File

@ -1199,22 +1199,19 @@ on the Invidious instances only as a fallback method.")
(define-public x265 (define-public x265
(package (package
(name "x265") (name "x265")
(version "3.4") (version "3.5")
(outputs '("out" "static")) (outputs '("out" "static"))
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append "https://bitbucket.org/multicoreware/x265" (uri (string-append "https://bitbucket.org/multicoreware/x265_git"
"/downloads/x265_" version ".tar.gz") "/downloads/x265_" version ".tar.gz"))
(string-append "https://download.videolan.org/videolan/x265/"
"x265_" version ".tar.gz")))
(sha256 (sha256
(base32 "0wl62hfsdqpf3r3z3s6l9bz7pdb1rcik5ll00b3yaadplqipy162")) (base32 "1s6afxj61jdwfjnn70dwiql34fbqsvn6zv10785vmjyar8sk62p7"))
(patches (search-patches "x265-arm-flags.patch")) (patches (search-patches "x265-arm-flags.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet '(begin (snippet '(begin
(delete-file-recursively "source/compat/getopt") (delete-file-recursively "source/compat/getopt")))))
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
;; XXX: ASM optimization fails on i686-linux, see <https://bugs.gnu.org/41768>. ;; XXX: ASM optimization fails on i686-linux, see <https://bugs.gnu.org/41768>.
@ -1222,7 +1219,7 @@ on the Invidious instances only as a fallback method.")
'() '()
`(("nasm" ,nasm)))) `(("nasm" ,nasm))))
(arguments (arguments
`(#:tests? #f ; tests are skipped if cpu-optimized code isn't built `(#:tests? #f ; tests are skipped if ENABLE_ASSEMBLY is TRUE.
#:configure-flags #:configure-flags
;; Ensure position independent code for everyone. ;; Ensure position independent code for everyone.
(list "-DENABLE_PIC=TRUE" (list "-DENABLE_PIC=TRUE"
@ -1237,7 +1234,12 @@ on the Invidious instances only as a fallback method.")
(lambda _ (lambda _
(delete-file-recursively "build") (delete-file-recursively "build")
(chdir "source") (chdir "source")
#t)) ;; We're not building from a git or mercurial repository,
;; so help cmake find the version number.
(substitute* "cmake/Version.cmake"
(("if\\(X265_TAG_DISTANCE STREQUAL \"0\"\\)")
(string-append "if(TRUE)\n"
" set(X265_LATEST_TAG \"" ,version "\")\n")))))
(add-before 'configure 'build-12-bit (add-before 'configure 'build-12-bit
(lambda* (#:key (configure-flags '()) #:allow-other-keys) (lambda* (#:key (configure-flags '()) #:allow-other-keys)
(mkdir "../build-12bit") (mkdir "../build-12bit")
@ -1251,8 +1253,8 @@ on the Invidious instances only as a fallback method.")
configure-flags) configure-flags)
(substitute* (cons "cmake_install.cmake" (substitute* (cons "cmake_install.cmake"
(append (append
(find-files "CMakeFiles/x265-shared.dir" ".") (find-files "CMakeFiles/x265-shared.dir")
(find-files "CMakeFiles/x265-static.dir" "."))) (find-files "CMakeFiles/x265-static.dir")))
(("libx265") "libx265_main12")) (("libx265") "libx265_main12"))
(invoke "make")))) (invoke "make"))))
(add-before 'configure 'build-10-bit (add-before 'configure 'build-10-bit
@ -1267,8 +1269,8 @@ on the Invidious instances only as a fallback method.")
configure-flags) configure-flags)
(substitute* (cons "cmake_install.cmake" (substitute* (cons "cmake_install.cmake"
(append (append
(find-files "CMakeFiles/x265-shared.dir" ".") (find-files "CMakeFiles/x265-shared.dir")
(find-files "CMakeFiles/x265-static.dir" "."))) (find-files "CMakeFiles/x265-static.dir")))
(("libx265") "libx265_main10")) (("libx265") "libx265_main10"))
(invoke "make")))) (invoke "make"))))
(add-after 'install 'install-more-libs (add-after 'install 'install-more-libs
@ -1288,8 +1290,7 @@ on the Invidious instances only as a fallback method.")
(lambda (file) (lambda (file)
(rename-file file (rename-file file
(string-append static "/lib/" file))) (string-append static "/lib/" file)))
(find-files "." "\\.a$")))) (find-files "." "\\.a$")))))))))
#t)))))
(home-page "http://x265.org/") (home-page "http://x265.org/")
(synopsis "Library for encoding h.265/HEVC video streams") (synopsis "Library for encoding h.265/HEVC video streams")
(description "x265 is a H.265 / HEVC video encoder application library, (description "x265 is a H.265 / HEVC video encoder application library,