diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-05-06 17:34:33 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-05-06 17:34:33 +0100 |
| commit | fb6a7e84128cd7df87023d4e7d224de83057f748 (patch) | |
| tree | 6ace847db7319686f5aeb137202fa1d273c75491 /media-gfx/jpegoptim | |
| parent | 0e52cbae2c719c3ef794ebeb0f4374fb96efcff3 (diff) | |
gentoo auto-resync : 06:05:2023 - 17:34:33
Diffstat (limited to 'media-gfx/jpegoptim')
| -rw-r--r-- | media-gfx/jpegoptim/Manifest | 5 | ||||
| -rw-r--r-- | media-gfx/jpegoptim/files/jpegoptim-1.5.3-system-libjpeg-libm.patch | 9 | ||||
| -rw-r--r-- | media-gfx/jpegoptim/jpegoptim-1.4.6.ebuild | 15 | ||||
| -rw-r--r-- | media-gfx/jpegoptim/jpegoptim-1.5.3-r1.ebuild | 6 |
4 files changed, 16 insertions, 19 deletions
diff --git a/media-gfx/jpegoptim/Manifest b/media-gfx/jpegoptim/Manifest index 420a8b362a7a..9b8a91a7572e 100644 --- a/media-gfx/jpegoptim/Manifest +++ b/media-gfx/jpegoptim/Manifest @@ -1,5 +1,4 @@ -DIST jpegoptim-1.4.6.tar.gz 99004 BLAKE2B efe8d4155e6a111ef7f810ddfa9d2ddc2b58d2a54728b81698c47444eebde864662ecc397cd935af47070b84daf36b33815e87a2909fc8b6ba7ca2421eff9687 SHA512 1ebd4986cbfeae19c1e01521862c15de25e078ccb6483c29f0d89b9c8e308c93d8dca7a200a57dd5da793e481ca5dc9c4f0d84b252f5b9408b4e719c35d7e90f +AUX jpegoptim-1.5.3-system-libjpeg-libm.patch 390 BLAKE2B f23acc7cf017fc8dc5402b7e940b26fef5870cc4ca03ad3a1d2776820126420acd9c03d5a4eeb2c76c7979af223fa00a4ad5eba8c76347c01d2935677348a7f2 SHA512 c76e4a44455374f15f1021876860014dc1bc256e4c474abbc01a35692a569b679194d341b0ceb8751a91c62d54125f21fa7090de7ce3feb4dd1125810b60acca DIST jpegoptim-1.5.3.tar.gz 121006 BLAKE2B 8fd54eb3e08268b080efb1747f5090a5a21500cea695483f1c892f1848155d3afc7b40304390d903cd3d7433e7811a0a77caa0747108be6e2e7535e7d664d3de SHA512 2e198636a7028d1781a00efed881e77af1324cf1906838ead9ffbb027c085cd287b26c3207e8b4f53e2f53ecb4dd2c035101b345a241a472288ba175e27d9423 -EBUILD jpegoptim-1.4.6.ebuild 521 BLAKE2B c3ed9280aa0a636ea102a73e681459d9435ed5a7ee689152e1fd9b0a8fe692d16dab2f709c4e100d1006cff90e1b1a1a8497dfba251ee7b6360fcb7d649567fa SHA512 3897cbc3888b8258f547321f1f64bbb2359a4d09bf4133f303a9b25e1172b0347148290e8716f7ecef9db1dfac292aa4f2d9de2f4a1a9330e7eda9efddf834b3 -EBUILD jpegoptim-1.5.3-r1.ebuild 631 BLAKE2B faed4e136cbab580519cd4c8c1041025c73e73c4278382cae754959df1e7fadb282c86027c2fc08eb81cdfef7787f0db3f2d3aefe1fee2e10ad8e0fe519282d0 SHA512 c66d2b92a5b57e1d5b111ca79e3f69902a53ff0dfb40e1482b2f05c77e0c63220a2e1394e803e577bb869ce6864824c0d6137185e50af211349b219985e3f12d +EBUILD jpegoptim-1.5.3-r1.ebuild 695 BLAKE2B df130735db15d25abf223a06f51535c0aee69eae35186b4970ef8f9ecf8cbdf455d10a7ba1ba6a5018aca6b68f50976ea21bde22fa090dd8c23f8d4cd6164042 SHA512 4c586d24b79afd415c9607c7fe6b7ead5ac11aff7878572a3cd423be9f352913901c49efa17286b87083c74f39b799ac77e8bc8095b72bb3c605c6b9cd725180 MISC metadata.xml 325 BLAKE2B f70f1cdb1d6d60bf87058a388fec1b87e26e6277a04c0b8334f1d05d64de12706b7402260f6fa425bbb6835ab06351cc2289f7060f6fd33f637a0e26c71fea3e SHA512 e85426100408710a2441322b71113131e63127cea6f42d47d583656b93e851e3611b0305de731c3548144289eb475bce2dfc58df1fa61839e682d97498e678a3 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.4.6.ebuild b/media-gfx/jpegoptim/jpegoptim-1.4.6.ebuild deleted file mode 100644 index 905d570976eb..000000000000 --- a/media-gfx/jpegoptim/jpegoptim-1.4.6.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Utility to optimize JPEG files" -HOMEPAGE="https://www.kokkonen.net/tjko/projects.html https://github.com/tjko/jpegoptim" -SRC_URI="https://www.kokkonen.net/tjko/src/${P}.tar.gz" - -LICENSE="GPL-2+" # While COPYING is plain GPL-2, COPYRIGHT is clarifying it to be 'any later version' -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" - -DEPEND="virtual/jpeg:0" -RDEPEND="${DEPEND}" diff --git a/media-gfx/jpegoptim/jpegoptim-1.5.3-r1.ebuild b/media-gfx/jpegoptim/jpegoptim-1.5.3-r1.ebuild index 5db3691699a0..a46ab0bdf5cc 100644 --- a/media-gfx/jpegoptim/jpegoptim-1.5.3-r1.ebuild +++ b/media-gfx/jpegoptim/jpegoptim-1.5.3-r1.ebuild @@ -11,11 +11,15 @@ SRC_URI="https://www.kokkonen.net/tjko/src/${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +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 |