Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [WIP] openimageio 2.2.10.1
@ 2021-01-10 15:20 sgn
  2021-02-26  9:39 ` biopsin
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: sgn @ 2021-01-10 15:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 316 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages openimageio-2.2.10.1
https://github.com/void-linux/void-packages/pull/27808

[WIP] openimageio 2.2.10.1


A patch file from https://github.com/void-linux/void-packages/pull/27808.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openimageio-2.2.10.1-27808.patch --]
[-- Type: text/x-diff, Size: 24419 bytes --]

From 230e5ed75027bbc6f786b191982ef82e2dfb7003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 10 Jan 2021 20:50:27 +0700
Subject: [PATCH 1/8] New package: tsl-robin-map-0.6.3

---
 srcpkgs/tsl-robin-map/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/tsl-robin-map/template

diff --git a/srcpkgs/tsl-robin-map/template b/srcpkgs/tsl-robin-map/template
new file mode 100644
index 00000000000..7339c5ec5fb
--- /dev/null
+++ b/srcpkgs/tsl-robin-map/template
@@ -0,0 +1,16 @@
+# Template file for 'tsl-robin-map'
+pkgname=tsl-robin-map
+version=0.6.3
+revision=1
+wrksrc=robin-map-$version
+build_style=cmake
+short_desc="C++ hashmap using robin hood hashing"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/v$version.tar.gz"
+checksum=e6654c8c2598f63eb0b1d52ff8bdf39cfcc91d81dd5d05274a6dca91241cd72f
+
+post_install() {
+	vlicense LICENSE
+}

From 92b3e0a540ab13df66149f78caedc03116a45e35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 10 Jan 2021 21:24:28 +0700
Subject: [PATCH 2/8] openimageio: update to 2.2.10.1.

---
 common/shlibs                                 |   4 +-
 .../patches/find-openexr-cmake.patch          | 197 ------------------
 srcpkgs/openimageio/template                  |  47 +++--
 3 files changed, 29 insertions(+), 219 deletions(-)
 delete mode 100644 srcpkgs/openimageio/patches/find-openexr-cmake.patch

diff --git a/common/shlibs b/common/shlibs
index 24c31d8621d..de1f26c2f5a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2176,8 +2176,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.7.2_1
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.1.8 openimageio-1.8.12_1
-libOpenImageIO.so.1.8 openimageio-1.8.12_1
+libOpenImageIO_Util.so.2.2 openimageio-2.2.10.1_1
+libOpenImageIO.so.2.2 openimageio-2.2.10.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
 libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/openimageio/patches/find-openexr-cmake.patch b/srcpkgs/openimageio/patches/find-openexr-cmake.patch
deleted file mode 100644
index c17c383371f..00000000000
--- a/srcpkgs/openimageio/patches/find-openexr-cmake.patch
+++ /dev/null
@@ -1,197 +0,0 @@
---- src/cmake/modules/FindOpenEXR.cmake	2018-12-01 17:42:08.000000000 +0100
-+++ src/cmake/modules/FindOpenEXR.cmake	2019-12-02 21:37:56.477945777 +0100
-@@ -2,17 +2,12 @@
- #
- # This module will set
- #   OPENEXR_FOUND          true, if found
--#   OPENEXR_INCLUDE_DIR    directory where headers are found
-+#   OPENEXR_INCLUDES       directory where headers are found
- #   OPENEXR_LIBRARIES      libraries for OpenEXR + IlmBase
- #   ILMBASE_LIBRARIES      libraries just IlmBase
- #   OPENEXR_VERSION        OpenEXR version (accurate for >= 2.0.0,
- #                              otherwise will just guess 1.6.1)
- #
--# Special inputs:
--#   OPENEXR_CUSTOM_INCLUDE_DIR - custom location of headers
--#   OPENEXR_CUSTOM_LIB_DIR - custom location of libraries
--#   OPENEXR_CUSTOM_LIB_PREFIX - special snowflake library prefix
--#   OPENEXR_CUSTOM_LIB_SUFFIX - special snowflake library suffix
- #
- 
- # Other standard issue macros
-@@ -30,18 +25,25 @@
- # Attempt to find OpenEXR with pkgconfig
- find_package(PkgConfig)
- if (PKG_CONFIG_FOUND)
--    pkg_check_modules(_ILMBASE QUIET IlmBase)
--    pkg_check_modules(_OPENEXR QUIET OpenEXR>=2.0.0)
-+    if (NOT Ilmbase_ROOT AND NOT ILMBASE_ROOT
-+        AND NOT DEFINED ENV{Ilmbase_ROOT} AND NOT DEFINED ENV{ILMBASE_ROOT})
-+        pkg_check_modules(_ILMBASE QUIET IlmBase>=2.0.0)
-+    endif ()
-+    if (NOT OpenEXR_ROOT AND NOT OPENEXR_ROOT
-+        AND NOT DEFINED ENV{OpenEXR_ROOT} AND NOT DEFINED ENV{OPENEXR_ROOT})
-+        pkg_check_modules(_OPENEXR QUIET OpenEXR>=2.0.0)
-+    endif ()
- endif (PKG_CONFIG_FOUND)
- 
- # List of likely places to find the headers -- note priority override of
--# OPENEXR_CUSTOM_INCLUDE_DIR and ${OPENEXR_HOME}/include.
-+# ${OPENEXR_ROOT}/include.
- # ILMBASE is needed in case ilmbase an openexr are installed in separate
- # directories, like NixOS does
- set (GENERIC_INCLUDE_PATHS
--    ${OPENEXR_CUSTOM_INCLUDE_DIR}
--    ${OPENEXR_HOME}/include
--    ${ILMBASE_HOME}/include
-+    ${OPENEXR_ROOT}/include
-+    $ENV{OPENEXR_ROOT}/include
-+    ${ILMBASE_ROOT}/include
-+    $ENV{ILMBASE_ROOT}/include
-     ${_ILMBASE_INCLUDEDIR}
-     ${_OPENEXR_INCLUDEDIR}
-     /usr/local/include
-@@ -50,22 +52,19 @@
-     /sw/include
-     /opt/local/include )
- 
--# Find the include file locations. We call find_path twice -- first using
--# only the custom paths, then if that fails, try the default paths only.
--# This seems to be the most robust way I can find to not get confused when
--# both system and custom libraries are present.
-+# Find the include file locations.
- find_path (ILMBASE_INCLUDE_PATH OpenEXR/IlmBaseConfig.h
--           PATHS ${GENERIC_INCLUDE_PATHS} NO_DEFAULT_PATH)
--find_path (ILMBASE_INCLUDE_PATH OpenEXR/IlmBaseConfig.h)
-+           HINTS ${ILMBASE_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}
-+                 ${GENERIC_INCLUDE_PATHS} )
- find_path (OPENEXR_INCLUDE_PATH OpenEXR/OpenEXRConfig.h
--           PATHS ${GENERIC_INCLUDE_PATHS} NO_DEFAULT_PATH)
--find_path (OPENEXR_INCLUDE_PATH OpenEXR/OpenEXRConfig.h)
-+           HINTS ${OPENEXR_INCLUDE_DIR}
-+                 ${GENERIC_INCLUDE_PATHS} )
- 
- # Try to figure out version number
- if (DEFINED _OPENEXR_VERSION AND NOT "${_OPENEXR_VERSION}" STREQUAL "")
-     set (OPENEXR_VERSION "${_OPENEXR_VERSION}")
--    string (REGEX REPLACE "([0-9]+)\\.[0-9]+" "\\1" OPENEXR_VERSION_MAJOR "${_OPENEXR_VERSION}")
--    string (REGEX REPLACE "[0-9]+\\.([0-9]+)" "\\1" OPENEXR_VERSION_MINOR "${_OPENEXR_VERSION}")
-+    string (REGEX REPLACE "([0-9]+)\\.[0-9\\.]+" "\\1" OPENEXR_VERSION_MAJOR "${_OPENEXR_VERSION}")
-+    string (REGEX REPLACE "[0-9]+\\.([0-9]+)(\\.[0-9]+)?" "\\1" OPENEXR_VERSION_MINOR "${_OPENEXR_VERSION}")
- elseif (EXISTS "${OPENEXR_INCLUDE_PATH}/OpenEXR/ImfMultiPartInputFile.h")
-     # Must be at least 2.0
-     file(STRINGS "${OPENEXR_INCLUDE_PATH}/OpenEXR/OpenEXRConfig.h" TMP REGEX "^#define OPENEXR_VERSION_STRING .*$")
-@@ -83,24 +82,10 @@
- 
- 
- # List of likely places to find the libraries -- note priority override of
--# OPENEXR_CUSTOM_LIB_DIR and ${OPENEXR_HOME}/lib.
--
--# If there's no OPENEXR_HOME or ILMBASE_HOME, then the path will point to
--# "/lib", which may not always be wanted/expected.
--if (OPENEXR_CUSTOM_LIB_DIR)
--  set (GENERIC_LIBRARY_PATHS ${GENERIC_LIBRARY_PATHS} ${OPENEXR_CUSTOM_LIB_DIR})
--endif()
--
--if (OPENEXR_HOME)
--  set (GENERIC_LIBRARY_PATHS ${GENERIC_LIBRARY_PATHS} ${OPENEXR_HOME})
--endif()
--
--if (ILMBASE_HOME)
--  set (GENERIC_LIBRARY_PATHS ${GENERIC_LIBRARY_PATHS} ${ILMBASE_HOME})
--endif()
--
-+# ${OPENEXR_ROOT}/lib.
- set (GENERIC_LIBRARY_PATHS
--    ${GENERIC_LIBRARY_PATHS}
-+    ${OPENEXR_ROOT}/lib
-+    ${ILMBASE_ROOT}/lib
-     ${OPENEXR_INCLUDE_PATH}/../lib
-     ${ILMBASE_INCLUDE_PATH}/../lib
-     ${_ILMBASE_LIBDIR}
-@@ -113,6 +98,8 @@
-     /opt/local/lib
-     $ENV{PROGRAM_FILES}/OpenEXR/lib/static )
- 
-+# message (STATUS "Generic lib paths: ${GENERIC_LIBRARY_PATHS}")
-+
- # Handle request for static libs by altering CMAKE_FIND_LIBRARY_SUFFIXES.
- # We will restore it at the end of this file.
- set (_openexr_orig_suffixes ${CMAKE_FIND_LIBRARY_SUFFIXES})
-@@ -124,42 +111,19 @@
-     endif ()
- endif ()
- 
--# Look for the libraries themselves, for all the components. Like with the
--# headers, we do two finds -- first for custom locations, then for default.
-+# Look for the libraries themselves, for all the components.
- # This is complicated because the OpenEXR libraries may or may not be
- # built with version numbers embedded.
- set (_openexr_components IlmThread IlmImf Imath Iex Half)
- foreach (COMPONENT ${_openexr_components})
-     string (TOUPPER ${COMPONENT} UPPERCOMPONENT)
-     # First try with the version embedded
--    set (FULL_COMPONENT_NAME ${OPENEXR_CUSTOM_LIB_PREFIX}${COMPONENT}-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}${OPENEXR_CUSTOM_LIB_SUFFIX})
--    find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME}
--                  PATHS ${GENERIC_LIBRARY_PATHS} NO_DEFAULT_PATH)
--    # Again, with no directory restrictions
--    find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME})
--    # Try again without the version
--    set (FULL_COMPONENT_NAME ${OPENEXR_CUSTOM_LIB_PREFIX}${COMPONENT}${OPENEXR_CUSTOM_LIB_SUFFIX})
--    find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME}
--                  PATHS ${GENERIC_LIBRARY_PATHS} NO_DEFAULT_PATH)
--    # One more time, with no restrictions
--    find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME})
-+    find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY
-+                  NAMES ${COMPONENT}-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}
-+                        ${COMPONENT}
-+                  HINTS ${OPENEXR_LIBRARY_DIR} $ENV{OPENEXR_LIBRARY_DIR}
-+                        ${GENERIC_LIBRARY_PATHS} )
- endforeach ()
--#Half usually has no suffix
--find_library (OPENEXR_HALF_LIBRARY ${OPENEXR_CUSTOM_LIB_PREFIX}Half
--              PATHS ${GENERIC_LIBRARY_PATHS} NO_DEFAULT_PATH)
--find_library (OPENEXR_HALF_LIBRARY ${OPENEXR_CUSTOM_LIB_PREFIX}Half)
--
--# Set the FOUND, INCLUDE_DIR, and LIBRARIES variables.
--if (ILMBASE_INCLUDE_PATH AND OPENEXR_INCLUDE_PATH AND
--      OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND
--      OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY)
--    set (OPENEXR_FOUND TRUE)
--    set (ILMBASE_FOUND TRUE)
--    set (ILMBASE_INCLUDE_DIR ${ILMBASE_INCLUDE_PATH} CACHE STRING "The include paths needed to use IlmBase")
--    set (OPENEXR_INCLUDE_DIR ${OPENEXR_INCLUDE_PATH} CACHE STRING "The include paths needed to use OpenEXR")
--    set (ILMBASE_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ILMBASE_PTHREADS} CACHE STRING "The libraries needed to use IlmBase")
--    set (OPENEXR_LIBRARIES ${OPENEXR_ILMIMF_LIBRARY} ${ILMBASE_LIBRARIES} ${ZLIB_LIBRARIES} CACHE STRING "The libraries needed to use OpenEXR")
--endif ()
- 
- find_package_handle_standard_args (OpenEXR
-     REQUIRED_VARS ILMBASE_INCLUDE_PATH OPENEXR_INCLUDE_PATH
-@@ -168,11 +132,17 @@
-     VERSION_VAR   OPENEXR_VERSION
-     )
- 
--MARK_AS_ADVANCED(
--    ILMBASE_INCLUDE_DIR
--    OPENEXR_INCLUDE_DIR
--    ILMBASE_LIBRARIES
--    OPENEXR_LIBRARIES
-+if (OPENEXR_FOUND)
-+    set (ILMBASE_FOUND TRUE)
-+    set (ILMBASE_INCLUDES ${ILMBASE_INCLUDE_PATH})
-+    set (OPENEXR_INCLUDES ${OPENEXR_INCLUDE_PATH})
-+    set (ILMBASE_INCLUDE_DIR ${ILMBASE_INCLUDE_PATH})
-+    set (OPENEXR_INCLUDE_DIR ${OPENEXR_INCLUDE_PATH})
-+    set (ILMBASE_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ILMBASE_PTHREADS} CACHE STRING "The libraries needed to use IlmBase")
-+    set (OPENEXR_LIBRARIES ${OPENEXR_ILMIMF_LIBRARY} ${ILMBASE_LIBRARIES} ${ZLIB_LIBRARIES} CACHE STRING "The libraries needed to use OpenEXR")
-+endif ()
-+
-+mark_as_advanced(
-     OPENEXR_ILMIMF_LIBRARY
-     OPENEXR_IMATH_LIBRARY
-     OPENEXR_IEX_LIBRARY
-@@ -181,3 +151,4 @@
- 
- # Restore the original CMAKE_FIND_LIBRARY_SUFFIXES
- set (CMAKE_FIND_LIBRARY_SUFFIXES ${_openexr_orig_suffixes})
-+
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bcab0e90b7d..9174e650070 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,22 +1,24 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=1.8.17
-revision=3
+version=2.2.10.1
+revision=1
 wrksrc="oiio-Release-${version}"
 build_style=cmake
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0
  -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
 hostmakedepends="pkg-config"
-makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
+makedepends="boost-devel giflib-devel libraw-devel libopenjpeg2-devel
+ libwebp-devel libheif-devel hdf5-devel libopencv-devel tbb-devel
+ fmt-devel tsl-robin-map openvdb-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
 distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=a019086c05a6150d445a2240bab1723dff540dde5f5c327c36a97f0b5ae0e157
+checksum=625f4ad666f9aa133039c0ae6ade8fc5dab835fadac988cbe65f824463d614dc
 
 CXXFLAGS="-faligned-new"
 case "$XBPS_TARGET_MACHINE" in
@@ -25,30 +27,32 @@ esac
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
 fi
 
 if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
+	configure_args+=" -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
 fi
 
-pre_build() {
-	local f
-	# Replace -isystem with -I to avoid "#include_next <stdlib.h>" file not found
-	vsed -i src/cmake/compiler.cmake -e "s;-isystem;-I;g"
+post_extract() {
+	local _lib
+	mkdir -p ext
+	for _lib in fmt tsl
+	do
+		rm -rf ext/$_lib
+		ln -s $XBPS_CROSS_BASE/usr/include/$_lib ext
+	done
+}
 
-	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-		# Add libatomic to the targets
-		vsed -i src/libOpenImageIO/CMakeLists.txt \
-			-e "s;^\(target_link_libraries (OpenImageIO ${ZLIB_LIBRARIES}\));\1 atomic);"
-		for f in idiff igrep iconvert iinfo maketx testtex oiiotool; do
-			vsed -i src/${f}/CMakeLists.txt \
-				-e "s;^\(target_link_libraries .*\));\1 atomic);"
-		done
-	fi
+post_patch() {
+	vsed -i -e '\!/usr/include/openjpeg-2.3!i /usr/include/openjpeg-2.4' \
+		src/cmake/modules/FindOpenJpeg.cmake
 }
 
 post_install() {
-	vlicense LICENSE
+	vlicense LICENSE.md
+	vlicense THIRD-PARTY.md
+	rm -rf $DESTDIR/usr/share/doc
 }
 
 openimageio-devel_package() {
@@ -57,5 +61,8 @@ openimageio-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove usr/share/cmake
 	}
 }

From 389dc44511679a03684c056a4ab27a847debe544 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 10 Jan 2021 21:26:36 +0700
Subject: [PATCH 3/8] blender: rebuild for openimageio-2.2.10.1

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index b724ef01318..01b3677ff4f 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=2.90.1
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From be07763afd9516862c51880a4e8238ec0b3378c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 10 Jan 2021 21:45:08 +0700
Subject: [PATCH 4/8] luxmark: rebuild for openimageio-2.2.10.1

---
 srcpkgs/luxmark/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/luxmark/template b/srcpkgs/luxmark/template
index 68a7a7ab86c..6df4f94bd6f 100644
--- a/srcpkgs/luxmark/template
+++ b/srcpkgs/luxmark/template
@@ -1,7 +1,7 @@
 # Template file for 'luxmark'
 pkgname=luxmark
 version=3.1
-revision=9
+revision=10
 build_style=cmake
 makedepends="openimageio-devel tiff-devel libpng-devel libgomp-devel
  libopenexr-devel MesaLib-devel ocl-icd-devel opencl2-headers boost-devel

From a4a88644de268d96f940038816bfc81e332b120a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 10 Jan 2021 21:45:08 +0700
Subject: [PATCH 5/8] luxrays: rebuild for openimageio-2.2.10.1

---
 srcpkgs/luxrays/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/luxrays/template b/srcpkgs/luxrays/template
index 4ed0916d282..4c54e823747 100644
--- a/srcpkgs/luxrays/template
+++ b/srcpkgs/luxrays/template
@@ -1,7 +1,7 @@
 # Template file for 'luxrays'
 pkgname=luxrays
 version=3.1
-revision=18
+revision=19
 build_style=cmake
 configure_args="-DLUXRAYS_DISABLE_OPENCL=OFF -DCMAKE_SKIP_RPATH=ON"
 hostmakedepends="flex bison boost-devel"

From f7334c032878eaacb4f8bd614aa7d0d078e63fba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 10 Jan 2021 21:45:08 +0700
Subject: [PATCH 6/8] openimagedenoise: rebuild for openimageio-2.2.10.1

---
 srcpkgs/openimagedenoise/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index 3eb4a732684..3ffd6bdfc83 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,7 +1,7 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
 version=1.2.4
-revision=1
+revision=2
 archs="x86_64*"
 wrksrc=oidn-${version}
 build_style=cmake

From 15470e9557b294f0b41187a713ad2a6e4c0bf34f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 10 Jan 2021 22:18:14 +0700
Subject: [PATCH 7/8] openjpeg: update to 2.4.0

---
 common/shlibs                      |  1 -
 srcpkgs/libopenjpeg-devel          |  1 -
 srcpkgs/libopenjpeg2               |  2 +-
 srcpkgs/libopenjpeg2-devel         |  2 +-
 srcpkgs/openjpeg/template          | 29 +++++++++++++----------
 srcpkgs/openjpeg/update            |  1 -
 srcpkgs/{libopenjpeg => openjpeg2} |  0
 srcpkgs/openjpeg2/template         | 37 ------------------------------
 srcpkgs/openjpeg2/update           |  1 -
 9 files changed, 19 insertions(+), 55 deletions(-)
 delete mode 120000 srcpkgs/libopenjpeg-devel
 delete mode 100644 srcpkgs/openjpeg/update
 rename srcpkgs/{libopenjpeg => openjpeg2} (100%)
 delete mode 100644 srcpkgs/openjpeg2/template
 delete mode 100644 srcpkgs/openjpeg2/update

diff --git a/common/shlibs b/common/shlibs
index de1f26c2f5a..759c6c1b5b0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2033,7 +2033,6 @@ libimobiledevice-1.0.so.6 libimobiledevice-1.3.0_1
 libstfl.so.0 stfl-0.23_1
 libCDApplet.so cairo-dock-plugins-3.4.0_1
 libldns.so.3 libldns-1.7.1_1
-libopenjpeg.so.5 libopenjpeg-1.5.2_1
 liboping.so.0 liboping-1.8.0_1
 libloudmouth-1.so.0 loudmouth-1.4.3_1
 libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.2_1
diff --git a/srcpkgs/libopenjpeg-devel b/srcpkgs/libopenjpeg-devel
deleted file mode 120000
index b0c86d2338a..00000000000
--- a/srcpkgs/libopenjpeg-devel
+++ /dev/null
@@ -1 +0,0 @@
-openjpeg
\ No newline at end of file
diff --git a/srcpkgs/libopenjpeg2 b/srcpkgs/libopenjpeg2
index 42dd6d2a421..b0c86d2338a 120000
--- a/srcpkgs/libopenjpeg2
+++ b/srcpkgs/libopenjpeg2
@@ -1 +1 @@
-openjpeg2
\ No newline at end of file
+openjpeg
\ No newline at end of file
diff --git a/srcpkgs/libopenjpeg2-devel b/srcpkgs/libopenjpeg2-devel
index 42dd6d2a421..b0c86d2338a 120000
--- a/srcpkgs/libopenjpeg2-devel
+++ b/srcpkgs/libopenjpeg2-devel
@@ -1 +1 @@
-openjpeg2
\ No newline at end of file
+openjpeg
\ No newline at end of file
diff --git a/srcpkgs/openjpeg/template b/srcpkgs/openjpeg/template
index ecd38c66ebb..f5d6b5f937f 100644
--- a/srcpkgs/openjpeg/template
+++ b/srcpkgs/openjpeg/template
@@ -1,36 +1,41 @@
 # Template file for 'openjpeg'
 pkgname=openjpeg
-version=1.5.2
+version=2.4.0
 revision=2
 build_style=cmake
-configure_args="--disable-static"
-hostmakedepends="pkg-config"
-makedepends="libpng-devel lcms2-devel tiff-devel doxygen"
+configure_args="-DCMAKE_BUILD_TYPE=None"
+makedepends="libpng-devel lcms2-devel tiff-devel"
 short_desc="Open-source JPEG 2000 codec written in C language"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="http://www.openjpeg.org/"
-distfiles="$SOURCEFORGE_SITE/openjpeg.mirror/${version}/${pkgname}-${version}.tar.gz"
-checksum=15df7b194a5d8dba0052cd21c17a4dc761149a770a907d73fffb972078c28a87
+distfiles="https://github.com/uclouvain/openjpeg/archive/v${version}.tar.gz"
+checksum=8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d
+patch_args="-Np1"
 
 post_install() {
 	vlicense LICENSE
 }
 
-libopenjpeg-devel_package() {
+libopenjpeg2-devel_package() {
 	short_desc+=" - development files"
-	depends="libopenjpeg>=${version}_${revision}"
+	depends="libopenjpeg2>=${version}_${revision} ${sourcepkg}-${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
+		vmove "usr/lib/openjpeg-2.*"
+		vmove "usr/lib/*.a"
 		vmove usr/lib/pkgconfig
-		vmove usr/share/man/man3
 	}
 }
-
-libopenjpeg_package() {
+libopenjpeg2_package() {
 	short_desc+=" - library files"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
 	}
 }
+openjpeg2_package() {
+	short_desc+=" - transition (binaries)"
+	depends="openjpeg>=${version}_${revision}"
+	build_style=meta
+}
diff --git a/srcpkgs/openjpeg/update b/srcpkgs/openjpeg/update
deleted file mode 100644
index 6bfa7d9a00b..00000000000
--- a/srcpkgs/openjpeg/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="2.*"
diff --git a/srcpkgs/libopenjpeg b/srcpkgs/openjpeg2
similarity index 100%
rename from srcpkgs/libopenjpeg
rename to srcpkgs/openjpeg2
diff --git a/srcpkgs/openjpeg2/template b/srcpkgs/openjpeg2/template
deleted file mode 100644
index 372fb65370b..00000000000
--- a/srcpkgs/openjpeg2/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'openjpeg2'
-pkgname=openjpeg2
-version=2.4.0
-revision=1
-wrksrc="openjpeg-${version}"
-build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=None"
-makedepends="libpng-devel lcms2-devel tiff-devel"
-short_desc="Open-source JPEG 2000 codec written in C language (Version 2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
-homepage="http://www.openjpeg.org/"
-distfiles="https://github.com/uclouvain/openjpeg/archive/v${version}.tar.gz"
-checksum=8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d
-patch_args="-Np1"
-
-post_install() {
-	vlicense LICENSE
-}
-
-libopenjpeg2-devel_package() {
-	short_desc+=" - development files"
-	depends="libopenjpeg2>=${version}_${revision} ${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/openjpeg-2.*"
-		vmove "usr/lib/*.a"
-		vmove usr/lib/pkgconfig
-	}
-}
-libopenjpeg2_package() {
-	short_desc+=" - library files"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-	}
-}
diff --git a/srcpkgs/openjpeg2/update b/srcpkgs/openjpeg2/update
deleted file mode 100644
index 8d485090e24..00000000000
--- a/srcpkgs/openjpeg2/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="openjpeg"

From b625e7a3a1675fea734f4bb1e301a95fa7d834c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 10 Jan 2021 22:19:07 +0700
Subject: [PATCH 8/8] removed-packages: remove libopenjpeg{,-devel}

---
 srcpkgs/removed-packages/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c3b79f436a5..59e753b6acb 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=7
+revision=8
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -39,6 +39,8 @@ replaces="
  libapp<=20140527_2
  libdbusmenu-qt<=0.9.2_4
  libgksu<=2.0.12_5
+ libopenjpeg<=1.5.2_2
+ libopenjpeg-devel<=1.5.2_2
  libqzeitgeist<=0.8.0_6
  livewallpaper<=0.5.0_2
  llvm3.9<=3.9.1_5

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [WIP] openimageio 2.2.10.1
  2021-01-10 15:20 [PR PATCH] [WIP] openimageio 2.2.10.1 sgn
@ 2021-02-26  9:39 ` biopsin
  2021-02-26 10:09 ` biopsin
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: biopsin @ 2021-02-26  9:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 272 bytes --]

New comment by biopsin on void-packages repository

https://github.com/void-linux/void-packages/pull/27808#issuecomment-786530628

Comment:
Mind test updating to openimageio to 2.2.11.1 as it builds fine locally (x86_64_glibc).
Also disgard fix-tiff patch it's included.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [WIP] openimageio 2.2.10.1
  2021-01-10 15:20 [PR PATCH] [WIP] openimageio 2.2.10.1 sgn
  2021-02-26  9:39 ` biopsin
