Bug 172337 - [PATCH] graphics/ilmbase: update to 1.0.3, take maintainership
Summary: [PATCH] graphics/ilmbase: update to 1.0.3, take maintainership
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Steve Wills
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-10-04 23:20 UTC by nemysis
Modified: 2013-01-17 03:33 UTC (History)
0 users

See Also:


Attachments
ilmbase-1.0.3.patch (9.94 KB, patch)
2012-10-04 23:20 UTC, nemysis
no flags Details | Diff
ilmbase.shar (10.48 KB, application/x-shar)
2012-10-06 15:39 UTC, nemysis
no flags Details
ilmbase.diff (607 bytes, patch)
2012-10-06 16:03 UTC, nemysis
no flags Details | Diff
ilmbase.diff (10.00 KB, patch)
2012-10-16 13:15 UTC, nemysis
no flags Details | Diff
ilmbase.shar (10.47 KB, application/x-shar)
2012-10-17 02:03 UTC, nemysis
no flags Details
ilmbase.diff (10.02 KB, patch)
2012-11-01 14:03 UTC, nemysis
no flags Details | Diff
ilmbase.shar (10.48 KB, application/x-shar)
2012-11-01 14:03 UTC, nemysis
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description nemysis 2012-10-04 23:20:08 UTC
- Update to 1.0.3
- Take maintainership

Added file(s):
- files/patch-IexMath-IexMathFpu.cpp # don't work without this
- files/patch-Makefile.in

Removed file(s):
- files/patch-ImathTest-testLineAlgo.cpp # is not more needed
- files/patch-Makefile # wrong Name

- Changed MASTER_SITES

+MASTER_SITES=	https://github.com/downloads/openexr/openexr/


- Removed CONFLICTS

-CONFLICTS=	OpenEXR-1.[0-4].*


- Added LICENSE

+LICENSE=	BSD


- Added PORTDOCS

+PORTDOCS=	AUTHORS ChangeLog README


- Added OptionsNG

+.include <bsd.port.options.mk>

+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif


- Rework
 pkg-descr and pkg-plist

Generated and tested manually, tested with port test and with RedPorts (all RELEASES, CLANG), sent with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)

How-To-Repeat: 
portlint -A
WARN: Makefile: [30]: possible direct use of command "file" found. use ${FILE} instead.
WARN: Makefile: for new port, make $FreeBSD$ tag in comment section empty, to make SVN happy.
WARN: Makefile: only one MASTER_SITE configured.  Consider adding additional mirrors.
0 fatal errors and 3 warnings found.

WARN: Makefile: [30] because is used

Enable multithreaded file I/O support


port test: clean


Build log RedPorts

https://redports.org/buildarchive/20121004141223-26670/
Comment 1 nemysis 2012-10-06 15:39:03 UTC
Changed to

USE_PKGCONFIG=  build
Comment 2 nemysis 2012-10-06 16:03:59 UTC
Change to

+MASTER_SITES=  http://cloud.github.com/downloads/openexr/openexr/

+USE_GITHUB=  yes
Comment 3 Steve Wills freebsd_committer freebsd_triage 2012-10-07 17:50:08 UTC
Responsible Changed
From-To: freebsd-ports-bugs->swills

I'll take it.
Comment 4 nemysis 2012-10-17 02:03:41 UTC
I send this shar, because port diff not works good. Sorry.
Comment 5 nemysis 2012-11-01 14:03:32 UTC
All what i do to make a proper patch for Ilmbase not works, i think the
problem is in /usr/ports/graphics/ilmbase Port self, not in mine PR or diff.
Use please only shar.

Have changed to store all downloads in

DIST_SUBDIR=    OpenEXR


