media-libs/libjxl: fixes

3 files changed, 24 insertions, 13 deletions

diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index 5351cce..68460a8 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -1,3 +1,3 @@
 DIST libjxl-0.6.1.tar.gz 16953185 BLAKE2B d1e906480e80458635a65bd89ce79f13d463e8cf4fb0dfccf6c473e7649fdc5593669effdf85afbb176920c89e61c65c4907834225f7c9e6da4c611996b201e3 SHA512 302935d722160b0b288ac63301f9e95caf82eccf6ad76c4f4da6316a0314ee3562115932b1ceacb0d02708de0a07788992d3478cae73af0b90193f5769f9fb52
 DIST lodepng-48e5364ef48ec2408f44c727657ac1b6703185f8.tar.gz 240079 BLAKE2B 08240bd72d22f789bc0e06ed1d641fbca21ca674697880d4f004e4e76bb1b6cf595e931d2447544d896c79576e942db3cbdcca91d717f4ad8ddcfbd6c5bdc97e SHA512 50a515f1f15122fa017637be30df0db05980d07f8891f16b0b68697ef0df797176bbe005df623e9f2dbb68b750b0a87e69c3cef215c7bf15187d00491c4023c7
-DIST skcms-48e5364ef48ec2408f44c727657ac1b6703185f8.tar.gz 9181226 BLAKE2B 7e929079e3312ef7196092301eeeb24a9a4db407e3951ab6e6903fa0dfcf6e5861edd56a6ffdd3313d8d30edd9f3cedeebb36c7189bc2dc65d711ced2f8bb176 SHA512 d61670c68ec7f0fa88d10fd47f0a158364a74cedadebca227f18fc2ab652b3f3dc48e695d7be9dcc352aeab8e90054c6db19a521f653ceb66ed8038db9efc64f
+DIST skcms-64374756e03700d649f897dbd98c95e78c30c7da.tar.gz 9181180 BLAKE2B e57083e6add95f60944f098c60ea61be26a159f96dfa70256277495bfa1dfee0210d8f4aee7e7156b8808b4681f74a7a7c8dec7193b969234728d4200697e901 SHA512 524e8796400d0b230149ef93db09ef04847f45d34f67717deb0291ecfeb9ee6ad55549c3473835da87e62e1982b5e0e1071fa4792a6e121d9908216fa5b7422c
diff --git a/media-libs/libjxl/libjxl-0.6.1-r1.ebuild b/media-libs/libjxl/libjxl-0.6.1-r1.ebuild
index 1677cc8..a348b83 100644
--- a/media-libs/libjxl/libjxl-0.6.1-r1.ebuild
+++ b/media-libs/libjxl/libjxl-0.6.1-r1.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="
 		https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 		https://github.com/lvandeve/lodepng/archive/${LODEPNG_COMMIT}.tar.gz -> lodepng-${LODEPNG_COMMIT}.tar.gz
-		https://skia.googlesource.com/skcms/+archive/${SKCMS_COMMIT}.tar.gz -> skcms-${LODEPNG_COMMIT}.tar.gz
+		https://skia.googlesource.com/skcms/+archive/${SKCMS_COMMIT}.tar.gz -> skcms-${SKCMS_COMMIT}.tar.gz
 	"
 fi
 
@@ -61,11 +61,19 @@ PATCHES=(
 	"${FILESDIR}/roundtripanimationpatches-ifdef-gif.patch"
 )
 
-src_prepare() {
-	if [[ ${PV} != 9999 ]]; then
-		rmdir third_party/lodepng
-		ln -sv ../../lodepng-${LODEPNG_COMMIT} third_party/lodepng || die
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		tar -xf ${DISTDIR}/${P}.tar.gz || die
+		tar -xf ${DISTDIR}/lodepng-${LODEPNG_COMMIT}.tar.gz || die
+		rmdir ${P}/third_party/lodepng || die
+		mv lodepng-${LODEPNG_COMMIT} ${P}/third_party/lodepng || die
+		tar -C ${P}/third_party/skcms -xf ${DISTDIR}/skcms-${SKCMS_COMMIT}.tar.gz || die
 	fi
+}
+
+src_prepare() {
 	use gdk-pixbuf || sed -i -e '/(gdk-pixbuf)/s/^/#/' plugins/CMakeLists.txt || die
 	use gimp || sed -i -e '/(gimp)/s/^/#/' plugins/CMakeLists.txt || die
 	cmake_src_prepare
diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild
index 5020be6..9e21452 100644
--- a/media-libs/libjxl/libjxl-9999.ebuild
+++ b/media-libs/libjxl/libjxl-9999.ebuild
@@ -12,13 +12,11 @@ HOMEPAGE="https://github.com/libjxl/libjxl"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/libjxl/libjxl.git"
-	EGIT_SUBMODULES=(third_party/lodepng third_party/skcms)
+	EGIT_SUBMODULES=(third_party/skcms)
 else
-	LODEPNG_COMMIT="8c6a9e30576f07bf470ad6f09458a2dcd7a6a84a"
 	SKCMS_COMMIT="64374756e03700d649f897dbd98c95e78c30c7da"
 	SRC_URI="
 		https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/lvandeve/lodepng/archive/${LODEPNG_COMMIT}.tar.gz -> lodepng-${LODEPNG_COMMIT}.tar.gz
 		https://skia.googlesource.com/skcms/+archive/${SKCMS_COMMIT}.tar.gz -> skcms-${SKCMS_COMMIT}.tar.gz
 	"
 fi
@@ -57,11 +55,16 @@ DEPEND="${RDEPEND}
 	java? ( >=virtual/jdk-1.8:* )
 "
 
-src_prepare() {
-	if [[ ${PV} != 9999 ]]; then
-		rmdir third_party/lodepng
-		ln -sv ../../lodepng-${LODEPNG_COMMIT} third_party/lodepng || die
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		tar -xf ${DISTDIR}/${P}.tar.gz || die
+		tar -C ${P}/third_party/skcms -xf ${DISTDIR}/skcms-${SKCMS_COMMIT}.tar.gz || die
 	fi
+}
+
+src_prepare() {
 	use gdk-pixbuf || sed -i -e '/(gdk-pixbuf)/s/^/#/' plugins/CMakeLists.txt || die
 	use gimp || sed -i -e '/(gimp)/s/^/#/' plugins/CMakeLists.txt || die
 	cmake_src_prepare