From 4030efc5d368365f218458bee76d085e38ac6781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 29 Dec 2015 19:01:13 +0100 Subject: [PATCH] avidemux: update to 2.6.11beta1 --- srcpkgs/avidemux/patches/musl-uint.patch | 13 ------------- srcpkgs/avidemux/template | 21 +++++++++++---------- 2 files changed, 11 insertions(+), 23 deletions(-) delete mode 100644 srcpkgs/avidemux/patches/musl-uint.patch diff --git a/srcpkgs/avidemux/patches/musl-uint.patch b/srcpkgs/avidemux/patches/musl-uint.patch deleted file mode 100644 index 5a2c0d95eca..00000000000 --- a/srcpkgs/avidemux/patches/musl-uint.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- avidemux/common/ADM_requant/tcrequant.c 2015-06-10 07:42:47.000000000 +0200 -+++ avidemux/common/ADM_requant/tcrequant.c 2015-09-28 08:32:51.149470555 +0200 -@@ -62,6 +62,10 @@ - #define MODULE_NAME MODULE_TCREQUANT - #include "ADM_debug.h" - -+#if !defined(__GLIBC__) -+typedef uint32_t uint; -+#endif -+ - - // / MEANX - void mixDump_c(uint8_t *p, uint32_t l); diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template index 8dda623120e..898a8bbed03 100644 --- a/srcpkgs/avidemux/template +++ b/srcpkgs/avidemux/template @@ -1,25 +1,26 @@ # Template file for 'avidemux' pkgname=avidemux -version=2.6.10 -revision=2 -wrksrc="${pkgname}_${version}" -hostmakedepends="cmake pkg-config qt5-qmake yasm" +version=2.6.11 +revision=1 +_beta=beta1 +wrksrc="${pkgname}_${version}${_beta}" +hostmakedepends="cmake pkg-config $(vopt_if qt 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 - lame-devel libvorbis-devel libXv-devel sqlite-devel - qt5-multimedia-devel qt5-script-devel qt5-tools-devel SDL-devel - x264-devel x265-devel xvidcore-devel" + lame-devel libass-devel libdca-devel libvorbis-devel libvpx-devel libXv-devel + sqlite-devel qt5-multimedia-devel qt5-script-devel qt5-tools-devel + SDL-devel x264-devel x265-devel xvidcore-devel" depends="python" nocross=yes short_desc="Video editing and processing application" maintainer="Jürgen Buchmüller " license="GPL-2" homepage="http://avidemux.sourceforge.net/" -distfiles="http://download.oldfoss.com/Avidemux/avidemux_${version}.tar.gz" -checksum=176c2482a0656f81e307f1505e6dfcdab086ee73e7de363617b884c5d7205aed +distfiles="${SOURCEFORGE_SITE}/avidemux/avidemux/${version}${_beta}/${pkgname}_${version}${_beta}.tar.gz" +checksum=e45808fedf480e0ef2b33321b2e9e0c525aef0a1c487558a586c8c54924c16c3 do_build() { - bash bootStrap.bash --enable-qt5 + bash bootStrap.bash --without-gtk --enable-qt5 } do_install() { # Remove Windows stuff