[packages_10.03.2] motion: merge r28325, r29196

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30075 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile
index 867333f..0909c24 100644 (file)
--- a/multimedia/motion/Makefile
+++ b/multimedia/motion/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008-2009 OpenWrt.org
+# Copyright (C) 2008-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=motion
-PKG_VERSION:=3.2.11.1
-PKG_RELEASE:=1
+PKG_VERSION:=20110826-051001
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.lavrsen.dk/sources/motion-daily \
                @SF/motion
-PKG_MD5SUM:=4e729f129d8f9b9abaed5121c3cd0037
+PKG_MD5SUM:=e703fce57ae2215cb05f25e3027f5818
 
 PKG_INSTALL:=1
 
@@ -33,10 +33,13 @@ define Package/motion/conffiles
 endef
 
 CONFIGURE_ARGS+= \
+       --without-optimizecpu \
        --without-ffmpeg \
        --without-jpeg-mmx \
+       --without-sdl \
        --without-mysql \
        --without-pgsql \
+       --without-sqlite3 \
 
 define Package/motion/install
        $(INSTALL_DIR) $(1)/etc