[MAINTAINER UPDATE] graphics/openimageio -> 2.2.10.1]

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
11 messages Options
Reply | Threaded
Open this post in threaded view
|

[MAINTAINER UPDATE] graphics/openimageio -> 2.2.10.1]

Dimitri Karamazov
Ping

A new dependency is required only during build.
All tests pass for robin-map

Information for inst:robin-map-0.6.3

Comment:
fast hash map and hash set

Description:
A C++ implementation of a fast hash map and hash set using
open-addressing and linear robin hood hashing with backward
shift deletion to resolve collisions.

Maintainer: Dimitri Karamazov <[hidden email]>

WWW: https://github.com/Tessil/robin-map

Update graphics/openimageio to 2.2.10.1

-minor bump to first shared lib due to some export additions.
 no changes in second shared lib.
-10 tests fail out of 54, atleast 3 due to some dependencies
 not being turned on.
-USE_DICOM is not recognized anymore so I've replaced with DMCTK_FOUND
 USE_OPENVDB=OFF since it is picked up now but is not required by blender.

Build & run tested with blender

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 29 Jan 2021 17:50:59 -0000
@@ -8,12 +8,10 @@ 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.10.1
 DISTNAME = openimageio-${V}
-REVISION = 0
 
-SHARED_LIBS += OpenImageIO 8.0 # 2.2.10
+SHARED_LIBS += OpenImageIO 8.1 # 2.2.10
 SHARED_LIBS += OpenImageIO_Util 4.0 # 2.2.10
 
 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 \
@@ -66,9 +60,10 @@ LIB_DEPENDS = devel/boost \
 CONFIGURE_ARGS += -DCMAKE_INSTALL_MANDIR="man/man1" \
  -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 +73,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 29 Jan 2021 17:50:59 -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.10.1.tar.gz) = Yl9K1mb5qhMwOcCuat6Pxdq4NfrayYjL5l+CRGPWFNw=
+SIZE (openimageio-2.2.10.1.tar.gz) = 29215445
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 29 Jan 2021 17:50:59 -0000
@@ -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.so.8.1
 @man man/man1/iconvert.1
 @man man/man1/idiff.1
 @man man/man1/igrep.1

robin-map.tar.gz (1K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [MAINTAINER UPDATE] graphics/openimageio -> 2.2.10.1]

Rafael Sadowski
On Tue Feb 09, 2021 at 07:34:29AM +0000, Dimitri Karamazov wrote:

> Ping
>
> A new dependency is required only during build.
> All tests pass for robin-map
>
> Information for inst:robin-map-0.6.3
>
> Comment:
> fast hash map and hash set
>
> Description:
> A C++ implementation of a fast hash map and hash set using
> open-addressing and linear robin hood hashing with backward
> shift deletion to resolve collisions.
>
> Maintainer: Dimitri Karamazov <[hidden email]>
>
> WWW: https://github.com/Tessil/robin-map
>
With TEST_DEPENDS = devel/boost, OK rsadowski to import robin-map-0.6.3.

Reply | Threaded
Open this post in threaded view
|

Re: [MAINTAINER UPDATE] graphics/openimageio -> 2.2.10.1]

Dimitri Karamazov
On Wed, Feb 10, 2021 at 06:01:03AM +0100, Rafael Sadowski wrote:

> On Tue Feb 09, 2021 at 07:34:29AM +0000, Dimitri Karamazov wrote:
> > Ping
> >
> > A new dependency is required only during build.
> > All tests pass for robin-map
> >
> > Information for inst:robin-map-0.6.3
> >
> > Comment:
> > fast hash map and hash set
> >
> > Description:
> > A C++ implementation of a fast hash map and hash set using
> > open-addressing and linear robin hood hashing with backward
> > shift deletion to resolve collisions.
> >
> > Maintainer: Dimitri Karamazov <[hidden email]>
> >
> > WWW: https://github.com/Tessil/robin-map
> >
> With TEST_DEPENDS = devel/boost, OK rsadowski to import robin-map-0.6.3.
Reattached with necessary changes

regards,
  Dimitri

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 29 Jan 2021 17:50:59 -0000
@@ -8,12 +8,10 @@ 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.10.1
 DISTNAME = openimageio-${V}
-REVISION = 0
 
-SHARED_LIBS += OpenImageIO 8.0 # 2.2.10
+SHARED_LIBS += OpenImageIO 8.1 # 2.2.10
 SHARED_LIBS += OpenImageIO_Util 4.0 # 2.2.10
 
 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 \
@@ -66,9 +60,10 @@ LIB_DEPENDS = devel/boost \
 CONFIGURE_ARGS += -DCMAKE_INSTALL_MANDIR="man/man1" \
  -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 +73,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 29 Jan 2021 17:50:59 -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.10.1.tar.gz) = Yl9K1mb5qhMwOcCuat6Pxdq4NfrayYjL5l+CRGPWFNw=
