From ab3da91fb6c91a9df52fff8f991570f456fd3c7a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 18 Dec 2020 11:06:49 +0000 Subject: gentoo resync : 18.12.2020 --- media-video/makemkv/Manifest | 7 +- .../files/1.15.3-configure-CXXFLAGS-quoting.patch | 12 --- media-video/makemkv/makemkv-1.15.3.ebuild | 115 --------------------- media-video/makemkv/makemkv-1.15.4.ebuild | 114 ++++++++++++++++++++ 4 files changed, 117 insertions(+), 131 deletions(-) delete mode 100644 media-video/makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch delete mode 100644 media-video/makemkv/makemkv-1.15.3.ebuild create mode 100644 media-video/makemkv/makemkv-1.15.4.ebuild (limited to 'media-video/makemkv') diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest index 0faa9d140be4..0fecf5cdafe5 100644 --- a/media-video/makemkv/Manifest +++ b/media-video/makemkv/Manifest @@ -1,6 +1,5 @@ -AUX 1.15.3-configure-CXXFLAGS-quoting.patch 356 BLAKE2B d342f54821634f8a36d200ae9a3f54ad8400f9c7a68ad5af3a9992fdf62e2029be0cc5bd39a8da6713dec5f08972f79ae411ddabc294e48760005ef46860fbf8 SHA512 56da4d54a44805a21c35b2fae1aff1dedafd3b08782174ab140b0ead5e551d673593d652cddfbe3b0d778660f3134755cf97abf457d648b0ba739ddefd039270 AUX makemkv-path.patch 1579 BLAKE2B 6ca7ed6c854c0357fea864bedc3f65a1051a466a52db1380bf1904c97bfa2b455beeb7ff9852fe57f6d224ed659df63d02db96a281be7a14f0587bece9aff75b SHA512 9294d3645b953fdb7ca24e83066becfbf07e03cab01d0aaf4527cf2d54fb0990649da1f766836a0f3efea9c363c8f00116b4624c49fd7bcfa197cae2ef17e6ed -DIST makemkv-bin-1.15.3.tar.gz 8664187 BLAKE2B 37f026306a0601709659cfc2478e59251dd7fc1567f8b43326ddbefa55c9bfee77dc8f0f81d3e8e111e78ad9da0f4b32613d5ffbcae542a8978c49467be80db6 SHA512 4555c1fbb609b3b6d842fced374a8a6fab0bc69952f4349a1c6636964d7384001d1e6e7a91fae3715c4cf468cbfbd713f89d17e53eef6c5d69edfa158e47d8bd -DIST makemkv-oss-1.15.3.tar.gz 6403409 BLAKE2B c02881c13236d65eba5bbc66d9191ba4b2da53e1d776c502427a02ee8b18091db90643d7e8c3f94be5b5c80c40dfc5df282daee6f69c42d32383937aba33e700 SHA512 11248f4d35a16793a13a94c92f8eef060206e95d2383da06ce7adeadcd445dc12d09bad79142169cc32e514594b2c6cacf9ab216d446eece531c849a8803f13a -EBUILD makemkv-1.15.3.ebuild 3021 BLAKE2B ef64035d9c61bfa5ecd180a496a1714aa346ad01c0e2c1154a9bf1eb5f4682ab49b847016292c5b7fa2d72f4643327395e3b51ca384b41a6a116ae33d85f1e11 SHA512 bc44e4529fe32491b32fb82774168d7fd33b769702bbdf922e69a02c8e8cc7bb15d6f6e4f9c0a4fd82827a8ef3db0a75981901ddcaf612ef7ca5168ceaa61702 +DIST makemkv-bin-1.15.4.tar.gz 8976023 BLAKE2B 945d5efc61d4302690201a63caa959580476635729d78f8b9fcb0f252af9874b10b9f6a771c724eb76ffe00fa4217773890045b1657335d9910f753c8de5a5bd SHA512 f08377a77807bffc66e34f38975018ebf14a7bba91e0bb7ffce1d8376e52660b9c8f5da154ea5bf55b3d42b57ad301ac43a8c74ec97aad7d40f926029fa09c09 +DIST makemkv-oss-1.15.4.tar.gz 6405606 BLAKE2B 84e958b6004fa66a52186118be1ca696a181e300d21a2be583917181b3f1f87ee47b760e3cbcfc26b4fcdae4711fd18962c42763ce8ec6b176aaf865ab4e45b0 SHA512 f812d63363ddac68d50a0a4b3d2c3dd46000b8775d7885d61d5bf9dde013e3e9ff9cef558bcf54b2d59f5c4725dbfc014d48be3f3996d1055df761072fa4d62f +EBUILD makemkv-1.15.4.ebuild 2967 BLAKE2B 3056d4075015a84f6878590eeedd697951e38e7bfd238296b7d8b1a07806b3e1983c08381dc4afcb24d039b9da07b0d101fa260b5f75c55d46d2ce5505965dd0 SHA512 9b8758710482309f68c1ad6e8fb862830be9c4affafc5b7dd95e37aaa4fd8b6003831c942d5886162e61bf8f300dde771af86b0d37ae94f9d8eb1b9f1011bbc4 MISC metadata.xml 1166 BLAKE2B f2e594a7e322225101561a998472a832c3d2559dbfd79817f2fd1eaf9b0e7145fb467b9b0421d13b3df90ece45ff969d97e9e44d9147d4b0a57e4d8fd9104345 SHA512 d8e8d898cf3ee9428fc1b08e292608da7a4f753ad22053a521c475e9445dafa9ac7c2c5139ed4ab9009b0d59e95737f77773d15f8590b8a4cf0f39961d714fb7 diff --git a/media-video/makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch b/media-video/makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch deleted file mode 100644 index 3dfe508a24a4..000000000000 --- a/media-video/makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur makemkv-oss-1.15.3~/configure makemkv-oss-1.15.3/configure ---- makemkv-oss-1.15.3~/configure 2020-10-01 13:59:27.000000000 +0000 -+++ makemkv-oss-1.15.3/configure 2020-10-03 20:49:45.588257151 +0000 -@@ -11726,7 +11726,7 @@ - ENABLE_DEBUG=$enable_debug - - --if test -z $CXXFLAGS; then -+if test -z "$CXXFLAGS"; then - CXXFLAGS='-std=c++11' - fi - diff --git a/media-video/makemkv/makemkv-1.15.3.ebuild b/media-video/makemkv/makemkv-1.15.3.ebuild deleted file mode 100644 index 3c81c3d3988b..000000000000 --- a/media-video/makemkv/makemkv-1.15.3.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic linux-info xdg - -MY_P=makemkv-oss-${PV} -MY_PB=makemkv-bin-${PV} - -DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs" -HOMEPAGE="http://www.makemkv.com/" -SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz - http://www.makemkv.com/download/${MY_PB}.tar.gz" - -LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="+gui libressl" -RESTRICT="bindist mirror" - -QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec" - -DEPEND=" - sys-libs/glibc - dev-libs/expat - sys-libs/zlib - gui? ( - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - >=media-video/ffmpeg-1.0.0:0= - !libressl? ( dev-libs/openssl:0=[-bindist(-)] ) - libressl? ( dev-libs/libressl:0= ) -" -RDEPEND=" - ${DEPEND} - media-video/ccextractor - net-misc/wget -" -BDEPEND=" - virtual/pkgconfig - gui? ( dev-qt/qtcore:5 ) -" - -CONFIG_CHECK="~CHR_DEV_SG" -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${PN}-path.patch - "${FILESDIR}"/${PV}-configure-CXXFLAGS-quoting.patch -) - -src_configure() { - # See bug #439380. - replace-flags -O* -Os - - econf \ - --enable-debug \ - --disable-noec \ - $(use_enable gui) \ - $(use_enable gui qt5) -} - -src_install() { - default - - # add missing symlinks for QA - dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV} - dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so - dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV} - dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so - dosym libmmbd.so.0 /usr/$(get_libdir)/libmmbd.so - dosym libmmbd.so.0 /usr/$(get_libdir)/libmmbd.so.0.${PV} - - cd "${WORKDIR}"/${MY_PB} || die - - # install prebuilt bin - dobin bin/$(usex x86 i386 ${ARCH})/makemkvcon - - # additional tool is actually part of makemkvcon - dosym makemkvcon /usr/bin/sdftool - - # install profiles and locales - insinto /usr/share/MakeMKV - doins src/share/* - - # add symlink rather than relying on MMCCEXTRACTOR env var - dosym ccextractor /usr/bin/mmccextr -} - -pkg_postinst() { - xdg_pkg_postinst - - elog "While MakeMKV is in beta mode, upstream has provided a license" - elog "to use if you do not want to purchase one." - elog "" - elog "See this forum thread for more information, including the key:" - elog "https://www.makemkv.com/forum/viewtopic.php?f=5&t=1053" - elog "" - elog "Note that beta license may have an expiration date and you will" - elog "need to check for newer licenses/releases. " - elog "" - elog "We previously said to copy default.mmcp.xml to ~/.MakeMKV/. This" - elog "is no longer necessary and you should delete it from there to" - elog "avoid warning messages." - elog "" - elog "MakeMKV can also act as a drop-in replacement for libaacs and" - elog "libbdplus, allowing transparent decryption of a wider range of" - elog "titles under players like VLC and mplayer. To enable this, set" - elog "the following variables when launching the player:" - elog "LIBAACS_PATH=libmmbd LIBBDPLUS_PATH=libmmbd" -} diff --git a/media-video/makemkv/makemkv-1.15.4.ebuild b/media-video/makemkv/makemkv-1.15.4.ebuild new file mode 100644 index 000000000000..643dfc37ef2a --- /dev/null +++ b/media-video/makemkv/makemkv-1.15.4.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic linux-info xdg + +MY_P=makemkv-oss-${PV} +MY_PB=makemkv-bin-${PV} + +DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs" +HOMEPAGE="http://www.makemkv.com/" +SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz + http://www.makemkv.com/download/${MY_PB}.tar.gz" + +LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="+gui libressl" +RESTRICT="bindist mirror" + +QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec" + +DEPEND=" + sys-libs/glibc + dev-libs/expat + sys-libs/zlib + gui? ( + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + >=media-video/ffmpeg-1.0.0:0= + !libressl? ( dev-libs/openssl:0=[-bindist(-)] ) + libressl? ( dev-libs/libressl:0= ) +" +RDEPEND=" + ${DEPEND} + media-video/ccextractor + net-misc/wget +" +BDEPEND=" + virtual/pkgconfig + gui? ( dev-qt/qtcore:5 ) +" + +CONFIG_CHECK="~CHR_DEV_SG" +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${PN}-path.patch +) + +src_configure() { + # See bug #439380. + replace-flags -O* -Os + + econf \ + --enable-debug \ + --disable-noec \ + $(use_enable gui) \ + $(use_enable gui qt5) +} + +src_install() { + default + + # add missing symlinks for QA + dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV} + dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so + dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV} + dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so + dosym libmmbd.so.0 /usr/$(get_libdir)/libmmbd.so + dosym libmmbd.so.0 /usr/$(get_libdir)/libmmbd.so.0.${PV} + + cd "${WORKDIR}"/${MY_PB} || die + + # install prebuilt bin + dobin bin/$(usex x86 i386 ${ARCH})/makemkvcon + + # additional tool is actually part of makemkvcon + dosym makemkvcon /usr/bin/sdftool + + # install profiles and locales + insinto /usr/share/MakeMKV + doins src/share/* + + # add symlink rather than relying on MMCCEXTRACTOR env var + dosym ccextractor /usr/bin/mmccextr +} + +pkg_postinst() { + xdg_pkg_postinst + + elog "While MakeMKV is in beta mode, upstream has provided a license" + elog "to use if you do not want to purchase one." + elog "" + elog "See this forum thread for more information, including the key:" + elog "https://www.makemkv.com/forum/viewtopic.php?f=5&t=1053" + elog "" + elog "Note that beta license may have an expiration date and you will" + elog "need to check for newer licenses/releases. " + elog "" + elog "We previously said to copy default.mmcp.xml to ~/.MakeMKV/. This" + elog "is no longer necessary and you should delete it from there to" + elog "avoid warning messages." + elog "" + elog "MakeMKV can also act as a drop-in replacement for libaacs and" + elog "libbdplus, allowing transparent decryption of a wider range of" + elog "titles under players like VLC and mplayer. To enable this, set" + elog "the following variables when launching the player:" + elog "LIBAACS_PATH=libmmbd LIBBDPLUS_PATH=libmmbd" +} -- cgit v1.2.3