From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 668A413933E for ; Sat, 10 Jul 2021 11:24:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ACA95E09DA; Sat, 10 Jul 2021 11:24:25 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7FEC3E09DA for ; Sat, 10 Jul 2021 11:24:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9413633BDCC for ; Sat, 10 Jul 2021 11:24:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EDDAC7A2 for ; Sat, 10 Jul 2021 11:24:21 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1625916188.23368b935cdfbc6c29a956745d5e651b6c16ff2a.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/makemkv/Manifest media-video/makemkv/makemkv-1.16.3.ebuild media-video/makemkv/makemkv-1.16.4.ebuild media-video/makemkv/metadata.xml X-VCS-Directories: media-video/makemkv/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 23368b935cdfbc6c29a956745d5e651b6c16ff2a X-VCS-Branch: master Date: Sat, 10 Jul 2021 11:24:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 72da67fb-1f93-4963-a835-a2c22e127f96 X-Archives-Hash: 3edf917239819f3ce245734d64901698 commit: 23368b935cdfbc6c29a956745d5e651b6c16ff2a Author: James Le Cuirot gentoo org> AuthorDate: Sat Jul 10 11:14:17 2021 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Sat Jul 10 11:23:08 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23368b93 media-video/makemkv: Bump to 1.16.4, drop old 1.16.3 Adds missing optional Java dependency. The package has included a precompiled jar for a while. The sources are included but only for license compliance. Actually building them is probably more hassle than it's worth. Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: James Le Cuirot gentoo.org> media-video/makemkv/Manifest | 4 ++-- .../{makemkv-1.16.3.ebuild => makemkv-1.16.4.ebuild} | 17 +++++++++++++---- media-video/makemkv/metadata.xml | 3 +++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest index 00e323e19ee..6659e450f4a 100644 --- a/media-video/makemkv/Manifest +++ b/media-video/makemkv/Manifest @@ -1,2 +1,2 @@ -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 +DIST makemkv-bin-1.16.4.tar.gz 15455839 BLAKE2B 5d29416beeb06f5fc66db39e5323de4d3491b120ec1b734183c9aaf937baf8a63a277ddb378b668d9659c34449c474e2ab9a7bb82a448f33de85abf82e5e791b SHA512 d2d12a18ef64e77d7a47e1e68ced265fbd2071fd60fb8118085c2b8c892132e9ef81f1a54c09e5f45be6f880a91cef3bb25ed5e86e3735f5b449c6b7fb88a72f +DIST makemkv-oss-1.16.4.tar.gz 6536730 BLAKE2B 8f5167c6b5056f9ea38a47b60875aac8394c130b40f08ef7a102f00937c34feb58e6436a9140509da9fc2d2b835956dede6bd8485827f3037b2026b0421a7094 SHA512 e25b41cbc348a49f13914af6b2dd040376c7517273dd4f49dc68fe9e363e28e336fb6d3d525b190c11d70e7c9b7127ffabdd89b3130cd1aab55a6a6f708d7452 diff --git a/media-video/makemkv/makemkv-1.16.3.ebuild b/media-video/makemkv/makemkv-1.16.4.ebuild similarity index 94% rename from media-video/makemkv/makemkv-1.16.3.ebuild rename to media-video/makemkv/makemkv-1.16.4.ebuild index 796c9cd0572..ea05fb9afbb 100644 --- a/media-video/makemkv/makemkv-1.16.3.ebuild +++ b/media-video/makemkv/makemkv-1.16.4.ebuild @@ -16,14 +16,16 @@ SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl" SLOT="0" KEYWORDS="-* ~amd64 ~x86" -IUSE="+gui " +IUSE="+gui +java" RESTRICT="bindist mirror" QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec" DEPEND=" - sys-libs/glibc dev-libs/expat + dev-libs/openssl:0=[-bindist(-)] + >=media-video/ffmpeg-1.0.0:0= + sys-libs/glibc sys-libs/zlib gui? ( dev-qt/qtcore:5 @@ -31,12 +33,11 @@ DEPEND=" dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) - >=media-video/ffmpeg-1.0.0:0= - dev-libs/openssl:0=[-bindist(-)] " RDEPEND=" ${DEPEND} net-misc/wget + java? ( >=virtual/jre-1.8 ) " BDEPEND=" virtual/pkgconfig @@ -51,6 +52,14 @@ PATCHES=( "${FILESDIR}"/${PN}-flags.patch ) +src_prepare() { + default + + if ! use java; then + rm -v "${WORKDIR}/${MY_PB}"/src/share/blues.* || die + fi +} + src_configure() { # See bug #439380. replace-flags -O* -Os diff --git a/media-video/makemkv/metadata.xml b/media-video/makemkv/metadata.xml index 613533077af..3f3bb44be83 100644 --- a/media-video/makemkv/metadata.xml +++ b/media-video/makemkv/metadata.xml @@ -5,6 +5,9 @@ chewi@gentoo.org James Le Cuirot + + Handle additional Blu-ray protection mechanisms involving Java + MakeMKV is your one-click solution to convert video that you own into free and patents-unencumbered format that can be played