From fed43797d8ebff697e18076093882b7c3af32f8a Mon Sep 17 00:00:00 2001
From: "B. Watson" <urchlay@slackware.uk>
Date: Sun, 17 Mar 2024 16:00:18 -0400
Subject: [PATCH] graphics/mozjpeg: Updated for version 4.1.5.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 graphics/mozjpeg/README             | 12 ++++++------
 graphics/mozjpeg/mozjpeg.SlackBuild | 16 +++++++++-------
 graphics/mozjpeg/mozjpeg.info       |  6 +++---
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/graphics/mozjpeg/README b/graphics/mozjpeg/README
index 511af1e870..3c7dac79ca 100644
--- a/graphics/mozjpeg/README
+++ b/graphics/mozjpeg/README
@@ -51,10 +51,10 @@ mozjpeg libraries automatically.
 
 Java Support
 ------------
-Optionally, mozjpeg can be built with Java wrapper support
-for turbojpeg. To do this, install one of: jdk, openjdk8,
-openjdk7, or openjdk6 (or possibly one of the zulu-openjdk*
-packages; untested). Then run this script with JAVA=yes in
-the environment. The Java library will be installed as
-/opt/mozjpeg/classes/turbojpeg.jar, and the docs will be in
+Optionally, mozjpeg can be built with Java wrapper support for
+turbojpeg. To do this, install one of: zulu-openjdk8, openjdk8,
+openjdk7, or openjdk6 (or possibly jdk, or one of the later
+zulu-openjdk* packages; untested). Then run this script with
+JAVA=yes in the environment. The Java library will be installed
+as /opt/mozjpeg/classes/turbojpeg.jar, and the docs will be in
 /usr/doc/mozjpeg-$VERSION/javadoc.
diff --git a/graphics/mozjpeg/mozjpeg.SlackBuild b/graphics/mozjpeg/mozjpeg.SlackBuild
index 28975767c7..a175e3cd8f 100644
--- a/graphics/mozjpeg/mozjpeg.SlackBuild
+++ b/graphics/mozjpeg/mozjpeg.SlackBuild
@@ -7,6 +7,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20240317 bkw: update for v4.1.5.
 # 20230912 bkw: update for v4.1.4.
 
 # 20230710 bkw:
@@ -53,7 +54,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=mozjpeg
-VERSION=${VERSION:-4.1.4}
+VERSION=${VERSION:-4.1.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -139,8 +140,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
-        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
 mkdir -p build
 cd build
@@ -170,14 +171,15 @@ fi
 rm -rf $PKG/opt/$PRGNAM/man
 
 # most of the docs are installed in /opt already, but not all.
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
 mkdir -p $PKG/usr/doc
-mv $PKG/opt/$PRGNAM/doc $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/opt/$PRGNAM/doc $PKGDOC
 rm -f CMakeLists.txt BUILDING.* jconfig.txt # do not want
-cp -a *.txt *.md tjexample.c doc/html $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.txt *.md tjexample.c doc/html $PKGDOC
 ln -s ../../usr/doc/$PRGNAM-$VERSION $PKG/opt/$PRGNAM/doc
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
-[ "$JAVA" = "yes" ] && cp -a java/doc $PKG/usr/doc/$PRGNAM-$VERSION/javadoc
+[ "$JAVA" = "yes" ] && cp -a java/doc $PKGDOC/javadoc
 
 # 20210312 bkw: profile script is new with v4.0.x. It's installed without +x
 # permission (see README).
diff --git a/graphics/mozjpeg/mozjpeg.info b/graphics/mozjpeg/mozjpeg.info
index c6eedc6934..35fdb49570 100644
--- a/graphics/mozjpeg/mozjpeg.info
+++ b/graphics/mozjpeg/mozjpeg.info
@@ -1,8 +1,8 @@
 PRGNAM="mozjpeg"
-VERSION="4.1.4"
+VERSION="4.1.5"
 HOMEPAGE="https://github.com/mozilla/mozjpeg"
-DOWNLOAD="https://github.com/mozilla/mozjpeg/archive/v4.1.4/mozjpeg-4.1.4.tar.gz"
-MD5SUM="076b452b78001f29b2e996029c23aac0"
+DOWNLOAD="https://github.com/mozilla/mozjpeg/archive/v4.1.5/mozjpeg-4.1.5.tar.gz"
+MD5SUM="d37f58b3ebc811deaf3f684c85700294"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""