3 files changed, 54 insertions, 31 deletions
diff --git a/package/jack/Makefile b/package/jack/Makefile
index ece6930b2..1104b7797 100644
--- a/package/jack/Makefile
+++ b/package/jack/Makefile
@@ -1,47 +1,38 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-include $(TOPDIR)/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		jack
-PKG_VERSION:=		1.9.7
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		9759670feecbd43eeccf1c0f743ec199
-PKG_DESCR:=		JACK Audio Connection Kit
-PKG_SECTION:=		multimedia
-PKG_DEPENDS:=		alsa-lib
-PKG_BUILDDEP:=		python2 alsa-lib
+PKG_VERSION:=		5013bed0b834d0af1ce36077e2b49ed95934fe99
+PKG_RELEASE:=		2
+PKG_DESCR:=		audio connection kit (v1)
+PKG_SECTION:=		mm/audio
+PKG_DEPENDS:=		alsa-lib libsndfile libsamplerate libdb
+PKG_BUILDDEP:=		db python3-host alsa-lib libsndfile libsamplerate
+PKG_NEEDS:=		threads c++
 PKG_URL:=		http://jackaudio.org
-PKG_SITES:=		http://www.grame.fr/~letz/
+PKG_SITES:=		https://github.com/jackaudio/jack1.git
+PKG_OPT:=		dev
 
-PKG_ARCH_DEPENDS:=	!cris
-PKG_HOST_DEPENDS:=	!darwin
+include $(ADK_TOPDIR)/mk/package.mk
 
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+$(eval $(call PKG_template,JACK,jack,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
-include $(TOPDIR)/mk/package.mk
+AUTOTOOL_STYLE:=	autogen
 
-$(eval $(call PKG_template,JACK,jack,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:=		manual
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-do-configure:
-	$(WRKSRC)/waf configure --alsa  --prefix=$(WRKINST)/usr
-
-do-build:
-	cd $(WRKSRC) && $(WRKSRC)/waf build
-
-do-install:
-	cd $(WRKSRC) && $(WRKSRC)/waf install
+post-extract:
+	(cd $(WRKBUILD); git submodule init)
+	(cd $(WRKBUILD); git submodule update)
 
 jack-install:
+	$(INSTALL_DIR) $(IDIR_JACK)/usr/lib/jack
 	$(INSTALL_DIR) $(IDIR_JACK)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/jack* \
+	$(CP) $(WRKINST)/usr/bin/jack* \
 		$(IDIR_JACK)/usr/bin
-	$(INSTALL_DIR) $(IDIR_JACK)/usr/lib
-	$(INSTALL_BIN) $(WRKINST)/usr/lib/lib* \
+	$(CP) $(WRKINST)/usr/lib*/libjack*.so* \
 		$(IDIR_JACK)/usr/lib
+	$(CP) $(WRKINST)/usr/lib*/jack/*.so* \
+		$(IDIR_JACK)/usr/lib/jack
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/jack/files/jack.init b/package/jack/files/jack.init
new file mode 100644
index 000000000..53a81ac07
--- /dev/null
+++ b/package/jack/files/jack.init
@@ -0,0 +1,28 @@
+#!/bin/sh
+#PKG jack
+#INIT 78
+. /etc/rc.conf
+
+case $1 in
+autostop) ;;
+autostart)
+	test x"${jack:-NO}" = x"NO" && exit 0
+	test x"$jack" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start
+	exec sh $0 start
+	;;
+start)
+	(/usr/bin/jackd $jack_flags &) && sleep 0.1
+	;;
+stop)
+	kill $(pgrep -f /usr/bin/jackd ) && sleep 0.1
+	;;
+restart)
+	sh $0 stop
+	sh $0 start
+	;;
+*)
+	echo "Usage: $0 {start | stop | restart}"
+	exit 1
+	;;
+esac
+exit $?
diff --git a/package/jack/files/jack.postinst b/package/jack/files/jack.postinst
new file mode 100644
index 000000000..c28d4a148
--- /dev/null
+++ b/package/jack/files/jack.postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf jack NO
+add_rcconf jack_flags '-R -P70 -dalsa -r44100 -dhw:0 -p1024'