From 0bc6b973254ce1603a36ef70aecb1cba68973ce1 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 6 Nov 2020 16:14:21 -0800 Subject: [PATCH 1/2] grilo-plugins: add all options These options are normally set to auto. Make them explicit to try to fix buildbot errors. Also make several options conditional on plugins being selected. Signed-off-by: Rosen Penev --- multimedia/grilo-plugins/Makefile | 33 ++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/multimedia/grilo-plugins/Makefile b/multimedia/grilo-plugins/Makefile index a15affe2c..b4a794839 100644 --- a/multimedia/grilo-plugins/Makefile +++ b/multimedia/grilo-plugins/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=grilo-plugins PKG_VERSION:=0.3.12 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=LGPLv2.1 @@ -45,21 +45,30 @@ define Package/grilo/decription endef MESON_ARGS += \ - -Denable-filesystem=no \ - -Denable-optical-media=no \ - -Denable-youtube=no \ - -Denable-flickr=no \ - -Denable-podcasts=no \ -Denable-bookmarks=no \ - -Denable-lua-factory=no \ - -Denable-metadata-store=no \ - -Denable-vimeo=no \ - -Denable-tracker=no \ - -Denable-local-metadata=no \ -Denable-chromaprint=no \ + -Denable-dleyna=$(if $(CONFIG_PACKAGE_grilo-plugins-dleyna),yes,no) \ + -Denable-dmap=$(if $(CONFIG_PACKAGE_grilo-plugins-dmap),yes,no) \ + -Denable-filesystem=no \ + -Denable-flickr=no \ + -Denable-freebox=no \ + -Denable_gravatar=$(if $(CONFIG_PACKAGE_grilo-plugins-gravatar),yes,no) \ + -Denable_jamendo=$(if $(CONFIG_PACKAGE_grilo-plugins-jamendo),yes,no) \ + -Denable-local-metadata=no \ + -Denable-lua-factory=no \ + -Denable-magnatune=$(if $(CONFIG_PACKAGE_grilo-plugins-magnatune),yes,no) \ + -Denable-metadata-store=no \ + -Denable_opensubtitles=$(if $(CONFIG_PACKAGE_grilo-plugins-opensubtitles),yes,no) \ + -Denable-optical-media=no \ + -Denable-podcasts=no \ + -Denable-raitv=$(if $(CONFIG_PACKAGE_grilo-plugins-raitv),yes,no) \ + -Denable-shoutcast=$(if $(CONFIG_PACKAGE_grilo-plugins-shoutcast),yes,no) \ -Denable-thetvdb=no \ -Denable-tmdb=no \ - -Denable-freebox=no \ + -Denable-tracker=no \ + -Denable-tracker3=no \ + -Denable-vimeo=no \ + -Denable-youtube=no \ --wrap-mode=nodownload define Package/grilo-plugins/install From c8c5690755afd5db1c4a21060d7b8e0059327c55 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 6 Nov 2020 18:40:20 -0800 Subject: [PATCH 2/2] grilo-plugins: add three plugins Dependencies are available now. Signed-off-by: Rosen Penev --- multimedia/grilo-plugins/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/multimedia/grilo-plugins/Makefile b/multimedia/grilo-plugins/Makefile index b4a794839..ebc8342f5 100644 --- a/multimedia/grilo-plugins/Makefile +++ b/multimedia/grilo-plugins/Makefile @@ -46,7 +46,7 @@ endef MESON_ARGS += \ -Denable-bookmarks=no \ - -Denable-chromaprint=no \ + -Denable-chromaprint=$(if $(CONFIG_PACKAGE_grilo-plugins-chromaprint),yes,no) \ -Denable-dleyna=$(if $(CONFIG_PACKAGE_grilo-plugins-dleyna),yes,no) \ -Denable-dmap=$(if $(CONFIG_PACKAGE_grilo-plugins-dmap),yes,no) \ -Denable-filesystem=no \ @@ -57,14 +57,14 @@ MESON_ARGS += \ -Denable-local-metadata=no \ -Denable-lua-factory=no \ -Denable-magnatune=$(if $(CONFIG_PACKAGE_grilo-plugins-magnatune),yes,no) \ - -Denable-metadata-store=no \ + -Denable-metadata-store=$(if $(CONFIG_PACKAGE_grilo-plugins-metadata-store),yes,no) \ -Denable_opensubtitles=$(if $(CONFIG_PACKAGE_grilo-plugins-opensubtitles),yes,no) \ -Denable-optical-media=no \ -Denable-podcasts=no \ -Denable-raitv=$(if $(CONFIG_PACKAGE_grilo-plugins-raitv),yes,no) \ -Denable-shoutcast=$(if $(CONFIG_PACKAGE_grilo-plugins-shoutcast),yes,no) \ -Denable-thetvdb=no \ - -Denable-tmdb=no \ + -Denable-tmdb=$(if $(CONFIG_PACKAGE_grilo-plugins-tmdb),yes,no) \ -Denable-tracker=no \ -Denable-tracker3=no \ -Denable-vimeo=no \ @@ -97,11 +97,14 @@ endef $(eval $(call BuildPackage,grilo-plugins)) +$(eval $(call BuildPlugin,chromaprint,Chromaprint,chromaprint,+libgstreamer1,30)) $(eval $(call BuildPlugin,dleyna,DLNA sharing,dleyna,,30)) $(eval $(call BuildPlugin,dmap,DAAP and DPAP sharing,daap dpap,libdmapsharing,30)) $(eval $(call BuildPlugin,gravatar,Gravatar provider,gravatar,,30)) $(eval $(call BuildPlugin,jamendo,Jamendo sharing,jamendo,,30)) $(eval $(call BuildPlugin,magnatune,Magnatune sharing,magnatune,,30)) +$(eval $(call BuildPlugin,metadata-store,Metadata Store,metadatastore,,30)) $(eval $(call BuildPlugin,opensubtitles,Open subtitles provider,opensubtitles,,30)) $(eval $(call BuildPlugin,raitv,Rai.tv sharing,raitv,,30)) $(eval $(call BuildPlugin,shoutcast,SHOUTcast sharing,shoutcast,,30)) +$(eval $(call BuildPlugin,tmdb,TMDb,tmdb,+json-glib,30))