/usr/ports/graphics/ilmbase> " ls
Makefile     distinfo     files        ilmbase.diff pkg-descr    pkg-plist
root@nemysis3now /usr/ports/graphics/ilmbase> " patch -p4 < ilmbase.diff
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|===> Generating patch
|===> Viewing diff with more
|diff -ruN --exclude=CVS /usr/ports/graphics/ilmbase/Makefile ./Makefile
|--- /usr/ports/graphics/ilmbase/Makefile       2012-09-20 16:37:41.000000000 +0200
|+++ ./Makefile 2012-11-01 10:57:07.000000000 +0100
--------------------------
Patching file Makefile using Plan A...
Hunk #1 succeeded at 6.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -ruN --exclude=CVS /usr/ports/graphics/ilmbase/distinfo ./distinfo
|--- /usr/ports/graphics/ilmbase/distinfo       2012-09-20 16:37:41.000000000 +0200
|+++ ./distinfo 2012-11-01 11:03:44.000000000 +0100
--------------------------
Patching file distinfo using Plan A...
Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -ruN --exclude=CVS /usr/ports/graphics/ilmbase/files/patch-IexMath-IexMathFpu.cpp ./files/patch-IexMath-IexMathFpu.cpp
|--- /usr/ports/graphics/ilmbase/files/patch-IexMath-IexMathFpu.cpp     1970-01-01 01:00:00.000000000 +0100
|+++ ./files/patch-IexMath-IexMathFpu.cpp       2012-11-01 12:03:52.000000000 +0100
--------------------------
(Creating file patch-IexMath-IexMathFpu.cpp...)
Patching file patch-IexMath-IexMathFpu.cpp using Plan A...
Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -ruN --exclude=CVS /usr/ports/graphics/ilmbase/files/patch-Imath-ImathFun.cpp ./files/patch-Imath-ImathFun.cpp
|--- /usr/ports/graphics/ilmbase/files/patch-Imath-ImathFun.cpp 2007-10-07 16:47:38.000000000 +0200
|+++ ./files/patch-Imath-ImathFun.cpp   2012-11-01 12:10:50.000000000 +0100
--------------------------
File to patch: 


/usr/ports/graphics/ilmbase> "ls
Makefile                          distinfo.orig                     patch-IexMath-IexMathFpu.cpp      pkg-plist
Makefile.orig                     files                             patch-IexMath-IexMathFpu.cpp.orig
distinfo                          ilmbase.diff                      pkg-descr
Comment 6 dfilter service freebsd_committer freebsd_triage 2013-01-17 03:19:57 UTC
Author: swills
Date: Thu Jan 17 03:19:42 2013
New Revision: 310532
URL: http://svnweb.freebsd.org/changeset/ports/310532

Log:
  - Update to 1.0.3
  - Give maintainership to submitter
  
  PR:		ports/172337
  Submitted by:	nemysis <nemysis@gmx.ch>

Added:
  head/graphics/ilmbase/files/patch-IexMath-IexMathFpu.cpp   (contents, props changed)
  head/graphics/ilmbase/files/patch-Makefile.in   (contents, props changed)
Deleted:
  head/graphics/ilmbase/files/patch-ImathTest-testLineAlgo.cpp
  head/graphics/ilmbase/files/patch-Makefile
Modified:
  head/graphics/ilmbase/Makefile
  head/graphics/ilmbase/distinfo
  head/graphics/ilmbase/files/patch-ImathTest-testBoxAlgo.cpp   (contents, props changed)
  head/graphics/ilmbase/files/patch-configure
  head/graphics/ilmbase/pkg-descr   (contents, props changed)
  head/graphics/ilmbase/pkg-plist   (contents, props changed)

Modified: head/graphics/ilmbase/Makefile
==============================================================================
--- head/graphics/ilmbase/Makefile	Thu Jan 17 02:02:11 2013	(r310531)
+++ head/graphics/ilmbase/Makefile	Thu Jan 17 03:19:42 2013	(r310532)
@@ -6,35 +6,45 @@
 #
 
 PORTNAME=	ilmbase
-PORTVERSION=	1.0.2
+PORTVERSION=	1.0.3
 CATEGORIES=	graphics devel
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	openexr
+MASTER_SITES=	http://cloud.github.com/downloads/openexr/openexr/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nemysis@gmx.ch
 COMMENT=	ILM Base libraries a.k.a. Half, IlmThread, Imath, and Iex
 
-CONFLICTS=	OpenEXR-1.[0-4].*
+LICENSE=	BSD
 
-OPTIONS_DEFINE=		THREAD
-OPTIONS_DEFAULT=	THREAD
-THREAD_DESC=		Enable multithreaded file I/O support
+CONFLICTS=	OpenEXR-1.[0-4].*
 
-USE_GNOME=	pkgconfig
+USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
 
