commit: 6623af432998f86c34f9ed3f7587c9d0c082651d Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Tue Mar 30 22:25:33 2021 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Tue Mar 30 22:32:33 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6623af43
media-video/makemkv: Bump to 1.16.3, drop old 1.16.1 This version bundles ccextractor as mmccextr. For now, the differences are almost entirely the disabling of unneeded functionality. This may change though and I don't want to have to keep checking so I'm keeping it bundled. Closes: https://bugs.gentoo.org/777912 Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> media-video/makemkv/Manifest | 4 ++-- media-video/makemkv/files/makemkv-flags.patch | 11 +++++++++++ .../{makemkv-1.16.1.ebuild => makemkv-1.16.3.ebuild} | 16 ++++++++++------ 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest index 8dfd9fb24b0..00e323e19ee 100644 --- a/media-video/makemkv/Manifest +++ b/media-video/makemkv/Manifest @@ -1,2 +1,2 @@ -DIST makemkv-bin-1.16.1.tar.gz 15306460 BLAKE2B bc2c95da1e0bb6cb1280d2dbd16cfa8eaa5f9bb3c056b43f442b6d12c41ab593758f4d9eac6c472e277696707739e71b9e5746096490a926c9e97ca9d7ff36c2 SHA512 c0597aeff56da40074570bb66e6d1c16a31ec54d283d28681f2edaf89a4597fa8bea4adb45a27dfd348e99aa3c008b5447bb9dd9d0dfb11bec36d044ff3bd404 -DIST makemkv-oss-1.16.1.tar.gz 6409619 BLAKE2B d0381fc452c57695bbac66137ef5d3df97fb9c950a52c3cb97b08422d9d02ef1671443e0584c47127654502e893f6d57c197e2fa9e769727944dc2895e2a66dd SHA512 12c83ec05e31a54d75355cf396eae977319318dbe0384a08ed5a75648ffd8e4840e3c3a0bf855c14153a77e2bb831951b96c6c01a48d1d7f5285497ad772f199 +DIST makemkv-bin-1.16.3.tar.gz 15309313 BLAKE2B 34cbf3ee5400a21a4c9f3f71e95afeb2129bda69daa4743321c3aff9ad8bf2c8f703fbf63e45720612b5305efb04484fd1a5719af74398fde2a15a3f982d65b4 SHA512 0806d8f9adde605efeff5d551ba721d9f400c8643e78ec562425aec1af33bb429e2816c5b9cf2e4a1b1efe4161f5d2623a182799d75c9833f045f5420bf13543 +DIST makemkv-oss-1.16.3.tar.gz 6536679 BLAKE2B 63d119dff4098b47cafbe63112118922f77404f1d9353f8aae944be105754a6662db576d318522436ce5d4121528e5b9cc06829e30787120928e8be881d953d6 SHA512 a620141cbaeb621feb5746a753eb448b181d9c795d0f78fad0659baeea21ebf8c6ce925b24f8b7d6844f92b0438a36a32fbac7c7260858e26116d55832a233c0 diff --git a/media-video/makemkv/files/makemkv-flags.patch b/media-video/makemkv/files/makemkv-flags.patch new file mode 100644 index 00000000000..d7a2f1be16c --- /dev/null +++ b/media-video/makemkv/files/makemkv-flags.patch @@ -0,0 +1,11 @@ +--- a/Makefile.in 2021-03-19 13:06:50.000000000 +0000 ++++ b/Makefile.in 2021-03-30 23:28:42.720480399 +0100 +@@ -112,7 +112,7 @@ + + out/mmccextr.full: $(MMCCX_SRC) tmp/gen_buildinfo.h + mkdir -p out +- $(GCC) $(CFLAGS) $(MMCCEXTR_DEF) -DHAVE_BUILDINFO_H -Itmp -D_GNU_SOURCE -o$@ $(MMCCX_SRC) -lc \ ++ $(GCC) $(CFLAGS) $(LDFLAGS) $(MMCCEXTR_DEF) -DHAVE_BUILDINFO_H -Itmp -D_GNU_SOURCE -o$@ $(MMCCX_SRC) -lc \ + -ffunction-sections -Wl,--gc-sections -Wl,-z,defs + + tmp/gen_buildinfo.h: diff --git a/media-video/makemkv/makemkv-1.16.1.ebuild b/media-video/makemkv/makemkv-1.16.3.ebuild similarity index 92% rename from media-video/makemkv/makemkv-1.16.1.ebuild rename to media-video/makemkv/makemkv-1.16.3.ebuild index f28d5a01e2d..06832f14e6a 100644 --- a/media-video/makemkv/makemkv-1.16.1.ebuild +++ b/media-video/makemkv/makemkv-1.16.3.ebuild @@ -13,7 +13,7 @@ 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" +LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl" SLOT="0" KEYWORDS="-* ~amd64 ~x86" IUSE="+gui libressl" @@ -37,7 +37,6 @@ DEPEND=" " RDEPEND=" ${DEPEND} - media-video/ccextractor net-misc/wget " BDEPEND=" @@ -50,6 +49,7 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}"/${PN}-path.patch + "${FILESDIR}"/${PN}-flags.patch ) src_configure() { @@ -64,6 +64,13 @@ src_configure() { } src_install() { + local myarch + case "${ARCH}" in + arm) myarch=armel ;; + x86) myarch=i386 ;; + *) myarch=${ARCH} ;; + esac + default # add missing symlinks for QA @@ -77,7 +84,7 @@ src_install() { cd "${WORKDIR}"/${MY_PB} || die # install prebuilt bin - dobin bin/$(usex x86 i386 ${ARCH})/makemkvcon + dobin bin/"${myarch}"/makemkvcon # additional tool is actually part of makemkvcon dosym makemkvcon /usr/bin/sdftool @@ -85,9 +92,6 @@ src_install() { # 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() {
