diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-11-23 17:55:57 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-11-24 01:17:54 +0300 |
| commit | 79b0a9bf39846d551554960c8d3415543730a947 (patch) | |
| tree | a883fafbd61e1b048a4f8fee1dc513d8e79a3252 /pkgs/applications/video/avidemux | |
| parent | 1a9ce1d9d0f30cb07ba1d762af99ea76958d91cf (diff) | |
avidemux: 2.6.12 -> 2.6.15
Diffstat (limited to 'pkgs/applications/video/avidemux')
| -rw-r--r-- | pkgs/applications/video/avidemux/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/video/avidemux/dynamic_install_dir.patch | 24 |
2 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 6b20ce8870d7..01687b588677 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -14,11 +14,11 @@ }: let - version = "2.6.12"; + version = "2.6.15"; src = fetchurl { url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz"; - sha256 = "0nz52yih8sff53inndkh2dba759xjzsh4b8xjww419lcpk0qp6kn"; + sha256 = "0mr2nll81ki9d1s68klhm19jmr15450wjaws1p0b0y2qqwyrprdh"; }; common = { diff --git a/pkgs/applications/video/avidemux/dynamic_install_dir.patch b/pkgs/applications/video/avidemux/dynamic_install_dir.patch index f2f963e51694..803cde02ec2e 100644 --- a/pkgs/applications/video/avidemux/dynamic_install_dir.patch +++ b/pkgs/applications/video/avidemux/dynamic_install_dir.patch @@ -1,12 +1,12 @@ -diff -ru3 avidemux_2.6.12.old/avidemux_core/ADM_core/src/ADM_fileio.cpp avidemux_2.6.12/avidemux_core/ADM_core/src/ADM_fileio.cpp ---- avidemux_2.6.12.old/avidemux_core/ADM_core/src/ADM_fileio.cpp 2016-03-25 15:26:00.368213627 +0300 -+++ avidemux_2.6.12/avidemux_core/ADM_core/src/ADM_fileio.cpp 2016-03-26 02:32:56.163550537 +0300 -@@ -393,7 +393,7 @@ -
- return ADM_getRelativePath(buffer, base1, base2, base3);
- #else
-- return ADM_getRelativePath(ADM_INSTALL_DIR, base1, base2, base3);
-+ return ADM_getRelativePath(getenv("ADM_ROOT_DIR"), base1, base2, base3);
- #endif
- }
-
+diff -ru3 avidemux_2.6.15-old/avidemux_core/ADM_core/src/ADM_folder_linux.cpp avidemux_2.6.15/avidemux_core/ADM_core/src/ADM_folder_linux.cpp +--- avidemux_2.6.15-old/avidemux_core/ADM_core/src/ADM_folder_linux.cpp 2016-11-23 02:13:41.406566362 +0300 ++++ avidemux_2.6.15/avidemux_core/ADM_core/src/ADM_folder_linux.cpp 2016-11-23 02:14:33.433566147 +0300 +@@ -92,7 +92,7 @@ + + char *ADM_getInstallRelativePath(const char *base1, const char *base2, const char *base3) + { +- return ADM_getRelativePath(ADM_INSTALL_DIR, base1, base2, base3); ++ return ADM_getRelativePath(getenv("ADM_ROOT_DIR"), base1, base2, base3); + } + const std::string ADM_getI8NDir(const std::string &flavor) + { |