Hi, There is laftover in CVS:
cd multimedia/gstreamer-0.10/plugins-good && \ cvs rm pkg/PLIST-gconf I had some issues with update of my system: # pkg_add -ri gstreamer-plugins-bad Can't install gstreamer-plugins-bad-0.10.7p9 because of conflicts (gstreamer-xvid-0.10.7p4,gstreamer-sdl-0.10.7p6,gstreamer-plugins-bad-0.10.7p6,gstreamer-faad-0.10.7p3,gstreamer-faac-0.10.7p3,gstreamer-musepack-0.10.7p3,gstreamer-tremor-0.10.7p3) /usr/sbin/pkg_add: gstreamer-plugins-bad-0.10.7p9:Fatal error I thought that attached file should fix above issue, but it doesn't. I still have the same error with packages created from my diff. What I am missing? OpenBSD 4.6-current (GENERIC) #179: Thu Sep 24 10:50:43 MDT 2009 t...@i386.openbsd.org:/usr/src/sys/arch/i386/compile/GENERIC -- best regards q#
diff -ruN -xCVS gstreamer-0.10/plugins-bad/Makefile gstreamer-0.10-new/plugins-bad/Makefile --- gstreamer-0.10/plugins-bad/Makefile Mon Nov 16 01:35:12 2009 +++ gstreamer-0.10-new/plugins-bad/Makefile Mon Nov 16 01:01:50 2009 @@ -8,7 +8,7 @@ V = 0.10.7 DISTNAME = gst-plugins-bad-$V -PKGNAME-main = gstreamer-plugins-bad-${V}p9 +PKGNAME-main = gstreamer-plugins-bad-${V}p10 PKGNAME-neon = gstreamer-neon-$Vp5 PKGNAME-real = gstreamer-real-$Vp4 PKGNAME-mplex = gstreamer-mplex-$Vp2 diff -ruN -xCVS gstreamer-0.10/plugins-bad/pkg/PLIST-main gstreamer-0.10-new/plugins-bad/pkg/PLIST-main --- gstreamer-0.10/plugins-bad/pkg/PLIST-main Mon Nov 16 01:35:12 2009 +++ gstreamer-0.10-new/plugins-bad/pkg/PLIST-main Mon Nov 16 01:01:34 2009 @@ -8,10 +8,22 @@ @conflict gstreamer-musepack-* @conflict gstreamer-sdl-* @conflict gstreamer-sndfile-* -...@conflict gstreamer-swf-* @conflict gstreamer-tremor-* @conflict gstreamer-x264-* @conflict gstreamer-xvid-* +...@pkgpath multimedia/gstreamer-0.10/plugins-bad,-bz2 +...@pkgpath multimedia/gstreamer-0.10/plugins-bad,-faac +...@pkgpath multimedia/gstreamer-0.10/plugins-bad,-faad +...@pkgpath multimedia/gstreamer-0.10/plugins-bad,-gsm +...@pkgpath multimedia/gstreamer-0.10/plugins-bad,-ladspa +...@pkgpath multimedia/gstreamer-0.10/plugins-bad,-main +...@pkgpath multimedia/gstreamer-0.10/plugins-bad,-meta +...@pkgpath multimedia/gstreamer-0.10/plugins-bad,-musepack +...@pkgpath multimedia/gstreamer-0.10/plugins-bad,-sdl +...@pkgpath multimedia/gstreamer-0.10/plugins-bad,-sndfile +...@pkgpath multimedia/gstreamer-0.10/plugins-bad,-tremor +...@pkgpath multimedia/gstreamer-0.10/plugins-bad,-x264 +...@pkgpath multimedia/gstreamer-0.10/plugins-bad,-xvid include/gstreamer-${VERSION}/gst/app/ include/gstreamer-${VERSION}/gst/app/gstappbuffer.h include/gstreamer-${VERSION}/gst/app/gstappsink.h diff -ruN -xCVS gstreamer-0.10/plugins-base/Makefile gstreamer-0.10-new/plugins-base/Makefile --- gstreamer-0.10/plugins-base/Makefile Mon Nov 16 01:35:12 2009 +++ gstreamer-0.10-new/plugins-base/Makefile Mon Nov 16 01:05:41 2009 @@ -7,7 +7,7 @@ V = 0.10.19 DISTNAME = gst-plugins-base-$V -PKGNAME-main = gstreamer-plugins-base-$Vp4 +PKGNAME-main = gstreamer-plugins-base-$Vp5 PKGNAME-gnome = gstreamer-gnome-$Vp5 PKGNAME-cdda = gstreamer-cdda-$Vp3 diff -ruN -xCVS gstreamer-0.10/plugins-base/pkg/PLIST-main gstreamer-0.10-new/plugins-base/pkg/PLIST-main --- gstreamer-0.10/plugins-base/pkg/PLIST-main Mon Nov 16 01:35:13 2009 +++ gstreamer-0.10-new/plugins-base/pkg/PLIST-main Mon Nov 16 01:05:26 2009 @@ -3,6 +3,10 @@ @conflict gstreamer-theora-* @conflict gstreamer-vorbis-* @conflict gstreamer-pango-* +...@pkgpath multimedia/gstreamer-0.10/plugins-base,-ogg +...@pkgpath multimedia/gstreamer-0.10/plugins-base,-pango +...@pkgpath multimedia/gstreamer-0.10/plugins-base,-theora +...@pkgpath multimedia/gstreamer-0.10/plugins-base,-vorbis bin/gst-visualise-${VERSION} include/gstreamer-${VERSION}/gst/audio/ include/gstreamer-${VERSION}/gst/audio/audio.h diff -ruN -xCVS gstreamer-0.10/plugins-good/Makefile gstreamer-0.10-new/plugins-good/Makefile --- gstreamer-0.10/plugins-good/Makefile Mon Nov 16 01:35:14 2009 +++ gstreamer-0.10-new/plugins-good/Makefile Mon Nov 16 01:29:18 2009 @@ -11,7 +11,7 @@ V = 0.10.8 DISTNAME = gst-plugins-good-$V -PKGNAME-main = gstreamer-plugins-good-$Vp77v0 +PKGNAME-main = gstreamer-plugins-good-$Vp78v0 PKGNAME-aalib = gstreamer-aalib-$Vp6 PKGNAME-esd = gstreamer-esd-$Vp6 PKGNAME-dv = gstreamer-dv-$Vp5 diff -ruN -xCVS gstreamer-0.10/plugins-good/pkg/PLIST-gconf gstreamer-0.10-new/plugins-good/pkg/PLIST-gconf --- gstreamer-0.10/plugins-good/pkg/PLIST-gconf Mon Nov 16 01:35:14 2009 +++ gstreamer-0.10-new/plugins-good/pkg/PLIST-gconf Thu Jan 1 01:00:00 1970 @@ -1,9 +0,0 @@ -...@comment $OpenBSD: PLIST-gconf,v 1.3 2009/06/07 06:02:20 ajacoutot Exp $ -lib/gstreamer-${VERSION}/libgstautodetect.la -lib/gstreamer-${VERSION}/libgstautodetect.so -lib/gstreamer-${VERSION}/libgstgconfelements.la -lib/gstreamer-${VERSION}/libgstgconfelements.so -...@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null -${SCHEMAS_INSTDIR}/ -${SCHEMAS_INSTDIR}/gstreamer-${VERSION}.schemas -...@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null diff -ruN -xCVS gstreamer-0.10/plugins-good/pkg/PLIST-main gstreamer-0.10-new/plugins-good/pkg/PLIST-main --- gstreamer-0.10/plugins-good/pkg/PLIST-main Mon Nov 16 01:35:14 2009 +++ gstreamer-0.10-new/plugins-good/pkg/PLIST-main Mon Nov 16 01:22:49 2009 @@ -9,6 +9,15 @@ @conflict gstreamer-speex-* @conflict gstreamer-taglib-* @conflict gstreamer-wavpack-* +...@pkgpath multimedia/gstreamer-0.10/plugins-good,-cairo +...@pkgpath multimedia/gstreamer-0.10/plugins-good,-flac +...@pkgpath multimedia/gstreamer-0.10/plugins-good,-gconf +...@pkgpath multimedia/gstreamer-0.10/plugins-good,-jpeg +...@pkgpath multimedia/gstreamer-0.10/plugins-good,-png +...@pkgpath multimedia/gstreamer-0.10/plugins-good,-shout +...@pkgpath multimedia/gstreamer-0.10/plugins-good,-speex +...@pkgpath multimedia/gstreamer-0.10/plugins-good,-taglib +...@pkgpath multimedia/gstreamer-0.10/plugins-good,-wavpack lib/gstreamer-${VERSION}/libgstalaw.la lib/gstreamer-${VERSION}/libgstalaw.so lib/gstreamer-${VERSION}/libgstalpha.la diff -ruN -xCVS gstreamer-0.10/plugins-ugly/Makefile gstreamer-0.10-new/plugins-ugly/Makefile --- gstreamer-0.10/plugins-ugly/Makefile Mon Nov 16 01:35:14 2009 +++ gstreamer-0.10-new/plugins-ugly/Makefile Mon Nov 16 01:27:08 2009 @@ -7,7 +7,7 @@ V = 0.10.7 DISTNAME = gst-plugins-ugly-$V -PKGNAME-main = gstreamer-plugins-ugly-$Vp3 +PKGNAME-main = gstreamer-plugins-ugly-$Vp4 PKGNAME-sidplay = gstreamer-sidplay-$Vp3 PKGNAME-lame = gstreamer-lame-$Vp3 diff -ruN -xCVS gstreamer-0.10/plugins-ugly/pkg/PLIST-main gstreamer-0.10-new/plugins-ugly/pkg/PLIST-main --- gstreamer-0.10/plugins-ugly/pkg/PLIST-main Mon Nov 16 01:35:14 2009 +++ gstreamer-0.10-new/plugins-ugly/pkg/PLIST-main Mon Nov 16 01:26:58 2009 @@ -3,6 +3,10 @@ @conflict gstreamer-mad-* @conflict gstreamer-mpeg2-* @conflict gstreamer-dvdread-* +...@pkgpath multimedia/gstreamer-0.10/plugins-ugly,-a52 +...@pkgpath multimedia/gstreamer-0.10/plugins-ugly,-dvdread +...@pkgpath multimedia/gstreamer-0.10/plugins-ugly,-mad +...@pkgpath multimedia/gstreamer-0.10/plugins-ugly,-mpeg2 lib/gstreamer-${VERSION}/libgsta52dec.la lib/gstreamer-${VERSION}/libgsta52dec.so lib/gstreamer-${VERSION}/libgstasf.la