Skip to content

Commit

Permalink
libpng: update to 1.6.44
Browse files Browse the repository at this point in the history
Upstream has stubbed out arm/filter_neon.S in favor of the existing C
implementation of Neon optimizations.
  • Loading branch information
bgilbert authored and neheb committed Sep 15, 2024
1 parent 0603dee commit 719735d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 24 deletions.
1 change: 1 addition & 0 deletions releases.json
Original file line number Diff line number Diff line change
Expand Up @@ -1816,6 +1816,7 @@
"libpng"
],
"versions": [
"1.6.44-1",
"1.6.43-2",
"1.6.43-1",
"1.6.42-1",
Expand Down
8 changes: 4 additions & 4 deletions subprojects/libpng.wrap
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[wrap-file]
directory = libpng-1.6.43
source_url = https://github.com/glennrp/libpng/archive/v1.6.43.tar.gz
source_filename = libpng-1.6.43.tar.gz
source_hash = fecc95b46cf05e8e3fc8a414750e0ba5aad00d89e9fdf175e94ff041caf1a03a
directory = libpng-1.6.44
source_url = https://github.com/glennrp/libpng/archive/v1.6.44.tar.gz
source_filename = libpng-1.6.44.tar.gz
source_hash = 0ef5b633d0c65f780c4fced27ff832998e71478c13b45dfb6e94f23a82f64f7c
patch_directory = libpng

[provide]
Expand Down
21 changes: 1 addition & 20 deletions subprojects/packagefiles/libpng/meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project(
'libpng',
'c',
version: '1.6.43', license: 'libpng',
version: '1.6.44', license: 'libpng',
meson_version: '>=0.50.0',
)

Expand Down Expand Up @@ -58,25 +58,6 @@ if host_machine.cpu_family() == 'aarch64' or cc.get_define('__ARM_NEON').strip()
'arm/filter_neon_intrinsics.c',
'arm/palette_neon_intrinsics.c',
)
if cc.get_id() == 'msvc'
cl = find_program('cl')
msvc_preprocessed_asm_files = custom_target(
'MSVC assembly preprocessing',
output: '@[email protected]',
input: 'arm/filter_neon.S',
command: [cl, '/Fi@OUTPUT@', '/P', '@INPUT@', '-I@OUTDIR@', c_args],
)
msvc_armasm = find_program('armasm64')
png_src += custom_target(
'MSVC assembly compilation',
output: '@[email protected]',
input: msvc_preprocessed_asm_files,
command: [msvc_armasm, '@INPUT@', '/Fo@OUTPUT@', '-I@OUTDIR@'],
)
else
png_src += files('arm/filter_neon.S')
endif

c_args += '-DPNG_ARM_NEON_OPT=2'
elif host_machine.cpu_family() in ['x86', 'x86_64']
png_src += files(
Expand Down

0 comments on commit 719735d

Please sign in to comment.