[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/

[Sam James]

commit:     62238af1490e6900856b6f8fdd196ab779b46e72
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  8 22:30:23 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep  8 22:42:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62238af1

media-video/gpac: fix failed install for 1.0.0

Upstream are currently rewriting huge amounts
of their codebase. 0.8.x -> 1.0.0 marks a large change.

In this process, they inadverently broke non-Debian
builds by relying on "IS_DEB_MAKE" being set to
'undefined'.

We also change the openjpeg slot to :2 as per
changing upstream requirements.

Closes: https://bugs.gentoo.org/740404
Bug: https://bugs.gentoo.org/735600
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../gpac/files/gpac-1.0.0-makefile-debian.patch    | 13 ++++++++++++
 media-video/gpac/gpac-1.0.0.ebuild                 | 24 ++++++++++++++--------
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/media-video/gpac/files/gpac-1.0.0-makefile-debian.patch b/media-video/gpac/files/gpac-1.0.0-makefile-debian.patch
new file mode 100644
index 00000000000..8bb8074b1ce
--- /dev/null
+++ b/media-video/gpac/files/gpac-1.0.0-makefile-debian.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index b147725..244b07c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -164,7 +164,7 @@ ifneq ($(CONFIG_DARWIN),yes)
+ 	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/pixmaps"
+ 	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/applications"
+ 
+-ifeq ($(IS_DEB_MAKE),undefined)
++ifeq ($(IS_DEB_MAKE),)
+ 	ln -sf $(DESTDIR)$(prefix)/share/gpac/res/gpac.png $(DESTDIR)/usr/share/pixmaps/gpac.png
+ 	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/gpac.desktop "$(DESTDIR)/usr/share/applications/"
+ else

diff --git a/media-video/gpac/gpac-1.0.0.ebuild b/media-video/gpac/gpac-1.0.0.ebuild
index 37ed1edce4a..6a8fe8c576a 100644
--- a/media-video/gpac/gpac-1.0.0.ebuild
+++ b/media-video/gpac/gpac-1.0.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} == *9999 ]] ; then
 	SCM="git-r3"
@@ -22,6 +22,7 @@ SLOT="0/10"
 IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl oss png
 	pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	media-libs/libogg
 	a52? ( media-libs/a52dec )
@@ -30,7 +31,7 @@ RDEPEND="
 	ffmpeg? ( media-video/ffmpeg:0= )
 	jack? ( virtual/jack )
 	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2 )
 	mad? ( media-libs/libmad )
 	opengl? (
 		media-libs/freeglut
@@ -53,15 +54,19 @@ RDEPEND="
 		x11-libs/libXv
 		x11-libs/libXext
 	)
-	xml? ( dev-libs/libxml2:2 )
+	xml? ( dev-libs/libxml2:2= )
 	xvid? ( media-libs/xvid )
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+DEPEND="
+	${RDEPEND}
 	dvb? ( sys-kernel/linux-headers )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-0.8.1-configure.patch" "${FILESDIR}/zlib.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8.1-configure.patch"
+	"${FILESDIR}/${PN}-1.0.0-makefile-debian.patch"
+	"${FILESDIR}/zlib.patch"
+)
 
 DOCS=(
 	share/doc/CODING_STYLE
@@ -72,6 +77,7 @@ DOCS=(
 	Changelog
 	README.md
 )
+
 HTML_DOCS="share/doc/*.html"
 
 my_use() {
@@ -94,7 +100,7 @@ src_configure() {
 	local myeconfargs=(
 		--extra-cflags="${CFLAGS}"
 		--cc="$(tc-getCC)"
-		--libdir="/$(get_libdir)"
+		--libdir="$(get_libdir)"
 		--verbose
 		--enable-pic
 		--enable-svg
@@ -133,6 +139,6 @@ src_configure() {
 
 src_install() {
 	einstalldocs
-	emake STRIP="true" DESTDIR="${D}" install
-	emake STRIP="true" DESTDIR="${D}" install-lib
+	emake STRIP="true" DESTDIR="${ED}" install
+	emake STRIP="true" DESTDIR="${ED}" install-lib
 }