CVS commit: pkgsrc/multimedia/pitivi

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Dec 23 20:22:43 UTC 2021

Modified Files:
        pkgsrc/multimedia/pitivi: Makefile

Log Message:
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...


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/multimedia/pitivi/Makefile

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

Modified files:

Index: pkgsrc/multimedia/pitivi/Makefile
diff -u pkgsrc/multimedia/pitivi/Makefile:1.63 pkgsrc/multimedia/pitivi/Makefile:1.64
--- pkgsrc/multimedia/pitivi/Makefile:1.63      Wed Dec  8 16:05:52 2021
+++ pkgsrc/multimedia/pitivi/Makefile   Thu Dec 23 20:22:42 2021
@@ -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 @@ LDFLAGS+=                    -lpython${PYVERSSUFFIX}
 .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"