diff options
| author | wg <wg@FreeBSD.org> | 2013-08-21 20:54:47 +0800 |
|---|---|---|
| committer | wg <wg@FreeBSD.org> | 2013-08-21 20:54:47 +0800 |
| commit | b625dd4ab94c9cb63325a2063f61b8da47d850c2 (patch) | |
| tree | 1fda30fdfe1020162895044d4e1ad4cf920f1bd3 | |
| parent | ffb4a70a55bb50ab13c1de5f57528a58e8138723 (diff) | |
| download | freebsd-ports-gnome-b625dd4ab94c9cb63325a2063f61b8da47d850c2.tar.gz freebsd-ports-gnome-b625dd4ab94c9cb63325a2063f61b8da47d850c2.tar.zst freebsd-ports-gnome-b625dd4ab94c9cb63325a2063f61b8da47d850c2.zip | |
graphics/py-openimageio: fix build
- Fix build, missed in openimageio update
PR: ports/181008
Submitted by: Shane Ambler <FreeBSD Shaneware.biz> (maintainer)
| -rw-r--r-- | graphics/openimageio/Makefile | 3 | ||||
| -rw-r--r-- | graphics/openimageio/files/extra-patch-CMakeLists.txt | 49 | ||||
| -rw-r--r-- | graphics/py-openimageio/Makefile | 5 |
3 files changed, 2 insertions, 55 deletions
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile index f87a6f36abed..53591a02fad3 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -38,12 +38,13 @@ CMAKE_ARGS?= -DBUILDSTATIC:BOOL=OFF \ USE_LDCONFIG= yes .if defined(OIIO_PYBIND) -EXTRA_PATCHES= ${FILESDIR}/extra-patch-CMakeLists.txt PLIST= ${PKGDIR}/pkg-plist-pybind CMAKE_ARGS+= -DUSE_PYTHON:BOOL=ON +CMAKE_ARGS+= -DOIIO_BUILD_TOOLS:BOOL=OFF .else PLIST= ${PKGDIR}/pkg-plist CMAKE_ARGS+= -DUSE_PYTHON:BOOL=OFF +CMAKE_ARGS+= -DOIIO_BUILD_TOOLS:BOOL=ON .endif .if !defined(OIIO_PYBIND) diff --git a/graphics/openimageio/files/extra-patch-CMakeLists.txt b/graphics/openimageio/files/extra-patch-CMakeLists.txt deleted file mode 100644 index e7750e90478c..000000000000 --- a/graphics/openimageio/files/extra-patch-CMakeLists.txt +++ /dev/null @@ -1,49 +0,0 @@ ---- ./CMakeLists.txt.orig 2012-11-11 18:38:49.980294043 +1030 -+++ ./CMakeLists.txt 2012-11-11 18:39:47.515297055 +1030 -@@ -234,46 +234,6 @@ - # their add_test commands will not register. - include (CTest) - -- --# Tell CMake to process the sub-directories --add_subdirectory (libOpenImageIO) -- --add_subdirectory (iconvert) --add_subdirectory (idiff) --add_subdirectory (igrep) --add_subdirectory (iinfo) --add_subdirectory (maketx) --add_subdirectory (oiiotool) --add_subdirectory (testtex) --add_subdirectory (iv) --# Add IO plugin directories --if (NOT EMBEDPLUGINS) -- add_subdirectory (bmp.imageio) -- add_subdirectory (cineon.imageio) -- add_subdirectory (dds.imageio) -- add_subdirectory (dpx.imageio) -- add_subdirectory (field3d.imageio) -- add_subdirectory (fits.imageio) -- add_subdirectory (hdr.imageio) -- add_subdirectory (ico.imageio) -- add_subdirectory (iff.imageio) -- add_subdirectory (jpeg.imageio) -- add_subdirectory (jpeg2000.imageio) -- add_subdirectory (openexr.imageio) -- add_subdirectory (png.imageio) -- add_subdirectory (pnm.imageio) -- add_subdirectory (psd.imageio) -- add_subdirectory (ptex.imageio) -- add_subdirectory (rla.imageio) -- add_subdirectory (sgi.imageio) -- add_subdirectory (socket.imageio) -- add_subdirectory (softimage.imageio) -- add_subdirectory (targa.imageio) -- add_subdirectory (tiff.imageio) -- add_subdirectory (webp.imageio) -- add_subdirectory (zfile.imageio) --endif () -- - if (USE_PYTHON AND oiio_boost_PYTHON_FOUND) - add_subdirectory (python) - endif () diff --git a/graphics/py-openimageio/Makefile b/graphics/py-openimageio/Makefile index d85a899f7623..690b3ec82e45 100644 --- a/graphics/py-openimageio/Makefile +++ b/graphics/py-openimageio/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= openimageio -PORTREVISION= 1 CATEGORIES= graphics multimedia python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,14 +14,10 @@ LIB_DEPENDS= OpenImageIO:${PORTSDIR}/graphics/openimageio \ MASTERDIR= ${.CURDIR}/../openimageio -BROKEN= Does not patch - USE_PYTHON= 2.6+ OIIO_PYBIND= yes -EXTRA_PATCHES= ${FILESDIR}/extra-patch-CMakeLists.txt - do-install: ${INSTALL_LIB} ${BUILD_WRKSRC}/python/OpenImageIO.so ${PYTHON_SITELIBDIR}/ |