snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

avidemux: update to 2.6.12

This commit is contained in:
Jürgen Buchmüller 2016-03-08 03:22:58 +01:00
parent aae9636a77
commit d9733f2bce
2 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
srcpkgs/avidemux/patches/musl-execinfo.patch
View File

@ -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 2016-03-05 09:22:54.000000000 +0100
+++ avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp 2015-09-28 08:15:19.568394743 +0200 +++ avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp 2016-03-08 03:06:07.328943375 +0100
@@ -31,8 +31,10 @@ @@ -30,7 +30,7 @@
#define _ELF64
#endif #endif
#include <sys/machelf.h> #include <sys/machelf.h>
#else -#else
+#if defined(__GLIBC__) +#elif defined(__GLIBC__)
#include <execinfo.h> #include <execinfo.h>
#endif #endif
+#endif
#include "ADM_default.h" @@ -165,7 +165,7 @@
@@ -166,6 +168,7 @@
if(mysaveFunction) if(mysaveFunction)
mysaveFunction(); mysaveFunction();
#define MAX_BACKTRACK 30
+#if defined(__GLIBC__) -#if !defined(__HAIKU__) && !defined(__sun__)
#if !defined(__HAIKU__) +#if defined(__GLIBC__) && !defined(__HAIKU__) && !defined(__sun__)
char wholeStuff[2048]; char wholeStuff[2048];
#if !defined(__sun__) char buffer[4096];
@@ -209,7 +212,7 @@ char in[2048];
backtrace(fileno(stdout));
#endif
printf("*********** BACKTRACK **************\n");
-
+#endif
if(myFatalFunction)
myFatalFunction("Crash", wholeStuff); // FIXME

11
srcpkgs/avidemux/template
View File

@ -1,9 +1,8 @@
# Template file for 'avidemux' # Template file for 'avidemux'
pkgname=avidemux pkgname=avidemux
version=2.6.11 version=2.6.12
revision=2 revision=1
_beta=beta1 wrksrc="${pkgname}_${version}"
wrksrc="${pkgname}_${version}${_beta}"
hostmakedepends="cmake pkg-config qt5-qmake yasm" hostmakedepends="cmake pkg-config qt5-qmake yasm"
# XXX: MesaLib-devel, libva-devel, libvdpau-devel, etc. and make display output work # XXX: MesaLib-devel, libva-devel, libvdpau-devel, etc. and make display output work
makedepends="faac-devel faad2-devel gettext-devel jack-devel 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>" maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="GPL-2" license="GPL-2"
homepage="http://avidemux.sourceforge.net/" homepage="http://avidemux.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/avidemux/avidemux/${version}${_beta}/${pkgname}_${version}${_beta}.tar.gz" distfiles="${SOURCEFORGE_SITE}/avidemux/avidemux/${version}/${pkgname}_${version}.tar.gz"
checksum=e45808fedf480e0ef2b33321b2e9e0c525aef0a1c487558a586c8c54924c16c3 checksum=769a8bc1bc8ca64038971d2d02f5973d95a3561370366be328ce6904a317e55b
do_build() { do_build() {
bash bootStrap.bash --without-gtk --enable-qt5 bash bootStrap.bash --without-gtk --enable-qt5