Add patch to fix FTBFS
Ignore test segfault for now
This commit is contained in:
Orion Poplawski
parent
30f80455c9
commit
b70ae6db0a
3 changed files with 400 additions and 1 deletions
141
python-imagecodecs-nobcn.patch
Normal file
141
python-imagecodecs-nobcn.patch
Normal file
|
|
@ -0,0 +1,141 @@
|
|||
diff -up imagecodecs-2024.1.1/imagecodecs/imagecodecs.py.nobcn imagecodecs-2024.1.1/imagecodecs/imagecodecs.py
|
||||
--- imagecodecs-2024.1.1/imagecodecs/imagecodecs.py.nobcn 2023-12-28 21:05:16.000000000 -0700
|
||||
+++ imagecodecs-2024.1.1/imagecodecs/imagecodecs.py 2024-02-12 21:32:54.460164389 -0700
|
||||
@@ -710,20 +710,6 @@ _MODULES: dict[str, list[str]] = {
|
||||
'cms_check',
|
||||
'cms_version',
|
||||
],
|
||||
- '_bcn': [
|
||||
- 'BCN',
|
||||
- 'BcnError',
|
||||
- 'bcn_encode',
|
||||
- 'bcn_decode',
|
||||
- 'bcn_check',
|
||||
- 'bcn_version',
|
||||
- 'DDS',
|
||||
- 'DdsError',
|
||||
- 'dds_encode',
|
||||
- 'dds_decode',
|
||||
- 'dds_check',
|
||||
- 'dds_version',
|
||||
- ],
|
||||
'_deflate': [
|
||||
'DEFLATE',
|
||||
'DeflateError',
|
||||
diff -up imagecodecs-2024.1.1/setup.py.nobcn imagecodecs-2024.1.1/setup.py
|
||||
diff -up imagecodecs-2024.1.1/imagecodecs/__init__.pyi.nobcn imagecodecs-2024.1.1/imagecodecs/__init__.pyi
|
||||
--- imagecodecs-2024.1.1/imagecodecs/__init__.pyi.nobcn 2023-12-28 13:34:01.000000000 -0700
|
||||
+++ imagecodecs-2024.1.1/imagecodecs/__init__.pyi 2024-02-12 21:35:34.919824196 -0700
|
||||
@@ -378,57 +378,6 @@ def avif_decode(
|
||||
"""Return decoded AVIF image."""
|
||||
|
||||
|
||||
-class BCN:
|
||||
- """BCn codec constants."""
|
||||
-
|
||||
- available: bool
|
||||
- """BCn codec is available."""
|
||||
-
|
||||
- class FORMAT(enum.IntEnum):
|
||||
- """BCn compression format."""
|
||||
-
|
||||
- BC1 = 1 # DXT1
|
||||
- BC2 = 2 # DXT3
|
||||
- BC3 = 3 # DXT5
|
||||
- BC4 = 4 # BC4_UNORM
|
||||
- BC5 = 5 # BC5_UNORM
|
||||
- BC6HU = 6 # BC6H_UF16
|
||||
- BC6HS = -6 # BC6H_SF16
|
||||
- BC7 = 7 # BC7_UNORM
|
||||
-
|
||||
-
|
||||
-class BcnError(RuntimeError):
|
||||
- """BCn codec exceptions."""
|
||||
-
|
||||
-
|
||||
-def bcn_version() -> str:
|
||||
- """Return bcdec library version string."""
|
||||
-
|
||||
-
|
||||
-def bcn_check(data: BytesLike, /) -> None:
|
||||
- """Return whether data is BCn encoded."""
|
||||
-
|
||||
-
|
||||
-def bcn_encode(
|
||||
- data: BytesLike,
|
||||
- /,
|
||||
- *,
|
||||
- out: int | bytearray | None = None,
|
||||
-) -> bytes | bytearray:
|
||||
- """Return BCn encoded data (not implemented)."""
|
||||
-
|
||||
-
|
||||
-def bcn_decode(
|
||||
- data: BytesLike,
|
||||
- format: BCN.FORMAT | int,
|
||||
- /,
|
||||
- shape: tuple[int, ...] | None = None,
|
||||
- *,
|
||||
- out: int | bytearray | memoryview | None = None,
|
||||
-) -> bytes | bytearray:
|
||||
- """Return decoded BCn data."""
|
||||
-
|
||||
-
|
||||
class BITORDER:
|
||||
"""BITORDER codec constants."""
|
||||
|
||||
diff -up imagecodecs-2024.1.1/setup.py.nobcn imagecodecs-2024.1.1/setup.py
|
||||
--- imagecodecs-2024.1.1/setup.py.nobcn 2023-12-28 15:06:07.000000000 -0700
|
||||
+++ imagecodecs-2024.1.1/setup.py 2024-02-12 21:37:26.229282364 -0700
|
||||
@@ -122,10 +122,6 @@ EXTENSIONS = {
|
||||
'aec': ext(libraries=['aec']),
|
||||
'apng': ext(libraries=['png']),
|
||||
'avif': ext(libraries=['avif']),
|
||||
- 'bcn': ext(
|
||||
- include_dirs=['3rdparty/bcdec'],
|
||||
- define_macros=[('BCDEC_STATIC', 1), ('BCDEC_IMPLEMENTATION', 1)],
|
||||
- ),
|
||||
'bitshuffle': ext(
|
||||
sources=[
|
||||
'3rdparty/bitshuffle/bitshuffle_core.c',
|
||||
diff -up imagecodecs-2024.1.1/setup.py.nobcn imagecodecs-2024.1.1/setup.py
|
||||
--- imagecodecs-2024.1.1/setup.py.nobcn 2024-02-12 21:44:36.012054859 -0700
|
||||
+++ imagecodecs-2024.1.1/setup.py 2024-02-12 21:45:05.113176289 -0700
|
||||
@@ -586,6 +586,7 @@ if 'sdist' not in sys.argv:
|
||||
else:
|
||||
customize_build = customize_build_default
|
||||
|
||||
+ print(f'customize_build = {customize_build}')
|
||||
customize_build(EXTENSIONS, OPTIONS)
|
||||
|
||||
|
||||
diff -up imagecodecs-2024.1.1/setup.py.nobcn imagecodecs-2024.1.1/setup.py
|
||||
--- imagecodecs-2024.1.1/setup.py.nobcn 2024-02-12 21:46:16.313473389 -0700
|
||||
+++ imagecodecs-2024.1.1/setup.py 2024-02-12 21:46:30.849534044 -0700
|
||||
@@ -568,23 +568,9 @@ def customize_build_mingw(EXTENSIONS, OP
|
||||
|
||||
if 'sdist' not in sys.argv:
|
||||
# customize builds based on environment
|
||||
- try:
|
||||
- from imagecodecs_distributor_setup import ( # type: ignore
|
||||
- customize_build,
|
||||
- )
|
||||
- except ImportError:
|
||||
- if os.environ.get('COMPUTERNAME', '').startswith('CG-'):
|
||||
- customize_build = customize_build_cgohlke
|
||||
- elif os.environ.get('IMAGECODECS_CIBW', ''):
|
||||
- customize_build = customize_build_cibuildwheel
|
||||
- elif os.environ.get('CONDA_BUILD', ''):
|
||||
- customize_build = customize_build_condaforge
|
||||
- elif shutil.which('port'):
|
||||
- customize_build = customize_build_macports
|
||||
- elif os.name == 'nt' and 'GCC' in sys.version:
|
||||
- customize_build = customize_build_mingw
|
||||
- else:
|
||||
- customize_build = customize_build_default
|
||||
+ from imagecodecs_distributor_setup import ( # type: ignore
|
||||
+ customize_build,
|
||||
+ )
|
||||
|
||||
print(f'customize_build = {customize_build}')
|
||||
customize_build(EXTENSIONS, OPTIONS)
|
||||
Loading…
Add table
Add a link
Reference in a new issue