-regression-test regression test check:	build
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
+PORTDOCS=	AUTHORS ChangeLog README
+
+OPTIONS_DEFINE=		THREAD
+OPTIONS_DEFAULT=	THREAD
+THREAD_DESC=		Enable multithreaded file I/O support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTHREAD}
+CONFIGURE_ARGS+=--enable-threading
 CONFIGURE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 .else
 CONFIGURE_ARGS+=--disable-threading
 .endif
 
-.include <bsd.port.post.mk>
+regression-test regression test check:	build
+	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+
+.include <bsd.port.mk>

Modified: head/graphics/ilmbase/distinfo
==============================================================================
--- head/graphics/ilmbase/distinfo	Thu Jan 17 02:02:11 2013	(r310531)
+++ head/graphics/ilmbase/distinfo	Thu Jan 17 03:19:42 2013	(r310532)
@@ -1,2 +1,2 @@
-SHA256 (ilmbase-1.0.2.tar.gz) = 2e5cda799ffdfca9b1a16bb120d49c74a39af1457ef22f968918c6200ba62e44
-SIZE (ilmbase-1.0.2.tar.gz) = 496540
+SHA256 (ilmbase-1.0.3.tar.gz) = a998e064d6960ba258731fa5c8e7a3870b0eaa7ba9c1a5e5078263e9d9f76502
+SIZE (ilmbase-1.0.3.tar.gz) = 534980

Added: head/graphics/ilmbase/files/patch-IexMath-IexMathFpu.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/ilmbase/files/patch-IexMath-IexMathFpu.cpp	Thu Jan 17 03:19:42 2013	(r310532)
@@ -0,0 +1,11 @@
+--- IexMath/IexMathFpu.cpp.orig	2012-07-26 20:51:55.000000000 +0200
++++ IexMath/IexMathFpu.cpp	2012-11-01 12:00:36.000000000 +0100
+@@ -27,7 +27,7 @@
+ #endif
+ 
+ 
+-#ifdef HAVE_UCONTEXT_H
++#if defined(HAVE_UCONTEXT_H) && (defined(x86_64) || defined(i386_))
+ 
+ 
+ #include <ucontext.h>

Modified: head/graphics/ilmbase/files/patch-ImathTest-testBoxAlgo.cpp
==============================================================================
--- head/graphics/ilmbase/files/patch-ImathTest-testBoxAlgo.cpp	Thu Jan 17 02:02:11 2013	(r310531)
+++ head/graphics/ilmbase/files/patch-ImathTest-testBoxAlgo.cpp	Thu Jan 17 03:19:42 2013	(r310532)
@@ -1,11 +1,11 @@
---- ImathTest/testBoxAlgo.cpp.orig	2007-07-13 13:48:45.000000000 +0900
-+++ ImathTest/testBoxAlgo.cpp	2007-10-07 23:26:22.000000000 +0900
-@@ -336,7 +336,7 @@
+--- ImathTest/testBoxAlgo.cpp.orig	2012-07-18 01:27:26.000000000 +0200
++++ ImathTest/testBoxAlgo.cpp	2012-10-04 15:45:00.000000000 +0200
+@@ -356,7 +356,7 @@
  	Box3f ()
      };
  
 -    for (int i = 0; i < sizeof (boxes) / sizeof (boxes[0]); ++i)
 +    for (unsigned int i = 0; i < sizeof (boxes) / sizeof (boxes[0]); ++i)
- 	testRayBoxIntersection (boxes[i]);
+ 	testEntryAndExitPoints (boxes[i]);
  }
  

Added: head/graphics/ilmbase/files/patch-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/ilmbase/files/patch-Makefile.in	Thu Jan 17 03:19:42 2013	(r310532)
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2012-07-31 22:09:25.000000000 +0200
++++ Makefile.in	2012-10-04 14:25:06.000000000 +0200
+@@ -224,7 +224,7 @@
+         README README.CVS README.OSX README.win32 bootstrap \
+ 	config.windows/IlmBaseConfig.h
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = IlmBase.pc
+ all: all-recursive
+ 

