Merge confelements subpackage into -main.

Gstreamer should now work out of the box for most usages... at last...
This commit is contained in:
ajacoutot 2009-10-14 13:59:23 +00:00
parent 46a31b7d2b
commit 1b5889dec6
4 changed files with 18 additions and 20 deletions

View File

@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.47 2009/09/28 19:52:15 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.48 2009/10/14 13:59:23 ajacoutot Exp $
COMMENT-main = multimedia framework - good plugins
COMMENT-aalib = multimedia framework - aalib plugin
COMMENT-gconf = multimedia framework - conf elements
COMMENT-esd = multimedia framework - esound plugin
COMMENT-dv = multimedia framework - dv plugin
COMMENT-gdk = multimedia framework - gdk pixbuf plugin
@ -12,16 +11,15 @@ COMMENT-soup = multimedia framework - libsoup plugin
V = 0.10.8
DISTNAME = gst-plugins-good-$V
PKGNAME-main = gstreamer-plugins-good-$Vp76v0
PKGNAME-main = gstreamer-plugins-good-$Vp77v0
PKGNAME-aalib = gstreamer-aalib-$Vp6
PKGNAME-gconf = gstreamer-confelements-$Vp9
PKGNAME-esd = gstreamer-esd-$Vp6
PKGNAME-dv = gstreamer-dv-$Vp5
PKGNAME-gdk = gstreamer-gdk-pixbuf-$Vp8
PKGNAME-caca = gstreamer-libcaca-$Vp6
PKGNAME-soup = gstreamer-libsoup-$Vp6
MULTI_PACKAGES = -main -aalib -gconf -esd \
MULTI_PACKAGES = -main -aalib -esd \
-dv -gdk -caca -soup
MASTER_SITES = ${MASTER_SITE_GST:=gst-plugins-good/}
@ -43,8 +41,9 @@ WANTLIB-main = ${WANTLIB} \
gstcontroller-0.10 gstbase-0.10 Xau Xdmcp \
pthread-stubs xcb Xrender cairo expat \
fontconfig freetype glitz ogg pixman-1 png \
stdc++ theora vorbis
stdc++ theora vorbis ORBit-2 dbus-1 dbus-glib-1
LIB_DEPENDS-main = ${LIB_DEPENDS} \
${MODGCONF2_LIB_DEPENDS} \
oil-0.3::devel/liboil \
gstaudio-0.10,gstinterfaces-0.10,gstnetbuffer-0.10,gstriff-0.10,gstrtp-0.10,gsttag-0.10,gstvideo-0.10,gstfft-0.10,gstrtsp-0.10,gstsdp-0.10::$P/plugins-base \
FLAC.>=9::audio/flac \
@ -54,20 +53,13 @@ LIB_DEPENDS-main = ${LIB_DEPENDS} \
speex::audio/speex \
gsttag-0.10::$P/plugins-base \
shout::net/libshout
RUN_DEPENDS-main =
RUN_DEPENDS-main = ${MODGCONF2_RUN_DEPENDS}
WANTLIB-aalib= ${WANTLIB} \
X11 ncurses gstbase-0.10 Xau Xdmcp pthread-stubs xcb
LIB_DEPENDS-aalib = ${LIB_DEPENDS} \
aa::graphics/aalib
WANTLIB-gconf = ${WANTLIB} \
ORBit-2 dbus-1 dbus-glib-1
LIB_DEPENDS-gconf = ${LIB_DEPENDS} \
${MODGCONF2_LIB_DEPENDS}
RUN_DEPENDS-gconf = ${RUN_DEPENDS} \
${MODGCONF2_RUN_DEPENDS}
WANTLIB-esd = ${WANTLIB} \
audiofile gstbase-0.10 sndio
LIB_DEPENDS-esd= ${LIB_DEPENDS} \

View File

@ -1,4 +0,0 @@
good plugins for gstreamer-${VERSION}.
* autodetect auto-detection plugins for video/audio outputs
* gconfelements elements wrapping the GStreamer/GConf
audio/video output settings

View File

@ -12,6 +12,7 @@ The gstreamer people split plugins into:
* apetag APEv1/2 tag reader
* audiofx audio effects plugin (stereo positioning)
* auparse parses au streams
* autodetect auto-detection plugins for video/audio outputs
* avi AVI stream handling (mux/demux)
* cutter audio cutter, split along silences
* cairo cairo-based text and time overlays on videos
@ -24,6 +25,7 @@ The gstreamer people split plugins into:
* effectv effect plugins from the effectv project
* flac FLAC Lossless compressor encoder/decoder
* flxdec FLC/FLI/FLX video decoder
* gconfelements elements wrapping the GStreamer/GConf audio/video output settings
* goom GOOM visualization filter
* icydemux demux ICY tags from a stream
* id3demux demux ID3v1 and ID3v2 tags from a file
@ -59,7 +61,6 @@ The following plugins are in specific packages because of dependencies:
* cacasink
* dv
* esdsink
* autodetect & gconfelements
* gdkpixbuf
* soup

View File

@ -1,8 +1,9 @@
@comment $OpenBSD: PLIST-main,v 1.15 2009/09/28 18:27:13 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.16 2009/10/14 13:59:23 ajacoutot Exp $
@conflict gstreamer-plugins-bad-<0.10.7
@conflict gstreamer-jpeg-*
@conflict gstreamer-png-*
@conflict gstreamer-cairo-*
@conflict gstreamer-confelements-*
@conflict gstreamer-flac-*
@conflict gstreamer-shout-*
@conflict gstreamer-speex-*
@ -22,6 +23,8 @@ lib/gstreamer-${VERSION}/libgstaudiofx.la
lib/gstreamer-${VERSION}/libgstaudiofx.so
lib/gstreamer-${VERSION}/libgstauparse.la
lib/gstreamer-${VERSION}/libgstauparse.so
lib/gstreamer-${VERSION}/libgstautodetect.la
lib/gstreamer-${VERSION}/libgstautodetect.so
lib/gstreamer-${VERSION}/libgstavi.la
lib/gstreamer-${VERSION}/libgstavi.so
lib/gstreamer-${VERSION}/libgstcairo.la
@ -42,6 +45,8 @@ lib/gstreamer-${VERSION}/libgstflxdec.la
lib/gstreamer-${VERSION}/libgstflxdec.so
lib/gstreamer-${VERSION}/libgstgamma.la
lib/gstreamer-${VERSION}/libgstgamma.so
lib/gstreamer-${VERSION}/libgstgconfelements.la
lib/gstreamer-${VERSION}/libgstgconfelements.so
lib/gstreamer-${VERSION}/libgstgoom.la
lib/gstreamer-${VERSION}/libgstgoom.so
lib/gstreamer-${VERSION}/libgstgoom2k1.la
@ -138,3 +143,7 @@ share/locale/vi/LC_MESSAGES/gst-plugins-good-${VERSION}.mo
share/locale/zh_CN/LC_MESSAGES/gst-plugins-good-${VERSION}.mo
share/locale/zh_HK/LC_MESSAGES/gst-plugins-good-${VERSION}.mo
share/locale/zh_TW/LC_MESSAGES/gst-plugins-good-${VERSION}.mo
@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