From 7cbd24dd2f99c160b0e4c9765783b2294caca6dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=99emysl=20Eric=20Janouch?= <p@janouch.name>
Date: Thu, 11 Aug 2022 14:49:23 +0200
Subject: Bundle a fuller installation of Perl/ExifTool

wperl is necessary to get rid of the console window,
which is merely one of several issues with the PAR Packer-based
ExifTool bundle used in the last commit.

The Perl installation could be heavily trimmed down,
but it seems to require a very manual process.
---
 msys2-cross-configure.sh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'msys2-cross-configure.sh')

diff --git a/msys2-cross-configure.sh b/msys2-cross-configure.sh
index 848749a..8887928 100755
--- a/msys2-cross-configure.sh
+++ b/msys2-cross-configure.sh
@@ -34,10 +34,11 @@ fetch() {
 		[ -f "packages/$name" ] || curl -#o "packages/$name" "$repository/$name"
 	done
 
-	name=exiftool-$(curl -# https://exiftool.org/ver.txt).zip
-	status Fetching "$name"
-	[ -f "$name" ] || curl -#o "$name" "https://exiftool.org/$name"
-	ln -sf "$name" exiftool.zip
+	version=$(curl -# https://exiftool.org/ver.txt)
+	name=exiftool-$version.tar.gz remotename=Image-ExifTool-$version.tar.gz
+	status Fetching "$remotename"
+	[ -f "$name" ] || curl -#o "$name" "https://exiftool.org/$remotename"
+	ln -sf "$name" exiftool.tar.gz
 }
 
 verify() {
@@ -54,7 +55,10 @@ extract() {
 	do bsdtar -xf "$i" --strip-components 1 mingw64
 	done
 
-	bsdtar -xOf exiftool.zip > bin/exiftool.exe
+	bsdtar -xf exiftool.tar.gz
+	mv Image-ExifTool-*/exiftool bin
+	mv Image-ExifTool-*/lib/* lib/perl5/site_perl
+	rm -rf Image-ExifTool-*
 }
 
 configure() {
@@ -111,6 +115,7 @@ cd "$msys2_root"
 dbsync
 fetch mingw-w64-x86_64-gtk3 mingw-w64-x86_64-lcms2 \
 	mingw-w64-x86_64-libraw mingw-w64-x86_64-libheif \
+	mingw-w64-x86_64-perl mingw-w64-x86_64-perl-win32-api \
 	mingw-w64-x86_64-libwinpthread-git # Because we don't do "provides"?
 verify
 extract
-- 
cgit v1.2.3