+SIZE (openimageio-2.2.10.1.tar.gz) = 29215445
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 29 Jan 2021 17:50:59 -0000
@@ -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.so.8.1
 @man man/man1/iconvert.1
 @man man/man1/idiff.1
 @man man/man1/igrep.1

robin-map.tar.gz (1K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [MAINTAINER UPDATE] graphics/openimageio -> 2.2.11.1

Rafael Sadowski
On Sun Feb 21, 2021 at 05:36:13AM +0000, Dimitri Karamazov wrote:

> On Wed, Feb 17, 2021 at 05:32:19AM +0000, Dimitri Karamazov wrote:
> > Ping
> >
> > On Wed, Feb 10, 2021 at 12:06:29PM +0000, Dimitri Karamazov wrote:
> > > On Wed, Feb 10, 2021 at 06:01:03AM +0100, Rafael Sadowski wrote:
> > > > On Tue Feb 09, 2021 at 07:34:29AM +0000, Dimitri Karamazov wrote:
> > > > > Ping
> > > > >
> > > > > A new dependency is required only during build.
> > > > > All tests pass for robin-map
> > > > >
> > > > > Information for inst:robin-map-0.6.3
> > > > >
> > > > > Comment:
> > > > > fast hash map and hash set
> > > > >
> > > > > Description:
> > > > > A C++ implementation of a fast hash map and hash set using
> > > > > open-addressing and linear robin hood hashing with backward
> > > > > shift deletion to resolve collisions.
> > > > >
> > > > > Maintainer: Dimitri Karamazov <[hidden email]>
> > > > >
> > > > > WWW: https://github.com/Tessil/robin-map
> > > > >
> > > > With TEST_DEPENDS = devel/boost, OK rsadowski to import robin-map-0.6.3.
> > >
> > > Reattached with necessary changes
> > >
> > > regards,
> > >   Dimitri
>
> 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 15 Feb 2021 02:51:07 -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 \
> @@ -66,9 +60,10 @@ LIB_DEPENDS = devel/boost \
>  CONFIGURE_ARGS += -DCMAKE_INSTALL_MANDIR="man/man1" \
>   -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 +73,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 15 Feb 2021 02:51:07 -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 15 Feb 2021 02:51:07 -0000
> @@ -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.so.8.1
>  @man man/man1/iconvert.1
>  @man man/man1/idiff.1
>  @man man/man1/igrep.1


Reply | Threaded
Open this post in threaded view
|

Re: [MAINTAINER UPDATE] graphics/openimageio -> 2.2.11.1

Daniel Dickman


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?

Reply | Threaded
Open this post in threaded view
|

Re: [MAINTAINER UPDATE] graphics/openimageio -> 2.2.11.1

Daniel Dickman
In reply to this post by Dimitri Karamazov


> On Feb 23, 2021, at 4:17 AM, Dimitri Karamazov <[hidden email]> 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.

What are the cmake files that are installed needed for?
Reply | Threaded
Open this post in threaded view
|

Re: [MAINTAINER UPDATE] graphics/openimageio -> 2.2.11.1

Dimitri Karamazov
On Tue, Feb 23, 2021 at 08:37:45PM -0500, Daniel Dickman wrote:

>
>
> > On Feb 23, 2021, at 4:17 AM, Dimitri Karamazov <[hidden email]> 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.
>
> What are the cmake files that are installed needed for?

Not necessary for openimageio, but I guess that these files are
supposed to be part of any standard install.

They are installed by the default target just in the wrong
location. I simply added a post-install target which will
rectify that. I can substitute a command for removal instead.

regards,
  Dimitri

Reply | Threaded
Open this post in threaded view
|

Re: [MAINTAINER UPDATE] graphics/openimageio -> 2.2.11.1

Stuart Henderson
In reply to this post by Daniel Dickman
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.

> --- 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.

Reply | Threaded
Open this post in threaded view
|

Re: [MAINTAINER UPDATE] graphics/openimageio -> 2.2.11.1

Stuart Henderson
In reply to this post by Dimitri Karamazov
On 2021/02/24 02:18, Dimitri Karamazov wrote:

> On Tue, Feb 23, 2021 at 08:37:45PM -0500, Daniel Dickman wrote:
> >
> >
> > > On Feb 23, 2021, at 4:17 AM, Dimitri Karamazov <[hidden email]> 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.
> >
> > What are the cmake files that are installed needed for?
>
> Not necessary for openimageio, but I guess that these files are
> supposed to be part of any standard install.

yes this is quite common for cmake-based libraries and not a problem.

> They are installed by the default target just in the wrong
> location. I simply added a post-install target which will
> rectify that. I can substitute a command for removal instead.

That LGTM as-is.

Reply | Threaded
Open this post in threaded view
|

Re: [MAINTAINER UPDATE] graphics/openimageio -> 2.2.11.1

Dimitri Karamazov
In reply to this post by Stuart Henderson
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?

The suggested changes have been applied to the attachments.

regards,
  Dimitri

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

robin-map.tar.gz (1K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [MAINTAINER UPDATE] graphics/openimageio -> 2.2.11.1

Stuart Henderson
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).