| 1 |
commit: 6848ba2fb2727dd91e9ff0003e052068afc110de |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 8 13:15:29 2016 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 8 16:26:49 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6848ba2f |
| 7 |
|
| 8 |
media-video/makemkv: Launch executables from the PATH |
| 9 |
|
| 10 |
Upstream launches wget as /usr/bin/wget and uses a hardcoded set of |
| 11 |
paths to search for other executables. All the required executables |
| 12 |
should be in the PATH anyway and this will fix prefixed systems. |
| 13 |
|
| 14 |
Also add missing dependency on wget. It's in @system but it's one of |
| 15 |
the less obvious entries. |
| 16 |
|
| 17 |
Package-Manager: portage-2.2.28 |
| 18 |
|
| 19 |
media-video/makemkv/files/makemkv-path.patch | 72 +++++++++++++++++++++++----- |
| 20 |
media-video/makemkv/makemkv-1.9.10.ebuild | 5 +- |
| 21 |
2 files changed, 62 insertions(+), 15 deletions(-) |
| 22 |
|
| 23 |
diff --git a/media-video/makemkv/files/makemkv-path.patch b/media-video/makemkv/files/makemkv-path.patch |
| 24 |
index 88f44a9..7c66849 100644 |
| 25 |
--- a/media-video/makemkv/files/makemkv-path.patch |
| 26 |
+++ b/media-video/makemkv/files/makemkv-path.patch |
| 27 |
@@ -1,13 +1,59 @@ |
| 28 |
---- makemkv-oss-1.8.10/makemkvgui/src/api_linux.cpp.orig 2014-04-13 14:01:36.000000000 +0100 |
| 29 |
-+++ makemkv-oss-1.8.10/makemkvgui/src/api_linux.cpp 2014-05-08 00:09:52.863784998 +0100 |
| 30 |
-@@ -36,9 +36,7 @@ |
| 31 |
- } |
| 32 |
- |
| 33 |
- static const char* const app_locations[]={ |
| 34 |
-- "/bin", |
| 35 |
-- "/usr/bin", |
| 36 |
-- "/usr/local/bin", |
| 37 |
-+ "/opt/bin", |
| 38 |
- NULL }; |
| 39 |
- |
| 40 |
- const char* const* ApGetAppLocations() |
| 41 |
+diff -Naur makemkv-oss-1.9.10.orig/libabi/src/httplinux.cpp makemkv-oss-1.9.10/libabi/src/httplinux.cpp |
| 42 |
+--- makemkv-oss-1.9.10.orig/libabi/src/httplinux.cpp 2016-04-15 21:35:36.000000000 +0100 |
| 43 |
++++ makemkv-oss-1.9.10/libabi/src/httplinux.cpp 2016-05-08 10:52:42.481501963 +0100 |
| 44 |
+@@ -45,7 +45,7 @@ |
| 45 |
+ lurl = (char*)alloca(strlen(Url)+1); |
| 46 |
+ strcpy(lurl,Url); |
| 47 |
+ |
| 48 |
+- strcpy(argv0,"/usr/bin/wget"); argv[0]=argv0; |
| 49 |
++ strcpy(argv0,"wget"); argv[0]=argv0; |
| 50 |
+ strcpy(argv1,"-q"); argv[1]=argv1; |
| 51 |
+ strcpy(argv2,"-O"); argv[2]=argv2; |
| 52 |
+ strcpy(argv3,"-"); argv[3]=argv3; |
| 53 |
+diff -Naur makemkv-oss-1.9.10.orig/makemkvgui/src/api_posix.cpp makemkv-oss-1.9.10/makemkvgui/src/api_posix.cpp |
| 54 |
+--- makemkv-oss-1.9.10.orig/makemkvgui/src/api_posix.cpp 2016-04-15 21:35:36.000000000 +0100 |
| 55 |
++++ makemkv-oss-1.9.10/makemkvgui/src/api_posix.cpp 2016-05-08 13:51:48.761885862 +0100 |
| 56 |
+@@ -54,8 +54,6 @@ |
| 57 |
+ |
| 58 |
+ if (AppName[0]==':') |
| 59 |
+ { |
| 60 |
+- bool app_found = false; |
| 61 |
+- const char* const* app_locations = ApGetAppLocations(); |
| 62 |
+ const char* p_env = getenv("MAKEMKVCON"); |
| 63 |
+ |
| 64 |
+ AppName++; |
| 65 |
+@@ -63,6 +61,13 @@ |
| 66 |
+ if (p_env!=NULL) |
| 67 |
+ { |
| 68 |
+ strcpy(app_path,p_env); |
| 69 |
++ } else { |
| 70 |
++ strcpy(app_path,AppName); |
| 71 |
++ } |
| 72 |
++ } else { |
| 73 |
++ strcpy(app_path,AppName); |
| 74 |
++ } |
| 75 |
++/* |
| 76 |
+ app_found = true; |
| 77 |
+ } else { |
| 78 |
+ for (size_t i=0;app_locations[i]!=NULL;i++) |
| 79 |
+@@ -105,7 +110,7 @@ |
| 80 |
+ } |
| 81 |
+ strcpy(p,AppName); |
| 82 |
+ } |
| 83 |
+- |
| 84 |
++*/ |
| 85 |
+ strcpy(str_guiserver,"guiserver"); |
| 86 |
+ strcpy(str_apver,verstr); |
| 87 |
+ |
| 88 |
+diff -Naur makemkv-oss-1.9.10.orig/makemkvgui/src/spawn_posix.cpp makemkv-oss-1.9.10/makemkvgui/src/spawn_posix.cpp |
| 89 |
+--- makemkv-oss-1.9.10.orig/makemkvgui/src/spawn_posix.cpp 2016-04-15 21:35:36.000000000 +0100 |
| 90 |
++++ makemkv-oss-1.9.10/makemkvgui/src/spawn_posix.cpp 2016-05-08 10:52:37.137598384 +0100 |
| 91 |
+@@ -70,7 +70,7 @@ |
| 92 |
+ } |
| 93 |
+ } |
| 94 |
+ |
| 95 |
+- err = posix_spawn(&pid,argv[0],&spawn_actions,&spawn_attr,argv,envp); |
| 96 |
++ err = posix_spawnp(&pid,argv[0],&spawn_actions,&spawn_attr,argv,envp); |
| 97 |
+ |
| 98 |
+ posix_spawn_file_actions_destroy(&spawn_actions); |
| 99 |
+ posix_spawnattr_destroy(&spawn_attr); |
| 100 |
|
| 101 |
diff --git a/media-video/makemkv/makemkv-1.9.10.ebuild b/media-video/makemkv/makemkv-1.9.10.ebuild |
| 102 |
index bafbae6..57fd31d 100644 |
| 103 |
--- a/media-video/makemkv/makemkv-1.9.10.ebuild |
| 104 |
+++ b/media-video/makemkv/makemkv-1.9.10.ebuild |
| 105 |
@@ -22,7 +22,7 @@ REQUIRED_USE="?? ( qt4 qt5 )" |
| 106 |
|
| 107 |
QA_PREBUILT="opt/bin/makemkvcon opt/bin/mmdtsdec" |
| 108 |
|
| 109 |
-RDEPEND=" |
| 110 |
+DEPEND=" |
| 111 |
sys-libs/glibc[multilib?] |
| 112 |
dev-libs/expat |
| 113 |
dev-libs/openssl:0 |
| 114 |
@@ -41,7 +41,8 @@ RDEPEND=" |
| 115 |
!libav? ( >=media-video/ffmpeg-1.0.0:0= ) |
| 116 |
libav? ( >=media-video/libav-0.8.9:0= ) |
| 117 |
" |
| 118 |
-DEPEND="${RDEPEND}" |
| 119 |
+RDEPEND="${DEPEND} |
| 120 |
+ net-misc/wget" |
| 121 |
|
| 122 |
# Upstream uses non-standard locale names so map them with this |
| 123 |
# associative array and perform some tricks below. |
Archives