Commit 049562ab authored by Phil's avatar Phil
Browse files

avidemux: add some patches

parent d5a404d6
......@@ -10,7 +10,9 @@ hdr
build.sh
clean-builddir.sh
clean-workdir.sh
copy.sh
makepkg
move.sh
pkgrels-decrease.sh
pkgrels-increase.sh
pkgrels-reset.sh
......@@ -24,6 +26,11 @@ sync-complete.sh
sync-down.sh
sync-up-nodb.sh
sync-up.sh
remove.sh
recreate-database.sh
upload.sh
upload-nodb.sh
unlock-database.sh
*-cfg.conf
*-makepkg.conf
......
--- 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
......@@ -10,20 +10,23 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgbase=avidemux
pkgname=('avidemux-cli' 'avidemux')
pkgver=2.5.4
pkgrel=2
pkgrel=3
pkgdesc='Simple video editor for cutting, filtering and encoding tasks.'
arch=('i686' 'x86_64')
license=('GPL')
url="http://fixounet.free.fr/avidemux/"
makedepends=('cmake' 'libxslt' '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)
md5sums=('b849460f6480df92bfd72d1a3dc288d4')
source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz 2.5.4_audioDevice.patch
x264.patch)
md5sums=('b849460f6480df92bfd72d1a3dc288d4'
'ef375051a12c911c6bd8a7bf85b76330'
'0d01294b8171a856f718ab8131bea074')
build() {
cd "${srcdir}/${pkgbase}_${pkgver}"
#patch -Np1 -i "${srcdir}/2.5.3_field_asm_fix.diff" || return 1
patch -p0 < ../2.5.4_audioDevice.patch
patch -Np1 -i "${srcdir}/x264.patch"
mkdir build
cd build
cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=0 -D QT4=1 .. || return 1
......
diff -Nur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2010-10-10 06:45:42.000000000 -0700
+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-01-16 07:16:48.283341102 -0800
@@ -1386,7 +1386,7 @@
case X264_WEIGHTP_NONE:
strcpy((char*)xmlBuffer, "none");
break;
- case X264_WEIGHTP_BLIND:
+ case X264_WEIGHTP_SIMPLE:
strcpy((char*)xmlBuffer, "blind");
break;
case X264_WEIGHTP_SMART:
@@ -1896,7 +1896,7 @@
int weightedPredPFrames = X264_WEIGHTP_NONE;
if (strcmp(content, "blind") == 0)
- weightedPredPFrames = X264_WEIGHTP_BLIND;
+ weightedPredPFrames = X264_WEIGHTP_SIMPLE;
else if (strcmp(content, "smart") == 0)
weightedPredPFrames = X264_WEIGHTP_SMART;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment