diff options
| author | nia <nia@pkgsrc.org> | 2021-12-23 20:22:42 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2021-12-23 20:22:42 +0000 |
| commit | d15c57f7aa071eec26b85227ed2134206ea573fe (patch) | |
| tree | 20c261cd03f24e05ff7cd7a1290e2798e689b3b5 | |
| parent | 71d2fb731c72be19f2919430ba72afeb93c6dd32 (diff) | |
| download | pkgsrc-d15c57f7aa071eec26b85227ed2134206ea573fe.tar.gz | |
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...
| -rw-r--r-- | multimedia/pitivi/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/multimedia/pitivi/Makefile b/multimedia/pitivi/Makefile index 8e17d554d8f..0f49512f3be 100644 --- a/multimedia/pitivi/Makefile +++ b/multimedia/pitivi/Makefile @@ -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" |