Modified: head/graphics/ilmbase/files/patch-configure
==============================================================================
--- head/graphics/ilmbase/files/patch-configure	Thu Jan 17 02:02:11 2013	(r310531)
+++ head/graphics/ilmbase/files/patch-configure	Thu Jan 17 03:19:42 2013	(r310532)
@@ -1,6 +1,6 @@
---- configure.orig	2012-09-19 00:48:14.000000000 +0000
-+++ configure	2012-09-19 00:51:54.000000000 +0000
-@@ -20384,25 +20384,25 @@
+--- configure.orig	2012-07-31 00:11:22.000000000 +0200
++++ configure	2012-10-04 14:20:16.000000000 +0200
+@@ -15978,25 +15978,25 @@
    osx_arch=default
  fi;
  

Modified: head/graphics/ilmbase/pkg-descr
==============================================================================
--- head/graphics/ilmbase/pkg-descr	Thu Jan 17 02:02:11 2013	(r310531)
+++ head/graphics/ilmbase/pkg-descr	Thu Jan 17 03:19:42 2013	(r310532)
@@ -1,13 +1,18 @@
-ILM Base libraries have following four libraries.
+ABOUT THE ILMBASE LIBRARIES
+----------------------------
 
-*Half is a class that encapsulates ILM's 16-bit floating-point format.
+Half is a class that encapsulates our 16-bit floating-point format.
 
-*IlmThread is a thread abstraction library for use with OpenEXR
- and other software packages.
+IlmThread is a thread abstraction library for use with OpenEXR
+and other software packages.  It currently supports pthreads and
+Windows threads.
 
-*Imath implements 2D and 3D vectors, 3x3 and 4x4 matrices, quaternions
- and other useful 2D and 3D math functions.
+Imath implements 2D and 3D vectors, 3x3 and 4x4 matrices, quaternions
+and other useful 2D and 3D math functions.
 
-*Iex is an exception-handling library.
+Iex is an exception-handling library.
+
+If you have questions about using the IlmBase libraries, you may want
+to join our developer mailing list.
 
 WWW:	http://www.openexr.com/

Modified: head/graphics/ilmbase/pkg-plist
==============================================================================
--- head/graphics/ilmbase/pkg-plist	Thu Jan 17 02:02:11 2013	(r310531)
+++ head/graphics/ilmbase/pkg-plist	Thu Jan 17 03:19:42 2013	(r310532)
@@ -1,25 +1,11 @@
-lib/libHalf.a
-lib/libHalf.la
-lib/libHalf.so
-lib/libHalf.so.6
-lib/libIex.a
-lib/libIex.la
-lib/libIex.so
-lib/libIex.so.6
-lib/libIlmThread.a
-lib/libIlmThread.la
-lib/libIlmThread.so
-lib/libIlmThread.so.6
-lib/libImath.a
-lib/libImath.la
-lib/libImath.so
-lib/libImath.so.6
-libdata/pkgconfig/IlmBase.pc
 include/OpenEXR/Iex.h
 include/OpenEXR/IexBaseExc.h
 include/OpenEXR/IexErrnoExc.h
 include/OpenEXR/IexMacros.h
 include/OpenEXR/IexMathExc.h
+include/OpenEXR/IexMathFloatExc.h
+include/OpenEXR/IexMathFpu.h
+include/OpenEXR/IexMathIeeeExc.h
 include/OpenEXR/IexThrowErrnoExc.h
 include/OpenEXR/IlmBaseConfig.h
 include/OpenEXR/IlmThread.h
@@ -58,4 +44,26 @@ include/OpenEXR/ImathVecAlgo.h
 include/OpenEXR/half.h
 include/OpenEXR/halfFunction.h
 include/OpenEXR/halfLimits.h
-@dirrm include/OpenEXR
+lib/libHalf.a
+lib/libHalf.la
+lib/libHalf.so
+lib/libHalf.so.7
+lib/libIex.a
+lib/libIex.la
+lib/libIex.so
+lib/libIex.so.7
+lib/libIexMath.a
+lib/libIexMath.la
+lib/libIexMath.so
+lib/libIexMath.so.7
+lib/libIlmThread.a
+lib/libIlmThread.la
+lib/libIlmThread.so
+lib/libIlmThread.so.7
+lib/libImath.a
+lib/libImath.la
+lib/libImath.so
+lib/libImath.so.7
+libdata/pkgconfig/IlmBase.pc
+@dirrmtry share/applications
+@dirrmtry include/OpenEXR
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 7 Steve Wills freebsd_committer freebsd_triage 2013-01-17 03:33:36 UTC
State Changed
From-To: open->closed

Committed, with minor changes. Thanks and thanks for your patience.