[gentoo-commits] repo/gentoo:master commit in: media-gfx/jpegoptim/files/, media-gfx/jpegoptim/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/jpegoptim/files/, media-gfx/jpegoptim/

[Ionen Wolkens]

commit:     8afeab3960787bbf956f6cf092aea72cd7d32ab9
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat May  6 11:13:27 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat May  6 11:16:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8afeab39

media-gfx/jpegoptim: fix build on x86

Works by accident on amd64 and missed that.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../jpegoptim/files/jpegoptim-1.5.3-system-libjpeg-libm.patch    | 9 +++++++++
 media-gfx/jpegoptim/jpegoptim-1.5.3-r1.ebuild                    | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/media-gfx/jpegoptim/files/jpegoptim-1.5.3-system-libjpeg-libm.patch b/media-gfx/jpegoptim/files/jpegoptim-1.5.3-system-libjpeg-libm.patch
new file mode 100644
index 000000000000..47e4cc1e539b
--- /dev/null
+++ b/media-gfx/jpegoptim/files/jpegoptim-1.5.3-system-libjpeg-libm.patch
@@ -0,0 +1,9 @@
+libm is used with mozjpeg and built libjpeg, but not if using system's,
+yet jpegoptim.c uses floor() either way.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -356,3 +356,3 @@
+         target_include_directories(${PROJECT_NAME} PRIVATE ${JPEG_INCLUDE_DIRS})
+-        target_link_libraries(${PROJECT_NAME} JPEG::JPEG)
++        target_link_libraries(${PROJECT_NAME} JPEG::JPEG m)
+     endif()

diff --git a/media-gfx/jpegoptim/jpegoptim-1.5.3-r1.ebuild b/media-gfx/jpegoptim/jpegoptim-1.5.3-r1.ebuild
index 5db3691699a0..ed642e31a20b 100644
--- a/media-gfx/jpegoptim/jpegoptim-1.5.3-r1.ebuild
+++ b/media-gfx/jpegoptim/jpegoptim-1.5.3-r1.ebuild
@@ -16,6 +16,10 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 RDEPEND="media-libs/libjpeg-turbo:="
 DEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.3-system-libjpeg-libm.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DUSE_MOZJPEG=no