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

Merge -gdk into -main now that gdk-pixbuf has been moved away from gtk+2.

Browse Source 
jasper agrees
This commit is contained in:
ajacoutot 2010-09-30 13:46:06 +00:00
parent 09c69d7c64
commit 60acd64f36
3 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.62 2010/09/30 07:21:20 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.63 2010/09/30 13:46:06 ajacoutot Exp $
COMMENT-main = good elements for GStreamer COMMENT-main = good elements for GStreamer
COMMENT-aalib = aalib element for GStreamer (plugins-good) COMMENT-aalib = aalib element for GStreamer (plugins-good)
COMMENT-dv = dv element for GStreamer (plugins-good) COMMENT-dv = dv element for GStreamer (plugins-good)
COMMENT-gdk = gdk pixbuf element for GStreamer (plugins-good)
COMMENT-caca = libcaca element for GStreamer (plugins-good) COMMENT-caca = libcaca element for GStreamer (plugins-good)
V = 0.10.25 V = 0.10.25
@ -12,15 +11,14 @@ DISTNAME = gst-plugins-good-$V
PKGNAME-main = gstreamer-plugins-good-${V} PKGNAME-main = gstreamer-plugins-good-${V}
PKGNAME-aalib = gstreamer-aalib-${V} PKGNAME-aalib = gstreamer-aalib-${V}
PKGNAME-dv = gstreamer-dv-${V} PKGNAME-dv = gstreamer-dv-${V}
PKGNAME-gdk = gstreamer-gdk-pixbuf-${V}
PKGNAME-caca = gstreamer-libcaca-${V} PKGNAME-caca = gstreamer-libcaca-${V}
REVISION-main = 0 REVISION-main = 1
EPOCH-main = 0 EPOCH-main = 0
REVISION-gdk = 0 REVISION-caca = 0
MULTI_PACKAGES = -main -aalib \ MULTI_PACKAGES = -main -aalib \
-dv -gdk -caca -dv -caca
MASTER_SITES = ${MASTER_SITE_GST:=gst-plugins-good/} MASTER_SITES = ${MASTER_SITE_GST:=gst-plugins-good/}
@ -40,7 +38,7 @@ WANTLIB = glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
pcre xml2 m z gstreamer-0.10 gstbase-0.10 pcre xml2 m z gstreamer-0.10 gstbase-0.10
LIB_DEPENDS = :gstreamer->=0.10.30:$P/core LIB_DEPENDS = :gstreamer->=0.10.30:$P/core
WANTLIB-main = ${WANTLIB} \ WANTLIB-main = ${WANTLIB} gdk_pixbuf-2.0 \
ICE SM X11 Xdamage Xext Xfixes sndio ossaudio \ ICE SM X11 Xdamage Xext Xfixes sndio ossaudio \
gstcontroller-0.10 Xau Xdmcp xcb-render xcb-render-util \ gstcontroller-0.10 Xau Xdmcp xcb-render xcb-render-util \
pthread-stubs xcb Xrender cairo expat orc-0.4 \ pthread-stubs xcb Xrender cairo expat orc-0.4 \
@ -64,7 +62,9 @@ LIB_DEPENDS-main = ${LIB_DEPENDS} \
::$P/plugins-base \ ::$P/plugins-base \
::net/libshout \ ::net/libshout \
::archivers/bzip2 \ ::archivers/bzip2 \
::devel/libsoup,-gnome ::devel/libsoup,-gnome \
::graphics/gdk-pixbuf2 \
::devel/eggdbus
RUN_DEPENDS-main = ${MODGCONF2_RUN_DEPENDS} \ RUN_DEPENDS-main = ${MODGCONF2_RUN_DEPENDS} \
${MODGETTEXT_RUN_DEPENDS} ${MODGETTEXT_RUN_DEPENDS}
@ -78,14 +78,8 @@ LIB_DEPENDS-dv = ${LIB_DEPENDS} \
::multimedia/libdv \ ::multimedia/libdv \
::${P}/plugins-base ::${P}/plugins-base
WANTLIB-gdk = ${WANTLIB} \
gio-2.0 gdk_pixbuf-2.0 gstvideo-0.10
LIB_DEPENDS-gdk = ${LIB_DEPENDS} \
::graphics/gdk-pixbuf2 \
::$P/plugins-base
WANTLIB-caca = ${WANTLIB} \ WANTLIB-caca = ${WANTLIB} \
X11 ncurses Xau Xdmcp pthread-stubs xcb caca X11 ncursesw Xau Xdmcp pthread-stubs xcb caca
LIB_DEPENDS-caca = ${LIB_DEPENDS} \ LIB_DEPENDS-caca = ${LIB_DEPENDS} \
::graphics/libcaca ::graphics/libcaca

