From 2e8b7358c4c336a5a5845351db642e8f45aa61d2 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Sat, 8 Dec 2018 00:28:36 -0200 Subject: [PATCH 1/3] lcdgrilo: remove check dependency Signed-off-by: Eneas U de Queiroz --- multimedia/lcdgrilo/Makefile | 3 ++- .../lcdgrilo/patches/010-remove-check-dependency.patch | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 multimedia/lcdgrilo/patches/010-remove-check-dependency.patch diff --git a/multimedia/lcdgrilo/Makefile b/multimedia/lcdgrilo/Makefile index a642365991..7e61560846 100644 --- a/multimedia/lcdgrilo/Makefile +++ b/multimedia/lcdgrilo/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lcdgrilo PKG_VERSION:=0.0.12 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=W. Michael Petullo @@ -22,6 +22,7 @@ PKG_HASH:=2e5028fff7a90b1a3688c466f048e978a52d9a4da20a382546d5e5bd42e2fc6a PKG_BUILD_DEPENDS:=vala PKG_INSTALL:=1 +PKG_FIXUP:=autoreconf include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk diff --git a/multimedia/lcdgrilo/patches/010-remove-check-dependency.patch b/multimedia/lcdgrilo/patches/010-remove-check-dependency.patch new file mode 100644 index 0000000000..cd69e2251c --- /dev/null +++ b/multimedia/lcdgrilo/patches/010-remove-check-dependency.patch @@ -0,0 +1,10 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -85,7 +85,6 @@ AM_CONDITIONAL(USE_GSTREAMER, test x"$HA + AC_SUBST(GSTREAMER_CFLAGS) + AC_SUBST(GSTREAMER_LIBS) + +-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4],have_check=yes,have_check=no) + AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes") + + AM_PROG_VALAC([0.11.4]) From fb4b5c57015bcae10c1ba11aa575ba6ec93dbf4f Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Thu, 13 Dec 2018 15:27:36 -0200 Subject: [PATCH 2/3] libgee: copy vapi files to versioned vala dir The version is obtained via `valac --api-version` Signed-off-by: Eneas U de Queiroz --- libs/libgee/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libgee/Makefile b/libs/libgee/Makefile index f6b269f530..ce0a30b8c3 100644 --- a/libs/libgee/Makefile +++ b/libs/libgee/Makefile @@ -54,10 +54,10 @@ define Build/InstallDev $(INSTALL_DATA) \ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \ $(1)/usr/lib/pkgconfig/ - $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/share/vala/vapi/ + $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/share/vala-`$(STAGING_DIR_HOSTPKG)/bin/valac --api-version`/vapi/ $(INSTALL_DATA) \ $(PKG_INSTALL_DIR)/usr/share/vala/vapi/* \ - $(STAGING_DIR_HOSTPKG)/share/vala/vapi + $(STAGING_DIR_HOSTPKG)/share/vala-`$(STAGING_DIR_HOSTPKG)/bin/valac --api-version`/vapi endef define Package/libgee/install From 8d0c849e561bd5a984ccd2e99c67a7f9c4ed68f1 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Thu, 13 Dec 2018 15:31:12 -0200 Subject: [PATCH 3/3] grilo: copy vapi files to versioned vala dir The version is obtained via `valac --api-version` Signed-off-by: Eneas U de Queiroz --- multimedia/grilo/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/multimedia/grilo/Makefile b/multimedia/grilo/Makefile index 4e257db2dd..49887c034f 100644 --- a/multimedia/grilo/Makefile +++ b/multimedia/grilo/Makefile @@ -20,6 +20,7 @@ PKG_HASH:=1e65ca82dd58020451417fde79310d4b940adc3f63ab59997419c52ed3bc9c91 PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=vala/host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk @@ -58,13 +59,13 @@ define Build/InstallDev $(INSTALL_DATA) \ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \ $(1)/usr/lib/pkgconfig/ - $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/share/vala/vapi/ + $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/share/vala-`$(STAGING_DIR_HOSTPKG)/bin/valac --api-version`/vapi/ # Note: this are compiled elsewhere because grilo refuses to # generate VAPI files unless gobject-introspection exists; # OpenWrt does not yet have a gobject-introspection package. $(INSTALL_DATA) \ ./files/*.vapi \ - $(STAGING_DIR_HOSTPKG)/share/vala/vapi + $(STAGING_DIR_HOSTPKG)/share/vala-`$(STAGING_DIR_HOSTPKG)/bin/valac --api-version`/vapi endef define Package/grilo/install