pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

gst-plugins1-good: add CONFLICTS/SUPERSEDES



Module Name:	pkgsrc-wip
Committed By:	nia <nia%NetBSD.org@localhost>
Pushed By:	nee
Date:		Mon Nov 8 22:41:56 2021 +0100
Changeset:	1934199a4c6744e137d3eca0bf1462c6a499ed95

Modified Files:
	gst-plugins1-good/Makefile
	gst-plugins1-good/options.mk

Log Message:
gst-plugins1-good: add CONFLICTS/SUPERSEDES

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1934199a4c6744e137d3eca0bf1462c6a499ed95

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

diffstat:
 gst-plugins1-good/Makefile   | 27 +++++++++++++++++++++++++++
 gst-plugins1-good/options.mk |  8 +++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diffs:
diff --git a/gst-plugins1-good/Makefile b/gst-plugins1-good/Makefile
index e5260d0731..d269ea88a5 100644
--- a/gst-plugins1-good/Makefile
+++ b/gst-plugins1-good/Makefile
@@ -15,10 +15,37 @@ USE_LANGUAGES=	c c++
 
 USE_TOOLS+=	pkg-config perl:run xgettext
 
+CONFLICTS+=	gst-plugins1-cairo-[0-9]*
+SUPERSEDES+=	gst-plugins1-cairo-[0-9]*
+CONFLICTS+=	gst-plugins1-flac-[0-9]*
+SUPERSEDES+=	gst-plugins1-flac-[0-9]*
+CONFLICTS+=	gst-plugins1-gdk_pixbuf-[0-9]*
+SUPERSEDES+=	gst-plugins1-flac-[0-9]*
+CONFLICTS+=	gst-plugins1-jpeg-[0-9]*
+SUPERSEDES+=	gst-plugins1-jpeg-[0-9]*
+CONFLICTS+=	gst-plugins1-lame-[0-9]*
+SUPERSEDES+=	gst-plugins1-lame-[0-9]*
+CONFLICTS+=	gst-plugins1-mpg123-[0-9]*
+SUPERSEDES+=	gst-plugins1-mpg123-[0-9]*
+CONFLICTS+=	gst-plugins1-png-[0-9]*
+SUPERSEDES+=	gst-plugins1-png-[0-9]*
+CONFLICTS+=	gst-plugins1-speex-[0-9]*
+SUPERSEDES+=	gst-plugins1-speex-[0-9]*
+CONFLICTS+=	gst-plugins1-twolame-[0-9]*
+SUPERSEDES+=	gst-plugins1-twolame-[0-9]*
+CONFLICTS+=	gst-plugins1-v4l2-[0-9]*
+SUPERSEDES+=	gst-plugins1-v4l2-[0-9]*
+CONFLICTS+=	gst-plugins1-vpx-[0-9]*
+SUPERSEDES+=	gst-plugins1-vpx-[0-9]*
+CONFLICTS+=	gst-plugins1-wavpack-[0-9]*
+SUPERSEDES+=	gst-plugins1-wavpack-[0-9]*
+
 .include "../../mk/oss.buildlink3.mk"
 
 PLIST_VARS+=	oss
 .if ${OSS_TYPE} != "none"
+CONFLICTS+=	gst-plugins1-oss-[0-9]*
+SUPERSEDES+=	gst-plugins1-oss-[0-9]*
 PLIST.oss=	yes
 LDFLAGS+=	${LIBOSSAUDIO}
 .endif
diff --git a/gst-plugins1-good/options.mk b/gst-plugins1-good/options.mk
index f5621bba7e..8690efd2c0 100644
--- a/gst-plugins1-good/options.mk
+++ b/gst-plugins1-good/options.mk
@@ -14,14 +14,18 @@ PKG_SUGGESTED_OPTIONS=		gtk3 x11
 PLIST_VARS+=	gtk3
 .if !empty(PKG_OPTIONS:Mgtk3)
 .include "../../x11/gtk3/buildlink3.mk"
+CONFLICTS+=		gst-plugins1-gtk-[0-9]*
+SUPERSEDES+=		gst-plugins1-gtk-[0-9]*
 PLIST.gtk3=		yes
 .else
 MESON_ARGS+=		-D gtk3=disabled
 .endif
 
 PLIST_VARS+=	jack
-.if !empty(PKG_OPTIONS:Malsa)
+.if !empty(PKG_OPTIONS:Mjack)
 .include "../../audio/jack/buildlink3.mk"
+CONFLICTS+=		gst-plugins1-jack-[0-9]*
+SUPERSEDES+=		gst-plugins1-jack-[0-9]*
 PLIST.jack=		yes
 .else
 MESON_ARGS+=		-D jack=disabled
@@ -30,6 +34,8 @@ MESON_ARGS+=		-D jack=disabled
 PLIST_VARS+=	pulseaudio
 .if !empty(PKG_OPTIONS:Mpulseaudio)
 .include "../../audio/pulseaudio/buildlink3.mk"
+CONFLICTS+=		gst-plugins1-pulse-[0-9]*
+SUPERSEDES+=		gst-plugins1-pulse-[0-9]*
 PLIST.pulseaudio=	yes
 .else
 MESON_ARGS+=		-D pulse=disabled


Home | Main Index | Thread Index | Old Index