avidemux: 2.6.12 -> 2.6.15
This commit is contained in:
parent
1a9ce1d9d0
commit
79b0a9bf39
@ -14,11 +14,11 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "2.6.12";
|
version = "2.6.15";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz";
|
url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz";
|
||||||
sha256 = "0nz52yih8sff53inndkh2dba759xjzsh4b8xjww419lcpk0qp6kn";
|
sha256 = "0mr2nll81ki9d1s68klhm19jmr15450wjaws1p0b0y2qqwyrprdh";
|
||||||
};
|
};
|
||||||
|
|
||||||
common = {
|
common = {
|
||||||
|
@ -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
|
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.12.old/avidemux_core/ADM_core/src/ADM_fileio.cpp 2016-03-25 15:26:00.368213627 +0300
|
--- 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.12/avidemux_core/ADM_core/src/ADM_fileio.cpp 2016-03-26 02:32:56.163550537 +0300
|
+++ avidemux_2.6.15/avidemux_core/ADM_core/src/ADM_folder_linux.cpp 2016-11-23 02:14:33.433566147 +0300
|
||||||
@@ -393,7 +393,7 @@
|
@@ -92,7 +92,7 @@
|
||||||
|
|
||||||
return ADM_getRelativePath(buffer, base1, base2, base3);
|
char *ADM_getInstallRelativePath(const char *base1, const char *base2, const char *base3)
|
||||||
#else
|
{
|
||||||
- return ADM_getRelativePath(ADM_INSTALL_DIR, base1, base2, base3);
|
- return ADM_getRelativePath(ADM_INSTALL_DIR, base1, base2, base3);
|
||||||
+ return ADM_getRelativePath(getenv("ADM_ROOT_DIR"), base1, base2, base3);
|
+ return ADM_getRelativePath(getenv("ADM_ROOT_DIR"), base1, base2, base3);
|
||||||
#endif
|
}
|
||||||
}
|
const std::string ADM_getI8NDir(const std::string &flavor)
|
||||||
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user