[arch-commits] Commit in mjpegtools/trunk (PKGBUILD mjpegtools-2.0.0-gcc470.patch)

[Eric Bélanger]

    Date: Tuesday, April 30, 2013 @ 03:41:39
  Author: eric
Revision: 183958

upgpkg: mjpegtools 2.0.0-3

Rebuild against libpng 1.6, Add build patch

Added:
  mjpegtools/trunk/mjpegtools-2.0.0-gcc470.patch
Modified:
  mjpegtools/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |   19 +++++++++++++------
 mjpegtools-2.0.0-gcc470.patch |   11 +++++++++++
 2 files changed, 24 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-30 01:01:33 UTC (rev 183957)
+++ PKGBUILD	2013-04-30 01:41:39 UTC (rev 183958)
@@ -4,7 +4,7 @@
 
 pkgname=mjpegtools
 pkgver=2.0.0
-pkgrel=2
+pkgrel=3
 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')
@@ -15,20 +15,27 @@
 options=('!makeflags' '!libtool')
 install=mjpegtools.install
 source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz
-        mjpegtools-v4l-2.6.38.patch)
+        mjpegtools-v4l-2.6.38.patch
+        mjpegtools-2.0.0-gcc470.patch)
 md5sums=('903e1e3b967eebcc5fe5626d7517dc46'
-         '44006d6f844017fe57aa123aa43f4508')
+         '44006d6f844017fe57aa123aa43f4508'
+         '7c9b3d4a1f3a10e3263a6a110b0f55cc')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd ${pkgname}-${pkgver}
   patch -Np0 -i "${srcdir}/mjpegtools-v4l-2.6.38.patch"
+  patch -Np1 -i "${srcdir}/mjpegtools-2.0.0-gcc470.patch"
   sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --enable-largefile
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -m644 mpeg2enc/mpeg2syntaxcodes.h "${pkgdir}/usr/include/mjpegtools/mpeg2enc/"
 }

Added: mjpegtools-2.0.0-gcc470.patch
===================================================================
--- mjpegtools-2.0.0-gcc470.patch	                        (rev 0)
+++ mjpegtools-2.0.0-gcc470.patch	2013-04-30 01:41:39 UTC (rev 183958)
@@ -0,0 +1,11 @@
+--- a/y4mdenoise/MotionSearcher.hh
++++ b/y4mdenoise/MotionSearcher.hh
+@@ -2196,7 +2196,7 @@
+ 	{
+ 		// This region is too small to be bothered with.
+ 		// Just get rid of it.
+-		DeleteRegion (a_pRegion);
++		this->DeleteRegion (a_pRegion);
+ 	}
+ 	else
+ 	{