@ 2021-02-26 10:09 ` biopsin
  2021-04-28  5:46 ` biopsin
  2021-04-28  5:57 ` [PR PATCH] [Closed]: " sgn
  3 siblings, 0 replies; 5+ messages in thread
From: biopsin @ 2021-02-26 10:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

New comment by biopsin on void-packages repository

https://github.com/void-linux/void-packages/pull/27808#issuecomment-786530628

Comment:
Mind test updating to openimageio to 2.2.11.1 as it builds fine locally (x86_64_glibc).
Also disgard fix-tiff patch it's included.
Edit: successfully built blender-2.92.0 now.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [WIP] openimageio 2.2.10.1
  2021-01-10 15:20 [PR PATCH] [WIP] openimageio 2.2.10.1 sgn
  2021-02-26  9:39 ` biopsin
  2021-02-26 10:09 ` biopsin
@ 2021-04-28  5:46 ` biopsin
  2021-04-28  5:57 ` [PR PATCH] [Closed]: " sgn
  3 siblings, 0 replies; 5+ messages in thread
From: biopsin @ 2021-04-28  5:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 218 bytes --]

New comment by biopsin on void-packages repository

https://github.com/void-linux/void-packages/pull/27808#issuecomment-828162271

Comment:
Please close
(merged https://github.com/void-linux/void-packages/pull/30286)

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Closed]: [WIP] openimageio 2.2.10.1
  2021-01-10 15:20 [PR PATCH] [WIP] openimageio 2.2.10.1 sgn
                   ` (2 preceding siblings ...)
  2021-04-28  5:46 ` biopsin
@ 2021-04-28  5:57 ` sgn
  3 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2021-04-28  5:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 160 bytes --]

There's a closed pull request on the void-packages repository

[WIP] openimageio 2.2.10.1
https://github.com/void-linux/void-packages/pull/27808

Description:


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-04-28  5:57 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-10 15:20 [PR PATCH] [WIP] openimageio 2.2.10.1 sgn
2021-02-26  9:39 ` biopsin
2021-02-26 10:09 ` biopsin
2021-04-28  5:46 ` biopsin
2021-04-28  5:57 ` [PR PATCH] [Closed]: " sgn

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).