Skip to content

Commit

Permalink
strawberry 5.38 comes without fribidi and webp, add our own
Browse files Browse the repository at this point in the history
  • Loading branch information
dk committed Oct 19, 2023
1 parent 63dc672 commit 9a479e4
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions Makefile.PL
Original file line number Diff line number Diff line change
Expand Up @@ -1617,6 +1617,8 @@ to handle right-to-left text, f.ex. Arabic or Hebrew.
Consider fixing your installation.
BIDI
$END .= "Get fribidi binary from http://prima.eu.org/download/libfribidi-1.0.10-win64.zip\n"
if $Win32 and not $cygwin;
}

sub setup_harfbuzz
Expand Down Expand Up @@ -1993,7 +1995,7 @@ sub setup_codecs
printlog "yes";
if ($codec eq 'webp') {
my @addlib;
for my $lib2 ('webpdemux', 'webmux') {
for my $lib2 ('webpdemux', 'webpmux') {
if ( defined find_lib($lib2,join('', @inc), '', @codec_libpath)) {
push @addlib, $lib2 unless $libs{$lib2};
} else {
Expand Down Expand Up @@ -2028,7 +2030,6 @@ sub setup_codecs
}
}


# check supported versions
if ( grep {/webp/} @ACTIVE_CODECS) {
$webp_version //= compile_and_run(<<'VER');
Expand All @@ -2042,7 +2043,7 @@ VER
if (( $webp_version // 0) < 1537 ) { # 0.6.1
printlog "** Warning: webp version ".
((defined($webp_version) ?
"is too low, 0.6.1 at least is needed" :
"is too low ($webp_version), 0.6.1 at least is needed" :
"cannot be determined")).
", skipping\n";
@ACTIVE_CODECS = grep { !/webp/ } @ACTIVE_CODECS;
Expand Down Expand Up @@ -2135,6 +2136,9 @@ NOCODECS
$END .= <<LIBHEIF if $Win32 and not $cygwin and grep {/heif/} @warn_codecs;
Get libheif binary from http://prima.eu.org/download/libheif-1.12.0-win64.zip
LIBHEIF
$END .= <<LIBWEBP if $Win32 and not $cygwin and grep {/webp/} @warn_codecs;
Get libwebp binary from http://prima.eu.org/download/libwebp-1.0.2-win64.zip
LIBWEBP
}
push @ACTIVE_CODECS, @builtin_codecs;
}
Expand Down

0 comments on commit 9a479e4

Please sign in to comment.