cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge disaster: to merge subpackages together, it's not enough to put

Browse Source 
@conflict markers, the @pkgpath markers should also indicate what's going on.
This commit is contained in:
espie 2009-12-14 11:36:26 +00:00
parent a2c2187001
commit c7e398e0c6
6 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.7 2009/12/05 23:21:01 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.8 2009/12/14 11:36:26 espie Exp $
@conflict gstreamer-plugins-base-<0.10.25
@conflict gstreamer-bz2-*
@conflict gstreamer-faac-*
@ -13,6 +13,18 @@
@conflict gstreamer-tremor-*
@conflict gstreamer-x264-*
@conflict gstreamer-xvid-*
@pkgpath ${BASE_PKGPATH},-bz2
@pkgpath ${BASE_PKGPATH},-faac
@pkgpath ${BASE_PKGPATH},-faad
@pkgpath ${BASE_PKGPATH},-gsm
@pkgpath ${BASE_PKGPATH},-ladspa
@pkgpath ${BASE_PKGPATH},-meta
@pkgpath ${BASE_PKGPATH},-musepack
@pkgpath ${BASE_PKGPATH},-sndfile
@pkgpath ${BASE_PKGPATH},-swf
@pkgpath ${BASE_PKGPATH},-tremor
@pkgpath ${BASE_PKGPATH},-xvid
@pkgpath ${BASE_PKGPATH},-x264
@bin bin/gst-camera
@bin bin/gst-camera-perf
include/gstreamer-${VERSION}/gst/interfaces/photography-enumtypes.h

4
multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-mjpeg
View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST-mjpeg,v 1.1 2009/11/29 09:16:51 ajacoutot Exp $
@comment $OpenBSD: PLIST-mjpeg,v 1.2 2009/12/14 11:36:26 espie Exp $
@conflict gstreamer-mplex-*
@pkgpath multimedia/gstreamer-0.10/plugins-bad,-mplex
@pkgpath ${BASE_PKGPATH},-mplex
@comment lib/gstreamer-${VERSION}/libgstmpeg2enc.la
lib/gstreamer-${VERSION}/libgstmpeg2enc.so
@comment lib/gstreamer-${VERSION}/libgstmplex.la

4
multimedia/gstreamer-0.10/plugins-good/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.49 2009/11/29 09:17:38 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.50 2009/12/14 11:36:26 espie Exp $
COMMENT-main = good elements for GStreamer
COMMENT-aalib = aalib element for GStreamer (good)
@ -10,7 +10,7 @@ COMMENT-soup = libsoup element for GStreamer (good)
V = 0.10.17
DISTNAME = gst-plugins-good-$V
PKGNAME-main = gstreamer-plugins-good-$Vv0
PKGNAME-main = gstreamer-plugins-good-$Vp0v0
PKGNAME-aalib = gstreamer-aalib-$V
PKGNAME-dv = gstreamer-dv-$V
PKGNAME-gdk = gstreamer-gdk-pixbuf-$V

11
multimedia/gstreamer-0.10/plugins-good/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.17 2009/11/29 09:17:38 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.18 2009/12/14 11:36:26 espie Exp $
@conflict gstreamer-plugins-bad-<0.10.7
@conflict gstreamer-jpeg-*
@conflict gstreamer-png-*
@ -9,6 +9,15 @@
@conflict gstreamer-speex-*
@conflict gstreamer-taglib-*
@conflict gstreamer-wavpack-*
@pkgpath ${BASE_PKGPATH},-jpeg
@pkgpath ${BASE_PKGPATH},-png
@pkgpath ${BASE_PKGPATH},-cairo
@pkgpath ${BASE_PKGPATH},-gconf
@pkgpath ${BASE_PKGPATH},-flac
@pkgpath ${BASE_PKGPATH},-shout
@pkgpath ${BASE_PKGPATH},-speex
@pkgpath ${BASE_PKGPATH},-taglib
@pkgpath ${BASE_PKGPATH},-wavpack
@comment lib/gstreamer-${VERSION}/libgstalaw.la
lib/gstreamer-${VERSION}/libgstalaw.so
@comment lib/gstreamer-${VERSION}/libgstalpha.la

4
multimedia/gstreamer-0.10/plugins-ugly/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.13 2009/11/29 09:17:54 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.14 2009/12/14 11:36:26 espie Exp $
COMMENT-main = ugly elements for GStreamer
COMMENT-sidplay = sidplay element for GStreamer (ugly)
@ -7,7 +7,7 @@ COMMENT-lame = lame element for GStreamer (ugly)
V = 0.10.13
DISTNAME = gst-plugins-ugly-$V
PKGNAME-main = gstreamer-plugins-ugly-$V
PKGNAME-main = gstreamer-plugins-ugly-$Vp0
PKGNAME-sidplay = gstreamer-sidplay-$V
PKGNAME-lame = gstreamer-lame-$V

6
multimedia/gstreamer-0.10/plugins-ugly/pkg/PLIST-main
View File

@ -1,9 +1,13 @@
@comment $OpenBSD: PLIST-main,v 1.6 2009/11/29 09:17:54 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.7 2009/12/14 11:36:26 espie Exp $
@conflict gstreamer-bad-<0.10.17
@conflict gstreamer-a52-*
@conflict gstreamer-mad-*
@conflict gstreamer-mpeg2-*
@conflict gstreamer-dvdread-*
@pkgpath ${BASE_PKGPATH},-mad
@pkgpath ${BASE_PKGPATH},-a52
@pkgpath ${BASE_PKGPATH},-mpeg2
@pkgpath ${BASE_PKGPATH},-dvdread
@comment lib/gstreamer-${VERSION}/libgsta52dec.la
lib/gstreamer-${VERSION}/libgsta52dec.so
@comment lib/gstreamer-${VERSION}/libgstasf.la