Merge pull request #1546 from mayeut/macos-arm64

CI: add macOS arm64

.github/workflows/build.yml

@@ -103,7 +103,7 @@ jobs:
             OPJ_CI_BUILD_CONFIGURATION: Release
             OPJ_NONCOMMERCIAL: 1
 
-  macos:
+  macos_x86_64:
     runs-on: macos-13
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     steps:
@@ -115,6 +115,7 @@ jobs:
             ./tools/travis-ci/install.sh
             ./tools/travis-ci/run.sh
         env:
+            CMAKE_OSX_ARCHITECTURES: x86_64
             OPJ_CI_ARCH: x86_64
             OPJ_CI_BUILD_CONFIGURATION: Release
             OPJ_CI_INCLUDE_IF_DEPLOY: 1
@@ -126,6 +127,30 @@ jobs:
         with:
           files: build/openjpeg-*.zip
 
+  macos_arm64:
+    runs-on: macos-14
+    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Build and run tests
+        run: |
+            ./tools/travis-ci/install.sh
+            ./tools/travis-ci/run.sh
+        env:
+            CMAKE_OSX_ARCHITECTURES: arm64
+            OPJ_CI_ARCH: arm64
+            OPJ_CI_BUILD_CONFIGURATION: Release
+            OPJ_CI_INCLUDE_IF_DEPLOY: 1
+            #OPJ_NONCOMMERCIAL: 1
+
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: build/openjpeg-*.zip
+
   windows_build:
     runs-on: windows-2019
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
@@ -174,7 +199,7 @@ jobs:
       - name: Install wget
         shell: cmd
         run: |
-            choco install wget --no-progress 
+            choco install wget --no-progress
 
       - name: Build and run tests
         run: |

thirdparty/libpng/CMakeLists.txt

@@ -23,6 +23,7 @@ if(MSVC)
   set_target_properties(${LIBTARGET} PROPERTIES PREFIX "lib")
 endif(MSVC)
 #
+target_compile_definitions(${LIBTARGET} PRIVATE PNG_ARM_NEON_OPT=0)
 target_link_libraries(${LIBTARGET} ${Z_LIBNAME} ${M_LIBRARY})
 #
 set_target_properties(${LIBTARGET}

tools/travis-ci/knownfailures-macOS14.6-xcode15.4-arm64-Release-3rdP.txt

@@ -0,0 +1,48 @@
+NR-C1P0-p0_04.j2k-compare2base
+NR-C1P0-p0_05.j2k-compare2base
+NR-C1P0-p0_06.j2k-compare2base
+NR-C1P1-p1_02.j2k-compare2base
+NR-C1P1-p1_03.j2k-compare2base
+NR-C1P1-p1_04.j2k-compare2base
+NR-C1P1-p1_05.j2k-compare2base
+NR-JP2-file2.jp2-compare2base
+NR-RIC-subsampling_1.jp2-compare2base
+NR-RIC-subsampling_2.jp2-compare2base
+NR-RIC-zoo1.jp2-compare2base
+NR-RIC-zoo2.jp2-compare2base
+NR-DEC-_00042.j2k-2-decode-md5
+NR-DEC-buxI.j2k-9-decode-md5
+NR-DEC-CT_Phillips_JPEG2K_Decompr_Problem.j2k-13-decode-md5
+NR-DEC-Marrin.jp2-18-decode-md5
+NR-DEC-kodak_2layers_lrcp.j2c-31-decode-md5
+NR-DEC-kodak_2layers_lrcp.j2c-32-decode-md5
+NR-DEC-file409752.jp2-40-decode-md5
+NR-DEC-issue188_beach_64bitsbox.jp2-41-decode-md5
+NR-DEC-issue206_image-000.jp2-42-decode-md5
+NR-DEC-issue205.jp2-43-decode-md5
+NR-DEC-issue228.j2k-60-decode-md5
+NR-DEC-issue142.j2k-66-decode-md5
+NR-DEC-issue134.jp2-67-decode-md5
+NR-DEC-issue135.j2k-68-decode-md5
+NR-DEC-issue208.jp2-69-decode-md5
+NR-DEC-issue211.jp2-70-decode-md5
+NR-DEC-p1_04.j2k-124-decode-md5
+NR-DEC-p1_04.j2k-125-decode-md5
+NR-DEC-p1_04.j2k-126-decode-md5
+NR-DEC-p1_04.j2k-127-decode-md5
+NR-DEC-p1_04.j2k-128-decode-md5
+NR-DEC-p1_04.j2k-129-decode-md5
+NR-DEC-p1_04.j2k-131-decode-md5
+NR-DEC-p1_04.j2k-138-decode-md5
+NR-DEC-p1_04.j2k-140-decode-md5
+NR-DEC-p0_04.j2k-166-decode-md5
+NR-DEC-p0_04.j2k-167-decode-md5
+NR-DEC-p0_04.j2k-168-decode-md5
+NR-DEC-p0_04.j2k-172-decode-md5
+NR-DEC-issue205.jp2-253-decode-md5
+NR-DEC-issue236-ESYCC-CDEF.jp2-254-decode-md5
+NR-DEC-issue559-eci-090-CIELab.jp2-255-decode-md5
+NR-DEC-issue559-eci-091-CIELab.jp2-256-decode-md5
+NR-DEC-db11217111510058.jp2-306-decode-md5
+NR-DEC-tnsot_zero.jp2-307-decode-md5
+NR-DEC-Bretagne1_ht_lossy.j2k-311-decode-md5