me
/
guix
Archived
1
0
Fork 0
Code

gnu: x265: Honor make-flags. 

* gnu/packages/video.scm (x265)[arguments]: Adjust custom 'build-12-bit,
'build-10-bit and 'install-more-libs phases to use standard 'make and
'install phases.
master
Efraim Flashner 2022-06-30 20:02:55 +03:00
parent 857c9ce360
commit 6f2bdd4e6b
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/video.scm
View File

@ -1241,7 +1241,7 @@ on the Invidious instances only as a fallback method.")
(string-append "if(TRUE)\n" (string-append "if(TRUE)\n"
" set(X265_LATEST_TAG \"" ,version "\")\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 #:rest args)
(mkdir "../build-12bit") (mkdir "../build-12bit")
(with-directory-excursion "../build-12bit" (with-directory-excursion "../build-12bit"
(apply invoke (apply invoke
@ -1256,9 +1256,9 @@ on the Invidious instances only as a fallback method.")
(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")))) ((assoc-ref %standard-phases 'build)))))
(add-before 'configure 'build-10-bit (add-before 'configure 'build-10-bit
(lambda* (#:key (configure-flags '()) #:allow-other-keys) (lambda* (#:key (configure-flags '()) #:allow-other-keys #:rest args)
(mkdir "../build-10bit") (mkdir "../build-10bit")
(with-directory-excursion "../build-10bit" (with-directory-excursion "../build-10bit"
(apply invoke (apply invoke
@ -1272,13 +1272,13 @@ on the Invidious instances only as a fallback method.")
(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")))) ((assoc-ref %standard-phases 'build)))))
(add-after 'install 'install-more-libs (add-after 'install 'install-more-libs
(lambda _ (lambda args
(with-directory-excursion "../build-12bit" (with-directory-excursion "../build-12bit"
(invoke "make" "install")) ((assoc-ref %standard-phases 'install)))
(with-directory-excursion "../build-10bit" (with-directory-excursion "../build-10bit"
(invoke "make" "install")))) ((assoc-ref %standard-phases 'install)))))
(add-before 'strip 'move-static-libs (add-before 'strip 'move-static-libs
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))