Index: Mk/bsd.autotools.mk =================================================================== --- Mk/bsd.autotools.mk (revision 315495) +++ Mk/bsd.autotools.mk (working copy) @@ -84,35 +84,30 @@ # _AUTOTOOLS_IMPL= .for stanza in ${USE_AUTOTOOLS} -_AUTOTOOLS_IMPL+= ${stanza:C/^([^:]+).*/\1/} -_AUTOTOOL_${stanza:C/^([^:]+).*/\1/}= ${stanza:C/^[^:]+:([^:]+)/\1/} +_stanza=${stanza:C/^([^:]+).*/\1/} +_AUTOTOOLS_IMPL+= ${_stanza} +.if ${_stanza} != ${stanza} +_AUTOTOOL_${_stanza}= ${stanza:C/^[^:]+:([^:]+)/\1/} +.else +_AUTOTOOL_${_stanza}= yes +.endif .endfor -# Verify each component, normalize +# Verify each component, normalize and check for args being env or yes # _AUTOTOOLS_NOCOMP= +_AUTOTOOLS_BADCOMP= .for component in ${_AUTOTOOLS_IMPL} -. if ${_AUTOTOOLS_ALL:M${component}}=="" +.if ! ${_AUTOTOOLS_ALL:M${component}} _AUTOTOOLS_NOCOMP+= ${component} -. endif -. if ${_AUTOTOOL_${component}}==${component} -_AUTOTOOL_${component}= yes -. elsif ${_AUTOTOOL_${component}}!="env" && ${_AUTOTOOL_${component}}!="yes" -_AUTOTOOLS_BADCOMP+= ${component}:${_AUTOTOOL_${component}} -. endif +.endif +.if ${_AUTOTOOL_${component}:env=yes} != yes +_AUTOTOOLS_BADCOMP+= ${component}:${_AUTOTOOL_${component}} +.endif .endfor .if !empty(_AUTOTOOLS_NOCOMP) IGNORE+= Unknown autotool: ${_AUTOTOOLS_NOCOMP:O:u} .endif - -# Check for anything other than 'yes' or 'env' -# -_AUTOTOOLS_BADCOMP= -.for component in ${_AUTOTOOLS_IMPL} -. if ${_AUTOTOOL_${component}}!="env" && ${_AUTOTOOL_${component}}!="yes" -_AUTOTOOLS_BADCOMP+= ${component}:${_AUTOTOOL_${component}} -. endif -.endfor .if !empty(_AUTOTOOLS_BADCOMP) IGNORE+= Bad autotool stanza: ${_AUTOTOOLS_BADCOMP:O:u} .endif Index: Mk/bsd.gstreamer.mk =================================================================== --- Mk/bsd.gstreamer.mk (revision 315495) +++ Mk/bsd.gstreamer.mk (working copy) @@ -4,10 +4,9 @@ # bsd.gstreamer.mk - Support for gstreamer-plugins-based ports. # # Created by: Michael Johnson -# Date: 4 Oct 2004 # # $FreeBSD$ -# $MCom: ports/Mk/bsd.gstreamer.mk,v 1.43 2008/03/21 04:14:18 ahze Exp $ +# $MCom: ports/Mk/bsd.gstreamer.mk,v 1.56 2013/01/15 21:43:45 kwm Exp $ .if !defined(_POSTMKINCLUDED) && !defined(Gstreamer_Pre_Include) @@ -18,30 +17,33 @@ # Ports can use the following: # -# For Gstreamer 0.10: -# USE_GSTREAMER= lame faac ffmpeg +# For Gstreamer 0.10: +# USE_GSTREAMER= lame faac ffmpeg # +# For Gstreamer 1.x the same rules apply but instead of +# USE_GSTREAMER=, USE_GSTREAMER1= is used. +# # If you want to use USE_GSTREAMER after # you must follow one of the examples listed below # -# WANT_GSTREAMER= yes -# .include +# .include # .if defined(WITH_VORBIS) -# USE_GSTREAMER+= vorbis +# USE_GSTREAMER= vorbis # .endif # # or # USE_GSTREAMER= yes -# .include +# .include # .if defined(WITH_FAAD) # USE_GSTREAMER+= faad # .endif +# .include # -# # USE_GSTREAMER=yes will always add a dependency to # gstreamer-plugins # - +# The use of WANT_GSTREAMER=yes should be discouraged. +# # "Normal" dependencies and variables # @@ -50,23 +52,52 @@ GST_VERSION= 0.10 GST_MINOR_VERSION= .0 GST_SHLIB_VERSION= 1 + +GSTREAMER1_PORT= ${PORTSDIR}/multimedia/gstreamer1-plugins +_GST1_LIB_BASE= ${LOCALBASE}/lib/gstreamer-${GST1_VERSION} +GST1_VERSION= 1.0 +GST1_MINOR_VERSION= .0 +GST1_SHLIB_VERSION= 0 +GST1_MINIMAL_VERSION= .5 + # # These are the current supported gstreamer-plugins modules -# -_USE_GSTREAMER10_ALL= a52dec aalib amrnb amrwbdec annodex bz2 cairo \ - cdaudio cdparanoia dts dv dvd esound faac faad \ - ffmpeg flac flite gconf gio gl gme gnomevfs gnonlin \ - gsm hal jack jpeg ladspa lame libcaca libmms \ - libpng libvisual mm mp3 mpeg2enc mpeg2dec musepack \ - nas neon ogg opencv opus pango pulse python resindvd schroedinger \ - sdl shout2 sidplay sndfile spc soundtouch soup \ - speex taglib theora twolame v4l2 vorbis vdpau \ - vp8 wavpack x264 xvid +# missing base: alsa ivorbisdec +# missing good: pulseaudio(need newer) +# missing ugly: - (done) +# missing bad: - (done) + +# supported plugins by both 0.10 and 1.0. +_GSTREAMER_PLUGINS= \ + a52dec aalib amrnb amrwbdec cairo cdio \ + cdparanoia dts dv faac faad flac flite \ + gdkpixbuf gme gsm jack jpeg lame libcaca \ + libmms libvisual mad mpeg2dec mpeg2enc ogg \ + opencv opus pango resindvd schroedinger \ + shout2 sidplay soundtouch soup speex taglib \ + theora twolame v4l2 vorbis wavpack x264 + +# plugins only in 0.10 +.if defined(USE_GSTREAMER) +_GSTREAMER_PLUGINS+= \ + annodex bz2 cdaudio dvd esound ffmpeg fluendo-mp3 \ + fluendo-mpegdemux gconf gio gl gnomevfs gnonlin hal \ + ladspa libpng mm mp3 musepack nas neon pulse python qt4 \ + sdl sndfile spc vdpau vp8 xvid +.endif + +# plugins only in 1.0 +.if defined(USE_GSTREAMER1) +_GSTREAMER_PLUGINS+= \ + assrender celt curl dvdread libav modplug png spandsp vpx \ + x ximagesrc zbar +.endif + # other plugins -OTHER_GSTREAMER_PLUGINS+=bad good ugly core yes ${_USE_GSTREAMER10_ALL} fluendo-mp3 mad qt4 +_USE_GSTREAMER_ALL= bad core good ugly yes ${_GSTREAMER_PLUGINS} -_USE_GSTREAMER_ALL+= ${OTHER_GSTREAMER_PLUGINS} +#--------------------------------------------------------------------------# core_DEPENDS= multimedia/gstreamer-plugins-core @@ -74,10 +105,8 @@ yes_NAME= gstreamer-plugins yes_GST_PREFIX= # empty -cdio_DEPENDS= sysutils/gstreamer-plugins-cdio +#-- audio plugins section -------------------------------------------------# -gconf_DEPENDS= devel/gstreamer-plugins-gconf - # Audio Plugins Section a52dec_DEPENDS= audio/gstreamer-plugins-a52dec @@ -89,6 +118,8 @@ audiofile_DEPENDS= audio/gstreamer-plugins-audiofile +celt_DEPENDS= audio/gstreamer-plugins-celt + cdaudio_DEPENDS= audio/gstreamer-plugins-cdaudio cdparanoia_DEPENDS= audio/gstreamer-plugins-cdparanoia @@ -121,10 +152,7 @@ mikmod_DEPENDS= audio/gstreamer-plugins-mikmod -mm_DEPENDS= multimedia/gstreamermm -mm_GST_PREFIX= gstreamer -mm_GST_SUFX= # empty -mm_GST_VERSION= 0.9.4 +modplug_DEPENDS= audio/gstreamer-plugins-modplug mp3_DEPENDS= audio/gstreamer-plugins-mp3 @@ -166,7 +194,14 @@ wavpack_DEPENDS= audio/gstreamer-plugins-wavpack -# Devel Plugins Section +#-- comms plugin section --------------------------------------------------# + +spandsp_DEPENDS= comms/gstreamer-plugins-spandsp + +#-- devel plugin section --------------------------------------------------# + +gconf_DEPENDS= devel/gstreamer-plugins-gconf + gio_DEPENDS= devel/gstreamer-plugins-gio gnomevfs_DEPENDS= devel/gstreamer-plugins-gnomevfs @@ -175,11 +210,18 @@ soup_DEPENDS= devel/gstreamer-plugins-soup -# Graphics Plugins Section +#-- ftp plugin section ----------------------------------------------------# + +curl_DEPENDS= ftp/gstreamer-plugins-curl + +#-- graphics plugin section -----------------------------------------------# + aalib_DEPENDS= graphics/gstreamer-plugins-aalib annodex_DEPENDS= multimedia/gstreamer-plugins-annodex +assrender_DEPENDS= multimedia/gstreamer-plugins-assrender + cairo_DEPENDS= graphics/gstreamer-plugins-cairo gdkpixbuf_DEPENDS= graphics/gstreamer-plugins-gdkpixbuf @@ -200,16 +242,25 @@ opencv_DEPENDS= graphics/gstreamer-plugins-opencv -# Multimedia Plugins Section +png_DEPENDS= graphics/gstreamer-plugins-png + +zbar_DEPENDS= graphics/gstreamer-plugins-zbar + +#-- multimedia plugins section --------------------------------------------# + bad_DEPENDS= multimedia/gstreamer-plugins-bad bz2_DEPENDS= multimedia/gstreamer-plugins-bz2 +dvdread_DEPENDS= multimedia/gstreamer-plugins-dvdread + ffmpeg_DEPENDS= multimedia/gstreamer-ffmpeg ffmpeg_GST_PREFIX= gstreamer- ffmpeg_GST_SUFX= # empty ffmpeg_GST_VERSION= 0.10.0 +fluendo-mpegdemux_DEPENDS= multimedia/gstreamer-plugins-fluendo-mpegdemux + dts_DEPENDS= multimedia/gstreamer-plugins-dts dv_DEPENDS= multimedia/gstreamer-plugins-dv @@ -220,8 +271,19 @@ gnonlin_DEPENDS= multimedia/gstreamer-plugins-gnonlin +libav_DEPENDS= multimedia/gstreamer-libav +libav_GST_PREFIX= gstreamer1- +libav_GST_SUFX= # empty +libav_GST_VERSION= 1.0.0 + libfame_DEPENDS= multimedia/gstreamer-plugins-libfame +mm_DEPENDS= multimedia/gstreamermm +mm_GST_PREFIX= gstreamer +mm_GST_SUFX= # empty +mm_GST_VERSION= 0.9.4 +#mm_GST1_VERSION= + mpeg2dec_DEPENDS= multimedia/gstreamer-plugins-mpeg2dec mpeg2enc_DEPENDS= multimedia/gstreamer-plugins-mpeg2enc @@ -235,6 +297,8 @@ vp8_DEPENDS= multimedia/gstreamer-plugins-vp8 +vpx_DEPENDS= multimedia/gstreamer-plugins-vpx + # XXX: This is a quick solution for ports with USE_GSTREAMER=python # but without USE_PYTHON. PYTHON_PKGNAMEPREFIX?= py*- @@ -259,16 +323,34 @@ xvid_DEPENDS= multimedia/gstreamer-plugins-xvid -# Net Plugins Section +#-- Net Plugins Section ---------------------------------------------------# + libmms_DEPENDS= net/gstreamer-plugins-libmms -# X11-Toolkits Plugins Section +#-- sysutils plugins section ----------------------------------------------# + +cdio_DEPENDS= sysutils/gstreamer-plugins-cdio + +#-- x11 plugins section ---------------------------------------------------# + +x_DEPENDS= x11/gstreamer-plugins-x + +ximagesrc_DEPENDS= x11/gstreamer-plugins-ximagesrc + +#-- x11-toolkits plugins section ------------------------------------------# + pango_DEPENDS= x11-toolkits/gstreamer-plugins-pango +#--------------------------------------------------------------------------# + .if defined(_POSTMKINCLUDED) && !defined(Gstreamer_Post_Include) Gstreamer_Post_Include= bsd.gstreamer.mk +.if (defined (USE_GSTREAMER) && defined(USE_GSTREAMER1)) +IGNORE= USE_GSTREAMER and USE_GSTREAMER1 can't be used together +.endif + .for ext in ${USE_GSTREAMER} ${ext}_GST_PREFIX?= gstreamer-plugins- ${ext}_GST_VERSION?= ${GST_VERSION}${GST_MINOR_VERSION} @@ -277,9 +359,23 @@ BUILD_DEPENDS+= ${${ext}_GST_PREFIX}${${ext}_NAME}>=${${ext}_GST_VERSION}:${PORTSDIR}/${${ext}_DEPENDS} RUN_DEPENDS+= ${${ext}_GST_PREFIX}${${ext}_NAME}>=${${ext}_GST_VERSION}:${PORTSDIR}/${${ext}_DEPENDS} . else -IGNORE= cannot install: unknown gstreamer-plugin -- ${ext} +IGNORE= cannot install: unknown gstreamer ${GST_VERSION} plugin -- ${ext} . endif .endfor +.for ext in ${USE_GSTREAMER1} +${ext}_GST_PREFIX?= gstreamer1-plugins- +${ext}_GST_VERSION?= ${GST1_VERSION}${GST1_MINIMAL_VERSION} +${ext}_NAME?= ${ext:S,gstreamer-,gstreamer1-,} +${ext}_GST_DEPENDS?= ${${ext}_DEPENDS:S,gstreamer-,gstreamer1-,} +. if ${_USE_GSTREAMER_ALL:M${ext}}!= "" && exists(${PORTSDIR}/${${ext}_GST_DEPENDS}) +printf ${ext} : ${${ext}_GST_PREFIX} : ${${ext}_NAME} \n +BUILD_DEPENDS+= ${${ext}_GST_PREFIX}${${ext}_NAME}>=${${ext}_GST_VERSION}:${PORTSDIR}/${${ext}_GST_DEPENDS} +RUN_DEPENDS+= ${${ext}_GST_PREFIX}${${ext}_NAME}>=${${ext}_GST_VERSION}:${PORTSDIR}/${${ext}_GST_DEPENDS} +. else +IGNORE= cannot install: unknown gstreamer ${GST1_VERSION} plugin -- ${ext} +. endif +.endfor + # The End .endif Index: audio/Makefile =================================================================== --- audio/Makefile (revision 315495) +++ audio/Makefile (working copy) @@ -291,6 +291,32 @@ SUBDIR += gstreamer-plugins-twolame SUBDIR += gstreamer-plugins-vorbis SUBDIR += gstreamer-plugins-wavpack + SUBDIR += gstreamer1-plugins-a52dec + SUBDIR += gstreamer1-plugins-amrnb + SUBDIR += gstreamer1-plugins-amrwbdec + SUBDIR += gstreamer1-plugins-cdparanoia + SUBDIR += gstreamer1-plugins-celt + SUBDIR += gstreamer1-plugins-faac + SUBDIR += gstreamer1-plugins-faad + SUBDIR += gstreamer1-plugins-flac + SUBDIR += gstreamer1-plugins-flite + SUBDIR += gstreamer1-plugins-gme + SUBDIR += gstreamer1-plugins-gsm + SUBDIR += gstreamer1-plugins-jack + SUBDIR += gstreamer1-plugins-lame + SUBDIR += gstreamer1-plugins-mad + SUBDIR += gstreamer1-plugins-modplug + SUBDIR += gstreamer1-plugins-ogg + SUBDIR += gstreamer1-plugins-opus + SUBDIR += gstreamer1-plugins-pulse + SUBDIR += gstreamer1-plugins-shout2 + SUBDIR += gstreamer1-plugins-sidplay + SUBDIR += gstreamer1-plugins-soundtouch + SUBDIR += gstreamer1-plugins-speex + SUBDIR += gstreamer1-plugins-taglib + SUBDIR += gstreamer1-plugins-twolame + SUBDIR += gstreamer1-plugins-vorbis + SUBDIR += gstreamer1-plugins-wavpack SUBDIR += gtick SUBDIR += gtkguitune SUBDIR += gtkpod Index: audio/gstreamer1-plugins-a52dec/Makefile =================================================================== --- audio/gstreamer1-plugins-a52dec/Makefile (revision 0) +++ audio/gstreamer1-plugins-a52dec/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= audio + +COMMENT= Gstreamer ATSC A/52 stream aka AC-3 (dvd audio) plugin + +GST_PLUGIN= a52dec +DIST= ugly + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: audio/gstreamer1-plugins-amrnb/Makefile =================================================================== --- audio/gstreamer1-plugins-amrnb/Makefile (revision 0) +++ audio/gstreamer1-plugins-amrnb/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= audio + +COMMENT= Gstreamer OpenCore based Adaptive Multi-Rate Narrow-Band plugin + +GST_PLUGIN= amrnb +DIST= ugly + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: audio/gstreamer1-plugins-amrwbdec/Makefile =================================================================== --- audio/gstreamer1-plugins-amrwbdec/Makefile (revision 0) +++ audio/gstreamer1-plugins-amrwbdec/Makefile (working copy) @@ -0,0 +1,14 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= audio +PKGNAMESUFFIX= 1-plugins-amrwbdec + +COMMENT= Gstreamer OpenCore based Adaptive Multi-Rate Wide-Band Decoder plugin + +GST_PLUGIN= amrwb +DIST= ugly + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: audio/gstreamer1-plugins-cdparanoia/Makefile =================================================================== --- audio/gstreamer1-plugins-cdparanoia/Makefile (revision 0) +++ audio/gstreamer1-plugins-cdparanoia/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= audio + +COMMENT= Gstreamer CDDA extraction (aka audio ripping) plugin + +GST_PLUGIN= cdparanoia +DIST= base + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: audio/gstreamer1-plugins-celt/Makefile =================================================================== --- audio/gstreamer1-plugins-celt/Makefile (revision 0) +++ audio/gstreamer1-plugins-celt/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= audio + +COMMENT= Gstreamer celt plugin + +GST_PLUGIN= celt +DIST= bad + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: audio/gstreamer1-plugins-faac/Makefile =================================================================== --- audio/gstreamer1-plugins-faac/Makefile (revision 0) +++ audio/gstreamer1-plugins-faac/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= audio + +COMMENT= Gstreamer MPEG-2 and MPEG-4 AAC encoder plugin + +GST_PLUGIN= faac +DIST= bad + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: audio/gstreamer1-plugins-faad/Makefile =================================================================== --- audio/gstreamer1-plugins-faad/Makefile (revision 0) +++ audio/gstreamer1-plugins-faad/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= audio + +COMMENT= Gstreamer MPEG-2 and MPEG-4 AAC decoder plugin + +GST_PLUGIN= faad +DIST= bad + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: audio/gstreamer1-plugins-flac/Makefile =================================================================== --- audio/gstreamer1-plugins-flac/Makefile (revision 0) +++ audio/gstreamer1-plugins-flac/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= audio + +COMMENT= Gstreamer free lossless audio encoder/decoder plugin + +GST_PLUGIN= flac +DIST= good + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: audio/gstreamer1-plugins-flite/Makefile =================================================================== --- audio/gstreamer1-plugins-flite/Makefile (revision 0) +++ audio/gstreamer1-plugins-flite/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= audio + +COMMENT= Gstreamer flite run-time speech synthesis engine plugin + +GST_PLUGIN= flite +DIST= bad + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: audio/gstreamer1-plugins-gme/Makefile =================================================================== --- audio/gstreamer1-plugins-gme/Makefile (revision 0) +++ audio/gstreamer1-plugins-gme/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= audio + +COMMENT= Gstreamer gme plugin + +GST_PLUGIN= gme +DIST= bad + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: audio/gstreamer1-plugins-gsm/Makefile =================================================================== --- audio/gstreamer1-plugins-gsm/Makefile (revision 0) +++ audio/gstreamer1-plugins-gsm/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= audio + +COMMENT= Gstreamer gsm encoding/decoding plugin + +GST_PLUGIN= gsm +DIST= bad + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: audio/gstreamer1-plugins-jack/Makefile =================================================================== --- audio/gstreamer1-plugins-jack/Makefile (revision 0) +++ audio/gstreamer1-plugins-jack/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= audio + +COMMENT= Gstreamer low-latency audio server plugin + +GST_PLUGIN= jack +DIST= good + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: audio/gstreamer1-plugins-lame/Makefile =================================================================== --- audio/gstreamer1-plugins-lame/Makefile (revision 0) +++ audio/gstreamer1-plugins-lame/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= audio + +COMMENT= Gstreamer mp3 encode plugin + +GST_PLUGIN= lame +DIST= ugly + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: audio/gstreamer1-plugins-mad/Makefile =================================================================== --- audio/gstreamer1-plugins-mad/Makefile (revision 0) +++ audio/gstreamer1-plugins-mad/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= audio + +COMMENT= Gstreamer mp3 decoder plugin + +GST_PLUGIN= mad +DIST= ugly + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: audio/gstreamer1-plugins-modplug/Makefile =================================================================== --- audio/gstreamer1-plugins-modplug/Makefile (revision 0) +++ audio/gstreamer1-plugins-modplug/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= audio + +COMMENT= Gstreamer modplug plugin + +GST_PLUGIN= modplug +DIST= bad + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: audio/gstreamer1-plugins-ogg/Makefile =================================================================== --- audio/gstreamer1-plugins-ogg/Makefile (revision 0) +++ audio/gstreamer1-plugins-ogg/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= audio + +COMMENT= Gstreamer Ogg bitstream plugin + +GST_PLUGIN= ogg +DIST= base + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: audio/gstreamer1-plugins-opus/Makefile =================================================================== --- audio/gstreamer1-plugins-opus/Makefile (revision 0) +++ audio/gstreamer1-plugins-opus/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= audio + +COMMENT= Gstreamer Opus audio encoder/decoder plugin + +GST_PLUGIN= opus +DIST= bad + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: audio/gstreamer1-plugins-shout2/Makefile =================================================================== --- audio/gstreamer1-plugins-shout2/Makefile (revision 0) +++ audio/gstreamer1-plugins-shout2/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= audio + +COMMENT= Gstreamer icecast plugin + +GST_PLUGIN= shout2 +DIST= good + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: audio/gstreamer1-plugins-sidplay/Makefile =================================================================== --- audio/gstreamer1-plugins-sidplay/Makefile (revision 0) +++ audio/gstreamer1-plugins-sidplay/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= audio + +COMMENT= Gstreamer Commodore SID decoder plugin + +GST_PLUGIN= sidplay +DIST= ugly + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: audio/gstreamer1-plugins-soundtouch/Makefile =================================================================== --- audio/gstreamer1-plugins-soundtouch/Makefile (revision 0) +++ audio/gstreamer1-plugins-soundtouch/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= audio + +COMMENT= GStreamer soundtouch plugin + +GST_PLUGIN= soundtouch +DIST= bad + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: audio/gstreamer1-plugins-speex/Makefile =================================================================== --- audio/gstreamer1-plugins-speex/Makefile (revision 0) +++ audio/gstreamer1-plugins-speex/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= audio + +COMMENT= Gstreamer speex voice plugin + +GST_PLUGIN= speex +DIST= good + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: audio/gstreamer1-plugins-taglib/Makefile =================================================================== --- audio/gstreamer1-plugins-taglib/Makefile (revision 0) +++ audio/gstreamer1-plugins-taglib/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= audio + +COMMENT= Gstreamer taglib plugin + +GST_PLUGIN= taglib +DIST= good + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: audio/gstreamer1-plugins-twolame/Makefile =================================================================== --- audio/gstreamer1-plugins-twolame/Makefile (revision 0) +++ audio/gstreamer1-plugins-twolame/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= audio + +COMMENT= Gstreamer High-quality free MP2 encoder plugin + +GST_PLUGIN= twolame +DIST= ugly + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: audio/gstreamer1-plugins-vorbis/Makefile =================================================================== --- audio/gstreamer1-plugins-vorbis/Makefile (revision 0) +++ audio/gstreamer1-plugins-vorbis/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= audio + +COMMENT= Gstreamer vorbis encoder/decoder plugin + +GST_PLUGIN= vorbis +DIST= base + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: audio/gstreamer1-plugins-wavpack/Makefile =================================================================== --- audio/gstreamer1-plugins-wavpack/Makefile (revision 0) +++ audio/gstreamer1-plugins-wavpack/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= audio + +COMMENT= Gstreamer wavpack plugin + +GST_PLUGIN= wavpack +DIST= good + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: comms/Makefile =================================================================== --- comms/Makefile (revision 315495) +++ comms/Makefile (working copy) @@ -53,6 +53,7 @@ SUBDIR += grig SUBDIR += gscmxx SUBDIR += gsmlib + SUBDIR += gstreamer1-plugins-spandsp SUBDIR += gtkmmorse SUBDIR += hamfax SUBDIR += hamlib Index: comms/gstreamer1-plugins-spandsp/Makefile =================================================================== --- comms/gstreamer1-plugins-spandsp/Makefile (revision 0) +++ comms/gstreamer1-plugins-spandsp/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= comms + +COMMENT= Gstreamer DSP library and software FAX machine plugin + +GST_PLUGIN= spandsp +DIST= bad + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: devel/Makefile =================================================================== --- devel/Makefile (revision 315495) +++ devel/Makefile (working copy) @@ -607,6 +607,7 @@ SUBDIR += gstreamer-plugins-gnomevfs SUBDIR += gstreamer-plugins-sdl SUBDIR += gstreamer-plugins-soup + SUBDIR += gstreamer1-plugins-soup SUBDIR += gtgt SUBDIR += gtkparasite SUBDIR += gtranslator Index: devel/gstreamer1-plugins-soup/Makefile =================================================================== --- devel/gstreamer1-plugins-soup/Makefile (revision 0) +++ devel/gstreamer1-plugins-soup/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= devel + +COMMENT= Gstreamer soup http src plugin + +GST_PLUGIN= soup +DIST= good + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: ftp/Makefile =================================================================== --- ftp/Makefile (revision 315495) +++ ftp/Makefile (working copy) @@ -33,6 +33,7 @@ SUBDIR += gftp SUBDIR += gnusget SUBDIR += gnustep-ftp + SUBDIR += gstreamer1-plugins-curl SUBDIR += gwget SUBDIR += horde-gollem SUBDIR += horde3-gollem Index: ftp/gstreamer1-plugins-curl/Makefile =================================================================== --- ftp/gstreamer1-plugins-curl/Makefile (revision 0) +++ ftp/gstreamer1-plugins-curl/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= ftp + +COMMENT= Gstreamer curl plugin + +GST_PLUGIN= curl +DIST= bad + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: graphics/Makefile =================================================================== --- graphics/Makefile (revision 315495) +++ graphics/Makefile (working copy) @@ -334,6 +334,15 @@ SUBDIR += gstreamer-plugins-libpng SUBDIR += gstreamer-plugins-libvisual SUBDIR += gstreamer-plugins-opencv + SUBDIR += gstreamer1-plugins-aalib + SUBDIR += gstreamer1-plugins-cairo + SUBDIR += gstreamer1-plugins-gdkpixbuf + SUBDIR += gstreamer1-plugins-jpeg + SUBDIR += gstreamer1-plugins-libcaca + SUBDIR += gstreamer1-plugins-libvisual + SUBDIR += gstreamer1-plugins-opencv + SUBDIR += gstreamer1-plugins-png + SUBDIR += gstreamer1-plugins-zbar SUBDIR += gthumb SUBDIR += gtimelapse SUBDIR += gtk-update-icon-cache Index: graphics/gstreamer-plugins-gdkpixbuf/Makefile =================================================================== --- graphics/gstreamer-plugins-gdkpixbuf/Makefile (revision 315495) +++ graphics/gstreamer-plugins-gdkpixbuf/Makefile (working copy) @@ -1,13 +1,10 @@ -# New ports collection makefile for: gstreamer-plugins-gdkpixbuf -# Date created: 3 Oct 2004 -# Whom: Michael Johnson -# +# Created by: Michael Johnson # $FreeBSD$ # $MCom: ports/graphics/gstreamer-plugins-gdkpixbuf/Makefile,v 1.5 2008/03/19 14:05:34 ahze Exp $ -# PORTREVISION= 0 CATEGORIES= graphics +PKGNAMESUFFIX= -plugins-gdkpixbuf COMMENT= Gstreamer image decoder plugin Index: graphics/gstreamer-plugins-libvisual/Makefile =================================================================== --- graphics/gstreamer-plugins-libvisual/Makefile (revision 315495) +++ graphics/gstreamer-plugins-libvisual/Makefile (working copy) @@ -1,12 +1,8 @@ -# New ports collection makefile for: gstreamer-plugins-libvisual -# Date created: 4 Dec 2004 -# Whom: Michael Johnson -# +# Created by: Michael Johnson # $FreeBSD$ # $MCom: ports/graphics/gstreamer-plugins-libvisual/Makefile,v 1.6 2008/03/21 04:01:32 ahze Exp $ -# -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics COMMENT= Gstreamer libvisual plugin Index: graphics/gstreamer1-plugins-aalib/Makefile =================================================================== --- graphics/gstreamer1-plugins-aalib/Makefile (revision 0) +++ graphics/gstreamer1-plugins-aalib/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= graphics + +COMMENT= Gstreamer ASCII art plugin + +GST_PLUGIN= aalib +DIST= good + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: graphics/gstreamer1-plugins-cairo/Makefile =================================================================== --- graphics/gstreamer1-plugins-cairo/Makefile (revision 0) +++ graphics/gstreamer1-plugins-cairo/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= graphics + +COMMENT= Gstreamer vector graphics plugin + +GST_PLUGIN= cairo +DIST= good + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: graphics/gstreamer1-plugins-gdkpixbuf/Makefile =================================================================== --- graphics/gstreamer1-plugins-gdkpixbuf/Makefile (revision 0) +++ graphics/gstreamer1-plugins-gdkpixbuf/Makefile (working copy) @@ -0,0 +1,14 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= graphics +PKGNAMESUFFIX= 1-plugins-gdkpixbuf + +COMMENT= Gstreamer image decoder plugin + +GST_PLUGIN= gdk_pixbuf +DIST= good + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: graphics/gstreamer1-plugins-jpeg/Makefile =================================================================== --- graphics/gstreamer1-plugins-jpeg/Makefile (revision 0) +++ graphics/gstreamer1-plugins-jpeg/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= graphics + +COMMENT= Gstreamer jpeg encoder/decoder plugin + +GST_PLUGIN= jpeg +DIST= good + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: graphics/gstreamer1-plugins-libcaca/Makefile =================================================================== --- graphics/gstreamer1-plugins-libcaca/Makefile (revision 0) +++ graphics/gstreamer1-plugins-libcaca/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= graphics + +COMMENT= Gstreamer color ASCII art plugin + +GST_PLUGIN= libcaca +DIST= good + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: graphics/gstreamer1-plugins-libvisual/Makefile =================================================================== --- graphics/gstreamer1-plugins-libvisual/Makefile (revision 0) +++ graphics/gstreamer1-plugins-libvisual/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= graphics + +COMMENT= Gstreamer libvisual plugin + +GST_PLUGIN= libvisual +DIST= base + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: graphics/gstreamer1-plugins-opencv/Makefile =================================================================== --- graphics/gstreamer1-plugins-opencv/Makefile (revision 0) +++ graphics/gstreamer1-plugins-opencv/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= graphics + +COMMENT= Gstreamer opencv real time computer vision plugin + +GST_PLUGIN= opencv +DIST= bad + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: graphics/gstreamer1-plugins-png/Makefile =================================================================== --- graphics/gstreamer1-plugins-png/Makefile (revision 0) +++ graphics/gstreamer1-plugins-png/Makefile (working copy) @@ -0,0 +1,14 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= graphics +PKGNAMESUFFIX= 1-plugins-png + +COMMENT= Gstreamer png plugin + +GST_PLUGIN= libpng +DIST= good + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: graphics/gstreamer1-plugins-zbar/Makefile =================================================================== --- graphics/gstreamer1-plugins-zbar/Makefile (revision 0) +++ graphics/gstreamer1-plugins-zbar/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= graphics + +COMMENT= Gstreamer ZBar barcode detector plugin + +GST_PLUGIN= zbar +DIST= bad + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: multimedia/Makefile =================================================================== --- multimedia/Makefile (revision 315495) +++ multimedia/Makefile (working copy) @@ -116,6 +116,26 @@ SUBDIR += gstreamer-plugins-x264 SUBDIR += gstreamer-plugins-xvid SUBDIR += gstreamer-qt4 + SUBDIR += gstreamer1 + SUBDIR += gstreamer1-libav + SUBDIR += gstreamer1-plugins + SUBDIR += gstreamer1-plugins-all + SUBDIR += gstreamer1-plugins-assrender + SUBDIR += gstreamer1-plugins-bad + SUBDIR += gstreamer1-plugins-core + SUBDIR += gstreamer1-plugins-dts + SUBDIR += gstreamer1-plugins-dv + SUBDIR += gstreamer1-plugins-dvdread + SUBDIR += gstreamer1-plugins-good + SUBDIR += gstreamer1-plugins-mpeg2dec + SUBDIR += gstreamer1-plugins-mpeg2enc + SUBDIR += gstreamer1-plugins-resindvd + SUBDIR += gstreamer1-plugins-schroedinger + SUBDIR += gstreamer1-plugins-theora + SUBDIR += gstreamer1-plugins-ugly + SUBDIR += gstreamer1-plugins-v4l2 + SUBDIR += gstreamer1-plugins-vpx + SUBDIR += gstreamer1-plugins-x264 SUBDIR += gstreamermm SUBDIR += gsubedit SUBDIR += gtk-recordmydesktop Index: multimedia/gstreamer-plugins/Makefile.common =================================================================== --- multimedia/gstreamer-plugins/Makefile.common (revision 315495) +++ multimedia/gstreamer-plugins/Makefile.common (working copy) @@ -377,7 +377,7 @@ ${GST_LIB_DIR}/libgstpng.la # libvisual -gst_libvisual_LIB_DEPENDS+= visual.0:${PORTSDIR}/graphics/libvisual +gst_libvisual_LIB_DEPENDS+= visual-0.4:${PORTSDIR}/graphics/libvisual04 gst_libvisual_PLIST_FILES= ${GST_LIB_DIR}/libgstlibvisual.la \ ${GST_LIB_DIR}/libgstlibvisual.so gst_libvisual_DIST= base Index: multimedia/gstreamer-plugins-all/Makefile =================================================================== --- multimedia/gstreamer-plugins-all/Makefile (revision 315495) +++ multimedia/gstreamer-plugins-all/Makefile (working copy) @@ -1,14 +1,10 @@ -# New ports collection makefile for: gstreamer-plugins-all -# Date created: 2004-12-12 -# Whom: Michael Johnson -# +# Created by: Michael Johnson # $FreeBSD$ # $MCom: ports/multimedia/gstreamer-plugins-all/Makefile,v 1.8 2006/01/25 18:54:32 ahze Exp $ -# PORTNAME= gstreamer-plugins-all PORTVERSION= 1.3.${GST_VERSION}.${GST_SHLIB_VERSION} -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= multimedia MASTER_SITES= # empty DISTFILES= # empty @@ -21,7 +17,7 @@ USE_GSTREAMER= yes .include "${.CURDIR}/../../Mk/bsd.gstreamer.mk" -.for all in ${_USE_GSTREAMER10_ALL} +.for all in ${_GSTREAMER_PLUGINS} OPTIONS_DEFINE+= ${all:U} ${all:U}_DESC= ${all} plugin OPTIONS_DEFAULT+= ${all:U} Index: multimedia/gstreamer1/Makefile =================================================================== --- multimedia/gstreamer1/Makefile (working copy) +++ multimedia/gstreamer1/Makefile (working copy) @@ -1,53 +1,56 @@ # Created by: Mario Sergio Fujikawa Ferreira # $FreeBSD$ -# $MCom: ports/multimedia/gstreamer/Makefile,v 1.74 2010/03/09 10:11:45 kwm Exp $ +# $MCom: ports/multimedia/gstreamer1/Makefile,v 1.5 2013/01/15 21:43:45 kwm Exp $ -PORTNAME= gstreamer -PORTVERSION= 0.10.36 +PORTNAME= gstreamer1 +PORTVERSION= 1.0.6 CATEGORIES= multimedia MASTER_SITES= http://gstreamer.freedesktop.org/src/gstreamer/ +DISTNAME= ${PORTNAME:S/1//}-${PORTVERSION} MAINTAINER= multimedia@FreeBSD.org -COMMENT= Development framework for creating media applications +COMMENT= Media applications framework +LICENSE= LGPL20 + BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \ - gobject-introspection>=0.9.12:${PORTSDIR}/devel/gobject-introspection + gobject-introspection>=1.31.1:${PORTSDIR}/devel/gobject-introspection RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection -LICENSE= LGPL20 -LICENSE_FILE= ${WRKSRC}/COPYING CFLAGS:= ${CFLAGS} -O2 -Wno-format USES= bison pathfix -USE_BZIP2= yes +USE_XZ= yes USE_GMAKE= yes -USE_GNOME= glib20 libxml2 ltverhack ltasneededhack +MAKE_JOBS_SAVE= yes +USE_GNOME= glib20 ltverhack:0 ltasneededhack USE_PKGCONFIG= build USE_GETTEXT= yes USE_AUTOTOOLS= libtool -CONFIGURE_ARGS= --disable-tests \ - --disable-examples \ - --disable-failing-tests \ - --disable-gtk-doc +#CONFIGURE_ARGS= --disable-tests \ +# --disable-examples \ +# --disable-failing-tests \ +# --disable-fatal-warnings \ +CONFIGURE_ARGS= --disable-gtk-doc --enable-gst-debug --enable-debug +# --enable-gcov CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= ac_cv_func_register_printf_function="no" \ FLEX_PATH="${LOCALBASE}/bin/flex" -PLIST_SUB= VERSION="${GST_VERSION}" +PLIST_SUB= VERSION="${GST10_VERSION}" USE_LDCONFIG= yes -GST_VERSION= 0.10 +GST10_VERSION= 1.0 -MAN1= gst-feedback-${GST_VERSION}.1 gst-inspect-${GST_VERSION}.1 \ - gst-launch-${GST_VERSION}.1 \ - gst-typefind-${GST_VERSION}.1 gst-xmlinspect-${GST_VERSION}.1 \ - gst-xmllaunch-${GST_VERSION}.1 +MAN1= gst-inspect-${GST10_VERSION}.1 gst-launch-${GST10_VERSION}.1 \ + gst-typefind-${GST10_VERSION}.1 OPTIONS_DEFINE= LIBCHECK LIBCHECK_DESC= Unit tests support -.include +.include .if ${PORT_OPTIONS:MLIBCHECK} LIB_DEPENDS+= check:${PORTSDIR}/devel/libcheck +CONFIGURE_ARGS+=--enable-check PLIST_SUB+= CHECK="" .else CONFIGURE_ARGS+=--disable-check @@ -58,4 +61,4 @@ @${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \ ${WRKSRC}/configure -.include +.include Index: multimedia/gstreamer1/distinfo =================================================================== --- multimedia/gstreamer1/distinfo (working copy) +++ multimedia/gstreamer1/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (gstreamer-0.10.36.tar.bz2) = e556a529e0a8cf1cd0afd0cab2af5488c9524e7c3f409de29b5d82bb41ae7a30 -SIZE (gstreamer-0.10.36.tar.bz2) = 3655705 +SHA256 (gstreamer-1.0.6.tar.xz) = 50d4050cd6a23684b6bbf40a9b7c132edfb39fe9db2d81980adaa6e72f4d5826 +SIZE (gstreamer-1.0.6.tar.xz) = 3136000 Index: multimedia/gstreamer1/files/patch-Makefile.in =================================================================== --- multimedia/gstreamer1/files/patch-Makefile.in (working copy) +++ multimedia/gstreamer1/files/patch-Makefile.in (working copy) @@ -1,18 +1,11 @@ ---- Makefile.in.orig 2009-10-19 00:06:14.000000000 +0200 -+++ Makefile.in 2009-10-19 00:07:47.000000000 +0200 -@@ -397,7 +397,6 @@ aclocaldir = $(datadir)/aclocal - aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4 - SUBDIRS = pkgconfig \ - gst libs plugins tools tests \ -- docs \ - po \ - common +--- Makefile.in.orig 2013-03-10 14:50:08.000000000 +0000 ++++ Makefile.in 2013-03-10 14:50:24.000000000 +0000 +@@ -499,7 +499,7 @@ + DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-docbook + aclocaldir = $(datadir)/aclocal + aclocal_DATA = gst-element-check-@GST_API_VERSION@.m4 +-SUBDIRS = pkgconfig gst libs plugins tests docs po m4 common \ ++SUBDIRS = pkgconfig gst libs plugins tests po m4 common \ + $(am__append_1) -@@ -405,7 +404,6 @@ SUBDIRS = pkgconfig \ # These are all the possible subdirs - DIST_SUBDIRS = pkgconfig \ - gst libs plugins tools tests \ -- docs \ - po \ - common - Index: multimedia/gstreamer1/pkg-descr =================================================================== --- multimedia/gstreamer1/pkg-descr (working copy) +++ multimedia/gstreamer1/pkg-descr (working copy) @@ -21,4 +21,4 @@ top of GStreamer and we even include a simple yet functional mediaplayer with GStreamer called Gst-Player -WWW: http://gstreamer.sourceforge.net/ +WWW: http://gstreamer.freedesktop.org/ Index: multimedia/gstreamer1/pkg-plist =================================================================== --- multimedia/gstreamer1/pkg-plist (working copy) +++ multimedia/gstreamer1/pkg-plist (working copy) @@ -1,15 +1,6 @@ -bin/gst-feedback -bin/gst-feedback-%%VERSION%% -bin/gst-inspect bin/gst-inspect-%%VERSION%% -bin/gst-launch bin/gst-launch-%%VERSION%% -bin/gst-typefind bin/gst-typefind-%%VERSION%% -bin/gst-xmlinspect -bin/gst-xmlinspect-%%VERSION%% -bin/gst-xmllaunch -bin/gst-xmllaunch-%%VERSION%% include/gstreamer-%%VERSION%%/gst/base/gstadapter.h include/gstreamer-%%VERSION%%/gst/base/gstbaseparse.h include/gstreamer-%%VERSION%%/gst/base/gstbasesink.h @@ -19,49 +10,50 @@ include/gstreamer-%%VERSION%%/gst/base/gstbytereader.h include/gstreamer-%%VERSION%%/gst/base/gstbytewriter.h include/gstreamer-%%VERSION%%/gst/base/gstcollectpads.h -include/gstreamer-%%VERSION%%/gst/base/gstcollectpads2.h -include/gstreamer-%%VERSION%%/gst/base/gstdataqueue.h include/gstreamer-%%VERSION%%/gst/base/gstpushsrc.h include/gstreamer-%%VERSION%%/gst/base/gsttypefindhelper.h %%CHECK%%include/gstreamer-%%VERSION%%/gst/check/gstbufferstraw.h %%CHECK%%include/gstreamer-%%VERSION%%/gst/check/gstcheck.h %%CHECK%%include/gstreamer-%%VERSION%%/gst/check/gstconsistencychecker.h %%CHECK%%include/gstreamer-%%VERSION%%/gst/check/internal-check.h -include/gstreamer-%%VERSION%%/gst/controller/gstcontroller.h -include/gstreamer-%%VERSION%%/gst/controller/gstcontrolsource.h +include/gstreamer-%%VERSION%%/gst/controller/gstargbcontrolbinding.h +include/gstreamer-%%VERSION%%/gst/controller/gstdirectcontrolbinding.h +include/gstreamer-%%VERSION%%/gst/controller/gsttimedvaluecontrolsource.h include/gstreamer-%%VERSION%%/gst/controller/gstinterpolationcontrolsource.h include/gstreamer-%%VERSION%%/gst/controller/gstlfocontrolsource.h -include/gstreamer-%%VERSION%%/gst/dataprotocol/dataprotocol.h +include/gstreamer-%%VERSION%%/gst/controller/gsttriggercontrolsource.h include/gstreamer-%%VERSION%%/gst/glib-compat.h include/gstreamer-%%VERSION%%/gst/gst.h +include/gstreamer-%%VERSION%%/gst/gstallocator.h include/gstreamer-%%VERSION%%/gst/gstatomicqueue.h include/gstreamer-%%VERSION%%/gst/gstbin.h include/gstreamer-%%VERSION%%/gst/gstbuffer.h include/gstreamer-%%VERSION%%/gst/gstbufferlist.h +include/gstreamer-%%VERSION%%/gst/gstbufferpool.h include/gstreamer-%%VERSION%%/gst/gstbus.h include/gstreamer-%%VERSION%%/gst/gstcaps.h include/gstreamer-%%VERSION%%/gst/gstchildproxy.h include/gstreamer-%%VERSION%%/gst/gstclock.h include/gstreamer-%%VERSION%%/gst/gstcompat.h include/gstreamer-%%VERSION%%/gst/gstconfig.h +include/gstreamer-%%VERSION%%/gst/gstcontrolbinding.h +include/gstreamer-%%VERSION%%/gst/gstcontrolsource.h include/gstreamer-%%VERSION%%/gst/gstdatetime.h include/gstreamer-%%VERSION%%/gst/gstdebugutils.h include/gstreamer-%%VERSION%%/gst/gstelement.h include/gstreamer-%%VERSION%%/gst/gstelementfactory.h +include/gstreamer-%%VERSION%%/gst/gstelementmetadata.h include/gstreamer-%%VERSION%%/gst/gstenumtypes.h include/gstreamer-%%VERSION%%/gst/gsterror.h include/gstreamer-%%VERSION%%/gst/gstevent.h -include/gstreamer-%%VERSION%%/gst/gstfilter.h include/gstreamer-%%VERSION%%/gst/gstformat.h include/gstreamer-%%VERSION%%/gst/gstghostpad.h -include/gstreamer-%%VERSION%%/gst/gstindex.h -include/gstreamer-%%VERSION%%/gst/gstindexfactory.h include/gstreamer-%%VERSION%%/gst/gstinfo.h -include/gstreamer-%%VERSION%%/gst/gstinterface.h include/gstreamer-%%VERSION%%/gst/gstiterator.h include/gstreamer-%%VERSION%%/gst/gstmacros.h -include/gstreamer-%%VERSION%%/gst/gstmarshal.h +include/gstreamer-%%VERSION%%/gst/gstmemory.h include/gstreamer-%%VERSION%%/gst/gstmessage.h +include/gstreamer-%%VERSION%%/gst/gstmeta.h include/gstreamer-%%VERSION%%/gst/gstminiobject.h include/gstreamer-%%VERSION%%/gst/gstobject.h include/gstreamer-%%VERSION%%/gst/gstpad.h @@ -75,6 +67,7 @@ include/gstreamer-%%VERSION%%/gst/gstpreset.h include/gstreamer-%%VERSION%%/gst/gstquery.h include/gstreamer-%%VERSION%%/gst/gstregistry.h +include/gstreamer-%%VERSION%%/gst/gstsample.h include/gstreamer-%%VERSION%%/gst/gstsegment.h include/gstreamer-%%VERSION%%/gst/gststructure.h include/gstreamer-%%VERSION%%/gst/gstsystemclock.h @@ -82,16 +75,17 @@ include/gstreamer-%%VERSION%%/gst/gsttagsetter.h include/gstreamer-%%VERSION%%/gst/gsttask.h include/gstreamer-%%VERSION%%/gst/gsttaskpool.h -include/gstreamer-%%VERSION%%/gst/gsttrace.h +include/gstreamer-%%VERSION%%/gst/gsttoc.h +include/gstreamer-%%VERSION%%/gst/gsttocsetter.h include/gstreamer-%%VERSION%%/gst/gsttypefind.h include/gstreamer-%%VERSION%%/gst/gsttypefindfactory.h include/gstreamer-%%VERSION%%/gst/gsturi.h include/gstreamer-%%VERSION%%/gst/gstutils.h include/gstreamer-%%VERSION%%/gst/gstvalue.h include/gstreamer-%%VERSION%%/gst/gstversion.h -include/gstreamer-%%VERSION%%/gst/gstxml.h include/gstreamer-%%VERSION%%/gst/math-compat.h include/gstreamer-%%VERSION%%/gst/net/gstnet.h +include/gstreamer-%%VERSION%%/gst/net/gstnetaddressmeta.h include/gstreamer-%%VERSION%%/gst/net/gstnetclientclock.h include/gstreamer-%%VERSION%%/gst/net/gstnettimepacket.h include/gstreamer-%%VERSION%%/gst/net/gstnettimeprovider.h @@ -102,8 +96,6 @@ lib/girepository-1.0/GstNet-%%VERSION%%.typelib lib/gstreamer-%%VERSION%%/libgstcoreelements.la lib/gstreamer-%%VERSION%%/libgstcoreelements.so -lib/gstreamer-%%VERSION%%/libgstcoreindexers.la -lib/gstreamer-%%VERSION%%/libgstcoreindexers.so lib/libgstbase-%%VERSION%%.a lib/libgstbase-%%VERSION%%.la lib/libgstbase-%%VERSION%%.so @@ -116,10 +108,6 @@ lib/libgstcontroller-%%VERSION%%.la lib/libgstcontroller-%%VERSION%%.so lib/libgstcontroller-%%VERSION%%.so.0 -lib/libgstdataprotocol-%%VERSION%%.a -lib/libgstdataprotocol-%%VERSION%%.la -lib/libgstdataprotocol-%%VERSION%%.so -lib/libgstdataprotocol-%%VERSION%%.so.0 lib/libgstnet-%%VERSION%%.a lib/libgstnet-%%VERSION%%.la lib/libgstnet-%%VERSION%%.so @@ -132,7 +120,6 @@ libdata/pkgconfig/gstreamer-base-%%VERSION%%.pc %%CHECK%%libdata/pkgconfig/gstreamer-check-%%VERSION%%.pc libdata/pkgconfig/gstreamer-controller-%%VERSION%%.pc -libdata/pkgconfig/gstreamer-dataprotocol-%%VERSION%%.pc libdata/pkgconfig/gstreamer-net-%%VERSION%%.pc libexec/gstreamer-%%VERSION%%/gst-plugin-scanner share/aclocal/gst-element-check-%%VERSION%%.m4 @@ -157,6 +144,7 @@ share/locale/fi/LC_MESSAGES/gstreamer-%%VERSION%%.mo share/locale/fr/LC_MESSAGES/gstreamer-%%VERSION%%.mo share/locale/gl/LC_MESSAGES/gstreamer-%%VERSION%%.mo +share/locale/hr/LC_MESSAGES/gstreamer-%%VERSION%%.mo share/locale/hu/LC_MESSAGES/gstreamer-%%VERSION%%.mo share/locale/id/LC_MESSAGES/gstreamer-%%VERSION%%.mo share/locale/it/LC_MESSAGES/gstreamer-%%VERSION%%.mo @@ -184,7 +172,6 @@ @dirrm libexec/gstreamer-%%VERSION%% @dirrm lib/gstreamer-%%VERSION%% @dirrm include/gstreamer-%%VERSION%%/gst/net -@dirrm include/gstreamer-%%VERSION%%/gst/dataprotocol @dirrm include/gstreamer-%%VERSION%%/gst/controller %%CHECK%%@dirrm include/gstreamer-%%VERSION%%/gst/check @dirrm include/gstreamer-%%VERSION%%/gst/base Index: multimedia/gstreamer1-libav/Makefile =================================================================== --- multimedia/gstreamer1-libav/Makefile (working copy) +++ multimedia/gstreamer1-libav/Makefile (working copy) @@ -1,53 +1,53 @@ -# New ports collection makefile for: gstreamer ffmpeg -# Date created: Thu Feb 26 20:10:39 CET 2004 -# Whom: Koop Mast -# +# Created by: Koop Mast # $FreeBSD$ -# $MCom: ports/multimedia/gstreamer-ffmpeg/Makefile,v 1.14 2006/07/20 13:40:27 ahze Exp $ -# +# $MCom: ports/multimedia/gstreamer1-libav/Makefile,v 1.4 2013/01/15 21:43:45 kwm Exp $ -PORTNAME= gstreamer -PORTVERSION= 0.10.13 +PORTNAME= gstreamer1-libav +PORTVERSION= 1.0.6 CATEGORIES= multimedia -MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-ffmpeg/ -PKGNAMESUFFIX= -ffmpeg -DISTNAME= gst-ffmpeg-${PORTVERSION} +MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-libav/ +DISTNAME= gst-libav-${PORTVERSION} MAINTAINER= multimedia@FreeBSD.org COMMENT= GStreamer plug-in for manipulating MPEG video streams LICENSE= GPLv2 -BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm -LIB_DEPENDS= orc-0.4.0:${PORTSDIR}/devel/orc +BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \ + orc>=0.4.16:${PORTSDIR}/devel/orc +# gstreamer-plugins10>=${GST10_VERSION}${GST10_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins -USE_BZIP2= yes +LIB_DEPENDS= orc-0.4:${PORTSDIR}/devel/orc + +USE_XZ= yes USE_GMAKE= yes USE_LDCONFIG= yes -USE_GSTREAMER= yes +USE_GSTREAMER1= yes GNU_CONFIGURE= yes -FFMPEG_CONFIG= --cc=${CC} \ +USE_PKGCONFIG= build +LIBAV_CONFIG= --cc=${CC} \ --enable-runtime-cpudetect \ --enable-pic LDFLAGS+= -Wl,-Bsymbolic CFLAGS+= -fno-force-addr CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} -PLIST_SUB= VERSION="${GST_VERSION}" +#PLIST_SUB= VERSION="${GST10_VERSION}" +PLIST_SUB= VERSION="1.0" PKG_CONFIG?="${LOCALBASE}/bin/pkg-config" -GST_VERSION=${PORTVERSION:C/..$//} +#GST_VERSION=${PORTVERSION:C/..$//} # sse hardware vector support .if defined(MACHINE_CPU) && (${MACHINE_CPU:Msse} == "sse" || ${MACHINE_CPU:Mamd64} == "amd64") WITH_BUILTIN_VECTOR= yes .else -FFMPEG_CONFIG+= --disable-sse +LIBAV_CONFIG+= --disable-sse .endif # mmx support .if defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx} == "" && ${MACHINE_CPU:Mamd64} == "" -FFMPEG_CONFIG+= --disable-mmx +LIBAV_CONFIG+= --disable-mmx WITHOUT_BUILTIN_VECTOR= yes .endif @@ -56,7 +56,7 @@ CFLAGS+= -msse .endif -CONFIGURE_ARGS+= --with-ffmpeg-extra-configure="${FFMPEG_CONFIG}" +CONFIGURE_ARGS+= --with-libav-extra-configure="${LIBAV_CONFIG}" .include Index: multimedia/gstreamer1-libav/distinfo =================================================================== --- multimedia/gstreamer1-libav/distinfo (working copy) +++ multimedia/gstreamer1-libav/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (gst-ffmpeg-0.10.13.tar.bz2) = 76fca05b08e00134e3cb92fa347507f42cbd48ddb08ed3343a912def187fbb62 -SIZE (gst-ffmpeg-0.10.13.tar.bz2) = 4784059 +SHA256 (gst-libav-1.0.6.tar.xz) = 8ab222a52bf7482e913f2c9a4f490cda8f8ed1acfbc429f27451b0558b08044d +SIZE (gst-libav-1.0.6.tar.xz) = 4236992 Index: multimedia/gstreamer1-libav/pkg-plist =================================================================== --- multimedia/gstreamer1-libav/pkg-plist (working copy) +++ multimedia/gstreamer1-libav/pkg-plist (working copy) @@ -1,6 +1,4 @@ -lib/gstreamer-%%VERSION%%/libgstffmpeg.la -lib/gstreamer-%%VERSION%%/libgstffmpeg.so -lib/gstreamer-%%VERSION%%/libgstffmpegscale.la -lib/gstreamer-%%VERSION%%/libgstffmpegscale.so -lib/gstreamer-%%VERSION%%/libgstpostproc.la -lib/gstreamer-%%VERSION%%/libgstpostproc.so +lib/gstreamer-%%VERSION%%/libgstavscale.la +lib/gstreamer-%%VERSION%%/libgstavscale.so +lib/gstreamer-%%VERSION%%/libgstlibav.la +lib/gstreamer-%%VERSION%%/libgstlibav.so Index: multimedia/gstreamer1-plugins/Makefile =================================================================== --- multimedia/gstreamer1-plugins/Makefile (working copy) +++ multimedia/gstreamer1-plugins/Makefile (working copy) @@ -1,64 +1,69 @@ # Created by: Mario Sergio Fujikawa Ferreira # $FreeBSD$ -# $MCom: ports/multimedia/gstreamer-plugins/Makefile,v 1.125 2010/03/16 19:33:10 mezz Exp $ +# $MCom: ports/multimedia/gstreamer1-plugins/Makefile,v 1.7 2013/01/15 21:43:45 kwm Exp $ PORTNAME= gstreamer PORTVERSION?= ${BASE_PORTVERSION} -# When chasing a shared library for a plug-in bump the PORTREVISION in the -# plug-in port instead, like ${category}/gstreamer-plugin-${PLUGIN}. -PORTREVISION?= 2 -PORTEPOCH= 3 +# When chasing a shared library for a plug-in bump the PORTREVISION in the +# plug-in port instead, like ${category}/gstreamer1-plugin-${PLUGIN}. +PORTREVISION?= 0 CATEGORIES?= multimedia audio MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-plugins-base/:base \ http://gstreamer.freedesktop.org/src/gst-plugins-bad/:bad \ http://gstreamer.freedesktop.org/src/gst-plugins-good/:good \ http://gstreamer.freedesktop.org/src/gst-plugins-ugly/:ugly -PKGNAMESUFFIX?= -plugins${GST_PLUGIN_SUFFIX} +PKGNAMESUFFIX?= 1-plugins${GST_PLUGIN_SUFFIX} MAINTAINER= multimedia@FreeBSD.org COMMENT?= GStreamer written collection of plugins handling several media types -BUILD_DEPENDS+= v4l_compat>=1.0.20110720:${PORTSDIR}/multimedia/v4l_compat \ - gstreamer>=0.10.36:${PORTSDIR}/multimedia/gstreamer \ - orc>=0.4.14:${PORTSDIR}/devel/orc -LIB_DEPENDS+= gstreamer-0.10:${PORTSDIR}/multimedia/gstreamer \ +BUILD_DEPENDS+= gobject-introspection>=1.31.1:${PORTSDIR}/devel/gobject-introspection \ + gstreamer1>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:${PORTSDIR}/multimedia/gstreamer1 \ + iso-codes>=0:${PORTSDIR}/misc/iso-codes \ + orc>=0.4.16:${PORTSDIR}/devel/orc +LIB_DEPENDS+= gstreamer-1.0:${PORTSDIR}/multimedia/gstreamer1 \ + freetype:${PORTSDIR}/print/freetype2 \ orc-0.4:${PORTSDIR}/devel/orc +RUN_DEPENDS+= iso-codes>=0:${PORTSDIR}/misc/iso-codes -CFLAGS:= ${CFLAGS} -O2 -Wno-format - -BASE_PORTVERSION= 0.10.36 +BASE_PORTVERSION= 1.0.6 BASE_DISTNAME= gst-plugins-base-${BASE_PORTVERSION} BASE_DISTFILE= ${BASE_DISTNAME}${EXTRACT_SUFX} -BAD_PORTVERSION= 0.10.23 +BAD_PORTVERSION= 1.0.6 BAD_DISTNAME= gst-plugins-bad-${BAD_PORTVERSION} BAD_DISTFILE= ${BAD_DISTNAME}${EXTRACT_SUFX} -GOOD_PORTVERSION= 0.10.31 +GOOD_PORTVERSION= 1.0.6 GOOD_DISTNAME= gst-plugins-good-${GOOD_PORTVERSION} GOOD_DISTFILE= ${GOOD_DISTNAME}${EXTRACT_SUFX} -UGLY_PORTVERSION= 0.10.19 +UGLY_PORTVERSION= 1.0.6 UGLY_DISTNAME= gst-plugins-ugly-${UGLY_PORTVERSION} UGLY_DISTFILE= ${UGLY_DISTNAME}${EXTRACT_SUFX} -DIST?= good +DIST?= base -SHLIB_VERSION= 1 +SHLIB_VERSION= 0 USE_GETTEXT= yes -VERSION= ${GST_VERSION} +VERSION= ${GST1_VERSION} WANT_GSTREAMER= yes -USE_BZIP2= yes +USE_XZ= yes USE_GMAKE= yes -USE_GNOME+= gnomehack ltverhack ltasneededhack +USES= pathfix +USE_GNOME+= ltverhack:0 ltasneededhack USE_PKGCONFIG= build USE_AUTOTOOLS= libtool GST_PLUGIN?= base +USE_LDCONFIG= yes -CONFIGURE_ARGS= --disable-option-checking +CFLAGS:= ${CFLAGS} -O2 -Wno-format CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${EXTRA_LIBS} ${PTHREAD_LIBS} -CFLAGS+= -I${LOCALBASE}/include DEFAULT_AUDIOSINK?= osssink DEFAULT_AUDIOSRC?= osssrc +.if ${DIST}=="" +IGNORE= DIST not specified +.endif + .include .if ${ARCH}=="i386" @@ -68,17 +73,27 @@ .endif .if ${GST_PLUGIN} == "base" -gst_base_DIST= base +DIST= base NO_GSTREAMER_COMMON= yes -USE_LDCONFIG= yes -USE_XORG= x11 xv xext videoproto xextproto -MAN1= gst-visualise-0.10.1 -PLIST_SUB+= VERSION="${VERSION}" \ - SHLIB_VERSION="${SHLIB_VERSION}" +MAN1= gst-discoverer-1.0.1 .else -USE_GSTREAMER= yes +BUILD_DEPENDS+= gstreamer1-plugins>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:${PORTSDIR}/multimedia/gstreamer1-plugins +RUN_DEPEDNS+= gstreamer1-plugins>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:${PORTSDIR}/multimedia/gstreamer1-plugins .endif +.if ${DIST} == base || ${DIST} == ugly +# --with-default-audiosink specify default audio sink +# --with-default-audiosrc specify default audio source +# --with-default-videosink specify default video sink +# --with-default-videosrc specify default video source +# --with-default-visualizer specify default visualizer +CONFIGURE_ARGS+=--with-default-audiosink="${DEFAULT_AUDIOSINK}" \ + --with-default-audiosrc="${DEFAULT_AUDIOSRC}" +.endif + +PLIST_SUB+= VERSION="${VERSION}" \ + SHLIB_VERSION="${SHLIB_VERSION}" + .include "${MASTERDIR}/Makefile.common" .if ${DIST}=="base" @@ -86,79 +101,66 @@ WRKSRC=${WRKDIR}/${BASE_DISTNAME} PORTVERSION= ${BASE_PORTVERSION} DISTFILES+= ${BASE_DISTFILE}:base -PATCHDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins/files +PATCHDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins/files .elif ${DIST}=="bad" EXTRACT_ONLY=${BAD_DISTFILE} WRKSRC=${WRKDIR}/${BAD_DISTNAME} PORTVERSION= ${BAD_PORTVERSION} DISTFILES+= ${BAD_DISTFILE}:bad -PATCHDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins-bad/files +PATCHDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins-bad/files .elif ${DIST}=="ugly" EXTRACT_ONLY=${UGLY_DISTFILE} WRKSRC=${WRKDIR}/${UGLY_DISTNAME} PORTVERSION= ${UGLY_PORTVERSION} DISTFILES+= ${UGLY_DISTFILE}:ugly -PATCHDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins-ugly/files -.elif ${DIST}=="makesum" -DISTFILES+= ${BASE_DISTFILE}:base ${BAD_DISTFILE}:bad \ - ${UGLY_DISTFILE}:ugly ${GOOD_DISTFILE}:good -.else +PATCHDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins-ugly/files +.elif ${DIST}=="good" EXTRACT_ONLY=${GOOD_DISTFILE} WRKSRC=${WRKDIR}/${GOOD_DISTNAME} PORTVERSION= ${GOOD_PORTVERSION} DISTFILES+= ${GOOD_DISTFILE}:good -PATCHDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins-good/files -.endif - -# cdrom default device -.ifdef(WITH_CDROM_DEVICE) -DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE} +PATCHDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins-good/files +.elif ${DIST}=="makesum" +DISTFILES+= ${BASE_DISTFILE}:base ${BAD_DISTFILE}:bad \ + ${UGLY_DISTFILE}:ugly ${GOOD_DISTFILE}:good .else -DEFAULT_CDROM_DEVICE=/dev/acd0 +BROKEN= Unknown dist setting .endif -# dvd default device +# cdrom/dvd default device .ifdef(WITH_DVD_DEVICE) DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE} .else -DEFAULT_DVD_DEVICE=/dev/acd0 +DEFAULT_DVD_DEVICE=/dev/cd0 .endif post-patch: .if ${DIST}=="bad" - @${REINPLACE_CMD} -e 's|opencv <= 2.2.0|opencv <= 2.3.99|g' \ - -e 's|GST_LIBVERSION=23:0:0|GST_LIBVERSION=0:0:0|g' \ + @${REINPLACE_CMD} -e 's|opencv <= 2.3.1|opencv <= 2.3.99|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|g' \ ${WRKSRC}/ext/resindvd/resindvdbin.c \ ${WRKSRC}/ext/resindvd/resindvdsrc.c .endif - @${FIND} ${WRKSRC}/ext -name Makefile.in | \ +.if ${DIST}!="ugly" + @${FIND} ${WRKSRC}/ext ${WRKSRC}/sys -name Makefile.in | \ ${XARGS} -n 10 ${REINPLACE_CMD} -e \ - 's|$$(top_builddir)/gst-libs/gst/tag/libgsttag-$$(GST_MAJORMINOR).la|${LOCALBASE}/lib/libgsttag-@GST_MAJORMINOR@.la|; \ - s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-$$(GST_MAJORMINOR).la|${LOCALBASE}/lib/libgstaudio-@GST_MAJORMINOR@.la|; \ - s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-$$(GST_MAJORMINOR).la|${LOCALBASE}/lib/libgstriff-@GST_MAJORMINOR@.la|; \ - s|$$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-$$(GST_MAJORMINOR).la|${LOCALBASE}/lib/libgstsignalprocessor-@GST_MAJORMINOR@.la|; \ - s|$$(top_builddir)/gst-libs/gst/video/libgstbasevideo-$$(GST_MAJORMINOR).la|${LOCALBASE}/lib/libgstbasevideo-@GST_MAJORMINOR@.la|; \ - s|$$(top_builddir)/gst-libs/gst/video/libgstvideo-$$(GST_MAJORMINOR).la|${LOCALBASE}/lib/libgstvideo-@GST_MAJORMINOR@.la|; \ - s|$$(top_builddir)/gst-libs/gst/cdda/libgstcdda-$$(GST_MAJORMINOR).la|${LOCALBASE}/lib/libgstcdda-@GST_MAJORMINOR@.la|' - @${FIND} ${WRKSRC} -type f | \ - ${XARGS} -n 10 ${REINPLACE_CMD} -e \ - 's|=0.1.3:${PORTSDIR}/audio/opencore-amr -gst_amrnb_LIB_DEPENDS+= opencore-amrnb.0:${PORTSDIR}/audio/opencore-amr +gst_amrnb_LIB_DEPENDS= opencore-amrnb:${PORTSDIR}/audio/opencore-amr gst_amrnb_PLIST_FILES= ${GST_LIB_DIR}/libgstamrnb.la \ ${GST_LIB_DIR}/libgstamrnb.so \ share/gstreamer-${VERSION}/presets/GstAmrnbEnc.prs gst_amrnb_PLIST_DIRSTRY=share/gstreamer-${VERSION}/presets \ share/gstreamer-${VERSION} -gst_amrnb_DIST= ugly -# amrwbdec -gst_amrwbdec_BUILD_DEPENDS+= opencore-amr>=0.1.3:${PORTSDIR}/audio/opencore-amr -gst_amrwbdec_LIB_DEPENDS+= opencore-amrwb.0:${PORTSDIR}/audio/opencore-amr -gst_amrwbdec_CONFIGURE_ARGS+= --enable-amrwb -gst_amrwbdec_PLIST_FILES= ${GST_LIB_DIR}/libgstamrwbdec.la \ - ${GST_LIB_DIR}/libgstamrwbdec.so -gst_amrwbdec_DIST= ugly +# amrwb +gst_amrwb_LIB_DEPENDS= opencore-amrwb:${PORTSDIR}/audio/opencore-amr +gst_amrwb_GST_PLUGIN_DIR= ext/amrwbdec +gst_amrwb_PLIST_FILES= ${GST_LIB_DIR}/libgstamrwbdec.la \ + ${GST_LIB_DIR}/libgstamrwbdec.so -# annodex -gst_annodex_LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2 -gst_annodex_PLIST_FILES= ${GST_LIB_DIR}/libgstannodex.la \ - ${GST_LIB_DIR}/libgstannodex.so +# assrender +gst_assrender_LIB_DEPENDS= ass:${PORTSDIR}/multimedia/libass -# bz2 -gst_bz2_PLIST_FILES= ${GST_LIB_DIR}/libgstbz2.la \ - ${GST_LIB_DIR}/libgstbz2.so -gst_bz2_DIST= bad - # cairo -gst_cairo_LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo -gst_cairo_PLIST_FILES= ${GST_LIB_DIR}/libgstcairo.la \ - ${GST_LIB_DIR}/libgstcairo.so +gst_cairo_LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo -# cdaudio -gst_cdaudio_LIB_DEPENDS+=cdaudio.1:${PORTSDIR}/audio/libcdaudio -gst_cdaudio_PLIST_FILES= ${GST_LIB_DIR}/libgstcdaudio.la \ - ${GST_LIB_DIR}/libgstcdaudio.so -gst_cdaudio_DIST= bad - # cdparanoia -gst_cdparanoia_LIB_DEPENDS+= cdda_interface.0:${PORTSDIR}/audio/cdparanoia -gst_cdparanoia_EXTRA_LIBS+= -lgstcdda-${VERSION} -gst_cdparanoia_PLIST_FILES= ${GST_LIB_DIR}/libgstcdparanoia.la \ - ${GST_LIB_DIR}/libgstcdparanoia.so -gst_cdparanoia_DIST= base +gst_cdparanoia_LIB_DEPENDS= cdda_interface:${PORTSDIR}/audio/cdparanoia # cdio -gst_cdio_LIB_DEPENDS+= cdio.13:${PORTSDIR}/sysutils/libcdio -gst_cdio_PLIST_FILES= ${GST_LIB_DIR}/libgstcdio.la \ - ${GST_LIB_DIR}/libgstcdio.so -gst_cdio_DIST= ugly +gst_cdio_LIB_DEPENDS= cdio:${PORTSDIR}/sysutils/libcdio +# celt +gst_celt_LIB_DEPENDS= celt0:${PORTSDIR}/audio/celt + +# curl +gst_curl_LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl + # dts -gst_dts_LIB_DEPENDS+= dca.0:${PORTSDIR}/multimedia/libdca +gst_dts_LIB_DEPENDS= dca:${PORTSDIR}/multimedia/libdca gst_dts_PLIST_FILES= ${GST_LIB_DIR}/libgstdtsdec.la \ - ${GST_LIB_DIR}/libgstdtsdec.so -gst_dts_EXTRA_LIBS+= -ldca -gst_dts_DIST= bad + ${GST_LIB_DIR}/libgstdtsdec.so -# dv -gst_dv_LIB_DEPENDS+= dv.4:${PORTSDIR}/multimedia/libdv -gst_dv_PLIST_FILES= ${GST_LIB_DIR}/libgstdv.la \ - ${GST_LIB_DIR}/libgstdv.so +# libdv +gst_libdv_LIB_DEPENDS= dv:${PORTSDIR}/multimedia/libdv +gst_libdv_GST_PLUGIN_DIR= ext/dv +gst_libdv_PLIST_FILES= ${GST_LIB_DIR}/libgstdv.la \ + ${GST_LIB_DIR}/libgstdv.so -# dvd -gst_dvd_LIB_DEPENDS+= dvdread.4:${PORTSDIR}/multimedia/libdvdread -gst_dvd_GST_PLUGIN_DIR= ext/dvdread -gst_dvd_PLIST_FILES= ${GST_LIB_DIR}/libgstdvdread.la \ - ${GST_LIB_DIR}/libgstdvdread.so -gst_dvd_DIST= ugly +# dvdread +gst_dvd_LIB_DEPENDS= dvdread:${PORTSDIR}/multimedia/libdvdread - -# esound -gst_esound_USE_GNOME+= esound -gst_esound_GST_PLUGIN_DIR= ext/esd -gst_esound_CONFIGURE_ENV+= ESD_CFLAGS="`pkg-config --cflags esound`" \ - ESD_LIBS="`pkg-config --libs esound`" -gst_esound_PLIST_FILES= ${GST_LIB_DIR}/libgstesd.so \ - ${GST_LIB_DIR}/libgstesd.la - -# exif -# hmm not a real plugin, seems to be part of metadata? -#gst_exif_LIB_DEPENDS+= exif.12:${PORTSDIR}/graphics/libexif -#gst_exif_PLIST_FILES= ${GST_LIB_DIR}/libgstexif.la \ -# ${GST_LIB_DIR}/libgstexif.so -#gst_exif_DIST= bad - # faac -gst_faac_LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac -gst_faac_PLIST_FILES= ${GST_LIB_DIR}/libgstfaac.la \ - ${GST_LIB_DIR}/libgstfaac.so -gst_faac_DIST= bad +gst_faac_LIB_DEPENDS= faac:${PORTSDIR}/audio/faac # faad -gst_faad_USE_GSTREAMER+= bad -gst_faad_LIB_DEPENDS+= faad.2:${PORTSDIR}/audio/faad -gst_faad_PLIST_FILES= ${GST_LIB_DIR}/libgstfaad.la \ - ${GST_LIB_DIR}/libgstfaad.so -gst_faad_DIST= bad +gst_faad_LIB_DEPENDS= faad:${PORTSDIR}/audio/faad # flac -gst_flac_LIB_DEPENDS+= FLAC.10:${PORTSDIR}/audio/flac -gst_flac_PLIST_FILES= ${GST_LIB_DIR}/libgstflac.la \ - ${GST_LIB_DIR}/libgstflac.so +gst_flac_LIB_DEPENDS= FLAC:${PORTSDIR}/audio/flac # flite -gst_flite_LIB_DEPENDS+= flite.1:${PORTSDIR}/audio/flite -gst_flite_PLIST_FILES= ${GST_LIB_DIR}/libgstflite.la \ - ${GST_LIB_DIR}/libgstflite.so -gst_flite_DIST= bad +gst_flite_LIB_DEPENDS= flite:${PORTSDIR}/audio/flite -# gconf -gst_gconf_USE_GNOME+= gnomeprefix gconf2 -gst_gconf_GST_PLUGIN_DIR= ext/gconf \ - gconf -gst_gconf_CONFIGURE_ARGS+= --enable-schemas-install -gst_gconf_GCONF_SCHEMAS= gstreamer-${GST_VERSION}.schemas -gst_gconf_PLIST_FILES= ${GST_LIB_DIR}/libgstgconfelements.so \ - ${GST_LIB_DIR}/libgstgconfelements.la - # gdk_pixbuf -gst_gdk_pixbuf_USE_GNOME+= gtk20 -gst_gdk_pixbuf_GST_PLUGIN_DIR= ext/gdk_pixbuf +gst_gdk_pixbuf_USE_GNOME+= gdkpixbuf2 gst_gdk_pixbuf_PLIST_FILES= ${GST_LIB_DIR}/libgstgdkpixbuf.la \ ${GST_LIB_DIR}/libgstgdkpixbuf.so -# gio -gst_gio_USE_GNOME+= glib20 -gst_gio_CONFIGURE_ARGS+=--enable-experimental -gst_gio_PLIST_FILES= ${GST_LIB_DIR}/libgstgio.la \ - ${GST_LIB_DIR}/libgstgio.so -gst_gio_DIST= base # gme -gst_gme_LIB_DEPENDS+= gme.0:${PORTSDIR}/audio/libgme -gst_gme_PLIST_FILES= ${GST_LIB_DIR}/libgstgme.la \ - ${GST_LIB_DIR}/libgstgme.so -gst_gme_DIST= bad +gst_gme_LIB_DEPENDS= gme:${PORTSDIR}/audio/libgme -# gnomevfs -gst_gnomevfs_USE_GNOME+= gnomevfs2 -gst_gnomevfs_CONFIGURE_ARGS+=--enable-gnome_vfs -gst_gnomevfs_PLIST_FILES= ${GST_LIB_DIR}/libgstgnomevfs.la \ - ${GST_LIB_DIR}/libgstgnomevfs.so -gst_gnomevfs_DIST= base - # gsm -gst_gsm_LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm -gst_gsm_PLIST_FILES= ${GST_LIB_DIR}/libgstgsm.la \ - ${GST_LIB_DIR}/libgstgsm.so -gst_gsm_DIST= bad +gst_gsm_LIB_DEPENDS= gsm:${PORTSDIR}/audio/gsm -# hal -gst_hal_LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal -gst_hal_PLIST_FILES= ${GST_LIB_DIR}/libgsthalelements.la \ - ${GST_LIB_DIR}/libgsthalelements.so - # jack -gst_jack_LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack -gst_jack_PLIST_FILES= ${GST_LIB_DIR}/libgstjack.la \ - ${GST_LIB_DIR}/libgstjack.so -gst_jack_DIST= good +gst_jack_LIB_DEPENDS= jack:${PORTSDIR}/audio/jack # jpeg -gst_jpeg_LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg -gst_jpeg_PLIST_FILES= ${GST_LIB_DIR}/libgstjpeg.la \ - ${GST_LIB_DIR}/libgstjpeg.so +gst_jpeg_LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg -# ladspa -gst_ladspa_BUILD_DEPENDS+= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa -gst_ladspa_PLIST_FILES= ${GST_LIB_DIR}/libgstladspa.la \ - ${GST_LIB_DIR}/libgstladspa.so -gst_ladspa_DIST= bad - # lame -gst_lame_LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame -gst_lame_PLIST_FILES= ${GST_LIB_DIR}/libgstlame.la \ - ${GST_LIB_DIR}/libgstlame.so -gst_lame_DIST= ugly +gst_lame_LIB_DEPENDS= mp3lame:${PORTSDIR}/audio/lame # libcaca -gst_libcaca_LIB_DEPENDS+= caca.0:${PORTSDIR}/graphics/libcaca -gst_libcaca_PLIST_FILES= ${GST_LIB_DIR}/libgstcacasink.so \ - ${GST_LIB_DIR}/libgstcacasink.la +gst_libcaca_LIB_DEPENDS= caca:${PORTSDIR}/graphics/libcaca +gst_libcaca_PLIST_FILES= ${GST_LIB_DIR}/libgstcacasink.la \ + ${GST_LIB_DIR}/libgstcacasink.so # libmms -gst_libmms_LIB_DEPENDS+= mms.0:${PORTSDIR}/net/libmms +gst_libmms_LIB_DEPENDS= mms:${PORTSDIR}/net/libmms gst_libmms_PLIST_FILES= ${GST_LIB_DIR}/libgstmms.so \ - ${GST_LIB_DIR}/libgstmms.la -gst_libmms_DIST= bad + ${GST_LIB_DIR}/libgstmms.la -# libpng and the snapshot plugin -gst_libpng_LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png -gst_libpng_GST_PLUGIN_DIR= ext/libpng -gst_libpng_PLIST_FILES= ${GST_LIB_DIR}/libgstpng.so \ - ${GST_LIB_DIR}/libgstpng.la +# png +gst_libpng_LIB_DEPENDS= png15:${PORTSDIR}/graphics/png +gst_libpng_PLIST_FILES= ${GST_LIB_DIR}/libgstpng.la \ + ${GST_LIB_DIR}/libgstpng.so # libvisual -gst_libvisual_LIB_DEPENDS+= visual.0:${PORTSDIR}/graphics/libvisual -gst_libvisual_PLIST_FILES= ${GST_LIB_DIR}/libgstlibvisual.la \ - ${GST_LIB_DIR}/libgstlibvisual.so -gst_libvisual_DIST= base +gst_libvisual_LIB_DEPENDS= visual-0.4:${PORTSDIR}/graphics/libvisual04 # mad -gst_mad_LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad \ - id3tag.0:${PORTSDIR}/audio/libid3tag -gst_mad_PLIST_FILES= ${GST_LIB_DIR}/libgstmad.la \ - ${GST_LIB_DIR}/libgstmad.so -gst_mad_DIST= ugly +gst_mad_LIB_DEPENDS= mad:${PORTSDIR}/audio/libmad +# modplug +gst_modplug_LIB_DEPENDS= modplug:${PORTSDIR}/audio/libmodplug + # mpeg2enc -gst_mpeg2enc_LIB_DEPENDS+= mjpegutils-2.0.0:${PORTSDIR}/multimedia/mjpegtools -gst_mpeg2enc_PLIST_FILES= ${GST_LIB_DIR}/libgstmpeg2enc.la \ - ${GST_LIB_DIR}/libgstmpeg2enc.so -gst_mpeg2enc_DIST= bad +gst_mpeg2enc_LIB_DEPENDS= mjpegutils-2.0:${PORTSDIR}/multimedia/mjpegtools # mpeg2dec -gst_mpeg2dec_LIB_DEPENDS+= mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 -gst_mpeg2dec_PLIST_FILES= ${GST_LIB_DIR}/libgstmpeg2dec.la \ - ${GST_LIB_DIR}/libgstmpeg2dec.so -gst_mpeg2dec_DIST= ugly +gst_mpeg2dec_LIB_DEPENDS= mpeg2:${PORTSDIR}/multimedia/libmpeg2 -# musepack -gst_musepack_LIB_DEPENDS+= mpcdec.7:${PORTSDIR}/audio/musepack -gst_musepack_PLIST_FILES= ${GST_LIB_DIR}/libgstmusepack.la \ - ${GST_LIB_DIR}/libgstmusepack.so -gst_musepack_DIST= bad - -# nas -gst_nas_LIB_DEPENDS+= audio.2:${PORTSDIR}/audio/nas -gst_nas_DIST= bad -gst_nas_PLIST_FILES= ${GST_LIB_DIR}/libgstnassink.la \ - ${GST_LIB_DIR}/libgstnassink.so - -# neon -gst_neon_LIB_DEPENDS+= neon.27:${PORTSDIR}/www/neon29 -gst_neon_CONFIGURE_ENV+= NEON_CFLAGS="-I${LOCALBASE}/include/neon" -gst_neon_PLIST_FILES= ${GST_LIB_DIR}/libgstneonhttpsrc.la \ - ${GST_LIB_DIR}/libgstneonhttpsrc.so -gst_neon_DIST= bad - # ogg -gst_ogg_LIB_DEPENDS+= ogg:${PORTSDIR}/audio/libogg -gst_ogg_EXTRA_LIBS+= -lgstriff-${VERSION} -gst_ogg_PLIST_FILES= ${GST_LIB_DIR}/libgstogg.la \ - ${GST_LIB_DIR}/libgstogg.so -gst_ogg_DIST= base +gst_ogg_LIB_DEPENDS= ogg:${PORTSDIR}/audio/libogg # opencv -gst_opencv_LIB_DEPENDS+=opencv_highgui.2:${PORTSDIR}/graphics/opencv -gst_opencv_PLIST_FILES= ${GST_LIB_DIR}/libgstopencv.la \ - ${GST_LIB_DIR}/libgstopencv.so -gst_opencv_DIST= bad +gst_opencv_LIB_DEPENDS= opencv_highgui:${PORTSDIR}/graphics/opencv +# opus +gst_opus_LIB_DEPENDS= opus:${PORTSDIR}/audio/opus + # pango gst_pango_USE_GNOME+= pango -gst_pango_PLIST_FILES= ${GST_LIB_DIR}/libgstpango.la \ - ${GST_LIB_DIR}/libgstpango.so -gst_pango_DIST= base -# pulse -gst_pulse_LIB_DEPENDS= pulse.0:${PORTSDIR}/audio/pulseaudio -gst_pulse_PLIST_FILES= ${GST_LIB_DIR}/libgstpulse.la \ - ${GST_LIB_DIR}/libgstpulse.so -gst_pulse_DIST= good +# pulse (soon) +gst_pulse_LIB_DEPENDS= pulse:${PORTSDIR}/audio/pulseaudio # resindvd gst_resindvd_BUILD_DEPENDS+= libdvdnav>=4.1.2:${PORTSDIR}/multimedia/libdvdnav gst_resindvd_RUN_DEPENDS+= libdvdnav>=4.1.2:${PORTSDIR}/multimedia/libdvdnav -gst_resindvd_PLIST_FILES= ${GST_LIB_DIR}/libresindvd.la \ - ${GST_LIB_DIR}/libresindvd.so -gst_resindvd_DIST= bad -# sdl -gst_sdl_USE_SDL+= sdl -gst_sdl_PLIST_FILES= ${GST_LIB_DIR}/libgstsdl.la \ - ${GST_LIB_DIR}/libgstsdl.so -gst_sdl_DIST= bad - # shout2 -gst_shout2_LIB_DEPENDS+= shout.5:${PORTSDIR}/audio/libshout2 -gst_shout2_PLIST_FILES= ${GST_LIB_DIR}/libgstshout2.la \ - ${GST_LIB_DIR}/libgstshout2.so +# keep the version to tell de difference between libshout and libshout2 +gst_shout2_LIB_DEPENDS= shout.5:${PORTSDIR}/audio/libshout2 # sidplay -gst_sidplay_LIB_DEPENDS+= sidplay.1:${PORTSDIR}/audio/libsidplay +gst_sidplay_LIB_DEPENDS= sidplay:${PORTSDIR}/audio/libsidplay gst_sidplay_PLIST_FILES= ${GST_LIB_DIR}/libgstsid.so \ - ${GST_LIB_DIR}/libgstsid.la -gst_sidplay_DIST= ugly + ${GST_LIB_DIR}/libgstsid.la -# sndfile -gst_sndfile_LIB_DEPENDS+= sndfile.1:${PORTSDIR}/audio/libsndfile -gst_sndfile_PLIST_FILES= ${GST_LIB_DIR}/libgstsndfile.la \ - ${GST_LIB_DIR}/libgstsndfile.so -gst_sndfile_DIST= bad - # soundtouch -gst_soundtouch_LIB_DEPENDS+= SoundTouch.0:${PORTSDIR}/audio/soundtouch -gst_soundtouch_PLIST_FILES= ${GST_LIB_DIR}/libgstsoundtouch.la \ - ${GST_LIB_DIR}/libgstsoundtouch.so -gst_soundtouch_DIST= bad +gst_soundtouch_LIB_DEPENDS= SoundTouch:${PORTSDIR}/audio/soundtouch # souphttpsrc -gst_soup_LIB_DEPENDS+= soup-2.4.1:${PORTSDIR}/devel/libsoup +gst_soup_LIB_DEPENDS= soup-2.4:${PORTSDIR}/devel/libsoup gst_soup_GST_PLUGIN_DIR=ext/soup gst_soup_PLIST_FILES= ${GST_LIB_DIR}/libgstsouphttpsrc.la \ ${GST_LIB_DIR}/libgstsouphttpsrc.so -# spc -gst_spc_LIB_DEPENDS+= openspc.0:${PORTSDIR}/audio/libopenspc -gst_spc_PLIST_FILES= ${GST_LIB_DIR}/libgstspc.la \ - ${GST_LIB_DIR}/libgstspc.so -gst_spc_DIST= bad +# spandsp +# keep shlib version here, so we don't pick up the comms/spandsp port by accident. +gst_spandsp_LIB_DEPENDS= spandsp.2:${PORTSDIR}/comms/spandsp-devel # speex -gst_speex_LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex -gst_speex_PLIST_FILES= ${GST_LIB_DIR}/libgstspeex.la \ - ${GST_LIB_DIR}/libgstspeex.so +gst_speex_LIB_DEPENDS= speex:${PORTSDIR}/audio/speex -# schro(edinger) -gst_schroedinger_LIB_DEPENDS+= schroedinger-1.0.11:${PORTSDIR}/multimedia/schroedinger -gst_schroedinger_CONFIGURE_ARGS+=--enable-schro -gst_schroedinger_PLIST_FILES= ${GST_LIB_DIR}/libgstschro.la \ - ${GST_LIB_DIR}/libgstschro.so -gst_schroedinger_DIST= bad +# schroedinger or schro for short +gst_schro_LIB_DEPENDS= schroedinger-1.0:${PORTSDIR}/multimedia/schroedinger +gst_schro_GST_PLUGIN_DIR= ext/schroedinger -# swfdec -gst_swfdec_LIB_DEPENDS+=swfdec-0.4.1:${PORTSDIR}/graphics/swfdec -gst_swfdec_DIST= bad - # taglib -gst_taglib_LIB_DEPENDS+= tag.1:${PORTSDIR}/audio/taglib -gst_taglib_PLIST_FILES= ${GST_LIB_DIR}/libgsttaglib.la \ - ${GST_LIB_DIR}/libgsttaglib.so +gst_taglib_LIB_DEPENDS= tag:${PORTSDIR}/audio/taglib # theora -gst_theora_LIB_DEPENDS+= theora.0:${PORTSDIR}/multimedia/libtheora -gst_theora_PLIST_FILES= ${GST_LIB_DIR}/libgsttheora.la \ - ${GST_LIB_DIR}/libgsttheora.so -gst_theora_DIST= base +gst_theora_LIB_DEPENDS= theora:${PORTSDIR}/multimedia/libtheora # twolame -gst_twolame_LIB_DEPENDS+= twolame.0:${PORTSDIR}/audio/twolame -gst_twolame_PLIST_FILES= ${GST_LIB_DIR}/libgsttwolame.la \ - ${GST_LIB_DIR}/libgsttwolame.so -gst_twolame_DIST= ugly +gst_twolame_LIB_DEPENDS= twolame:${PORTSDIR}/audio/twolame # gst_v4l2 -gst_gst_v4l2_LIB_DEPENDS+= v4l2.0:${PORTSDIR}/multimedia/libv4l -.if ${OSVERSION} >= 800000 +gst_gst_v4l2_LIB_DEPENDS= v4l2:${PORTSDIR}/multimedia/libv4l gst_gst_v4l2_RUN_DEPENDS+= webcamd:${PORTSDIR}/multimedia/webcamd -.endif gst_gst_v4l2_PLIST_FILES= ${GST_LIB_DIR}/libgstvideo4linux2.la \ - ${GST_LIB_DIR}/libgstvideo4linux2.so -gst_gst_v4l2_CONFIGURE_ARGS+= --enable-gst_v4l2 -gst_gst_v4l2_GST_PLUGIN_DIR=sys/v4l2 -gst_gst_v4l2_DIST= good + ${GST_LIB_DIR}/libgstvideo4linux2.so +gst_gst_v4l2_GST_PLUGIN_DIR= sys/v4l2 -# vdpau -gst_vdpau_LIB_DEPENDS+= vdpau.1:${PORTSDIR}/multimedia/libvdpau -gst_vdpau_GST_PLUGIN_DIR=sys/vdpau -gst_vdpau_PLIST_FILES= ${GST_INC_DIR}/gst/vdpau/gstvdp.h \ - ${GST_INC_DIR}/gst/vdpau/gstvdpbuffer.h \ - ${GST_INC_DIR}/gst/vdpau/gstvdpbufferpool.h \ - ${GST_INC_DIR}/gst/vdpau/gstvdpdecoder.h \ - ${GST_INC_DIR}/gst/vdpau/gstvdpdevice.h \ - ${GST_INC_DIR}/gst/vdpau/gstvdpoutputbuffer.h \ - ${GST_INC_DIR}/gst/vdpau/gstvdpoutputbufferpool.h \ - ${GST_INC_DIR}/gst/vdpau/gstvdpoutputsrcpad.h \ - ${GST_INC_DIR}/gst/vdpau/gstvdputils.h \ - ${GST_INC_DIR}/gst/vdpau/gstvdpvideobuffer.h \ - ${GST_INC_DIR}/gst/vdpau/gstvdpvideobufferpool.h \ - ${GST_INC_DIR}/gst/vdpau/gstvdpvideosrcpad.h \ - ${GST_LIB_DIR}/libgstvdpau.la \ - ${GST_LIB_DIR}/libgstvdpau.so \ - lib/libgstvdp-${VERSION}.la \ - lib/libgstvdp-${VERSION}.so \ - lib/libgstvdp-${VERSION}.so.0 -gst_vdpau_PLIST_DIRS= ${GST_INC_DIR}/gst/vdpau -gst_vdpau_DIST= bad - # vorbis -gst_vorbis_USE_GSTREAMER+= ogg -gst_vorbis_LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis -gst_vorbis_EXTRA_LIBS+= -lgsttag-${VERSION} -lgstaudio-${VERSION} -gst_vorbis_PLIST_FILES= ${GST_LIB_DIR}/libgstvorbis.la \ - ${GST_LIB_DIR}/libgstvorbis.so -gst_vorbis_DIST= base +gst_vorbis_USE_GSTREAMER1+= ogg +gst_vorbis_LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis -# vp8 -gst_vp8_LIB_DEPENDS+= vpx.1:${PORTSDIR}/multimedia/libvpx -gst_vp8_PLIST_FILES= ${GST_LIB_DIR}/libgstvp8.la \ - ${GST_LIB_DIR}/libgstvp8.so -gst_vp8_DIST= bad +# vpx +gst_vpx_LIB_DEPENDS= vpx:${PORTSDIR}/multimedia/libvpx +# X ximage and xvimage sinks +.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 +.endif + +.if ${DIST} == good +# Ximagesrc +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.125:${PORTSDIR}/multimedia/x264 +gst_x264_LIB_DEPENDS= x264:${PORTSDIR}/multimedia/x264 gst_x264_PLIST_FILES= ${GST_LIB_DIR}/libgstx264.la \ - ${GST_LIB_DIR}/libgstx264.so \ - share/gstreamer-${VERSION}/presets/GstX264Enc.prs + ${GST_LIB_DIR}/libgstx264.so \ + share/gstreamer-${VERSION}/presets/GstX264Enc.prs gst_x264_PLIST_DIRSTRY= share/gstreamer-${VERSION}/presets \ share/gstreamer-${VERSION} -gst_x264_DIST= ugly # xvid -gst_xvid_LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid -gst_xvid_PLIST_FILES= ${GST_LIB_DIR}/libgstxvid.la \ - ${GST_LIB_DIR}/libgstxvid.so -gst_xvid_DIST= bad +gst_xvid_LIB_DEPENDS= xvidcore:${PORTSDIR}/multimedia/xvid # wavpack -gst_wavpack_LIB_DEPENDS+= wavpack.2:${PORTSDIR}/audio/wavpack -gst_wavpack_PLIST_FILES= ${GST_LIB_DIR}/libgstwavpack.la \ - ${GST_LIB_DIR}/libgstwavpack.so +gst_wavpack_LIB_DEPENDS= wavpack:${PORTSDIR}/audio/wavpack +# zbar +gst_zbar_LIB_DEPENDS= zbar:${PORTSDIR}/graphics/zbar + .endif # NO_GSTREAMER_COMMON -gst_${GST_PLUGIN}_DIST?= good -DIST= ${gst_${GST_PLUGIN}_DIST} - .if !defined(NO_GSTREAMER_COMMON) gst_${GST_PLUGIN}_BUILD_DEPENDS?= gst_${GST_PLUGIN}_LIB_DEPENDS?= gst_${GST_PLUGIN}_RUN_DEPENDS?= -gst_${GST_PLUGIN}_PLIST_FILES?=${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.so \ - ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.a \ - ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.la +gst_${GST_PLUGIN}_USE_XORG?= +gst_${GST_PLUGIN}_PLIST_FILES?= \ + ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.la \ + ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.so gst_${GST_PLUGIN}_EXTRA_LIBS?= gst_${GST_PLUGIN}_PREBUILD_DIR?= gst_${GST_PLUGIN}_GST_PLUGIN_DIR?= ext/${GST_PLUGIN} gst_${GST_PLUGIN}_POSTBUILD_DIR?= gst_${GST_PLUGIN}_USE_GNOME?= gst_${GST_PLUGIN}_CONFIGURE_ENV?= -gst_${GST_PLUGIN}_GCONF_SCHEMAS?= gst_${GST_PLUGIN}_GLIB_SCHEMAS?= gst_${GST_PLUGIN}_CONFIGURE_ARGS?= gst_${GST_PLUGIN}_USE_SDL?= -gst_${GST_PLUGIN}_USE_GSTREAMER?= +gst_${GST_PLUGIN}_USE_GSTREAMER1?= BUILD_DEPENDS+= ${gst_${GST_PLUGIN}_BUILD_DEPENDS} LIB_DEPENDS+= ${gst_${GST_PLUGIN}_LIB_DEPENDS} @@ -624,23 +449,25 @@ PLIST_DIRS= ${gst_${GST_PLUGIN}_PLIST_DIRS} PLIST_DIRSTRY= ${gst_${GST_PLUGIN}_PLIST_DIRSTRY} EXTRA_LIBS+= ${gst_${GST_PLUGIN}_EXTRA_LIBS} +USE_XORG+= ${gst_${GST_PLUGIN}_USE_XORG} USE_GNOME+= ${gst_${GST_PLUGIN}_USE_GNOME} CONFIGURE_ENV+= ${gst_${GST_PLUGIN}_CONFIGURE_ENV} -.if ${gst_${GST_PLUGIN}_GCONF_SCHEMAS}!="" -GCONF_SCHEMAS= ${gst_${GST_PLUGIN}_GCONF_SCHEMAS} -.endif + .if ${gst_${GST_PLUGIN}_GLIB_SCHEMAS}!="" -GLIB_SCHEMAS= ${gst_${GST_PLUGIN}_GLIB_SCHEMAS} +GLIB_SCHEMAS= ${gst_${GST_PLUGIN}_GLIB_SCHEMAS} .endif -CONFIGURE_ARGS+=${gst_${GST_PLUGIN}_CONFIGURE_ARGS} + +CONFIGURE_ARGS+= ${gst_${GST_PLUGIN}_CONFIGURE_ARGS} + .if ${gst_${GST_PLUGIN}_USE_SDL}!="" -USE_SDL= ${gst_${GST_PLUGIN}_USE_SDL} +USE_SDL= ${gst_${GST_PLUGIN}_USE_SDL} .endif -USE_GSTREAMER+= ${gst_${GST_PLUGIN}_USE_GSTREAMER} ${DIST:S/base/yes/} -GST_PREBUILD_DIR=${gst_${GST_PLUGIN}_GST_PREBUILD_DIR} -GST_PLUGIN_DIR= ${gst_${GST_PLUGIN}_GST_PLUGIN_DIR} -GST_POSTBUILD_DIR=${gst_${GST_PLUGIN}_GST_POSTBUILD_DIR} +USE_GSTREAMER1+= ${gst_${GST_PLUGIN}_USE_GSTREAMER1} ${DIST:base=yes} +GST_PREBUILD_DIR= ${gst_${GST_PLUGIN}_GST_PREBUILD_DIR} +GST_PLUGIN_DIR= ${gst_${GST_PLUGIN}_GST_PLUGIN_DIR} +GST_POSTBUILD_DIR= ${gst_${GST_PLUGIN}_GST_POSTBUILD_DIR} + .if !target(do-build) do-build: .for dir in ${GST_PREBUILD_DIR} ${GST_PLUGIN_DIR} ${GST_POSTBUILD_DIR} Index: multimedia/gstreamer1-plugins/distinfo =================================================================== --- multimedia/gstreamer1-plugins/distinfo (working copy) +++ multimedia/gstreamer1-plugins/distinfo (working copy) @@ -1,8 +1,8 @@ -SHA256 (gst-plugins-base-0.10.36.tar.bz2) = 2cd3b0fa8e9b595db8f514ef7c2bdbcd639a0d63d154c00f8c9b609321f49976 -SIZE (gst-plugins-base-0.10.36.tar.bz2) = 3036143 -SHA256 (gst-plugins-bad-0.10.23.tar.bz2) = 0eae7d1a1357ae8377fded6a1b42e663887beabe0e6cc336e2ef9ada42e11491 -SIZE (gst-plugins-bad-0.10.23.tar.bz2) = 4001543 -SHA256 (gst-plugins-ugly-0.10.19.tar.bz2) = 1ca90059275c0f5dca71d4d1601a8f429b7852baed0723e820703b977e2c8df0 -SIZE (gst-plugins-ugly-0.10.19.tar.bz2) = 1083623 -SHA256 (gst-plugins-good-0.10.31.tar.bz2) = 7e27840e40a7932ef2dc032d7201f9f41afcaf0b437daf5d1d44dc96d9e35ac6 -SIZE (gst-plugins-good-0.10.31.tar.bz2) = 3390378 +SHA256 (gst-plugins-base-1.0.6.tar.xz) = 85e5f99af690f720ccde5ea7e793269d35883a3ead80ca9985fa44e18bb1a4a5 +SIZE (gst-plugins-base-1.0.6.tar.xz) = 2363832 +SHA256 (gst-plugins-bad-1.0.6.tar.xz) = 92130899d0b78b71f1551cada9b10b550e91506c2d7b8b748e5cc18a620d302d +SIZE (gst-plugins-bad-1.0.6.tar.xz) = 3157252 +SHA256 (gst-plugins-ugly-1.0.6.tar.xz) = 8655ceec7533b5d30080a5051025e26ff8d06bea8d03a6b2af56c2f839d60586 +SIZE (gst-plugins-ugly-1.0.6.tar.xz) = 825396 +SHA256 (gst-plugins-good-1.0.6.tar.xz) = 67f7690a9826d9a6ab28b9af2536a6f3e833ee412bd59dd603c48fb3c6823e0d +SIZE (gst-plugins-good-1.0.6.tar.xz) = 2715844 Index: multimedia/gstreamer1-plugins/files/patch-Makefile.in =================================================================== --- multimedia/gstreamer1-plugins/files/patch-Makefile.in (working copy) +++ multimedia/gstreamer1-plugins/files/patch-Makefile.in (working copy) @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2009-11-09 10:37:05.000000000 +0100 -+++ Makefile.in 2009-11-09 10:37:34.000000000 +0100 -@@ -397,19 +397,15 @@ +--- Makefile.in.orig 2013-03-10 14:54:07.000000000 +0000 ++++ Makefile.in 2013-03-10 14:55:01.000000000 +0000 +@@ -483,8 +483,6 @@ gst-libs \ gst sys $(SUBDIRS_EXT) \ tools \ @@ -9,14 +9,3 @@ po \ common \ m4 - - DIST_SUBDIRS = \ - pkgconfig \ -- docs \ - gst-libs \ - gst sys ext \ - tools \ -- tests \ - po \ - common \ - m4 Index: multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_sdp_gstsdpmessage.c =================================================================== --- multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_sdp_gstsdpmessage.c (revision 315495) +++ multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_sdp_gstsdpmessage.c (working copy) @@ -1,11 +0,0 @@ ---- gst-libs/gst/sdp/gstsdpmessage.c.orig 2007-12-02 11:51:45.000000000 -0500 -+++ gst-libs/gst/sdp/gstsdpmessage.c 2007-12-02 11:52:01.000000000 -0500 -@@ -64,7 +64,7 @@ - #ifdef HAVE_SYS_TYPES_H - #include - #endif -- -+#include - #include /* for G_OS_WIN32 */ - - #ifdef G_OS_WIN32 Index: multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_video_video.h =================================================================== --- multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_video_video.h (revision 315495) +++ multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_video_video.h (working copy) @@ -1,14 +0,0 @@ ---- gst-libs/gst/video/video.h.orig 2012-09-08 10:03:46.000000000 +0200 -+++ gst-libs/gst/video/video.h 2012-09-08 10:07:58.000000000 +0200 -@@ -342,9 +342,9 @@ - */ - #define GST_VIDEO_CAPS_RGB8_PALETTED \ - "video/x-raw-rgb, bpp = (int)8, depth = (int)8, " \ -- "width = "GST_VIDEO_SIZE_RANGE" , " \ -+ "width = " GST_VIDEO_SIZE_RANGE " , " \ - "height = " GST_VIDEO_SIZE_RANGE ", " \ -- "framerate = "GST_VIDEO_FPS_RANGE -+ "framerate = " GST_VIDEO_FPS_RANGE - - /** - * GST_VIDEO_CAPS_YUV: Index: multimedia/gstreamer1-plugins/files/patch-sys_v4l_gstv4lelement.h =================================================================== --- multimedia/gstreamer1-plugins/files/patch-sys_v4l_gstv4lelement.h (revision 315495) +++ multimedia/gstreamer1-plugins/files/patch-sys_v4l_gstv4lelement.h (working copy) @@ -1,11 +0,0 @@ ---- sys/v4l/gstv4lelement.h.orig 2008-02-23 15:31:39.000000000 -0500 -+++ sys/v4l/gstv4lelement.h 2008-02-23 15:32:00.000000000 -0500 -@@ -91,6 +91,8 @@ struct _GstV4lElement { - /* X-overlay */ - GstV4lXv *xv; - gulong xwindow_id; -+ -+ gboolean use_read; - }; - - struct _GstV4lElementClass { Index: multimedia/gstreamer1-plugins/files/patch-sys_v4l_v4lsrc_calls.c =================================================================== --- multimedia/gstreamer1-plugins/files/patch-sys_v4l_v4lsrc_calls.c (revision 315495) +++ multimedia/gstreamer1-plugins/files/patch-sys_v4l_v4lsrc_calls.c (working copy) @@ -1,261 +0,0 @@ ---- sys/v4l/v4lsrc_calls.c.orig 2008-03-03 17:29:52.000000000 -0500 -+++ sys/v4l/v4lsrc_calls.c 2008-03-20 23:50:39.000000000 -0400 -@@ -26,12 +26,14 @@ - - #include - #include -+#include - #include - #include - #include - #include - #include - #include -+#include - #include "v4lsrc_calls.h" - #include - -@@ -87,6 +89,51 @@ - return FALSE; - } - -+ if (GST_V4LELEMENT (v4lsrc)->use_read) { -+ struct video_picture vp; -+ struct video_window vw; -+ -+ -+ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCGPICT, &vp) == -1) { -+ GST_ELEMENT_ERROR (v4lsrc, RESOURCE, WRITE, (NULL), -+ ("Error getting current picture info for frame (%d): %s", num, g_strerror (errno))); -+ return FALSE; -+ } -+ -+ vp.palette = v4lsrc->mmap.format; -+ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSPICT, &vp) == -1) { -+ GST_ELEMENT_ERROR (v4lsrc, RESOURCE, WRITE, (NULL), -+ ("Error setting picture info for frame (%d): %s", num, g_strerror (errno))); -+ return FALSE; -+ } -+ -+ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCGWIN, &vw) == -1) { -+ GST_ELEMENT_ERROR (v4lsrc, RESOURCE, WRITE, (NULL), -+ ("Error getting current window properties for frame (%d): %s", num, g_strerror (errno))); -+ return FALSE; -+ } -+ -+ vw.width = v4lsrc->mmap.width; -+ vw.height = v4lsrc->mmap.height; -+ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSWIN, &vw) == -1) { -+ vw.flags &= (0x3F00 - 1); -+ vw.flags |= 15 << 16; -+ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSWIN, &vw) == -1) { -+ GST_ELEMENT_ERROR (v4lsrc, RESOURCE, WRITE, (NULL), -+ ("Error setting window properties for frame (%d): %s", num, g_strerror (errno))); -+ return FALSE; -+ } -+ } -+ -+ -+ if (read(GST_V4LELEMENT (v4lsrc)->video_fd, GST_V4LELEMENT (v4lsrc)->buffer + (1024 * 768 * 3 * num), v4lsrc->mmap.width * v4lsrc->mmap.height * 3/2) < 0) { -+ GST_ELEMENT_ERROR (v4lsrc, RESOURCE, WRITE, (NULL), -+ ("Error queueing a buffer (%d): %s", num, g_strerror (errno))); -+ return FALSE; -+ } -+ goto done; -+ } -+ - /* instruct the driver to prepare capture using buffer frame num */ - v4lsrc->mmap.frame = num; - if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, -@@ -95,6 +142,7 @@ - ("Error queueing a buffer (%d): %s", num, g_strerror (errno))); - return FALSE; - } -+done: - - v4lsrc->frame_queue_state[num] = QUEUE_STATE_QUEUED; - v4lsrc->num_queued++; -@@ -117,6 +165,10 @@ - return FALSE; - } - -+ if (GST_V4LELEMENT (v4lsrc)->use_read) { -+ goto done; -+ } -+ - while (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSYNC, &num) < 0) { - /* if the sync() got interrupted, we can retry */ - if (errno != EINTR) { -@@ -126,6 +178,7 @@ - } - GST_DEBUG_OBJECT (v4lsrc, "Sync got interrupted"); - } -+done: - GST_LOG_OBJECT (v4lsrc, "VIOIOCSYNC on frame %d done", num); - - v4lsrc->frame_queue_state[num] = QUEUE_STATE_SYNCED; -@@ -168,13 +221,28 @@ - GST_V4L_CHECK_OPEN (GST_V4LELEMENT (v4lsrc)); - GST_V4L_CHECK_NOT_ACTIVE (GST_V4LELEMENT (v4lsrc)); - -+ GST_V4LELEMENT (v4lsrc)->use_read = FALSE; -+ - /* request the mmap buffer info: - * total size of mmap buffer, number of frames, offsets of frames */ - if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCGMBUF, - &(v4lsrc->mbuf)) < 0) { -- GST_ELEMENT_ERROR (v4lsrc, RESOURCE, READ, (NULL), -- ("Error getting buffer information: %s", g_strerror (errno))); -- return FALSE; -+ int i; -+ -+ GST_V4LELEMENT (v4lsrc)->buffer = (guint8 *) g_malloc0 (sizeof (guint8) * 1024 * 768 * 3 * MIN_BUFFERS_QUEUED); -+ GST_V4LELEMENT (v4lsrc)->use_read = TRUE; -+ -+ v4lsrc->frame_queue_state = (gint8 *) g_malloc (sizeof (gint8) * MIN_BUFFERS_QUEUED); -+ -+ v4lsrc->mbuf.frames = MIN_BUFFERS_QUEUED; -+ for (i = 0; i < MIN_BUFFERS_QUEUED; i++) { -+ v4lsrc->mbuf.offsets[i] = (1024 * 768 * 3 * i); -+ } -+ -+ /* lock for the frame_state */ -+ v4lsrc->mutex_queue_state = g_mutex_new (); -+ v4lsrc->cond_queue_state = g_cond_new (); -+ goto done; - } - - if (v4lsrc->mbuf.frames < MIN_BUFFERS_QUEUED) { -@@ -205,6 +273,7 @@ - GST_V4LELEMENT (v4lsrc)->buffer = NULL; - return FALSE; - } -+done: - - return TRUE; - } -@@ -413,10 +482,14 @@ - v4lsrc->frame_queue_state = NULL; - - /* unmap the buffer */ -- if (munmap (GST_V4LELEMENT (v4lsrc)->buffer, v4lsrc->mbuf.size) == -1) { -- GST_ELEMENT_ERROR (v4lsrc, RESOURCE, CLOSE, (NULL), -- ("error munmap'ing capture buffer: %s", g_strerror (errno))); -- return FALSE; -+ if (GST_V4LELEMENT (v4lsrc)->use_read) { -+ g_free (GST_V4LELEMENT (v4lsrc)->buffer); -+ } else { -+ if (munmap (GST_V4LELEMENT (v4lsrc)->buffer, v4lsrc->mbuf.size) == -1) { -+ GST_ELEMENT_ERROR (v4lsrc, RESOURCE, CLOSE, (NULL), -+ ("error munmap'ing capture buffer: %s", g_strerror (errno))); -+ return FALSE; -+ } - } - GST_V4LELEMENT (v4lsrc)->buffer = NULL; - -@@ -446,6 +519,7 @@ - /* so, we need a buffer and some more stuff */ - int frame = 0; - guint8 *buffer; -+ gboolean use_read = FALSE; - struct video_mbuf vmbuf; - struct video_mmap vmmap; - -@@ -456,24 +530,72 @@ - - /* let's start by requesting a buffer and mmap()'ing it */ - if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCGMBUF, &vmbuf) < 0) { -- GST_ELEMENT_ERROR (v4lsrc, RESOURCE, READ, (NULL), -- ("Error getting buffer information: %s", g_strerror (errno))); -- return FALSE; -- } -- /* Map the buffers */ -- buffer = mmap (NULL, vmbuf.size, PROT_READ | PROT_WRITE, -- MAP_SHARED, GST_V4LELEMENT (v4lsrc)->video_fd, 0); -- if (buffer == MAP_FAILED) { -- GST_ELEMENT_ERROR (v4lsrc, RESOURCE, OPEN_READ_WRITE, (NULL), -- ("Error mapping our try-out buffer: %s", g_strerror (errno))); -- return FALSE; -- } -+ buffer = (gint8 *) g_malloc0 (sizeof (gint8) * 1024 * 768 * 3); -+ use_read = TRUE; -+ } else { -+ /* Map the buffers */ -+ buffer = mmap (0, vmbuf.size, PROT_READ | PROT_WRITE, -+ MAP_SHARED, GST_V4LELEMENT (v4lsrc)->video_fd, 0); -+ if (buffer == MAP_FAILED) { -+ GST_ELEMENT_ERROR (v4lsrc, RESOURCE, OPEN_READ_WRITE, (NULL), -+ ("Error mapping our try-out buffer: %s", g_strerror (errno))); -+ return FALSE; -+ } -+ } - - /* now that we have a buffer, let's try out our format */ - vmmap.width = width; - vmmap.height = height; - vmmap.format = palette; - vmmap.frame = frame; -+ if (use_read) { -+ struct video_picture vp; -+ struct video_window vw; -+ -+ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCGWIN, &vw) == -1) { -+ GST_ERROR_OBJECT (v4lsrc, -+ "Error getting current window properties: %s", g_strerror (errno)); -+ g_free (buffer); -+ return FALSE; -+ } -+ -+ vw.width = width; -+ vw.height = height; -+ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSWIN, &vw) == -1) { -+ vw.flags &= (0x3F00 - 1); -+ vw.flags |= 15 << 16; -+ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSWIN, &vw) == -1) { -+ GST_ERROR_OBJECT (v4lsrc, -+ "Error setting window properties: %s", g_strerror (errno)); -+ g_free (buffer); -+ return FALSE; -+ } -+ } -+ -+ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCGPICT, &vp) == -1) { -+ GST_ERROR_OBJECT (v4lsrc, -+ "Error getting current picture info: %s", g_strerror (errno)); -+ g_free (buffer); -+ return FALSE; -+ } -+ -+ vp.palette = palette; -+ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSPICT, &vp) == -1) { -+ GST_ERROR_OBJECT (v4lsrc, -+ "Error setting picture info: %s", g_strerror (errno)); -+ g_free (buffer); -+ return FALSE; -+ } -+ -+ -+ if (read (GST_V4LELEMENT (v4lsrc)->video_fd, buffer, width * height * 3/2) < 0) { -+ GST_ERROR_OBJECT (v4lsrc, -+ "Error reading into our try-out buffer: %s", g_strerror (errno)); -+ g_free (buffer); -+ return FALSE; -+ } -+ goto done; -+ } - if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCMCAPTURE, &vmmap) < 0) { - if (errno != EINVAL) /* our format failed! */ - GST_ERROR_OBJECT (v4lsrc, -@@ -488,7 +610,11 @@ - return FALSE; - } - -- munmap (buffer, vmbuf.size); -+done: -+ if (use_read) -+ g_free (buffer); -+ else -+ munmap (buffer, vmbuf.size); - - /* if we got here, it worked! woohoo, the format is supported! */ - return TRUE; Index: multimedia/gstreamer1-plugins/pkg-descr =================================================================== --- multimedia/gstreamer1-plugins/pkg-descr (working copy) +++ multimedia/gstreamer1-plugins/pkg-descr (working copy) @@ -14,4 +14,4 @@ - Pipelines can be saved to XML and loaded back to working state - Resource friendly plugins don't waste RAM -WWW: http://gstreamer.sourceforge.net/ +WWW: http://gstreamer.freedesktop.org/ Index: multimedia/gstreamer1-plugins/pkg-plist =================================================================== --- multimedia/gstreamer1-plugins/pkg-plist (working copy) +++ multimedia/gstreamer1-plugins/pkg-plist (working copy) @@ -1,44 +1,29 @@ bin/gst-discoverer-%%VERSION%% -bin/gst-visualise-%%VERSION%% -include/gstreamer-%%VERSION%%/gst/app/gstappbuffer.h include/gstreamer-%%VERSION%%/gst/app/gstappsink.h include/gstreamer-%%VERSION%%/gst/app/gstappsrc.h +include/gstreamer-%%VERSION%%/gst/audio/audio-channels.h +include/gstreamer-%%VERSION%%/gst/audio/audio-enumtypes.h +include/gstreamer-%%VERSION%%/gst/audio/audio-format.h +include/gstreamer-%%VERSION%%/gst/audio/audio-info.h include/gstreamer-%%VERSION%%/gst/audio/audio.h -include/gstreamer-%%VERSION%%/gst/audio/audio-enumtypes.h +include/gstreamer-%%VERSION%%/gst/audio/gstaudiobasesink.h +include/gstreamer-%%VERSION%%/gst/audio/gstaudiobasesrc.h +include/gstreamer-%%VERSION%%/gst/audio/gstaudiocdsrc.h include/gstreamer-%%VERSION%%/gst/audio/gstaudioclock.h include/gstreamer-%%VERSION%%/gst/audio/gstaudiodecoder.h include/gstreamer-%%VERSION%%/gst/audio/gstaudioencoder.h +include/gstreamer-%%VERSION%%/gst/audio/gstaudiofilter.h include/gstreamer-%%VERSION%%/gst/audio/gstaudioiec61937.h -include/gstreamer-%%VERSION%%/gst/audio/gstaudiofilter.h +include/gstreamer-%%VERSION%%/gst/audio/gstaudiometa.h +include/gstreamer-%%VERSION%%/gst/audio/gstaudioringbuffer.h include/gstreamer-%%VERSION%%/gst/audio/gstaudiosink.h include/gstreamer-%%VERSION%%/gst/audio/gstaudiosrc.h -include/gstreamer-%%VERSION%%/gst/audio/gstbaseaudiosink.h -include/gstreamer-%%VERSION%%/gst/audio/gstbaseaudiosrc.h -include/gstreamer-%%VERSION%%/gst/audio/gstringbuffer.h -include/gstreamer-%%VERSION%%/gst/audio/mixerutils.h -include/gstreamer-%%VERSION%%/gst/audio/multichannel.h -include/gstreamer-%%VERSION%%/gst/cdda/gstcddabasesrc.h +include/gstreamer-%%VERSION%%/gst/audio/streamvolume.h include/gstreamer-%%VERSION%%/gst/fft/gstfft.h include/gstreamer-%%VERSION%%/gst/fft/gstfftf32.h include/gstreamer-%%VERSION%%/gst/fft/gstfftf64.h include/gstreamer-%%VERSION%%/gst/fft/gstffts16.h include/gstreamer-%%VERSION%%/gst/fft/gstffts32.h -include/gstreamer-%%VERSION%%/gst/floatcast/floatcast.h -include/gstreamer-%%VERSION%%/gst/interfaces/colorbalance.h -include/gstreamer-%%VERSION%%/gst/interfaces/colorbalancechannel.h -include/gstreamer-%%VERSION%%/gst/interfaces/interfaces-enumtypes.h -include/gstreamer-%%VERSION%%/gst/interfaces/mixer.h -include/gstreamer-%%VERSION%%/gst/interfaces/mixeroptions.h -include/gstreamer-%%VERSION%%/gst/interfaces/mixertrack.h -include/gstreamer-%%VERSION%%/gst/interfaces/navigation.h -include/gstreamer-%%VERSION%%/gst/interfaces/propertyprobe.h -include/gstreamer-%%VERSION%%/gst/interfaces/streamvolume.h -include/gstreamer-%%VERSION%%/gst/interfaces/tuner.h -include/gstreamer-%%VERSION%%/gst/interfaces/tunerchannel.h -include/gstreamer-%%VERSION%%/gst/interfaces/tunernorm.h -include/gstreamer-%%VERSION%%/gst/interfaces/videoorientation.h -include/gstreamer-%%VERSION%%/gst/interfaces/xoverlay.h -include/gstreamer-%%VERSION%%/gst/netbuffer/gstnetbuffer.h include/gstreamer-%%VERSION%%/gst/pbutils/codec-utils.h include/gstreamer-%%VERSION%%/gst/pbutils/descriptions.h include/gstreamer-%%VERSION%%/gst/pbutils/encoding-profile.h @@ -52,14 +37,13 @@ include/gstreamer-%%VERSION%%/gst/riff/riff-ids.h include/gstreamer-%%VERSION%%/gst/riff/riff-media.h include/gstreamer-%%VERSION%%/gst/riff/riff-read.h -include/gstreamer-%%VERSION%%/gst/rtp/gstbasertpaudiopayload.h -include/gstreamer-%%VERSION%%/gst/rtp/gstbasertpdepayload.h -include/gstreamer-%%VERSION%%/gst/rtp/gstbasertppayload.h include/gstreamer-%%VERSION%%/gst/rtp/gstrtcpbuffer.h +include/gstreamer-%%VERSION%%/gst/rtp/gstrtpbaseaudiopayload.h +include/gstreamer-%%VERSION%%/gst/rtp/gstrtpbasedepayload.h +include/gstreamer-%%VERSION%%/gst/rtp/gstrtpbasepayload.h include/gstreamer-%%VERSION%%/gst/rtp/gstrtpbuffer.h include/gstreamer-%%VERSION%%/gst/rtp/gstrtppayloads.h include/gstreamer-%%VERSION%%/gst/rtsp/gstrtsp-enumtypes.h -include/gstreamer-%%VERSION%%/gst/rtsp/gstrtspbase64.h include/gstreamer-%%VERSION%%/gst/rtsp/gstrtspconnection.h include/gstreamer-%%VERSION%%/gst/rtsp/gstrtspdefs.h include/gstreamer-%%VERSION%%/gst/rtsp/gstrtspextension.h @@ -73,16 +57,30 @@ include/gstreamer-%%VERSION%%/gst/tag/gsttagmux.h include/gstreamer-%%VERSION%%/gst/tag/tag.h include/gstreamer-%%VERSION%%/gst/tag/xmpwriter.h +include/gstreamer-%%VERSION%%/gst/video/colorbalance.h +include/gstreamer-%%VERSION%%/gst/video/colorbalancechannel.h +include/gstreamer-%%VERSION%%/gst/video/gstvideodecoder.h +include/gstreamer-%%VERSION%%/gst/video/gstvideoencoder.h include/gstreamer-%%VERSION%%/gst/video/gstvideofilter.h +include/gstreamer-%%VERSION%%/gst/video/gstvideometa.h +include/gstreamer-%%VERSION%%/gst/video/gstvideopool.h include/gstreamer-%%VERSION%%/gst/video/gstvideosink.h -include/gstreamer-%%VERSION%%/gst/video/video.h +include/gstreamer-%%VERSION%%/gst/video/gstvideoutils.h +include/gstreamer-%%VERSION%%/gst/video/navigation.h +include/gstreamer-%%VERSION%%/gst/video/video-blend.h +include/gstreamer-%%VERSION%%/gst/video/video-color.h include/gstreamer-%%VERSION%%/gst/video/video-enumtypes.h +include/gstreamer-%%VERSION%%/gst/video/video-event.h +include/gstreamer-%%VERSION%%/gst/video/video-format.h +include/gstreamer-%%VERSION%%/gst/video/video-frame.h +include/gstreamer-%%VERSION%%/gst/video/video-info.h include/gstreamer-%%VERSION%%/gst/video/video-overlay-composition.h +include/gstreamer-%%VERSION%%/gst/video/video.h +include/gstreamer-%%VERSION%%/gst/video/videoorientation.h +include/gstreamer-%%VERSION%%/gst/video/videooverlay.h lib/girepository-1.0/GstApp-%%VERSION%%.typelib lib/girepository-1.0/GstAudio-%%VERSION%%.typelib lib/girepository-1.0/GstFft-%%VERSION%%.typelib -lib/girepository-1.0/GstInterfaces-%%VERSION%%.typelib -lib/girepository-1.0/GstNetbuffer-%%VERSION%%.typelib lib/girepository-1.0/GstPbutils-%%VERSION%%.typelib lib/girepository-1.0/GstRiff-%%VERSION%%.typelib lib/girepository-1.0/GstRtp-%%VERSION%%.typelib @@ -102,26 +100,20 @@ lib/gstreamer-%%VERSION%%/libgstaudioresample.so lib/gstreamer-%%VERSION%%/libgstaudiotestsrc.la lib/gstreamer-%%VERSION%%/libgstaudiotestsrc.so -lib/gstreamer-%%VERSION%%/libgstdecodebin.la -lib/gstreamer-%%VERSION%%/libgstdecodebin.so -lib/gstreamer-%%VERSION%%/libgstdecodebin2.la -lib/gstreamer-%%VERSION%%/libgstdecodebin2.so lib/gstreamer-%%VERSION%%/libgstencodebin.la lib/gstreamer-%%VERSION%%/libgstencodebin.so -lib/gstreamer-%%VERSION%%/libgstffmpegcolorspace.la -lib/gstreamer-%%VERSION%%/libgstffmpegcolorspace.so -lib/gstreamer-%%VERSION%%/libgstgdp.la -lib/gstreamer-%%VERSION%%/libgstgdp.so -lib/gstreamer-%%VERSION%%/libgstplaybin.la -lib/gstreamer-%%VERSION%%/libgstplaybin.so +lib/gstreamer-%%VERSION%%/libgstgio.la +lib/gstreamer-%%VERSION%%/libgstgio.so +lib/gstreamer-%%VERSION%%/libgstplayback.la +lib/gstreamer-%%VERSION%%/libgstplayback.so lib/gstreamer-%%VERSION%%/libgstsubparse.la lib/gstreamer-%%VERSION%%/libgstsubparse.so lib/gstreamer-%%VERSION%%/libgsttcp.la lib/gstreamer-%%VERSION%%/libgsttcp.so lib/gstreamer-%%VERSION%%/libgsttypefindfunctions.la lib/gstreamer-%%VERSION%%/libgsttypefindfunctions.so -lib/gstreamer-%%VERSION%%/libgstvideo4linux.la -lib/gstreamer-%%VERSION%%/libgstvideo4linux.so +lib/gstreamer-%%VERSION%%/libgstvideoconvert.la +lib/gstreamer-%%VERSION%%/libgstvideoconvert.so lib/gstreamer-%%VERSION%%/libgstvideorate.la lib/gstreamer-%%VERSION%%/libgstvideorate.so lib/gstreamer-%%VERSION%%/libgstvideoscale.la @@ -130,10 +122,6 @@ lib/gstreamer-%%VERSION%%/libgstvideotestsrc.so lib/gstreamer-%%VERSION%%/libgstvolume.la lib/gstreamer-%%VERSION%%/libgstvolume.so -lib/gstreamer-%%VERSION%%/libgstximagesink.la -lib/gstreamer-%%VERSION%%/libgstximagesink.so -lib/gstreamer-%%VERSION%%/libgstxvimagesink.la -lib/gstreamer-%%VERSION%%/libgstxvimagesink.so lib/libgstapp-%%VERSION%%.la lib/libgstapp-%%VERSION%%.so lib/libgstapp-%%VERSION%%.so.0 @@ -141,22 +129,10 @@ lib/libgstaudio-%%VERSION%%.la lib/libgstaudio-%%VERSION%%.so lib/libgstaudio-%%VERSION%%.so.0 -lib/libgstcdda-%%VERSION%%.a -lib/libgstcdda-%%VERSION%%.la -lib/libgstcdda-%%VERSION%%.so -lib/libgstcdda-%%VERSION%%.so.0 lib/libgstfft-%%VERSION%%.a lib/libgstfft-%%VERSION%%.la lib/libgstfft-%%VERSION%%.so lib/libgstfft-%%VERSION%%.so.0 -lib/libgstinterfaces-%%VERSION%%.a -lib/libgstinterfaces-%%VERSION%%.la -lib/libgstinterfaces-%%VERSION%%.so -lib/libgstinterfaces-%%VERSION%%.so.0 -lib/libgstnetbuffer-%%VERSION%%.a -lib/libgstnetbuffer-%%VERSION%%.la -lib/libgstnetbuffer-%%VERSION%%.so -lib/libgstnetbuffer-%%VERSION%%.so.0 lib/libgstpbutils-%%VERSION%%.a lib/libgstpbutils-%%VERSION%%.la lib/libgstpbutils-%%VERSION%%.so @@ -187,11 +163,7 @@ lib/libgstvideo-%%VERSION%%.so.0 libdata/pkgconfig/gstreamer-app-%%VERSION%%.pc libdata/pkgconfig/gstreamer-audio-%%VERSION%%.pc -libdata/pkgconfig/gstreamer-cdda-%%VERSION%%.pc libdata/pkgconfig/gstreamer-fft-%%VERSION%%.pc -libdata/pkgconfig/gstreamer-floatcast-%%VERSION%%.pc -libdata/pkgconfig/gstreamer-interfaces-%%VERSION%%.pc -libdata/pkgconfig/gstreamer-netbuffer-%%VERSION%%.pc libdata/pkgconfig/gstreamer-pbutils-%%VERSION%%.pc libdata/pkgconfig/gstreamer-plugins-base-%%VERSION%%.pc libdata/pkgconfig/gstreamer-riff-%%VERSION%%.pc @@ -203,8 +175,6 @@ share/gir-1.0/GstApp-%%VERSION%%.gir share/gir-1.0/GstAudio-%%VERSION%%.gir share/gir-1.0/GstFft-%%VERSION%%.gir -share/gir-1.0/GstInterfaces-%%VERSION%%.gir -share/gir-1.0/GstNetbuffer-%%VERSION%%.gir share/gir-1.0/GstPbutils-%%VERSION%%.gir share/gir-1.0/GstRiff-%%VERSION%%.gir share/gir-1.0/GstRtp-%%VERSION%%.gir @@ -212,7 +182,7 @@ share/gir-1.0/GstSdp-%%VERSION%%.gir share/gir-1.0/GstTag-%%VERSION%%.gir share/gir-1.0/GstVideo-%%VERSION%%.gir -share/gst-plugins-base/license-translations.dict +share/gst-plugins-base/1.0/license-translations.dict share/locale/af/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/az/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/bg/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo @@ -228,6 +198,7 @@ share/locale/fi/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/fr/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/gl/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo +share/locale/hr/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/hu/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/id/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/it/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo @@ -240,6 +211,7 @@ share/locale/pl/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/pt_BR/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/ro/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo +share/locale/ru/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/sk/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/sl/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/sq/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo @@ -248,9 +220,9 @@ share/locale/tr/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/uk/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/vi/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo -share/locale/ru/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/zh_CN/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo -@dirrm share/gst-plugins-base +@dirrm share/gst-plugins-base/1.0 +@dirrmtry share/gst-plugins-base @dirrm include/gstreamer-%%VERSION%%/gst/video @dirrm include/gstreamer-%%VERSION%%/gst/tag @dirrm include/gstreamer-%%VERSION%%/gst/sdp @@ -258,10 +230,6 @@ @dirrm include/gstreamer-%%VERSION%%/gst/rtp @dirrm include/gstreamer-%%VERSION%%/gst/riff @dirrm include/gstreamer-%%VERSION%%/gst/pbutils -@dirrm include/gstreamer-%%VERSION%%/gst/netbuffer -@dirrm include/gstreamer-%%VERSION%%/gst/interfaces -@dirrm include/gstreamer-%%VERSION%%/gst/floatcast @dirrm include/gstreamer-%%VERSION%%/gst/fft -@dirrm include/gstreamer-%%VERSION%%/gst/cdda @dirrm include/gstreamer-%%VERSION%%/gst/audio @dirrm include/gstreamer-%%VERSION%%/gst/app Index: multimedia/gstreamer1-plugins-all/Makefile =================================================================== --- multimedia/gstreamer1-plugins-all/Makefile (working copy) +++ multimedia/gstreamer1-plugins-all/Makefile (working copy) @@ -1,27 +1,23 @@ -# New ports collection makefile for: gstreamer-plugins-all -# Date created: 2004-12-12 -# Whom: Michael Johnson -# +# Created by: Michael Johnson # $FreeBSD$ -# $MCom: ports/multimedia/gstreamer-plugins-all/Makefile,v 1.8 2006/01/25 18:54:32 ahze Exp $ -# -PORTNAME= gstreamer-plugins-all -PORTVERSION= 1.3.${GST_VERSION}.${GST_SHLIB_VERSION} -PORTREVISION= 13 +PORTNAME= gstreamer1-plugins-all +PORTVERSION= ${GST1_VERSION} +PORTREVISION= 0 CATEGORIES= multimedia MASTER_SITES= # empty DISTFILES= # empty EXTRACT_ONLY= # empty MAINTAINER= multimedia@FreeBSD.org -COMMENT= Meta-port of all gstreamer plugins with options +COMMENT= Meta-port of all gstreamer 1.x plugins with options NO_BUILD= yes -USE_GSTREAMER= yes +USE_GSTREAMER1= yes + .include "${.CURDIR}/../../Mk/bsd.gstreamer.mk" -.for all in ${_USE_GSTREAMER10_ALL} +.for all in ${_GSTREAMER_PLUGINS} OPTIONS_DEFINE+= ${all:U} ${all:U}_DESC= ${all} plugin OPTIONS_DEFAULT+= ${all:U} @@ -33,7 +29,6 @@ .if defined(PACKAGE_BUILDING) PORT_OPTIONS:= ${PORT_OPTIONS:NFAAC} # Mp4 Dolby license , no package PORT_OPTIONS:= ${PORT_OPTIONS:NLAME} # MP3 License , no package -PORT_OPTIONS:= ${PORT_OPTIONS:NPEG2ENC} # Broken PORT_OPTIONS:= ${PORT_OPTIONS:NVDPAU} # Needs to be build agains running kernel .endif @@ -43,7 +38,7 @@ .for f in ${OPTIONS_DEFINE} .if ${PORT_OPTIONS:M${f:U}} -USE_GSTREAMER+= ${f:L} +USE_GSTREAMER1+=${f:L} .endif .endfor Index: multimedia/gstreamer1-plugins-assrender/Makefile =================================================================== --- multimedia/gstreamer1-plugins-assrender/Makefile (revision 0) +++ multimedia/gstreamer1-plugins-assrender/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= multimedia + +COMMENT= Gstreamer ASS/SSA text renderer plugin + +GST_PLUGIN= assrender +DIST= bad + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: multimedia/gstreamer1-plugins-bad/Makefile =================================================================== --- multimedia/gstreamer1-plugins-bad/Makefile (working copy) +++ multimedia/gstreamer1-plugins-bad/Makefile (working copy) @@ -1,6 +1,6 @@ # Created by: Michael Johnson # $FreeBSD$ -# $MCom: ports/multimedia/gstreamer-plugins-bad/Makefile,v 1.11 2008/03/19 14:05:35 ahze Exp $ +# $MCom: ports/multimedia/gstreamer1-plugins-bad/Makefile,v 1.4 2013/01/15 21:43:45 kwm Exp $ PORTREVISION= 0 CATEGORIES= multimedia @@ -10,17 +10,16 @@ GST_PLUGIN= bad GST_PLUGIN_SUFFIX= -bad -MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins -BUILD_DEPENDS+= gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins \ +BUILD_DEPENDS+= gstreamer1-plugins>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:${PORTSDIR}/multimedia/gstreamer1-plugins \ v4l_compat>=1.0.20100321:${PORTSDIR}/multimedia/v4l_compat -RUN_DEPENDS+= gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins +RUN_DEPENDS+= gstreamer1-plugins>=${GST1_VERSION}${GST1_MININAL_VERSION}:${PORTSDIR}/multimedia/gstreamer1-plugins -gst_bad_DIST= bad +DIST= bad BAD_GST_DIRS= gst-libs sys gst po -PLIST_SUB= VERSION="${GST_VERSION}" NO_GSTREAMER_COMMON= yes -PLIST= ${.CURDIR}/pkg-plist +PLIST= ${.CURDIR}/pkg-plist do-build: .for dir in ${BAD_GST_DIRS} @@ -30,7 +29,6 @@ do-install: .for dir in ${BAD_GST_DIRS} @(cd ${INSTALL_WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) - .endfor .include "${MASTERDIR}/Makefile" Index: multimedia/gstreamer1-plugins-bad/files/patch-ext_spc_tag.c =================================================================== --- multimedia/gstreamer1-plugins-bad/files/patch-ext_spc_tag.c (revision 315495) +++ multimedia/gstreamer1-plugins-bad/files/patch-ext_spc_tag.c (working copy) @@ -1,13 +0,0 @@ ---- ext/spc/tag.c.orig 2013-03-10 09:53:25.000000000 +0000 -+++ ext/spc/tag.c 2013-03-10 09:53:41.000000000 +0000 -@@ -16,9 +16,7 @@ - * Boston, MA 02111-1307, USA. - */ - --#include --#include --#include -+#include - #include - - #include Index: multimedia/gstreamer1-plugins-bad/files/patch-ext_spc_tag.h =================================================================== --- multimedia/gstreamer1-plugins-bad/files/patch-ext_spc_tag.h (revision 315495) +++ multimedia/gstreamer1-plugins-bad/files/patch-ext_spc_tag.h (working copy) @@ -1,10 +0,0 @@ ---- ext/spc/tag.h.orig 2013-03-10 09:54:22.000000000 +0000 -+++ ext/spc/tag.h 2013-03-10 09:54:34.000000000 +0000 -@@ -16,7 +16,6 @@ - * Boston, MA 02111-1307, USA. - */ - --#include - #include - - typedef struct Index: multimedia/gstreamer1-plugins-bad/pkg-plist =================================================================== --- multimedia/gstreamer1-plugins-bad/pkg-plist (working copy) +++ multimedia/gstreamer1-plugins-bad/pkg-plist (working copy) @@ -8,129 +8,77 @@ include/gstreamer-%%VERSION%%/gst/interfaces/photography-enumtypes.h include/gstreamer-%%VERSION%%/gst/interfaces/photography.h include/gstreamer-%%VERSION%%/gst/signalprocessor/gstsignalprocessor.h -include/gstreamer-%%VERSION%%/gst/video/gstbasevideocodec.h -include/gstreamer-%%VERSION%%/gst/video/gstbasevideodecoder.h -include/gstreamer-%%VERSION%%/gst/video/gstbasevideoencoder.h -include/gstreamer-%%VERSION%%/gst/video/gstbasevideoutils.h -include/gstreamer-%%VERSION%%/gst/video/gstsurfacebuffer.h include/gstreamer-%%VERSION%%/gst/video/gstsurfaceconverter.h +include/gstreamer-%%VERSION%%/gst/video/gstsurfacemeta.h include/gstreamer-%%VERSION%%/gst/video/videocontext.h lib/gstreamer-%%VERSION%%/libgstadpcmdec.la lib/gstreamer-%%VERSION%%/libgstadpcmdec.so lib/gstreamer-%%VERSION%%/libgstadpcmenc.la lib/gstreamer-%%VERSION%%/libgstadpcmenc.so -lib/gstreamer-%%VERSION%%/libgstaiff.la -lib/gstreamer-%%VERSION%%/libgstaiff.so lib/gstreamer-%%VERSION%%/libgstasfmux.la lib/gstreamer-%%VERSION%%/libgstasfmux.so lib/gstreamer-%%VERSION%%/libgstautoconvert.la lib/gstreamer-%%VERSION%%/libgstautoconvert.so -lib/gstreamer-%%VERSION%%/libgstaudiovisualizers.la -lib/gstreamer-%%VERSION%%/libgstaudiovisualizers.so lib/gstreamer-%%VERSION%%/libgstbayer.la lib/gstreamer-%%VERSION%%/libgstbayer.so -lib/gstreamer-%%VERSION%%/libgstcamerabin.la -lib/gstreamer-%%VERSION%%/libgstcamerabin.so -lib/gstreamer-%%VERSION%%/libgstcamerabin2.la -lib/gstreamer-%%VERSION%%/libgstcamerabin2.so -lib/gstreamer-%%VERSION%%/libgstcdxaparse.la -lib/gstreamer-%%VERSION%%/libgstcdxaparse.so lib/gstreamer-%%VERSION%%/libgstcoloreffects.la lib/gstreamer-%%VERSION%%/libgstcoloreffects.so -lib/gstreamer-%%VERSION%%/libgstcolorspace.la -lib/gstreamer-%%VERSION%%/libgstcolorspace.so lib/gstreamer-%%VERSION%%/libgstdataurisrc.la lib/gstreamer-%%VERSION%%/libgstdataurisrc.so -lib/gstreamer-%%VERSION%%/libgstdccp.la -lib/gstreamer-%%VERSION%%/libgstdccp.so lib/gstreamer-%%VERSION%%/libgstdebugutilsbad.la lib/gstreamer-%%VERSION%%/libgstdebugutilsbad.so lib/gstreamer-%%VERSION%%/libgstdtmf.la lib/gstreamer-%%VERSION%%/libgstdtmf.so lib/gstreamer-%%VERSION%%/libgstdvb.la lib/gstreamer-%%VERSION%%/libgstdvb.so +lib/gstreamer-%%VERSION%%/libgstdvbsuboverlay.la +lib/gstreamer-%%VERSION%%/libgstdvbsuboverlay.so lib/gstreamer-%%VERSION%%/libgstdvdspu.la lib/gstreamer-%%VERSION%%/libgstdvdspu.so -lib/gstreamer-%%VERSION%%/libgstdvbsuboverlay.la -lib/gstreamer-%%VERSION%%/libgstdvbsuboverlay.so -lib/gstreamer-%%VERSION%%/libgstfaceoverlay.la -lib/gstreamer-%%VERSION%%/libgstfaceoverlay.so lib/gstreamer-%%VERSION%%/libgstfestival.la lib/gstreamer-%%VERSION%%/libgstfestival.so lib/gstreamer-%%VERSION%%/libgstfieldanalysis.la lib/gstreamer-%%VERSION%%/libgstfieldanalysis.so lib/gstreamer-%%VERSION%%/libgstfragmented.la lib/gstreamer-%%VERSION%%/libgstfragmented.so -lib/gstreamer-%%VERSION%%/libgstfreeverb.la -lib/gstreamer-%%VERSION%%/libgstfreeverb.so -lib/gstreamer-%%VERSION%%/libgstfreeze.la -lib/gstreamer-%%VERSION%%/libgstfreeze.so lib/gstreamer-%%VERSION%%/libgstfrei0r.la lib/gstreamer-%%VERSION%%/libgstfrei0r.so lib/gstreamer-%%VERSION%%/libgstgaudieffects.la lib/gstreamer-%%VERSION%%/libgstgaudieffects.so +lib/gstreamer-%%VERSION%%/libgstgdp.la +lib/gstreamer-%%VERSION%%/libgstgdp.so lib/gstreamer-%%VERSION%%/libgstgeometrictransform.la lib/gstreamer-%%VERSION%%/libgstgeometrictransform.so -lib/gstreamer-%%VERSION%%/libgsth264parse.la -lib/gstreamer-%%VERSION%%/libgsth264parse.so -lib/gstreamer-%%VERSION%%/libgsthdvparse.la -lib/gstreamer-%%VERSION%%/libgsthdvparse.so lib/gstreamer-%%VERSION%%/libgstid3tag.la lib/gstreamer-%%VERSION%%/libgstid3tag.so lib/gstreamer-%%VERSION%%/libgstinter.la lib/gstreamer-%%VERSION%%/libgstinter.so lib/gstreamer-%%VERSION%%/libgstinterlace.la lib/gstreamer-%%VERSION%%/libgstinterlace.so -lib/gstreamer-%%VERSION%%/libgstivfparse.la -lib/gstreamer-%%VERSION%%/libgstivfparse.so -lib/gstreamer-%%VERSION%%/libgstjp2kdecimator.la -lib/gstreamer-%%VERSION%%/libgstjp2kdecimator.so lib/gstreamer-%%VERSION%%/libgstjpegformat.la lib/gstreamer-%%VERSION%%/libgstjpegformat.so -lib/gstreamer-%%VERSION%%/libgstlegacyresample.la -lib/gstreamer-%%VERSION%%/libgstlegacyresample.so lib/gstreamer-%%VERSION%%/libgstliveadder.la lib/gstreamer-%%VERSION%%/libgstliveadder.so -lib/gstreamer-%%VERSION%%/libgstmpegdemux.la -lib/gstreamer-%%VERSION%%/libgstmpegdemux.so +lib/gstreamer-%%VERSION%%/libgstmpegpsdemux.la +lib/gstreamer-%%VERSION%%/libgstmpegpsdemux.so lib/gstreamer-%%VERSION%%/libgstmpegpsmux.la lib/gstreamer-%%VERSION%%/libgstmpegpsmux.so lib/gstreamer-%%VERSION%%/libgstmpegtsdemux.la lib/gstreamer-%%VERSION%%/libgstmpegtsdemux.so lib/gstreamer-%%VERSION%%/libgstmpegtsmux.la lib/gstreamer-%%VERSION%%/libgstmpegtsmux.so -lib/gstreamer-%%VERSION%%/libgstmpegvideoparse.la -lib/gstreamer-%%VERSION%%/libgstmpegvideoparse.so -lib/gstreamer-%%VERSION%%/libgstmve.la -lib/gstreamer-%%VERSION%%/libgstmve.so -lib/gstreamer-%%VERSION%%/libgstmxf.la -lib/gstreamer-%%VERSION%%/libgstmxf.so -lib/gstreamer-%%VERSION%%/libgstnsf.la -lib/gstreamer-%%VERSION%%/libgstnsf.so -lib/gstreamer-%%VERSION%%/libgstnuvdemux.la -lib/gstreamer-%%VERSION%%/libgstnuvdemux.so -lib/gstreamer-%%VERSION%%/libgstpatchdetect.la -lib/gstreamer-%%VERSION%%/libgstpatchdetect.so lib/gstreamer-%%VERSION%%/libgstpcapparse.la lib/gstreamer-%%VERSION%%/libgstpcapparse.so lib/gstreamer-%%VERSION%%/libgstpnm.la lib/gstreamer-%%VERSION%%/libgstpnm.so -%%I386%%lib/gstreamer-%%VERSION%%/libgstreal.la -%%I386%%lib/gstreamer-%%VERSION%%/libgstreal.so lib/gstreamer-%%VERSION%%/libgstrawparse.la lib/gstreamer-%%VERSION%%/libgstrawparse.so -lib/gstreamer-%%VERSION%%/libgstremovesilence.la -lib/gstreamer-%%VERSION%%/libgstremovesilence.so -lib/gstreamer-%%VERSION%%/libgstrfbsrc.la -lib/gstreamer-%%VERSION%%/libgstrfbsrc.so lib/gstreamer-%%VERSION%%/libgstrtpmux.la lib/gstreamer-%%VERSION%%/libgstrtpmux.so lib/gstreamer-%%VERSION%%/libgstrtpvp8.la lib/gstreamer-%%VERSION%%/libgstrtpvp8.so lib/gstreamer-%%VERSION%%/libgstscaletempoplugin.la lib/gstreamer-%%VERSION%%/libgstscaletempoplugin.so -lib/gstreamer-%%VERSION%%/libgstsdi.la -lib/gstreamer-%%VERSION%%/libgstsdi.so lib/gstreamer-%%VERSION%%/libgstsdpelem.la lib/gstreamer-%%VERSION%%/libgstsdpelem.so lib/gstreamer-%%VERSION%%/libgstsegmentclip.la @@ -139,30 +87,22 @@ lib/gstreamer-%%VERSION%%/libgstshm.so lib/gstreamer-%%VERSION%%/libgstsiren.la lib/gstreamer-%%VERSION%%/libgstsiren.so -lib/gstreamer-%%VERSION%%/libgstsmooth.la -lib/gstreamer-%%VERSION%%/libgstsmooth.so lib/gstreamer-%%VERSION%%/libgstspeed.la lib/gstreamer-%%VERSION%%/libgstspeed.so -lib/gstreamer-%%VERSION%%/libgststereo.la -lib/gstreamer-%%VERSION%%/libgststereo.so lib/gstreamer-%%VERSION%%/libgstsubenc.la lib/gstreamer-%%VERSION%%/libgstsubenc.so -lib/gstreamer-%%VERSION%%/libgsttta.la -lib/gstreamer-%%VERSION%%/libgsttta.so -lib/gstreamer-%%VERSION%%/libgstvideofiltersbad.la -lib/gstreamer-%%VERSION%%/libgstvideofiltersbad.so -lib/gstreamer-%%VERSION%%/libgstvideomaxrate.la -lib/gstreamer-%%VERSION%%/libgstvideomaxrate.so -lib/gstreamer-%%VERSION%%/libgstvideomeasure.la -lib/gstreamer-%%VERSION%%/libgstvideomeasure.so lib/gstreamer-%%VERSION%%/libgstvideoparsersbad.la lib/gstreamer-%%VERSION%%/libgstvideoparsersbad.so -lib/gstreamer-%%VERSION%%/libgstvideosignal.la -lib/gstreamer-%%VERSION%%/libgstvideosignal.so -lib/gstreamer-%%VERSION%%/libgstvmnc.la -lib/gstreamer-%%VERSION%%/libgstvmnc.so lib/gstreamer-%%VERSION%%/libgsty4mdec.la lib/gstreamer-%%VERSION%%/libgsty4mdec.so +lib/gstreamer-%%VERSION%%/libgstaudiovisualizers.la +lib/gstreamer-%%VERSION%%/libgstaudiovisualizers.so +lib/gstreamer-%%VERSION%%/libgstcamerabin2.la +lib/gstreamer-%%VERSION%%/libgstcamerabin2.so +lib/gstreamer-%%VERSION%%/libgstremovesilence.la +lib/gstreamer-%%VERSION%%/libgstremovesilence.so +lib/gstreamer-%%VERSION%%/libgstsmooth.la +lib/gstreamer-%%VERSION%%/libgstsmooth.so lib/libgstbasecamerabinsrc-%%VERSION%%.a lib/libgstbasecamerabinsrc-%%VERSION%%.la lib/libgstbasecamerabinsrc-%%VERSION%%.so @@ -198,6 +138,7 @@ share/locale/fi/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/fr/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/gl/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo +share/locale/hr/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/hu/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/id/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/it/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo @@ -224,6 +165,7 @@ share/locale/zh_CN/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo @dirrmtry share/locale/ky/LC_MESSAGES @dirrmtry share/locale/ky -@dirrmtry include/gstreamer-%%VERSION%%/gst/signalprocessor -@dirrmtry include/gstreamer-%%VERSION%%/gst/codecparsers -@dirrmtry include/gstreamer-%%VERSION%%/gst/basecamerabinsrc +@dirrm include/gstreamer-%%VERSION%%/gst/signalprocessor +@dirrm include/gstreamer-%%VERSION%%/gst/interfaces +@dirrm include/gstreamer-%%VERSION%%/gst/codecparsers +@dirrm include/gstreamer-%%VERSION%%/gst/basecamerabinsrc Index: multimedia/gstreamer1-plugins-core/Makefile =================================================================== --- multimedia/gstreamer1-plugins-core/Makefile (working copy) +++ multimedia/gstreamer1-plugins-core/Makefile (working copy) @@ -1,13 +1,10 @@ -# New ports collection makefile for: gstreamer-plugins-core -# Date created: 2004-11-15 -# Whom: Michael Johnson -# +# Created by: Michael Johnson # $FreeBSD$ # $MCom: ports/multimedia/gstreamer-plugins-core/Makefile,v 1.17 2006/07/17 01:39:57 ahze Exp $ PORTNAME= gstreamer-plugins-core -PORTVERSION= 0.10 -PORTREVISION= 13 +PORTVERSION= ${GST1_VERSION} +PORTREVISION= 0 CATEGORIES= multimedia audio MASTER_SITES= # empty DISTFILES= # empty @@ -20,36 +17,35 @@ GST_DIR= lib/gstreamer-${PORTVERSION} PLIST_FILES= ${GST_DIR}/.gstreamer-plugins-core.keep -WANT_GSTREAMER= yes +USE_GSTREAMER1=yes -.include +OPTIONS_DEFINE= DVD +OPTIONS_DEFAULT=DVD +DVD_DESC= Include DVD related plugins +.include + # Audio plugins -USE_GSTREAMER+= mp3 ogg vorbis +USE_GSTREAMER1+= mad ogg vorbis # Graphics plugins -USE_GSTREAMER+= libpng +USE_GSTREAMER1+= png # Misc plugins -USE_GSTREAMER+= pango +USE_GSTREAMER1+= pango # Multimedia plugins -USE_GSTREAMER+= ffmpeg good theora xvid +USE_GSTREAMER1+= libav good theora -.if !defined(WITHOUT_DVD) -# Audio plugins -USE_GSTREAMER+= a52dec dvd dts +.if ${PORT_OPTIONS:MDVD} +# dvd related plugins plugins +USE_GSTREAMER1+= a52dec dvdread resindvd dts .endif -pre-everything:: - @${ECHO_MSG} "" - @${ECHO_MSG} " Disable DVD plugins by defining WITHOUT_DVD" - @${ECHO_MSG} "" - do-install: if [ ! -d ${PREFIX}/${GST_DIR} ]; then \ ${MKDIR} ${PREFIX}/${GST_DIR} ; \ fi ${TOUCH} -f ${PREFIX}/${GST_DIR}/.gstreamer-plugins-core.keep -.include +.include Index: multimedia/gstreamer1-plugins-dts/Makefile =================================================================== --- multimedia/gstreamer1-plugins-dts/Makefile (revision 0) +++ multimedia/gstreamer1-plugins-dts/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= multimedia + +COMMENT= Gstreamer dts plugin + +GST_PLUGIN= dts +DIST= bad + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: multimedia/gstreamer1-plugins-dv/Makefile =================================================================== --- multimedia/gstreamer1-plugins-dv/Makefile (revision 0) +++ multimedia/gstreamer1-plugins-dv/Makefile (working copy) @@ -0,0 +1,14 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= multimedia +PKGNAMESUFFIX= 1-plugins-dv + +COMMENT= Gstreamer dv plugin + +GST_PLUGIN= libdv +DIST= good + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: multimedia/gstreamer1-plugins-dvdread/Makefile =================================================================== --- multimedia/gstreamer1-plugins-dvdread/Makefile (revision 0) +++ multimedia/gstreamer1-plugins-dvdread/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= multimedia + +COMMENT= Gstreamer dvdread plugin + +GST_PLUGIN= dvdread +DIST= ugly + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: multimedia/gstreamer1-plugins-good/Makefile =================================================================== --- multimedia/gstreamer1-plugins-good/Makefile (working copy) +++ multimedia/gstreamer1-plugins-good/Makefile (working copy) @@ -1,10 +1,6 @@ -# New ports collection makefile for: gstreamer-plugins-good -# Date created: 20 Jan 2006 -# Whom: Michael Johnson -# +# Created by: Michael Johnson # $FreeBSD$ -# $MCom: ports/multimedia/gstreamer-plugins-good/Makefile,v 1.14 2008/03/19 14:05:36 ahze Exp $ -# +# $MCom: ports/multimedia/gstreamer1-plugins-good/Makefile,v 1.4 2013/01/15 21:43:45 kwm Exp $ PORTREVISION= 0 CATEGORIES= multimedia @@ -14,18 +10,19 @@ GST_PLUGIN= good GST_PLUGIN_SUFFIX= -good -MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins -BUILD_DEPENDS+= gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins -RUN_DEPENDS+= gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins +CONFIGURE_ARGS+=--enable-monoscope -gst_good_DIST= good +BUILD_DEPENDS+= gstreamer1-plugins>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:${PORTSDIR}/multimedia/gstreamer1-plugins +RUN_DEPENDS+= gstreamer1-plugins>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:${PORTSDIR}/multimedia/gstreamer1-plugins + +DIST= good GOOD_GST_DIRS= gst sys po -PLIST_SUB= VERSION="${GST_VERSION}" -PLIST= ${.CURDIR}/pkg-plist -FILESDIR=${.CURDIR}/files -PATCHDIR=${.CURDIR}/files +PLIST= ${.CURDIR}/pkg-plist +FILESDIR= ${.CURDIR}/files +PATCHDIR= ${.CURDIR}/files NO_GSTREAMER_COMMON= yes do-build: Index: multimedia/gstreamer1-plugins-good/files/patch-configure =================================================================== --- multimedia/gstreamer1-plugins-good/files/patch-configure (working copy) +++ multimedia/gstreamer1-plugins-good/files/patch-configure (working copy) @@ -9,21 +9,3 @@ fi -@@ -27516,6 +27516,8 @@ $as_echo_n "checking Checking for up to - #ifdef __sun /* Solaris */ - #include - #include -+#elif __FreeBSD__ -+#include - #else /* Linux */ - #include - #define _LINUX_TIME_H -@@ -27589,6 +27591,8 @@ $as_echo_n "checking struct v4l2_buffer - #ifdef __sun /* Solaris */ - #include - #include -+#elif __FreeBSD__ -+#include - #else /* Linux */ - #include - #define _LINUX_TIME_H Index: multimedia/gstreamer1-plugins-good/files/patch-gst_goom_mmx.h =================================================================== --- multimedia/gstreamer1-plugins-good/files/patch-gst_goom_mmx.h (revision 315495) +++ multimedia/gstreamer1-plugins-good/files/patch-gst_goom_mmx.h (working copy) @@ -1,18 +0,0 @@ ---- gst/goom/mmx.h.orig 2011-12-11 19:48:11.000000000 +0100 -+++ gst/goom/mmx.h 2013-02-08 00:54:14.000000000 +0100 -@@ -715,13 +715,13 @@ void zoom_filter_xmmx (int prevX, int pr - { \ - printf("emms()\n"); \ - __asm__ __volatile__ ("emms" \ -- "st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)"); \ -+ "st", "st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)"); \ - } - - #else - - #define emms() __asm__ __volatile__ ("emms"::: \ -- "st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)") -+ "st", "st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)") - - #endif - Index: multimedia/gstreamer1-plugins-good/files/patch-sys_oss_gstossmixer.c =================================================================== --- multimedia/gstreamer1-plugins-good/files/patch-sys_oss_gstossmixer.c (revision 315495) +++ multimedia/gstreamer1-plugins-good/files/patch-sys_oss_gstossmixer.c (working copy) @@ -1,11 +0,0 @@ ---- sys/oss/gstossmixer.c.bak 2006-08-16 05:25:17.000000000 -0400 -+++ sys/oss/gstossmixer.c 2008-12-24 00:27:14.000000000 -0500 -@@ -146,7 +146,7 @@ gst_ossmixer_ensure_track_list (GstOssMi - - /* do we want this in our list? */ - if (!((mixer->dir & GST_OSS_MIXER_CAPTURE && input == TRUE) || -- (mixer->dir & GST_OSS_MIXER_PLAYBACK && i != SOUND_MIXER_PCM))) -+ (mixer->dir & GST_OSS_MIXER_PLAYBACK))) - /* the PLAYBACK case seems hacky, but that's how 0.8 had it */ - continue; - Index: multimedia/gstreamer1-plugins-good/files/patch-sys_v4l2_gstv4l2object.h =================================================================== --- multimedia/gstreamer1-plugins-good/files/patch-sys_v4l2_gstv4l2object.h (revision 315495) +++ multimedia/gstreamer1-plugins-good/files/patch-sys_v4l2_gstv4l2object.h (working copy) @@ -1,21 +0,0 @@ ---- sys/v4l2/gstv4l2object.h.orig 2010-02-11 17:52:41.000000000 +0100 -+++ sys/v4l2/gstv4l2object.h 2010-02-11 17:57:50.000000000 +0100 -@@ -38,13 +38,15 @@ - */ - #include - #include --#ifndef __sun -+#ifdef __sun -+#include -+#elif defined(__FreeBSD__) -+#include -+#else /* linux */ - #include - #define _LINUX_TIME_H - #define __user - #include --#else --#include - #endif - - #include Index: multimedia/gstreamer1-plugins-good/pkg-plist =================================================================== --- multimedia/gstreamer1-plugins-good/pkg-plist (working copy) +++ multimedia/gstreamer1-plugins-good/pkg-plist (working copy) @@ -22,8 +22,6 @@ lib/gstreamer-%%VERSION%%/libgstdebug.so lib/gstreamer-%%VERSION%%/libgstdeinterlace.la lib/gstreamer-%%VERSION%%/libgstdeinterlace.so -lib/gstreamer-%%VERSION%%/libgstefence.la -lib/gstreamer-%%VERSION%%/libgstefence.so lib/gstreamer-%%VERSION%%/libgsteffectv.la lib/gstreamer-%%VERSION%%/libgsteffectv.so lib/gstreamer-%%VERSION%%/libgstequalizer.la @@ -90,8 +88,6 @@ lib/gstreamer-%%VERSION%%/libgstwavenc.so lib/gstreamer-%%VERSION%%/libgstwavparse.la lib/gstreamer-%%VERSION%%/libgstwavparse.so -lib/gstreamer-%%VERSION%%/libgstximagesrc.la -lib/gstreamer-%%VERSION%%/libgstximagesrc.so lib/gstreamer-%%VERSION%%/libgsty4menc.la lib/gstreamer-%%VERSION%%/libgsty4menc.so share/gstreamer-%%VERSION%%/presets/GstIirEqualizer10Bands.prs @@ -111,6 +107,7 @@ share/locale/fi/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/fr/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/gl/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo +share/locale/hr/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/hu/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/id/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/it/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo Index: multimedia/gstreamer1-plugins-mpeg2dec/Makefile =================================================================== --- multimedia/gstreamer1-plugins-mpeg2dec/Makefile (revision 0) +++ multimedia/gstreamer1-plugins-mpeg2dec/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= multimedia + +COMMENT= Gstreamer mpeg decode plugin + +GST_PLUGIN= mpeg2dec +DIST= ugly + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: multimedia/gstreamer1-plugins-mpeg2enc/Makefile =================================================================== --- multimedia/gstreamer1-plugins-mpeg2enc/Makefile (revision 0) +++ multimedia/gstreamer1-plugins-mpeg2enc/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= multimedia + +COMMENT= Gstreamer mpeg encoder plugin + +GST_PLUGIN= mpeg2enc +DIST= bad + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: multimedia/gstreamer1-plugins-resindvd/Makefile =================================================================== --- multimedia/gstreamer1-plugins-resindvd/Makefile (revision 0) +++ multimedia/gstreamer1-plugins-resindvd/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= multimedia + +COMMENT= Gstreamer resindvd plugin + +GST_PLUGIN= resindvd +DIST= bad + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: multimedia/gstreamer1-plugins-schroedinger/Makefile =================================================================== --- multimedia/gstreamer1-plugins-schroedinger/Makefile (revision 0) +++ multimedia/gstreamer1-plugins-schroedinger/Makefile (working copy) @@ -0,0 +1,14 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= multimedia +PKGNAMESUFFIX= 1-plugins-schroedinger + +COMMENT= Gstreamer Dirac high-speed codec plugin + +GST_PLUGIN= schro +DIST= bad + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: multimedia/gstreamer1-plugins-theora/Makefile =================================================================== --- multimedia/gstreamer1-plugins-theora/Makefile (revision 0) +++ multimedia/gstreamer1-plugins-theora/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= multimedia + +COMMENT= Gstreamer theora plugin + +GST_PLUGIN= theora +DIST= base + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: multimedia/gstreamer1-plugins-ugly/Makefile =================================================================== --- multimedia/gstreamer1-plugins-ugly/Makefile (working copy) +++ multimedia/gstreamer1-plugins-ugly/Makefile (working copy) @@ -1,10 +1,6 @@ -# New ports collection makefile for: gstreamer-plugins-ugly -# Date created: 20 Jan 2006 -# Whom: Michael Johnson -# +# Created by: Michael Johnson # $FreeBSD$ -# $MCom: ports/multimedia/gstreamer-plugins-ugly/Makefile,v 1.13 2008/03/19 14:05:37 ahze Exp $ -# +# $MCom: ports/multimedia/gstreamer1-plugins-ugly/Makefile,v 1.3 2013/01/15 21:43:46 kwm Exp $ PORTREVISION= 0 CATEGORIES= multimedia @@ -14,14 +10,13 @@ GST_PLUGIN= ugly GST_PLUGIN_SUFFIX= -ugly -MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins -BUILD_DEPENDS+= gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins -RUN_DEPENDS+= gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins +BUILD_DEPENDS+= gstreamer1-plugins>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:${PORTSDIR}/multimedia/gstreamer1-plugins +RUN_DEPENDS+= gstreamer1-plugins>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:${PORTSDIR}/multimedia/gstreamer1-plugins -gst_ugly_DIST= ugly +DIST= ugly UGLY_GST_DIRS= gst po gst-libs -PLIST_SUB= VERSION="${GST_VERSION}" NO_GSTREAMER_COMMON= yes PLIST= ${.CURDIR}/pkg-plist @@ -33,7 +28,6 @@ do-install: .for dir in ${UGLY_GST_DIRS} @(cd ${INSTALL_WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) - .endfor .include "${MASTERDIR}/Makefile" Index: multimedia/gstreamer1-plugins-ugly/files/patch-ext-amr =================================================================== --- multimedia/gstreamer1-plugins-ugly/files/patch-ext-amr (revision 315495) +++ multimedia/gstreamer1-plugins-ugly/files/patch-ext-amr (working copy) @@ -1,40 +0,0 @@ ---- ext/amrnb/amrnbdec.h.orig 2011-12-30 18:40:45.000000000 +0100 -+++ ext/amrnb/amrnbdec.h 2012-08-07 16:21:06.000000000 +0200 -@@ -22,7 +22,8 @@ - - #include - #include --#include -+ -+#include - - G_BEGIN_DECLS - ---- ext/amrnb/amrnbenc.h.orig 2011-12-30 18:40:45.000000000 +0100 -+++ ext/amrnb/amrnbenc.h 2012-08-07 16:19:26.000000000 +0200 -@@ -21,9 +21,10 @@ - #define __GST_AMRNBENC_H__ - - #include --#include - #include - -+#include -+ - G_BEGIN_DECLS - - #define GST_TYPE_AMRNBENC \ ---- ext/amrwbdec/amrwbdec.h.orig 2011-12-30 18:40:45.000000000 +0100 -+++ ext/amrwbdec/amrwbdec.h 2012-08-07 16:19:05.000000000 +0200 -@@ -22,8 +22,9 @@ - - #include - #include --#include --#include -+ -+#include -+#include - - G_BEGIN_DECLS - Index: multimedia/gstreamer1-plugins-ugly/pkg-plist =================================================================== --- multimedia/gstreamer1-plugins-ugly/pkg-plist (working copy) +++ multimedia/gstreamer1-plugins-ugly/pkg-plist (working copy) @@ -4,14 +4,10 @@ lib/gstreamer-%%VERSION%%/libgstdvdlpcmdec.so lib/gstreamer-%%VERSION%%/libgstdvdsub.la lib/gstreamer-%%VERSION%%/libgstdvdsub.so -lib/gstreamer-%%VERSION%%/libgstiec958.la -lib/gstreamer-%%VERSION%%/libgstiec958.so -lib/gstreamer-%%VERSION%%/libgstmpegaudioparse.la -lib/gstreamer-%%VERSION%%/libgstmpegaudioparse.so -lib/gstreamer-%%VERSION%%/libgstmpegstream.la -lib/gstreamer-%%VERSION%%/libgstmpegstream.so lib/gstreamer-%%VERSION%%/libgstrmdemux.la lib/gstreamer-%%VERSION%%/libgstrmdemux.so +lib/gstreamer-%%VERSION%%/libgstxingmux.la +lib/gstreamer-%%VERSION%%/libgstxingmux.so share/locale/af/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo share/locale/az/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo share/locale/bg/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo @@ -27,6 +23,7 @@ share/locale/fi/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo share/locale/fr/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo share/locale/gl/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo +share/locale/hr/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo share/locale/hu/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo share/locale/id/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo share/locale/it/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo Index: multimedia/gstreamer1-plugins-v4l2/Makefile =================================================================== --- multimedia/gstreamer1-plugins-v4l2/Makefile (revision 0) +++ multimedia/gstreamer1-plugins-v4l2/Makefile (working copy) @@ -0,0 +1,14 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= multimedia +PKGNAMESUFFIX= 1-plugins-v4l2 + +COMMENT= Gstreamer Video 4 Linux 2 source plugin + +GST_PLUGIN= gst_v4l2 +DIST= good + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: multimedia/gstreamer1-plugins-vpx/Makefile =================================================================== --- multimedia/gstreamer1-plugins-vpx/Makefile (revision 0) +++ multimedia/gstreamer1-plugins-vpx/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= multimedia + +COMMENT= Gstreamer vp8 codec plugin + +GST_PLUGIN= vpx +DIST= good + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: multimedia/gstreamer1-plugins-x264/Makefile =================================================================== --- multimedia/gstreamer1-plugins-x264/Makefile (revision 0) +++ multimedia/gstreamer1-plugins-x264/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= multimedia + +COMMENT= Gstreamer x264 plugin + +GST_PLUGIN= x264 +DIST= ugly + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: net/Makefile =================================================================== --- net/Makefile (revision 315495) +++ net/Makefile (working copy) @@ -196,6 +196,7 @@ SUBDIR += gspoof SUBDIR += gssdp SUBDIR += gstreamer-plugins-libmms + SUBDIR += gstreamer1-plugins-libmms SUBDIR += gtic SUBDIR += gtk-vnc SUBDIR += gupnp Index: net/gstreamer1-plugins-libmms/Makefile =================================================================== --- net/gstreamer1-plugins-libmms/Makefile (revision 0) +++ net/gstreamer1-plugins-libmms/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= net + +COMMENT= Gstreamer mms:// and mmsh:// plugin + +GST_PLUGIN= libmms +DIST= bad + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: sysutils/Makefile =================================================================== --- sysutils/Makefile (revision 315495) +++ sysutils/Makefile (working copy) @@ -351,6 +351,7 @@ SUBDIR += gstopd SUBDIR += gstreamer-plugins-cdio SUBDIR += gstreamer-plugins-hal + SUBDIR += gstreamer1-plugins-cdio SUBDIR += gtk-imonc SUBDIR += gtk-send-pr SUBDIR += gupsc Index: sysutils/gstreamer1-plugins-cdio/Makefile =================================================================== --- sysutils/gstreamer1-plugins-cdio/Makefile (revision 0) +++ sysutils/gstreamer1-plugins-cdio/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= sysutils + +COMMENT= Gstreamer compact disc input and control library + +GST_PLUGIN= cdio +DIST= ugly + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: x11/Makefile =================================================================== --- x11/Makefile (revision 315495) +++ x11/Makefile (working copy) @@ -97,6 +97,8 @@ SUBDIR += grabc SUBDIR += gromit SUBDIR += gskrab + SUBDIR += gstreamer1-plugins-x + SUBDIR += gstreamer1-plugins-ximagesrc SUBDIR += gsynaptics SUBDIR += gtk-launch SUBDIR += gtk-theme-switch Index: x11/gstreamer1-plugins-x/Makefile =================================================================== --- x11/gstreamer1-plugins-x/Makefile (revision 0) +++ x11/gstreamer1-plugins-x/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= x11 + +COMMENT= Gstreamer X and Xvideo output plugins + +GST_PLUGIN= x +DIST= base + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: x11/gstreamer1-plugins-ximagesrc/Makefile =================================================================== --- x11/gstreamer1-plugins-ximagesrc/Makefile (revision 0) +++ x11/gstreamer1-plugins-ximagesrc/Makefile (working copy) @@ -0,0 +1,14 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= x11 +PKGNAMESUFFIX= 1-plugins-ximagesrc + +COMMENT= Gstreamer X source plugin + +GST_PLUGIN= x +DIST= good + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" Index: x11-toolkits/Makefile =================================================================== --- x11-toolkits/Makefile (revision 315495) +++ x11-toolkits/Makefile (working copy) @@ -41,6 +41,7 @@ SUBDIR += gnustep-gui SUBDIR += gnustep-xdps SUBDIR += gstreamer-plugins-pango + SUBDIR += gstreamer1-plugins-pango SUBDIR += gtk-sharp-beans SUBDIR += gtk-sharp10 SUBDIR += gtk-sharp20 Index: x11-toolkits/gstreamer1-plugins-pango/Makefile =================================================================== --- x11-toolkits/gstreamer1-plugins-pango/Makefile (revision 0) +++ x11-toolkits/gstreamer1-plugins-pango/Makefile (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= x11-toolkits + +COMMENT= Gstreamer pango textoverlay plugin + +GST_PLUGIN= pango +DIST= base + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile"