2.29: use gswin64c on 64-bit Windows

git-svn-id: svn://tug.org/texlive/trunk@64235 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 23 insertions, 10 deletions

diff --git a/Build/extra/epstopdf/epstopdf.1 b/Build/extra/epstopdf/epstopdf.1
index c16262939e0..6022b99923d 100644
--- a/Build/extra/epstopdf/epstopdf.1
+++ b/Build/extra/epstopdf/epstopdf.1
@@ -1,4 +1,4 @@
-.TH EPSTOPDF 1 "17 September 2018"
+.TH EPSTOPDF 1 "29 August 2022"
 .\" $Id$
 .SH NAME
 epstopdf, repstopdf \- convert an EPS file to PDF
@@ -64,11 +64,14 @@ scan HiresBoundingBox (default: false).
 turn on restricted mode (default: [true for repstopdf, else false]);
 this forbids the use of \fB--gscmd\fP and other options and imposes
 restrictions on the input and output file names according to the values
-of openin_any and openout_any (see the Web2c manual, http://tug.org/web2c).
+of openin_any and openout_any (see the Web2c manual, https://tug.org/web2c).
+On Windows, the Ghostscript command is forced to be the TeX Live builtin
+gs, installed under \fB.../tlpkg/tlgs/bin/\fP.
 .PP
 Options for Ghostscript (more info below):
 .IP "\fB--gscmd\fP=\fIval\fP"
-pipe output to \fIval\fP (default: [\fBgswin32c\fP on Windows, else \fBgs\fP])
+pipe output to \fIval\fP (default: [\fBgswin64c\fP on 64-bit Windows,
+\fBgswin32c\fP on 32-bit Windows, else \fBgs\fP])
 .IP "\fB--gsopt\fP=\fIval\fP"
 include \fIval\fP as one argument in the gs command (can be repeated).
 .IP "\fB--gsopts\fP=\fIval\fP"
@@ -148,8 +151,8 @@ options specified, so the problem can be reproduced.
 \fBgs\fP(1),
 \fBpdfcrop\fP(1).
 .PP
-The epstopdf LaTeX package, part of the oberdiek bundle, which automates
-running this script on the fly under TeX: http://ctan.org/pkg/epstopdf-pkg.
+The epstopdf LaTeX package, which automates running this script on the
+fly under TeX: https://ctan.org/pkg/epstopdf-pkg.
 .SH AUTHOR
 Originally written by Sebastian Rahtz, for Elsevier Science, with
 subsequent contributions from Thomas Esser, Gerben Wierda, Heiko
@@ -157,6 +160,6 @@ Oberdiek, and many others.  Currently maintained by Karl Berry.
 .PP
 Man page originally written by Jim Van Zandt.
 .PP
-epstopdf home page: http://tug.org/epstopdf.
+epstopdf home page: https://tug.org/epstopdf.
 .PP
 You may freely use, modify and/or distribute this man page.
diff --git a/Build/extra/epstopdf/epstopdf.pl b/Build/extra/epstopdf/epstopdf.pl
index 353ad6d0265..0bf495e9fb9 100755
--- a/Build/extra/epstopdf/epstopdf.pl
+++ b/Build/extra/epstopdf/epstopdf.pl
@@ -35,9 +35,10 @@
 #
 # emacs-page
 #
-my $ver = "2.28";
+my $ver = "2.29";
+#  2022/08/29 v2.29 (Karl Berry)
 #  2018/09/17 v2.28 (Karl Berry)
-#    * -dCompatibilityLevel=1.5 by default, since gs9.25 switched to 1.7.
+#    * use gswin64c on 64-bit Windows.
 #  2017/09/14 v2.27 (Karl Berry)
 #    * extract value from --gsopt with $3 not $2 (extra regexp group
 #      added previously), and check it with ^(...)$ so anchors apply to all.
@@ -191,7 +192,7 @@ my $ver = "2.28";
 my $program = "epstopdf";
 my $ident = '($Id$)' . " $ver";
 my $copyright = <<END_COPYRIGHT ;
-Copyright 2009-2018 Karl Berry et al.
+Copyright 2009-2022 Karl Berry et al.
 Copyright 2002-2009 Gerben Wierda et al.
 Copyright 1998-2001 Sebastian Rahtz et al.
 License RBSD: Revised BSD <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>
@@ -204,7 +205,15 @@ my $on_windows = $^O =~ /^(MSWin|msys$)/;
 my $on_windows_or_cygwin = $on_windows || $^O eq "cygwin";
 
 ### ghostscript command name
-my $GS = $on_windows ? "gswin32c" : "gs";
+my $GS = "gs";
+if ($on_windows) {
+  if ($ENV{"PROCESSOR_ARCHITECTURE"} eq "AMD64"
+      || $ENV{"PROCESSOR_ARCHITEW6432"} eq "AMD64") {
+    $GS = "gswin64c";
+  } else {
+    $GS = "gswin32c";  
+  }
+}
 
 ### restricted mode
 my $restricted = 0;
@@ -480,6 +489,7 @@ if ($restricted && $on_windows) {
   # $mydirname is the location of the Perl script
   $kpsewhich = "$mydirname/../../../bin/win32/$kpsewhich";
   $GS = "$mydirname/../../../tlpkg/tlgs/bin/$GS";
+  debug "restricted Windows gs: $GS";
 }
 debug "kpsewhich command: $kpsewhich";