diff options
| author | Ruslan Makhmatkhanov <rm@FreeBSD.org> | 2012-09-17 05:24:02 +0000 |
|---|---|---|
| committer | Ruslan Makhmatkhanov <rm@FreeBSD.org> | 2012-09-17 05:24:02 +0000 |
| commit | 7fdcb6654c6ac3bddb85e152fadba5e5826d4ce5 (patch) | |
| tree | b386d64dc5a1ab737ca444aedfb626e1a885f0a7 /graphics | |
| parent | - Fix build on PowerPC (diff) | |
- update openimageio to 1.0.9
- add conflicts with fbm
- convert DOCS to optionsng
- chase update in graphics/blender (the only consumer)
PR: 171665
Submitted by: Shane Ambler <FreeBSD at Shaneware dot biz> (maintainer)
- update py-openimageio to 1.0.9
PR: 171666
Submitted by: Shane Ambler <FreeBSD at Shaneware dot biz> (maintainer)
Notes
Notes:
svn path=/head/; revision=304386
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/blender/Makefile | 1 | ||||
| -rw-r--r-- | graphics/openimageio/Makefile | 15 | ||||
| -rw-r--r-- | graphics/openimageio/distinfo | 4 | ||||
| -rw-r--r-- | graphics/openimageio/pkg-plist | 2 | ||||
| -rw-r--r-- | graphics/py-openimageio/Makefile | 4 | ||||
| -rw-r--r-- | graphics/py-openimageio/distinfo | 4 |
6 files changed, 18 insertions, 12 deletions
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index d8a4ad0af303..60903ca2bf18 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -6,6 +6,7 @@ PORTNAME= blender PORTVERSION= 2.63a +PORTREVISION= 1 CATEGORIES= graphics games MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile index e0b677c594af..0447b2f01ce3 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openimageio -PORTVERSION= 1.0.6 +PORTVERSION= 1.0.9 CATEGORIES= graphics multimedia MASTER_SITES= https://github.com/OpenImageIO/oiio/tarball/ DISTNAME= Release-${PORTVERSION} @@ -26,6 +26,9 @@ LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \ tbb:${PORTSDIR}/devel/tbb \ webp:${PORTSDIR}/graphics/webp +# fbm also installs bin/idiff +CONFLICTS= fbm-[0-9]* + FETCH_ARGS= -pRr USE_CMAKE= yes CMAKE_VERBOSE= yes @@ -36,17 +39,19 @@ CMAKE_ARGS= -DBUILDSTATIC:BOOL=OFF \ -DUSE_TBB:BOOL=ON LDFLAGS+= -ltbb USE_LDCONFIG= yes -WRKSRC= ${WRKDIR}/OpenImageIO-oiio-f0a566a/src +WRKSRC= ${WRKDIR}/OpenImageIO-oiio-0d48631/src MAKE_JOBS_SAFE= yes -OPTIONS_DEFINE= IMAGEVIEWER THREADS +OPTIONS_DEFINE= DOCS IMAGEVIEWER THREADS OPTIONS_DEFAULT= DOCS IMAGEVIEWER THREADS IMAGEVIEWER_DESC= Build image viewer .include <bsd.port.options.mk> -.if empty(PORT_OPTIONS:MDOCS) +.if ${PORT_OPTIONS:MDOCS} +CMAKE_ARGS+= -DINSTALL_DOCS:BOOL=ON +.else CMAKE_ARGS+= -DINSTALL_DOCS:BOOL=OFF .endif @@ -61,7 +66,7 @@ CMAKE_ARGS+= -DUSE_OPENGL:BOOL=OFF -DUSE_QT:BOOL=OFF PLIST_SUB+= IMAGEVIEWER="@comment " .endif -.if empty(PORT_OPTIONS:MTHREADS) +.if ${PORT_OPTIONS:MTHREADS} CMAKE_ARGS+= -DNOTHREADS:BOOL=ON .else CMAKE_ARGS+= -DNOTHREADS:BOOL=OFF diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo index b04594f5f5c7..9f1d550a4c8a 100644 --- a/graphics/openimageio/distinfo +++ b/graphics/openimageio/distinfo @@ -1,2 +1,2 @@ -SHA256 (openimageio/Release-1.0.6) = b6ca648f13973b517135edbc9bc34367cdc54a8ca87f6b8014f363803825aa1e -SIZE (openimageio/Release-1.0.6) = 4196479 +SHA256 (openimageio/Release-1.0.9) = 59ebc09f3d3e5ac780adc4a3e0020d6986721f6be1c84dd01da7899a565b5204 +SIZE (openimageio/Release-1.0.9) = 4208590 diff --git a/graphics/openimageio/pkg-plist b/graphics/openimageio/pkg-plist index de3b056be333..6986445cd4b3 100644 --- a/graphics/openimageio/pkg-plist +++ b/graphics/openimageio/pkg-plist @@ -60,7 +60,7 @@ include/OpenImageIO/version.h lib/libOpenImageIO.so lib/libOpenImageIO.so.1 lib/libOpenImageIO.so.1.0 -lib/libOpenImageIO.so.1.0.6 +lib/libOpenImageIO.so.1.0.9 %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf diff --git a/graphics/py-openimageio/Makefile b/graphics/py-openimageio/Makefile index 92ed88e04b74..0a49af577147 100644 --- a/graphics/py-openimageio/Makefile +++ b/graphics/py-openimageio/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openimageio -PORTVERSION= 1.0.6 +PORTVERSION= 1.0.9 CATEGORIES= graphics multimedia python MASTER_SITES= https://github.com/OpenImageIO/oiio/tarball/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -36,7 +36,7 @@ LDFLAGS+= -ltbb MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes USE_PYTHON= 2.6+ -WRKSRC= ${WRKDIR}/OpenImageIO-oiio-f0a566a/src +WRKSRC= ${WRKDIR}/OpenImageIO-oiio-0d48631/src PLIST_FILES= %%PYTHON_SITELIBDIR%%/OpenImageIO.so diff --git a/graphics/py-openimageio/distinfo b/graphics/py-openimageio/distinfo index b04594f5f5c7..9f1d550a4c8a 100644 --- a/graphics/py-openimageio/distinfo +++ b/graphics/py-openimageio/distinfo @@ -1,2 +1,2 @@ -SHA256 (openimageio/Release-1.0.6) = b6ca648f13973b517135edbc9bc34367cdc54a8ca87f6b8014f363803825aa1e -SIZE (openimageio/Release-1.0.6) = 4196479 +SHA256 (openimageio/Release-1.0.9) = 59ebc09f3d3e5ac780adc4a3e0020d6986721f6be1c84dd01da7899a565b5204 +SIZE (openimageio/Release-1.0.9) = 4208590 |