From 64e26e3516b9b52e9507da9ffad5c5d44c476b4d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 3 May 2016 08:49:31 +0200 Subject: add jack1 package mainly from oliver --- package/alsa-plugins/Makefile | 11 ++++++---- package/jack/Makefile | 38 +++++++++++++++++++++++++++++++++ package/jack/patches/patch-configure_ac | 24 +++++++++++++++++++++ package/jack2/Makefile | 2 +- package/mpd/Makefile | 17 ++++++++++++--- 5 files changed, 84 insertions(+), 8 deletions(-) create mode 100644 package/jack/Makefile create mode 100644 package/jack/patches/patch-configure_ac diff --git a/package/alsa-plugins/Makefile b/package/alsa-plugins/Makefile index b6391d58b..2e784403e 100644 --- a/package/alsa-plugins/Makefile +++ b/package/alsa-plugins/Makefile @@ -16,16 +16,19 @@ PKG_SITES:= ftp://ftp.alsa-project.org/pub/plugins/ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_FLAVOURS_ALSA_PLUGINS:= WITH_JACK +PKG_FLAVOURS_ALSA_PLUGINS:= WITH_JACK WITH_JACK2 PKGFD_WITH_JACK:= enable jack support -PKGFS_WITH_JACK:= jack2 -PKGFB_WITH_JACK:= jack2 +PKGFS_WITH_JACK:= jack +PKGFB_WITH_JACK:= jack +PKGFD_WITH_JACK2:= enable jack2 support +PKGFS_WITH_JACK2:= jack2 +PKGFB_WITH_JACK2:= jack2 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},) +ifneq (${ADK_PACKAGE_ALSA_PLUGINS_WITH_JACK}${ADK_PACKAGE_ALSA_PLUGINS_WITH_JACK2},) CONFIGURE_ARGS+= --enable-jack else CONFIGURE_ARGS+= --disable-jack diff --git a/package/jack/Makefile b/package/jack/Makefile new file mode 100644 index 000000000..a47c286b7 --- /dev/null +++ b/package/jack/Makefile @@ -0,0 +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 $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= jack +PKG_VERSION:= 5013bed0b834d0af1ce36077e2b49ed95934fe99 +PKG_RELEASE:= 1 +PKG_DESCR:= audio connection kit (v1) +PKG_SECTION:= mm/audio +PKG_DEPENDS:= alsa-lib libsndfile libsamplerate libdb +PKG_BUILDDEP:= db python2-host alsa-lib libsndfile libsamplerate +PKG_NEEDS:= threads rt c++ +PKG_URL:= http://jackaudio.org +PKG_SITES:= git://github.com/jackaudio/jack1.git + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,JACK,jack,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +XAKE_FLAGS+= GCC_HONOUR_COPTS=s +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/patches/patch-configure_ac b/package/jack/patches/patch-configure_ac new file mode 100644 index 000000000..7dc4823d8 --- /dev/null +++ b/package/jack/patches/patch-configure_ac @@ -0,0 +1,24 @@ +--- jack-5013bed0b834d0af1ce36077e2b49ed95934fe99.orig/configure.ac 2016-05-02 23:06:52.000000000 +0200 ++++ jack-5013bed0b834d0af1ce36077e2b49ed95934fe99/configure.ac 2016-05-02 23:20:22.128238520 +0200 +@@ -190,21 +190,7 @@ esac + + AC_SUBST(OS_LDFLAGS) + +-# +-# We need to establish suitable defaults for a 64-bit OS + libnn=lib +-case "${host_os}" in +- linux*) +- case "${host_cpu}" in +- x86_64|mips64|ppc64|sparc64|s390x) +- libnn=lib64 +- ;; +- esac +- ;; +- solaris*) +- ## libnn=lib/sparcv9 ## on 64-bit only, but that's compiler-specific +- ;; +-esac + + ## take care not to override the command-line setting + if test "${libdir}" = '${exec_prefix}/lib'; then diff --git a/package/jack2/Makefile b/package/jack2/Makefile index 2394a08bf..ecb5304d2 100644 --- a/package/jack2/Makefile +++ b/package/jack2/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= jack2 PKG_VERSION:= 7bdad4966b29f721c384bdfe6921a1e5c1d84561 PKG_RELEASE:= 1 PKG_GIT:= hash -PKG_DESCR:= audio connection kit +PKG_DESCR:= audio connection kit (v2) PKG_SECTION:= mm/audio PKG_DEPENDS:= alsa-lib libsndfile libsamplerate PKG_BUILDDEP:= python2-host alsa-lib libsndfile libsamplerate diff --git a/package/mpd/Makefile b/package/mpd/Makefile index 51218c5a2..9695140e3 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -19,7 +19,7 @@ PKG_SITES:= http://www.musicpd.org/download/mpd/0.19/ PKG_FLAVOURS_MPD:= WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR PKG_FLAVOURS_MPD+= WITH_OGG WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG PKG_FLAVOURS_MPD+= WITH_SHOUT WITH_CURL WITH_SAMPLERATE WITH_HTTPD -PKG_FLAVOURS_MPD+= WITH_SNDFILE WITH_OPUS WITH_PULSE WITH_AVAHI +PKG_FLAVOURS_MPD+= WITH_SNDFILE WITH_OPUS WITH_PULSE WITH_AVAHI WITH_JACK PKGFD_WITH_ALSA:= enable ALSA output PKGFS_WITH_ALSA:= alsa-lib @@ -33,6 +33,12 @@ PKGFB_WITH_AO:= libao ifeq ($(ADK_PACKAGE_MPD_WITH_AO),y) PKG_FDEPENDS+= libao endif +PKGFD_WITH_JACK:= enable JACK support +PKGFS_WITH_AO:= jack +PKGFB_WITH_AO:= jack +ifeq ($(ADK_PACKAGE_MPD_WITH_JACK),y) +PKG_FDEPENDS+= jack +endif PKGFD_WITH_MP3:= enable MP3 support PKGFS_WITH_MP3:= libid3tag libmad PKGFB_WITH_MP3:= libid3tag libmad @@ -138,8 +144,7 @@ $(eval $(call PKG_template,MPD,mpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_FDEPENDS} TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE TARGET_CFLAGS+= -std=gnu99 CONFIGURE_ENV+= ac_cv_lib_nsl_gethostbyname=no -CONFIGURE_ARGS+= --disable-jack \ - --disable-fifo \ +CONFIGURE_ARGS+= --disable-fifo \ --disable-oss \ --disable-icu \ --disable-bzip2 \ @@ -154,6 +159,12 @@ CONFIGURE_ARGS+= --disable-jack \ --enable-inotify \ --enable-pipe-output +ifneq (${ADK_PACKAGE_MPD_WITH_JACK},) +CONFIGURE_ARGS+= --enable-jack +else +CONFIGURE_ARGS+= --disable-jack +endif + ifneq (${ADK_PACKAGE_MPD_WITH_SNDFILE},) CONFIGURE_ARGS+= --enable-sndfile else -- cgit v1.2.3