gnu: Rename openexr to openexr-2.
This is done so the OpenEXR package can be upgraded to version 3 in a later commit. * gnu/packages/graphics.scm (openexr): Rename to ... (openexr-2): ... new variable. (blender, blender-2.79, openimageio, povray)[inputs]: Adjust accordingly. (ctl)[propagated-inputs]: Likewise. * gnu/packages/animation.scm (synfig)[propagated-inputs]: Likewise. * gnu/packages/gimp.scm (gegl, gimp)[inputs]: Likewise. * gnu/packages/gstreamer.scm (gst-plugins-bad)[inputs]: Likewise. * gnu/packages/image-processing.scm (mia, opencolorio, opencv, vips, gmic, nip2)[inputs]: Likewise. * gnu/packages/image-viewers.scm (luminance-hdr)[inputs]: Likewise. * gnu/packages/image.scm (freeimage, vigra, devil)[inputs]: Likewise. * gnu/packages/kde-frameworks.scm (kimageformats)[inputs]: Likewise. * gnu/packages/kde.scm (krita)[inputs]: Likewise. * gnu/packages/photo.scm (enblend-enfuse, darktable, hugin)[inputs]: Likewise. Signed-off-by: Leo Famulari <leo@famulari.name>
This commit is contained in:
parent
ae3fa855f3
commit
d71336b2e3
10 changed files with 25 additions and 25 deletions
|
@ -179,7 +179,7 @@ (define-public synfig
|
|||
("libxml++" ,libxml++)
|
||||
("libsigc++" ,libsigc++)
|
||||
("mlt" ,mlt-6)
|
||||
("openexr" ,openexr)
|
||||
("openexr" ,openexr-2)
|
||||
("pango" ,pango)))
|
||||
(native-inputs
|
||||
`(("intltool" ,intltool)
|
||||
|
|
|
@ -265,7 +265,7 @@ (define-public gegl
|
|||
("libtiff" ,libtiff)
|
||||
("libwebp" ,libwebp)
|
||||
("maxflow" ,maxflow)
|
||||
("openexr" ,openexr)
|
||||
("openexr" ,openexr-2)
|
||||
("pango" ,pango)
|
||||
("poppler" ,poppler)
|
||||
("sdl2" ,sdl2)))
|
||||
|
@ -352,7 +352,7 @@ (define-public gimp
|
|||
("libmng" ,libmng) ; optional, MNG support
|
||||
("librsvg" ,librsvg) ; optional, SVG support
|
||||
("libxcursor" ,libxcursor) ; optional, Mouse Cursor support
|
||||
("openexr" ,openexr) ; optional, EXR support
|
||||
("openexr" ,openexr-2) ; optional, EXR support
|
||||
("openjpeg" ,openjpeg) ; optional, JPEG 2000 support
|
||||
("poppler" ,poppler) ; optional, PDF support
|
||||
("poppler-data" ,poppler-data) ; optional, PDF support
|
||||
|
|
|
@ -569,7 +569,7 @@ (define-public blender
|
|||
("libxrender" ,libxrender)
|
||||
("opencolorio" ,opencolorio)
|
||||
("openimageio" ,openimageio)
|
||||
("openexr" ,openexr)
|
||||
("openexr" ,openexr-2)
|
||||
("opensubdiv" ,opensubdiv)
|
||||
("ilmbase" ,ilmbase)
|
||||
("openjpeg" ,openjpeg)
|
||||
|
@ -669,7 +669,7 @@ (define-public blender-2.79
|
|||
("libx11" ,libx11)
|
||||
("opencolorio" ,opencolorio)
|
||||
("openimageio" ,openimageio)
|
||||
("openexr" ,openexr)
|
||||
("openexr" ,openexr-2)
|
||||
("ilmbase" ,ilmbase)
|
||||
("openjpeg" ,openjpeg)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
|
@ -1105,7 +1105,7 @@ (define-public ogre
|
|||
(home-page "https://www.ogre3d.org/")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public openexr
|
||||
(define-public openexr-2
|
||||
(package
|
||||
(name "openexr")
|
||||
(version (package-version ilmbase))
|
||||
|
@ -1189,7 +1189,7 @@ (define-public openimageio
|
|||
("libjpeg" ,libjpeg-turbo)
|
||||
("libtiff" ,libtiff)
|
||||
("giflib" ,giflib)
|
||||
("openexr" ,openexr)
|
||||
("openexr" ,openexr-2)
|
||||
("ilmbase" ,ilmbase)
|
||||
("pugixml" ,pugixml)
|
||||
("python" ,python-wrapper)
|
||||
|
@ -1392,7 +1392,7 @@ (define-public povray
|
|||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("libtiff" ,libtiff)
|
||||
("openexr" ,openexr)
|
||||
("openexr" ,openexr-2)
|
||||
("sdl" ,sdl)
|
||||
("zlib" ,zlib)))
|
||||
(arguments
|
||||
|
@ -1513,7 +1513,7 @@ (define-public ctl
|
|||
(arguments '(#:tests? #f)) ;no 'test' target
|
||||
|
||||
;; Headers include OpenEXR and IlmBase headers.
|
||||
(propagated-inputs `(("openexr" ,openexr)))
|
||||
(propagated-inputs `(("openexr" ,openexr-2)))
|
||||
|
||||
(home-page "http://ampasctl.sourceforge.net")
|
||||
(synopsis "Color Transformation Language")
|
||||
|
|
|
@ -768,7 +768,7 @@ (define-public gst-plugins-bad
|
|||
("mesa" ,mesa)
|
||||
("neon" ,neon)
|
||||
("openal" ,openal)
|
||||
("openexr" ,openexr)
|
||||
("openexr" ,openexr-2)
|
||||
("openjpeg" ,openjpeg)
|
||||
("openssl" ,openssl)
|
||||
("opus" ,opus)
|
||||
|
|
|
@ -162,7 +162,7 @@ (define-public mia
|
|||
("maxflow" ,maxflow)
|
||||
("niftilib" ,niftilib)
|
||||
("nlopt" ,nlopt)
|
||||
("openexr" ,openexr)
|
||||
("openexr" ,openexr-2)
|
||||
("python-lxml" ,python2-lxml)
|
||||
("vtk" ,vtk)))
|
||||
(native-inputs
|
||||
|
@ -232,7 +232,7 @@ (define-public opencolorio
|
|||
;; ocioconvert fails: error: conflicting declaration ?typedef void
|
||||
;; (* PFNGLGETFRAGMENTMATERIALFVSGIXPROC)(GLenum, GLenum, GLfloat*)
|
||||
`(("lcms" ,lcms)
|
||||
("openexr" ,openexr)
|
||||
("openexr" ,openexr-2)
|
||||
("tinyxml" ,tinyxml)))
|
||||
(home-page "https://opencolorio.org")
|
||||
(synopsis "Color management for visual effects and animation")
|
||||
|
@ -637,7 +637,7 @@ (define-public opencv
|
|||
("libwebp" ,libwebp)
|
||||
("zlib" ,zlib)
|
||||
("gtkglext" ,gtkglext)
|
||||
("openexr" ,openexr)
|
||||
("openexr" ,openexr-2)
|
||||
("ilmbase" ,ilmbase)
|
||||
("gtk+" ,gtk+-2)
|
||||
("python-numpy" ,python-numpy)
|
||||
|
@ -703,7 +703,7 @@ (define-public vips
|
|||
("libwebp" ,libwebp)
|
||||
("matio" ,matio)
|
||||
("niftilib" ,niftilib)
|
||||
("openexr" ,openexr)
|
||||
("openexr" ,openexr-2)
|
||||
("orc" ,orc)
|
||||
("pango" ,pango)
|
||||
("poppler" ,poppler)))
|
||||
|
@ -755,7 +755,7 @@ (define-public gmic
|
|||
("libtiff" ,libtiff)
|
||||
("libx11" ,libx11)
|
||||
;;("opencv" ,opencv) ;OpenCV is currently broken in the CI
|
||||
("openexr" ,openexr)
|
||||
("openexr" ,openexr-2)
|
||||
("zlib" ,zlib)))
|
||||
(home-page "https://gmic.eu/")
|
||||
(synopsis "Full-featured framework for digital image processing")
|
||||
|
@ -861,7 +861,7 @@ (define-public nip2
|
|||
("matio" ,matio)
|
||||
("lcms" ,lcms)
|
||||
("libwebp" ,libwebp)
|
||||
("openexr" ,openexr)
|
||||
("openexr" ,openexr-2)
|
||||
("poppler" ,poppler)
|
||||
("gsl" ,gsl)))
|
||||
(native-inputs
|
||||
|
|
|
@ -544,7 +544,7 @@ (define-public luminance-hdr
|
|||
("libpng" ,libpng)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("lcms" ,lcms)
|
||||
("openexr" ,openexr)
|
||||
("openexr" ,openexr-2)
|
||||
("fftw" ,fftwf)
|
||||
("gsl" ,gsl)
|
||||
("libtiff" ,libtiff)))
|
||||
|
|
|
@ -1158,7 +1158,7 @@ (define-public freeimage
|
|||
("libraw" ,libraw)
|
||||
("libtiff" ,libtiff)
|
||||
("libwebp" ,libwebp)
|
||||
("openexr" ,openexr)
|
||||
("openexr" ,openexr-2)
|
||||
("openjpeg" ,openjpeg)
|
||||
("zlib" ,zlib)))
|
||||
(synopsis "Library for handling popular graphics image formats")
|
||||
|
@ -1192,7 +1192,7 @@ (define-public vigra
|
|||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("libtiff" ,libtiff)
|
||||
("openexr" ,openexr)
|
||||
("openexr" ,openexr-2)
|
||||
("python" ,python-wrapper)
|
||||
("python-numpy" ,python-numpy)
|
||||
("zlib" ,zlib)))
|
||||
|
@ -1412,7 +1412,7 @@ (define-public devil
|
|||
("libmng" ,libmng)
|
||||
("libpng" ,libpng)
|
||||
("libtiff" ,libtiff)
|
||||
("openexr" ,openexr)
|
||||
("openexr" ,openexr-2)
|
||||
("zlib" ,zlib)))
|
||||
(synopsis "Library for manipulating many image formats")
|
||||
(description "Developer's Image Library (DevIL) is a library to develop
|
||||
|
|
|
@ -1816,7 +1816,7 @@ (define-public kimageformats
|
|||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("karchive" ,karchive) ; for Krita and OpenRaster images
|
||||
("openexr" ,openexr) ; for OpenEXR high dynamic-range images
|
||||
("openexr" ,openexr-2) ; for OpenEXR high dynamic-range images
|
||||
("qtbase" ,qtbase-5)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
|
@ -522,7 +522,7 @@ (define-public krita
|
|||
("libx11" ,libx11)
|
||||
("libxcb" ,libxcb)
|
||||
("libxi" ,libxi)
|
||||
("openexr" ,openexr)
|
||||
("openexr" ,openexr-2)
|
||||
("perl" ,perl)
|
||||
("poppler-qt5" ,poppler-qt5)
|
||||
("qtbase" ,qtbase-5)
|
||||
|
|
|
@ -413,7 +413,7 @@ (define-public enblend-enfuse
|
|||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("libtiff" ,libtiff)
|
||||
("openexr" ,openexr)
|
||||
("openexr" ,openexr-2)
|
||||
("vigra" ,vigra)
|
||||
("zlib" ,zlib)))
|
||||
(arguments
|
||||
|
@ -568,7 +568,7 @@ (define-public darktable
|
|||
("libxslt" ,libxslt)
|
||||
("lua" ,lua) ;optional, for plugins
|
||||
("opencl-icd-loader" ,opencl-icd-loader) ;optional, for OpenCL support
|
||||
("openexr" ,openexr) ;optional, for EXR import/export
|
||||
("openexr" ,openexr-2) ;optional, for EXR import/export
|
||||
("openjpeg" ,openjpeg) ;optional, for JPEG2000 export
|
||||
("osm-gps-map" ,osm-gps-map) ;optional, for geotagging view
|
||||
("pugixml" ,pugixml)
|
||||
|
@ -726,7 +726,7 @@ (define-public hugin
|
|||
("libxi" ,libxi)
|
||||
("libxmu" ,libxmu)
|
||||
("mesa" ,mesa)
|
||||
("openexr" ,openexr)
|
||||
("openexr" ,openexr-2)
|
||||
("sqlite" ,sqlite)
|
||||
("vigra" ,vigra)
|
||||
("wxwidgets" ,wxwidgets)
|
||||
|
|
Loading…
Reference in a new issue