[arch-commits] Commit in avidemux/trunk (4 files)

[Eric Bélanger]

    Date: Sunday, June 5, 2011 @ 03:19:37
  Author: eric
Revision: 126410

upgpkg: avidemux 2.5.5-1
Upstream update, Added install scriptlet to run update-desktop-database, Added pulse support, Removed old patches

Added:
  avidemux/trunk/avidemux.install
Modified:
  avidemux/trunk/PKGBUILD
Deleted:
  avidemux/trunk/2.5.4_audioDevice.patch
  avidemux/trunk/x264.patch

-------------------------+
 2.5.4_audioDevice.patch |   12 ------------
 PKGBUILD                |   26 +++++++++++---------------
 avidemux.install        |   11 +++++++++++
 x264.patch              |   21 ---------------------
 4 files changed, 22 insertions(+), 48 deletions(-)

Deleted: 2.5.4_audioDevice.patch
===================================================================
--- 2.5.4_audioDevice.patch	2011-06-05 07:18:30 UTC (rev 126409)
+++ 2.5.4_audioDevice.patch	2011-06-05 07:19:37 UTC (rev 126410)
@@ -1,12 +0,0 @@
---- 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
- 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-05 07:18:30 UTC (rev 126409)
+++ PKGBUILD	2011-06-05 07:19:37 UTC (rev 126410)
@@ -1,29 +1,22 @@
 # $Id$
-# Maintainer: Eric Belanger <eric at archlinux.org>
+# Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgbase=avidemux
 pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
-pkgver=2.5.4
-pkgrel=4
+pkgver=2.5.5
+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' 'mesa' 'libvpx')
-source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz 2.5.4_audioDevice.patch
-        x264.patch)
-md5sums=('b849460f6480df92bfd72d1a3dc288d4'
-         'ef375051a12c911c6bd8a7bf85b76330'
-         '0d01294b8171a856f718ab8131bea074')
+             'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse')
+source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz)
+md5sums=('33bbe210c6826cea1987ed18a41d57a7')
 
 build() {
   cd "${srcdir}/${pkgbase}_${pkgver}"
 
-  #gcc 4.6 workaround
-  export CXXFLAGS="$CXXFLAGS -fpermissive"
-  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=1 -D QT4=1 ..
@@ -53,6 +46,7 @@
               'opencore-amr: for the corresponding audio decoder plugin'
               'esound: for the corresponding audio device plugin'
               'jack: for the corresponding audio device plugin'
+              'libpulse: for the corresponding audio device plugin'
               'sdl: for the corresponding audio device plugin'
               'x264: for the corresponding video encoder plugin'
               'xvidcore: for the corresponding video encoder plugin')
@@ -81,7 +75,8 @@
 
 package_avidemux-gtk() {
   pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI"
-  depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv')
+  depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils')
+  install=avidemux.install
 
   cd "${srcdir}/${pkgbase}_${pkgver}"
   install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk"
@@ -100,7 +95,8 @@
 
 package_avidemux-qt() {
   pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI"
-  depends=("avidemux-cli=${pkgver}" 'qt')
+  depends=("avidemux-cli=${pkgver}" 'qt' 'desktop-file-utils')
+  install=avidemux.install
 
   cd "${srcdir}/${pkgbase}_${pkgver}"
   install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4"

Added: avidemux.install
===================================================================
--- avidemux.install	                        (rev 0)
+++ avidemux.install	2011-06-05 07:19:37 UTC (rev 126410)
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}

Deleted: x264.patch
===================================================================
--- x264.patch	2011-06-05 07:18:30 UTC (rev 126409)
+++ x264.patch	2011-06-05 07:19:37 UTC (rev 126410)
@@ -1,21 +0,0 @@
-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;
-