* [PR PATCH] blender 2.92.0 1
@ 2021-04-17 20:00 Gottox
2021-04-17 20:10 ` [PR PATCH] [Updated] " Gottox
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Gottox @ 2021-04-17 20:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 456 bytes --]
There is a new pull request by Gottox against master on the void-packages repository
https://github.com/Gottox/void-packages blender-2.92.0_1
https://github.com/void-linux/void-packages/pull/30286
blender 2.92.0 1
- pugixml: update to 1.11.4.
- New package: ptex-2.3.2
- New package: Field3D-1.7.3
- openimageio: update to 2.2.13.1.
- blender: update to 2.92.0.
A patch file from https://github.com/void-linux/void-packages/pull/30286.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-blender-2.92.0_1-30286.patch --]
[-- Type: text/x-diff, Size: 35006 bytes --]
From 2ed0c27d22772d617950d368a8179da7fb0946d1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 16 Apr 2021 20:42:58 +0200
Subject: [PATCH 1/5] pugixml: update to 1.11.4.
---
srcpkgs/pugixml/patches/pkg-config.patch | 18 ------------------
srcpkgs/pugixml/template | 6 +++---
2 files changed, 3 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/pugixml/patches/pkg-config.patch
diff --git a/srcpkgs/pugixml/patches/pkg-config.patch b/srcpkgs/pugixml/patches/pkg-config.patch
deleted file mode 100644
index d021d58889f9..000000000000
--- a/srcpkgs/pugixml/patches/pkg-config.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- CMakeLists.txt.bak 2017-09-30 16:33:46.956774231 +0200
-+++ CMakeLists.txt 2017-09-30 16:34:08.857775066 +0200
-@@ -52,7 +52,7 @@
-
- if(BUILD_PKGCONFIG)
- # Install library into its own directory under LIBDIR
-- set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING})
-+ # set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING})
- endif()
-
- install(TARGETS pugixml EXPORT pugixml-config
-@@ -75,4 +75,4 @@
- add_executable(check ${TEST_SOURCES})
- target_link_libraries(check pugixml)
- add_custom_command(TARGET check POST_BUILD COMMAND check WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
--endif()
-\ No newline at end of file
-+endif()
diff --git a/srcpkgs/pugixml/template b/srcpkgs/pugixml/template
index 4e0d5c256f29..45d0d36a67b7 100644
--- a/srcpkgs/pugixml/template
+++ b/srcpkgs/pugixml/template
@@ -1,15 +1,15 @@
# Template file for 'pugixml'
pkgname=pugixml
-version=1.9
+version=1.11.4
revision=1
build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=On -DBUILD_PKGCONFIG=On"
+configure_args="-DBUILD_SHARED_LIBS=On"
short_desc="Light-weight, simple and fast XML parser for C++ with XPath support"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="http://pugixml.org/"
distfiles="http://github.com/zeux/pugixml/releases/download/v${version}/pugixml-${version}.tar.gz"
-checksum=d156d35b83f680e40fd6412c4455fdd03544339779134617b9b28d19e11fdba6
+checksum=8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716
post_install() {
tail -22 readme.txt > LICENSE
From 36d9b09db45a5e8706b3c136ceff5eb7f1dd64ab Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 17 Apr 2021 10:46:05 +0200
Subject: [PATCH 2/5] New package: ptex-2.3.2
---
common/shlibs | 1 +
srcpkgs/ptex-devel | 1 +
srcpkgs/ptex/template | 24 ++++++++++++++++++++++++
3 files changed, 26 insertions(+)
create mode 120000 srcpkgs/ptex-devel
create mode 100644 srcpkgs/ptex/template
diff --git a/common/shlibs b/common/shlibs
index 001fcd56590d..0b6baab49345 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2968,6 +2968,7 @@ libPocoRedis.so.64 poco-1.9.4_3
libPocoEncodings.so.64 poco-1.9.4_3
libPocoNetSSL.so.64 poco-1.9.4_3
libPocoCrypto.so.64 poco-1.9.4_3
+libPtex.so ptex-2.3.2_1
libopenblas.so.0 openblas-0.2.19_1
librtaudio.so.6 rtaudio-5.1.0_1
librtmidi.so.5 rtmidi-4.0.0_1
diff --git a/srcpkgs/ptex-devel b/srcpkgs/ptex-devel
new file mode 120000
index 000000000000..43a4f13c2a2a
--- /dev/null
+++ b/srcpkgs/ptex-devel
@@ -0,0 +1 @@
+ptex
\ No newline at end of file
diff --git a/srcpkgs/ptex/template b/srcpkgs/ptex/template
new file mode 100644
index 000000000000..7f0df5f0e174
--- /dev/null
+++ b/srcpkgs/ptex/template
@@ -0,0 +1,24 @@
+# Template file for 'ptex'
+pkgname=ptex
+version=2.3.2
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="zlib-devel"
+configure_args="-DPTEX_VER=$version"
+short_desc="Per-Face Texture Mapping for Production Rendering"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="http://ptex.us/"
+distfiles="https://github.com/wdas/ptex/archive/refs/tags/v${version}.tar.gz"
+checksum=30aeb85b965ca542a8945b75285cd67d8e207d23dbb57fcfeaab587bb443402b
+
+ptex-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/share/cmake
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ }
+}
From f9aa59b60bcee7886d8eedfb0a5b1bf8f72bd588 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 17 Apr 2021 11:52:02 +0200
Subject: [PATCH 3/5] New package: Field3D-1.7.3
---
common/shlibs | 1 +
srcpkgs/Field3D-devel | 1 +
srcpkgs/Field3D/template | 21 +++++++++++++++++++++
3 files changed, 23 insertions(+)
create mode 120000 srcpkgs/Field3D-devel
create mode 100644 srcpkgs/Field3D/template
diff --git a/common/shlibs b/common/shlibs
index 0b6baab49345..c9aff5b33017 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -412,6 +412,7 @@ libproxy.so.1 libproxy-0.4.6_1
libmoar.so MoarVM-2015.11_1
libFLAC.so.8 libflac-1.2.1_1
libFLAC++.so.6 libflac-1.2.1_1
+libField3D.so.1.7 Field3D-1.7.3_1
libMAC.so.6 libMAC-5.28_1
libmad.so.0 libmad-0.15.1b_1
libmatroska.so.7 libmatroska-1.6.0_1
diff --git a/srcpkgs/Field3D-devel b/srcpkgs/Field3D-devel
new file mode 120000
index 000000000000..7482d5683e82
--- /dev/null
+++ b/srcpkgs/Field3D-devel
@@ -0,0 +1 @@
+Field3D
\ No newline at end of file
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
new file mode 100644
index 000000000000..a9791dbfde40
--- /dev/null
+++ b/srcpkgs/Field3D/template
@@ -0,0 +1,21 @@
+# Template file for 'Field3D'
+pkgname=Field3D
+version=1.7.3
+revision=1
+build_style=cmake
+makedepends="boost-devel hdf5-devel ilmbase-devel"
+short_desc="Library for storing voxel data on disk and in memory"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/imageworks/Field3D/wiki/Field3D-Home"
+distfiles="https://github.com/imageworks/Field3D/archive/refs/tags/v${version}.tar.gz"
+checksum=b6168bc27abe0f5e9b8d01af7794b3268ae301ac72b753712df93125d51a0fd4
+
+Field3D-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} $makedepends"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ }
+}
From dd420277e28f03e40946565c283cb0287d9b7ea3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 16 Apr 2021 21:18:16 +0200
Subject: [PATCH 4/5] openimageio: update to 2.2.13.1.
---
common/shlibs | 4 +-
.../patches/find-openexr-cmake.patch | 197 ------------------
.../openimageio/patches/fix-tiff-4.2.0.patch | 23 --
srcpkgs/openimageio/template | 17 +-
4 files changed, 12 insertions(+), 229 deletions(-)
delete mode 100644 srcpkgs/openimageio/patches/find-openexr-cmake.patch
delete mode 100644 srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch
diff --git a/common/shlibs b/common/shlibs
index c9aff5b33017..d9983efa5f26 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2164,8 +2164,8 @@ libgom-1.0.so.0 gom-0.3.0_1
libetpan.so.20 libetpan-1.9.3_4
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.13.1_1
+libOpenImageIO.so.2.2 openimageio-2.2.13.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 c17c383371f8..000000000000
--- 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/patches/fix-tiff-4.2.0.patch b/srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch
deleted file mode 100644
index 20ba5792f7d1..000000000000
--- a/srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/libOpenImageIO/exif.cpp 2018-12-01 17:42:08.000000000 +0100
-+++ src/libOpenImageIO/exif.cpp 2021-01-16 13:30:01.747255896 +0100
-@@ -212,7 +212,7 @@
- };
-
-
--
-+#if !defined(GPSTAG_VERSIONID)
- enum GPSTag {
- GPSTAG_VERSIONID = 0,
- GPSTAG_LATITUDEREF = 1, GPSTAG_LATITUDE = 2,
-@@ -237,6 +237,11 @@
- GPSTAG_DIFFERENTIAL = 30,
- GPSTAG_HPOSITIONINGERROR = 31
- };
-+#endif
-+#if !defined(GPSTAG_HPOSITIONINGERROR)
-+/* The tiff.h tag name differs from the one used here */
-+#define GPSTAG_HPOSITIONINGERROR GPSTAG_GPSHPOSITIONINGERROR
-+#endif
-
- static const EXIF_tag_info gps_tag_table[] = {
- { GPSTAG_VERSIONID, "GPS:VersionID", TIFF_BYTE, 4 },
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bcab0e90b7d0..525b159fad92 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,22 +1,25 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=1.8.17
-revision=3
+version=2.2.13.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
+configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
-DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config git"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
- ffmpeg-devel opencolorio-devel"
+ ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
+ Field3D-devel"
short_desc="Library for reading and writing images"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="BSD"
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=7f810124e866ac14ad9c11b0ab528a6ed4c8e62a190cc44a77eed8159f57405c
+# Runs checks even for features we disabled.
+make_check=no
CXXFLAGS="-faligned-new"
case "$XBPS_TARGET_MACHINE" in
@@ -48,7 +51,7 @@ pre_build() {
}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md LICENSE
}
openimageio-devel_package() {
From 3d78f2c51ddbc214925ca84926be997437a7b4f4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 16 Apr 2021 20:31:28 +0200
Subject: [PATCH 5/5] blender: update to 2.92.0.
---
.../{musl.patch => 0001-musl-fixes.patch} | 77 ++++++++-----------
.../patches/0002-fix-linking-issue.patch | 25 ++++++
...-increase-thread-stack-size-for-musl.patch | 50 ++++++++++++
srcpkgs/blender/patches/altivec-all.patch | 32 --------
...patch => no-Werror-double-promotion.patch} | 12 ++-
srcpkgs/blender/patches/python39.patch | 25 ------
srcpkgs/blender/template | 17 ++--
7 files changed, 124 insertions(+), 114 deletions(-)
rename srcpkgs/blender/patches/{musl.patch => 0001-musl-fixes.patch} (53%)
create mode 100644 srcpkgs/blender/patches/0002-fix-linking-issue.patch
create mode 100644 srcpkgs/blender/patches/0003-increase-thread-stack-size-for-musl.patch
delete mode 100644 srcpkgs/blender/patches/altivec-all.patch
rename srcpkgs/blender/patches/{disable_werror.patch => no-Werror-double-promotion.patch} (51%)
delete mode 100644 srcpkgs/blender/patches/python39.patch
diff --git a/srcpkgs/blender/patches/musl.patch b/srcpkgs/blender/patches/0001-musl-fixes.patch
similarity index 53%
rename from srcpkgs/blender/patches/musl.patch
rename to srcpkgs/blender/patches/0001-musl-fixes.patch
index 5cfded1586d0..4e74ad816055 100644
--- a/srcpkgs/blender/patches/musl.patch
+++ b/srcpkgs/blender/patches/0001-musl-fixes.patch
@@ -1,46 +1,21 @@
-From 8f2b2e92ffdec658d4eb999f41acf6c74a5b32ed Mon Sep 17 00:00:00 2001
-From: Leon Marz <lmarz@cs.uni-frankfurt.de>
-Date: Tue, 1 Sep 2020 09:09:50 +0200
-Subject: [PATCH 1/2] musl fixes
-
-[ Taken from https://git.alpinelinux.org/aports/plain/testing/blender/0001-musl-fixes.patch ]
+Imported from https://git.alpinelinux.org/aports/plain/testing/blender/0001-musl-fixes.patch?id=42cee48643cb6ccc1a110e66446aa74408ee0160
-Original Patch by Nathanael Copa
+From e530dc5b32695c208aa46bfe460ac7d76159a6d3 Mon Sep 17 00:00:00 2001
+From: Leon Marz <lmarz@cs.uni-frankfurt.de>
+Date: Wed, 25 Nov 2020 10:10:41 +0100
+Subject: [PATCH 1/3] musl fixes
+Original patch by Nathanael Copa
---
- CMakeLists.txt | 13 +++++++++++++
- intern/guardedalloc/intern/mallocn_intern.h | 2 +-
- intern/libc_compat/libc_compat.c | 2 --
- source/blender/blenlib/intern/system.c | 4 +++-
- source/creator/creator_signals.c | 2 +-
- 5 files changed, 18 insertions(+), 5 deletions(-)
+ intern/guardedalloc/intern/mallocn_intern.h | 2 +-
+ intern/libc_compat/libc_compat.c | 2 --
+ source/blender/blenlib/intern/system.c | 4 +++-
+ source/blender/gpu/GPU_vertex_buffer.h | 1 -
+ source/creator/creator_signals.c | 2 +-
+ 5 files changed, 5 insertions(+), 6 deletions(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cee8675..111e6e3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -138,6 +138,19 @@ get_blender_version()
- #-----------------------------------------------------------------------------
- # Options
-
-+# musl-libc related checks (missing execinfo.h and feenableexcept())
-+include(CheckIncludeFiles)
-+check_include_files(execinfo.h HAVE_EXECINFO_H)
-+if(HAVE_EXECINFO_H)
-+ add_definitions(-DHAVE_EXECINFO_H)
-+endif()
-+
-+include(CheckLibraryExists)
-+check_library_exists(m feenableexcept "fenv.h" HAVE_FEENABLEEXCEPT)
-+if(HAVE_FEENABLEEXCEPT)
-+ add_definitions(-DHAVE_FEENABLEEXCEPT)
-+endif()
-+
- # Blender internal features
- option(WITH_BLENDER "Build blender (disable to build only the blender player)" ON)
- mark_as_advanced(WITH_BLENDER)
diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h
-index 8fc3e43..ee443c4 100644
+index aa95615..f7e347d 100644
--- a/intern/guardedalloc/intern/mallocn_intern.h
+++ b/intern/guardedalloc/intern/mallocn_intern.h
@@ -33,7 +33,7 @@
@@ -48,7 +23,7 @@ index 8fc3e43..ee443c4 100644
#define USE_MALLOC_USABLE_SIZE /* internal, when we have malloc_usable_size() */
-#if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \
-+#if defined(__linux__) && defined(HAVE_EXECINFO_H) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \
++#if defined(__linux__) && !defined(__MUSL__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \
defined(__GLIBC__)
# include <malloc.h>
# define HAVE_MALLOC_STATS
@@ -71,14 +46,14 @@ index 78e387e..d21c281 100644
-# endif /* __GLIBC_PREREQ */
#endif /* __linux__ */
diff --git a/source/blender/blenlib/intern/system.c b/source/blender/blenlib/intern/system.c
-index 20edbb9..6e856cd 100644
+index 8e3d489..4d0789b 100644
--- a/source/blender/blenlib/intern/system.c
+++ b/source/blender/blenlib/intern/system.c
@@ -35,7 +35,9 @@
# include "BLI_winstuff.h"
#else
-+#if defined(HAVE_EXECINFO_H)
++#if !defined(__MUSL__)
# include <execinfo.h>
+#endif
# include <unistd.h>
@@ -89,12 +64,24 @@ index 20edbb9..6e856cd 100644
/* ------------- */
/* Linux / Apple */
-# if defined(__linux__) || defined(__APPLE__)
-+# if defined(__linux__) && defined(HAVE_EXECINFO_H) || defined(__APPLE__)
++# if defined(__linux__) && !defined(__MUSL__) || defined(__APPLE__)
# define SIZE 100
void *buffer[SIZE];
+diff --git a/source/blender/gpu/GPU_vertex_buffer.h b/source/blender/gpu/GPU_vertex_buffer.h
+index eeaebd3..93a77a2 100644
+--- a/source/blender/gpu/GPU_vertex_buffer.h
++++ b/source/blender/gpu/GPU_vertex_buffer.h
+@@ -118,7 +118,6 @@ GPU_INLINE void *GPU_vertbuf_raw_step(GPUVertBufRaw *a)
+ {
+ unsigned char *data = a->data;
+ a->data += a->stride;
+- BLI_assert(data < a->_data_end);
+ return (void *)data;
+ }
+
diff --git a/source/creator/creator_signals.c b/source/creator/creator_signals.c
-index ad0b7b2..01d5e37 100644
+index 29e12a9..d90da8f 100644
--- a/source/creator/creator_signals.c
+++ b/source/creator/creator_signals.c
@@ -269,7 +269,7 @@ void main_signal_setup_fpe(void)
@@ -102,10 +89,10 @@ index ad0b7b2..01d5e37 100644
signal(SIGFPE, sig_handle_fpe);
-# if defined(__linux__) && defined(__GNUC__)
-+# if defined(__linux__) && defined(__GNUC__) && defined(HAVE_FEENABLEEXCEPT)
++# if defined(__linux__) && defined(__GNUC__) && !defined(__MUSL__)
feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
# endif /* defined(__linux__) && defined(__GNUC__) */
# if defined(OSX_SSE_FPE)
--
-2.28.0
+2.30.1
diff --git a/srcpkgs/blender/patches/0002-fix-linking-issue.patch b/srcpkgs/blender/patches/0002-fix-linking-issue.patch
new file mode 100644
index 000000000000..28683714e126
--- /dev/null
+++ b/srcpkgs/blender/patches/0002-fix-linking-issue.patch
@@ -0,0 +1,25 @@
+Imported from https://git.alpinelinux.org/aports/plain/testing/blender/0002-fix-linking-issue.patch?id=42cee48643cb6ccc1a110e66446aa74408ee0160
+
+From 54f5929131f537b6cbb74b5a7da45858cef6020b Mon Sep 17 00:00:00 2001
+From: Leon Marz <lmarz@cs.uni-frankfurt.de>
+Date: Tue, 1 Sep 2020 09:11:18 +0200
+Subject: [PATCH 2/3] fix linking issue
+
+---
+ intern/ghost/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
+index 1739659..d6b442b 100644
+--- a/intern/ghost/CMakeLists.txt
++++ b/intern/ghost/CMakeLists.txt
+@@ -484,5 +484,5 @@ if(WITH_XR_OPENXR)
+ endif()
+
+ add_definitions(${GL_DEFINITIONS})
+-
++list(APPEND LIB "-lX11" "-lXi" "-lXxf86vm" "-lXfixes" "-lXrender")
+ blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+--
+2.30.1
+
diff --git a/srcpkgs/blender/patches/0003-increase-thread-stack-size-for-musl.patch b/srcpkgs/blender/patches/0003-increase-thread-stack-size-for-musl.patch
new file mode 100644
index 000000000000..72c723027a8b
--- /dev/null
+++ b/srcpkgs/blender/patches/0003-increase-thread-stack-size-for-musl.patch
@@ -0,0 +1,50 @@
+Imported from https://git.alpinelinux.org/aports/plain/testing/blender/0003-increase-thread-stack-size-for-musl.patch?id=42cee48643cb6ccc1a110e66446aa74408ee0160
+
+From 3c99b60fddf616268347b3569fea480076c00bef Mon Sep 17 00:00:00 2001
+From: Damian Kurek <starfire24680@gmail.com>
+Date: Sun, 22 Nov 2020 02:03:11 +0100
+Subject: [PATCH 3/3] increase thread stack size for musl
+
+---
+ intern/cycles/util/util_thread.cpp | 4 ++--
+ intern/cycles/util/util_thread.h | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/intern/cycles/util/util_thread.cpp b/intern/cycles/util/util_thread.cpp
+index cccde5a..4bf62d5 100644
+--- a/intern/cycles/util/util_thread.cpp
++++ b/intern/cycles/util/util_thread.cpp
+@@ -23,7 +23,7 @@ CCL_NAMESPACE_BEGIN
+
+ thread::thread(function<void()> run_cb, int node) : run_cb_(run_cb), joined_(false), node_(node)
+ {
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__MUSL__)
+ /* Set the stack size to 2MB to match Linux. The default 512KB on macOS is
+ * too small for Embree, and consistent stack size also makes things more
+ * predictable in general. */
+@@ -56,7 +56,7 @@ void *thread::run(void *arg)
+ bool thread::join()
+ {
+ joined_ = true;
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__MUSL__)
+ return pthread_join(pthread_id, NULL) == 0;
+ #else
+ try {
+diff --git a/intern/cycles/util/util_thread.h b/intern/cycles/util/util_thread.h
+index 29f9bec..58a63ce 100644
+--- a/intern/cycles/util/util_thread.h
++++ b/intern/cycles/util/util_thread.h
+@@ -56,7 +56,7 @@ class thread {
+
+ protected:
+ function<void()> run_cb_;
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__MUSL__)
+ pthread_t pthread_id;
+ #else
+ std::thread std_thread;
+--
+2.30.1
+
diff --git a/srcpkgs/blender/patches/altivec-all.patch b/srcpkgs/blender/patches/altivec-all.patch
deleted file mode 100644
index 115e1ea6fd03..000000000000
--- a/srcpkgs/blender/patches/altivec-all.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-This applies a better workaround for C++ type conflicts
-in AltiVec/C++, allowing it to build on BE ppc(64).
-
---- a/extern/clew/include/clew.h
-+++ b/extern/clew/include/clew.h
-@@ -370,15 +370,18 @@ typedef unsigned int cl_GLenum;
-
- /* Define basic vector types */
- /* Workaround for ppc64el platform: conflicts with bool from C++. */
--#if defined( __VEC__ ) && !(defined(__PPC64__) && defined(__LITTLE_ENDIAN__))
-+#if defined(__VEC__)
- #include <altivec.h> /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
-- typedef vector unsigned char __cl_uchar16;
-- typedef vector signed char __cl_char16;
-- typedef vector unsigned short __cl_ushort8;
-- typedef vector signed short __cl_short8;
-- typedef vector unsigned int __cl_uint4;
-- typedef vector signed int __cl_int4;
-- typedef vector float __cl_float4;
-+ #undef vector
-+ #undef bool
-+ #undef pixel
-+ typedef __vector unsigned char __cl_uchar16;
-+ typedef __vector signed char __cl_char16;
-+ typedef __vector unsigned short __cl_ushort8;
-+ typedef __vector signed short __cl_short8;
-+ typedef __vector unsigned int __cl_uint4;
-+ typedef __vector signed int __cl_int4;
-+ typedef __vector float __cl_float4;
- #define __CL_UCHAR16__ 1
- #define __CL_CHAR16__ 1
- #define __CL_USHORT8__ 1
diff --git a/srcpkgs/blender/patches/disable_werror.patch b/srcpkgs/blender/patches/no-Werror-double-promotion.patch
similarity index 51%
rename from srcpkgs/blender/patches/disable_werror.patch
rename to srcpkgs/blender/patches/no-Werror-double-promotion.patch
index 9fada907e1ce..2d17a6da1818 100644
--- a/srcpkgs/blender/patches/disable_werror.patch
+++ b/srcpkgs/blender/patches/no-Werror-double-promotion.patch
@@ -1,13 +1,11 @@
-diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
-index f22688f..c32aad1 100644
---- a/intern/cycles/CMakeLists.txt
-+++ b/intern/cycles/CMakeLists.txt
-@@ -227,8 +227,6 @@ endif()
-
+--- ./intern/cycles/CMakeLists.txt.orig 2021-04-16 20:47:50.466754473 +0200
++++ ./intern/cycles/CMakeLists.txt 2021-04-16 20:48:06.199903232 +0200
+@@ -336,7 +336,7 @@ endif()
# Warnings
if(CMAKE_COMPILER_IS_GNUCXX)
-- ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion")
+ ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion")
- ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion")
++ #ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion")
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_no_error_unused_macros "-Wno-error=unused-macros")
unset(_has_cxxflag_float_conversion)
unset(_has_cxxflag_double_promotion)
diff --git a/srcpkgs/blender/patches/python39.patch b/srcpkgs/blender/patches/python39.patch
deleted file mode 100644
index 1e14eb062035..000000000000
--- a/srcpkgs/blender/patches/python39.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-The deprecated PyEval_ReleaseLock() triggers a segfault with Python 3.9.0.
-See issue at https://developer.blender.org/T81688 and fix at
-https://developer.blender.org/rB5edba9b42f684bf8b99894bb6988e7f46180e12c
-
---- a/source/blender/python/generic/bpy_threads.c 2020-10-13 15:29:16.708347045 -0400
-+++ b/source/blender/python/generic/bpy_threads.c 2020-10-13 15:29:43.123345331 -0400
-@@ -29,14 +29,11 @@
- /* analogue of PyEval_SaveThread() */
- BPy_ThreadStatePtr BPY_thread_save(void)
- {
-- PyThreadState *tstate = PyThreadState_Swap(NULL);
-- /* note: tstate can be NULL when quitting Blender */
--
-- if (tstate && PyEval_ThreadsInitialized()) {
-- PyEval_ReleaseLock();
-+ /* The thread-state can be NULL when quitting Blender. */
-+ if (_PyThreadState_UncheckedGet()) {
-+ return (BPy_ThreadStatePtr)PyEval_SaveThread();
- }
--
-- return (BPy_ThreadStatePtr)tstate;
-+ return NULL;
- }
-
- /* analogue of PyEval_RestoreThread() */
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 01b3677ff4f6..334ffe0c0118 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
-version=2.90.1
-revision=2
+version=2.92.0
+revision=1
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
@@ -18,19 +18,26 @@ makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm
libopenexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
opencolorio-devel opencollada-devel python3-numpy libXrender-devel
- OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel"
+ OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel
+ pugixml-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="3D graphics creation suite"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.blender.org"
distfiles="http://download.blender.org/source/${pkgname}-${version}.tar.xz"
-checksum=e78dcc946c823ad1bd89bcc6938fc6b375540ec3eff58649586acf1f6a653d99
+checksum=e791cfc403292383577c3c8ce2cd34e5aa2cd8da0a7483041049a1609ddb4595
python_version=3
+CXXFLAGS="-DNDEBUG"
+CFLAGS="$CXXFLAGS"
patch_args="-Np1"
case "$XBPS_TARGET_MACHINE" in
- *-musl) ;;
+ *-musl)
+ # Make the alpine patches work
+ CXXFLAGS+=" -D__MUSL__"
+ CFLAGS+=" -D__MUSL__"
+ ;;
*) makedepends+=" jemalloc-devel" ;;
esac
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] blender 2.92.0 1
2021-04-17 20:00 [PR PATCH] blender 2.92.0 1 Gottox
@ 2021-04-17 20:10 ` Gottox
2021-04-18 6:07 ` Gottox
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Gottox @ 2021-04-17 20:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 553 bytes --]
There is an updated pull request by Gottox against master on the void-packages repository
https://github.com/Gottox/void-packages blender-2.92.0_1
https://github.com/void-linux/void-packages/pull/30286
blender 2.92.0 1
- pugixml: update to 1.11.4.
- New package: ptex-2.3.2
- New package: Field3D-1.7.3
- openimageio: update to 2.2.13.1.
- blender: update to 2.92.0.
TODO:
* [ ] remove luxmark from repository
* [ ] remove luxrays from repository
A patch file from https://github.com/void-linux/void-packages/pull/30286.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-blender-2.92.0_1-30286.patch --]
[-- Type: text/x-diff, Size: 35136 bytes --]
From 2ed0c27d22772d617950d368a8179da7fb0946d1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 16 Apr 2021 20:42:58 +0200
Subject: [PATCH 1/5] pugixml: update to 1.11.4.
---
srcpkgs/pugixml/patches/pkg-config.patch | 18 ------------------
srcpkgs/pugixml/template | 6 +++---
2 files changed, 3 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/pugixml/patches/pkg-config.patch
diff --git a/srcpkgs/pugixml/patches/pkg-config.patch b/srcpkgs/pugixml/patches/pkg-config.patch
deleted file mode 100644
index d021d58889f9..000000000000
--- a/srcpkgs/pugixml/patches/pkg-config.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- CMakeLists.txt.bak 2017-09-30 16:33:46.956774231 +0200
-+++ CMakeLists.txt 2017-09-30 16:34:08.857775066 +0200
-@@ -52,7 +52,7 @@
-
- if(BUILD_PKGCONFIG)
- # Install library into its own directory under LIBDIR
-- set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING})
-+ # set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING})
- endif()
-
- install(TARGETS pugixml EXPORT pugixml-config
-@@ -75,4 +75,4 @@
- add_executable(check ${TEST_SOURCES})
- target_link_libraries(check pugixml)
- add_custom_command(TARGET check POST_BUILD COMMAND check WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
--endif()
-\ No newline at end of file
-+endif()
diff --git a/srcpkgs/pugixml/template b/srcpkgs/pugixml/template
index 4e0d5c256f29..45d0d36a67b7 100644
--- a/srcpkgs/pugixml/template
+++ b/srcpkgs/pugixml/template
@@ -1,15 +1,15 @@
# Template file for 'pugixml'
pkgname=pugixml
-version=1.9
+version=1.11.4
revision=1
build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=On -DBUILD_PKGCONFIG=On"
+configure_args="-DBUILD_SHARED_LIBS=On"
short_desc="Light-weight, simple and fast XML parser for C++ with XPath support"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="http://pugixml.org/"
distfiles="http://github.com/zeux/pugixml/releases/download/v${version}/pugixml-${version}.tar.gz"
-checksum=d156d35b83f680e40fd6412c4455fdd03544339779134617b9b28d19e11fdba6
+checksum=8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716
post_install() {
tail -22 readme.txt > LICENSE
From c39ae4bad3302fcb4581c5c016edad4a08eda013 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 17 Apr 2021 10:46:05 +0200
Subject: [PATCH 2/5] New package: ptex-2.3.2
---
common/shlibs | 1 +
srcpkgs/ptex-devel | 1 +
srcpkgs/ptex/template | 29 +++++++++++++++++++++++++++++
3 files changed, 31 insertions(+)
create mode 120000 srcpkgs/ptex-devel
create mode 100644 srcpkgs/ptex/template
diff --git a/common/shlibs b/common/shlibs
index 001fcd56590d..0b6baab49345 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2968,6 +2968,7 @@ libPocoRedis.so.64 poco-1.9.4_3
libPocoEncodings.so.64 poco-1.9.4_3
libPocoNetSSL.so.64 poco-1.9.4_3
libPocoCrypto.so.64 poco-1.9.4_3
+libPtex.so ptex-2.3.2_1
libopenblas.so.0 openblas-0.2.19_1
librtaudio.so.6 rtaudio-5.1.0_1
librtmidi.so.5 rtmidi-4.0.0_1
diff --git a/srcpkgs/ptex-devel b/srcpkgs/ptex-devel
new file mode 120000
index 000000000000..43a4f13c2a2a
--- /dev/null
+++ b/srcpkgs/ptex-devel
@@ -0,0 +1 @@
+ptex
\ No newline at end of file
diff --git a/srcpkgs/ptex/template b/srcpkgs/ptex/template
new file mode 100644
index 000000000000..f6a5347ccb44
--- /dev/null
+++ b/srcpkgs/ptex/template
@@ -0,0 +1,29 @@
+# Template file for 'ptex'
+pkgname=ptex
+version=2.3.2
+revision=1
+build_style=cmake
+configure_args="-DPTEX_VER=$version"
+hostmakedepends="pkg-config"
+makedepends="zlib-devel"
+short_desc="Per-Face Texture Mapping for Production Rendering"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="http://ptex.us/"
+distfiles="https://github.com/wdas/ptex/archive/refs/tags/v${version}.tar.gz"
+checksum=30aeb85b965ca542a8945b75285cd67d8e207d23dbb57fcfeaab587bb443402b
+
+post_install() {
+ sed '1,/\/\*/d;/\*\//,$d' src/ptex/PtexCache.h > LICENSE
+ vlicense LICENSE
+}
+
+ptex-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/share/cmake
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ }
+}
From fc5a464b2ccf4a137998e0169bbaf9fce898bc39 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 17 Apr 2021 11:52:02 +0200
Subject: [PATCH 3/5] New package: Field3D-1.7.3
---
common/shlibs | 1 +
srcpkgs/Field3D-devel | 1 +
srcpkgs/Field3D/template | 21 +++++++++++++++++++++
3 files changed, 23 insertions(+)
create mode 120000 srcpkgs/Field3D-devel
create mode 100644 srcpkgs/Field3D/template
diff --git a/common/shlibs b/common/shlibs
index 0b6baab49345..c9aff5b33017 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -412,6 +412,7 @@ libproxy.so.1 libproxy-0.4.6_1
libmoar.so MoarVM-2015.11_1
libFLAC.so.8 libflac-1.2.1_1
libFLAC++.so.6 libflac-1.2.1_1
+libField3D.so.1.7 Field3D-1.7.3_1
libMAC.so.6 libMAC-5.28_1
libmad.so.0 libmad-0.15.1b_1
libmatroska.so.7 libmatroska-1.6.0_1
diff --git a/srcpkgs/Field3D-devel b/srcpkgs/Field3D-devel
new file mode 120000
index 000000000000..7482d5683e82
--- /dev/null
+++ b/srcpkgs/Field3D-devel
@@ -0,0 +1 @@
+Field3D
\ No newline at end of file
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
new file mode 100644
index 000000000000..a9791dbfde40
--- /dev/null
+++ b/srcpkgs/Field3D/template
@@ -0,0 +1,21 @@
+# Template file for 'Field3D'
+pkgname=Field3D
+version=1.7.3
+revision=1
+build_style=cmake
+makedepends="boost-devel hdf5-devel ilmbase-devel"
+short_desc="Library for storing voxel data on disk and in memory"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/imageworks/Field3D/wiki/Field3D-Home"
+distfiles="https://github.com/imageworks/Field3D/archive/refs/tags/v${version}.tar.gz"
+checksum=b6168bc27abe0f5e9b8d01af7794b3268ae301ac72b753712df93125d51a0fd4
+
+Field3D-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} $makedepends"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ }
+}
From 06382c0a1a3ba72c916b9724e0758d75e0a631d4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 16 Apr 2021 21:18:16 +0200
Subject: [PATCH 4/5] openimageio: update to 2.2.13.1.
---
common/shlibs | 4 +-
.../patches/find-openexr-cmake.patch | 197 ------------------
.../openimageio/patches/fix-tiff-4.2.0.patch | 23 --
srcpkgs/openimageio/template | 19 +-
4 files changed, 13 insertions(+), 230 deletions(-)
delete mode 100644 srcpkgs/openimageio/patches/find-openexr-cmake.patch
delete mode 100644 srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch
diff --git a/common/shlibs b/common/shlibs
index c9aff5b33017..d9983efa5f26 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2164,8 +2164,8 @@ libgom-1.0.so.0 gom-0.3.0_1
libetpan.so.20 libetpan-1.9.3_4
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.13.1_1
+libOpenImageIO.so.2.2 openimageio-2.2.13.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 c17c383371f8..000000000000
--- 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/patches/fix-tiff-4.2.0.patch b/srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch
deleted file mode 100644
index 20ba5792f7d1..000000000000
--- a/srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/libOpenImageIO/exif.cpp 2018-12-01 17:42:08.000000000 +0100
-+++ src/libOpenImageIO/exif.cpp 2021-01-16 13:30:01.747255896 +0100
-@@ -212,7 +212,7 @@
- };
-
-
--
-+#if !defined(GPSTAG_VERSIONID)
- enum GPSTag {
- GPSTAG_VERSIONID = 0,
- GPSTAG_LATITUDEREF = 1, GPSTAG_LATITUDE = 2,
-@@ -237,6 +237,11 @@
- GPSTAG_DIFFERENTIAL = 30,
- GPSTAG_HPOSITIONINGERROR = 31
- };
-+#endif
-+#if !defined(GPSTAG_HPOSITIONINGERROR)
-+/* The tiff.h tag name differs from the one used here */
-+#define GPSTAG_HPOSITIONINGERROR GPSTAG_GPSHPOSITIONINGERROR
-+#endif
-
- static const EXIF_tag_info gps_tag_table[] = {
- { GPSTAG_VERSIONID, "GPS:VersionID", TIFF_BYTE, 4 },
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bcab0e90b7d0..3f35a3a98bb7 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,22 +1,25 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=1.8.17
-revision=3
+version=2.2.13.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
+configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
-DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config git"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
- ffmpeg-devel opencolorio-devel"
+ ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
+ Field3D-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=7f810124e866ac14ad9c11b0ab528a6ed4c8e62a190cc44a77eed8159f57405c
+# Runs checks even for features we disabled.
+make_check=no
CXXFLAGS="-faligned-new"
case "$XBPS_TARGET_MACHINE" in
@@ -48,7 +51,7 @@ pre_build() {
}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md LICENSE
}
openimageio-devel_package() {
From ac33f7d740c2a7f7f2afe6ca5478e8800e81cc95 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 16 Apr 2021 20:31:28 +0200
Subject: [PATCH 5/5] blender: update to 2.92.0.
---
.../{musl.patch => 0001-musl-fixes.patch} | 77 ++++++++-----------
.../patches/0002-fix-linking-issue.patch | 25 ++++++
...-increase-thread-stack-size-for-musl.patch | 50 ++++++++++++
srcpkgs/blender/patches/altivec-all.patch | 32 --------
...patch => no-Werror-double-promotion.patch} | 12 ++-
srcpkgs/blender/patches/python39.patch | 25 ------
srcpkgs/blender/template | 17 ++--
7 files changed, 124 insertions(+), 114 deletions(-)
rename srcpkgs/blender/patches/{musl.patch => 0001-musl-fixes.patch} (53%)
create mode 100644 srcpkgs/blender/patches/0002-fix-linking-issue.patch
create mode 100644 srcpkgs/blender/patches/0003-increase-thread-stack-size-for-musl.patch
delete mode 100644 srcpkgs/blender/patches/altivec-all.patch
rename srcpkgs/blender/patches/{disable_werror.patch => no-Werror-double-promotion.patch} (51%)
delete mode 100644 srcpkgs/blender/patches/python39.patch
diff --git a/srcpkgs/blender/patches/musl.patch b/srcpkgs/blender/patches/0001-musl-fixes.patch
similarity index 53%
rename from srcpkgs/blender/patches/musl.patch
rename to srcpkgs/blender/patches/0001-musl-fixes.patch
index 5cfded1586d0..4e74ad816055 100644
--- a/srcpkgs/blender/patches/musl.patch
+++ b/srcpkgs/blender/patches/0001-musl-fixes.patch
@@ -1,46 +1,21 @@
-From 8f2b2e92ffdec658d4eb999f41acf6c74a5b32ed Mon Sep 17 00:00:00 2001
-From: Leon Marz <lmarz@cs.uni-frankfurt.de>
-Date: Tue, 1 Sep 2020 09:09:50 +0200
-Subject: [PATCH 1/2] musl fixes
-
-[ Taken from https://git.alpinelinux.org/aports/plain/testing/blender/0001-musl-fixes.patch ]
+Imported from https://git.alpinelinux.org/aports/plain/testing/blender/0001-musl-fixes.patch?id=42cee48643cb6ccc1a110e66446aa74408ee0160
-Original Patch by Nathanael Copa
+From e530dc5b32695c208aa46bfe460ac7d76159a6d3 Mon Sep 17 00:00:00 2001
+From: Leon Marz <lmarz@cs.uni-frankfurt.de>
+Date: Wed, 25 Nov 2020 10:10:41 +0100
+Subject: [PATCH 1/3] musl fixes
+Original patch by Nathanael Copa
---
- CMakeLists.txt | 13 +++++++++++++
- intern/guardedalloc/intern/mallocn_intern.h | 2 +-
- intern/libc_compat/libc_compat.c | 2 --
- source/blender/blenlib/intern/system.c | 4 +++-
- source/creator/creator_signals.c | 2 +-
- 5 files changed, 18 insertions(+), 5 deletions(-)
+ intern/guardedalloc/intern/mallocn_intern.h | 2 +-
+ intern/libc_compat/libc_compat.c | 2 --
+ source/blender/blenlib/intern/system.c | 4 +++-
+ source/blender/gpu/GPU_vertex_buffer.h | 1 -
+ source/creator/creator_signals.c | 2 +-
+ 5 files changed, 5 insertions(+), 6 deletions(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cee8675..111e6e3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -138,6 +138,19 @@ get_blender_version()
- #-----------------------------------------------------------------------------
- # Options
-
-+# musl-libc related checks (missing execinfo.h and feenableexcept())
-+include(CheckIncludeFiles)
-+check_include_files(execinfo.h HAVE_EXECINFO_H)
-+if(HAVE_EXECINFO_H)
-+ add_definitions(-DHAVE_EXECINFO_H)
-+endif()
-+
-+include(CheckLibraryExists)
-+check_library_exists(m feenableexcept "fenv.h" HAVE_FEENABLEEXCEPT)
-+if(HAVE_FEENABLEEXCEPT)
-+ add_definitions(-DHAVE_FEENABLEEXCEPT)
-+endif()
-+
- # Blender internal features
- option(WITH_BLENDER "Build blender (disable to build only the blender player)" ON)
- mark_as_advanced(WITH_BLENDER)
diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h
-index 8fc3e43..ee443c4 100644
+index aa95615..f7e347d 100644
--- a/intern/guardedalloc/intern/mallocn_intern.h
+++ b/intern/guardedalloc/intern/mallocn_intern.h
@@ -33,7 +33,7 @@
@@ -48,7 +23,7 @@ index 8fc3e43..ee443c4 100644
#define USE_MALLOC_USABLE_SIZE /* internal, when we have malloc_usable_size() */
-#if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \
-+#if defined(__linux__) && defined(HAVE_EXECINFO_H) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \
++#if defined(__linux__) && !defined(__MUSL__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \
defined(__GLIBC__)
# include <malloc.h>
# define HAVE_MALLOC_STATS
@@ -71,14 +46,14 @@ index 78e387e..d21c281 100644
-# endif /* __GLIBC_PREREQ */
#endif /* __linux__ */
diff --git a/source/blender/blenlib/intern/system.c b/source/blender/blenlib/intern/system.c
-index 20edbb9..6e856cd 100644
+index 8e3d489..4d0789b 100644
--- a/source/blender/blenlib/intern/system.c
+++ b/source/blender/blenlib/intern/system.c
@@ -35,7 +35,9 @@
# include "BLI_winstuff.h"
#else
-+#if defined(HAVE_EXECINFO_H)
++#if !defined(__MUSL__)
# include <execinfo.h>
+#endif
# include <unistd.h>
@@ -89,12 +64,24 @@ index 20edbb9..6e856cd 100644
/* ------------- */
/* Linux / Apple */
-# if defined(__linux__) || defined(__APPLE__)
-+# if defined(__linux__) && defined(HAVE_EXECINFO_H) || defined(__APPLE__)
++# if defined(__linux__) && !defined(__MUSL__) || defined(__APPLE__)
# define SIZE 100
void *buffer[SIZE];
+diff --git a/source/blender/gpu/GPU_vertex_buffer.h b/source/blender/gpu/GPU_vertex_buffer.h
+index eeaebd3..93a77a2 100644
+--- a/source/blender/gpu/GPU_vertex_buffer.h
++++ b/source/blender/gpu/GPU_vertex_buffer.h
+@@ -118,7 +118,6 @@ GPU_INLINE void *GPU_vertbuf_raw_step(GPUVertBufRaw *a)
+ {
+ unsigned char *data = a->data;
+ a->data += a->stride;
+- BLI_assert(data < a->_data_end);
+ return (void *)data;
+ }
+
diff --git a/source/creator/creator_signals.c b/source/creator/creator_signals.c
-index ad0b7b2..01d5e37 100644
+index 29e12a9..d90da8f 100644
--- a/source/creator/creator_signals.c
+++ b/source/creator/creator_signals.c
@@ -269,7 +269,7 @@ void main_signal_setup_fpe(void)
@@ -102,10 +89,10 @@ index ad0b7b2..01d5e37 100644
signal(SIGFPE, sig_handle_fpe);
-# if defined(__linux__) && defined(__GNUC__)
-+# if defined(__linux__) && defined(__GNUC__) && defined(HAVE_FEENABLEEXCEPT)
++# if defined(__linux__) && defined(__GNUC__) && !defined(__MUSL__)
feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
# endif /* defined(__linux__) && defined(__GNUC__) */
# if defined(OSX_SSE_FPE)
--
-2.28.0
+2.30.1
diff --git a/srcpkgs/blender/patches/0002-fix-linking-issue.patch b/srcpkgs/blender/patches/0002-fix-linking-issue.patch
new file mode 100644
index 000000000000..28683714e126
--- /dev/null
+++ b/srcpkgs/blender/patches/0002-fix-linking-issue.patch
@@ -0,0 +1,25 @@
+Imported from https://git.alpinelinux.org/aports/plain/testing/blender/0002-fix-linking-issue.patch?id=42cee48643cb6ccc1a110e66446aa74408ee0160
+
+From 54f5929131f537b6cbb74b5a7da45858cef6020b Mon Sep 17 00:00:00 2001
+From: Leon Marz <lmarz@cs.uni-frankfurt.de>
+Date: Tue, 1 Sep 2020 09:11:18 +0200
+Subject: [PATCH 2/3] fix linking issue
+
+---
+ intern/ghost/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
+index 1739659..d6b442b 100644
+--- a/intern/ghost/CMakeLists.txt
++++ b/intern/ghost/CMakeLists.txt
+@@ -484,5 +484,5 @@ if(WITH_XR_OPENXR)
+ endif()
+
+ add_definitions(${GL_DEFINITIONS})
+-
++list(APPEND LIB "-lX11" "-lXi" "-lXxf86vm" "-lXfixes" "-lXrender")
+ blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+--
+2.30.1
+
diff --git a/srcpkgs/blender/patches/0003-increase-thread-stack-size-for-musl.patch b/srcpkgs/blender/patches/0003-increase-thread-stack-size-for-musl.patch
new file mode 100644
index 000000000000..72c723027a8b
--- /dev/null
+++ b/srcpkgs/blender/patches/0003-increase-thread-stack-size-for-musl.patch
@@ -0,0 +1,50 @@
+Imported from https://git.alpinelinux.org/aports/plain/testing/blender/0003-increase-thread-stack-size-for-musl.patch?id=42cee48643cb6ccc1a110e66446aa74408ee0160
+
+From 3c99b60fddf616268347b3569fea480076c00bef Mon Sep 17 00:00:00 2001
+From: Damian Kurek <starfire24680@gmail.com>
+Date: Sun, 22 Nov 2020 02:03:11 +0100
+Subject: [PATCH 3/3] increase thread stack size for musl
+
+---
+ intern/cycles/util/util_thread.cpp | 4 ++--
+ intern/cycles/util/util_thread.h | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/intern/cycles/util/util_thread.cpp b/intern/cycles/util/util_thread.cpp
+index cccde5a..4bf62d5 100644
+--- a/intern/cycles/util/util_thread.cpp
++++ b/intern/cycles/util/util_thread.cpp
+@@ -23,7 +23,7 @@ CCL_NAMESPACE_BEGIN
+
+ thread::thread(function<void()> run_cb, int node) : run_cb_(run_cb), joined_(false), node_(node)
+ {
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__MUSL__)
+ /* Set the stack size to 2MB to match Linux. The default 512KB on macOS is
+ * too small for Embree, and consistent stack size also makes things more
+ * predictable in general. */
+@@ -56,7 +56,7 @@ void *thread::run(void *arg)
+ bool thread::join()
+ {
+ joined_ = true;
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__MUSL__)
+ return pthread_join(pthread_id, NULL) == 0;
+ #else
+ try {
+diff --git a/intern/cycles/util/util_thread.h b/intern/cycles/util/util_thread.h
+index 29f9bec..58a63ce 100644
+--- a/intern/cycles/util/util_thread.h
++++ b/intern/cycles/util/util_thread.h
+@@ -56,7 +56,7 @@ class thread {
+
+ protected:
+ function<void()> run_cb_;
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__MUSL__)
+ pthread_t pthread_id;
+ #else
+ std::thread std_thread;
+--
+2.30.1
+
diff --git a/srcpkgs/blender/patches/altivec-all.patch b/srcpkgs/blender/patches/altivec-all.patch
deleted file mode 100644
index 115e1ea6fd03..000000000000
--- a/srcpkgs/blender/patches/altivec-all.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-This applies a better workaround for C++ type conflicts
-in AltiVec/C++, allowing it to build on BE ppc(64).
-
---- a/extern/clew/include/clew.h
-+++ b/extern/clew/include/clew.h
-@@ -370,15 +370,18 @@ typedef unsigned int cl_GLenum;
-
- /* Define basic vector types */
- /* Workaround for ppc64el platform: conflicts with bool from C++. */
--#if defined( __VEC__ ) && !(defined(__PPC64__) && defined(__LITTLE_ENDIAN__))
-+#if defined(__VEC__)
- #include <altivec.h> /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
-- typedef vector unsigned char __cl_uchar16;
-- typedef vector signed char __cl_char16;
-- typedef vector unsigned short __cl_ushort8;
-- typedef vector signed short __cl_short8;
-- typedef vector unsigned int __cl_uint4;
-- typedef vector signed int __cl_int4;
-- typedef vector float __cl_float4;
-+ #undef vector
-+ #undef bool
-+ #undef pixel
-+ typedef __vector unsigned char __cl_uchar16;
-+ typedef __vector signed char __cl_char16;
-+ typedef __vector unsigned short __cl_ushort8;
-+ typedef __vector signed short __cl_short8;
-+ typedef __vector unsigned int __cl_uint4;
-+ typedef __vector signed int __cl_int4;
-+ typedef __vector float __cl_float4;
- #define __CL_UCHAR16__ 1
- #define __CL_CHAR16__ 1
- #define __CL_USHORT8__ 1
diff --git a/srcpkgs/blender/patches/disable_werror.patch b/srcpkgs/blender/patches/no-Werror-double-promotion.patch
similarity index 51%
rename from srcpkgs/blender/patches/disable_werror.patch
rename to srcpkgs/blender/patches/no-Werror-double-promotion.patch
index 9fada907e1ce..2d17a6da1818 100644
--- a/srcpkgs/blender/patches/disable_werror.patch
+++ b/srcpkgs/blender/patches/no-Werror-double-promotion.patch
@@ -1,13 +1,11 @@
-diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
-index f22688f..c32aad1 100644
---- a/intern/cycles/CMakeLists.txt
-+++ b/intern/cycles/CMakeLists.txt
-@@ -227,8 +227,6 @@ endif()
-
+--- ./intern/cycles/CMakeLists.txt.orig 2021-04-16 20:47:50.466754473 +0200
++++ ./intern/cycles/CMakeLists.txt 2021-04-16 20:48:06.199903232 +0200
+@@ -336,7 +336,7 @@ endif()
# Warnings
if(CMAKE_COMPILER_IS_GNUCXX)
-- ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion")
+ ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion")
- ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion")
++ #ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion")
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_no_error_unused_macros "-Wno-error=unused-macros")
unset(_has_cxxflag_float_conversion)
unset(_has_cxxflag_double_promotion)
diff --git a/srcpkgs/blender/patches/python39.patch b/srcpkgs/blender/patches/python39.patch
deleted file mode 100644
index 1e14eb062035..000000000000
--- a/srcpkgs/blender/patches/python39.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-The deprecated PyEval_ReleaseLock() triggers a segfault with Python 3.9.0.
-See issue at https://developer.blender.org/T81688 and fix at
-https://developer.blender.org/rB5edba9b42f684bf8b99894bb6988e7f46180e12c
-
---- a/source/blender/python/generic/bpy_threads.c 2020-10-13 15:29:16.708347045 -0400
-+++ b/source/blender/python/generic/bpy_threads.c 2020-10-13 15:29:43.123345331 -0400
-@@ -29,14 +29,11 @@
- /* analogue of PyEval_SaveThread() */
- BPy_ThreadStatePtr BPY_thread_save(void)
- {
-- PyThreadState *tstate = PyThreadState_Swap(NULL);
-- /* note: tstate can be NULL when quitting Blender */
--
-- if (tstate && PyEval_ThreadsInitialized()) {
-- PyEval_ReleaseLock();
-+ /* The thread-state can be NULL when quitting Blender. */
-+ if (_PyThreadState_UncheckedGet()) {
-+ return (BPy_ThreadStatePtr)PyEval_SaveThread();
- }
--
-- return (BPy_ThreadStatePtr)tstate;
-+ return NULL;
- }
-
- /* analogue of PyEval_RestoreThread() */
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 01b3677ff4f6..334ffe0c0118 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
-version=2.90.1
-revision=2
+version=2.92.0
+revision=1
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
@@ -18,19 +18,26 @@ makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm
libopenexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
opencolorio-devel opencollada-devel python3-numpy libXrender-devel
- OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel"
+ OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel
+ pugixml-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="3D graphics creation suite"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.blender.org"
distfiles="http://download.blender.org/source/${pkgname}-${version}.tar.xz"
-checksum=e78dcc946c823ad1bd89bcc6938fc6b375540ec3eff58649586acf1f6a653d99
+checksum=e791cfc403292383577c3c8ce2cd34e5aa2cd8da0a7483041049a1609ddb4595
python_version=3
+CXXFLAGS="-DNDEBUG"
+CFLAGS="$CXXFLAGS"
patch_args="-Np1"
case "$XBPS_TARGET_MACHINE" in
- *-musl) ;;
+ *-musl)
+ # Make the alpine patches work
+ CXXFLAGS+=" -D__MUSL__"
+ CFLAGS+=" -D__MUSL__"
+ ;;
*) makedepends+=" jemalloc-devel" ;;
esac
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] blender 2.92.0 1
2021-04-17 20:00 [PR PATCH] blender 2.92.0 1 Gottox
2021-04-17 20:10 ` [PR PATCH] [Updated] " Gottox
@ 2021-04-18 6:07 ` Gottox
2021-04-18 6:09 ` Gottox
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Gottox @ 2021-04-18 6:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 553 bytes --]
There is an updated pull request by Gottox against master on the void-packages repository
https://github.com/Gottox/void-packages blender-2.92.0_1
https://github.com/void-linux/void-packages/pull/30286
blender 2.92.0 1
- pugixml: update to 1.11.4.
- New package: ptex-2.3.2
- New package: Field3D-1.7.3
- openimageio: update to 2.2.13.1.
- blender: update to 2.92.0.
TODO:
* [ ] remove luxmark from repository
* [ ] remove luxrays from repository
A patch file from https://github.com/void-linux/void-packages/pull/30286.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-blender-2.92.0_1-30286.patch --]
[-- Type: text/x-diff, Size: 32855 bytes --]
From 13e4b29e907badde7bf389b3742b82f627c97dba Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 16 Apr 2021 20:42:58 +0200
Subject: [PATCH 1/5] pugixml: update to 1.11.4.
---
srcpkgs/pugixml/patches/pkg-config.patch | 18 ------------------
srcpkgs/pugixml/template | 6 +++---
2 files changed, 3 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/pugixml/patches/pkg-config.patch
diff --git a/srcpkgs/pugixml/patches/pkg-config.patch b/srcpkgs/pugixml/patches/pkg-config.patch
deleted file mode 100644
index d021d58889f9..000000000000
--- a/srcpkgs/pugixml/patches/pkg-config.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- CMakeLists.txt.bak 2017-09-30 16:33:46.956774231 +0200
-+++ CMakeLists.txt 2017-09-30 16:34:08.857775066 +0200
-@@ -52,7 +52,7 @@
-
- if(BUILD_PKGCONFIG)
- # Install library into its own directory under LIBDIR
-- set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING})
-+ # set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING})
- endif()
-
- install(TARGETS pugixml EXPORT pugixml-config
-@@ -75,4 +75,4 @@
- add_executable(check ${TEST_SOURCES})
- target_link_libraries(check pugixml)
- add_custom_command(TARGET check POST_BUILD COMMAND check WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
--endif()
-\ No newline at end of file
-+endif()
diff --git a/srcpkgs/pugixml/template b/srcpkgs/pugixml/template
index 4e0d5c256f29..45d0d36a67b7 100644
--- a/srcpkgs/pugixml/template
+++ b/srcpkgs/pugixml/template
@@ -1,15 +1,15 @@
# Template file for 'pugixml'
pkgname=pugixml
-version=1.9
+version=1.11.4
revision=1
build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=On -DBUILD_PKGCONFIG=On"
+configure_args="-DBUILD_SHARED_LIBS=On"
short_desc="Light-weight, simple and fast XML parser for C++ with XPath support"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="http://pugixml.org/"
distfiles="http://github.com/zeux/pugixml/releases/download/v${version}/pugixml-${version}.tar.gz"
-checksum=d156d35b83f680e40fd6412c4455fdd03544339779134617b9b28d19e11fdba6
+checksum=8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716
post_install() {
tail -22 readme.txt > LICENSE
From 214018319a17cef7d4ef5d73e596a947632a0f8e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 17 Apr 2021 10:46:05 +0200
Subject: [PATCH 2/5] New package: ptex-2.3.2
---
common/shlibs | 1 +
srcpkgs/ptex-devel | 1 +
srcpkgs/ptex/template | 29 +++++++++++++++++++++++++++++
3 files changed, 31 insertions(+)
create mode 120000 srcpkgs/ptex-devel
create mode 100644 srcpkgs/ptex/template
diff --git a/common/shlibs b/common/shlibs
index 001fcd56590d..0b6baab49345 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2968,6 +2968,7 @@ libPocoRedis.so.64 poco-1.9.4_3
libPocoEncodings.so.64 poco-1.9.4_3
libPocoNetSSL.so.64 poco-1.9.4_3
libPocoCrypto.so.64 poco-1.9.4_3
+libPtex.so ptex-2.3.2_1
libopenblas.so.0 openblas-0.2.19_1
librtaudio.so.6 rtaudio-5.1.0_1
librtmidi.so.5 rtmidi-4.0.0_1
diff --git a/srcpkgs/ptex-devel b/srcpkgs/ptex-devel
new file mode 120000
index 000000000000..43a4f13c2a2a
--- /dev/null
+++ b/srcpkgs/ptex-devel
@@ -0,0 +1 @@
+ptex
\ No newline at end of file
diff --git a/srcpkgs/ptex/template b/srcpkgs/ptex/template
new file mode 100644
index 000000000000..f6a5347ccb44
--- /dev/null
+++ b/srcpkgs/ptex/template
@@ -0,0 +1,29 @@
+# Template file for 'ptex'
+pkgname=ptex
+version=2.3.2
+revision=1
+build_style=cmake
+configure_args="-DPTEX_VER=$version"
+hostmakedepends="pkg-config"
+makedepends="zlib-devel"
+short_desc="Per-Face Texture Mapping for Production Rendering"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="http://ptex.us/"
+distfiles="https://github.com/wdas/ptex/archive/refs/tags/v${version}.tar.gz"
+checksum=30aeb85b965ca542a8945b75285cd67d8e207d23dbb57fcfeaab587bb443402b
+
+post_install() {
+ sed '1,/\/\*/d;/\*\//,$d' src/ptex/PtexCache.h > LICENSE
+ vlicense LICENSE
+}
+
+ptex-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/share/cmake
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ }
+}
From 162550848a1238140602c394c244246e281f0353 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 17 Apr 2021 11:52:02 +0200
Subject: [PATCH 3/5] New package: Field3D-1.7.3
---
common/shlibs | 1 +
srcpkgs/Field3D-devel | 1 +
srcpkgs/Field3D/template | 21 +++++++++++++++++++++
3 files changed, 23 insertions(+)
create mode 120000 srcpkgs/Field3D-devel
create mode 100644 srcpkgs/Field3D/template
diff --git a/common/shlibs b/common/shlibs
index 0b6baab49345..c9aff5b33017 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -412,6 +412,7 @@ libproxy.so.1 libproxy-0.4.6_1
libmoar.so MoarVM-2015.11_1
libFLAC.so.8 libflac-1.2.1_1
libFLAC++.so.6 libflac-1.2.1_1
+libField3D.so.1.7 Field3D-1.7.3_1
libMAC.so.6 libMAC-5.28_1
libmad.so.0 libmad-0.15.1b_1
libmatroska.so.7 libmatroska-1.6.0_1
diff --git a/srcpkgs/Field3D-devel b/srcpkgs/Field3D-devel
new file mode 120000
index 000000000000..7482d5683e82
--- /dev/null
+++ b/srcpkgs/Field3D-devel
@@ -0,0 +1 @@
+Field3D
\ No newline at end of file
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
new file mode 100644
index 000000000000..a9791dbfde40
--- /dev/null
+++ b/srcpkgs/Field3D/template
@@ -0,0 +1,21 @@
+# Template file for 'Field3D'
+pkgname=Field3D
+version=1.7.3
+revision=1
+build_style=cmake
+makedepends="boost-devel hdf5-devel ilmbase-devel"
+short_desc="Library for storing voxel data on disk and in memory"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/imageworks/Field3D/wiki/Field3D-Home"
+distfiles="https://github.com/imageworks/Field3D/archive/refs/tags/v${version}.tar.gz"
+checksum=b6168bc27abe0f5e9b8d01af7794b3268ae301ac72b753712df93125d51a0fd4
+
+Field3D-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} $makedepends"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ }
+}
From 7fdc360b8b2b1188572fb3b703420294a839ec07 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 16 Apr 2021 21:18:16 +0200
Subject: [PATCH 4/5] openimageio: update to 2.2.13.1.
---
common/shlibs | 4 +-
.../patches/find-openexr-cmake.patch | 197 ------------------
.../openimageio/patches/fix-tiff-4.2.0.patch | 23 --
srcpkgs/openimageio/template | 19 +-
4 files changed, 13 insertions(+), 230 deletions(-)
delete mode 100644 srcpkgs/openimageio/patches/find-openexr-cmake.patch
delete mode 100644 srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch
diff --git a/common/shlibs b/common/shlibs
index c9aff5b33017..d9983efa5f26 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2164,8 +2164,8 @@ libgom-1.0.so.0 gom-0.3.0_1
libetpan.so.20 libetpan-1.9.3_4
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.13.1_1
+libOpenImageIO.so.2.2 openimageio-2.2.13.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 c17c383371f8..000000000000
--- 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/patches/fix-tiff-4.2.0.patch b/srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch
deleted file mode 100644
index 20ba5792f7d1..000000000000
--- a/srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/libOpenImageIO/exif.cpp 2018-12-01 17:42:08.000000000 +0100
-+++ src/libOpenImageIO/exif.cpp 2021-01-16 13:30:01.747255896 +0100
-@@ -212,7 +212,7 @@
- };
-
-
--
-+#if !defined(GPSTAG_VERSIONID)
- enum GPSTag {
- GPSTAG_VERSIONID = 0,
- GPSTAG_LATITUDEREF = 1, GPSTAG_LATITUDE = 2,
-@@ -237,6 +237,11 @@
- GPSTAG_DIFFERENTIAL = 30,
- GPSTAG_HPOSITIONINGERROR = 31
- };
-+#endif
-+#if !defined(GPSTAG_HPOSITIONINGERROR)
-+/* The tiff.h tag name differs from the one used here */
-+#define GPSTAG_HPOSITIONINGERROR GPSTAG_GPSHPOSITIONINGERROR
-+#endif
-
- static const EXIF_tag_info gps_tag_table[] = {
- { GPSTAG_VERSIONID, "GPS:VersionID", TIFF_BYTE, 4 },
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bcab0e90b7d0..3f35a3a98bb7 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,22 +1,25 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=1.8.17
-revision=3
+version=2.2.13.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
+configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
-DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config git"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
- ffmpeg-devel opencolorio-devel"
+ ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
+ Field3D-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=7f810124e866ac14ad9c11b0ab528a6ed4c8e62a190cc44a77eed8159f57405c
+# Runs checks even for features we disabled.
+make_check=no
CXXFLAGS="-faligned-new"
case "$XBPS_TARGET_MACHINE" in
@@ -48,7 +51,7 @@ pre_build() {
}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md LICENSE
}
openimageio-devel_package() {
From b2bcb9db7a868802a4d4134eb52e0d6b95a1664c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 16 Apr 2021 20:31:28 +0200
Subject: [PATCH 5/5] blender: update to 2.92.0.
---
.../{musl.patch => 0001-musl-fixes.patch} | 81 ++++++++-----------
.../patches/0002-fix-linking-issue.patch | 25 ++++++
srcpkgs/blender/patches/altivec-all.patch | 32 --------
...patch => no-Werror-double-promotion.patch} | 12 ++-
srcpkgs/blender/patches/python39.patch | 25 ------
srcpkgs/blender/template | 12 ++-
6 files changed, 72 insertions(+), 115 deletions(-)
rename srcpkgs/blender/patches/{musl.patch => 0001-musl-fixes.patch} (52%)
create mode 100644 srcpkgs/blender/patches/0002-fix-linking-issue.patch
delete mode 100644 srcpkgs/blender/patches/altivec-all.patch
rename srcpkgs/blender/patches/{disable_werror.patch => no-Werror-double-promotion.patch} (51%)
delete mode 100644 srcpkgs/blender/patches/python39.patch
diff --git a/srcpkgs/blender/patches/musl.patch b/srcpkgs/blender/patches/0001-musl-fixes.patch
similarity index 52%
rename from srcpkgs/blender/patches/musl.patch
rename to srcpkgs/blender/patches/0001-musl-fixes.patch
index 5cfded1586d0..0700382f2bfe 100644
--- a/srcpkgs/blender/patches/musl.patch
+++ b/srcpkgs/blender/patches/0001-musl-fixes.patch
@@ -1,55 +1,30 @@
-From 8f2b2e92ffdec658d4eb999f41acf6c74a5b32ed Mon Sep 17 00:00:00 2001
-From: Leon Marz <lmarz@cs.uni-frankfurt.de>
-Date: Tue, 1 Sep 2020 09:09:50 +0200
-Subject: [PATCH 1/2] musl fixes
-
-[ Taken from https://git.alpinelinux.org/aports/plain/testing/blender/0001-musl-fixes.patch ]
+Imported from https://git.alpinelinux.org/aports/plain/testing/blender/0001-musl-fixes.patch?id=42cee48643cb6ccc1a110e66446aa74408ee0160
+adapted to not use __MUSL__ definition
-Original Patch by Nathanael Copa
+From e530dc5b32695c208aa46bfe460ac7d76159a6d3 Mon Sep 17 00:00:00 2001
+From: Leon Marz <lmarz@cs.uni-frankfurt.de>
+Date: Wed, 25 Nov 2020 10:10:41 +0100
+Subject: [PATCH 1/3] musl fixes
+Original patch by Nathanael Copa
---
- CMakeLists.txt | 13 +++++++++++++
- intern/guardedalloc/intern/mallocn_intern.h | 2 +-
- intern/libc_compat/libc_compat.c | 2 --
- source/blender/blenlib/intern/system.c | 4 +++-
- source/creator/creator_signals.c | 2 +-
- 5 files changed, 18 insertions(+), 5 deletions(-)
+ intern/guardedalloc/intern/mallocn_intern.h | 2 +-
+ intern/libc_compat/libc_compat.c | 2 --
+ source/blender/blenlib/intern/system.c | 4 +++-
+ source/blender/gpu/GPU_vertex_buffer.h | 1 -
+ source/creator/creator_signals.c | 2 +-
+ 5 files changed, 5 insertions(+), 6 deletions(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cee8675..111e6e3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -138,6 +138,19 @@ get_blender_version()
- #-----------------------------------------------------------------------------
- # Options
-
-+# musl-libc related checks (missing execinfo.h and feenableexcept())
-+include(CheckIncludeFiles)
-+check_include_files(execinfo.h HAVE_EXECINFO_H)
-+if(HAVE_EXECINFO_H)
-+ add_definitions(-DHAVE_EXECINFO_H)
-+endif()
-+
-+include(CheckLibraryExists)
-+check_library_exists(m feenableexcept "fenv.h" HAVE_FEENABLEEXCEPT)
-+if(HAVE_FEENABLEEXCEPT)
-+ add_definitions(-DHAVE_FEENABLEEXCEPT)
-+endif()
-+
- # Blender internal features
- option(WITH_BLENDER "Build blender (disable to build only the blender player)" ON)
- mark_as_advanced(WITH_BLENDER)
diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h
-index 8fc3e43..ee443c4 100644
+index aa95615..f7e347d 100644
--- a/intern/guardedalloc/intern/mallocn_intern.h
+++ b/intern/guardedalloc/intern/mallocn_intern.h
-@@ -33,7 +33,7 @@
+@@ -33,7 +33,6 @@
#undef HAVE_MALLOC_STATS
#define USE_MALLOC_USABLE_SIZE /* internal, when we have malloc_usable_size() */
-#if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \
-+#if defined(__linux__) && defined(HAVE_EXECINFO_H) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \
- defined(__GLIBC__)
++#if (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || defined(__GLIBC__)
# include <malloc.h>
# define HAVE_MALLOC_STATS
diff --git a/intern/libc_compat/libc_compat.c b/intern/libc_compat/libc_compat.c
@@ -71,14 +46,14 @@ index 78e387e..d21c281 100644
-# endif /* __GLIBC_PREREQ */
#endif /* __linux__ */
diff --git a/source/blender/blenlib/intern/system.c b/source/blender/blenlib/intern/system.c
-index 20edbb9..6e856cd 100644
+index 8e3d489..4d0789b 100644
--- a/source/blender/blenlib/intern/system.c
+++ b/source/blender/blenlib/intern/system.c
@@ -35,7 +35,9 @@
# include "BLI_winstuff.h"
#else
-+#if defined(HAVE_EXECINFO_H)
++#if defined(__GLIBC__)
# include <execinfo.h>
+#endif
# include <unistd.h>
@@ -89,12 +64,24 @@ index 20edbb9..6e856cd 100644
/* ------------- */
/* Linux / Apple */
-# if defined(__linux__) || defined(__APPLE__)
-+# if defined(__linux__) && defined(HAVE_EXECINFO_H) || defined(__APPLE__)
++# if defined(__linux__) && defined(__GLIBC__) || defined(__APPLE__)
# define SIZE 100
void *buffer[SIZE];
+diff --git a/source/blender/gpu/GPU_vertex_buffer.h b/source/blender/gpu/GPU_vertex_buffer.h
+index eeaebd3..93a77a2 100644
+--- a/source/blender/gpu/GPU_vertex_buffer.h
++++ b/source/blender/gpu/GPU_vertex_buffer.h
+@@ -118,7 +118,6 @@ GPU_INLINE void *GPU_vertbuf_raw_step(GPUVertBufRaw *a)
+ {
+ unsigned char *data = a->data;
+ a->data += a->stride;
+- BLI_assert(data < a->_data_end);
+ return (void *)data;
+ }
+
diff --git a/source/creator/creator_signals.c b/source/creator/creator_signals.c
-index ad0b7b2..01d5e37 100644
+index 29e12a9..d90da8f 100644
--- a/source/creator/creator_signals.c
+++ b/source/creator/creator_signals.c
@@ -269,7 +269,7 @@ void main_signal_setup_fpe(void)
@@ -102,10 +89,10 @@ index ad0b7b2..01d5e37 100644
signal(SIGFPE, sig_handle_fpe);
-# if defined(__linux__) && defined(__GNUC__)
-+# if defined(__linux__) && defined(__GNUC__) && defined(HAVE_FEENABLEEXCEPT)
++# if defined(__linux__) && defined(__GNUC__) && defined(__GLIBC__)
feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
# endif /* defined(__linux__) && defined(__GNUC__) */
# if defined(OSX_SSE_FPE)
--
-2.28.0
+2.30.1
diff --git a/srcpkgs/blender/patches/0002-fix-linking-issue.patch b/srcpkgs/blender/patches/0002-fix-linking-issue.patch
new file mode 100644
index 000000000000..28683714e126
--- /dev/null
+++ b/srcpkgs/blender/patches/0002-fix-linking-issue.patch
@@ -0,0 +1,25 @@
+Imported from https://git.alpinelinux.org/aports/plain/testing/blender/0002-fix-linking-issue.patch?id=42cee48643cb6ccc1a110e66446aa74408ee0160
+
+From 54f5929131f537b6cbb74b5a7da45858cef6020b Mon Sep 17 00:00:00 2001
+From: Leon Marz <lmarz@cs.uni-frankfurt.de>
+Date: Tue, 1 Sep 2020 09:11:18 +0200
+Subject: [PATCH 2/3] fix linking issue
+
+---
+ intern/ghost/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
+index 1739659..d6b442b 100644
+--- a/intern/ghost/CMakeLists.txt
++++ b/intern/ghost/CMakeLists.txt
+@@ -484,5 +484,5 @@ if(WITH_XR_OPENXR)
+ endif()
+
+ add_definitions(${GL_DEFINITIONS})
+-
++list(APPEND LIB "-lX11" "-lXi" "-lXxf86vm" "-lXfixes" "-lXrender")
+ blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+--
+2.30.1
+
diff --git a/srcpkgs/blender/patches/altivec-all.patch b/srcpkgs/blender/patches/altivec-all.patch
deleted file mode 100644
index 115e1ea6fd03..000000000000
--- a/srcpkgs/blender/patches/altivec-all.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-This applies a better workaround for C++ type conflicts
-in AltiVec/C++, allowing it to build on BE ppc(64).
-
---- a/extern/clew/include/clew.h
-+++ b/extern/clew/include/clew.h
-@@ -370,15 +370,18 @@ typedef unsigned int cl_GLenum;
-
- /* Define basic vector types */
- /* Workaround for ppc64el platform: conflicts with bool from C++. */
--#if defined( __VEC__ ) && !(defined(__PPC64__) && defined(__LITTLE_ENDIAN__))
-+#if defined(__VEC__)
- #include <altivec.h> /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
-- typedef vector unsigned char __cl_uchar16;
-- typedef vector signed char __cl_char16;
-- typedef vector unsigned short __cl_ushort8;
-- typedef vector signed short __cl_short8;
-- typedef vector unsigned int __cl_uint4;
-- typedef vector signed int __cl_int4;
-- typedef vector float __cl_float4;
-+ #undef vector
-+ #undef bool
-+ #undef pixel
-+ typedef __vector unsigned char __cl_uchar16;
-+ typedef __vector signed char __cl_char16;
-+ typedef __vector unsigned short __cl_ushort8;
-+ typedef __vector signed short __cl_short8;
-+ typedef __vector unsigned int __cl_uint4;
-+ typedef __vector signed int __cl_int4;
-+ typedef __vector float __cl_float4;
- #define __CL_UCHAR16__ 1
- #define __CL_CHAR16__ 1
- #define __CL_USHORT8__ 1
diff --git a/srcpkgs/blender/patches/disable_werror.patch b/srcpkgs/blender/patches/no-Werror-double-promotion.patch
similarity index 51%
rename from srcpkgs/blender/patches/disable_werror.patch
rename to srcpkgs/blender/patches/no-Werror-double-promotion.patch
index 9fada907e1ce..2d17a6da1818 100644
--- a/srcpkgs/blender/patches/disable_werror.patch
+++ b/srcpkgs/blender/patches/no-Werror-double-promotion.patch
@@ -1,13 +1,11 @@
-diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
-index f22688f..c32aad1 100644
---- a/intern/cycles/CMakeLists.txt
-+++ b/intern/cycles/CMakeLists.txt
-@@ -227,8 +227,6 @@ endif()
-
+--- ./intern/cycles/CMakeLists.txt.orig 2021-04-16 20:47:50.466754473 +0200
++++ ./intern/cycles/CMakeLists.txt 2021-04-16 20:48:06.199903232 +0200
+@@ -336,7 +336,7 @@ endif()
# Warnings
if(CMAKE_COMPILER_IS_GNUCXX)
-- ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion")
+ ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion")
- ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion")
++ #ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion")
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_no_error_unused_macros "-Wno-error=unused-macros")
unset(_has_cxxflag_float_conversion)
unset(_has_cxxflag_double_promotion)
diff --git a/srcpkgs/blender/patches/python39.patch b/srcpkgs/blender/patches/python39.patch
deleted file mode 100644
index 1e14eb062035..000000000000
--- a/srcpkgs/blender/patches/python39.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-The deprecated PyEval_ReleaseLock() triggers a segfault with Python 3.9.0.
-See issue at https://developer.blender.org/T81688 and fix at
-https://developer.blender.org/rB5edba9b42f684bf8b99894bb6988e7f46180e12c
-
---- a/source/blender/python/generic/bpy_threads.c 2020-10-13 15:29:16.708347045 -0400
-+++ b/source/blender/python/generic/bpy_threads.c 2020-10-13 15:29:43.123345331 -0400
-@@ -29,14 +29,11 @@
- /* analogue of PyEval_SaveThread() */
- BPy_ThreadStatePtr BPY_thread_save(void)
- {
-- PyThreadState *tstate = PyThreadState_Swap(NULL);
-- /* note: tstate can be NULL when quitting Blender */
--
-- if (tstate && PyEval_ThreadsInitialized()) {
-- PyEval_ReleaseLock();
-+ /* The thread-state can be NULL when quitting Blender. */
-+ if (_PyThreadState_UncheckedGet()) {
-+ return (BPy_ThreadStatePtr)PyEval_SaveThread();
- }
--
-- return (BPy_ThreadStatePtr)tstate;
-+ return NULL;
- }
-
- /* analogue of PyEval_RestoreThread() */
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 01b3677ff4f6..c2f50e341abf 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
-version=2.90.1
-revision=2
+version=2.92.0
+revision=1
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
@@ -18,15 +18,19 @@ makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm
libopenexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
opencolorio-devel opencollada-devel python3-numpy libXrender-devel
- OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel"
+ OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel
+ pugixml-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="3D graphics creation suite"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.blender.org"
distfiles="http://download.blender.org/source/${pkgname}-${version}.tar.xz"
-checksum=e78dcc946c823ad1bd89bcc6938fc6b375540ec3eff58649586acf1f6a653d99
+checksum=e791cfc403292383577c3c8ce2cd34e5aa2cd8da0a7483041049a1609ddb4595
python_version=3
+CXXFLAGS="-DNDEBUG"
+CFLAGS="$CXXFLAGS"
+LDFLAGS="-Wl,-z,stack-size=2097152"
patch_args="-Np1"
case "$XBPS_TARGET_MACHINE" in
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] blender 2.92.0 1
2021-04-17 20:00 [PR PATCH] blender 2.92.0 1 Gottox
2021-04-17 20:10 ` [PR PATCH] [Updated] " Gottox
2021-04-18 6:07 ` Gottox
@ 2021-04-18 6:09 ` Gottox
2021-04-18 6:19 ` Gottox
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Gottox @ 2021-04-18 6:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 553 bytes --]
There is an updated pull request by Gottox against master on the void-packages repository
https://github.com/Gottox/void-packages blender-2.92.0_1
https://github.com/void-linux/void-packages/pull/30286
blender 2.92.0 1
- pugixml: update to 1.11.4.
- New package: ptex-2.3.2
- New package: Field3D-1.7.3
- openimageio: update to 2.2.13.1.
- blender: update to 2.92.0.
TODO:
* [ ] remove luxmark from repository
* [ ] remove luxrays from repository
A patch file from https://github.com/void-linux/void-packages/pull/30286.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-blender-2.92.0_1-30286.patch --]
[-- Type: text/x-diff, Size: 32855 bytes --]
From f4352fbadc040673d6c5844efdba5aad86a3e6de Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 16 Apr 2021 20:42:58 +0200
Subject: [PATCH 1/5] pugixml: update to 1.11.4.
---
srcpkgs/pugixml/patches/pkg-config.patch | 18 ------------------
srcpkgs/pugixml/template | 6 +++---
2 files changed, 3 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/pugixml/patches/pkg-config.patch
diff --git a/srcpkgs/pugixml/patches/pkg-config.patch b/srcpkgs/pugixml/patches/pkg-config.patch
deleted file mode 100644
index d021d58889f9..000000000000
--- a/srcpkgs/pugixml/patches/pkg-config.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- CMakeLists.txt.bak 2017-09-30 16:33:46.956774231 +0200
-+++ CMakeLists.txt 2017-09-30 16:34:08.857775066 +0200
-@@ -52,7 +52,7 @@
-
- if(BUILD_PKGCONFIG)
- # Install library into its own directory under LIBDIR
-- set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING})
-+ # set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING})
- endif()
-
- install(TARGETS pugixml EXPORT pugixml-config
-@@ -75,4 +75,4 @@
- add_executable(check ${TEST_SOURCES})
- target_link_libraries(check pugixml)
- add_custom_command(TARGET check POST_BUILD COMMAND check WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
--endif()
-\ No newline at end of file
-+endif()
diff --git a/srcpkgs/pugixml/template b/srcpkgs/pugixml/template
index 4e0d5c256f29..45d0d36a67b7 100644
--- a/srcpkgs/pugixml/template
+++ b/srcpkgs/pugixml/template
@@ -1,15 +1,15 @@
# Template file for 'pugixml'
pkgname=pugixml
-version=1.9
+version=1.11.4
revision=1
build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=On -DBUILD_PKGCONFIG=On"
+configure_args="-DBUILD_SHARED_LIBS=On"
short_desc="Light-weight, simple and fast XML parser for C++ with XPath support"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="http://pugixml.org/"
distfiles="http://github.com/zeux/pugixml/releases/download/v${version}/pugixml-${version}.tar.gz"
-checksum=d156d35b83f680e40fd6412c4455fdd03544339779134617b9b28d19e11fdba6
+checksum=8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716
post_install() {
tail -22 readme.txt > LICENSE
From fa1cbaa27f767e1adcfab90abffde096857ee4d6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 17 Apr 2021 10:46:05 +0200
Subject: [PATCH 2/5] New package: ptex-2.3.2
---
common/shlibs | 1 +
srcpkgs/ptex-devel | 1 +
srcpkgs/ptex/template | 29 +++++++++++++++++++++++++++++
3 files changed, 31 insertions(+)
create mode 120000 srcpkgs/ptex-devel
create mode 100644 srcpkgs/ptex/template
diff --git a/common/shlibs b/common/shlibs
index 001fcd56590d..0b6baab49345 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2968,6 +2968,7 @@ libPocoRedis.so.64 poco-1.9.4_3
libPocoEncodings.so.64 poco-1.9.4_3
libPocoNetSSL.so.64 poco-1.9.4_3
libPocoCrypto.so.64 poco-1.9.4_3
+libPtex.so ptex-2.3.2_1
libopenblas.so.0 openblas-0.2.19_1
librtaudio.so.6 rtaudio-5.1.0_1
librtmidi.so.5 rtmidi-4.0.0_1
diff --git a/srcpkgs/ptex-devel b/srcpkgs/ptex-devel
new file mode 120000
index 000000000000..43a4f13c2a2a
--- /dev/null
+++ b/srcpkgs/ptex-devel
@@ -0,0 +1 @@
+ptex
\ No newline at end of file
diff --git a/srcpkgs/ptex/template b/srcpkgs/ptex/template
new file mode 100644
index 000000000000..f6a5347ccb44
--- /dev/null
+++ b/srcpkgs/ptex/template
@@ -0,0 +1,29 @@
+# Template file for 'ptex'
+pkgname=ptex
+version=2.3.2
+revision=1
+build_style=cmake
+configure_args="-DPTEX_VER=$version"
+hostmakedepends="pkg-config"
+makedepends="zlib-devel"
+short_desc="Per-Face Texture Mapping for Production Rendering"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="http://ptex.us/"
+distfiles="https://github.com/wdas/ptex/archive/refs/tags/v${version}.tar.gz"
+checksum=30aeb85b965ca542a8945b75285cd67d8e207d23dbb57fcfeaab587bb443402b
+
+post_install() {
+ sed '1,/\/\*/d;/\*\//,$d' src/ptex/PtexCache.h > LICENSE
+ vlicense LICENSE
+}
+
+ptex-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/share/cmake
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ }
+}
From 5dc0c66ab0bba3997b3429de06dc99c1359c9abc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 17 Apr 2021 11:52:02 +0200
Subject: [PATCH 3/5] New package: Field3D-1.7.3
---
common/shlibs | 1 +
srcpkgs/Field3D-devel | 1 +
srcpkgs/Field3D/template | 21 +++++++++++++++++++++
3 files changed, 23 insertions(+)
create mode 120000 srcpkgs/Field3D-devel
create mode 100644 srcpkgs/Field3D/template
diff --git a/common/shlibs b/common/shlibs
index 0b6baab49345..c9aff5b33017 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -412,6 +412,7 @@ libproxy.so.1 libproxy-0.4.6_1
libmoar.so MoarVM-2015.11_1
libFLAC.so.8 libflac-1.2.1_1
libFLAC++.so.6 libflac-1.2.1_1
+libField3D.so.1.7 Field3D-1.7.3_1
libMAC.so.6 libMAC-5.28_1
libmad.so.0 libmad-0.15.1b_1
libmatroska.so.7 libmatroska-1.6.0_1
diff --git a/srcpkgs/Field3D-devel b/srcpkgs/Field3D-devel
new file mode 120000
index 000000000000..7482d5683e82
--- /dev/null
+++ b/srcpkgs/Field3D-devel
@@ -0,0 +1 @@
+Field3D
\ No newline at end of file
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
new file mode 100644
index 000000000000..a9791dbfde40
--- /dev/null
+++ b/srcpkgs/Field3D/template
@@ -0,0 +1,21 @@
+# Template file for 'Field3D'
+pkgname=Field3D
+version=1.7.3
+revision=1
+build_style=cmake
+makedepends="boost-devel hdf5-devel ilmbase-devel"
+short_desc="Library for storing voxel data on disk and in memory"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/imageworks/Field3D/wiki/Field3D-Home"
+distfiles="https://github.com/imageworks/Field3D/archive/refs/tags/v${version}.tar.gz"
+checksum=b6168bc27abe0f5e9b8d01af7794b3268ae301ac72b753712df93125d51a0fd4
+
+Field3D-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} $makedepends"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ }
+}
From 5df73421e3abe58b3a065e0f73c894bc629f1954 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 16 Apr 2021 21:18:16 +0200
Subject: [PATCH 4/5] openimageio: update to 2.2.13.1.
---
common/shlibs | 4 +-
.../patches/find-openexr-cmake.patch | 197 ------------------
.../openimageio/patches/fix-tiff-4.2.0.patch | 23 --
srcpkgs/openimageio/template | 19 +-
4 files changed, 13 insertions(+), 230 deletions(-)
delete mode 100644 srcpkgs/openimageio/patches/find-openexr-cmake.patch
delete mode 100644 srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch
diff --git a/common/shlibs b/common/shlibs
index c9aff5b33017..d9983efa5f26 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2164,8 +2164,8 @@ libgom-1.0.so.0 gom-0.3.0_1
libetpan.so.20 libetpan-1.9.3_4
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.13.1_1
+libOpenImageIO.so.2.2 openimageio-2.2.13.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 c17c383371f8..000000000000
--- 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/patches/fix-tiff-4.2.0.patch b/srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch
deleted file mode 100644
index 20ba5792f7d1..000000000000
--- a/srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/libOpenImageIO/exif.cpp 2018-12-01 17:42:08.000000000 +0100
-+++ src/libOpenImageIO/exif.cpp 2021-01-16 13:30:01.747255896 +0100
-@@ -212,7 +212,7 @@
- };
-
-
--
-+#if !defined(GPSTAG_VERSIONID)
- enum GPSTag {
- GPSTAG_VERSIONID = 0,
- GPSTAG_LATITUDEREF = 1, GPSTAG_LATITUDE = 2,
-@@ -237,6 +237,11 @@
- GPSTAG_DIFFERENTIAL = 30,
- GPSTAG_HPOSITIONINGERROR = 31
- };
-+#endif
-+#if !defined(GPSTAG_HPOSITIONINGERROR)
-+/* The tiff.h tag name differs from the one used here */
-+#define GPSTAG_HPOSITIONINGERROR GPSTAG_GPSHPOSITIONINGERROR
-+#endif
-
- static const EXIF_tag_info gps_tag_table[] = {
- { GPSTAG_VERSIONID, "GPS:VersionID", TIFF_BYTE, 4 },
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bcab0e90b7d0..3f35a3a98bb7 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,22 +1,25 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=1.8.17
-revision=3
+version=2.2.13.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
+configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
-DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config git"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
- ffmpeg-devel opencolorio-devel"
+ ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
+ Field3D-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=7f810124e866ac14ad9c11b0ab528a6ed4c8e62a190cc44a77eed8159f57405c
+# Runs checks even for features we disabled.
+make_check=no
CXXFLAGS="-faligned-new"
case "$XBPS_TARGET_MACHINE" in
@@ -48,7 +51,7 @@ pre_build() {
}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md LICENSE
}
openimageio-devel_package() {
From 6336620c87f748a578037eab5183acc260b90a87 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 16 Apr 2021 20:31:28 +0200
Subject: [PATCH 5/5] blender: update to 2.92.0.
---
.../{musl.patch => 0001-musl-fixes.patch} | 81 ++++++++-----------
.../patches/0002-fix-linking-issue.patch | 25 ++++++
srcpkgs/blender/patches/altivec-all.patch | 32 --------
...patch => no-Werror-double-promotion.patch} | 12 ++-
srcpkgs/blender/patches/python39.patch | 25 ------
srcpkgs/blender/template | 12 ++-
6 files changed, 72 insertions(+), 115 deletions(-)
rename srcpkgs/blender/patches/{musl.patch => 0001-musl-fixes.patch} (52%)
create mode 100644 srcpkgs/blender/patches/0002-fix-linking-issue.patch
delete mode 100644 srcpkgs/blender/patches/altivec-all.patch
rename srcpkgs/blender/patches/{disable_werror.patch => no-Werror-double-promotion.patch} (51%)
delete mode 100644 srcpkgs/blender/patches/python39.patch
diff --git a/srcpkgs/blender/patches/musl.patch b/srcpkgs/blender/patches/0001-musl-fixes.patch
similarity index 52%
rename from srcpkgs/blender/patches/musl.patch
rename to srcpkgs/blender/patches/0001-musl-fixes.patch
index 5cfded1586d0..0700382f2bfe 100644
--- a/srcpkgs/blender/patches/musl.patch
+++ b/srcpkgs/blender/patches/0001-musl-fixes.patch
@@ -1,55 +1,30 @@
-From 8f2b2e92ffdec658d4eb999f41acf6c74a5b32ed Mon Sep 17 00:00:00 2001
-From: Leon Marz <lmarz@cs.uni-frankfurt.de>
-Date: Tue, 1 Sep 2020 09:09:50 +0200
-Subject: [PATCH 1/2] musl fixes
-
-[ Taken from https://git.alpinelinux.org/aports/plain/testing/blender/0001-musl-fixes.patch ]
+Imported from https://git.alpinelinux.org/aports/plain/testing/blender/0001-musl-fixes.patch?id=42cee48643cb6ccc1a110e66446aa74408ee0160
+adapted to not use __MUSL__ definition
-Original Patch by Nathanael Copa
+From e530dc5b32695c208aa46bfe460ac7d76159a6d3 Mon Sep 17 00:00:00 2001
+From: Leon Marz <lmarz@cs.uni-frankfurt.de>
+Date: Wed, 25 Nov 2020 10:10:41 +0100
+Subject: [PATCH 1/3] musl fixes
+Original patch by Nathanael Copa
---
- CMakeLists.txt | 13 +++++++++++++
- intern/guardedalloc/intern/mallocn_intern.h | 2 +-
- intern/libc_compat/libc_compat.c | 2 --
- source/blender/blenlib/intern/system.c | 4 +++-
- source/creator/creator_signals.c | 2 +-
- 5 files changed, 18 insertions(+), 5 deletions(-)
+ intern/guardedalloc/intern/mallocn_intern.h | 2 +-
+ intern/libc_compat/libc_compat.c | 2 --
+ source/blender/blenlib/intern/system.c | 4 +++-
+ source/blender/gpu/GPU_vertex_buffer.h | 1 -
+ source/creator/creator_signals.c | 2 +-
+ 5 files changed, 5 insertions(+), 6 deletions(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cee8675..111e6e3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -138,6 +138,19 @@ get_blender_version()
- #-----------------------------------------------------------------------------
- # Options
-
-+# musl-libc related checks (missing execinfo.h and feenableexcept())
-+include(CheckIncludeFiles)
-+check_include_files(execinfo.h HAVE_EXECINFO_H)
-+if(HAVE_EXECINFO_H)
-+ add_definitions(-DHAVE_EXECINFO_H)
-+endif()
-+
-+include(CheckLibraryExists)
-+check_library_exists(m feenableexcept "fenv.h" HAVE_FEENABLEEXCEPT)
-+if(HAVE_FEENABLEEXCEPT)
-+ add_definitions(-DHAVE_FEENABLEEXCEPT)
-+endif()
-+
- # Blender internal features
- option(WITH_BLENDER "Build blender (disable to build only the blender player)" ON)
- mark_as_advanced(WITH_BLENDER)
diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h
-index 8fc3e43..ee443c4 100644
+index aa95615..f7e347d 100644
--- a/intern/guardedalloc/intern/mallocn_intern.h
+++ b/intern/guardedalloc/intern/mallocn_intern.h
-@@ -33,7 +33,7 @@
+@@ -33,7 +33,6 @@
#undef HAVE_MALLOC_STATS
#define USE_MALLOC_USABLE_SIZE /* internal, when we have malloc_usable_size() */
-#if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \
-+#if defined(__linux__) && defined(HAVE_EXECINFO_H) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \
- defined(__GLIBC__)
++#if (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || defined(__GLIBC__)
# include <malloc.h>
# define HAVE_MALLOC_STATS
diff --git a/intern/libc_compat/libc_compat.c b/intern/libc_compat/libc_compat.c
@@ -71,14 +46,14 @@ index 78e387e..d21c281 100644
-# endif /* __GLIBC_PREREQ */
#endif /* __linux__ */
diff --git a/source/blender/blenlib/intern/system.c b/source/blender/blenlib/intern/system.c
-index 20edbb9..6e856cd 100644
+index 8e3d489..4d0789b 100644
--- a/source/blender/blenlib/intern/system.c
+++ b/source/blender/blenlib/intern/system.c
@@ -35,7 +35,9 @@
# include "BLI_winstuff.h"
#else
-+#if defined(HAVE_EXECINFO_H)
++#if defined(__GLIBC__)
# include <execinfo.h>
+#endif
# include <unistd.h>
@@ -89,12 +64,24 @@ index 20edbb9..6e856cd 100644
/* ------------- */
/* Linux / Apple */
-# if defined(__linux__) || defined(__APPLE__)
-+# if defined(__linux__) && defined(HAVE_EXECINFO_H) || defined(__APPLE__)
++# if defined(__linux__) && defined(__GLIBC__) || defined(__APPLE__)
# define SIZE 100
void *buffer[SIZE];
+diff --git a/source/blender/gpu/GPU_vertex_buffer.h b/source/blender/gpu/GPU_vertex_buffer.h
+index eeaebd3..93a77a2 100644
+--- a/source/blender/gpu/GPU_vertex_buffer.h
++++ b/source/blender/gpu/GPU_vertex_buffer.h
+@@ -118,7 +118,6 @@ GPU_INLINE void *GPU_vertbuf_raw_step(GPUVertBufRaw *a)
+ {
+ unsigned char *data = a->data;
+ a->data += a->stride;
+- BLI_assert(data < a->_data_end);
+ return (void *)data;
+ }
+
diff --git a/source/creator/creator_signals.c b/source/creator/creator_signals.c
-index ad0b7b2..01d5e37 100644
+index 29e12a9..d90da8f 100644
--- a/source/creator/creator_signals.c
+++ b/source/creator/creator_signals.c
@@ -269,7 +269,7 @@ void main_signal_setup_fpe(void)
@@ -102,10 +89,10 @@ index ad0b7b2..01d5e37 100644
signal(SIGFPE, sig_handle_fpe);
-# if defined(__linux__) && defined(__GNUC__)
-+# if defined(__linux__) && defined(__GNUC__) && defined(HAVE_FEENABLEEXCEPT)
++# if defined(__linux__) && defined(__GNUC__) && defined(__GLIBC__)
feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
# endif /* defined(__linux__) && defined(__GNUC__) */
# if defined(OSX_SSE_FPE)
--
-2.28.0
+2.30.1
diff --git a/srcpkgs/blender/patches/0002-fix-linking-issue.patch b/srcpkgs/blender/patches/0002-fix-linking-issue.patch
new file mode 100644
index 000000000000..28683714e126
--- /dev/null
+++ b/srcpkgs/blender/patches/0002-fix-linking-issue.patch
@@ -0,0 +1,25 @@
+Imported from https://git.alpinelinux.org/aports/plain/testing/blender/0002-fix-linking-issue.patch?id=42cee48643cb6ccc1a110e66446aa74408ee0160
+
+From 54f5929131f537b6cbb74b5a7da45858cef6020b Mon Sep 17 00:00:00 2001
+From: Leon Marz <lmarz@cs.uni-frankfurt.de>
+Date: Tue, 1 Sep 2020 09:11:18 +0200
+Subject: [PATCH 2/3] fix linking issue
+
+---
+ intern/ghost/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
+index 1739659..d6b442b 100644
+--- a/intern/ghost/CMakeLists.txt
++++ b/intern/ghost/CMakeLists.txt
+@@ -484,5 +484,5 @@ if(WITH_XR_OPENXR)
+ endif()
+
+ add_definitions(${GL_DEFINITIONS})
+-
++list(APPEND LIB "-lX11" "-lXi" "-lXxf86vm" "-lXfixes" "-lXrender")
+ blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+--
+2.30.1
+
diff --git a/srcpkgs/blender/patches/altivec-all.patch b/srcpkgs/blender/patches/altivec-all.patch
deleted file mode 100644
index 115e1ea6fd03..000000000000
--- a/srcpkgs/blender/patches/altivec-all.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-This applies a better workaround for C++ type conflicts
-in AltiVec/C++, allowing it to build on BE ppc(64).
-
---- a/extern/clew/include/clew.h
-+++ b/extern/clew/include/clew.h
-@@ -370,15 +370,18 @@ typedef unsigned int cl_GLenum;
-
- /* Define basic vector types */
- /* Workaround for ppc64el platform: conflicts with bool from C++. */
--#if defined( __VEC__ ) && !(defined(__PPC64__) && defined(__LITTLE_ENDIAN__))
-+#if defined(__VEC__)
- #include <altivec.h> /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
-- typedef vector unsigned char __cl_uchar16;
-- typedef vector signed char __cl_char16;
-- typedef vector unsigned short __cl_ushort8;
-- typedef vector signed short __cl_short8;
-- typedef vector unsigned int __cl_uint4;
-- typedef vector signed int __cl_int4;
-- typedef vector float __cl_float4;
-+ #undef vector
-+ #undef bool
-+ #undef pixel
-+ typedef __vector unsigned char __cl_uchar16;
-+ typedef __vector signed char __cl_char16;
-+ typedef __vector unsigned short __cl_ushort8;
-+ typedef __vector signed short __cl_short8;
-+ typedef __vector unsigned int __cl_uint4;
-+ typedef __vector signed int __cl_int4;
-+ typedef __vector float __cl_float4;
- #define __CL_UCHAR16__ 1
- #define __CL_CHAR16__ 1
- #define __CL_USHORT8__ 1
diff --git a/srcpkgs/blender/patches/disable_werror.patch b/srcpkgs/blender/patches/no-Werror-double-promotion.patch
similarity index 51%
rename from srcpkgs/blender/patches/disable_werror.patch
rename to srcpkgs/blender/patches/no-Werror-double-promotion.patch
index 9fada907e1ce..2d17a6da1818 100644
--- a/srcpkgs/blender/patches/disable_werror.patch
+++ b/srcpkgs/blender/patches/no-Werror-double-promotion.patch
@@ -1,13 +1,11 @@
-diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
-index f22688f..c32aad1 100644
---- a/intern/cycles/CMakeLists.txt
-+++ b/intern/cycles/CMakeLists.txt
-@@ -227,8 +227,6 @@ endif()
-
+--- ./intern/cycles/CMakeLists.txt.orig 2021-04-16 20:47:50.466754473 +0200
++++ ./intern/cycles/CMakeLists.txt 2021-04-16 20:48:06.199903232 +0200
+@@ -336,7 +336,7 @@ endif()
# Warnings
if(CMAKE_COMPILER_IS_GNUCXX)
-- ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion")
+ ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion")
- ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion")
++ #ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion")
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_no_error_unused_macros "-Wno-error=unused-macros")
unset(_has_cxxflag_float_conversion)
unset(_has_cxxflag_double_promotion)
diff --git a/srcpkgs/blender/patches/python39.patch b/srcpkgs/blender/patches/python39.patch
deleted file mode 100644
index 1e14eb062035..000000000000
--- a/srcpkgs/blender/patches/python39.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-The deprecated PyEval_ReleaseLock() triggers a segfault with Python 3.9.0.
-See issue at https://developer.blender.org/T81688 and fix at
-https://developer.blender.org/rB5edba9b42f684bf8b99894bb6988e7f46180e12c
-
---- a/source/blender/python/generic/bpy_threads.c 2020-10-13 15:29:16.708347045 -0400
-+++ b/source/blender/python/generic/bpy_threads.c 2020-10-13 15:29:43.123345331 -0400
-@@ -29,14 +29,11 @@
- /* analogue of PyEval_SaveThread() */
- BPy_ThreadStatePtr BPY_thread_save(void)
- {
-- PyThreadState *tstate = PyThreadState_Swap(NULL);
-- /* note: tstate can be NULL when quitting Blender */
--
-- if (tstate && PyEval_ThreadsInitialized()) {
-- PyEval_ReleaseLock();
-+ /* The thread-state can be NULL when quitting Blender. */
-+ if (_PyThreadState_UncheckedGet()) {
-+ return (BPy_ThreadStatePtr)PyEval_SaveThread();
- }
--
-- return (BPy_ThreadStatePtr)tstate;
-+ return NULL;
- }
-
- /* analogue of PyEval_RestoreThread() */
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 01b3677ff4f6..c2f50e341abf 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
-version=2.90.1
-revision=2
+version=2.92.0
+revision=1
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
@@ -18,15 +18,19 @@ makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm
libopenexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
opencolorio-devel opencollada-devel python3-numpy libXrender-devel
- OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel"
+ OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel
+ pugixml-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="3D graphics creation suite"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.blender.org"
distfiles="http://download.blender.org/source/${pkgname}-${version}.tar.xz"
-checksum=e78dcc946c823ad1bd89bcc6938fc6b375540ec3eff58649586acf1f6a653d99
+checksum=e791cfc403292383577c3c8ce2cd34e5aa2cd8da0a7483041049a1609ddb4595
python_version=3
+CXXFLAGS="-DNDEBUG"
+CFLAGS="$CXXFLAGS"
+LDFLAGS="-Wl,-z,stack-size=2097152"
patch_args="-Np1"
case "$XBPS_TARGET_MACHINE" in
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] blender 2.92.0 1
2021-04-17 20:00 [PR PATCH] blender 2.92.0 1 Gottox
` (2 preceding siblings ...)
2021-04-18 6:09 ` Gottox
@ 2021-04-18 6:19 ` Gottox
2021-04-20 8:57 ` Gottox
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Gottox @ 2021-04-18 6:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 553 bytes --]
There is an updated pull request by Gottox against master on the void-packages repository
https://github.com/Gottox/void-packages blender-2.92.0_1
https://github.com/void-linux/void-packages/pull/30286
blender 2.92.0 1
- pugixml: update to 1.11.4.
- New package: ptex-2.3.2
- New package: Field3D-1.7.3
- openimageio: update to 2.2.13.1.
- blender: update to 2.92.0.
TODO:
* [ ] remove luxmark from repository
* [ ] remove luxrays from repository
A patch file from https://github.com/void-linux/void-packages/pull/30286.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-blender-2.92.0_1-30286.patch --]
[-- Type: text/x-diff, Size: 32758 bytes --]
From f4352fbadc040673d6c5844efdba5aad86a3e6de Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 16 Apr 2021 20:42:58 +0200
Subject: [PATCH 1/5] pugixml: update to 1.11.4.
---
srcpkgs/pugixml/patches/pkg-config.patch | 18 ------------------
srcpkgs/pugixml/template | 6 +++---
2 files changed, 3 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/pugixml/patches/pkg-config.patch
diff --git a/srcpkgs/pugixml/patches/pkg-config.patch b/srcpkgs/pugixml/patches/pkg-config.patch
deleted file mode 100644
index d021d58889f9..000000000000
--- a/srcpkgs/pugixml/patches/pkg-config.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- CMakeLists.txt.bak 2017-09-30 16:33:46.956774231 +0200
-+++ CMakeLists.txt 2017-09-30 16:34:08.857775066 +0200
-@@ -52,7 +52,7 @@
-
- if(BUILD_PKGCONFIG)
- # Install library into its own directory under LIBDIR
-- set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING})
-+ # set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING})
- endif()
-
- install(TARGETS pugixml EXPORT pugixml-config
-@@ -75,4 +75,4 @@
- add_executable(check ${TEST_SOURCES})
- target_link_libraries(check pugixml)
- add_custom_command(TARGET check POST_BUILD COMMAND check WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
--endif()
-\ No newline at end of file
-+endif()
diff --git a/srcpkgs/pugixml/template b/srcpkgs/pugixml/template
index 4e0d5c256f29..45d0d36a67b7 100644
--- a/srcpkgs/pugixml/template
+++ b/srcpkgs/pugixml/template
@@ -1,15 +1,15 @@
# Template file for 'pugixml'
pkgname=pugixml
-version=1.9
+version=1.11.4
revision=1
build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=On -DBUILD_PKGCONFIG=On"
+configure_args="-DBUILD_SHARED_LIBS=On"
short_desc="Light-weight, simple and fast XML parser for C++ with XPath support"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="http://pugixml.org/"
distfiles="http://github.com/zeux/pugixml/releases/download/v${version}/pugixml-${version}.tar.gz"
-checksum=d156d35b83f680e40fd6412c4455fdd03544339779134617b9b28d19e11fdba6
+checksum=8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716
post_install() {
tail -22 readme.txt > LICENSE
From fa1cbaa27f767e1adcfab90abffde096857ee4d6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 17 Apr 2021 10:46:05 +0200
Subject: [PATCH 2/5] New package: ptex-2.3.2
---
common/shlibs | 1 +
srcpkgs/ptex-devel | 1 +
srcpkgs/ptex/template | 29 +++++++++++++++++++++++++++++
3 files changed, 31 insertions(+)
create mode 120000 srcpkgs/ptex-devel
create mode 100644 srcpkgs/ptex/template
diff --git a/common/shlibs b/common/shlibs
index 001fcd56590d..0b6baab49345 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2968,6 +2968,7 @@ libPocoRedis.so.64 poco-1.9.4_3
libPocoEncodings.so.64 poco-1.9.4_3
libPocoNetSSL.so.64 poco-1.9.4_3
libPocoCrypto.so.64 poco-1.9.4_3
+libPtex.so ptex-2.3.2_1
libopenblas.so.0 openblas-0.2.19_1
librtaudio.so.6 rtaudio-5.1.0_1
librtmidi.so.5 rtmidi-4.0.0_1
diff --git a/srcpkgs/ptex-devel b/srcpkgs/ptex-devel
new file mode 120000
index 000000000000..43a4f13c2a2a
--- /dev/null
+++ b/srcpkgs/ptex-devel
@@ -0,0 +1 @@
+ptex
\ No newline at end of file
diff --git a/srcpkgs/ptex/template b/srcpkgs/ptex/template
new file mode 100644
index 000000000000..f6a5347ccb44
--- /dev/null
+++ b/srcpkgs/ptex/template
@@ -0,0 +1,29 @@
+# Template file for 'ptex'
+pkgname=ptex
+version=2.3.2
+revision=1
+build_style=cmake
+configure_args="-DPTEX_VER=$version"
+hostmakedepends="pkg-config"
+makedepends="zlib-devel"
+short_desc="Per-Face Texture Mapping for Production Rendering"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="http://ptex.us/"
+distfiles="https://github.com/wdas/ptex/archive/refs/tags/v${version}.tar.gz"
+checksum=30aeb85b965ca542a8945b75285cd67d8e207d23dbb57fcfeaab587bb443402b
+
+post_install() {
+ sed '1,/\/\*/d;/\*\//,$d' src/ptex/PtexCache.h > LICENSE
+ vlicense LICENSE
+}
+
+ptex-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/share/cmake
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ }
+}
From 5dc0c66ab0bba3997b3429de06dc99c1359c9abc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 17 Apr 2021 11:52:02 +0200
Subject: [PATCH 3/5] New package: Field3D-1.7.3
---
common/shlibs | 1 +
srcpkgs/Field3D-devel | 1 +
srcpkgs/Field3D/template | 21 +++++++++++++++++++++
3 files changed, 23 insertions(+)
create mode 120000 srcpkgs/Field3D-devel
create mode 100644 srcpkgs/Field3D/template
diff --git a/common/shlibs b/common/shlibs
index 0b6baab49345..c9aff5b33017 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -412,6 +412,7 @@ libproxy.so.1 libproxy-0.4.6_1
libmoar.so MoarVM-2015.11_1
libFLAC.so.8 libflac-1.2.1_1
libFLAC++.so.6 libflac-1.2.1_1
+libField3D.so.1.7 Field3D-1.7.3_1
libMAC.so.6 libMAC-5.28_1
libmad.so.0 libmad-0.15.1b_1
libmatroska.so.7 libmatroska-1.6.0_1
diff --git a/srcpkgs/Field3D-devel b/srcpkgs/Field3D-devel
new file mode 120000
index 000000000000..7482d5683e82
--- /dev/null
+++ b/srcpkgs/Field3D-devel
@@ -0,0 +1 @@
+Field3D
\ No newline at end of file
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
new file mode 100644
index 000000000000..a9791dbfde40
--- /dev/null
+++ b/srcpkgs/Field3D/template
@@ -0,0 +1,21 @@
+# Template file for 'Field3D'
+pkgname=Field3D
+version=1.7.3
+revision=1
+build_style=cmake
+makedepends="boost-devel hdf5-devel ilmbase-devel"
+short_desc="Library for storing voxel data on disk and in memory"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/imageworks/Field3D/wiki/Field3D-Home"
+distfiles="https://github.com/imageworks/Field3D/archive/refs/tags/v${version}.tar.gz"
+checksum=b6168bc27abe0f5e9b8d01af7794b3268ae301ac72b753712df93125d51a0fd4
+
+Field3D-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} $makedepends"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ }
+}
From 5df73421e3abe58b3a065e0f73c894bc629f1954 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 16 Apr 2021 21:18:16 +0200
Subject: [PATCH 4/5] openimageio: update to 2.2.13.1.
---
common/shlibs | 4 +-
.../patches/find-openexr-cmake.patch | 197 ------------------
.../openimageio/patches/fix-tiff-4.2.0.patch | 23 --
srcpkgs/openimageio/template | 19 +-
4 files changed, 13 insertions(+), 230 deletions(-)
delete mode 100644 srcpkgs/openimageio/patches/find-openexr-cmake.patch
delete mode 100644 srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch
diff --git a/common/shlibs b/common/shlibs
index c9aff5b33017..d9983efa5f26 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2164,8 +2164,8 @@ libgom-1.0.so.0 gom-0.3.0_1
libetpan.so.20 libetpan-1.9.3_4
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.13.1_1
+libOpenImageIO.so.2.2 openimageio-2.2.13.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 c17c383371f8..000000000000
--- 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/patches/fix-tiff-4.2.0.patch b/srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch
deleted file mode 100644
index 20ba5792f7d1..000000000000
--- a/srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/libOpenImageIO/exif.cpp 2018-12-01 17:42:08.000000000 +0100
-+++ src/libOpenImageIO/exif.cpp 2021-01-16 13:30:01.747255896 +0100
-@@ -212,7 +212,7 @@
- };
-
-
--
-+#if !defined(GPSTAG_VERSIONID)
- enum GPSTag {
- GPSTAG_VERSIONID = 0,
- GPSTAG_LATITUDEREF = 1, GPSTAG_LATITUDE = 2,
-@@ -237,6 +237,11 @@
- GPSTAG_DIFFERENTIAL = 30,
- GPSTAG_HPOSITIONINGERROR = 31
- };
-+#endif
-+#if !defined(GPSTAG_HPOSITIONINGERROR)
-+/* The tiff.h tag name differs from the one used here */
-+#define GPSTAG_HPOSITIONINGERROR GPSTAG_GPSHPOSITIONINGERROR
-+#endif
-
- static const EXIF_tag_info gps_tag_table[] = {
- { GPSTAG_VERSIONID, "GPS:VersionID", TIFF_BYTE, 4 },
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bcab0e90b7d0..3f35a3a98bb7 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,22 +1,25 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=1.8.17
-revision=3
+version=2.2.13.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
+configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
-DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config git"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
- ffmpeg-devel opencolorio-devel"
+ ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
+ Field3D-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=7f810124e866ac14ad9c11b0ab528a6ed4c8e62a190cc44a77eed8159f57405c
+# Runs checks even for features we disabled.
+make_check=no
CXXFLAGS="-faligned-new"
case "$XBPS_TARGET_MACHINE" in
@@ -48,7 +51,7 @@ pre_build() {
}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md LICENSE
}
openimageio-devel_package() {
From 160f4c54edfe3c54b1e9cce9ae18d68228b144bc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 16 Apr 2021 20:31:28 +0200
Subject: [PATCH 5/5] blender: update to 2.92.0.
---
.../{musl.patch => 0001-musl-fixes.patch} | 78 ++++++++-----------
.../patches/0002-fix-linking-issue.patch | 25 ++++++
srcpkgs/blender/patches/altivec-all.patch | 32 --------
...patch => no-Werror-double-promotion.patch} | 12 ++-
srcpkgs/blender/patches/python39.patch | 25 ------
srcpkgs/blender/template | 12 ++-
6 files changed, 71 insertions(+), 113 deletions(-)
rename srcpkgs/blender/patches/{musl.patch => 0001-musl-fixes.patch} (53%)
create mode 100644 srcpkgs/blender/patches/0002-fix-linking-issue.patch
delete mode 100644 srcpkgs/blender/patches/altivec-all.patch
rename srcpkgs/blender/patches/{disable_werror.patch => no-Werror-double-promotion.patch} (51%)
delete mode 100644 srcpkgs/blender/patches/python39.patch
diff --git a/srcpkgs/blender/patches/musl.patch b/srcpkgs/blender/patches/0001-musl-fixes.patch
similarity index 53%
rename from srcpkgs/blender/patches/musl.patch
rename to srcpkgs/blender/patches/0001-musl-fixes.patch
index 5cfded1586d0..0e64369b4379 100644
--- a/srcpkgs/blender/patches/musl.patch
+++ b/srcpkgs/blender/patches/0001-musl-fixes.patch
@@ -1,46 +1,22 @@
-From 8f2b2e92ffdec658d4eb999f41acf6c74a5b32ed Mon Sep 17 00:00:00 2001
-From: Leon Marz <lmarz@cs.uni-frankfurt.de>
-Date: Tue, 1 Sep 2020 09:09:50 +0200
-Subject: [PATCH 1/2] musl fixes
-
-[ Taken from https://git.alpinelinux.org/aports/plain/testing/blender/0001-musl-fixes.patch ]
+Imported from https://git.alpinelinux.org/aports/plain/testing/blender/0001-musl-fixes.patch?id=42cee48643cb6ccc1a110e66446aa74408ee0160
+adapted to not use __MUSL__ definition
-Original Patch by Nathanael Copa
+From e530dc5b32695c208aa46bfe460ac7d76159a6d3 Mon Sep 17 00:00:00 2001
+From: Leon Marz <lmarz@cs.uni-frankfurt.de>
+Date: Wed, 25 Nov 2020 10:10:41 +0100
+Subject: [PATCH 1/3] musl fixes
+Original patch by Nathanael Copa
---
- CMakeLists.txt | 13 +++++++++++++
- intern/guardedalloc/intern/mallocn_intern.h | 2 +-
- intern/libc_compat/libc_compat.c | 2 --
- source/blender/blenlib/intern/system.c | 4 +++-
- source/creator/creator_signals.c | 2 +-
- 5 files changed, 18 insertions(+), 5 deletions(-)
+ intern/guardedalloc/intern/mallocn_intern.h | 2 +-
+ intern/libc_compat/libc_compat.c | 2 --
+ source/blender/blenlib/intern/system.c | 4 +++-
+ source/blender/gpu/GPU_vertex_buffer.h | 1 -
+ source/creator/creator_signals.c | 2 +-
+ 5 files changed, 5 insertions(+), 6 deletions(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cee8675..111e6e3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -138,6 +138,19 @@ get_blender_version()
- #-----------------------------------------------------------------------------
- # Options
-
-+# musl-libc related checks (missing execinfo.h and feenableexcept())
-+include(CheckIncludeFiles)
-+check_include_files(execinfo.h HAVE_EXECINFO_H)
-+if(HAVE_EXECINFO_H)
-+ add_definitions(-DHAVE_EXECINFO_H)
-+endif()
-+
-+include(CheckLibraryExists)
-+check_library_exists(m feenableexcept "fenv.h" HAVE_FEENABLEEXCEPT)
-+if(HAVE_FEENABLEEXCEPT)
-+ add_definitions(-DHAVE_FEENABLEEXCEPT)
-+endif()
-+
- # Blender internal features
- option(WITH_BLENDER "Build blender (disable to build only the blender player)" ON)
- mark_as_advanced(WITH_BLENDER)
diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h
-index 8fc3e43..ee443c4 100644
+index aa95615..f7e347d 100644
--- a/intern/guardedalloc/intern/mallocn_intern.h
+++ b/intern/guardedalloc/intern/mallocn_intern.h
@@ -33,7 +33,7 @@
@@ -48,7 +24,7 @@ index 8fc3e43..ee443c4 100644
#define USE_MALLOC_USABLE_SIZE /* internal, when we have malloc_usable_size() */
-#if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \
-+#if defined(__linux__) && defined(HAVE_EXECINFO_H) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \
++#if (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \
defined(__GLIBC__)
# include <malloc.h>
# define HAVE_MALLOC_STATS
@@ -71,14 +47,14 @@ index 78e387e..d21c281 100644
-# endif /* __GLIBC_PREREQ */
#endif /* __linux__ */
diff --git a/source/blender/blenlib/intern/system.c b/source/blender/blenlib/intern/system.c
-index 20edbb9..6e856cd 100644
+index 8e3d489..4d0789b 100644
--- a/source/blender/blenlib/intern/system.c
+++ b/source/blender/blenlib/intern/system.c
@@ -35,7 +35,9 @@
# include "BLI_winstuff.h"
#else
-+#if defined(HAVE_EXECINFO_H)
++#if defined(__GLIBC__)
# include <execinfo.h>
+#endif
# include <unistd.h>
@@ -89,12 +65,24 @@ index 20edbb9..6e856cd 100644
/* ------------- */
/* Linux / Apple */
-# if defined(__linux__) || defined(__APPLE__)
-+# if defined(__linux__) && defined(HAVE_EXECINFO_H) || defined(__APPLE__)
++# if defined(__linux__) && defined(__GLIBC__) || defined(__APPLE__)
# define SIZE 100
void *buffer[SIZE];
+diff --git a/source/blender/gpu/GPU_vertex_buffer.h b/source/blender/gpu/GPU_vertex_buffer.h
+index eeaebd3..93a77a2 100644
+--- a/source/blender/gpu/GPU_vertex_buffer.h
++++ b/source/blender/gpu/GPU_vertex_buffer.h
+@@ -118,7 +118,6 @@ GPU_INLINE void *GPU_vertbuf_raw_step(GPUVertBufRaw *a)
+ {
+ unsigned char *data = a->data;
+ a->data += a->stride;
+- BLI_assert(data < a->_data_end);
+ return (void *)data;
+ }
+
diff --git a/source/creator/creator_signals.c b/source/creator/creator_signals.c
-index ad0b7b2..01d5e37 100644
+index 29e12a9..d90da8f 100644
--- a/source/creator/creator_signals.c
+++ b/source/creator/creator_signals.c
@@ -269,7 +269,7 @@ void main_signal_setup_fpe(void)
@@ -102,10 +90,10 @@ index ad0b7b2..01d5e37 100644
signal(SIGFPE, sig_handle_fpe);
-# if defined(__linux__) && defined(__GNUC__)
-+# if defined(__linux__) && defined(__GNUC__) && defined(HAVE_FEENABLEEXCEPT)
++# if defined(__linux__) && defined(__GNUC__) && defined(__GLIBC__)
feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
# endif /* defined(__linux__) && defined(__GNUC__) */
# if defined(OSX_SSE_FPE)
--
-2.28.0
+2.30.1
diff --git a/srcpkgs/blender/patches/0002-fix-linking-issue.patch b/srcpkgs/blender/patches/0002-fix-linking-issue.patch
new file mode 100644
index 000000000000..28683714e126
--- /dev/null
+++ b/srcpkgs/blender/patches/0002-fix-linking-issue.patch
@@ -0,0 +1,25 @@
+Imported from https://git.alpinelinux.org/aports/plain/testing/blender/0002-fix-linking-issue.patch?id=42cee48643cb6ccc1a110e66446aa74408ee0160
+
+From 54f5929131f537b6cbb74b5a7da45858cef6020b Mon Sep 17 00:00:00 2001
+From: Leon Marz <lmarz@cs.uni-frankfurt.de>
+Date: Tue, 1 Sep 2020 09:11:18 +0200
+Subject: [PATCH 2/3] fix linking issue
+
+---
+ intern/ghost/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
+index 1739659..d6b442b 100644
+--- a/intern/ghost/CMakeLists.txt
++++ b/intern/ghost/CMakeLists.txt
+@@ -484,5 +484,5 @@ if(WITH_XR_OPENXR)
+ endif()
+
+ add_definitions(${GL_DEFINITIONS})
+-
++list(APPEND LIB "-lX11" "-lXi" "-lXxf86vm" "-lXfixes" "-lXrender")
+ blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+--
+2.30.1
+
diff --git a/srcpkgs/blender/patches/altivec-all.patch b/srcpkgs/blender/patches/altivec-all.patch
deleted file mode 100644
index 115e1ea6fd03..000000000000
--- a/srcpkgs/blender/patches/altivec-all.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-This applies a better workaround for C++ type conflicts
-in AltiVec/C++, allowing it to build on BE ppc(64).
-
---- a/extern/clew/include/clew.h
-+++ b/extern/clew/include/clew.h
-@@ -370,15 +370,18 @@ typedef unsigned int cl_GLenum;
-
- /* Define basic vector types */
- /* Workaround for ppc64el platform: conflicts with bool from C++. */
--#if defined( __VEC__ ) && !(defined(__PPC64__) && defined(__LITTLE_ENDIAN__))
-+#if defined(__VEC__)
- #include <altivec.h> /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
-- typedef vector unsigned char __cl_uchar16;
-- typedef vector signed char __cl_char16;
-- typedef vector unsigned short __cl_ushort8;
-- typedef vector signed short __cl_short8;
-- typedef vector unsigned int __cl_uint4;
-- typedef vector signed int __cl_int4;
-- typedef vector float __cl_float4;
-+ #undef vector
-+ #undef bool
-+ #undef pixel
-+ typedef __vector unsigned char __cl_uchar16;
-+ typedef __vector signed char __cl_char16;
-+ typedef __vector unsigned short __cl_ushort8;
-+ typedef __vector signed short __cl_short8;
-+ typedef __vector unsigned int __cl_uint4;
-+ typedef __vector signed int __cl_int4;
-+ typedef __vector float __cl_float4;
- #define __CL_UCHAR16__ 1
- #define __CL_CHAR16__ 1
- #define __CL_USHORT8__ 1
diff --git a/srcpkgs/blender/patches/disable_werror.patch b/srcpkgs/blender/patches/no-Werror-double-promotion.patch
similarity index 51%
rename from srcpkgs/blender/patches/disable_werror.patch
rename to srcpkgs/blender/patches/no-Werror-double-promotion.patch
index 9fada907e1ce..2d17a6da1818 100644
--- a/srcpkgs/blender/patches/disable_werror.patch
+++ b/srcpkgs/blender/patches/no-Werror-double-promotion.patch
@@ -1,13 +1,11 @@
-diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
-index f22688f..c32aad1 100644
---- a/intern/cycles/CMakeLists.txt
-+++ b/intern/cycles/CMakeLists.txt
-@@ -227,8 +227,6 @@ endif()
-
+--- ./intern/cycles/CMakeLists.txt.orig 2021-04-16 20:47:50.466754473 +0200
++++ ./intern/cycles/CMakeLists.txt 2021-04-16 20:48:06.199903232 +0200
+@@ -336,7 +336,7 @@ endif()
# Warnings
if(CMAKE_COMPILER_IS_GNUCXX)
-- ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion")
+ ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion")
- ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion")
++ #ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion")
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_no_error_unused_macros "-Wno-error=unused-macros")
unset(_has_cxxflag_float_conversion)
unset(_has_cxxflag_double_promotion)
diff --git a/srcpkgs/blender/patches/python39.patch b/srcpkgs/blender/patches/python39.patch
deleted file mode 100644
index 1e14eb062035..000000000000
--- a/srcpkgs/blender/patches/python39.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-The deprecated PyEval_ReleaseLock() triggers a segfault with Python 3.9.0.
-See issue at https://developer.blender.org/T81688 and fix at
-https://developer.blender.org/rB5edba9b42f684bf8b99894bb6988e7f46180e12c
-
---- a/source/blender/python/generic/bpy_threads.c 2020-10-13 15:29:16.708347045 -0400
-+++ b/source/blender/python/generic/bpy_threads.c 2020-10-13 15:29:43.123345331 -0400
-@@ -29,14 +29,11 @@
- /* analogue of PyEval_SaveThread() */
- BPy_ThreadStatePtr BPY_thread_save(void)
- {
-- PyThreadState *tstate = PyThreadState_Swap(NULL);
-- /* note: tstate can be NULL when quitting Blender */
--
-- if (tstate && PyEval_ThreadsInitialized()) {
-- PyEval_ReleaseLock();
-+ /* The thread-state can be NULL when quitting Blender. */
-+ if (_PyThreadState_UncheckedGet()) {
-+ return (BPy_ThreadStatePtr)PyEval_SaveThread();
- }
--
-- return (BPy_ThreadStatePtr)tstate;
-+ return NULL;
- }
-
- /* analogue of PyEval_RestoreThread() */
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 01b3677ff4f6..c2f50e341abf 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
-version=2.90.1
-revision=2
+version=2.92.0
+revision=1
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
@@ -18,15 +18,19 @@ makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm
libopenexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
opencolorio-devel opencollada-devel python3-numpy libXrender-devel
- OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel"
+ OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel
+ pugixml-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="3D graphics creation suite"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.blender.org"
distfiles="http://download.blender.org/source/${pkgname}-${version}.tar.xz"
-checksum=e78dcc946c823ad1bd89bcc6938fc6b375540ec3eff58649586acf1f6a653d99
+checksum=e791cfc403292383577c3c8ce2cd34e5aa2cd8da0a7483041049a1609ddb4595
python_version=3
+CXXFLAGS="-DNDEBUG"
+CFLAGS="$CXXFLAGS"
+LDFLAGS="-Wl,-z,stack-size=2097152"
patch_args="-Np1"
case "$XBPS_TARGET_MACHINE" in
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] blender 2.92.0 1
2021-04-17 20:00 [PR PATCH] blender 2.92.0 1 Gottox
` (3 preceding siblings ...)
2021-04-18 6:19 ` Gottox
@ 2021-04-20 8:57 ` Gottox
2021-04-20 9:49 ` Gottox
2021-04-20 9:59 ` [PR PATCH] [Merged]: " Gottox
6 siblings, 0 replies; 8+ messages in thread
From: Gottox @ 2021-04-20 8:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 553 bytes --]
There is an updated pull request by Gottox against master on the void-packages repository
https://github.com/Gottox/void-packages blender-2.92.0_1
https://github.com/void-linux/void-packages/pull/30286
blender 2.92.0 1
- pugixml: update to 1.11.4.
- New package: ptex-2.3.2
- New package: Field3D-1.7.3
- openimageio: update to 2.2.13.1.
- blender: update to 2.92.0.
TODO:
* [ ] remove luxmark from repository
* [ ] remove luxrays from repository
A patch file from https://github.com/void-linux/void-packages/pull/30286.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-blender-2.92.0_1-30286.patch --]
[-- Type: text/x-diff, Size: 32907 bytes --]
From f4352fbadc040673d6c5844efdba5aad86a3e6de Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 16 Apr 2021 20:42:58 +0200
Subject: [PATCH 1/5] pugixml: update to 1.11.4.
---
srcpkgs/pugixml/patches/pkg-config.patch | 18 ------------------
srcpkgs/pugixml/template | 6 +++---
2 files changed, 3 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/pugixml/patches/pkg-config.patch
diff --git a/srcpkgs/pugixml/patches/pkg-config.patch b/srcpkgs/pugixml/patches/pkg-config.patch
deleted file mode 100644
index d021d58889f9..000000000000
--- a/srcpkgs/pugixml/patches/pkg-config.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- CMakeLists.txt.bak 2017-09-30 16:33:46.956774231 +0200
-+++ CMakeLists.txt 2017-09-30 16:34:08.857775066 +0200
-@@ -52,7 +52,7 @@
-
- if(BUILD_PKGCONFIG)
- # Install library into its own directory under LIBDIR
-- set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING})
-+ # set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING})
- endif()
-
- install(TARGETS pugixml EXPORT pugixml-config
-@@ -75,4 +75,4 @@
- add_executable(check ${TEST_SOURCES})
- target_link_libraries(check pugixml)
- add_custom_command(TARGET check POST_BUILD COMMAND check WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
--endif()
-\ No newline at end of file
-+endif()
diff --git a/srcpkgs/pugixml/template b/srcpkgs/pugixml/template
index 4e0d5c256f29..45d0d36a67b7 100644
--- a/srcpkgs/pugixml/template
+++ b/srcpkgs/pugixml/template
@@ -1,15 +1,15 @@
# Template file for 'pugixml'
pkgname=pugixml
-version=1.9
+version=1.11.4
revision=1
build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=On -DBUILD_PKGCONFIG=On"
+configure_args="-DBUILD_SHARED_LIBS=On"
short_desc="Light-weight, simple and fast XML parser for C++ with XPath support"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="http://pugixml.org/"
distfiles="http://github.com/zeux/pugixml/releases/download/v${version}/pugixml-${version}.tar.gz"
-checksum=d156d35b83f680e40fd6412c4455fdd03544339779134617b9b28d19e11fdba6
+checksum=8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716
post_install() {
tail -22 readme.txt > LICENSE
From fa1cbaa27f767e1adcfab90abffde096857ee4d6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 17 Apr 2021 10:46:05 +0200
Subject: [PATCH 2/5] New package: ptex-2.3.2
---
common/shlibs | 1 +
srcpkgs/ptex-devel | 1 +
srcpkgs/ptex/template | 29 +++++++++++++++++++++++++++++
3 files changed, 31 insertions(+)
create mode 120000 srcpkgs/ptex-devel
create mode 100644 srcpkgs/ptex/template
diff --git a/common/shlibs b/common/shlibs
index 001fcd56590d..0b6baab49345 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2968,6 +2968,7 @@ libPocoRedis.so.64 poco-1.9.4_3
libPocoEncodings.so.64 poco-1.9.4_3
libPocoNetSSL.so.64 poco-1.9.4_3
libPocoCrypto.so.64 poco-1.9.4_3
+libPtex.so ptex-2.3.2_1
libopenblas.so.0 openblas-0.2.19_1
librtaudio.so.6 rtaudio-5.1.0_1
librtmidi.so.5 rtmidi-4.0.0_1
diff --git a/srcpkgs/ptex-devel b/srcpkgs/ptex-devel
new file mode 120000
index 000000000000..43a4f13c2a2a
--- /dev/null
+++ b/srcpkgs/ptex-devel
@@ -0,0 +1 @@
+ptex
\ No newline at end of file
diff --git a/srcpkgs/ptex/template b/srcpkgs/ptex/template
new file mode 100644
index 000000000000..f6a5347ccb44
--- /dev/null
+++ b/srcpkgs/ptex/template
@@ -0,0 +1,29 @@
+# Template file for 'ptex'
+pkgname=ptex
+version=2.3.2
+revision=1
+build_style=cmake
+configure_args="-DPTEX_VER=$version"
+hostmakedepends="pkg-config"
+makedepends="zlib-devel"
+short_desc="Per-Face Texture Mapping for Production Rendering"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="http://ptex.us/"
+distfiles="https://github.com/wdas/ptex/archive/refs/tags/v${version}.tar.gz"
+checksum=30aeb85b965ca542a8945b75285cd67d8e207d23dbb57fcfeaab587bb443402b
+
+post_install() {
+ sed '1,/\/\*/d;/\*\//,$d' src/ptex/PtexCache.h > LICENSE
+ vlicense LICENSE
+}
+
+ptex-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/share/cmake
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ }
+}
From 5dc0c66ab0bba3997b3429de06dc99c1359c9abc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 17 Apr 2021 11:52:02 +0200
Subject: [PATCH 3/5] New package: Field3D-1.7.3
---
common/shlibs | 1 +
srcpkgs/Field3D-devel | 1 +
srcpkgs/Field3D/template | 21 +++++++++++++++++++++
3 files changed, 23 insertions(+)
create mode 120000 srcpkgs/Field3D-devel
create mode 100644 srcpkgs/Field3D/template
diff --git a/common/shlibs b/common/shlibs
index 0b6baab49345..c9aff5b33017 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -412,6 +412,7 @@ libproxy.so.1 libproxy-0.4.6_1
libmoar.so MoarVM-2015.11_1
libFLAC.so.8 libflac-1.2.1_1
libFLAC++.so.6 libflac-1.2.1_1
+libField3D.so.1.7 Field3D-1.7.3_1
libMAC.so.6 libMAC-5.28_1
libmad.so.0 libmad-0.15.1b_1
libmatroska.so.7 libmatroska-1.6.0_1
diff --git a/srcpkgs/Field3D-devel b/srcpkgs/Field3D-devel
new file mode 120000
index 000000000000..7482d5683e82
--- /dev/null
+++ b/srcpkgs/Field3D-devel
@@ -0,0 +1 @@
+Field3D
\ No newline at end of file
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
new file mode 100644
index 000000000000..a9791dbfde40
--- /dev/null
+++ b/srcpkgs/Field3D/template
@@ -0,0 +1,21 @@
+# Template file for 'Field3D'
+pkgname=Field3D
+version=1.7.3
+revision=1
+build_style=cmake
+makedepends="boost-devel hdf5-devel ilmbase-devel"
+short_desc="Library for storing voxel data on disk and in memory"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/imageworks/Field3D/wiki/Field3D-Home"
+distfiles="https://github.com/imageworks/Field3D/archive/refs/tags/v${version}.tar.gz"
+checksum=b6168bc27abe0f5e9b8d01af7794b3268ae301ac72b753712df93125d51a0fd4
+
+Field3D-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} $makedepends"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ }
+}
From 5df73421e3abe58b3a065e0f73c894bc629f1954 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 16 Apr 2021 21:18:16 +0200
Subject: [PATCH 4/5] openimageio: update to 2.2.13.1.
---
common/shlibs | 4 +-
.../patches/find-openexr-cmake.patch | 197 ------------------
.../openimageio/patches/fix-tiff-4.2.0.patch | 23 --
srcpkgs/openimageio/template | 19 +-
4 files changed, 13 insertions(+), 230 deletions(-)
delete mode 100644 srcpkgs/openimageio/patches/find-openexr-cmake.patch
delete mode 100644 srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch
diff --git a/common/shlibs b/common/shlibs
index c9aff5b33017..d9983efa5f26 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2164,8 +2164,8 @@ libgom-1.0.so.0 gom-0.3.0_1
libetpan.so.20 libetpan-1.9.3_4
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.13.1_1
+libOpenImageIO.so.2.2 openimageio-2.2.13.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 c17c383371f8..000000000000
--- 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/patches/fix-tiff-4.2.0.patch b/srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch
deleted file mode 100644
index 20ba5792f7d1..000000000000
--- a/srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/libOpenImageIO/exif.cpp 2018-12-01 17:42:08.000000000 +0100
-+++ src/libOpenImageIO/exif.cpp 2021-01-16 13:30:01.747255896 +0100
-@@ -212,7 +212,7 @@
- };
-
-
--
-+#if !defined(GPSTAG_VERSIONID)
- enum GPSTag {
- GPSTAG_VERSIONID = 0,
- GPSTAG_LATITUDEREF = 1, GPSTAG_LATITUDE = 2,
-@@ -237,6 +237,11 @@
- GPSTAG_DIFFERENTIAL = 30,
- GPSTAG_HPOSITIONINGERROR = 31
- };
-+#endif
-+#if !defined(GPSTAG_HPOSITIONINGERROR)
-+/* The tiff.h tag name differs from the one used here */
-+#define GPSTAG_HPOSITIONINGERROR GPSTAG_GPSHPOSITIONINGERROR
-+#endif
-
- static const EXIF_tag_info gps_tag_table[] = {
- { GPSTAG_VERSIONID, "GPS:VersionID", TIFF_BYTE, 4 },
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bcab0e90b7d0..3f35a3a98bb7 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,22 +1,25 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=1.8.17
-revision=3
+version=2.2.13.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
+configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
-DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config git"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
- ffmpeg-devel opencolorio-devel"
+ ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
+ Field3D-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=7f810124e866ac14ad9c11b0ab528a6ed4c8e62a190cc44a77eed8159f57405c
+# Runs checks even for features we disabled.
+make_check=no
CXXFLAGS="-faligned-new"
case "$XBPS_TARGET_MACHINE" in
@@ -48,7 +51,7 @@ pre_build() {
}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md LICENSE
}
openimageio-devel_package() {
From 02984dd1dda3588fa1bfe71b811ef1e3d81ffa62 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 16 Apr 2021 20:31:28 +0200
Subject: [PATCH 5/5] blender: update to 2.92.0.
---
.../{musl.patch => 0001-musl-fixes.patch} | 78 ++++++++-----------
.../patches/0002-fix-linking-issue.patch | 25 ++++++
srcpkgs/blender/patches/altivec-all.patch | 32 --------
...patch => no-Werror-double-promotion.patch} | 12 ++-
srcpkgs/blender/patches/python39.patch | 25 ------
srcpkgs/blender/template | 15 +++-
6 files changed, 74 insertions(+), 113 deletions(-)
rename srcpkgs/blender/patches/{musl.patch => 0001-musl-fixes.patch} (53%)
create mode 100644 srcpkgs/blender/patches/0002-fix-linking-issue.patch
delete mode 100644 srcpkgs/blender/patches/altivec-all.patch
rename srcpkgs/blender/patches/{disable_werror.patch => no-Werror-double-promotion.patch} (51%)
delete mode 100644 srcpkgs/blender/patches/python39.patch
diff --git a/srcpkgs/blender/patches/musl.patch b/srcpkgs/blender/patches/0001-musl-fixes.patch
similarity index 53%
rename from srcpkgs/blender/patches/musl.patch
rename to srcpkgs/blender/patches/0001-musl-fixes.patch
index 5cfded1586d0..0e64369b4379 100644
--- a/srcpkgs/blender/patches/musl.patch
+++ b/srcpkgs/blender/patches/0001-musl-fixes.patch
@@ -1,46 +1,22 @@
-From 8f2b2e92ffdec658d4eb999f41acf6c74a5b32ed Mon Sep 17 00:00:00 2001
-From: Leon Marz <lmarz@cs.uni-frankfurt.de>
-Date: Tue, 1 Sep 2020 09:09:50 +0200
-Subject: [PATCH 1/2] musl fixes
-
-[ Taken from https://git.alpinelinux.org/aports/plain/testing/blender/0001-musl-fixes.patch ]
+Imported from https://git.alpinelinux.org/aports/plain/testing/blender/0001-musl-fixes.patch?id=42cee48643cb6ccc1a110e66446aa74408ee0160
+adapted to not use __MUSL__ definition
-Original Patch by Nathanael Copa
+From e530dc5b32695c208aa46bfe460ac7d76159a6d3 Mon Sep 17 00:00:00 2001
+From: Leon Marz <lmarz@cs.uni-frankfurt.de>
+Date: Wed, 25 Nov 2020 10:10:41 +0100
+Subject: [PATCH 1/3] musl fixes
+Original patch by Nathanael Copa
---
- CMakeLists.txt | 13 +++++++++++++
- intern/guardedalloc/intern/mallocn_intern.h | 2 +-
- intern/libc_compat/libc_compat.c | 2 --
- source/blender/blenlib/intern/system.c | 4 +++-
- source/creator/creator_signals.c | 2 +-
- 5 files changed, 18 insertions(+), 5 deletions(-)
+ intern/guardedalloc/intern/mallocn_intern.h | 2 +-
+ intern/libc_compat/libc_compat.c | 2 --
+ source/blender/blenlib/intern/system.c | 4 +++-
+ source/blender/gpu/GPU_vertex_buffer.h | 1 -
+ source/creator/creator_signals.c | 2 +-
+ 5 files changed, 5 insertions(+), 6 deletions(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cee8675..111e6e3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -138,6 +138,19 @@ get_blender_version()
- #-----------------------------------------------------------------------------
- # Options
-
-+# musl-libc related checks (missing execinfo.h and feenableexcept())
-+include(CheckIncludeFiles)
-+check_include_files(execinfo.h HAVE_EXECINFO_H)
-+if(HAVE_EXECINFO_H)
-+ add_definitions(-DHAVE_EXECINFO_H)
-+endif()
-+
-+include(CheckLibraryExists)
-+check_library_exists(m feenableexcept "fenv.h" HAVE_FEENABLEEXCEPT)
-+if(HAVE_FEENABLEEXCEPT)
-+ add_definitions(-DHAVE_FEENABLEEXCEPT)
-+endif()
-+
- # Blender internal features
- option(WITH_BLENDER "Build blender (disable to build only the blender player)" ON)
- mark_as_advanced(WITH_BLENDER)
diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h
-index 8fc3e43..ee443c4 100644
+index aa95615..f7e347d 100644
--- a/intern/guardedalloc/intern/mallocn_intern.h
+++ b/intern/guardedalloc/intern/mallocn_intern.h
@@ -33,7 +33,7 @@
@@ -48,7 +24,7 @@ index 8fc3e43..ee443c4 100644
#define USE_MALLOC_USABLE_SIZE /* internal, when we have malloc_usable_size() */
-#if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \
-+#if defined(__linux__) && defined(HAVE_EXECINFO_H) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \
++#if (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \
defined(__GLIBC__)
# include <malloc.h>
# define HAVE_MALLOC_STATS
@@ -71,14 +47,14 @@ index 78e387e..d21c281 100644
-# endif /* __GLIBC_PREREQ */
#endif /* __linux__ */
diff --git a/source/blender/blenlib/intern/system.c b/source/blender/blenlib/intern/system.c
-index 20edbb9..6e856cd 100644
+index 8e3d489..4d0789b 100644
--- a/source/blender/blenlib/intern/system.c
+++ b/source/blender/blenlib/intern/system.c
@@ -35,7 +35,9 @@
# include "BLI_winstuff.h"
#else
-+#if defined(HAVE_EXECINFO_H)
++#if defined(__GLIBC__)
# include <execinfo.h>
+#endif
# include <unistd.h>
@@ -89,12 +65,24 @@ index 20edbb9..6e856cd 100644
/* ------------- */
/* Linux / Apple */
-# if defined(__linux__) || defined(__APPLE__)
-+# if defined(__linux__) && defined(HAVE_EXECINFO_H) || defined(__APPLE__)
++# if defined(__linux__) && defined(__GLIBC__) || defined(__APPLE__)
# define SIZE 100
void *buffer[SIZE];
+diff --git a/source/blender/gpu/GPU_vertex_buffer.h b/source/blender/gpu/GPU_vertex_buffer.h
+index eeaebd3..93a77a2 100644
+--- a/source/blender/gpu/GPU_vertex_buffer.h
++++ b/source/blender/gpu/GPU_vertex_buffer.h
+@@ -118,7 +118,6 @@ GPU_INLINE void *GPU_vertbuf_raw_step(GPUVertBufRaw *a)
+ {
+ unsigned char *data = a->data;
+ a->data += a->stride;
+- BLI_assert(data < a->_data_end);
+ return (void *)data;
+ }
+
diff --git a/source/creator/creator_signals.c b/source/creator/creator_signals.c
-index ad0b7b2..01d5e37 100644
+index 29e12a9..d90da8f 100644
--- a/source/creator/creator_signals.c
+++ b/source/creator/creator_signals.c
@@ -269,7 +269,7 @@ void main_signal_setup_fpe(void)
@@ -102,10 +90,10 @@ index ad0b7b2..01d5e37 100644
signal(SIGFPE, sig_handle_fpe);
-# if defined(__linux__) && defined(__GNUC__)
-+# if defined(__linux__) && defined(__GNUC__) && defined(HAVE_FEENABLEEXCEPT)
++# if defined(__linux__) && defined(__GNUC__) && defined(__GLIBC__)
feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
# endif /* defined(__linux__) && defined(__GNUC__) */
# if defined(OSX_SSE_FPE)
--
-2.28.0
+2.30.1
diff --git a/srcpkgs/blender/patches/0002-fix-linking-issue.patch b/srcpkgs/blender/patches/0002-fix-linking-issue.patch
new file mode 100644
index 000000000000..28683714e126
--- /dev/null
+++ b/srcpkgs/blender/patches/0002-fix-linking-issue.patch
@@ -0,0 +1,25 @@
+Imported from https://git.alpinelinux.org/aports/plain/testing/blender/0002-fix-linking-issue.patch?id=42cee48643cb6ccc1a110e66446aa74408ee0160
+
+From 54f5929131f537b6cbb74b5a7da45858cef6020b Mon Sep 17 00:00:00 2001
+From: Leon Marz <lmarz@cs.uni-frankfurt.de>
+Date: Tue, 1 Sep 2020 09:11:18 +0200
+Subject: [PATCH 2/3] fix linking issue
+
+---
+ intern/ghost/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
+index 1739659..d6b442b 100644
+--- a/intern/ghost/CMakeLists.txt
++++ b/intern/ghost/CMakeLists.txt
+@@ -484,5 +484,5 @@ if(WITH_XR_OPENXR)
+ endif()
+
+ add_definitions(${GL_DEFINITIONS})
+-
++list(APPEND LIB "-lX11" "-lXi" "-lXxf86vm" "-lXfixes" "-lXrender")
+ blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+--
+2.30.1
+
diff --git a/srcpkgs/blender/patches/altivec-all.patch b/srcpkgs/blender/patches/altivec-all.patch
deleted file mode 100644
index 115e1ea6fd03..000000000000
--- a/srcpkgs/blender/patches/altivec-all.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-This applies a better workaround for C++ type conflicts
-in AltiVec/C++, allowing it to build on BE ppc(64).
-
---- a/extern/clew/include/clew.h
-+++ b/extern/clew/include/clew.h
-@@ -370,15 +370,18 @@ typedef unsigned int cl_GLenum;
-
- /* Define basic vector types */
- /* Workaround for ppc64el platform: conflicts with bool from C++. */
--#if defined( __VEC__ ) && !(defined(__PPC64__) && defined(__LITTLE_ENDIAN__))
-+#if defined(__VEC__)
- #include <altivec.h> /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
-- typedef vector unsigned char __cl_uchar16;
-- typedef vector signed char __cl_char16;
-- typedef vector unsigned short __cl_ushort8;
-- typedef vector signed short __cl_short8;
-- typedef vector unsigned int __cl_uint4;
-- typedef vector signed int __cl_int4;
-- typedef vector float __cl_float4;
-+ #undef vector
-+ #undef bool
-+ #undef pixel
-+ typedef __vector unsigned char __cl_uchar16;
-+ typedef __vector signed char __cl_char16;
-+ typedef __vector unsigned short __cl_ushort8;
-+ typedef __vector signed short __cl_short8;
-+ typedef __vector unsigned int __cl_uint4;
-+ typedef __vector signed int __cl_int4;
-+ typedef __vector float __cl_float4;
- #define __CL_UCHAR16__ 1
- #define __CL_CHAR16__ 1
- #define __CL_USHORT8__ 1
diff --git a/srcpkgs/blender/patches/disable_werror.patch b/srcpkgs/blender/patches/no-Werror-double-promotion.patch
similarity index 51%
rename from srcpkgs/blender/patches/disable_werror.patch
rename to srcpkgs/blender/patches/no-Werror-double-promotion.patch
index 9fada907e1ce..2d17a6da1818 100644
--- a/srcpkgs/blender/patches/disable_werror.patch
+++ b/srcpkgs/blender/patches/no-Werror-double-promotion.patch
@@ -1,13 +1,11 @@
-diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
-index f22688f..c32aad1 100644
---- a/intern/cycles/CMakeLists.txt
-+++ b/intern/cycles/CMakeLists.txt
-@@ -227,8 +227,6 @@ endif()
-
+--- ./intern/cycles/CMakeLists.txt.orig 2021-04-16 20:47:50.466754473 +0200
++++ ./intern/cycles/CMakeLists.txt 2021-04-16 20:48:06.199903232 +0200
+@@ -336,7 +336,7 @@ endif()
# Warnings
if(CMAKE_COMPILER_IS_GNUCXX)
-- ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion")
+ ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion")
- ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion")
++ #ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion")
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_no_error_unused_macros "-Wno-error=unused-macros")
unset(_has_cxxflag_float_conversion)
unset(_has_cxxflag_double_promotion)
diff --git a/srcpkgs/blender/patches/python39.patch b/srcpkgs/blender/patches/python39.patch
deleted file mode 100644
index 1e14eb062035..000000000000
--- a/srcpkgs/blender/patches/python39.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-The deprecated PyEval_ReleaseLock() triggers a segfault with Python 3.9.0.
-See issue at https://developer.blender.org/T81688 and fix at
-https://developer.blender.org/rB5edba9b42f684bf8b99894bb6988e7f46180e12c
-
---- a/source/blender/python/generic/bpy_threads.c 2020-10-13 15:29:16.708347045 -0400
-+++ b/source/blender/python/generic/bpy_threads.c 2020-10-13 15:29:43.123345331 -0400
-@@ -29,14 +29,11 @@
- /* analogue of PyEval_SaveThread() */
- BPy_ThreadStatePtr BPY_thread_save(void)
- {
-- PyThreadState *tstate = PyThreadState_Swap(NULL);
-- /* note: tstate can be NULL when quitting Blender */
--
-- if (tstate && PyEval_ThreadsInitialized()) {
-- PyEval_ReleaseLock();
-+ /* The thread-state can be NULL when quitting Blender. */
-+ if (_PyThreadState_UncheckedGet()) {
-+ return (BPy_ThreadStatePtr)PyEval_SaveThread();
- }
--
-- return (BPy_ThreadStatePtr)tstate;
-+ return NULL;
- }
-
- /* analogue of PyEval_RestoreThread() */
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 01b3677ff4f6..5daa3ce0b4ac 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
-version=2.90.1
-revision=2
+version=2.92.0
+revision=1
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
@@ -18,16 +18,23 @@ makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm
libopenexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
opencolorio-devel opencollada-devel python3-numpy libXrender-devel
- OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel"
+ OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel
+ pugixml-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="3D graphics creation suite"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.blender.org"
distfiles="http://download.blender.org/source/${pkgname}-${version}.tar.xz"
-checksum=e78dcc946c823ad1bd89bcc6938fc6b375540ec3eff58649586acf1f6a653d99
+checksum=e791cfc403292383577c3c8ce2cd34e5aa2cd8da0a7483041049a1609ddb4595
python_version=3
+CXXFLAGS="-DNDEBUG"
+CFLAGS="$CXXFLAGS"
+LDFLAGS="-Wl,-z,stack-size=2097152"
patch_args="-Np1"
+# Blender tests are executed against a system installation of blender. This
+# is currently not supported by xbps-src.
+make_check=no
case "$XBPS_TARGET_MACHINE" in
*-musl) ;;
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: blender 2.92.0 1
2021-04-17 20:00 [PR PATCH] blender 2.92.0 1 Gottox
` (4 preceding siblings ...)
2021-04-20 8:57 ` Gottox
@ 2021-04-20 9:49 ` Gottox
2021-04-20 9:59 ` [PR PATCH] [Merged]: " Gottox
6 siblings, 0 replies; 8+ messages in thread
From: Gottox @ 2021-04-20 9:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 183 bytes --]
New comment by Gottox on void-packages repository
https://github.com/void-linux/void-packages/pull/30286#issuecomment-823141885
Comment:
i686 seems to report a false-positive here.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Merged]: blender 2.92.0 1
2021-04-17 20:00 [PR PATCH] blender 2.92.0 1 Gottox
` (5 preceding siblings ...)
2021-04-20 9:49 ` Gottox
@ 2021-04-20 9:59 ` Gottox
6 siblings, 0 replies; 8+ messages in thread
From: Gottox @ 2021-04-20 9:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 390 bytes --]
There's a merged pull request on the void-packages repository
blender 2.92.0 1
https://github.com/void-linux/void-packages/pull/30286
Description:
- pugixml: update to 1.11.4.
- New package: ptex-2.3.2
- New package: Field3D-1.7.3
- openimageio: update to 2.2.13.1.
- blender: update to 2.92.0.
TODO:
* [ ] remove luxmark from repository
* [ ] remove luxrays from repository
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-04-20 9:59 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-17 20:00 [PR PATCH] blender 2.92.0 1 Gottox
2021-04-17 20:10 ` [PR PATCH] [Updated] " Gottox
2021-04-18 6:07 ` Gottox
2021-04-18 6:09 ` Gottox
2021-04-18 6:19 ` Gottox
2021-04-20 8:57 ` Gottox
2021-04-20 9:49 ` Gottox
2021-04-20 9:59 ` [PR PATCH] [Merged]: " Gottox
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).