[arch-commits] Commit in motion/trunk (PKGBUILD ffmpeg-compat.patch)

[Sergej Pupykin]

    Date: Saturday, April 30, 2016 @ 19:50:29
  Author: spupykin
Revision: 173200

upgpkg: motion 3.2.12-14

upd

Modified:
  motion/trunk/PKGBUILD
  motion/trunk/ffmpeg-compat.patch

---------------------+
 PKGBUILD            |    8 ++++----
 ffmpeg-compat.patch |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-30 17:39:01 UTC (rev 173199)
+++ PKGBUILD	2016-04-30 17:50:29 UTC (rev 173200)
@@ -3,12 +3,12 @@
 
 pkgname=motion
 pkgver=3.2.12
-pkgrel=13
+pkgrel=14
 pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.lavrsen.dk/foswiki/bin/view/Motion/WebHome"
-depends=('libjpeg' 'v4l-utils' 'ffmpeg-compat')
+depends=('libjpeg' 'v4l-utils' 'ffmpeg0.10')
 backup=('etc/motion/motion.conf')
 options=('!makeflags')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
@@ -22,11 +22,11 @@
          'f863f8c025f7f025b2178def8418decd'
          'd36687710837d69fbce4608b1345fa34'
          'd8c3c4fdded5cfbd729710475559a21d'
-         'e85c596292aceb425fcf17e5072e2fff')
+         'b2666cade705f6bb663a2139717e0da7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH
+  export PKG_CONFIG_PATH=/usr/lib/ffmpeg0.10/pkgconfig:$PKG_CONFIG_PATH
   patch -Np1 -i $srcdir/ffmpeg-0.8.patch
   patch -Np1 -i $srcdir/linux-headers.patch
   patch -Np1 -i $srcdir/ffmpeg-compat.patch

Modified: ffmpeg-compat.patch
===================================================================
--- ffmpeg-compat.patch	2016-04-30 17:39:01 UTC (rev 173199)
+++ ffmpeg-compat.patch	2016-04-30 17:50:29 UTC (rev 173200)
@@ -163,7 +163,7 @@
 -fi
 -
 +TEMP_CFLAGS+=" `pkg-config --cflags libavformat libavcodec` -DHAVE_FFMPEG -DFFMPEG_NEW_INCLUDES -DHAVE_FFMPEG_NEW"
-+TEMP_LIBS+=" `pkg-config --libs libavformat libavcodec` -lavutil -Wl,-rpath /usr/lib/ffmpeg-compat"
++TEMP_LIBS+=" `pkg-config --libs libavformat libavcodec` -lavutil -Wl,-rpath /usr/lib/ffmpeg0.10"
 +FFMPEG_OK=found
 +FFMPEG_OBJ="ffmpeg.o"
 +AC_SUBST(FFMPEG_OBJ)