commit: 9814c939ebdcf12eeb186be0742ef18abab7f197
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 29 10:25:36 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 29 10:31:49 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9814c939
media-video/gpac: drop patch for newer zlib
See 491bf8bd3ef621da49b168736a04f23aa4c7719c. Could do ifndef in patch
but I'd like to remove all of these eventually and there's only a handful.
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/gpac/gpac-2.0.0.ebuild | 6 ++++--
media-video/gpac/gpac-2.2.0.ebuild | 8 +++++++-
media-video/gpac/gpac-2.2.1-r1.ebuild | 8 +++++++-
media-video/gpac/gpac-9999.ebuild | 8 +++++++-
4 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/media-video/gpac/gpac-2.0.0.ebuild
b/media-video/gpac/gpac-2.0.0.ebuild
index 34e01f0cc807..884c45073b43 100644
--- a/media-video/gpac/gpac-2.0.0.ebuild
+++ b/media-video/gpac/gpac-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -64,7 +64,6 @@ DEPEND="
PATCHES=(
"${FILESDIR}/${PN}-2.0.0-configure.patch"
- "${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
)
DOCS=(
@@ -91,6 +90,9 @@ my_use() {
src_prepare() {
default
sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
+
+ # TODO: remove when old zlib is no longer in tree
+ has_version "<sys-libs/zlib-1.3" && eapply
"${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
}
src_configure() {
diff --git a/media-video/gpac/gpac-2.2.0.ebuild
b/media-video/gpac/gpac-2.2.0.ebuild
index f99b1f15a15f..abd67bfaac3c 100644
--- a/media-video/gpac/gpac-2.2.0.ebuild
+++ b/media-video/gpac/gpac-2.2.0.ebuild
@@ -64,7 +64,6 @@ DEPEND="
PATCHES=(
"${FILESDIR}/${PN}-2.2.0-configure.patch"
- "${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
"${FILESDIR}/${PN}-2.2.0-ffmpeg6.patch"
"${FILESDIR}/${PN}-2.2.0-ffmpeg6-deux.patch"
)
@@ -88,6 +87,13 @@ my_use() {
fi
}
+src_prepare() {
+ default
+
+ # TODO: remove when old zlib is no longer in tree
+ has_version "<sys-libs/zlib-1.3" && eapply
"${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
+}
+
src_configure() {
tc-export CC CXX AR RANLIB
diff --git a/media-video/gpac/gpac-2.2.1-r1.ebuild
b/media-video/gpac/gpac-2.2.1-r1.ebuild
index fc002d795023..406fedb39196 100644
--- a/media-video/gpac/gpac-2.2.1-r1.ebuild
+++ b/media-video/gpac/gpac-2.2.1-r1.ebuild
@@ -64,7 +64,6 @@ DEPEND="
PATCHES=(
"${FILESDIR}/${PN}-2.2.0-configure.patch"
- "${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
"${FILESDIR}/${PN}-2.2.0-ffmpeg6.patch"
"${FILESDIR}/${PN}-2.2.0-ffmpeg6-deux.patch"
)
@@ -88,6 +87,13 @@ my_use() {
fi
}
+src_prepare() {
+ default
+
+ # TODO: remove when old zlib is no longer in tree
+ has_version "<sys-libs/zlib-1.3" && eapply
"${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
+}
+
src_configure() {
tc-export CC CXX AR RANLIB
diff --git a/media-video/gpac/gpac-9999.ebuild
b/media-video/gpac/gpac-9999.ebuild
index f21d8e2a08aa..963ca68ca30f 100644
--- a/media-video/gpac/gpac-9999.ebuild
+++ b/media-video/gpac/gpac-9999.ebuild
@@ -64,7 +64,6 @@ DEPEND="
PATCHES=(
"${FILESDIR}/${PN}-2.2.0-configure.patch"
- "${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
"${FILESDIR}/${PN}-2.2.0-ffmpeg6.patch"
)
@@ -87,6 +86,13 @@ my_use() {
fi
}
+src_prepare() {
+ default
+
+ # TODO: remove when old zlib is no longer in tree
+ has_version "<sys-libs/zlib-1.3" && eapply
"${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
+}
+
src_configure() {
tc-export CC CXX AR RANLIB
