manually specify vapidirs in staging_dir correct libgupnp-vala package name in depends
Signed-off-by: Andy Leiserson <a...@leiserson.org> --- For prior discussion, see http://patchwork.openwrt.org/patch/2524/, this eliminates the need for that patch. I am having problems with audio output using the latest trunk, which I'm still looking into. But this patch only changes the build, and I think should make rygel work when built for AA and possibly even for trunk in environments different from mine. multimedia/rygel/Makefile | 2 +- .../patches/010-vapidirs-from-pkg-config.patch | 28 -------------------- multimedia/rygel/patches/010-vapidirs.patch | 12 +++++++++ 3 files changed, 13 insertions(+), 29 deletions(-) delete mode 100644 multimedia/rygel/patches/010-vapidirs-from-pkg-config.patch create mode 100644 multimedia/rygel/patches/010-vapidirs.patch diff --git a/multimedia/rygel/Makefile b/multimedia/rygel/Makefile index ce9c4e7..93e12d0 100644 --- a/multimedia/rygel/Makefile +++ b/multimedia/rygel/Makefile @@ -16,7 +16,7 @@ PKG_SOURCE_URL:=@GNOME/rygel/0.14/ PKG_SHA256SUM:=c4f79fb30bc1a062a2ffdadc7a55dd91fa58240302f152fb070d8c674bdddd67 PKG_FIXUP:=autoreconf -PKG_BUILD_DEPENDS:=vala/host intltool/host vala gupnp-vala +PKG_BUILD_DEPENDS:=vala/host intltool/host vala libgupnp-vala include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk diff --git a/multimedia/rygel/patches/010-vapidirs-from-pkg-config.patch b/multimedia/rygel/patches/010-vapidirs-from-pkg-config.patch deleted file mode 100644 index 70023c5..0000000 --- a/multimedia/rygel/patches/010-vapidirs-from-pkg-config.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/m4/rygel.m4 2012-04-12 08:47:08.000000000 -0700 -+++ b/m4/rygel.m4 2012-06-15 11:55:36.000000000 -0700 -@@ -99,6 +99,25 @@ - [dnl check for vala - AM_PROG_VALAC([$1]) - -+ dnl See where we should look for vapi files. If it's under -+ dnl $datadir, then assume it's one of the standard locations where -+ dnl vala will look. Otherwise, specify explicitly. -+ dnl -+ dnl Note the distinction between these directories (where we look -+ dnl for APIs when we do vala builds) and VAPIDIR, which is where we -+ dnl install our own vapi files. -+ -+ for var in vapidir vapidir_versioned; do -+ AS_IF([dir=`$PKG_CONFIG --variable=$var vapigen`], -+ [ -+ AC_MSG_NOTICE([got $var=$dir from pkg-config]) -+ AS_IF([expr "$dir" : "${datadir}"], -+ [], -+ [RYGEL_ADD_VALAFLAGS([--vapidir $dir])]) -+ ], -+ [AC_MSG_NOTICE([pkg-config didn't return a value for $var, relying on valac built-in defaults])]) -+ done -+ - AS_IF([test x$VALAC = "x"], - [AC_MSG_ERROR([Cannot find the "valac" compiler in your PATH])], - [ diff --git a/multimedia/rygel/patches/010-vapidirs.patch b/multimedia/rygel/patches/010-vapidirs.patch new file mode 100644 index 0000000..6a4b353 --- /dev/null +++ b/multimedia/rygel/patches/010-vapidirs.patch @@ -0,0 +1,12 @@ +--- a/m4/rygel.m4 2012-04-12 08:47:08.000000000 -0700 ++++ b/m4/rygel.m4 2012-12-17 22:59:38.000000000 -0800 +@@ -99,6 +99,9 @@ + [dnl check for vala + AM_PROG_VALAC([$1]) + ++ RYGEL_ADD_VALAFLAGS([--vapidir $STAGING_DIR/usr/share/vala/vapi]) ++ RYGEL_ADD_VALAFLAGS([--vapidir $STAGING_DIR/usr/share/vala-0.16/vapi]) ++ + AS_IF([test x$VALAC = "x"], + [AC_MSG_ERROR([Cannot find the "valac" compiler in your PATH])], + [ -- 1.7.10.4 _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
