CVS commit: pkgsrc/multimedia/gst-plugins0.10-base

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu May  6 08:16:00 UTC 2021

Modified Files:
        pkgsrc/multimedia/gst-plugins0.10-base: Makefile distinfo
Added Files:
        pkgsrc/multimedia/gst-plugins0.10-base/patches:
            patch-common_gst-glib-gen.mak patch-configure.ac

Log Message:
gst-plugins0.10-base: fix build with gmake 4.3

Based on patches for chat/farstream.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/multimedia/gst-plugins0.10-base/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/multimedia/gst-plugins0.10-base/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/gst-plugins0.10-base/patches/patch-common_gst-glib-gen.mak \
    pkgsrc/multimedia/gst-plugins0.10-base/patches/patch-configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/gst-plugins0.10-base/Makefile
diff -u pkgsrc/multimedia/gst-plugins0.10-base/Makefile:1.41 pkgsrc/multimedia/gst-plugins0.10-base/Makefile:1.42
--- pkgsrc/multimedia/gst-plugins0.10-base/Makefile:1.41        Wed Apr 21 11:40:31 2021
+++ pkgsrc/multimedia/gst-plugins0.10-base/Makefile     Thu May  6 08:15:59 2021
@@ -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"

Index: pkgsrc/multimedia/gst-plugins0.10-base/distinfo
diff -u pkgsrc/multimedia/gst-plugins0.10-base/distinfo:1.37 pkgsrc/multimedia/gst-plugins0.10-base/distinfo:1.38
--- pkgsrc/multimedia/gst-plugins0.10-base/distinfo:1.37        Tue Nov  3 23:54:25 2015
+++ pkgsrc/multimedia/gst-plugins0.10-base/distinfo     Thu May  6 08:15:59 2021
@@ -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
 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

Added files:

Index: pkgsrc/multimedia/gst-plugins0.10-base/patches/patch-common_gst-glib-gen.mak
diff -u /dev/null pkgsrc/multimedia/gst-plugins0.10-base/patches/patch-common_gst-glib-gen.mak:1.1
--- /dev/null   Thu May  6 08:16:00 2021
+++ pkgsrc/multimedia/gst-plugins0.10-base/patches/patch-common_gst-glib-gen.mak        Thu May  6 08:16:00 2021
@@ -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
Index: pkgsrc/multimedia/gst-plugins0.10-base/patches/patch-configure.ac
diff -u /dev/null pkgsrc/multimedia/gst-plugins0.10-base/patches/patch-configure.ac:1.1
--- /dev/null   Thu May  6 08:16:00 2021
+++ pkgsrc/multimedia/gst-plugins0.10-base/patches/patch-configure.ac   Thu May  6 08:16:00 2021
@@ -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 ***