Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11399 from suvari/master

Browse Source 
xsimd: new package for krita
This commit is contained in:
Kamil ATLI
2023-01-23 12:44:34 +03:00
committed by GitHub
parent 7c2c6b0a37 015fd9d638
commit e50745a206
11 changed files with 373159 additions and 374197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/krita/files/find-xsimd.patch
+21
View File
@@ -0,0 +1,21 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d075a7223..6dc88e243a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1052,10 +1052,12 @@ list (APPEND ANDROID_EXTRA_LIBS ${LCMS2_LIBRARIES})
##
## Test for xsimd
##
-find_package(xsimd 8.1.0)
-if(NOT xsimd_FOUND)
- find_package(xsimd 9)
-endif()
+foreach(xsimd_version 8.1.0 9 10)
+ if(NOT xsimd_FOUND)
+ find_package(xsimd ${xsimd_version})
+ endif()
+endforeach()
+
set_package_properties(xsimd PROPERTIES
DESCRIPTION "C++ wrappers for SIMD intrinsics"
URL "https://github.com/xtensor-stack/xsimd"
editor/krita/files/krita-opencolorio2.patch
-1080
View File
File diff suppressed because it is too large Load Diff
editor/krita/files/krita-openexr3.patch
-136
View File
@@ -1,136 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e8f456492..9a3ae863ec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -649,15 +649,20 @@ set_package_properties(ZLIB PROPERTIES
PURPOSE "Optionally used by the G'Mic and the PSD plugins")
macro_bool_to_01(ZLIB_FOUND HAVE_ZLIB)
-find_package(OpenEXR)
+find_package(OpenEXR 3.0 CONFIG QUIET)
+if(TARGET OpenEXR::OpenEXR)
+ set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
+else()
+ find_package(OpenEXR)
+endif()
set_package_properties(OpenEXR PROPERTIES
DESCRIPTION "High dynamic-range (HDR) image file format"
URL "https://www.openexr.com"
TYPE OPTIONAL
PURPOSE "Required by the Krita OpenEXR filter")
-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
+macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
set(LINK_OPENEXR_LIB)
-if(OPENEXR_FOUND)
+if(OpenEXR_FOUND)
include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS})
set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
add_definitions(${OPENEXR_DEFINITIONS})
diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
index e9ff363df3..59e567fa04 100644
--- a/libs/image/CMakeLists.txt
+++ b/libs/image/CMakeLists.txt
@@ -367,7 +367,7 @@ if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
endif()
endif()
-if(OPENEXR_FOUND)
+if(OpenEXR_FOUND)
target_link_libraries(kritaimage PUBLIC ${OPENEXR_LIBRARIES})
endif()
diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
index 3e8bcf9e25..d55fd8714f 100644
--- a/libs/pigment/CMakeLists.txt
+++ b/libs/pigment/CMakeLists.txt
@@ -14,7 +14,7 @@ include_directories(
set(FILE_OPENEXR_SOURCES)
set(LINK_OPENEXR_LIB)
-if(OPENEXR_FOUND)
+if(OpenEXR_FOUND)
include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS})
set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
add_definitions(${OPENEXR_DEFINITIONS})
diff --git a/plugins/color/lcms2engine/CMakeLists.txt b/plugins/color/lcms2engine/CMakeLists.txt
index 86b83710dc..801783c1f3 100644
--- a/plugins/color/lcms2engine/CMakeLists.txt
+++ b/plugins/color/lcms2engine/CMakeLists.txt
@@ -28,7 +28,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
)
-if (HAVE_LCMS24 AND OPENEXR_FOUND)
+if (HAVE_LCMS24 AND OpenEXR_FOUND)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
@@ -38,7 +38,7 @@ endif ()
set(FILE_OPENEXR_SOURCES)
set(LINK_OPENEXR_LIB)
-if(OPENEXR_FOUND)
+if(OpenEXR_FOUND)
include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS})
set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
add_definitions(${OPENEXR_DEFINITIONS})
@@ -77,7 +77,7 @@ set ( lcmsengine_SRCS
LcmsEnginePlugin.cpp
)
-if (HAVE_LCMS24 AND OPENEXR_FOUND)
+if (HAVE_LCMS24 AND OpenEXR_FOUND)
set ( lcmsengine_SRCS
${lcmsengine_SRCS}
colorspaces/gray_f16/GrayF16ColorSpace.cpp
diff --git a/plugins/color/lcms2engine/tests/CMakeLists.txt b/plugins/color/lcms2engine/tests/CMakeLists.txt
index ae69220698..8c5fe5d061 100644
--- a/plugins/color/lcms2engine/tests/CMakeLists.txt
+++ b/plugins/color/lcms2engine/tests/CMakeLists.txt
@@ -11,7 +11,7 @@ include_directories( ../colorspaces/cmyk_u16
../colorprofiles
..
)
-if(OPENEXR_FOUND)
+if(OpenEXR_FOUND)
include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS})
endif()
include_directories( ${LCMS2_INCLUDE_DIR} )
diff --git a/plugins/impex/CMakeLists.txt b/plugins/impex/CMakeLists.txt
index 63df1fd69a..c94674b381 100644
--- a/plugins/impex/CMakeLists.txt
+++ b/plugins/impex/CMakeLists.txt
@@ -19,7 +19,7 @@ if(PNG_FOUND)
add_subdirectory(csv)
endif()
-if(OPENEXR_FOUND)
+if(OpenEXR_FOUND)
add_subdirectory(exr)
endif()
diff --git a/plugins/impex/exr/exr_converter.cc b/plugins/impex/exr/exr_converter.cc
index f63ab73cd9..d620062594 100644
--- a/plugins/impex/exr/exr_converter.cc
+++ b/plugins/impex/exr/exr_converter.cc
@@ -11,6 +11,8 @@
#include <ImfAttribute.h>
#include <ImfChannelList.h>
+#include <ImfFrameBuffer.h>
+#include <ImfHeader.h>
#include <ImfInputFile.h>
#include <ImfOutputFile.h>
diff --git a/plugins/impex/raw/CMakeLists.txt b/plugins/impex/raw/CMakeLists.txt
index 71cb5b355c..f65bc770a5 100644
--- a/plugins/impex/raw/CMakeLists.txt
+++ b/plugins/impex/raw/CMakeLists.txt
@@ -1,6 +1,6 @@
add_subdirectory(tests)
-if(OPENEXR_FOUND)
+if(OpenEXR_FOUND)
include_directories(${OPENEXR_INCLUDE_DIRS})
endif()
include_directories(${LibRaw_INCLUDE_DIR})
editor/krita/pspec.xml
+25 -16
View File
@@ -18,6 +18,7 @@
<Dependency>kio-devel</Dependency>
<Dependency>pkgconfig</Dependency>
<Dependency>gsl-devel</Dependency>
<Dependency>webp-devel</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>tiff-devel</Dependency>
<Dependency>libvc-devel</Dependency>
@@ -28,44 +29,47 @@
<Dependency>boost-devel</Dependency>
<Dependency>libXi-devel</Dependency>
<Dependency>imath-devel</Dependency>
<Dependency>xsimd-devel</Dependency>
<Dependency>libjxl-devel</Dependency>
<Dependency>ffmpeg-devel</Dependency>
<Dependency>libraw-devel</Dependency>
<Dependency>giflib-devel</Dependency>
<Dependency>libpng-devel</Dependency>
<Dependency>kcrash-devel</Dependency>
<Dependency>quazip-devel</Dependency>
<Dependency>qt5-sql-odbc</Dependency>
<Dependency>qt5-sql-mysql</Dependency>
<Dependency>qt5-svg-devel</Dependency>
<Dependency>libheif-devel</Dependency>
<Dependency>python3-devel</Dependency>
<Dependency>openexr-devel</Dependency>
<Dependency>kconfig-devel</Dependency>
<Dependency>kseexpr-devel</Dependency>
<Dependency>karchive-devel</Dependency>
<Dependency>qt5-base-devel</Dependency>
<Dependency>qt5-sql-sqlite</Dependency>
<Dependency>openjpeg2-devel</Dependency>
<Dependency>libmypaint-devel</Dependency>
<Dependency>kguiaddons-devel</Dependency>
<Dependency>kitemviews-devel</Dependency>
<Dependency>opencolorio-devel</Dependency>
<Dependency>poppler-qt5-devel</Dependency>
<Dependency>kitemmodels-devel</Dependency>
<Dependency>python3-qt5-devel</Dependency>
<Dependency>python3-pyqt5-sip</Dependency>
<Dependency>kcoreaddons-devel</Dependency>
<Dependency>kcompletion-devel</Dependency>
<Dependency>qt5-sql-postgresql</Dependency>
<Dependency>qt5-designer-devel</Dependency>
<Dependency>qt5-x11extras-devel</Dependency>
<Dependency>extra-cmake-modules</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>kwindowsystem-devel</Dependency>
<Dependency>kwidgetsaddons-devel</Dependency>
<Dependency>qt5-multimedia-devel</Dependency>
<Dependency>qt5-svg-devel</Dependency>
<Dependency>qt5-designer-devel</Dependency>
<Dependency>qt5-x11extras-devel</Dependency>
<Dependency>opencolorio-devel</Dependency>
<Dependency>qt5-sql-sqlite</Dependency>
<Dependency>qt5-sql-mysql</Dependency>
<Dependency>qt5-sql-odbc</Dependency>
<Dependency>qt5-base-devel</Dependency>
<Dependency>qt5-sql-postgresql</Dependency>
<Dependency>webp-devel</Dependency>
<Dependency>kseexpr-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">krita-openexr3.patch</Patch> -->
<!-- <Patch level="1">krita-opencolorio2.patch</Patch> -->
<Patch>find-xsimd.patch</Patch>
</Patches>
</Source>
@@ -77,11 +81,13 @@
<Dependency>tiff</Dependency>
<Dependency>zlib</Dependency>
<Dependency>webp</Dependency>
<Dependency>xsimd</Dependency>
<Dependency>boost</Dependency>
<Dependency>fftw3</Dependency>
<Dependency>ki18n</Dependency>
<Dependency>lcms2</Dependency>
<Dependency>imath</Dependency>
<Dependency>libjxl</Dependency>
<Dependency>giflib</Dependency>
<Dependency>kcrash</Dependency>
<Dependency>libX11</Dependency>
@@ -93,23 +99,26 @@
<Dependency>python3</Dependency>
<Dependency>kconfig</Dependency>
<Dependency>qt5-svg</Dependency>
<Dependency>libheif</Dependency>
<Dependency>karchive</Dependency>
<Dependency>qt5-base</Dependency>
<Dependency>openjpeg2</Dependency>
<Dependency>libmypaint</Dependency>
<Dependency>exiv2-libs</Dependency>
<Dependency>kguiaddons</Dependency>
<Dependency>kitemviews</Dependency>
<Dependency>kcompletion</Dependency>
<Dependency>kcoreaddons</Dependency>
<Dependency>poppler-qt5</Dependency>
<Dependency>opencolorio</Dependency>
<Dependency>openexr-libs</Dependency>
<Dependency>qt5-designer</Dependency>
<Dependency>kwindowsystem</Dependency>
<Dependency>libjpeg-turbo</Dependency>
<Dependency>qt5-x11extras</Dependency>
<Dependency>kwidgetsaddons</Dependency>
<Dependency>qt5-multimedia</Dependency>
<Dependency>qt5-declarative</Dependency>
<Dependency>qt5-designer</Dependency>
<Dependency>opencolorio</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
@@ -126,7 +135,7 @@
<History>
<Update release="7">
<Date>2023-01-21</Date>
<Date>2023-01-23</Date>
<Version>5.1.5</Version>
<Comment>Version bump</Comment>
<Name>Mustafa Cinasal</Name>
pisi-index.xml
+373027 -372963
View File
File diff suppressed because it is too large Load Diff
pisi-index.xml.sha1sum
+1 -1
View File
@@ -1 +1 @@
ec9a6f02af3f029a1d6f92a612a11b3ed5a035c8
ca71b791bba82ce0291e481f05401421513d2bfd
pisi-index.xml.xz
BIN
View File
Binary file not shown.
pisi-index.xml.xz.sha1sum
+1 -1
View File
@@ -1 +1 @@
a7d30a8d37647db75eb7447ec3fc36bacd509e73
caa0cd0827d196e53007d7a32163e3d209557484
science/mathematics/xsimd/actions.py
+20
View File
@@ -0,0 +1,20 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import cmaketools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
def setup():
cmaketools.configure("DCMAKE_INSTALL_PREFIX=/usr")
def build():
cmaketools.make()
def install():
cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("README.md", "LICENSE")
science/mathematics/xsimd/pspec.xml
+56
View File
@@ -0,0 +1,56 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>xsimd</Name>
<Homepage>https://github.com/xtensor-stack/xsimd</Homepage>
<Packager>
<Name>Kamil Atlı</Name>
<Email>suvari@pisilinux.org</Email>
</Packager>
<PartOf>science.mathematics</PartOf>
<License>BSD-3-Clause</License>
<Icon>xsimd</Icon>
<IsA>library</IsA>
<Summary>C++ wrappers for SIMD intrinsics and parallelized, optimized mathematical functions (SSE, AVX, AVX512, NEON, SVE))</Summary>
<Description>xsimd provides a unified means for using these features for library authors. Namely, it enables manipulation of batches of numbers with the same arithmetic operators as for single values. It also provides accelerated implementation of common mathematical functions operating on batches.</Description>
<Archive sha1sum="41e1bbe22cbd8d573a1d996c7aae5c86145fe1e8" type="targz">https://github.com/xtensor-stack/xsimd/archive/refs/tags/10.0.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>xsimd</Name>
<RuntimeDependencies>
<!-- <Dependency></Dependency> -->
</RuntimeDependencies>
<Files>
<Path fileType="data">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<Package>
<Name>xsimd-devel</Name>
<Summary>Development files for xsimd</Summary>
<RuntimeDependencies>
<Dependency release="current">xsimd</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/cmake</Path>
<Path fileType="library">/usr/lib/pkgconfig</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2023-01-21</Date>
<Version>10.0.0</Version>
<Comment>First release</Comment>
<Name>Kamil Atlı</Name>
<Email>suvari@pisilinux.org</Email>
</Update>
</History>
</PISI>
science/mathematics/xsimd/translations.xml
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>xsimd</Name>
<Summary xml:lang="tr">SIMD esasları ve paralelleştirilmiş, optimize edilmiş matematiksel işlevler (SSE, AVX, AVX512, NEON, SVE)) için C++ sarmalayıcıları</Summary>
<Description xml:lang="tr">xsimd, kitaplık yazarları için bu özellikleri kullanmak için birleşik bir yol sağlar. Yani, tek değerler için olduğu gibi aynı aritmetik işleçlerle sayı gruplarının işlenmesini sağlar. Ayrıca toplu işlerde çalışan ortak matematiksel işlevlerin hızlandırılmış uygulanmasını sağlar.</Description>
</Source>
</PISI>