Skip to content

Commit

Permalink
Update libdicom, remove OS patch, get their official build from website
Browse files Browse the repository at this point in the history
  • Loading branch information
alanocallaghan committed Oct 13, 2023
1 parent f97fe44 commit cef6002
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 333 deletions.
18 changes: 5 additions & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ jobs:
OPENSLIDE_DEBUG=synthetic $showprops ""
jar:
name: Package openslide JAR
name: Package openslide Jar
runs-on: ubuntu-latest
needs: [sdist, bdist]
steps:
Expand All @@ -283,20 +283,12 @@ jobs:
with:
name: ${{ needs.sdist.outputs.artifact }}

- name: Download openslide windows build
id: download-artifact
uses: dawidd6/action-download-artifact@v2
with:
repo: openslide/openslide
run_id: 6407412709
name: openslide-windows-main-*
name_is_regexp: true
- name: Wrangle openslide windows build
shell: bash
run: |
mv openslide-windows-main-*/openslide-windows-main-*/openslide-win64-main-*.zip ./
unzip openslide-win64-main-*.zip
run: |
wget --quiet https://github.com/openslide/openslide-winbuild/releases/download/v20231011/openslide-win64-20231011.zip
unzip -p openslide-win64-20231011.zip openslide-win64-20231011/bin/libopenslide-1.dll > openslide.dll
chmod 755 openslide.dll
- uses: ruby/setup-ruby@v1
with:
ruby-version: '3.2'
Expand Down
17 changes: 9 additions & 8 deletions meson/subprojects/libdicom.wrap
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# not from wrapdb

[wrap-file]
directory = libdicom-1.0.1
source_url = https://github.com/ImagingDataCommons/libdicom/releases/download/v1.0.1/libdicom-1.0.1.tar.xz
source_filename = libdicom-1.0.1.tar.xz
source_hash = 45edf650e214fa4dc905660aa25970210fe851d51fec5145dc369d447af4f3e1
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libdicom_1.0.1-1/libdicom-1.0.1.tar.xz
wrapdb_version = 1.0.1-1
directory = libdicom-1.0.5
source_url = https://github.com/ImagingDataCommons/libdicom/releases/download/v1.0.5/libdicom-1.0.5.tar.xz
source_filename = libdicom-1.0.5.tar.xz
source_hash = 3b88f267b58009005bc1182d8bd0c4a3218013ce202da722e5e8c9867c6f94f4
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libdicom_1.0.5-1/libdicom-1.0.5.tar.xz
wrapdb_version = 1.0.5-1

[provide]
dependency_names = libdicom
3 changes: 0 additions & 3 deletions meson/subprojects/openslide.wrap
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,3 @@ directory = openslide-3.4.1
source_url = https://github.com/openslide/openslide/releases/download/v3.4.1/openslide-3.4.1.tar.xz
source_filename = openslide-3.4.1.tar.xz
source_hash = 9938034dba7f48fadc90a2cdf8cfe94c5613b04098d1348a5ff19da95b990564

# backport of Meson config from Git main
diff_files = openslide-meson.patch
309 changes: 0 additions & 309 deletions meson/subprojects/packagefiles/openslide-meson.patch

This file was deleted.

0 comments on commit cef6002

Please sign in to comment.