From 8715a23f331805b749419e60831ef9df67a19da1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 27 Jan 2020 14:53:08 +0100 Subject: [PATCH] farstream: fix build The generator gst-glib-gen.mak output emitted backslashes before the hash (#) for #include lines. Regenerate autotools to fix that. --- srcpkgs/farstream/patches/fix-gst-glib-gen_mak.patch | 11 +++++++++++ srcpkgs/farstream/template | 9 +++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/farstream/patches/fix-gst-glib-gen_mak.patch diff --git a/srcpkgs/farstream/patches/fix-gst-glib-gen_mak.patch b/srcpkgs/farstream/patches/fix-gst-glib-gen_mak.patch new file mode 100644 index 00000000000..c928b013621 --- /dev/null +++ b/srcpkgs/farstream/patches/fix-gst-glib-gen_mak.patch @@ -0,0 +1,11 @@ +--- common-modified/gst-glib-gen.mak 2014-09-03 04:47:25.000000000 +0200 ++++ common-modified/gst-glib-gen.mak 2020-01-27 14:47:28.704958877 +0100 +@@ -6,7 +6,7 @@ + #glib_gen_prefix=gst_color_balance + #glib_gen_basename=colorbalance + +-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers=$(foreach h,$(glib_enum_headers),\n#include \"$(h)\") + + # these are all the rules generating the relevant files + $(glib_gen_basename)-enumtypes.h: $(glib_enum_headers) diff --git a/srcpkgs/farstream/template b/srcpkgs/farstream/template index bed15263f6e..90002e1227a 100644 --- a/srcpkgs/farstream/template +++ b/srcpkgs/farstream/template @@ -1,11 +1,12 @@ # Template file for 'farstream' pkgname=farstream version=0.2.8 -revision=3 +revision=4 build_style=gnu-configure build_helper="gir" configure_args="--disable-valgrind --disable-static $(vopt_enable gir introspection)" -hostmakedepends="pkg-config intltool python-devel glib-devel $(vopt_if gir gobject-introspection)" +hostmakedepends="automake libtool gettext pkg-config intltool python-devel + glib-devel $(vopt_if gir gobject-introspection)" makedepends="python-devel gupnp-igd-devel libnice-devel gst-plugins-base1-devel" depends="gst-plugins-good1 gst-plugins-bad1" short_desc="GStreamer modules and libraries for videoconferencing" @@ -18,6 +19,10 @@ checksum=2b3b9c6b4f64ace8c83e03d1da5c5a2884c1cae10b35471072b574201ab38908 build_options="gir" build_options_default="gir" +pre_configure() { + NOCONFIGURE=1 autoreconf -fi +} + farstream-devel_package() { depends="gst-plugins-base1-devel farstream-${version}_${revision}" short_desc+=" - development files"