diff options
Diffstat (limited to 'chat')
| -rw-r--r-- | chat/farstream/Makefile | 9 | ||||
| -rw-r--r-- | chat/farstream/distinfo | 4 | ||||
| -rw-r--r-- | chat/farstream/patches/patch-common-modified_gst-glib-gen.mak | 27 | ||||
| -rw-r--r-- | chat/farstream/patches/patch-configure.ac | 22 |
4 files changed, 58 insertions, 4 deletions
diff --git a/chat/farstream/Makefile b/chat/farstream/Makefile index 002bacc6c9b..e9e9f96132b 100644 --- a/chat/farstream/Makefile +++ b/chat/farstream/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.26 2021/05/02 08:53:32 nia Exp $ +# $NetBSD: Makefile,v 1.27 2021/05/03 08:34:36 wiz Exp $ DISTNAME= farstream-0.2.9 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= chat multimedia MASTER_SITES= https://freedesktop.org/software/farstream/releases/farstream/ @@ -12,10 +12,13 @@ LICENSE= gnu-lgpl-v2.1 GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_TOOLS+= gmake pkg-config +USE_TOOLS+= gmake pkg-config autoconf automake autoreconf PKGCONFIG_OVERRIDE+= farstream.pc.in +pre-configure: + cd ${WRKSRC} && autoreconf -fiv + BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.0 .include "../../devel/glib2/buildlink3.mk" BUILDLINK_API_DEPENDS.gst-plugins1-base+= gst-plugins1-base>=1.4 diff --git a/chat/farstream/distinfo b/chat/farstream/distinfo index cf8d38dae85..6f01d26eafe 100644 --- a/chat/farstream/distinfo +++ b/chat/farstream/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.3 2020/03/15 19:47:55 wiz Exp $ +$NetBSD: distinfo,v 1.4 2021/05/03 08:34:36 wiz Exp $ SHA1 (farstream-0.2.9.tar.gz) = 21a3e8ebe5c450a157a543a4f4d1b217892a7ca0 RMD160 (farstream-0.2.9.tar.gz) = c19c9a130dafb205e16781169f3f13c4ee01a476 SHA512 (farstream-0.2.9.tar.gz) = 8840725d2f1de59bebc8c49cf68a6712822a4e7b6ba9078713f80e3c35a39135565a1a885edab43a562f895e11b8f5d8d666d57d9b3814dabb661f46498515bd Size (farstream-0.2.9.tar.gz) = 1334833 bytes +SHA1 (patch-common-modified_gst-glib-gen.mak) = c263dcc05f309be5d7495e286f842dd21acaa80a +SHA1 (patch-configure.ac) = 476db129a8a425e44cd0eacdaeacf4855996a518 diff --git a/chat/farstream/patches/patch-common-modified_gst-glib-gen.mak b/chat/farstream/patches/patch-common-modified_gst-glib-gen.mak new file mode 100644 index 00000000000..ccebd9f062d --- /dev/null +++ b/chat/farstream/patches/patch-common-modified_gst-glib-gen.mak @@ -0,0 +1,27 @@ +$NetBSD: patch-common-modified_gst-glib-gen.mak,v 1.1 2021/05/03 08:34:37 wiz Exp $ + +GNU Make 4.3 has a backwards incompatible change affecting the use of +number signs or hashes (ie., #) inside function invocations. See: +https://lists.gnu.org/archive/html/info-gnu/2020-01/msg00004.html + +In this case, it would expand the '\#' in the '\n\#include \"$(h)\"' +argument to the foreach call to '\#', not '#'. This would lead to +spurious backslashes in front of the '#include' directives in the +generated fs-enumtypes.c file. + +Spotted by Ernestas Kulik. + +https://gitlab.freedesktop.org/farstream/farstream/-/commit/54987d445ea714b467d901b7daf8c09ed0644189 + +--- common-modified/gst-glib-gen.mak.orig 2020-03-11 21:05:08.000000000 +0000 ++++ common-modified/gst-glib-gen.mak +@@ -6,7 +6,8 @@ + #glib_gen_prefix=gst_color_balance + #glib_gen_basename=colorbalance + +-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++hash:=\# ++enum_headers=$(foreach h,$(glib_enum_headers),\n$(hash)include \"$(h)\") + + # these are all the rules generating the relevant files + $(glib_gen_basename)-enumtypes.h: $(glib_enum_headers) diff --git a/chat/farstream/patches/patch-configure.ac b/chat/farstream/patches/patch-configure.ac new file mode 100644 index 00000000000..285fc76087a --- /dev/null +++ b/chat/farstream/patches/patch-configure.ac @@ -0,0 +1,22 @@ +$NetBSD: patch-configure.ac,v 1.1 2021/05/03 08:34:37 wiz Exp $ + +This fixes build failure for latest source with autoconf. Add the check +glib-mkenums and definition of GLIB_MKENUMS to configure.ac + +https://gitlab.freedesktop.org/farstream/farstream/-/commit/f047f4f6640146dda90cf9c87565fd61a3edeee8 + +--- configure.ac.orig 2020-03-11 23:26:39.000000000 +0000 ++++ configure.ac +@@ -264,6 +264,12 @@ FS_PREFIX="`$PKG_CONFIG --variable=prefi + AC_SUBST(GLIB_PREFIX) + AC_SUBST(FS_PREFIX) + ++dnl Check for glib-2.0 tools ++AC_MSG_CHECKING([for glib-mkenums]) ++GLIB_MKENUMS="`$PKG_CONFIG --variable=glib_mkenums glib-2.0`" ++AC_SUBST(GLIB_MKENUMS) ++AC_MSG_RESULT($GLIB_MKENUMS) ++ + dnl *** set variables based on configure arguments *** + + dnl set license and copyright notice |