diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-10-14 06:38:03 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-10-14 06:38:03 +0800 |
| commit | cc476934f6ec234d9070f7d6bae7f02e94ab82e1 (patch) | |
| tree | 2f8572165338c667412d99d86e2e5b067c287794 /multimedia | |
| parent | da884fe92f1d494f17bf4c1303c48666c787a31a (diff) | |
| download | marcuscom-ports-cc476934f6ec234d9070f7d6bae7f02e94ab82e1.tar marcuscom-ports-cc476934f6ec234d9070f7d6bae7f02e94ab82e1.tar.gz marcuscom-ports-cc476934f6ec234d9070f7d6bae7f02e94ab82e1.tar.bz2 marcuscom-ports-cc476934f6ec234d9070f7d6bae7f02e94ab82e1.tar.lz marcuscom-ports-cc476934f6ec234d9070f7d6bae7f02e94ab82e1.tar.xz marcuscom-ports-cc476934f6ec234d9070f7d6bae7f02e94ab82e1.tar.zst marcuscom-ports-cc476934f6ec234d9070f7d6bae7f02e94ab82e1.zip | |
Sort out the X input and output plugins.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17113 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/gstreamer1-plugins/Makefile.common | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/multimedia/gstreamer1-plugins/Makefile.common b/multimedia/gstreamer1-plugins/Makefile.common index 0011bd59b..975ef778f 100644 --- a/multimedia/gstreamer1-plugins/Makefile.common +++ b/multimedia/gstreamer1-plugins/Makefile.common @@ -1,5 +1,5 @@ # $FreeBSD$ -# $MCom: ports/multimedia/gstreamer1-plugins/Makefile.common,v 1.3 2012/10/06 16:28:55 kwm Exp $ +# $MCom: ports/multimedia/gstreamer1-plugins/Makefile.common,v 1.4 2012/10/11 22:26:28 kwm Exp $ # XXX configure checks for bad @@ -164,7 +164,6 @@ GOOD_GST_ALL_PLUGINS+= \ vpx \ wavpack \ x -# ximagesrc # cairo \ GOOD_GST_NON_PLUGINS= \ @@ -177,10 +176,8 @@ GOOD_GST_NON_PLUGINS= \ --disable-osx_video \ --disable-sunaudio \ --disable-waveform \ - --disable-x \ --enable-zlib - # ugly UGLY_GST_ALL_PLUGINS+= \ a52dec \ @@ -263,9 +260,6 @@ CONFIGURE_ARGS+= --enable-${GST_PLUGIN} # --disable-sunaudio \ # --disable-wildmidi \ # --disable-xine \ -# --enable-x \ -# --enable-xshm \ -# --enable-xvideo .if !defined(NO_GSTREAMER_COMMON) GST_PLUGIN_SUFFIX?= -${GST_PLUGIN} @@ -600,20 +594,24 @@ gst_vorbis_PLIST_FILES= ${GST_LIB_DIR}/libgstvorbis.la \ gst_vpx_LIB_DEPENDS+= vpx:${PORTSDIR}/multimedia/libvpx # X -gst_x_USE_XORG+= x11 xv xext -# xxx videoproto xextproto, xshm? +.if ${DIST} == base +gst_x_USE_XORG= x11 xv xext gst_x_CONFIGURE_ARGS+= --enable-xvideo --enable-xshm gst_x_GST_PLUGIN_DIR= sys/ximage sys/xvimage gst_x_PLIST_FILES= ${GST_LIB_DIR}/libgstximagesink.la \ ${GST_LIB_DIR}/libgstximagesink.so \ ${GST_LIB_DIR}/libgstxvimagesink.la \ ${GST_LIB_DIR}/libgstxvimagesink.so -# base +.endif +.if ${DIST} == good # Ximagesrc -#gst_x_GST_PLUGIN_SUFFIX -# --disable-x --disable-xshm --disable-xvideo .. -# good +gst_x_USE_XORG= x11 xfixes xdamage xext +gst_x_CONFIGURE_ARGS+= --enable-x +gst_x_GST_PLUGIN_DIR= sys/ximage +gst_x_PLIST_FILES= ${GST_LIB_DIR}/libgstximagesrc.la \ + ${GST_LIB_DIR}/libgstximagesrc.so +.endif # x264 gst_x264_LIB_DEPENDS+= x264:${PORTSDIR}/multimedia/x264 @@ -674,7 +672,7 @@ RUN_DEPENDS+= ${gst_${GST_PLUGIN}_RUN_DEPENDS} PLIST_FILES= ${gst_${GST_PLUGIN}_PLIST_FILES} PLIST_DIRS= ${gst_${GST_PLUGIN}_PLIST_DIRS} EXTRA_LIBS+= ${gst_${GST_PLUGIN}_EXTRA_LIBS} -USE_XORG+= ${GST_${GST_PLUGIN}_USE_XORG} +USE_XORG+= ${gst_${GST_PLUGIN}_USE_XORG} USE_GNOME+= ${gst_${GST_PLUGIN}_USE_GNOME} CONFIGURE_ENV+= ${gst_${GST_PLUGIN}_CONFIGURE_ENV} |