Ping
On Thu, Feb 25, 2021 at 04:48:09PM +0000, Dimitri Karamazov wrote:
> On Thu, Feb 25, 2021 at 01:08:22PM +0000, Stuart Henderson wrote:
> > On 2021/02/24 12:07, Dimitri Karamazov wrote:
> > > On Wed, Feb 24, 2021 at 11:23:47AM +0000, Stuart Henderson wrote:
> > > > On 2021/02/22 15:32, Dimitri Karamazov wrote:
> > > > > On Mon, Feb 22, 2021 at 01:28:26AM -0500, Daniel Dickman wrote:
> > > > > >
> > > > > >
> > > > > > On Mon, 22 Feb 2021, Rafael Sadowski wrote:
> > > > > >
> > > > > > > >
> > > > > > > > Bump for a new release.
> > > > > > >
> > > > > > > Still OK for me but we need to import robin-map first. A second OK is
> > > > > > > needed.
> > > > > > >
> > > > > >
> > > > > > Where is the port for robin-map? Can someone resend it?
> > > > >
> > > > > Avoid the previous diff as there is a mistake and the robin-map
> > > > > port has been attached at the very end.
> > > >
> > > > robin-map wants "ONLY_FOR_ARCHS= ${CXX11_ARCHS}". I would drop the
> > > > NO_BUILD as well it is really just for cases where things fail if you
> > > > try to do "build". Otherwise OK for that.
> > > >
> > > Done.
> > >
> > > > > --- pkg/PLIST 5 Jan 2021 20:53:18 -0000 1.11
> > > > > +++ pkg/PLIST 22 Feb 2021 15:29:57 -0000
> > > > > @@ -1,5 +1,4 @@
> > > > > -@comment $OpenBSD: PLIST,v 1.11 2021/01/05 20:53:18 jca Exp $
> > > > > -@conflict idiff-*
> > > > > +@comment $OpenBSD: PLIST,v$
> > > >
> > > > The conflict should stay.
> > > >
> > > This conflict is not being detected by pkglocatedb.
> > > I wonder why?
> >
> > $ pkglocate bin/idiff
> > idiff-1.1:textproc/idiff:/usr/local/bin/idiff
> > openimageio-2.2.10.0p0:graphics/openimageio:/usr/local/bin/idiff
> > plan9port-20210129:plan9/plan9port:/usr/local/plan9/bin/idiff
> >
> > If you mean the automatic check, that has been changed to only check
> > new files, otherwise everybody working on ports with thousands of PLIST
> > entries has to disable checking completely otherwise it's too slow..
> >
> > > The suggested changes have been applied to the attachments.
> >
> > This is OK with me. (Or I can commit if I get an OK for robin-map).
> >
> I think Mr Sadowski has already provided on OK, check above.
>
> > > > > > On Mon, 22 Feb 2021, Rafael Sadowski wrote:
> > > > > >
> > > > > > > >
> > > > > > > > Bump for a new release.
> > > > > > >
> > > > > > > Still OK for me but we need to import robin-map first. A second OK is
> > > > > > > needed.
> > > > > > >
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/openimageio/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- Makefile 23 Jan 2021 12:46:26 -0000 1.50
+++ Makefile 24 Feb 2021 11:45:36 -0000
@@ -8,13 +8,11 @@ COMMENT = library for reading and writi
GH_ACCOUNT = OpenImageIO
GH_PROJECT = oiio
GH_TAGNAME = Release-$V
-V = 2.2.10.0
-ROBIN_VER = 0.6.2
+V = 2.2.11.1
DISTNAME = openimageio-${V}
-REVISION = 0
-SHARED_LIBS += OpenImageIO 8.0 # 2.2.10
-SHARED_LIBS += OpenImageIO_Util 4.0 # 2.2.10
+SHARED_LIBS += OpenImageIO 9.0 # 2.2.11
+SHARED_LIBS += OpenImageIO_Util 5.0 # 2.2.11
CATEGORIES = graphics devel
@@ -34,11 +32,6 @@ WANTLIB += boost_filesystem-mt boost_sys
WANTLIB += bz2 c freetype gif intl jpeg m openjp2 png pugixml
WANTLIB += raw_r swscale tiff util webp webpdemux z
-MASTER_SITES0 = https://github.com/Tessil/robin-map/
-
-DISTFILES = ${DISTNAME}.tar.gz \
- robin-map-{archive/v}${ROBIN_VER}.tar.gz:0
-
MODULES = devel/cmake \
lang/python \
x11/qt5
@@ -48,8 +41,9 @@ MODPY_VERSION = ${MODPY_DEFAULT_VERSION
COMPILER = base-clang ports-gcc
BUILD_DEPENDS = devel/fmt \
- textproc/txt2man \
- devel/py-pybind11${MODPY_FLAVOR}
+ devel/py-pybind11${MODPY_FLAVOR} \
+ devel/robin-map \
+ textproc/txt2man
LIB_DEPENDS = devel/boost \
graphics/ffmpeg \
@@ -64,11 +58,13 @@ LIB_DEPENDS = devel/boost \
textproc/pugixml
CONFIGURE_ARGS += -DCMAKE_INSTALL_MANDIR="man/man1" \
+ -DCMAKE_LIBRARY_PATH="${WRKBUILD}/lib:${CMAKE_LIBRARY_PATH}" \
-DSTOP_ON_WARNING=OFF \
-DUSE_CCACHE=OFF \
- -DUSE_DICOM=OFF \
+ -DDCMTK_FOUND=OFF \
-DUSE_EXTERNAL_PUGIXML=ON \
-DUSE_OPENCV=OFF \
+ -DUSE_OPENVDB=OFF \
-DUSE_HDF5=OFF \
-DUSE_LIBHEIF=OFF \
-Dpybind11_DIR=${MODPY_SITEPKG}/pybind11/share/cmake/pybind11/
@@ -78,10 +74,6 @@ CONFIGURE_ARGS += -DCMAKE_INSTALL_MANDIR
CONFIGURE_ENV += LDFLAGS="${LDFLAGS} -latomic"
WANTLIB += atomic
.endif
-
-post-extract:
- mkdir ${WRKSRC}/ext
- cp -r ${WRKDIR}/robin-map-${ROBIN_VER} ${WRKSRC}/ext/robin-map
post-install:
find ${PREFIX} -name '*.orig' -delete
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/openimageio/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo 5 Jan 2021 20:53:18 -0000 1.10
+++ distinfo 24 Feb 2021 11:45:36 -0000
@@ -1,4 +1,2 @@
-SHA256 (openimageio-2.2.10.0.tar.gz) = 28Dj6XGEl9n3HqAfsd6Lh0SXda2dvOpNJTjZxSu+HVo=
-SHA256 (robin-map-0.6.2.tar.gz) = wI7Esb8chesNZDIkSmqJhiIp2hy4NPP5D7qNw12MjvE=
-SIZE (openimageio-2.2.10.0.tar.gz) = 29215970
-SIZE (robin-map-0.6.2.tar.gz) = 63782
+SHA256 (openimageio-2.2.11.1.tar.gz) = EgFw6FF9iRH1Kw+1bxTrVqrYjt1yzJ5LLjXHQCUpO30=
+SIZE (openimageio-2.2.11.1.tar.gz) = 29250377
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/openimageio/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST 5 Jan 2021 20:53:18 -0000 1.11
+++ pkg/PLIST 24 Feb 2021 11:45:36 -0000
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.11 2021/01/05 20:53:18 jca Exp $
+@comment $OpenBSD: PLIST,v$
@conflict idiff-*
@bin bin/iconvert
@bin bin/idiff
@@ -70,7 +70,7 @@ lib/cmake/OpenImageIO/OpenImageIOTargets
@lib lib/libOpenImageIO.so.${LIBOpenImageIO_VERSION}
@lib lib/libOpenImageIO_Util.so.${LIBOpenImageIO_Util_VERSION}
lib/pkgconfig/OpenImageIO.pc
-lib/python${MODPY_VERSION}/site-packages/OpenImageIO.so.8.0
+lib/python${MODPY_VERSION}/site-packages/OpenImageIO.${MODPY_PYC_MAGIC_TAG}so.9.0
@man man/man1/iconvert.1
@man man/man1/idiff.1
@man man/man1/igrep.1
No comments:
Post a Comment