[arch-commits] Commit in mjpegtools/trunk (PKGBUILD mjpegtools-1.9.0-glibc-2.10.patch)

[Allan McRae]

    Date: Tuesday, June 30, 2009 @ 02:22:42
  Author: allan
Revision: 43857

upgpkg: mjpegtools 1.9.0-2
    libjpeg soname bump rebuild, add build patch

Added:
  mjpegtools/trunk/mjpegtools-1.9.0-glibc-2.10.patch
Modified:
  mjpegtools/trunk/PKGBUILD

-----------------------------------+
 PKGBUILD                          |   13 ++++++++-----
 mjpegtools-1.9.0-glibc-2.10.patch |   11 +++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-06-30 06:22:02 UTC (rev 43856)
+++ PKGBUILD	2009-06-30 06:22:42 UTC (rev 43857)
@@ -4,21 +4,24 @@
 
 pkgname=mjpegtools
 pkgver=1.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Set of tools that can do recording of videos and playback, simple cut-and-paste editing and the MPEG compression of audio and video"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://mjpeg.sourceforge.net/"
-depends=('libjpeg' 'libpng' 'sdl' 'gcc-libs' 'libdv')
-makedepends=('gtk2')
+depends=('libjpeg>=7' 'libpng' 'sdl' 'gcc-libs' 'libdv')
+makedepends=('gtk2>=2.16.2-2')
 optdepends=('gtk2: glav GUI')
 options=('!makeflags' '!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz)
-md5sums=('309a6fcf0900a010d6a9c1e91afc2f5c')
+source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz
+        mjpegtools-1.9.0-glibc-2.10.patch)
+md5sums=('309a6fcf0900a010d6a9c1e91afc2f5c'
+         'b8ae66237d83be533db8eea166fd3357')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure || return 1
+  patch -Np1 -i $srcdir/mjpegtools-1.9.0-glibc-2.10.patch || return 1
   ./configure --prefix=/usr --enable-largefile || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1

Added: mjpegtools-1.9.0-glibc-2.10.patch
===================================================================
--- mjpegtools-1.9.0-glibc-2.10.patch	                        (rev 0)
+++ mjpegtools-1.9.0-glibc-2.10.patch	2009-06-30 06:22:42 UTC (rev 43857)
@@ -0,0 +1,11 @@
+--- mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp.orig	2009-05-27 01:31:46.000000000 -0700
++++ mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp	2009-05-27 01:33:09.000000000 -0700
+@@ -53,7 +53,7 @@
+ 
+ bool LPCMStream::Probe(IBitStream &bs )
+ {
+-    char *last_dot = strrchr( bs.StreamName(), '.' );
++    const char *last_dot = strrchr( bs.StreamName(), '.' );
+     return 
+         last_dot != NULL 
+         && strcmp( last_dot+1, "lpcm") == 0;