From ddb29beb95df4a5056b4feef70f11f70553de5bd Mon Sep 17 00:00:00 2001 From: martin Date: Thu, 6 May 2021 18:01:31 +0000 Subject: Woraround quoting changes in gmake 4.3 --- multimedia/gst-plugins0.10-good/distinfo | 6 ++++- .../patches/patch-common_glib-gen.mak | 27 +++++++++++++++++++++ .../patches/patch-common_gst-glib-gen.mak | 27 +++++++++++++++++++++ .../patches/patch-gst_rtpmanager_Makefile.in | 28 ++++++++++++++++++++++ .../patches/patch-gst_udp_Makefile.in | 28 ++++++++++++++++++++++ 5 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 multimedia/gst-plugins0.10-good/patches/patch-common_glib-gen.mak create mode 100644 multimedia/gst-plugins0.10-good/patches/patch-common_gst-glib-gen.mak create mode 100644 multimedia/gst-plugins0.10-good/patches/patch-gst_rtpmanager_Makefile.in create mode 100644 multimedia/gst-plugins0.10-good/patches/patch-gst_udp_Makefile.in (limited to 'multimedia') diff --git a/multimedia/gst-plugins0.10-good/distinfo b/multimedia/gst-plugins0.10-good/distinfo index 365fa7dbae4..1b1ca049e0b 100644 --- a/multimedia/gst-plugins0.10-good/distinfo +++ b/multimedia/gst-plugins0.10-good/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.44 2020/09/01 21:44:01 ryoon Exp $ +$NetBSD: distinfo,v 1.45 2021/05/06 18:01:31 martin Exp $ SHA1 (gst-plugins-good-0.10.31.tar.bz2) = b45fc01b133fc23617fa501dd9307a90f467b396 RMD160 (gst-plugins-good-0.10.31.tar.bz2) = d9fed957ba26d055f7bccb9079bd43faae15b7e5 @@ -7,7 +7,11 @@ Size (gst-plugins-good-0.10.31.tar.bz2) = 3390378 bytes SHA1 (patch-ab) = d0d8b7fbd373d300e1808b8b106257d87dd85f7a SHA1 (patch-ba) = 0f2cc16c39f8bc2a4854ec928b7c0b60d0559eb5 SHA1 (patch-bb) = b71b740e106b5fc932cc50a7994e491da27909be +SHA1 (patch-common_glib-gen.mak) = bba208397034ba010e6b31b05d1504caeb63eef9 +SHA1 (patch-common_gst-glib-gen.mak) = 1dc21face8fe3cfb5242f9a21532a008ac0bf571 SHA1 (patch-gst_goom_mmx.h) = b940bfcd0599fa83fbe574ca9059c7f626d23663 +SHA1 (patch-gst_rtpmanager_Makefile.in) = 8c42df0ad3a2d1113416f87d4793e4a32a52c67b +SHA1 (patch-gst_udp_Makefile.in) = d35415c498285d1eb6dff6e269402515ec039fab SHA1 (patch-sys_v4l2_gstv4l2bufferpool.c) = c200c8f0a647dd0c74be6d4e68bfac7a910b78a3 SHA1 (patch-sys_v4l2_gstv4l2object.c) = 2897708371b21cb098e799fa0dd2d288f042374a SHA1 (patch-sys_v4l2_v4l2_calls.c) = 4eb5d965a821c6b9e7a6ae84f86b256eb7e56e4c diff --git a/multimedia/gst-plugins0.10-good/patches/patch-common_glib-gen.mak b/multimedia/gst-plugins0.10-good/patches/patch-common_glib-gen.mak new file mode 100644 index 00000000000..aa0946b46f1 --- /dev/null +++ b/multimedia/gst-plugins0.10-good/patches/patch-common_glib-gen.mak @@ -0,0 +1,27 @@ +$NetBSD: patch-common_glib-gen.mak,v 1.1 2021/05/06 18:01:31 martin 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/glib-gen.mak.orig 2011-12-11 20:10:47.000000000 +0100 ++++ common/glib-gen.mak 2021-05-06 19:36:23.205924531 +0200 +@@ -5,7 +5,8 @@ + #glib_enum_define=GST_COLOR_BALANCE + #glib_enum_prefix=gst_color_balance + +-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 + %-marshal.h: %-marshal.list diff --git a/multimedia/gst-plugins0.10-good/patches/patch-common_gst-glib-gen.mak b/multimedia/gst-plugins0.10-good/patches/patch-common_gst-glib-gen.mak new file mode 100644 index 00000000000..a9c33b4ca08 --- /dev/null +++ b/multimedia/gst-plugins0.10-good/patches/patch-common_gst-glib-gen.mak @@ -0,0 +1,27 @@ +$NetBSD: patch-common_gst-glib-gen.mak,v 1.1 2021/05/06 18:01:31 martin 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-good/patches/patch-gst_rtpmanager_Makefile.in b/multimedia/gst-plugins0.10-good/patches/patch-gst_rtpmanager_Makefile.in new file mode 100644 index 00000000000..db6db1f994b --- /dev/null +++ b/multimedia/gst-plugins0.10-good/patches/patch-gst_rtpmanager_Makefile.in @@ -0,0 +1,28 @@ +$NetBSD: patch-gst_rtpmanager_Makefile.in,v 1.1 2021/05/06 18:01:31 martin 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 + +--- ./gst/rtpmanager/Makefile.in.orig 2012-02-21 01:09:01.000000000 +0100 ++++ ./gst/rtpmanager/Makefile.in 2021-05-06 19:59:14.809647955 +0200 +@@ -501,7 +501,8 @@ + glib_enum_define = GST_RTP_BIN + glib_gen_prefix = gst_rtp_bin + glib_gen_basename = gstrtpbin +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++hash:=\# ++enum_headers=$(foreach h,$(glib_enum_headers),\n$(hash)include \"$(h)\") + built_sources = gstrtpbin-marshal.c + built_headers = gstrtpbin-marshal.h + BUILT_SOURCES = $(built_sources) $(built_headers) + diff --git a/multimedia/gst-plugins0.10-good/patches/patch-gst_udp_Makefile.in b/multimedia/gst-plugins0.10-good/patches/patch-gst_udp_Makefile.in new file mode 100644 index 00000000000..28f85481ab4 --- /dev/null +++ b/multimedia/gst-plugins0.10-good/patches/patch-gst_udp_Makefile.in @@ -0,0 +1,28 @@ +$NetBSD: patch-gst_udp_Makefile.in,v 1.1 2021/05/06 18:01:31 martin 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 + +--- ./gst/udp/Makefile.in.orig 2012-02-21 01:09:02.000000000 +0100 ++++ ./gst/udp/Makefile.in 2021-05-06 20:00:09.759428988 +0200 +@@ -498,7 +498,8 @@ + glib_enum_define = GST_UDP + glib_gen_prefix = gst_udp + glib_gen_basename = gstudp +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++hash:=\# ++enum_headers=$(foreach h,$(glib_enum_headers),\n$(hash)include \"$(h)\") + built_sources = gstudp-enumtypes.c gstudp-marshal.c + built_headers = gstudp-enumtypes.h gstudp-marshal.h + BUILT_SOURCES = $(built_sources) $(built_headers) + -- cgit v1.2.3