svn commit: r349312 - in head/graphics/ilmbase: . files

Rusmir Dusko nemysis at FreeBSD.org
Thu Mar 27 01:04:00 UTC 2014 

Author: nemysis
Date: Thu Mar 27 01:03:59 2014
New Revision: 349312
URL: http://svnweb.freebsd.org/changeset/ports/349312
QAT: https://qat.redports.org/buildarchive/r349312/

Log:
  - Switch to USES=cmake
  - Use patch instead of USES pathfix
  - Remove THREAD Option
  - Remove obsolete REINPLACE and .la files, needed that works
    graphics/nvidia-texture-tools ports/172108, remove from pkg-plist  [1]
  - Symlink libraries [1]
  - Add patches files/patch-CMakeLists.txt and
    files/patch-IlmThread__CMakeLists.txt for proper Cmake usage [1]
  - Remove obsolete patch files/patch-configure
  - All dependent ports builds fine, only graphics/hugin-devel have self
    problem with build
  
  Reviewed by:	amdmi3@ [1]

Added:
  head/graphics/ilmbase/files/patch-CMakeLists.txt   (contents, props changed)
  head/graphics/ilmbase/files/patch-IlmThread__CMakeLists.txt   (contents, props changed)
Deleted:
  head/graphics/ilmbase/files/patch-configure
Modified:
  head/graphics/ilmbase/Makefile
  head/graphics/ilmbase/pkg-plist

Modified: head/graphics/ilmbase/Makefile
==============================================================================
--- head/graphics/ilmbase/Makefile	Thu Mar 27 00:58:45 2014	(r349311)
+++ head/graphics/ilmbase/Makefile	Thu Mar 27 01:03:59 2014	(r349312)
@@ -12,51 +12,36 @@ COMMENT=	ILM Base libraries a.k.a. Half,
 
 LICENSE=	BSD3CLAUSE
 
-USES=		pathfix pkgconfig
-GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool
+USES=		cmake pkgconfig
 USE_LDCONFIG=	yes
 
 PORTDOCS=	AUTHORS ChangeLog README
-
-BIN=	eLut toFloat
-
-OPTIONS_DEFINE=		DOCS THREAD
-OPTIONS_DEFAULT=	THREAD
-THREAD_DESC=		Enable multithreaded file I/O support
+OPTIONS_DEFINE=		DOCS
 
 OPTIONS_SUB=	yes
 
 THREAD_CONFIGURE_ENABLE=	threading
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MTHREAD}
-CONFIGURE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
-.endif
-
 MAJORVER=	2_1
 VER=	11
 
 PLIST_SUB=	MAJORVER=${MAJORVER}
 PLIST_SUB+=	VER=${VER}
 
