[pkgsrc/trunk]: pkgsrc/multimedia/pitivi pitivi: Hack around a conflict betwe...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/52f1a5f6c34c
branches:  trunk
changeset: 771714:52f1a5f6c34c
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Dec 23 20:22:42 2021 +0000

description:
pitivi: Hack around a conflict between gst-plugins1-transcoder and
gst-plugins1-bad. Ideally transcoder would not be built as a core
part of bad when it was previously serparate, but such is life.

We can probably clean this up after freeze...

diffstat:

 multimedia/pitivi/Makefile |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (22 lines):

diff -r 2bbfbebc75df -r 52f1a5f6c34c multimedia/pitivi/Makefile
--- a/multimedia/pitivi/Makefile        Thu Dec 23 18:39:44 2021 +0000
+++ b/multimedia/pitivi/Makefile        Thu Dec 23 20:22:42 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2021/12/08 16:05:52 adam Exp $
+# $NetBSD: Makefile,v 1.64 2021/12/23 20:22:42 nia Exp $
 
 DISTNAME=      pitivi-0.999
 PKGREVISION=   6
@@ -44,9 +44,11 @@
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/application.mk"
 .include "../../multimedia/frei0r/buildlink3.mk"
+.include "../../multimedia/gst-plugins1-bad/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-editing-services/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-good/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-gtk/buildlink3.mk"
-.include "../../multimedia/gst-plugins1-transcoder/buildlink3.mk"
+# HACK: avoid conflict with gst-plugins1-bad...
+#.include "../../multimedia/gst-plugins1-transcoder/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"