1
multimedia/gstreamer-0.10/plugins-good/pkg/DESCR-gdk
View File

@ -1 +0,0 @@
This package contains the "gdkpixbuf" element for gstreamer-${VERSION} (good).

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

@ -1,10 +1,11 @@
@comment $OpenBSD: PLIST-main,v 1.24 2010/09/03 15:48:14 ajacoutot Exp $ @comment $OpenBSD: PLIST-main,v 1.25 2010/09/30 13:46:06 ajacoutot Exp $
@conflict gstreamer-plugins-bad-<0.10.18 @conflict gstreamer-plugins-bad-<0.10.18
@conflict gstreamer-jpeg-* @conflict gstreamer-jpeg-*
@conflict gstreamer-png-* @conflict gstreamer-png-*
@conflict gstreamer-cairo-* @conflict gstreamer-cairo-*
@conflict gstreamer-confelements-* @conflict gstreamer-confelements-*
@conflict gstreamer-flac-* @conflict gstreamer-flac-*
@conflict gstreamer-gdk-pixbuf-*
@conflict gstreamer-shout-* @conflict gstreamer-shout-*
@conflict gstreamer-libsoup-* @conflict gstreamer-libsoup-*
@conflict gstreamer-speex-* @conflict gstreamer-speex-*
@ -14,6 +15,7 @@
@pkgpath ${BASE_PKGPATH},-png @pkgpath ${BASE_PKGPATH},-png
@pkgpath ${BASE_PKGPATH},-cairo @pkgpath ${BASE_PKGPATH},-cairo
@pkgpath ${BASE_PKGPATH},-gconf @pkgpath ${BASE_PKGPATH},-gconf
@pkgpath ${BASE_PKGPATH},-gdk
@pkgpath ${BASE_PKGPATH},-flac @pkgpath ${BASE_PKGPATH},-flac
@pkgpath ${BASE_PKGPATH},-shout @pkgpath ${BASE_PKGPATH},-shout
@pkgpath ${BASE_PKGPATH},-soup @pkgpath ${BASE_PKGPATH},-soup
@ -60,6 +62,8 @@ lib/gstreamer-${VERSION}/libgstflv.so
lib/gstreamer-${VERSION}/libgstflxdec.so lib/gstreamer-${VERSION}/libgstflxdec.so
@comment lib/gstreamer-${VERSION}/libgstgconfelements.la @comment lib/gstreamer-${VERSION}/libgstgconfelements.la
lib/gstreamer-${VERSION}/libgstgconfelements.so lib/gstreamer-${VERSION}/libgstgconfelements.so
@comment lib/gstreamer-${VERSION}/libgstgdkpixbuf.la
lib/gstreamer-${VERSION}/libgstgdkpixbuf.so
@comment lib/gstreamer-${VERSION}/libgstgoom.la @comment lib/gstreamer-${VERSION}/libgstgoom.la
lib/gstreamer-${VERSION}/libgstgoom.so lib/gstreamer-${VERSION}/libgstgoom.so
@comment lib/gstreamer-${VERSION}/libgstgoom2k1.la @comment lib/gstreamer-${VERSION}/libgstgoom2k1.la