| 1 |
commit: 6623af432998f86c34f9ed3f7587c9d0c082651d |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 30 22:25:33 2021 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 30 22:32:33 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6623af43 |
| 7 |
|
| 8 |
media-video/makemkv: Bump to 1.16.3, drop old 1.16.1 |
| 9 |
|
| 10 |
This version bundles ccextractor as mmccextr. For now, the differences |
| 11 |
are almost entirely the disabling of unneeded functionality. This may |
| 12 |
change though and I don't want to have to keep checking so I'm keeping |
| 13 |
it bundled. |
| 14 |
|
| 15 |
Closes: https://bugs.gentoo.org/777912 |
| 16 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
| 17 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 18 |
|
| 19 |
media-video/makemkv/Manifest | 4 ++-- |
| 20 |
media-video/makemkv/files/makemkv-flags.patch | 11 +++++++++++ |
| 21 |
.../{makemkv-1.16.1.ebuild => makemkv-1.16.3.ebuild} | 16 ++++++++++------ |
| 22 |
3 files changed, 23 insertions(+), 8 deletions(-) |
| 23 |
|
| 24 |
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest |
| 25 |
index 8dfd9fb24b0..00e323e19ee 100644 |
| 26 |
--- a/media-video/makemkv/Manifest |
| 27 |
+++ b/media-video/makemkv/Manifest |
| 28 |
@@ -1,2 +1,2 @@ |
| 29 |
-DIST makemkv-bin-1.16.1.tar.gz 15306460 BLAKE2B bc2c95da1e0bb6cb1280d2dbd16cfa8eaa5f9bb3c056b43f442b6d12c41ab593758f4d9eac6c472e277696707739e71b9e5746096490a926c9e97ca9d7ff36c2 SHA512 c0597aeff56da40074570bb66e6d1c16a31ec54d283d28681f2edaf89a4597fa8bea4adb45a27dfd348e99aa3c008b5447bb9dd9d0dfb11bec36d044ff3bd404 |
| 30 |
-DIST makemkv-oss-1.16.1.tar.gz 6409619 BLAKE2B d0381fc452c57695bbac66137ef5d3df97fb9c950a52c3cb97b08422d9d02ef1671443e0584c47127654502e893f6d57c197e2fa9e769727944dc2895e2a66dd SHA512 12c83ec05e31a54d75355cf396eae977319318dbe0384a08ed5a75648ffd8e4840e3c3a0bf855c14153a77e2bb831951b96c6c01a48d1d7f5285497ad772f199 |
| 31 |
+DIST makemkv-bin-1.16.3.tar.gz 15309313 BLAKE2B 34cbf3ee5400a21a4c9f3f71e95afeb2129bda69daa4743321c3aff9ad8bf2c8f703fbf63e45720612b5305efb04484fd1a5719af74398fde2a15a3f982d65b4 SHA512 0806d8f9adde605efeff5d551ba721d9f400c8643e78ec562425aec1af33bb429e2816c5b9cf2e4a1b1efe4161f5d2623a182799d75c9833f045f5420bf13543 |
| 32 |
+DIST makemkv-oss-1.16.3.tar.gz 6536679 BLAKE2B 63d119dff4098b47cafbe63112118922f77404f1d9353f8aae944be105754a6662db576d318522436ce5d4121528e5b9cc06829e30787120928e8be881d953d6 SHA512 a620141cbaeb621feb5746a753eb448b181d9c795d0f78fad0659baeea21ebf8c6ce925b24f8b7d6844f92b0438a36a32fbac7c7260858e26116d55832a233c0 |
| 33 |
|
| 34 |
diff --git a/media-video/makemkv/files/makemkv-flags.patch b/media-video/makemkv/files/makemkv-flags.patch |
| 35 |
new file mode 100644 |
| 36 |
index 00000000000..d7a2f1be16c |
| 37 |
--- /dev/null |
| 38 |
+++ b/media-video/makemkv/files/makemkv-flags.patch |
| 39 |
@@ -0,0 +1,11 @@ |
| 40 |
+--- a/Makefile.in 2021-03-19 13:06:50.000000000 +0000 |
| 41 |
++++ b/Makefile.in 2021-03-30 23:28:42.720480399 +0100 |
| 42 |
+@@ -112,7 +112,7 @@ |
| 43 |
+ |
| 44 |
+ out/mmccextr.full: $(MMCCX_SRC) tmp/gen_buildinfo.h |
| 45 |
+ mkdir -p out |
| 46 |
+- $(GCC) $(CFLAGS) $(MMCCEXTR_DEF) -DHAVE_BUILDINFO_H -Itmp -D_GNU_SOURCE -o$@ $(MMCCX_SRC) -lc \ |
| 47 |
++ $(GCC) $(CFLAGS) $(LDFLAGS) $(MMCCEXTR_DEF) -DHAVE_BUILDINFO_H -Itmp -D_GNU_SOURCE -o$@ $(MMCCX_SRC) -lc \ |
| 48 |
+ -ffunction-sections -Wl,--gc-sections -Wl,-z,defs |
| 49 |
+ |
| 50 |
+ tmp/gen_buildinfo.h: |
| 51 |
|
| 52 |
diff --git a/media-video/makemkv/makemkv-1.16.1.ebuild b/media-video/makemkv/makemkv-1.16.3.ebuild |
| 53 |
similarity index 92% |
| 54 |
rename from media-video/makemkv/makemkv-1.16.1.ebuild |
| 55 |
rename to media-video/makemkv/makemkv-1.16.3.ebuild |
| 56 |
index f28d5a01e2d..06832f14e6a 100644 |
| 57 |
--- a/media-video/makemkv/makemkv-1.16.1.ebuild |
| 58 |
+++ b/media-video/makemkv/makemkv-1.16.3.ebuild |
| 59 |
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.makemkv.com/" |
| 60 |
SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz |
| 61 |
http://www.makemkv.com/download/${MY_PB}.tar.gz" |
| 62 |
|
| 63 |
-LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl" |
| 64 |
+LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl" |
| 65 |
SLOT="0" |
| 66 |
KEYWORDS="-* ~amd64 ~x86" |
| 67 |
IUSE="+gui libressl" |
| 68 |
@@ -37,7 +37,6 @@ DEPEND=" |
| 69 |
" |
| 70 |
RDEPEND=" |
| 71 |
${DEPEND} |
| 72 |
- media-video/ccextractor |
| 73 |
net-misc/wget |
| 74 |
" |
| 75 |
BDEPEND=" |
| 76 |
@@ -50,6 +49,7 @@ S="${WORKDIR}/${MY_P}" |
| 77 |
|
| 78 |
PATCHES=( |
| 79 |
"${FILESDIR}"/${PN}-path.patch |
| 80 |
+ "${FILESDIR}"/${PN}-flags.patch |
| 81 |
) |
| 82 |
|
| 83 |
src_configure() { |
| 84 |
@@ -64,6 +64,13 @@ src_configure() { |
| 85 |
} |
| 86 |
|
| 87 |
src_install() { |
| 88 |
+ local myarch |
| 89 |
+ case "${ARCH}" in |
| 90 |
+ arm) myarch=armel ;; |
| 91 |
+ x86) myarch=i386 ;; |
| 92 |
+ *) myarch=${ARCH} ;; |
| 93 |
+ esac |
| 94 |
+ |
| 95 |
default |
| 96 |
|
| 97 |
# add missing symlinks for QA |
| 98 |
@@ -77,7 +84,7 @@ src_install() { |
| 99 |
cd "${WORKDIR}"/${MY_PB} || die |
| 100 |
|
| 101 |
# install prebuilt bin |
| 102 |
- dobin bin/$(usex x86 i386 ${ARCH})/makemkvcon |
| 103 |
+ dobin bin/"${myarch}"/makemkvcon |
| 104 |
|
| 105 |
# additional tool is actually part of makemkvcon |
| 106 |
dosym makemkvcon /usr/bin/sdftool |
| 107 |
@@ -85,9 +92,6 @@ src_install() { |
| 108 |
# install profiles and locales |
| 109 |
insinto /usr/share/MakeMKV |
| 110 |
doins src/share/* |
| 111 |
- |
| 112 |
- # add symlink rather than relying on MMCCEXTRACTOR env var |
| 113 |
- dosym ccextractor /usr/bin/mmccextr |
| 114 |
} |
| 115 |
|
| 116 |
pkg_postinst() { |
Archives