mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gnu: avidemux: Clean up inputs.
* gnu/packages/video.scm (avidemux)[inputs]: Remove sdl. Move perl, python-wrapper, qttools, yasm ... [native-inputs]: ... to here. [arguments]: Remove references to sdl.
This commit is contained in:
parent
3c526173dd
commit
4632e7c787
1 changed files with 5 additions and 9 deletions
|
@ -1943,7 +1943,11 @@ (define-public avidemux
|
|||
(patches (search-patches "avidemux-install-to-lib.patch"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
`(("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python" ,python-wrapper)
|
||||
("qttools" ,qttools)
|
||||
("yasm" ,yasm)))
|
||||
;; FIXME: Once packaged, add libraries not found during the build.
|
||||
(inputs
|
||||
`(("alsa-lib" ,alsa-lib)
|
||||
|
@ -1958,14 +1962,9 @@ (define-public avidemux
|
|||
("libvorbis" ,libvorbis)
|
||||
("libvpx" ,libvpx)
|
||||
("libxv" ,libxv)
|
||||
("perl" ,perl)
|
||||
("pulseaudio" ,pulseaudio)
|
||||
("python" ,python-wrapper)
|
||||
("qtbase" ,qtbase)
|
||||
("qttools" ,qttools)
|
||||
("sdl" ,sdl)
|
||||
("sqlite" ,sqlite)
|
||||
("yasm" ,yasm)
|
||||
("zlib" ,zlib)))
|
||||
(arguments
|
||||
`(#:tests? #f ; no check target
|
||||
|
@ -2002,7 +2001,6 @@ (define-public avidemux
|
|||
(let* ((out (assoc-ref outputs "out"))
|
||||
(lib (string-append out "/lib"))
|
||||
(top (getcwd))
|
||||
(sdl (assoc-ref inputs "sdl"))
|
||||
(build_component
|
||||
(lambda* (component srcdir #:optional (args '()))
|
||||
(let ((builddir (string-append "build_" component)))
|
||||
|
@ -2015,8 +2013,6 @@ (define-public avidemux
|
|||
(string-append "-DCMAKE_SHARED_LINKER_FLAGS="
|
||||
"\"-Wl,-rpath=" lib "\"")
|
||||
(string-append "-DAVIDEMUX_SOURCE_DIR=" top)
|
||||
(string-append "-DSDL_INCLUDE_DIR="
|
||||
sdl "/include/SDL")
|
||||
(string-append "../" srcdir)
|
||||
"-DENABLE_QT5=True"
|
||||
args)
|
||||
|
|
Loading…
Reference in a new issue