Update to OpenCV 4.5.5 and add Mac M1 architecture #1084 #1125
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gunterze
reviewed
Feb 10, 2022
There was a problem hiding this comment.
Prefer to include i686 and s390x version in binary distribution package:
diff --git a/dcm4che-assembly/pom.xml b/dcm4che-assembly/pom.xml
index 8ee13852e..3a14c1b4a 100644
--- a/dcm4che-assembly/pom.xml
+++ b/dcm4che-assembly/pom.xml
@@ -544,6 +544,13 @@
<type>so</type>
<classifier>linux-x86</classifier>
</dependency>
+ <dependency>
+ <groupId>org.weasis.thirdparty.org.opencv</groupId>
+ <artifactId>libopencv_java</artifactId>
+ <version>${weasis.opencv.native.version}</version>
+ <type>so</type>
+ <classifier>linux-s390x</classifier>
+ </dependency>
<dependency>
<groupId>org.weasis.thirdparty.org.opencv</groupId>
<artifactId>libopencv_java</artifactId>
diff --git a/dcm4che-assembly/src/main/assembly/component.xml b/dcm4che-assembly/src/main/assembly/component.xml
index 17bf68857..bb8b32ec2 100644
--- a/dcm4che-assembly/src/main/assembly/component.xml
+++ b/dcm4che-assembly/src/main/assembly/component.xml
@@ -231,6 +231,22 @@
</includes>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
+ <dependencySet>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <outputDirectory>lib/linux-x86</outputDirectory>
+ <includes>
+ <include>*:*:so:linux-x86:*</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <outputDirectory>lib/linux-s390x</outputDirectory>
+ <includes>
+ <include>*:*:so:linux-s390x:*</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
<dependencySet>
Not sure about appropriate sub directory names in the distribution package. NativeLibraryResourceLoader of jboss-modules expects linux-i686 for x86 32-bit arch - and it does not support loading s390x native libraries, so I agree to keep the s390x version excluded from dcm4che-jboss-modules assembly.
|
The directory name must match with the package name in the table above. |
So looks ok for you? @nroduit We may think about to provide os-arch specific binary distribution packages to reduce download bandwidth in a separate step... |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
dcm4che uses a native library for the compression and decompression of images. Here is the list of supported systems and architectures:
*** The binary is not included in the dcm4che package but downloaded at the first use.