Bug 501832 – media-video/makemkv - add USE=X

• Product: Gentoo Linux
• Status: RESOLVED FIXED

[Description nickrobbins 2014-02-19 21:53:09 UTC]

This patch adds the X useflag to makemkv to control installation of the gui component as well as (if USE="-X") remove dependency on Qt.

[Comment 1 nickrobbins 2014-02-19 21:53:28 UTC]

Created attachment 370804 [details, diff]
patch to ebuild

[Comment 2 nickrobbins 2014-02-20 15:07:09 UTC]

Comment on attachment 370804 [details, diff]
patch to ebuild

>--- makemkv-1.8.8.ebuild-old	2014-02-19 16:49:07.933745940 -0500
>+++ makemkv-1.8.8.ebuild	2014-02-19 16:46:23.197228444 -0500
>@@ -16,7 +16,7 @@
> LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
> SLOT="0"
> KEYWORDS="~amd64 ~x86"
>-IUSE="multilib"
>+IUSE="multilib X"
> 
> QA_PREBUILT="opt/bin/makemkvcon opt/bin/mmdtsdec"
> RESTRICT="mirror"
>@@ -24,10 +24,10 @@
> RDEPEND="dev-libs/expat
> 	dev-libs/openssl:0
> 	sys-libs/zlib
>-	virtual/opengl
>+	X? ( virtual/opengl
> 	dev-qt/qtcore:4
> 	dev-qt/qtdbus:4
>-	dev-qt/qtgui:4
>+	dev-qt/qtgui:4 ) 
> 	|| ( >=media-video/ffmpeg-1.0.0 >=media-video/libav-0.8.9 )
> 	amd64? ( multilib? ( app-emulation/emul-linux-x86-baselibs ) )"
> DEPEND="${RDEPEND}"
>@@ -41,7 +41,7 @@
> src_configure() {
> 	replace-flags -O* -Os
> 	if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
>-		econf
>+		econf $(use_enable X gui)
> 	fi
> }
> 
>@@ -58,14 +58,17 @@
> 	dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
> 	dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
> 	into /opt
>-	dobin out/makemkv
> 
>-	local res
>-	for res in 16 22 32 64 128; do
>-		newicon -s ${res} makemkvgui/share/icons/${res}x${res}/makemkv.png ${PN}.png
>-	done
>+	if use X ; then
>+		dobin out/makemkv
> 
>-	make_desktop_entry ${PN} MakeMKV ${PN} 'Qt;AudioVideo;Video'
>+		local res
>+		for res in 16 22 32 64 128; do
>+			newicon -s ${res} makemkvgui/share/icons/${res}x${res}/makemkv.png ${PN}.png
>+		done
>+
>+		make_desktop_entry ${PN} MakeMKV ${PN} 'Qt;AudioVideo;Video'
>+	fi
> 
> 	# install bin package
> 	pushd "${WORKDIR}"/${MY_PB}/bin >/dev/null

[Comment 3 nickrobbins 2014-02-20 15:09:09 UTC]

Created attachment 370886 [details, diff]
patch to ebuild

fixed a typo in the original patch.

[Comment 4 nickrobbins 2014-03-12 13:28:01 UTC]

Created attachment 372494 [details, diff]
patch to ebuild

patch updated for 1.8.9

[Comment 5 Steve Dibb (RETIRED) 2014-08-21 23:18:07 UTC]

Created attachment 383302 [details, diff]
add optional qt4 support

[Comment 6 Steve Dibb (RETIRED) 2014-08-21 23:18:53 UTC]

Matt, I've got a new patch for latest makemkv for optional Qt4 support.  Mind at all if I apply it?

[Comment 7 Matthew Marlowe (RETIRED) 2014-08-22 21:50:59 UTC]

Steve,
Sure - go ahead and apply revised patch to a 1.8.12-r2.
Matt

[Comment 8 Steve Dibb (RETIRED) 2014-08-22 23:06:59 UTC]

*makemkv-1.8.12-r2 (22 Aug 2014)

  22 Aug 2014; Steve Dibb <[e-mail]> -makemkv-1.8.12-r1.ebuild,
  +makemkv-1.8.12-r2.ebuild:
  Add qt4 use flag to make GUI install optional