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

[Eric Bélanger]

    Date: Monday, February 9, 2009 @ 20:26:47
  Author: eric
Revision: 26624

Merged revisions 26622 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/avidemux/trunk

........
  r26622 | eric | 2009-02-09 19:46:07 -0500 (Mon, 09 Feb 2009) | 2 lines
  
  upgpkg: avidemux 2.4.4-1
      Upstream update
........

Modified:
  avidemux/repos/extra-i686/	(properties)
  avidemux/repos/extra-i686/ChangeLog
  avidemux/repos/extra-i686/PKGBUILD
Deleted:
  avidemux/repos/extra-i686/avidemux-2.4.3-x264.patch

---------------------------+
 ChangeLog                 |    6 ++++++
 PKGBUILD                  |   22 ++++++++++------------
 avidemux-2.4.3-x264.patch |   40 ----------------------------------------
 3 files changed, 16 insertions(+), 52 deletions(-)


Property changes on: avidemux/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /avidemux/trunk:1-24058
   + /avidemux/trunk:1-26623

Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2009-02-10 00:46:28 UTC (rev 26623)
+++ extra-i686/ChangeLog	2009-02-10 01:26:47 UTC (rev 26624)
@@ -1,5 +1,11 @@
+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

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-02-10 00:46:28 UTC (rev 26623)
+++ extra-i686/PKGBUILD	2009-02-10 01:26:47 UTC (rev 26624)
@@ -3,8 +3,8 @@
 # Contributor: damir <damir at archlinux.org>
 
 pkgname=avidemux
-pkgver=2.4.3
-pkgrel=2
+pkgver=2.4.4
+pkgrel=1
 pkgdesc="A graphical tool to edit video (filter/re-encode/split)"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,18 +14,16 @@
 optdepends=('gtk2: for using the GTK GUI' 'qt: for using the QT4 GUI')
 options=('!makeflags')
 source=(http://download.berlios.de/avidemux/${pkgname}_${pkgver}.tar.gz avidemux.desktop \
-        avidemux-2.4-i18n.patch avidemux-2.4.3-x264.patch)
-md5sums=('ff8e6ac186321e7e8bec9f8177df3724' 'a9cf864c209782307afda5bc6a33a0cd'\
-         'c76ab4a1434689b5be2084c4af66298c' '632d9935e4102454f4f61c86e572e62d')
-sha1sums=('d3a4dc2c07884916c45f750229d02fbdeb3cedde'
+        avidemux-2.4-i18n.patch)
+md5sums=('503dfd25842ef81be7c769811e7bc54e' 'a9cf864c209782307afda5bc6a33a0cd'\
+         'c76ab4a1434689b5be2084c4af66298c')
+sha1sums=('c50a00caf13a8ea1053e5994edeb59354192e18e'
           'e575817d59cd992c2b056c1ff978c23f7fa0e50b'
-          '32557519caeed3b236f48b40d5ee8953b2d03197'
-          '06fb7f651ff8b3c866785c8a9e65ced1ec395d03')
+          '32557519caeed3b236f48b40d5ee8953b2d03197')
 
 build() {
   cd ${srcdir}/${pkgname}_${pkgver}
   patch -p1 < ../avidemux-2.4-i18n.patch || return 1
-  patch -p1 < ../avidemux-2.4.3-x264.patch || return 1
 
   mkdir build
   cd build
@@ -33,7 +31,7 @@
   make || return 1
   make DESTDIR=${pkgdir} install || return 1
 
-  install -D -m644 ../avidemux_icon.png ${pkgdir}/usr/share/pixmaps/avidemux.png
-  install -D -m644 ${srcdir}/avidemux.desktop ${pkgdir}/usr/share/applications/avidemux.desktop
-  install -D -m644 ../man/avidemux.1 ${pkgdir}/usr/share/man/man1/avidemux.1
+  install -D -m644 ../avidemux_icon.png ${pkgdir}/usr/share/pixmaps/avidemux.png || return 1
+  install -D -m644 ${srcdir}/avidemux.desktop ${pkgdir}/usr/share/applications/avidemux.desktop || return 1
+  install -D -m644 ../man/avidemux.1 ${pkgdir}/usr/share/man/man1/avidemux.1 || return 1
 }

Deleted: extra-i686/avidemux-2.4.3-x264.patch
===================================================================
--- extra-i686/avidemux-2.4.3-x264.patch	2009-02-10 00:46:28 UTC (rev 26623)
+++ extra-i686/avidemux-2.4.3-x264.patch	2009-02-10 01:26:47 UTC (rev 26624)
@@ -1,40 +0,0 @@
-diff -ur avidemux_2.4.3.orig/avidemux/ADM_codecs/ADM_x264.cpp avidemux_2.4.3/avidemux/ADM_codecs/ADM_x264.cpp
---- avidemux_2.4.3.orig/avidemux/ADM_codecs/ADM_x264.cpp	2008-10-09 01:45:06.048940024 -0700
-+++ avidemux_2.4.3/avidemux/ADM_codecs/ADM_x264.cpp	2008-10-09 01:49:07.606940126 -0700
-@@ -109,8 +109,14 @@
-   MKPARAM(i_bframe,MaxBFrame);
-   MKPARAM(i_bframe_bias,Bias);
-   MKPARAM( b_bframe_pyramid,BasReference );
-+#if X264_BUILD < 65
-   MKPARAM(analyse. b_bidir_me,BidirME );
-+#endif
-+#if X264_BUILD >= 63
-+  MKPARAM( i_bframe_adaptive, Adaptative);
-+#else
-   MKPARAM( b_bframe_adaptive, Adaptative);
-+#endif
-   MKPARAM( analyse.b_weighted_bipred, Weighted);
-   MKPARAM( b_cabac , CABAC);
-   MKPARAM( analyse.i_trellis, Trellis);
-@@ -118,12 +124,16 @@
- #define MIN_RDO 6
-   if(zparam->PartitionDecision+1>=MIN_RDO)
-   {
--      int rank,parity;
--      rank=((zparam->PartitionDecision+1-MIN_RDO)>>1)+MIN_RDO;
--      parity=(zparam->PartitionDecision+1-MIN_RDO)&1;
-+#if X264_BUILD >= 65
-+    param.analyse.i_subpel_refine = zparam->PartitionDecision + 1;
-+#else
-+    int rank,parity;
-+    rank=((zparam->PartitionDecision+1-MIN_RDO)>>1)+MIN_RDO;
-+    parity=(zparam->PartitionDecision+1-MIN_RDO)&1;
-       
--      param.analyse.i_subpel_refine=rank;
--      param.analyse.b_bframe_rdo=parity;
-+    param.analyse.i_subpel_refine=rank;
-+    param.analyse.b_bframe_rdo=parity;
-+#endif
-   }
-   MKPARAM(analyse.b_chroma_me,ChromaME);
-   MKPARAM(b_deblocking_filter,DeblockingFilter);