From cbb97bb1b108bd1599aedc2a5c57bf2b2d1e1c24 Mon Sep 17 00:00:00 2001
From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
Date: Fri, 17 Dec 2021 20:22:42 -0500
Subject: media-libs/libjxl: fixes

---
 media-libs/libjxl/libjxl-9999.ebuild | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'media-libs/libjxl/libjxl-9999.ebuild')

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
-- 
cgit v1.2.3-54-g00ecf