[arch-commits] Commit in motion/trunk (PKGBUILD libjpeg-8.patch)
Eric Bélanger
eric at archlinux.org
Fri Jul 9 22:50:45 UTC 2010
Date: Friday, July 9, 2010 @ 18:50:45
Author: eric
Revision: 85176
upgpkg: motion 3.2.12-1
Upstream update, Improved description, Added libjpeg depends, Renamed sample config such as to be the real config
Modified:
motion/trunk/PKGBUILD
Deleted:
motion/trunk/libjpeg-8.patch
-----------------+
PKGBUILD | 31 +++++++++++++------------------
libjpeg-8.patch | 29 -----------------------------
2 files changed, 13 insertions(+), 47 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-07-09 22:40:03 UTC (rev 85175)
+++ PKGBUILD 2010-07-09 22:50:45 UTC (rev 85176)
@@ -2,37 +2,32 @@
# Maintainer:
pkgname=motion
-pkgver=3.2.11.1
-pkgrel=4
-pkgdesc="A software motion detector. It grabs images from video4linux devices and/or from webcams"
+pkgver=3.2.12
+pkgrel=1
+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/twiki/bin/view/Motion/WebHome"
-depends=('ffmpeg')
+depends=('ffmpeg' 'libjpeg')
+backup=('etc/motion/motion.conf')
options=('!makeflags')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
- 'rc.motion'
- 'libjpeg-8.patch')
-md5sums=('4e729f129d8f9b9abaed5121c3cd0037'
- '24b6fbfa586857b72f90cda81410c14f'
- '945a7da5e65156804d2446826d28dfbb')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.motion)
+md5sums=('1ba0065ed50509aaffb171594c689f46' '24b6fbfa586857b72f90cda81410c14f')
+sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd' '06f74131a9d4abc8aa05f531bd19c51a5732023f')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
-
- patch -Np1 -i ${srcdir}/libjpeg-8.patch
-
./configure --prefix=/usr \
--without-pgsql \
--without-mysql \
- --with-libavcodec=/usr/lib/ \
- --sysconfdir=/etc/motion || return 1
- make || return 1
+ --sysconfdir=/etc/motion
+ make
}
package(){
cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install || return 1
+ make DESTDIR="${pkgdir}" install
+ mv "${pkgdir}/etc/motion/motion-dist.conf" "${pkgdir}/etc/motion/motion.conf"
- install -Dm755 "${srcdir}/rc.motion" "${pkgdir}/etc/rc.d/motion" || return 1
+ install -Dm755 "${srcdir}/rc.motion" "${pkgdir}/etc/rc.d/motion"
}
Deleted: libjpeg-8.patch
===================================================================
--- libjpeg-8.patch 2010-07-09 22:40:03 UTC (rev 85175)
+++ libjpeg-8.patch 2010-07-09 22:50:45 UTC (rev 85176)
@@ -1,29 +0,0 @@
---- motion-3.2.11.1/picture.c~ 2010-01-19 21:16:45.621459550 +0100
-+++ motion-3.2.11.1/picture.c 2010-01-19 21:17:56.818117906 +0100
-@@ -52,7 +52,7 @@
- dest->jpegsize = dest->bufsize - dest->pub.free_in_buffer;
- }
-
--static GLOBAL(void) jpeg_mem_dest(j_compress_ptr cinfo, JOCTET* buf, size_t bufsize)
-+static GLOBAL(void) _jpeg_mem_dest(j_compress_ptr cinfo, JOCTET* buf, size_t bufsize)
- {
- mem_dest_ptr dest;
-
-@@ -131,7 +131,7 @@
- jpeg_set_quality(&cinfo, quality, TRUE);
- cinfo.dct_method = JDCT_FASTEST;
-
-- jpeg_mem_dest(&cinfo, dest_image, image_size); // data written to mem
-+ _jpeg_mem_dest(&cinfo, dest_image, image_size); // data written to mem
-
- jpeg_start_compress (&cinfo, TRUE);
-
-@@ -182,7 +182,7 @@
-
- jpeg_set_quality(&cjpeg, quality, TRUE);
- cjpeg.dct_method = JDCT_FASTEST;
-- jpeg_mem_dest(&cjpeg, dest_image, image_size); // data written to mem
-+ _jpeg_mem_dest(&cjpeg, dest_image, image_size); // data written to mem
-
- jpeg_start_compress (&cjpeg, TRUE);
-
More information about the arch-commits
mailing list