+HALF_BIN=	eLut toFloat
+
 regression-test regression test check:	build
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|Iex/libIex.la|Iex/libIex.la $(PTHREAD_LIBS)|' \
-		${WRKSRC}/IlmThread/Makefile.am
-	@${REINPLACE_CMD} -e 's|== x|= x|g' ${WRKSRC}/configure
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libHalf.so.${VER}
+	${RM} -f ${STAGEDIR}${PREFIX}/lib/*.la
 .for l in libIex libIexMath libImath libIlmThread
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${l}-${MAJORVER}.so.${VER}
+	${LN} -s ${l}-${MAJORVER}.so.${VER} ${STAGEDIR}${PREFIX}/lib/${l}.so
 .endfor
 
-.for e in ${BIN}
+.for e in ${HALF_BIN}
 	${INSTALL_PROGRAM} ${WRKSRC}/Half/${e} ${STAGEDIR}${PREFIX}/bin/${e}
 .endfor
 

Added: head/graphics/ilmbase/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/ilmbase/files/patch-CMakeLists.txt	Thu Mar 27 01:03:59 2014	(r349312)
@@ -0,0 +1,53 @@
+--- CMakeLists.txt.orig	2013-11-12 03:09:51.000000000 +0400
++++ CMakeLists.txt	2014-03-27 00:26:23.467722879 +0400
+@@ -130,30 +130,30 @@
+ 
+ SET_TARGET_PROPERTIES ( Half
+   PROPERTIES
+-  VERSION 11.0.0
++  VERSION 11
+   SOVERSION 11
+   )
+ SET_TARGET_PROPERTIES ( Iex
+   PROPERTIES
+-  VERSION 11.0.0
++  VERSION 11
+   SOVERSION 11
+   OUTPUT_NAME "Iex-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}"
+   )
+ SET_TARGET_PROPERTIES ( Imath
+   PROPERTIES
+-  VERSION 11.0.0
++  VERSION 11
+   SOVERSION 11
+   OUTPUT_NAME "Imath-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}"
+   )
+ SET_TARGET_PROPERTIES ( IlmThread
+   PROPERTIES
+-  VERSION 11.0.0
++  VERSION 11
+   SOVERSION 11
+   OUTPUT_NAME "IlmThread-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}"
+   )
+ SET_TARGET_PROPERTIES ( IexMath
+   PROPERTIES
+-  VERSION 11.0.0
++  VERSION 11
+   SOVERSION 11
+   OUTPUT_NAME "IexMath-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}"
+   )
+@@ -190,11 +190,12 @@
+ Name: IlmBase
+ Description: Base math and exception libraries
+ Version: ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}
+-Libs: -L\${libdir} -lImath-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR} -lIexMath-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR} -lHalf -lIex-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR} -lIlmThread-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR} -pthreadCflags: -pthread -I\${OpenEXR_includedir}
++Libs: -L\${libdir} -lImath-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR} -lIexMath-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR} -lHalf -lIex-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR} -lIlmThread-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR} -pthread
++Cflags: -pthread -I\${OpenEXR_includedir}
+ ")
+ 
+ INSTALL ( FILES
+   ${CMAKE_BINARY_DIR}/IlmBase.pc
+   DESTINATION
+-  lib/pkgconfig
++  libdata/pkgconfig
+ )

Added: head/graphics/ilmbase/files/patch-IlmThread__CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/ilmbase/files/patch-IlmThread__CMakeLists.txt	Thu Mar 27 01:03:59 2014	(r349312)
@@ -0,0 +1,19 @@
+--- IlmThread/CMakeLists.txt.orig	2013-11-12 01:10:49.000000000 +0400
++++ IlmThread/CMakeLists.txt	2014-03-27 00:38:30.616700075 +0400
+@@ -18,6 +18,7 @@
+ 	)
+ ENDIF()
+ 
++FIND_PACKAGE(Threads)
+ 
+ IF(BUILD_SHARED_LIBS)
+   ADD_DEFINITIONS(-DILMTHREAD_EXPORTS)
+@@ -26,7 +27,7 @@
+ ADD_LIBRARY ( IlmThread ${LIB_TYPE}
+   ${ILMTHREAD_LIBRARY_SOURCES}
+   )
+-TARGET_LINK_LIBRARIES(IlmThread Iex)
++TARGET_LINK_LIBRARIES(IlmThread Iex ${CMAKE_THREAD_LIBS_INIT})
+ 
+ INSTALL ( TARGETS
+   IlmThread

Modified: head/graphics/ilmbase/pkg-plist
==============================================================================
--- head/graphics/ilmbase/pkg-plist	Thu Mar 27 00:58:45 2014	(r349311)
+++ head/graphics/ilmbase/pkg-plist	Thu Mar 27 01:03:59 2014	(r349312)
@@ -57,29 +57,19 @@ include/OpenEXR/half.h
 include/OpenEXR/halfExport.h
 include/OpenEXR/halfFunction.h
 include/OpenEXR/halfLimits.h
-lib/libHalf.a
-lib/libHalf.la
 lib/libHalf.so
 lib/libHalf.so.%%VER%%
 lib/libIex-%%MAJORVER%%.so
 lib/libIex-%%MAJORVER%%.so.%%VER%%
-lib/libIex.a
-lib/libIex.la
 lib/libIex.so
 lib/libIexMath-%%MAJORVER%%.so
 lib/libIexMath-%%MAJORVER%%.so.%%VER%%
-lib/libIexMath.a
-lib/libIexMath.la
 lib/libIexMath.so
 lib/libIlmThread-%%MAJORVER%%.so
 lib/libIlmThread-%%MAJORVER%%.so.%%VER%%
-lib/libIlmThread.a
-lib/libIlmThread.la
 lib/libIlmThread.so
 lib/libImath-%%MAJORVER%%.so
 lib/libImath-%%MAJORVER%%.so.%%VER%%
-lib/libImath.a
-lib/libImath.la
 lib/libImath.so
 libdata/pkgconfig/IlmBase.pc
 @dirrmtry include/OpenEXR

More information about the svn-ports-head mailing list