avidemux: update to 2.6.12
This commit is contained in:
parent
aae9636a77
commit
d9733f2bce
|
@ -1,30 +1,20 @@
|
|||
--- avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp 2015-06-10 07:42:47.000000000 +0200
|
||||
+++ avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp 2015-09-28 08:15:19.568394743 +0200
|
||||
@@ -31,8 +31,10 @@
|
||||
--- avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp 2016-03-05 09:22:54.000000000 +0100
|
||||
+++ avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp 2016-03-08 03:06:07.328943375 +0100
|
||||
@@ -30,7 +30,7 @@
|
||||
#define _ELF64
|
||||
#endif
|
||||
#include <sys/machelf.h>
|
||||
#else
|
||||
+#if defined(__GLIBC__)
|
||||
-#else
|
||||
+#elif defined(__GLIBC__)
|
||||
#include <execinfo.h>
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
#include "ADM_default.h"
|
||||
|
||||
@@ -166,6 +168,7 @@
|
||||
@@ -165,7 +165,7 @@
|
||||
if(mysaveFunction)
|
||||
mysaveFunction();
|
||||
|
||||
+#if defined(__GLIBC__)
|
||||
#if !defined(__HAIKU__)
|
||||
#define MAX_BACKTRACK 30
|
||||
-#if !defined(__HAIKU__) && !defined(__sun__)
|
||||
+#if defined(__GLIBC__) && !defined(__HAIKU__) && !defined(__sun__)
|
||||
char wholeStuff[2048];
|
||||
#if !defined(__sun__)
|
||||
@@ -209,7 +212,7 @@
|
||||
backtrace(fileno(stdout));
|
||||
#endif
|
||||
printf("*********** BACKTRACK **************\n");
|
||||
-
|
||||
+#endif
|
||||
if(myFatalFunction)
|
||||
myFatalFunction("Crash", wholeStuff); // FIXME
|
||||
|
||||
char buffer[4096];
|
||||
char in[2048];
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
# Template file for 'avidemux'
|
||||
pkgname=avidemux
|
||||
version=2.6.11
|
||||
revision=2
|
||||
_beta=beta1
|
||||
wrksrc="${pkgname}_${version}${_beta}"
|
||||
version=2.6.12
|
||||
revision=1
|
||||
wrksrc="${pkgname}_${version}"
|
||||
hostmakedepends="cmake pkg-config qt5-qmake yasm"
|
||||
# XXX: MesaLib-devel, libva-devel, libvdpau-devel, etc. and make display output work
|
||||
makedepends="faac-devel faad2-devel gettext-devel jack-devel
|
||||
|
@ -16,8 +15,8 @@ short_desc="Video editing and processing application"
|
|||
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
|
||||
license="GPL-2"
|
||||
homepage="http://avidemux.sourceforge.net/"
|
||||
distfiles="${SOURCEFORGE_SITE}/avidemux/avidemux/${version}${_beta}/${pkgname}_${version}${_beta}.tar.gz"
|
||||
checksum=e45808fedf480e0ef2b33321b2e9e0c525aef0a1c487558a586c8c54924c16c3
|
||||
distfiles="${SOURCEFORGE_SITE}/avidemux/avidemux/${version}/${pkgname}_${version}.tar.gz"
|
||||
checksum=769a8bc1bc8ca64038971d2d02f5973d95a3561370366be328ce6904a317e55b
|
||||
|
||||
do_build() {
|
||||
bash bootStrap.bash --without-gtk --enable-qt5
|
||||
|
|
Loading…
Reference in New Issue