| 1 |
commit: 97fd48ee1056584a50eecf2cd9e495f6e3c46e8b |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 30 22:29:29 2018 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 30 22:29:29 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97fd48ee |
| 7 |
|
| 8 |
media-video/makemkv: Bump to 1.12.2, remove old 1.12.0 |
| 9 |
|
| 10 |
The wget patch was merged upstream and the mmdtsdec binary has gone. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
| 13 |
|
| 14 |
media-video/makemkv/Manifest | 4 +-- |
| 15 |
media-video/makemkv/files/makemkv-wget.patch | 29 ---------------------- |
| 16 |
...makemkv-1.12.0.ebuild => makemkv-1.12.2.ebuild} | 15 ++++------- |
| 17 |
3 files changed, 7 insertions(+), 41 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest |
| 20 |
index b6bf42aa119..234d2b5ca36 100644 |
| 21 |
--- a/media-video/makemkv/Manifest |
| 22 |
+++ b/media-video/makemkv/Manifest |
| 23 |
@@ -1,2 +1,2 @@ |
| 24 |
-DIST makemkv-bin-1.12.0.tar.gz 9157789 BLAKE2B 5534250c6d217824de4f0eac9b17f1e61e24a82e40d01b42c3df856be24b0d5f9421e52433840b50e9dc4134fab09bfb8fd2c0e3e45fac1afd2fa8026d299ce4 SHA512 039a60308b90434c9aa39a18c03078cd67c8f5594ea20578dcc2c2eb75fbf2bc1918f976cb35b97c977c3380cbef27c5cb819593276343b6357cd0b384ac6c22 |
| 25 |
-DIST makemkv-oss-1.12.0.tar.gz 4572233 BLAKE2B 1eb14296180e4c2e13dab12414c5a7087069b43d19ef93a0ece0824d5187069fd78be750712f3fd76da2393d2717ced1fe5e26abfe3879bb6465a0bfeea275be SHA512 36c6f1e447081e2bd003fb75e6b70eaac4c6ed5ea2b39615bf81599664c66631c3ae84dcb04448ac8877724fdc4112b351af8c16aa3d1463ce8a7ac871524469 |
| 26 |
+DIST makemkv-bin-1.12.2.tar.gz 9137254 BLAKE2B 9dbb6ff446f76bd119fdad65a97b983badeee17f78b59d79a4cb55f22d1bff443493ddbc1be77686906e324c6dbd3c93b851b0944238e97fc29bc4503c85ef07 SHA512 25b6be8dcea8aa521f2cf4b4ebac1a7a29ed1de603c5c14ee50f94fbf6a2968bf94116ba2dc39129334fb62497966d01032da4b276563c2e819a5f62f93d4d94 |
| 27 |
+DIST makemkv-oss-1.12.2.tar.gz 4379033 BLAKE2B 24da56b6b3c356dd41d7a6f0449258c0b45cfb8f4882f130fb934911c5c42c080294f4e6445e949f840c372079f143a9b4c920e7f79ed71e553b8486bcc778b4 SHA512 d418dbb14b55bc69937d2265220b3df9dd4baf7d083ba94ff51ed5d9eb2e65c0c4dd2527076dfdcc539ccde7da24dcba94e471bef47998921f0d154330dc2980 |
| 28 |
|
| 29 |
diff --git a/media-video/makemkv/files/makemkv-wget.patch b/media-video/makemkv/files/makemkv-wget.patch |
| 30 |
deleted file mode 100644 |
| 31 |
index 01398469ae6..00000000000 |
| 32 |
--- a/media-video/makemkv/files/makemkv-wget.patch |
| 33 |
+++ /dev/null |
| 34 |
@@ -1,29 +0,0 @@ |
| 35 |
-https://www.makemkv.com/forum2/viewtopic.php?f=3&t=15885 |
| 36 |
- |
| 37 |
-diff -Naur a/libabi/src/httplinux.cpp b/libabi/src/httplinux.cpp |
| 38 |
---- a/libabi/src/httplinux.cpp 2017-03-26 16:33:04.000000000 +0100 |
| 39 |
-+++ b/libabi/src/httplinux.cpp 2017-03-26 20:31:04.630357491 +0100 |
| 40 |
-@@ -29,8 +29,8 @@ |
| 41 |
- int HTTP_Download(const char* Url,const char* Agent,void* Buffer,uint32_t* Size) |
| 42 |
- { |
| 43 |
- int pipe_fd[2],err; |
| 44 |
-- char* argv[10]; |
| 45 |
-- char argv0[16],argv1[4],argv2[4],argv3[4],argv4[4],argv5[4],argv6[4]; |
| 46 |
-+ char* argv[12]; |
| 47 |
-+ char argv0[16],argv1[4],argv2[4],argv3[4],argv4[4],argv5[4],argv6[4],argv8[4],argv9[16]; |
| 48 |
- char *lagent,*lurl; |
| 49 |
- ssize_t rd; |
| 50 |
- |
| 51 |
-@@ -53,8 +53,10 @@ |
| 52 |
- strcpy(argv5,"20"); argv[5]=argv5; |
| 53 |
- strcpy(argv6,"-U"); argv[6]=argv6; |
| 54 |
- argv[7]=lagent; |
| 55 |
-- argv[8]=lurl; |
| 56 |
-- argv[9]=NULL; |
| 57 |
-+ strcpy(argv8,"-o"); argv[8]=argv8; |
| 58 |
-+ strcpy(argv9,"/dev/null"); argv[9]=argv9; |
| 59 |
-+ argv[10]=lurl; |
| 60 |
-+ argv[11]=NULL; |
| 61 |
- |
| 62 |
- err = SYS_posix_launch(argv,0,pipe_fd[1],0,SYS_posix_envp()); |
| 63 |
- |
| 64 |
|
| 65 |
diff --git a/media-video/makemkv/makemkv-1.12.0.ebuild b/media-video/makemkv/makemkv-1.12.2.ebuild |
| 66 |
similarity index 90% |
| 67 |
rename from media-video/makemkv/makemkv-1.12.0.ebuild |
| 68 |
rename to media-video/makemkv/makemkv-1.12.2.ebuild |
| 69 |
index 530e22a417b..bcc7cf5092e 100644 |
| 70 |
--- a/media-video/makemkv/makemkv-1.12.0.ebuild |
| 71 |
+++ b/media-video/makemkv/makemkv-1.12.2.ebuild |
| 72 |
@@ -16,12 +16,12 @@ SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz |
| 73 |
LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl" |
| 74 |
SLOT="0" |
| 75 |
KEYWORDS="-* ~amd64 ~x86" |
| 76 |
-IUSE="+gui libav multilib" |
| 77 |
+IUSE="+gui libav" |
| 78 |
|
| 79 |
QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec" |
| 80 |
|
| 81 |
DEPEND=" |
| 82 |
- sys-libs/glibc[multilib?] |
| 83 |
+ sys-libs/glibc |
| 84 |
dev-libs/expat |
| 85 |
dev-libs/openssl:0[-bindist(-)] |
| 86 |
sys-libs/zlib |
| 87 |
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND} |
| 88 |
|
| 89 |
CONFIG_CHECK="~CHR_DEV_SG" |
| 90 |
S="${WORKDIR}/${MY_P}" |
| 91 |
-PATCHES=( "${FILESDIR}"/${PN}-{wget,path}.patch ) |
| 92 |
+PATCHES=( "${FILESDIR}"/${PN}-path.patch ) |
| 93 |
|
| 94 |
src_configure() { |
| 95 |
# See bug #439380. |
| 96 |
@@ -66,13 +66,8 @@ src_install() { |
| 97 |
|
| 98 |
cd "${WORKDIR}"/${MY_PB} || die |
| 99 |
|
| 100 |
- # install prebuilt bins |
| 101 |
- if use x86; then |
| 102 |
- dobin bin/i386/{makemkvcon,mmdtsdec} |
| 103 |
- elif use amd64; then |
| 104 |
- dobin bin/amd64/makemkvcon |
| 105 |
- use multilib && dobin bin/i386/mmdtsdec |
| 106 |
- fi |
| 107 |
+ # install prebuilt bin |
| 108 |
+ dobin bin/$(usex x86 i386 ${ARCH})/makemkvcon |
| 109 |
|
| 110 |
# install profiles and locales |
| 111 |
insinto /usr/share/MakeMKV |
Archives