diff options
author | wiz <wiz@pkgsrc.org> | 2021-05-06 08:15:59 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2021-05-06 08:15:59 +0000 |
commit | 9ec0578813379ca1c0ea0afee468dca1936ba5de (patch) | |
tree | 4cad94794fc43591e176e53cd4165591678320f6 /multimedia | |
parent | 6d718adbcb967b43eed000dc506b25b38c687cb3 (diff) | |
download | pkgsrc-9ec0578813379ca1c0ea0afee468dca1936ba5de.tar.gz |
gst-plugins0.10-base: fix build with gmake 4.3
Based on patches for chat/farstream.
Diffstat (limited to 'multimedia')
4 files changed, 65 insertions, 3 deletions
diff --git a/multimedia/gst-plugins0.10-base/Makefile b/multimedia/gst-plugins0.10-base/Makefile index 24e46050146..6c2c010817a 100644 --- a/multimedia/gst-plugins0.10-base/Makefile +++ b/multimedia/gst-plugins0.10-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2021/04/21 11:40:31 adam Exp $ +# $NetBSD: Makefile,v 1.42 2021/05/06 08:15:59 wiz Exp $ # .include "Makefile.common" @@ -11,7 +11,9 @@ COMMENT+= Base plugins # some plugins were moved from bad to base CONFLICTS+= gst-plugins0.10-bad<0.10.10 -USE_TOOLS+= perl:run +USE_TOOLS+= perl:run autoconf automake gmake +TOOL_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc + MAKE_JOBS_SAFE= no PKGCONFIG_OVERRIDE+= pkgconfig/*.pc.in REPLACE_PERL+= tools/gst-visualise-m.m @@ -36,4 +38,13 @@ PLIST.introspection= yes CONFIGURE_ARGS+= --disable-introspection .endif +pre-configure: + cd ${WRKSRC} && autoreconf -fiv + +# XXX: hack +# autoreconf some breaks the file names of the .mo files +# manually fix this here instead of debugging generated Makefiles +post-install: + find ${DESTDIR}${PREFIX}/share/locale -name .mo -execdir mv .mo gst-plugins-base-0.10.mo \; + .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/gst-plugins0.10-base/distinfo b/multimedia/gst-plugins0.10-base/distinfo index a63af74c285..993852b2d6e 100644 --- a/multimedia/gst-plugins0.10-base/distinfo +++ b/multimedia/gst-plugins0.10-base/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.37 2015/11/03 23:54:25 agc Exp $ +$NetBSD: distinfo,v 1.38 2021/05/06 08:15:59 wiz Exp $ SHA1 (gst-plugins-base-0.10.36.tar.bz2) = e675401b62a6bf2e5ea966e833afd005a585e978 RMD160 (gst-plugins-base-0.10.36.tar.bz2) = b601372b3a1c04de63f69ba350c5010c99dbc6ae @@ -6,5 +6,7 @@ SHA512 (gst-plugins-base-0.10.36.tar.bz2) = 881845d3e3cca18028904ac724d529aa3e12 Size (gst-plugins-base-0.10.36.tar.bz2) = 3036143 bytes SHA1 (patch-ab) = 17a44f9b50d4acf9b0effd80911698a2f9813e4d SHA1 (patch-ac) = a8a56dc16f3cc908d93aaed810fc5a9c6a875cc2 +SHA1 (patch-common_gst-glib-gen.mak) = 1dc21face8fe3cfb5242f9a21532a008ac0bf571 +SHA1 (patch-configure.ac) = e104b84f2f3c51dafee57c40b5b903de0fc37578 SHA1 (patch-gst-libs_gst_video_video.h) = ba07c80ab91a0086234073c3fcbf28315502449b SHA1 (patch-gst_audioresample_resample.c) = 77a88286c74df80f5f724c922a5ecec0341d4788 diff --git a/multimedia/gst-plugins0.10-base/patches/patch-common_gst-glib-gen.mak b/multimedia/gst-plugins0.10-base/patches/patch-common_gst-glib-gen.mak new file mode 100644 index 00000000000..684e20b0324 --- /dev/null +++ b/multimedia/gst-plugins0.10-base/patches/patch-common_gst-glib-gen.mak @@ -0,0 +1,27 @@ +$NetBSD: patch-common_gst-glib-gen.mak,v 1.1 2021/05/06 08:16:00 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/gst-glib-gen.mak.orig 2011-12-11 19:03:48.000000000 +0000 ++++ common/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)-marshal.h: $(glib_gen_basename)-marshal.list diff --git a/multimedia/gst-plugins0.10-base/patches/patch-configure.ac b/multimedia/gst-plugins0.10-base/patches/patch-configure.ac new file mode 100644 index 00000000000..e7a59ceb123 --- /dev/null +++ b/multimedia/gst-plugins0.10-base/patches/patch-configure.ac @@ -0,0 +1,22 @@ +$NetBSD: patch-configure.ac,v 1.1 2021/05/06 08:16:00 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 2012-02-20 23:32:56.000000000 +0000 ++++ configure.ac +@@ -235,6 +235,12 @@ dnl Check for FIONREAD ioctl declaration + dnl used in gst/tcp + GST_CHECK_FIONREAD + ++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 *** checks for structures *** + + dnl *** checks for compiler characteristics *** |