owntone: Add new owntone package variant: owntone-pulseaudio

Author: davidandreoletti

sound/owntone/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=owntone
 PKG_VERSION:=28.8
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/owntone/owntone-server/releases/download/$(PKG_VERSION)/
@@ -26,39 +26,76 @@ PKG_LICENSE_FILES:=COPYING
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
 
+define Package/owntone/default
+  SECTION:=sound
+  CATEGORY:=Sound
+  TITLE:=iTunes (DAAP) server for Apple Remote and AirPlay
+  URL:=https://github.com/owntone/owntone-server
+  DEPENDS:=+libgpg-error +libgcrypt +libgdbm +zlib +libexpat +libunistring \
+  	+libevent2 +libevent2-pthreads +libdaemon +confuse +alsa-lib +libffmpeg-full \
+  	+mxml +libavahi-client +sqlite3-cli +libplist +libcurl +libjson-c \
+  	+libprotobuf-c +libgnutls +libsodium +libwebsockets +libuuid $(ICONV_DEPENDS)
+endef
+
 define Package/owntone
-SECTION:=sound
-CATEGORY:=Sound
-TITLE:=iTunes (DAAP) server for Apple Remote and AirPlay
-URL:=https://github.com/owntone/owntone-server
-DEPENDS:=+libgpg-error +libgcrypt +libgdbm +zlib +libexpat +libunistring \
-	+libevent2 +libevent2-pthreads +libdaemon +confuse +alsa-lib +libffmpeg-full \
-	+mxml +libavahi-client +sqlite3-cli +libplist +libcurl +libjson-c \
-	+libprotobuf-c +libgnutls +libsodium +libwebsockets +libuuid $(ICONV_DEPENDS)
+  $(Package/owntone/default)
+  TITLE+= (full)
+  # FIXME: Goal: retain full compatibility with existing owntone package. Should "full" be used here ?
+  VARIANT:=full
+  DEFAULT_VARIANT:=1
+  CONFLICTS:=owntone-pulseaudio
+endef
+
+define Package/owntone-pulseaudio
+  $(Package/owntone/default)
+  TITLE+= (with pulseaudio support)
+  DEPENDS+= +pulseaudio-daemon
+  VARIANT:=pulseaudio
 endef
 
-define Package/owntone/description
+define Package/owntone/default/description
   OwnTone is a Linux/FreeBSD DAAP (iTunes), MPD (Music Player Daemon) and
   RSP (Roku) media server. It has support for AirPlay speakers, Chromecast,
   Apple Remote (and compatibles), MPD clients, Spotify, internet radio and
   LastFM. It does not support AirPlay/Chromecast video.
 endef
+Package/owntone/description = $(Package/owntone/default/description)
+Package/owntone-pulseaudio/description = $(Package/owntone/default/description)
 
-define Package/owntone/conffiles
+define Package/owntone/default/conffiles
 /etc/owntone.conf
 endef
+Package/owntone/conffiles = $(Package/owntone/default/conffiles)
+Package/owntone-pulseaudio/conffiles = $(Package/owntone/default/conffiles)
 
 CONFIGURE_ARGS += \
 	--enable-chromecast \
 	--disable-install_systemd \
 	--disable-install_conf_file \
 	--disable-install_user \
-	--with-alsa \
-	--without-pulseaudio
+	--with-alsa
+
+ifeq ($(BUILD_VARIANT),pulseaudio)
+  # FIXME: Undoing https://github.com/openwrt/packages/commit/7a90d1836c96d2bd9322bfaf3689fb19983604bc because a "pulseaudio" dependency was missing on OpenWRT.
+  #        Problem: Which "pulseaudio" dependency to add to fix this error ?
+  #
+  #        checking for pa_stream_get_state... no
+  #        configure: error: Unable to link function pa_stream_get_state
+  #        make[2]: *** [Makefile:104: /tmp/openwrt_packages/openwrt-sdk-Linux-x86_64/build_dir/target-aarch64_generic_musl/owntone-pulseaudio/owntone-28.8/.configured_a17fb5ef857664f03cd0ce37cc5ea591] Error 1
+  #        make[2]: Leaving directory '/mnt/share_openwrt/packages.git/sound/owntone'
+  #        time: package/feeds/packages/owntone/pulseaudio/compile#33.12#7.55#41.62
+  #            ERROR: package/feeds/packages/owntone failed to build (build variant: pulseaudio).
+  #        make[1]: *** [package/Makefile:131: package/feeds/packages/owntone/compile] Error 1
+
+  #           
+  CONFIGURE_ARGS+= --with-pulseaudio
+else
+  CONFIGURE_ARGS+= --without-pulseaudio
+endif
 
 TARGET_CFLAGS += $(FPIC)
 
-define Package/owntone/install
+define Package/owntone/default/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/owntone $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/etc
@@ -70,5 +107,8 @@ define Package/owntone/install
 	$(INSTALL_DIR) $(1)/usr/share/owntone
 	$(CP) $(PKG_INSTALL_DIR)/usr/share/owntone/htdocs $(1)/usr/share/owntone
 endef
+Package/owntone/install = $(Package/owntone/default/install)
+Package/owntone-pulseaudio/install = $(Package/owntone/default/install)
 
 $(eval $(call BuildPackage,owntone))
+$(eval $(call BuildPackage,owntone-pulseaudio))