jack: remove package

6 files changed, 7 insertions, 83 deletions

diff --git a/package/alsa-plugins/Makefile b/package/alsa-plugins/Makefile
index 2e784403e..6a49b6e3d 100644
--- a/package/alsa-plugins/Makefile
+++ b/package/alsa-plugins/Makefile
@@ -16,10 +16,7 @@ PKG_SITES:=		ftp://ftp.alsa-project.org/pub/plugins/
 
 DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
-PKG_FLAVOURS_ALSA_PLUGINS:=	WITH_JACK WITH_JACK2
-PKGFD_WITH_JACK:=	enable jack support
-PKGFS_WITH_JACK:=	jack
-PKGFB_WITH_JACK:=	jack
+PKG_FLAVOURS_ALSA_PLUGINS:=	WITH_JACK2
 PKGFD_WITH_JACK2:=	enable jack2 support
 PKGFS_WITH_JACK2:=	jack2
 PKGFB_WITH_JACK2:=	jack2
@@ -28,7 +25,7 @@ include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,ALSA_PLUGINS,alsa-plugins,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
-ifneq (${ADK_PACKAGE_ALSA_PLUGINS_WITH_JACK}${ADK_PACKAGE_ALSA_PLUGINS_WITH_JACK2},)
+ifneq (${ADK_PACKAGE_ALSA_PLUGINS_WITH_JACK2},)
 CONFIGURE_ARGS+=	--enable-jack
 else
 CONFIGURE_ARGS+=	--disable-jack
diff --git a/package/brutefir/Makefile b/package/brutefir/Makefile
index 8fd9044aa..0a0cb80e1 100644
--- a/package/brutefir/Makefile
+++ b/package/brutefir/Makefile
@@ -16,11 +16,8 @@ PKG_SITES:=		https://www.ludd.ltu.se/~torger/files/
 
 DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.gz
 
-PKG_CHOICES_BRUTEFIR:=	WITH_JACK WITH_JACK2
-PKGCD_WITH_JACK:=	use jack (v1)
-PKGCB_WITH_JACK:=	jack
-PKGCS_WITH_JACK:=	jack
-PKGCD_WITH_JACK2:=	use jack (v2)
+PKG_CHOICES_BRUTEFIR:=	WITH_JACK2
+PKGCD_WITH_JACK2:=	use jack
 PKGCB_WITH_JACK2:=	jack2
 PKGCS_WITH_JACK2:=	jack2
 
diff --git a/package/jack/Makefile b/package/jack/Makefile
deleted file mode 100644
index 1104b7797..000000000
--- a/package/jack/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:=		jack
-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:=		https://github.com/jackaudio/jack1.git
-PKG_OPT:=		dev
-
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,JACK,jack,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
-
-AUTOTOOL_STYLE:=	autogen
-
-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
-	$(CP) $(WRKINST)/usr/bin/jack* \
-		$(IDIR_JACK)/usr/bin
-	$(CP) $(WRKINST)/usr/lib*/libjack*.so* \
-		$(IDIR_JACK)/usr/lib
-	$(CP) $(WRKINST)/usr/lib*/jack/*.so* \
-		$(IDIR_JACK)/usr/lib/jack
-
-include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/jack/files/jack.init b/package/jack/files/jack.init
deleted file mode 100644
index 53a81ac07..000000000
--- a/package/jack/files/jack.init
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/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
deleted file mode 100644
index c28d4a148..000000000
--- a/package/jack/files/jack.postinst
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf jack NO
-add_rcconf jack_flags '-R -P70 -dalsa -r44100 -dhw:0 -p1024'
diff --git a/package/shairport-sync/Makefile b/package/shairport-sync/Makefile
index 75c6801f8..4d3677fd0 100644
--- a/package/shairport-sync/Makefile
+++ b/package/shairport-sync/Makefile
@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_GIT:=		tag
 PKG_DESCR:=		airplay daemon	
 PKG_SECTION:=		mm/audio	
-PKG_DEPENDS:=		libressl libpopt libdaemon libconfig jack mosquitto libavahi
-PKG_BUILDDEP:=		libressl popt libdaemon libconfig jack mosquitto avahi
+PKG_DEPENDS:=		libopenssl libpopt libdaemon libconfig mosquitto libavahi
+PKG_BUILDDEP:=		openssl popt libdaemon libconfig mosquitto avahi
 PKG_URL:=		https://github.com/mikebrady/shairport-sync
 PKG_SITES:=		https://github.com/mikebrady/shairport-sync.git
 
@@ -22,11 +22,11 @@ AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ARGS+=	--with-pkg-config \
   			--without-systemv \
   			--without-systemd \
+  			--without-jack \
 			--with-libdaemon \
   			--with-avahi \
  			--disable-tinysvcmdns \
   			--with-alsa \
-  			--with-jack \
   			--with-mqtt-client \
 			-with-ssl=openssl