summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-03-27 20:36:45 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-03-27 20:36:45 +0000
commitdd25a83fa1cc2510d05d137ea45eedb3dcee1f62 (patch)
tree68fcc5e7670d729a7b7c894100fce63a18a7fa63
parentc253a3c066f2b5ad749cc0e76088354e074f29c8 (diff)
update motion package, add a patch to honor CPPFLAGS,
explicitely remove database support, add MD5SUMS, add dependency on libpthread in ipkg/control file, standardize. git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3509 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/motion/Makefile45
-rw-r--r--package/motion/ipkg/motion.control5
-rw-r--r--package/motion/patches/02-honor_cppflags.patch20
3 files changed, 52 insertions, 18 deletions
diff --git a/package/motion/Makefile b/package/motion/Makefile
index 1cc30398e..a5a568181 100644
--- a/package/motion/Makefile
+++ b/package/motion/Makefile
@@ -1,8 +1,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=motion
-PKG_VERSION:=3.2.5.1
+PKG_VERSION:=3.2.6
PKG_RELEASE:=1
+PKG_MD5SUM:=71e6bd13fcca70372e9b7c7806d62b30
PKG_SOURCE_URL:=http://superb.dl.sourceforge.net/sourceforge/motion
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -18,15 +19,33 @@ $(eval $(call PKG_template,MOTION,motion,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
(cd $(PKG_BUILD_DIR); \
$(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
- LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --sysconfdir=/etc \
- --with-jpeg-mmx="$(STAGING_DIR)/usr" \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --program-prefix="" \
+ --program-suffix="" \
+ --prefix=/usr \
+ --exec-prefix=/usr \
+ --bindir=/usr/bin \
+ --datadir=/usr/share \
+ --includedir=/usr/include \
+ --infodir=/usr/share/info \
+ --libdir=/usr/lib \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --mandir=/usr/share/man \
+ --sbindir=/usr/sbin \
+ --sysconfdir=/etc \
+ $(DISABLE_LARGEFILE) \
+ $(DISABLE_NLS) \
+ --without-ffmpeg \
+ --without-jpeg-mmx \
+ --without-mysql \
+ --without-pgsql \
);
touch $@
@@ -34,18 +53,16 @@ $(PKG_BUILD_DIR)/.built:
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
- $(TARGET_CONFIGURE_OPTS) \
DESTDIR="$(PKG_INSTALL_DIR)" \
all install
touch $@
$(IPKG_MOTION):
install -d -m0755 $(IDIR_MOTION)/usr/bin
- $(CP) $(PKG_INSTALL_DIR)/usr/bin/motion $(IDIR_MOTION)/usr/bin
+ $(CP) $(PKG_INSTALL_DIR)/usr/bin/motion $(IDIR_MOTION)/usr/bin/
$(RSTRIP) $(IDIR_MOTION)
$(IPKG_BUILD) $(IDIR_MOTION) $(PACKAGE_DIR)
mostlyclean:
- make -C $(PKG_BUILD_DIR) clean
- rm $(PKG_BUILD_DIR)/.built
-
+ -$(MAKE) -C $(PKG_BUILD_DIR) clean
+ rm -f $(PKG_BUILD_DIR)/.built
diff --git a/package/motion/ipkg/motion.control b/package/motion/ipkg/motion.control
index 5bf192298..44a0c2b91 100644
--- a/package/motion/ipkg/motion.control
+++ b/package/motion/ipkg/motion.control
@@ -1,8 +1,5 @@
Package: motion
Priority: optional
Section: multimedia
-Maintainer: Jeroen Vreeken <pe1rxq@amsat.org>
-Source: http://www.lavrsen.dk
-Depends: libjpeg
+Depends: libjpeg, libpthread
Description: Webcam motion sensing and logging
-
diff --git a/package/motion/patches/02-honor_cppflags.patch b/package/motion/patches/02-honor_cppflags.patch
new file mode 100644
index 000000000..322fb772d
--- /dev/null
+++ b/package/motion/patches/02-honor_cppflags.patch
@@ -0,0 +1,20 @@
+diff -ruN motion-3.2.5.1-old/Makefile.in motion-3.2.5.1-new/Makefile.in
+--- motion-3.2.5.1-old/Makefile.in 2006-03-07 22:52:49.000000000 +0100
++++ motion-3.2.5.1-new/Makefile.in 2006-03-27 22:04:34.000000000 +0200
+@@ -32,6 +32,7 @@
+ ################################################################################
+ CFLAGS = @CFLAGS@ -Wall -DVERSION=\"$(VERSION)\" -D_REENTRANT \
+ -Dsysconfdir=\"$(sysconfdir)\"
++CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+ VIDEO_OBJ = @VIDEO@
+@@ -115,7 +116,7 @@
+ ################################################################################
+ $(DEPEND_FILE): *.h $(SRC)
+ @echo "Generating dependencies, please wait..."
+- @$(CC) $(CFLAGS) -M $(SRC) > .tmp
++ @$(CC) $(CFLAGS) $(CPPFLAGS) -M $(SRC) > .tmp
+ @mv -f .tmp $(DEPEND_FILE)
+ @echo
+