diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/motion/Makefile | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/motion/Makefile')
| -rw-r--r-- | package/motion/Makefile | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/package/motion/Makefile b/package/motion/Makefile index 3b0671f99..5253297cd 100644 --- a/package/motion/Makefile +++ b/package/motion/Makefile @@ -6,18 +6,23 @@ include ${TOPDIR}/rules.mk PKG_NAME:= motion -PKG_VERSION:= 3.2.6 +PKG_VERSION:= 3.2.11 PKG_RELEASE:= 1 -PKG_MD5SUM:= 71e6bd13fcca70372e9b7c7806d62b30 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=motion/} +PKG_MD5SUM:= 3a26c00f3250eacf6fa93c7a7e0249d9 +PKG_DESCR:= Webcam motion sensing and logging +PKG_SECTION:= multimedia +PKG_DEPENDS:= libjpeg libpthread +PKG_URL:= http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=motion/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MOTION,motion,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,MOTION,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --without-ffmpeg \ --without-jpeg-mmx \ + --without-optimizecpu \ --without-mysql \ --without-pgsql BUILD_STYLE:= auto |