From bdb5fdf4cb2f9c03420f9363fe1b3cfea60d3999 Mon Sep 17 00:00:00 2001
From: Antoine Martin <totaam@xpra.org>
Date: Fri, 24 May 2024 23:43:38 +0700
Subject: [PATCH] switch from old libjpeg to libjpeg-turbo 3.0.3

---
 modulesets-stable/gtk-osx-bootstrap.modules   | 18 +++++++--------
 modulesets-unstable/gtk-osx-bootstrap.modules | 17 +++++++-------
 modulesets/gtk-osx-bootstrap.modules          | 22 +++++++++----------
 3 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index 4c5fa4a0..2b425d6e 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -17,9 +17,6 @@
   <repository name="sourceforge"
               href="http://downloads.sourceforge.net/sourceforge/"
               type="tarball" />
-  <repository name="jpeg"
-              href="http://www.ijg.org/files/"
-              type="tarball" />
   <repository name="libtiff"
               href="http://download.osgeo.org/"
               type="tarball" />
@@ -45,13 +42,14 @@
     </dependencies>
   </autotools>
   <!---->
-  <autotools id="libjpeg"
-             autogen-sh="configure">
-    <branch module="jpegsrc.v9e.tar.gz"
-            version="9e"
-            checkoutdir="jpeg-9e"
-            repo="jpeg" />
-  </autotools>
+  <cmake id="libjpeg" cmakeargs="-DCMAKE_MACOSX_RPATH=true -DCMAKE_INSTALL_PREFIX:PATH=${JHBUILD_PREFIX} -DCMAKE_INSTALL_NAME_DIR=${JHBUILD_PREFIX}/lib -DCMAKE_INSTALL_LIBDIR:PATH=lib">
+    <branch module="libjpeg-turbo/libjpeg-turbo/releases/download/3.0.3/libjpeg-turbo-3.0.3.tar.gz" version="3.0.3"
+            hash="sha256:343e789069fc7afbcdfe44dbba7dbbf45afa98a15150e079a38e60e44578865d"
+            repo="github-tarball" checkoutdir="libjpeg-turbo-3.0.3" />
+    <dependencies>
+      <dep package="nasm" />
+    </dependencies>
+  </cmake>
   <!---->
   <autotools id="libtiff"
              autogen-sh="configure"
diff --git a/modulesets-unstable/gtk-osx-bootstrap.modules b/modulesets-unstable/gtk-osx-bootstrap.modules
index 21511267..02daa562 100644
--- a/modulesets-unstable/gtk-osx-bootstrap.modules
+++ b/modulesets-unstable/gtk-osx-bootstrap.modules
@@ -8,8 +8,6 @@
   <repository type="tarball" name="ftp.gnu.org" href="https://ftp.gnu.org/gnu/"/>
   <repository type="tarball" name="sourceforge"
               href="http://downloads.sourceforge.net/sourceforge/"/>
-  <repository type="tarball" name="jpeg"
-              href="http://www.ijg.org/files/"/>
   <repository type="tarball" name="libtiff"
 	      href="http://download.osgeo.org/"/>
   <repository type="tarball" name="icon-theme"
@@ -28,13 +26,14 @@
     </dependencies>
   </autotools>
   <!---->
-  <autotools id="libjpeg"
-             autogen-sh="configure">
-    <branch module="jpegsrc.v9e.tar.gz"
-            version="9e"
-            checkoutdir="jpeg-9e"
-            repo="jpeg" />
-  </autotools>
+  <cmake id="libjpeg" cmakeargs="-DCMAKE_MACOSX_RPATH=true -DCMAKE_INSTALL_PREFIX:PATH=${JHBUILD_PREFIX} -DCMAKE_INSTALL_NAME_DIR=${JHBUILD_PREFIX}/lib -DCMAKE_INSTALL_LIBDIR:PATH=lib">
+    <branch module="libjpeg-turbo/libjpeg-turbo/releases/download/3.0.3/libjpeg-turbo-3.0.3.tar.gz" version="3.0.3"
+            hash="sha256:343e789069fc7afbcdfe44dbba7dbbf45afa98a15150e079a38e60e44578865d"
+            repo="github-tarball" checkoutdir="libjpeg-turbo-3.0.3" />
+    <dependencies>
+      <dep package="nasm" />
+    </dependencies>
+  </cmake>
   <!---->
   <autotools id="libtiff"
              autogen-sh="configure"
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index 90c698fb..365653f6 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -17,9 +17,6 @@
   <repository name="sourceforge"
               href="http://downloads.sourceforge.net/sourceforge/"
               type="tarball" />
-  <repository name="jpeg"
-              href="http://www.ijg.org/files/"
-              type="tarball" />
   <repository name="libtiff"
               href="http://download.osgeo.org/"
               type="tarball" />
@@ -41,15 +38,16 @@
       <dep package="zlib" />
     </dependencies>
   </autotools>
-  <!---->
-  <autotools id="libjpeg"
-             autogen-sh="configure">
-    <branch module="jpegsrc.v9e.tar.gz"
-            version="9e"
-            checkoutdir="jpeg-9e"
-            repo="jpeg" />
-  </autotools>
-  <!---->
+
+  <cmake id="libjpeg" cmakeargs="-DCMAKE_MACOSX_RPATH=true -DCMAKE_INSTALL_PREFIX:PATH=${JHBUILD_PREFIX} -DCMAKE_INSTALL_NAME_DIR=${JHBUILD_PREFIX}/lib -DCMAKE_INSTALL_LIBDIR:PATH=lib">
+    <branch module="libjpeg-turbo/libjpeg-turbo/releases/download/3.0.3/libjpeg-turbo-3.0.3.tar.gz" version="3.0.3"
+            hash="sha256:343e789069fc7afbcdfe44dbba7dbbf45afa98a15150e079a38e60e44578865d"
+            repo="github-tarball" checkoutdir="libjpeg-turbo-3.0.3" />
+    <dependencies>
+      <dep package="nasm" />
+    </dependencies>
+  </cmake>
+
   <autotools id="libtiff"
              autogen-sh="configure"
              autogenargs="--without-x">