[arch-commits] Commit in avidemux/trunk (4 files)
Eric Bélanger
eric at archlinux.org
Fri Oct 29 18:56:13 UTC 2010
Date: Friday, October 29, 2010 @ 14:56:13
Author: eric
Revision: 97337
upgpkg: avidemux 2.5.4-1
Upstream update with audio patch, Added mesa makedepends, Added VP8 support, Updated gtk desktop file, Removed ChangeLog and old patch
Added:
avidemux/trunk/2.5.4_audioDevice.patch
Modified:
avidemux/trunk/PKGBUILD
Deleted:
avidemux/trunk/2.5.3_field_asm_fix.diff
avidemux/trunk/ChangeLog
--------------------------+
2.5.3_field_asm_fix.diff | 135 ---------------------------------------------
2.5.4_audioDevice.patch | 12 ++++
ChangeLog | 87 -----------------------------
PKGBUILD | 31 +++++-----
4 files changed, 27 insertions(+), 238 deletions(-)
Deleted: 2.5.3_field_asm_fix.diff
===================================================================
--- 2.5.3_field_asm_fix.diff 2010-10-29 13:43:06 UTC (rev 97336)
+++ 2.5.3_field_asm_fix.diff 2010-10-29 18:56:13 UTC (rev 97337)
@@ -1,135 +0,0 @@
-diff --git a/avidemux/ADM_coreImage/src/ADM_interlaceUtil.cpp b/avidemux/ADM_coreImage/src/ADM_interlaceUtil.cpp
-index 33b2a7f..99f0664 100644
---- a/avidemux/ADM_coreImage/src/ADM_interlaceUtil.cpp
-+++ b/avidemux/ADM_coreImage/src/ADM_interlaceUtil.cpp
-@@ -30,19 +30,8 @@ Skip factor=2
- ***************************************************************************/
-
- #include "ADM_default.h"
--
--//#include "ADM_editor/ADM_edit.hxx"
- #include "ADM_videoFilter.h"
-
--//#define MMX_TRACE
--#warning remove mmxmacro and debug asm
--//#define ASM_ILACING
--
--
--#include "ADM_mmxMacros.h"
--
--
--
-
- #define SKIP_FACTOR 2 // 2^SKIPFACTOR=SKIP_LINEAR+1
- #define SKIP_LINEAR 3
-@@ -62,7 +51,7 @@ Skip factor=2
- */
-
- #if defined(ADM_CPU_X86) && defined(ASM_ILACING)
--
-+#warning REWRITE IN PLAIN ASM
- static uint32_t ADMVideo_interlaceCount_MMX( uint8_t *src ,uint32_t w, uint32_t h);
- static uint8_t * FUNNY_MANGLE(_l_p) =NULL;
- static uint8_t * FUNNY_MANGLE(_l_c) =NULL;
-diff --git a/avidemux/ADM_coreImage/src/ADM_vidFieldASM.cpp b/avidemux/ADM_coreImage/src/ADM_vidFieldASM.cpp
-index 61d11d4..479731c 100644
---- a/avidemux/ADM_coreImage/src/ADM_vidFieldASM.cpp
-+++ b/avidemux/ADM_coreImage/src/ADM_vidFieldASM.cpp
-@@ -20,15 +20,13 @@
- ***************************************************************************/
-
- #include "ADM_default.h"
--
- #include "ADM_videoFilter.h"
--
- #include"ADM_vidField.h"
-
- #ifdef ADM_CPU_X86
- // #define DEBUG_DEINT 1
- // #define MMX_TRACE 1
-- #include "ADM_mmxMacros.h"
-+// #include "ADM_mmxMacros.h"
-
- void myDeintASM(void);
-
-@@ -36,25 +34,27 @@
- static uint8_t * FUNNY_MANGLE(_l_p) , * FUNNY_MANGLE(_l_c) ,* FUNNY_MANGLE(_l_n);
- static uint8_t * FUNNY_MANGLE(_l_e) , * FUNNY_MANGLE(_l_e2);
- #define EXPAND(x) (x)+((x)<<16)+((x)<<32) +((x)<<48)
--static mmx_t _mmTHRESH1;
--static mmx_t _mmTHRESH2;
-+static uint64_t __attribute__((used)) __attribute__ ((__aligned__ (8))) FUNNY_MANGLE(_mmTHRESH1) ;
-+static uint64_t __attribute__((used)) __attribute__ ((__aligned__ (8))) FUNNY_MANGLE(_mmTHRESH2) ;
-
--#define COMPUTE_MMX \
--punpcklbw_r2r(mm5,mm0); /*c expand 4 bytes -> 4 word */ \
--punpcklbw_r2r(mm5,mm1); /*p*/ \
--punpcklbw_r2r(mm5,mm2); /* n*/ \
--movq_r2r(mm0,mm3); /* mm3 also c*/ \
--psubw_r2r(mm1,mm0) ; /* mm0=mm0-mm1 = c-p*/ \
--psubw_r2r(mm2,mm3) ; /* mm3=mm3-mm2 = c-n*/ \
--psraw_i2r(1,mm0); /* to protect from overflow*/ \
--psraw_i2r(1,mm3);\
--pmullw_r2r(mm0,mm3); /* mm3=(c-p)*(c-n) / 4;*/ \
--movq_r2r(mm3,mm0) ; /* mm0 also c-p*c-n */ \
--pcmpgtw_r2r(mm4,mm3); /* keep only > size*/ \
--pcmpgtw_r2r(mm6,mm0); /* keep only > size*/ \
--packsswb_r2r(mm5,mm0); \
--packsswb_r2r(mm5,mm3);
-
-+#define COMPUTE_MMX \
-+__asm__ __volatile__(\
-+"punpcklbw %%mm5,%%mm0\n\t" \
-+"punpcklbw %%mm5,%%mm1\n\t" \
-+"punpcklbw %%mm5,%%mm2\n\t" \
-+"movq %%mm0,%%mm3\n\t" \
-+"psubw %%mm1,%%mm0\n\t" \
-+"psubw %%mm2,%%mm3\n\t" \
-+"psraw $1,%%mm0\n\t" \
-+"psraw $1,%%mm3\n\t" \
-+"pmullw %%mm0,%%mm3\n\t" \
-+"movq %%mm3,%%mm0\n\t" \
-+"pcmpgtw %%mm4,%%mm3\n\t" \
-+"pcmpgtw %%mm6,%%mm0\n\t" \
-+"packsswb %%mm5,%%mm0\n\t" \
-+"packsswb %%mm5,%%mm3\n\t" \
-+::)
- #endif
-
- void ADMVideoFields::hasMotion_C(uint8_t *p,uint8_t *c,
-@@ -90,8 +90,8 @@ void ADMVideoFields::hasMotion_MMX(uint8_t *p,uint8_t *c,
- {
-
-
-- _mmTHRESH1.uq=EXPAND((uint64_t ) ((_param->motion_trigger*_param->motion_trigger)>>2) );
-- _mmTHRESH2.uq=EXPAND((uint64_t ) ((_param->blend_trigger*_param->blend_trigger)>>2) );
-+ _mmTHRESH1=EXPAND((uint64_t ) ((_param->motion_trigger*_param->motion_trigger)>>2) );
-+ _mmTHRESH2=EXPAND((uint64_t ) ((_param->blend_trigger*_param->blend_trigger)>>2) );
-
- _l_h=_info.height-2;
- _l_w=_info.width>>2;
-@@ -102,10 +102,11 @@ void ADMVideoFields::hasMotion_MMX(uint8_t *p,uint8_t *c,
- _l_e=e;
- _l_e2=e2;
- // printf("\n MMX \n");
--
-- pxor_r2r(mm5,mm5);
-- movq_m2r(_mmTHRESH1,mm4);
-- movq_m2r(_mmTHRESH2,mm6);
-+ __asm__ __volatile__ (
-+ "pxor %%mm5,%%mm5\n\t"
-+ "movq "Mangle(_mmTHRESH1)",%%mm4\n\t"
-+ "movq "Mangle(_mmTHRESH2)",%%mm6\n\t"
-+ ::);
- myDeintASM();
- }
- #if !defined(DEBUG_DEINT)
-@@ -149,7 +150,7 @@ void myDeintASM(void)
- :
- : "eax", "ecx","edx","esi"
- );
-- emms();
-+ __asm__ __volatile__ ("emms");
-
- }
- #else
Added: 2.5.4_audioDevice.patch
===================================================================
--- 2.5.4_audioDevice.patch (rev 0)
+++ 2.5.4_audioDevice.patch 2010-10-29 18:56:13 UTC (rev 97337)
@@ -0,0 +1,12 @@
+--- cmake/config.h.cmake.orig 2010-10-29 12:51:05.000000000 -0400
++++ cmake/config.h.cmake 2010-10-29 12:51:48.000000000 -0400
+@@ -76,9 +76,7 @@
+ /* use Nvwa memory leak detector */
+ #cmakedefine FIND_LEAKS
+
+-#if defined(OSS_SUPPORT) || defined (USE_ARTS) || defined(USE_SDL) || defined(__APPLE__) || defined(__WIN32) || defined(ALSA_SUPPORT)
+ #define HAVE_AUDIO
+-#endif
+
+ #define HAVE_ENCODER
+
Deleted: ChangeLog
===================================================================
--- ChangeLog 2010-10-29 13:43:06 UTC (rev 97336)
+++ ChangeLog 2010-10-29 18:56:13 UTC (rev 97337)
@@ -1,87 +0,0 @@
-2010-06-08 Ionut Biru <ibiru at archlinux.org>
-
- * avidemux 2.5.3-2
- * rebuild x264 20100607
- * added 2.5.3_field_asm_fix.diff to fix building with gcc 4,5
-
-2010-05-25 Ionut Biru <ibiru at archlinux.org>
-
- * avidemux 2.5.3-1
- * upstream update
- * added yasm makedepends
- * dropped avidemux-2.5-i18n.patch, fixed upstream
-
-2010-04-11 Ionut Biru <ibiru at archlinux.org>
-
- * rebuild x264 20100410
-
-2010-03-16 Eric Belanger <eric at archlinux.org>
-
- * avidemux 2.5.2-4
- * Added libxv makedepends (close FS#18693)
-
-2010-03-12 Ionut Biru <ibiru at archlinux.org>
-
- * avidemux 2.5.2-3
- * rebuild x264 20100312
- * changed jack-audio-connection-kit to jack
-
-2010-02-08 Ionut Biru <ionut at archlinux.ro>
-
- * avidemux 2.5.2-2
- * rebuild x264 20100107
-
-2010-01-03 Eric Belanger <eric at archlinux.org>
-
- * avidemux 2.5.2-1
- * Upstream update
- * Implemented split package
-
-2009-08-17 Eric Belanger <eric at archlinux.org>
-
- * avidemux 2.5.1-1
- * Upstream update
- * Removed libdca optdepends
- * Enabled SMP build
-
-2009-08-05 Eric Belanger <eric at archlinux.org>
-
- * avidemux 2.5.0-2
- * Switched to a svn snapshot (close FS#15751)
- * Added library symlinks
-
-2009-07-17 Eric Belanger <eric at archlinux.org>
-
- * avidemux 2.5.0-1
- * Upstream update
- * Added optdepends for plugins
- * Updated patches
-
-2009-06-12 Eric Belanger <eric at archlinux.org>
-
- * Added patches to build with cmake 2.6.4 and gcc 4.4 (close FS#15082)
-
-2009-04-18 Eric Belanger <eric at archlinux.org>
-
- * avidemux 2.4.4-3
- * Rebuilt against x264 20090416
-
-2009-02-20 Eric Belanger <eric at archlinux.org>
-
- * avidemux 2.4.4-2
- * Rebuilt against x264 20090216
- * Rebuilt against faad2 2.7
-
-2009-02-09 Eric Belanger <eric at archlinux.org>
-
- * avidemux 2.4.4-1
- * Upstream update
-
-2009-01-10 Eric Belanger <eric at archlinux.org>
-
- * avidemux 2.4.3-2
- * Rebuilt against x264 20090108
- * Added QT4 GUI
- * Added libxslt makedepends
- * Added man page
- * Added ChangeLog
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-10-29 13:43:06 UTC (rev 97336)
+++ PKGBUILD 2010-10-29 18:56:13 UTC (rev 97337)
@@ -1,24 +1,23 @@
# $Id$
# Maintainer: Eric Belanger <eric at archlinux.org>
-# Contributor: damir <damir at archlinux.org>
pkgbase=avidemux
pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
-pkgver=2.5.3
-pkgrel=4
+pkgver=2.5.4
+pkgrel=1
arch=('i686' 'x86_64')
license=('GPL')
url="http://fixounet.free.fr/avidemux/"
-makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'esound' 'libvorbis' 'sdl' 'libxv'
- 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' 'opencore-amr' 'yasm')
-source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz
- 2.5.3_field_asm_fix.diff)
-md5sums=('5a688029895b66b65ca86b7c85a03ee3'
- '7eaae393f6c0890a68d382f32925e07d')
+makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'esound' 'libvorbis' 'sdl' 'libxv' \
+ 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \
+ 'opencore-amr' 'yasm' 'mesa' 'libvpx')
+source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz 2.5.4_audioDevice.patch)
+md5sums=('b849460f6480df92bfd72d1a3dc288d4' 'ef375051a12c911c6bd8a7bf85b76330')
+sha1sums=('83d6f6d87442ce4fc4e4806735ec27ef5e90364c' '95aa151acffd5b5c7b34a16e7727a4ba635c59c5')
build() {
cd "${srcdir}/${pkgbase}_${pkgver}"
- patch -Np1 -i "${srcdir}/2.5.3_field_asm_fix.diff"
+ patch -p0 < ../2.5.4_audioDevice.patch
mkdir build
cd build
cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 ..
@@ -41,7 +40,7 @@
package_avidemux-cli() {
pkgdesc="A graphical tool to edit video (filter/re-encode/split)"
- depends=('libxv' 'libxml2' 'sdl')
+ depends=('libxml2' 'sdl' 'fontconfig' 'libvpx')
optdepends=('lame: for the corresponding audio encoder plugin' \
'faac: for the corresponding audio encoder plugin' \
'faad2: for the corresponding audio decoder plugin' \
@@ -76,10 +75,10 @@
package_avidemux-gtk() {
pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI"
- depends=('avidemux-cli' 'gtk2')
+ depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv')
cd "${srcdir}/${pkgbase}_${pkgver}"
- install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk" || return 1
+ install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk"
install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
@@ -89,13 +88,13 @@
install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid"
install -D -m755 plugins/build/ADM_videoFilters/*/*_gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter"
- install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
- sed -i 's/Name=avidemux2/Name=avidemux (GTK)/' "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
+ install -D -m644 avidemux2-gtk.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
+ sed -i "s|\[\$e\]||" "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
}
package_avidemux-qt() {
pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI"
- depends=('avidemux-cli' 'qt')
+ depends=("avidemux-cli=${pkgver}" 'qt')
cd "${srcdir}/${pkgbase}_${pkgver}"
install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4"
More information about the arch-commits
mailing list