diff options
49 files changed, 403 insertions, 438 deletions
diff --git a/Mk/bsd.gstreamer.mk b/Mk/bsd.gstreamer.mk index 562cf6767ace..42c25bc1e33a 100644 --- a/Mk/bsd.gstreamer.mk +++ b/Mk/bsd.gstreamer.mk @@ -55,14 +55,14 @@ GST_SHLIB_VERSION= 1 GSTREAMER1_PORT= ${PORTSDIR}/multimedia/gstreamer1-plugins _GST1_LIB_BASE= ${LOCALBASE}/lib/gstreamer-${GST1_VERSION} -GST1_VERSION= 1.2 +GST1_VERSION= 1.4 GST1_MINOR_VERSION= .0 GST1_SHLIB_VERSION= 0 GST1_MINIMAL_VERSION= .0 # # missing base: alsa ivorbisdec -# missing good: pulseaudio(need newer pulse version) +# missing good: - # missing ugly: - # missing bad: openal @@ -71,9 +71,9 @@ GST1_MINIMAL_VERSION= .0 _GSTREAMER_PLUGINS= \ a52dec aalib amrnb amrwbdec cairo cdio \ cdparanoia dts dv faac faad flac flite \ - gdkpixbuf gme gnonlin gsm jack jpeg lame libcaca \ + gdkpixbuf gl gme gnonlin gsm jack jpeg lame libcaca \ libmms libvisual mad mpeg2dec mpeg2enc neon ogg \ - opencv opus pango resindvd schroedinger \ + opencv opus pango pulse resindvd schroedinger \ shout2 sidplay soundtouch soup speex taglib \ theora twolame v4l2 vorbis wavpack x264 @@ -81,15 +81,16 @@ _GSTREAMER_PLUGINS= \ .if defined(USE_GSTREAMER) _GSTREAMER_PLUGINS+= \ annodex bz2 cdaudio dvd esound ffmpeg fluendo-mp3 \ - fluendo-mpegdemux gconf gio gl gnomevfs hal \ - ladspa libpng mm mp3 musepack nas pulse python qt4 \ + fluendo-mpegdemux gconf gio gnomevfs hal \ + ladspa libpng mm mp3 musepack nas python qt4 \ sdl sndfile spc vdpau vp8 xvid .endif # plugins only in 1.0 .if defined(USE_GSTREAMER1) _GSTREAMER_PLUGINS+= \ - assrender curl dvdread kate libav modplug openjpeg png rtmp \ + assrender curl dvdread editing-services kate libav \ + modplug openjpeg png rtmp \ spandsp vpx webp x ximagesrc zbar # vaapi? .endif @@ -257,6 +258,11 @@ bz2_DEPENDS= multimedia/gstreamer-plugins-bz2 dvdread_DEPENDS= multimedia/gstreamer-plugins-dvdread +editing-services_DEPENDS= multimedia/gstreamer-editing-services +editing-services_GST_PREFIX= gstreamer1- +editing-services_GST_SUFX= # empty +editing-services_GST_VERSION= 1.0.0 + ffmpeg_DEPENDS= multimedia/gstreamer-ffmpeg ffmpeg_GST_PREFIX= gstreamer- ffmpeg_GST_SUFX= # empty diff --git a/audio/Makefile b/audio/Makefile index e9eeeb817124..e59e785d4021 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -262,6 +262,7 @@ 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 diff --git a/audio/gstreamer1-plugins-opus/Makefile b/audio/gstreamer1-plugins-opus/Makefile index a08d9426effc..f8080177e474 100644 --- a/audio/gstreamer1-plugins-opus/Makefile +++ b/audio/gstreamer1-plugins-opus/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= audio COMMENT= Gstreamer Opus audio encoder/decoder plugin diff --git a/audio/gstreamer1-plugins-pulse/Makefile b/audio/gstreamer1-plugins-pulse/Makefile new file mode 100644 index 000000000000..29339cfe4294 --- /dev/null +++ b/audio/gstreamer1-plugins-pulse/Makefile @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= audio + +COMMENT= GStreamer plugin for pulseaudio + +GST_PLUGIN= pulse +DIST= good + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" diff --git a/graphics/Makefile b/graphics/Makefile index 68f0394b6935..73cef9752921 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -310,6 +310,7 @@ SUBDIR += gstreamer1-plugins-aalib SUBDIR += gstreamer1-plugins-cairo SUBDIR += gstreamer1-plugins-gdkpixbuf + SUBDIR += gstreamer1-plugins-gl SUBDIR += gstreamer1-plugins-jpeg SUBDIR += gstreamer1-plugins-libcaca SUBDIR += gstreamer1-plugins-libvisual diff --git a/graphics/gstreamer1-plugins-gl/Makefile b/graphics/gstreamer1-plugins-gl/Makefile new file mode 100644 index 000000000000..c948ab0d2b01 --- /dev/null +++ b/graphics/gstreamer1-plugins-gl/Makefile @@ -0,0 +1,27 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= graphics + +COMMENT= Gstreamer GL graphics plugin + +GST_PLUGIN= gl +DIST= bad + +#USE_CSTD= gnu89 +#USE_CSTD= c11 +#USE_CXXSTD= c++11 +MAKE_ARGS+= V=1 +#USE_GCC= yes +PLIST= ${.CURDIR}/pkg-plist + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +pre-build: + @cd ${WRKSRC}/gst-libs/gst/gl && ${GMAKE} + +post-install: + @cd ${WRKSRC}/gst-libs/gst/gl && ${SETENV} DESTDIR=${STAGEDIR} \ + INSTALL_TARGET=${INSTALL_TARGET} ${GMAKE} install + +.include "${MASTERDIR}/Makefile" diff --git a/graphics/gstreamer1-plugins-gl/pkg-plist b/graphics/gstreamer1-plugins-gl/pkg-plist new file mode 100644 index 000000000000..9a56ab88fed4 --- /dev/null +++ b/graphics/gstreamer1-plugins-gl/pkg-plist @@ -0,0 +1,37 @@ +include/gstreamer-%%VERSION%%/gst/gl/egl/gsteglimagememory.h +include/gstreamer-%%VERSION%%/gst/gl/egl/gstgldisplay_egl.h +include/gstreamer-%%VERSION%%/gst/gl/gl.h +include/gstreamer-%%VERSION%%/gst/gl/glprototypes/all_functions.h +include/gstreamer-%%VERSION%%/gst/gl/glprototypes/base.h +include/gstreamer-%%VERSION%%/gst/gl/glprototypes/blending.h +include/gstreamer-%%VERSION%%/gst/gl/glprototypes/eglimage.h +include/gstreamer-%%VERSION%%/gst/gl/glprototypes/fbo.h +include/gstreamer-%%VERSION%%/gst/gl/glprototypes/fixedfunction.h +include/gstreamer-%%VERSION%%/gst/gl/glprototypes/gles.h +include/gstreamer-%%VERSION%%/gst/gl/glprototypes/gstgl_compat.h +include/gstreamer-%%VERSION%%/gst/gl/glprototypes/gstgl_gles2compat.h +include/gstreamer-%%VERSION%%/gst/gl/glprototypes/opengl.h +include/gstreamer-%%VERSION%%/gst/gl/glprototypes/shaders.h +include/gstreamer-%%VERSION%%/gst/gl/gstgl_fwd.h +include/gstreamer-%%VERSION%%/gst/gl/gstglapi.h +include/gstreamer-%%VERSION%%/gst/gl/gstglbufferpool.h +include/gstreamer-%%VERSION%%/gst/gl/gstglcolorconvert.h +include/gstreamer-%%VERSION%%/gst/gl/gstglconfig.h +include/gstreamer-%%VERSION%%/gst/gl/gstglcontext.h +include/gstreamer-%%VERSION%%/gst/gl/gstgldisplay.h +include/gstreamer-%%VERSION%%/gst/gl/gstgldownload.h +include/gstreamer-%%VERSION%%/gst/gl/gstglfeature.h +include/gstreamer-%%VERSION%%/gst/gl/gstglfilter.h +include/gstreamer-%%VERSION%%/gst/gl/gstglframebuffer.h +include/gstreamer-%%VERSION%%/gst/gl/gstglmemory.h +include/gstreamer-%%VERSION%%/gst/gl/gstglshader.h +include/gstreamer-%%VERSION%%/gst/gl/gstglshadervariables.h +include/gstreamer-%%VERSION%%/gst/gl/gstglupload.h +include/gstreamer-%%VERSION%%/gst/gl/gstgluploadmeta.h +include/gstreamer-%%VERSION%%/gst/gl/gstglutils.h +include/gstreamer-%%VERSION%%/gst/gl/gstglwindow.h +include/gstreamer-%%VERSION%%/gst/gl/x11/gstgldisplay_x11.h +lib/gstreamer-%%VERSION%%/libgstopengl.so +lib/libgstgl-%%VERSION%%.so +lib/libgstgl-%%VERSION%%.so.0 +lib/libgstgl-%%VERSION%%.so.%%SOVERSION%% diff --git a/graphics/gstreamer1-plugins-libcaca/Makefile b/graphics/gstreamer1-plugins-libcaca/Makefile index 46650ed9624c..779a0e869f5d 100644 --- a/graphics/gstreamer1-plugins-libcaca/Makefile +++ b/graphics/gstreamer1-plugins-libcaca/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= graphics COMMENT= Gstreamer color ASCII art plugin diff --git a/graphics/gstreamer1-plugins-opencv/Makefile b/graphics/gstreamer1-plugins-opencv/Makefile index 6887f7bfc3d0..c9443bf85836 100644 --- a/graphics/gstreamer1-plugins-opencv/Makefile +++ b/graphics/gstreamer1-plugins-opencv/Makefile @@ -7,6 +7,8 @@ COMMENT= Gstreamer opencv real time computer vision plugin GST_PLUGIN= opencv DIST= bad +MAKE_ARGS= V=1 + MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins diff --git a/graphics/gstreamer1-plugins-openjpeg/Makefile b/graphics/gstreamer1-plugins-openjpeg/Makefile index 952c66542e33..fca954293d0a 100644 --- a/graphics/gstreamer1-plugins-openjpeg/Makefile +++ b/graphics/gstreamer1-plugins-openjpeg/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= graphics COMMENT= Gstreamer jpeg2000 decoder plugin diff --git a/graphics/gstreamer1-plugins-webp/Makefile b/graphics/gstreamer1-plugins-webp/Makefile index 3d0a5bd84103..56a61a2bd385 100644 --- a/graphics/gstreamer1-plugins-webp/Makefile +++ b/graphics/gstreamer1-plugins-webp/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= graphics COMMENT= Gstreamer webp image decoder plugin diff --git a/graphics/gstreamer1-plugins-zbar/Makefile b/graphics/gstreamer1-plugins-zbar/Makefile index 46bd5f425199..59da68f189f5 100644 --- a/graphics/gstreamer1-plugins-zbar/Makefile +++ b/graphics/gstreamer1-plugins-zbar/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= graphics COMMENT= Gstreamer ZBar barcode detector plugin diff --git a/multimedia/Makefile b/multimedia/Makefile index ecbe678f9633..5d8efa0e970c 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -118,6 +118,7 @@ SUBDIR += gstreamer-plugins-xvid SUBDIR += gstreamer-qt4 SUBDIR += gstreamer1 + SUBDIR += gstreamer1-editing-services SUBDIR += gstreamer1-libav SUBDIR += gstreamer1-plugins SUBDIR += gstreamer1-plugins-all diff --git a/multimedia/gstreamer1-editing-services/Makefile b/multimedia/gstreamer1-editing-services/Makefile new file mode 100644 index 000000000000..aeb470f922bc --- /dev/null +++ b/multimedia/gstreamer1-editing-services/Makefile @@ -0,0 +1,23 @@ +# Created by: Koop Mast <kwm@FreeBSD.org> +# $FreeBSD$ + +PORTNAME= gstreamer1-editing-services +PORTVERSION= 1.4.0 +CATEGORIES= multimedia +MASTER_SITES= http://gstreamer.freedesktop.org/src/gstreamer-editing-services/ +DISTNAME= gstreamer-editing-services-${PORTVERSION} + +MAINTAINER= multimedia@FreeBSD.org +COMMENT= Gstreamer editing services + +USES= gmake libtool pathfix pkgconfig tar:xz +USE_LDCONFIG= yes +GNU_CONFIGURE= yes +USE_GNOME= glib20 introspection:build libxml2 +USE_GSTREAMER1= gnonlin +INSTALL_TARGET= install-strip + +CONFIGURE_ARGS= --enable-introspection=yes +PLIST_SUB= VERSION=1.0 + +.include <bsd.port.mk> diff --git a/multimedia/gstreamer1-editing-services/distinfo b/multimedia/gstreamer1-editing-services/distinfo new file mode 100644 index 000000000000..0adbe94d99da --- /dev/null +++ b/multimedia/gstreamer1-editing-services/distinfo @@ -0,0 +1,2 @@ +SHA256 (gstreamer-editing-services-1.4.0.tar.xz) = cc20b90fb7bcec257b2afda7474664d493b1acece66da675d7df584588808bb3 +SIZE (gstreamer-editing-services-1.4.0.tar.xz) = 915420 diff --git a/multimedia/gstreamer1-editing-services/pkg-descr b/multimedia/gstreamer1-editing-services/pkg-descr new file mode 100644 index 000000000000..99a4e20bdf0a --- /dev/null +++ b/multimedia/gstreamer1-editing-services/pkg-descr @@ -0,0 +1,4 @@ +GStreamer Editing Services (GES) is a high-level library for facilitating +the creation of audio/video non-linear editors. + +WWW: http://gstreamer.freedeskop.org diff --git a/multimedia/gstreamer1-editing-services/pkg-plist b/multimedia/gstreamer1-editing-services/pkg-plist new file mode 100644 index 000000000000..50a8d2ca847c --- /dev/null +++ b/multimedia/gstreamer1-editing-services/pkg-plist @@ -0,0 +1,67 @@ +bin/ges-launch-%%VERSION%% +include/gstreamer-%%VERSION%%/ges/ges-asset.h +include/gstreamer-%%VERSION%%/ges/ges-audio-source.h +include/gstreamer-%%VERSION%%/ges/ges-audio-test-source.h +include/gstreamer-%%VERSION%%/ges/ges-audio-track.h +include/gstreamer-%%VERSION%%/ges/ges-audio-transition.h +include/gstreamer-%%VERSION%%/ges/ges-audio-uri-source.h +include/gstreamer-%%VERSION%%/ges/ges-base-effect-clip.h +include/gstreamer-%%VERSION%%/ges/ges-base-effect.h +include/gstreamer-%%VERSION%%/ges/ges-base-transition-clip.h +include/gstreamer-%%VERSION%%/ges/ges-base-xml-formatter.h +include/gstreamer-%%VERSION%%/ges/ges-clip-asset.h +include/gstreamer-%%VERSION%%/ges/ges-clip.h +include/gstreamer-%%VERSION%%/ges/ges-container.h +include/gstreamer-%%VERSION%%/ges/ges-effect-asset.h +include/gstreamer-%%VERSION%%/ges/ges-effect-clip.h +include/gstreamer-%%VERSION%%/ges/ges-effect.h +include/gstreamer-%%VERSION%%/ges/ges-enums.h +include/gstreamer-%%VERSION%%/ges/ges-extractable.h +include/gstreamer-%%VERSION%%/ges/ges-formatter.h +include/gstreamer-%%VERSION%%/ges/ges-gerror.h +include/gstreamer-%%VERSION%%/ges/ges-group.h +include/gstreamer-%%VERSION%%/ges/ges-image-source.h +include/gstreamer-%%VERSION%%/ges/ges-layer.h +include/gstreamer-%%VERSION%%/ges/ges-meta-container.h +include/gstreamer-%%VERSION%%/ges/ges-multi-file-source.h +include/gstreamer-%%VERSION%%/ges/ges-operation-clip.h +include/gstreamer-%%VERSION%%/ges/ges-operation.h +include/gstreamer-%%VERSION%%/ges/ges-overlay-clip.h +include/gstreamer-%%VERSION%%/ges/ges-pipeline.h +include/gstreamer-%%VERSION%%/ges/ges-pitivi-formatter.h +include/gstreamer-%%VERSION%%/ges/ges-project.h +include/gstreamer-%%VERSION%%/ges/ges-screenshot.h +include/gstreamer-%%VERSION%%/ges/ges-smart-adder.h +include/gstreamer-%%VERSION%%/ges/ges-smart-video-mixer.h +include/gstreamer-%%VERSION%%/ges/ges-source-clip.h +include/gstreamer-%%VERSION%%/ges/ges-source.h +include/gstreamer-%%VERSION%%/ges/ges-test-clip.h +include/gstreamer-%%VERSION%%/ges/ges-text-overlay-clip.h +include/gstreamer-%%VERSION%%/ges/ges-text-overlay.h +include/gstreamer-%%VERSION%%/ges/ges-timeline-element.h +include/gstreamer-%%VERSION%%/ges/ges-timeline.h +include/gstreamer-%%VERSION%%/ges/ges-title-clip.h +include/gstreamer-%%VERSION%%/ges/ges-title-source.h +include/gstreamer-%%VERSION%%/ges/ges-track-element-asset.h +include/gstreamer-%%VERSION%%/ges/ges-track-element.h +include/gstreamer-%%VERSION%%/ges/ges-track.h +include/gstreamer-%%VERSION%%/ges/ges-transition-clip.h +include/gstreamer-%%VERSION%%/ges/ges-transition.h +include/gstreamer-%%VERSION%%/ges/ges-types.h +include/gstreamer-%%VERSION%%/ges/ges-uri-asset.h +include/gstreamer-%%VERSION%%/ges/ges-uri-clip.h +include/gstreamer-%%VERSION%%/ges/ges-utils.h +include/gstreamer-%%VERSION%%/ges/ges-version.h +include/gstreamer-%%VERSION%%/ges/ges-video-source.h +include/gstreamer-%%VERSION%%/ges/ges-video-test-source.h +include/gstreamer-%%VERSION%%/ges/ges-video-track.h +include/gstreamer-%%VERSION%%/ges/ges-video-transition.h +include/gstreamer-%%VERSION%%/ges/ges-video-uri-source.h +include/gstreamer-%%VERSION%%/ges/ges-xml-formatter.h +include/gstreamer-%%VERSION%%/ges/ges.h +lib/girepository-%%VERSION%%/GES-%%VERSION%%.typelib +lib/libges-%%VERSION%%.so +lib/libges-%%VERSION%%.so.0 +lib/libges-%%VERSION%%.so.0.0.0 +libdata/pkgconfig/gst-editing-services-%%VERSION%%.pc +share/gir-%%VERSION%%/GES-%%VERSION%%.gir diff --git a/multimedia/gstreamer1-libav/Makefile b/multimedia/gstreamer1-libav/Makefile index f006de1b04f2..5d3322ff3c23 100644 --- a/multimedia/gstreamer1-libav/Makefile +++ b/multimedia/gstreamer1-libav/Makefile @@ -3,8 +3,7 @@ # $MCom: ports/multimedia/gstreamer1-libav/Makefile,v 1.4 2013/01/15 21:43:45 kwm Exp $ PORTNAME= gstreamer1-libav -PORTVERSION= 1.2.4 -PORTREVISION= 1 +PORTVERSION= 1.4.4 CATEGORIES= multimedia MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-libav/ DISTNAME= gst-libav-${PORTVERSION} @@ -13,17 +12,22 @@ MAINTAINER= multimedia@FreeBSD.org COMMENT= GStreamer plug-in with many audio/video decoders/encoders LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \ orc>=0.4.16:${PORTSDIR}/devel/orc LIB_DEPENDS= liborc-0.4.so:${PORTSDIR}/devel/orc -USES= compiler gmake libtool pkgconfig tar:xz +USES= compiler:features gmake libtool pkgconfig tar:xz USE_LDCONFIG= yes USE_GSTREAMER1= yes GNU_CONFIGURE= yes +LIBAV_CONFIG= --cc=${CC} \ + --enable-runtime-cpudetect \ + --enable-pic +LDFLAGS+= -Wl,-Bsymbolic + INSTALL_TARGET= install-strip -PLIST_FILES= lib/gstreamer-1.0/libgstlibav.so .include <bsd.port.pre.mk> diff --git a/multimedia/gstreamer1-libav/distinfo b/multimedia/gstreamer1-libav/distinfo index 4c47b1de1a15..acb0032c2c57 100644 --- a/multimedia/gstreamer1-libav/distinfo +++ b/multimedia/gstreamer1-libav/distinfo @@ -1,2 +1,2 @@ -SHA256 (gst-libav-1.2.4.tar.xz) = 2a69480d63fc2db93249d9e2e229ab3541bbc2db881b0f64de13d0bfc7d1f037 -SIZE (gst-libav-1.2.4.tar.xz) = 4580144 +SHA256 (gst-libav-1.4.4.tar.xz) = 2ec7285e5ec6731963b0955487cceb9eb04e285ca682f3ef575996c068cde8aa +SIZE (gst-libav-1.4.4.tar.xz) = 5218776 diff --git a/multimedia/gstreamer1-libav/files/patch-ext_libav_gstavauddec.c b/multimedia/gstreamer1-libav/files/patch-ext_libav_gstavauddec.c deleted file mode 100644 index 1132b2e9ab8e..000000000000 --- a/multimedia/gstreamer1-libav/files/patch-ext_libav_gstavauddec.c +++ /dev/null @@ -1,12 +0,0 @@ ---- ext/libav/gstavauddec.c.orig 2013-11-21 00:29:36.000000000 +0100 -+++ ext/libav/gstavauddec.c 2013-11-21 00:29:59.000000000 +0100 -@@ -909,9 +909,6 @@ - case AV_CODEC_ID_SIPR: - rank = GST_RANK_SECONDARY; - break; -- case AV_CODEC_ID_MP3: -- rank = GST_RANK_NONE; -- break; - default: - rank = GST_RANK_MARGINAL; - break; diff --git a/multimedia/gstreamer1-libav/pkg-descr b/multimedia/gstreamer1-libav/pkg-descr index b8a091e3522f..aeb3ca9c76ab 100644 --- a/multimedia/gstreamer1-libav/pkg-descr +++ b/multimedia/gstreamer1-libav/pkg-descr @@ -1,4 +1,4 @@ -The Gstreamer ffmpeg package provides mpeg support for Gstreamer. +The Gstreamer libav package provides mpeg support for Gstreamer. It includes codecs for most popular formats, and optimized colourspace conversion. diff --git a/multimedia/gstreamer1-libav/pkg-plist b/multimedia/gstreamer1-libav/pkg-plist new file mode 100644 index 000000000000..a8d62793aca8 --- /dev/null +++ b/multimedia/gstreamer1-libav/pkg-plist @@ -0,0 +1,25 @@ +lib/gstreamer-1.0/libgstlibav.so +share/gtk-doc/html/gst-libav-plugins-1.0/ch01.html +share/gtk-doc/html/gst-libav-plugins-1.0/ch02.html +share/gtk-doc/html/gst-libav-plugins-1.0/ch03.html +share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-1.0.devhelp2 +share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-GstFFMpegAudDec.html +share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-GstFFMpegAudEnc.html +share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-GstFFMpegVidDec.html +share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-GstFFMpegVidEnc.html +share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-gstav.html +share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-gstavcfg.html +share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-gstavcodecmap.html +share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-gstavprotocol.html +share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-gstavutils.html +share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-plugin-libav.html +share/gtk-doc/html/gst-libav-plugins-1.0/home.png +share/gtk-doc/html/gst-libav-plugins-1.0/index.html +share/gtk-doc/html/gst-libav-plugins-1.0/index.sgml +share/gtk-doc/html/gst-libav-plugins-1.0/left-insensitive.png +share/gtk-doc/html/gst-libav-plugins-1.0/left.png +share/gtk-doc/html/gst-libav-plugins-1.0/right-insensitive.png +share/gtk-doc/html/gst-libav-plugins-1.0/right.png +share/gtk-doc/html/gst-libav-plugins-1.0/style.css +share/gtk-doc/html/gst-libav-plugins-1.0/up-insensitive.png +share/gtk-doc/html/gst-libav-plugins-1.0/up.png diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-ext_modplug_Makefile.in b/multimedia/gstreamer1-plugins-bad/files/patch-ext_modplug_Makefile.in deleted file mode 100644 index 38a3c02fc163..000000000000 --- a/multimedia/gstreamer1-plugins-bad/files/patch-ext_modplug_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/modplug/Makefile.in.orig 2013-11-01 22:34:02.000000000 +0100 -+++ ext/modplug/Makefile.in 2013-11-01 22:34:20.000000000 +0100 -@@ -623,7 +623,7 @@ - plugin_LTLIBRARIES = libgstmodplug.la - libgstmodplug_la_SOURCES = gstmodplug.cc - libgstmodplug_la_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(MODPLUG_CFLAGS) --libgstmodplug_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lstdc++ $(LIBM) $(MODPLUG_LIBS) -+libgstmodplug_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(LIBM) $(MODPLUG_LIBS) - libgstmodplug_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) - libgstmodplug_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS) - noinst_HEADERS = gstmodplug.h diff --git a/multimedia/gstreamer1-plugins-bad/pkg-plist b/multimedia/gstreamer1-plugins-bad/pkg-plist index cebaddc03620..aff248f29381 100644 --- a/multimedia/gstreamer1-plugins-bad/pkg-plist +++ b/multimedia/gstreamer1-plugins-bad/pkg-plist @@ -2,16 +2,20 @@ include/gstreamer-%%VERSION%%/gst/basecamerabinsrc/gstbasecamerasrc.h include/gstreamer-%%VERSION%%/gst/basecamerabinsrc/gstcamerabin-enum.h include/gstreamer-%%VERSION%%/gst/basecamerabinsrc/gstcamerabinpreview.h include/gstreamer-%%VERSION%%/gst/codecparsers/gsth264parser.h +include/gstreamer-%%VERSION%%/gst/codecparsers/gsth265parser.h include/gstreamer-%%VERSION%%/gst/codecparsers/gstmpeg4parser.h include/gstreamer-%%VERSION%%/gst/codecparsers/gstmpegvideometa.h include/gstreamer-%%VERSION%%/gst/codecparsers/gstmpegvideoparser.h include/gstreamer-%%VERSION%%/gst/codecparsers/gstvc1parser.h +include/gstreamer-%%VERSION%%/gst/codecparsers/gstvp8parser.h +include/gstreamer-%%VERSION%%/gst/codecparsers/gstvp8rangedecoder.h include/gstreamer-%%VERSION%%/gst/insertbin/gstinsertbin.h include/gstreamer-%%VERSION%%/gst/interfaces/photography-enumtypes.h include/gstreamer-%%VERSION%%/gst/interfaces/photography.h include/gstreamer-%%VERSION%%/gst/mpegts/gst-atsc-section.h include/gstreamer-%%VERSION%%/gst/mpegts/gst-dvb-descriptor.h include/gstreamer-%%VERSION%%/gst/mpegts/gst-dvb-section.h +include/gstreamer-%%VERSION%%/gst/mpegts/gst-scte-section.h include/gstreamer-%%VERSION%%/gst/mpegts/gstmpegts-enumtypes.h include/gstreamer-%%VERSION%%/gst/mpegts/gstmpegtsdescriptor.h include/gstreamer-%%VERSION%%/gst/mpegts/gstmpegtssection.h @@ -19,131 +23,86 @@ include/gstreamer-%%VERSION%%/gst/mpegts/mpegts.h include/gstreamer-%%VERSION%%/gst/uridownloader/gstfragment.h include/gstreamer-%%VERSION%%/gst/uridownloader/gsturidownloader.h include/gstreamer-%%VERSION%%/gst/uridownloader/gsturidownloader_debug.h -lib/girepository-%%VERSION%%/GstInsertBin-%%VERSION%%.typelib -lib/girepository-%%VERSION%%/GstMpegts-%%VERSION%%.typelib -lib/gstreamer-%%VERSION%%/libgstaccurip.la +lib/girepository-1.0/GstInsertBin-%%VERSION%%.typelib +lib/girepository-1.0/GstMpegts-%%VERSION%%.typelib lib/gstreamer-%%VERSION%%/libgstaccurip.so -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%%/libgstaudiofxbad.la lib/gstreamer-%%VERSION%%/libgstaudiofxbad.so -lib/gstreamer-%%VERSION%%/libgstaudiovisualizers.la +lib/gstreamer-%%VERSION%%/libgstaudiomixer.so lib/gstreamer-%%VERSION%%/libgstaudiovisualizers.so -lib/gstreamer-%%VERSION%%/libgstautoconvert.la lib/gstreamer-%%VERSION%%/libgstautoconvert.so -lib/gstreamer-%%VERSION%%/libgstbayer.la lib/gstreamer-%%VERSION%%/libgstbayer.so -lib/gstreamer-%%VERSION%%/libgstcamerabin2.la lib/gstreamer-%%VERSION%%/libgstcamerabin2.so -lib/gstreamer-%%VERSION%%/libgstcoloreffects.la lib/gstreamer-%%VERSION%%/libgstcoloreffects.so -lib/gstreamer-%%VERSION%%/libgstdataurisrc.la +lib/gstreamer-%%VERSION%%/libgstcompositor.so lib/gstreamer-%%VERSION%%/libgstdataurisrc.so -lib/gstreamer-%%VERSION%%/libgstdebugutilsbad.la lib/gstreamer-%%VERSION%%/libgstdebugutilsbad.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%%/libgstfestival.la lib/gstreamer-%%VERSION%%/libgstfestival.so -lib/gstreamer-%%VERSION%%/libgstfieldanalysis.la lib/gstreamer-%%VERSION%%/libgstfieldanalysis.so -lib/gstreamer-%%VERSION%%/libgstfreeverb.la lib/gstreamer-%%VERSION%%/libgstfreeverb.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%%/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%%/libgstivtc.la +lib/gstreamer-%%VERSION%%/libgstivfparse.so lib/gstreamer-%%VERSION%%/libgstivtc.so -lib/gstreamer-%%VERSION%%/libgstjpegformat.la +lib/gstreamer-%%VERSION%%/libgstjp2kdecimator.so lib/gstreamer-%%VERSION%%/libgstjpegformat.so -lib/gstreamer-%%VERSION%%/libgstliveadder.la lib/gstreamer-%%VERSION%%/libgstliveadder.so -lib/gstreamer-%%VERSION%%/libgstmfc.la -lib/gstreamer-%%VERSION%%/libgstmfc.so -lib/gstreamer-%%VERSION%%/libgstmidi.la lib/gstreamer-%%VERSION%%/libgstmidi.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%%/libgstmxf.la lib/gstreamer-%%VERSION%%/libgstmxf.so -lib/gstreamer-%%VERSION%%/libgstpcapparse.la lib/gstreamer-%%VERSION%%/libgstpcapparse.so -lib/gstreamer-%%VERSION%%/libgstpnm.la lib/gstreamer-%%VERSION%%/libgstpnm.so -lib/gstreamer-%%VERSION%%/libgstrawparse.la lib/gstreamer-%%VERSION%%/libgstrawparse.so -lib/gstreamer-%%VERSION%%/libgstremovesilence.la lib/gstreamer-%%VERSION%%/libgstremovesilence.so -lib/gstreamer-%%VERSION%%/libgstsdpelem.la lib/gstreamer-%%VERSION%%/libgstsdpelem.so -lib/gstreamer-%%VERSION%%/libgstsegmentclip.la lib/gstreamer-%%VERSION%%/libgstsegmentclip.so -lib/gstreamer-%%VERSION%%/libgstshm.la 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%%/libgstsubenc.la +lib/gstreamer-%%VERSION%%/libgststereo.so lib/gstreamer-%%VERSION%%/libgstsubenc.so -lib/gstreamer-%%VERSION%%/libgstvideofiltersbad.la lib/gstreamer-%%VERSION%%/libgstvideofiltersbad.so -lib/gstreamer-%%VERSION%%/libgstvideoparsersbad.la lib/gstreamer-%%VERSION%%/libgstvideoparsersbad.so -lib/gstreamer-%%VERSION%%/libgsty4mdec.la +lib/gstreamer-%%VERSION%%/libgstvideosignal.so +lib/gstreamer-%%VERSION%%/libgstvmnc.so lib/gstreamer-%%VERSION%%/libgsty4mdec.so -lib/gstreamer-%%VERSION%%/libgstyadif.la lib/gstreamer-%%VERSION%%/libgstyadif.so -lib/libgstbasecamerabinsrc-%%VERSION%%.la +lib/libgstbadbase-%%VERSION%%.so +lib/libgstbadbase-%%VERSION%%.so.0 +lib/libgstbadbase-%%VERSION%%.so.%%SOVERSION%% +lib/libgstbadvideo-%%VERSION%%.so +lib/libgstbadvideo-%%VERSION%%.so.0 +lib/libgstbadvideo-%%VERSION%%.so.%%SOVERSION%% lib/libgstbasecamerabinsrc-%%VERSION%%.so lib/libgstbasecamerabinsrc-%%VERSION%%.so.0 lib/libgstbasecamerabinsrc-%%VERSION%%.so.%%SOVERSION%% -lib/libgstcodecparsers-%%VERSION%%.la lib/libgstcodecparsers-%%VERSION%%.so lib/libgstcodecparsers-%%VERSION%%.so.0 lib/libgstcodecparsers-%%VERSION%%.so.%%SOVERSION%% -lib/libgstinsertbin-%%VERSION%%.la lib/libgstinsertbin-%%VERSION%%.so lib/libgstinsertbin-%%VERSION%%.so.0 lib/libgstinsertbin-%%VERSION%%.so.%%SOVERSION%% -lib/libgstmpegts-%%VERSION%%.la lib/libgstmpegts-%%VERSION%%.so lib/libgstmpegts-%%VERSION%%.so.0 lib/libgstmpegts-%%VERSION%%.so.%%SOVERSION%% -lib/libgstphotography-%%VERSION%%.la lib/libgstphotography-%%VERSION%%.so lib/libgstphotography-%%VERSION%%.so.0 lib/libgstphotography-%%VERSION%%.so.%%SOVERSION%% -lib/libgsturidownloader-%%VERSION%%.la lib/libgsturidownloader-%%VERSION%%.so lib/libgsturidownloader-%%VERSION%%.so.0 lib/libgsturidownloader-%%VERSION%%.so.%%SOVERSION%% @@ -151,8 +110,8 @@ libdata/pkgconfig/gstreamer-codecparsers-%%VERSION%%.pc libdata/pkgconfig/gstreamer-insertbin-%%VERSION%%.pc libdata/pkgconfig/gstreamer-mpegts-%%VERSION%%.pc libdata/pkgconfig/gstreamer-plugins-bad-%%VERSION%%.pc -share/gir-%%VERSION%%/GstInsertBin-%%VERSION%%.gir -share/gir-%%VERSION%%/GstMpegts-%%VERSION%%.gir +share/gir-1.0/GstInsertBin-%%VERSION%%.gir +share/gir-1.0/GstMpegts-%%VERSION%%.gir share/locale/af/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/az/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/bg/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo @@ -193,11 +152,3 @@ share/locale/tr/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/uk/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/vi/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/zh_CN/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo -@dirrmtry share/locale/ky/LC_MESSAGES -@dirrmtry share/locale/ky -@dirrm include/gstreamer-%%VERSION%%/gst/uridownloader -@dirrm include/gstreamer-%%VERSION%%/gst/mpegts -@dirrm include/gstreamer-%%VERSION%%/gst/interfaces -@dirrm include/gstreamer-%%VERSION%%/gst/insertbin -@dirrm include/gstreamer-%%VERSION%%/gst/codecparsers -@dirrm include/gstreamer-%%VERSION%%/gst/basecamerabinsrc diff --git a/multimedia/gstreamer1-plugins-dvdread/Makefile b/multimedia/gstreamer1-plugins-dvdread/Makefile index ff08b21ea1a0..ca439dffa2ce 100644 --- a/multimedia/gstreamer1-plugins-dvdread/Makefile +++ b/multimedia/gstreamer1-plugins-dvdread/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= multimedia COMMENT= Gstreamer dvdread plugin diff --git a/multimedia/gstreamer1-plugins-gnonlin/Makefile b/multimedia/gstreamer1-plugins-gnonlin/Makefile index 1be2f8d86a9f..0f34589661bf 100644 --- a/multimedia/gstreamer1-plugins-gnonlin/Makefile +++ b/multimedia/gstreamer1-plugins-gnonlin/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gstreamer1-plugins-gnonlin -PORTVERSION= 1.2.1 +PORTVERSION= 1.4.0 CATEGORIES= multimedia MASTER_SITES= http://gstreamer.freedesktop.org/src/gnonlin/ DISTNAME= gnonlin-${PORTVERSION} @@ -10,8 +10,7 @@ DISTNAME= gnonlin-${PORTVERSION} MAINTAINER= multimedia@FreeBSD.org COMMENT= Gstreamer lib for writing non-linear audio and video -CFLAGS:= ${CFLAGS} -O2 -Wno-format -USES= libtool pkgconfig python:build tar:xz +USES= libtool pkgconfig python:3,build tar:xz GNU_CONFIGURE= yes USE_GSTREAMER1= good INSTALL_TARGET= install-strip diff --git a/multimedia/gstreamer1-plugins-gnonlin/distinfo b/multimedia/gstreamer1-plugins-gnonlin/distinfo index cf7f634d6423..c60d6ee28ec8 100644 --- a/multimedia/gstreamer1-plugins-gnonlin/distinfo +++ b/multimedia/gstreamer1-plugins-gnonlin/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnonlin-1.2.1.tar.xz) = 787006231184753f8330b4b6d63d37979d937355291c6da75080d83efe1aeb93 -SIZE (gnonlin-1.2.1.tar.xz) = 401620 +SHA256 (gnonlin-1.4.0.tar.xz) = 2d667e1632816ea8a6ff7c8b75b29241b6542e1f6ab41d9d51661c287006667f +SIZE (gnonlin-1.4.0.tar.xz) = 404096 diff --git a/multimedia/gstreamer1-plugins-good/Makefile b/multimedia/gstreamer1-plugins-good/Makefile index 3dd91c6a3af6..509887eb8a2d 100644 --- a/multimedia/gstreamer1-plugins-good/Makefile +++ b/multimedia/gstreamer1-plugins-good/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # $MCom: ports/multimedia/gstreamer1-plugins-good/Makefile,v 1.4 2013/01/15 21:43:45 kwm Exp $ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= multimedia COMMENT= Good gstreamer-plugins @@ -12,8 +12,6 @@ GST_PLUGIN_SUFFIX= -good MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins -CONFIGURE_ARGS+=--enable-monoscope - 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 diff --git a/multimedia/gstreamer1-plugins-good/files/patch-sys_oss_gstosshelper.c b/multimedia/gstreamer1-plugins-good/files/patch-sys_oss_gstosshelper.c index 6fae8849cfef..c5790c08eb8d 100644 --- a/multimedia/gstreamer1-plugins-good/files/patch-sys_oss_gstosshelper.c +++ b/multimedia/gstreamer1-plugins-good/files/patch-sys_oss_gstosshelper.c @@ -1,22 +1,18 @@ ---- sys/oss/gstosshelper.c.orig 2014-01-14 13:03:14.000000000 +0100 -+++ sys/oss/gstosshelper.c 2014-09-11 09:10:55.115013111 +0200 -@@ -95,9 +95,13 @@ - format_mask = AFMT_U8 | AFMT_S8; - - if (G_BYTE_ORDER == G_LITTLE_ENDIAN) -- format_mask |= AFMT_S16_LE | AFMT_U16_LE; -+ format_mask |= AFMT_S16_LE | AFMT_U16_LE -+ | AFMT_S24_LE | AFMT_U24_LE -+ | AFMT_S32_LE | AFMT_U32_LE; - else -- format_mask |= AFMT_S16_BE | AFMT_U16_BE; -+ format_mask |= AFMT_S16_BE | AFMT_U16_BE -+ | AFMT_S24_BE | AFMT_U24_BE -+ | AFMT_S32_BE | AFMT_U32_BE; - - caps = gst_caps_new_empty (); - -@@ -169,6 +173,9 @@ +--- sys/oss/gstosshelper.c.orig 2014-07-21 10:24:27.000000000 +0200 ++++ sys/oss/gstosshelper.c 2014-10-12 18:13:53.847663389 +0200 +@@ -82,9 +82,9 @@ + gst_oss_helper_probe_caps (gint fd) + { + #if G_BYTE_ORDER == G_LITTLE_ENDIAN +- const guint probe_formats[] = { AFMT_S16_LE, AFMT_U16_LE, AFMT_U8, AFMT_S8 }; ++ const guint probe_formats[] = { AFMT_U32_LE, AFMT_S32_LE, AFMT_U24_LE, AFMT_S24_LE, AFMT_S16_LE, AFMT_U16_LE, AFMT_U8, AFMT_S8 }; + #else +- const guint probe_formats[] = { AFMT_S16_BE, AFMT_U16_BE, AFMT_U8, AFMT_S8 }; ++ const guint probe_formats[] = { AFMT_U32_BE, AFMT_S32_BE, AFMT_U24_BE, AFMT_S24_BE, AFMT_S16_BE, AFMT_U16_BE, AFMT_U8, AFMT_S8 }; + #endif + GstOssProbe *probe; + int i, f; +@@ -165,6 +165,9 @@ const gchar *format; switch (format_bit) { @@ -26,7 +22,7 @@ case AFMT_U8: format = "U8"; break; -@@ -178,15 +185,36 @@ +@@ -174,15 +177,36 @@ case AFMT_S16_BE: format = "S16BE"; break; @@ -66,7 +62,7 @@ default: g_assert_not_reached (); return NULL; -@@ -324,13 +352,17 @@ +@@ -320,13 +344,17 @@ int format; int n_channels; int ret; diff --git a/multimedia/gstreamer1-plugins-good/pkg-plist b/multimedia/gstreamer1-plugins-good/pkg-plist index 926389ec3e75..cd64f69d198e 100644 --- a/multimedia/gstreamer1-plugins-good/pkg-plist +++ b/multimedia/gstreamer1-plugins-good/pkg-plist @@ -1,96 +1,49 @@ -lib/gstreamer-%%VERSION%%/libgstalaw.la lib/gstreamer-%%VERSION%%/libgstalaw.so -lib/gstreamer-%%VERSION%%/libgstalpha.la lib/gstreamer-%%VERSION%%/libgstalpha.so -lib/gstreamer-%%VERSION%%/libgstalphacolor.la lib/gstreamer-%%VERSION%%/libgstalphacolor.so -lib/gstreamer-%%VERSION%%/libgstapetag.la lib/gstreamer-%%VERSION%%/libgstapetag.so -lib/gstreamer-%%VERSION%%/libgstaudiofx.la lib/gstreamer-%%VERSION%%/libgstaudiofx.so -lib/gstreamer-%%VERSION%%/libgstaudioparsers.la lib/gstreamer-%%VERSION%%/libgstaudioparsers.so -lib/gstreamer-%%VERSION%%/libgstauparse.la lib/gstreamer-%%VERSION%%/libgstauparse.so -lib/gstreamer-%%VERSION%%/libgstautodetect.la lib/gstreamer-%%VERSION%%/libgstautodetect.so -lib/gstreamer-%%VERSION%%/libgstavi.la lib/gstreamer-%%VERSION%%/libgstavi.so -lib/gstreamer-%%VERSION%%/libgstcutter.la lib/gstreamer-%%VERSION%%/libgstcutter.so -lib/gstreamer-%%VERSION%%/libgstdebug.la lib/gstreamer-%%VERSION%%/libgstdebug.so -lib/gstreamer-%%VERSION%%/libgstdeinterlace.la lib/gstreamer-%%VERSION%%/libgstdeinterlace.so -lib/gstreamer-%%VERSION%%/libgstdtmf.la lib/gstreamer-%%VERSION%%/libgstdtmf.so -lib/gstreamer-%%VERSION%%/libgsteffectv.la lib/gstreamer-%%VERSION%%/libgsteffectv.so -lib/gstreamer-%%VERSION%%/libgstequalizer.la lib/gstreamer-%%VERSION%%/libgstequalizer.so -lib/gstreamer-%%VERSION%%/libgstflv.la lib/gstreamer-%%VERSION%%/libgstflv.so -lib/gstreamer-%%VERSION%%/libgstflxdec.la lib/gstreamer-%%VERSION%%/libgstflxdec.so -lib/gstreamer-%%VERSION%%/libgstgoom.la lib/gstreamer-%%VERSION%%/libgstgoom.so -lib/gstreamer-%%VERSION%%/libgstgoom2k1.la lib/gstreamer-%%VERSION%%/libgstgoom2k1.so -lib/gstreamer-%%VERSION%%/libgsticydemux.la lib/gstreamer-%%VERSION%%/libgsticydemux.so -lib/gstreamer-%%VERSION%%/libgstid3demux.la lib/gstreamer-%%VERSION%%/libgstid3demux.so -lib/gstreamer-%%VERSION%%/libgstimagefreeze.la lib/gstreamer-%%VERSION%%/libgstimagefreeze.so -lib/gstreamer-%%VERSION%%/libgstinterleave.la lib/gstreamer-%%VERSION%%/libgstinterleave.so -lib/gstreamer-%%VERSION%%/libgstlevel.la lib/gstreamer-%%VERSION%%/libgstlevel.so -lib/gstreamer-%%VERSION%%/libgstmatroska.la lib/gstreamer-%%VERSION%%/libgstmatroska.so -lib/gstreamer-%%VERSION%%/libgstmulaw.la lib/gstreamer-%%VERSION%%/libgstmulaw.so -lib/gstreamer-%%VERSION%%/libgstmultifile.la lib/gstreamer-%%VERSION%%/libgstmultifile.so -lib/gstreamer-%%VERSION%%/libgstmultipart.la lib/gstreamer-%%VERSION%%/libgstmultipart.so -lib/gstreamer-%%VERSION%%/libgstnavigationtest.la lib/gstreamer-%%VERSION%%/libgstnavigationtest.so -lib/gstreamer-%%VERSION%%/libgstoss4audio.la lib/gstreamer-%%VERSION%%/libgstoss4audio.so -lib/gstreamer-%%VERSION%%/libgstossaudio.la lib/gstreamer-%%VERSION%%/libgstossaudio.so -lib/gstreamer-%%VERSION%%/libgstisomp4.la lib/gstreamer-%%VERSION%%/libgstisomp4.so -lib/gstreamer-%%VERSION%%/libgstreplaygain.la lib/gstreamer-%%VERSION%%/libgstreplaygain.so -lib/gstreamer-%%VERSION%%/libgstrtp.la lib/gstreamer-%%VERSION%%/libgstrtp.so -lib/gstreamer-%%VERSION%%/libgstrtpmanager.la lib/gstreamer-%%VERSION%%/libgstrtpmanager.so -lib/gstreamer-%%VERSION%%/libgstrtsp.la lib/gstreamer-%%VERSION%%/libgstrtsp.so -lib/gstreamer-%%VERSION%%/libgstshapewipe.la lib/gstreamer-%%VERSION%%/libgstshapewipe.so -lib/gstreamer-%%VERSION%%/libgstsmpte.la lib/gstreamer-%%VERSION%%/libgstsmpte.so -lib/gstreamer-%%VERSION%%/libgstspectrum.la lib/gstreamer-%%VERSION%%/libgstspectrum.so -lib/gstreamer-%%VERSION%%/libgstudp.la lib/gstreamer-%%VERSION%%/libgstudp.so -lib/gstreamer-%%VERSION%%/libgstvideobox.la lib/gstreamer-%%VERSION%%/libgstvideobox.so -lib/gstreamer-%%VERSION%%/libgstvideocrop.la lib/gstreamer-%%VERSION%%/libgstvideocrop.so -lib/gstreamer-%%VERSION%%/libgstvideofilter.la lib/gstreamer-%%VERSION%%/libgstvideofilter.so -lib/gstreamer-%%VERSION%%/libgstvideomixer.la lib/gstreamer-%%VERSION%%/libgstvideomixer.so -lib/gstreamer-%%VERSION%%/libgstwavenc.la lib/gstreamer-%%VERSION%%/libgstwavenc.so -lib/gstreamer-%%VERSION%%/libgstwavparse.la lib/gstreamer-%%VERSION%%/libgstwavparse.so -lib/gstreamer-%%VERSION%%/libgsty4menc.la lib/gstreamer-%%VERSION%%/libgsty4menc.so share/gstreamer-%%VERSION%%/presets/GstIirEqualizer10Bands.prs share/gstreamer-%%VERSION%%/presets/GstIirEqualizer3Bands.prs @@ -135,7 +88,3 @@ share/locale/vi/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/zh_CN/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/zh_HK/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/zh_TW/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/gstreamer-%%VERSION%%/presets -@dirrmtry share/gstreamer-%%VERSION%% diff --git a/multimedia/gstreamer1-plugins-mpeg2enc/Makefile b/multimedia/gstreamer1-plugins-mpeg2enc/Makefile index d3cba8558b87..ef5d5e6b98e6 100644 --- a/multimedia/gstreamer1-plugins-mpeg2enc/Makefile +++ b/multimedia/gstreamer1-plugins-mpeg2enc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= multimedia COMMENT= Gstreamer mpeg encoder plugin diff --git a/multimedia/gstreamer1-plugins-resindvd/Makefile b/multimedia/gstreamer1-plugins-resindvd/Makefile index 72e1dd526171..c40882dc955e 100644 --- a/multimedia/gstreamer1-plugins-resindvd/Makefile +++ b/multimedia/gstreamer1-plugins-resindvd/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= multimedia COMMENT= Gstreamer resindvd plugin diff --git a/multimedia/gstreamer1-plugins-ugly/pkg-plist b/multimedia/gstreamer1-plugins-ugly/pkg-plist index a0c501ece2c4..0a479e7b17da 100644 --- a/multimedia/gstreamer1-plugins-ugly/pkg-plist +++ b/multimedia/gstreamer1-plugins-ugly/pkg-plist @@ -1,12 +1,7 @@ -lib/gstreamer-%%VERSION%%/libgstasf.la lib/gstreamer-%%VERSION%%/libgstasf.so -lib/gstreamer-%%VERSION%%/libgstdvdlpcmdec.la lib/gstreamer-%%VERSION%%/libgstdvdlpcmdec.so -lib/gstreamer-%%VERSION%%/libgstdvdsub.la lib/gstreamer-%%VERSION%%/libgstdvdsub.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 diff --git a/multimedia/gstreamer1-plugins-x264/Makefile b/multimedia/gstreamer1-plugins-x264/Makefile index bbdf10e0afcc..66ac4f231644 100644 --- a/multimedia/gstreamer1-plugins-x264/Makefile +++ b/multimedia/gstreamer1-plugins-x264/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= multimedia COMMENT= Gstreamer x264 plugin diff --git a/multimedia/gstreamer1-plugins/Makefile b/multimedia/gstreamer1-plugins/Makefile index aa12e6368501..7bb31334aaa2 100644 --- a/multimedia/gstreamer1-plugins/Makefile +++ b/multimedia/gstreamer1-plugins/Makefile @@ -27,23 +27,23 @@ RUN_DEPENDS+= iso-codes>=0:${PORTSDIR}/misc/iso-codes PORTSCOUT= limitw:1,even -BASE_PORTVERSION= 1.2.4 +BASE_PORTVERSION= 1.4.4 BASE_DISTNAME= gst-plugins-base-${BASE_PORTVERSION} BASE_DISTFILE= ${BASE_DISTNAME}${EXTRACT_SUFX} -BAD_PORTVERSION= 1.2.4 +BAD_PORTVERSION= 1.4.4 BAD_DISTNAME= gst-plugins-bad-${BAD_PORTVERSION} BAD_DISTFILE= ${BAD_DISTNAME}${EXTRACT_SUFX} -GOOD_PORTVERSION= 1.2.4 +GOOD_PORTVERSION= 1.4.4 GOOD_DISTNAME= gst-plugins-good-${GOOD_PORTVERSION} GOOD_DISTFILE= ${GOOD_DISTNAME}${EXTRACT_SUFX} -UGLY_PORTVERSION= 1.2.4 +UGLY_PORTVERSION= 1.4.4 UGLY_DISTNAME= gst-plugins-ugly-${UGLY_PORTVERSION} UGLY_DISTFILE= ${UGLY_DISTNAME}${EXTRACT_SUFX} DIST?= base -USES= tar:xz gettext gmake libtool:keepla pathfix pkgconfig +USES= gettext gmake libtool pathfix pkgconfig tar:xz WANT_GSTREAMER= yes -USE_GNOME+= glib20 gnomehier introspection:build libxml2 +USE_GNOME+= glib20 introspection:build libxml2 GNU_CONFIGURE= yes INSTALL_TARGET= install-strip GST_PLUGIN?= base @@ -61,8 +61,9 @@ IGNORE= DIST not specified .endif VERSION= 1.0 +SOVERSION= 0.404.0 PLIST_SUB+= VERSION="${VERSION}" \ - SOVERSION=0.204.0 + SOVERSION="${SOVERSION}" .include <bsd.port.pre.mk> @@ -125,34 +126,40 @@ DEFAULT_DVD_DEVICE=/dev/cd0 .endif post-patch: -.if ${DIST}=="bad" +.if ${DIST} == bad # custom rule to fix opencv detection in configure - @${REINPLACE_CMD} -e 's|opencv <= 2.4.8|opencv <= 2.4.9|g' \ - ${WRKSRC}/configure +# @${REINPLACE_CMD} -e 's|opencv <= 2.4.8|opencv <= 2.4.9|g' \ +# ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|g' \ ${WRKSRC}/ext/resindvd/resindvdbin.c \ ${WRKSRC}/ext/resindvd/resindvdsrc.c .endif -.if ${DIST}!="ugly" +.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_API_VERSION@.la|${LOCALBASE}/lib/libgsttag-$$(GST_API_VERSION).la|; \ - s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la|${LOCALBASE}/lib/libgstaudio-$$(GST_API_VERSION).la|; \ - s|$$(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_API_VERSION@.la|${LOCALBASE}/lib/libgstpbutils-$$(GST_API_VERSION).la|; \ - s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-@GST_API_VERSION@.la|${LOCALBASE}/lib/libgstriff-$$(GST_API_VERSION).la|; \ - s|$$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-@GST_API_VERSION@.la|${LOCALBASE}/lib/libgstsignalprocessor-$$(GST_API_VERSION).la|; \ - s|$$(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_API_VERSION@.la|${LOCALBASE}/lib/libgstbasevideo-$$(GST_API_VERSION).la|; \ - s|$$(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_API_VERSION@.la|${LOCALBASE}/lib/libgstvideo-$$(GST_API_VERSION).la|' + '/la_DEPENDENCIES/,/am__DEPENDENCIES/s,$$(top_builddir)/gst-libs/.*.la,,' -e \ + 's|$$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_API_VERSION@.la|-lgsttag-${VERSION}|; \ + s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la|-lgstaudio-${VERSION}|; \ + s|$$(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_API_VERSION@.la|-lgstpbutils-${VERSION}|; \ + s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-@GST_API_VERSION@.la|-lgstriff-${VERSION}|; \ + s|$$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-@GST_API_VERSION@.la|-lgstsignalprocessor-${VERSION}|; \ + s|$$(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_API_VERSION@.la|-lgstbasevideo-${VERSION}|; \ + s|$$(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_API_VERSION@.la|-lgstvideo-${VERSION}|; \ + s|$$(top_builddir)/gst-libs/gst/base/libgstbadbase-@GST_API_VERSION@.la|-lgstbadbase-${VERSION}|; \ + s|$$(top_builddir)/gst-libs/gst/video/libgstbadvideo-@GST_API_VERSION@.la|-lgstbadvideo-${VERSION}|' @${FIND} ${WRKSRC}/ext ${WRKSRC}/sys -name Makefile.in | \ ${XARGS} -n 10 ${REINPLACE_CMD} -e \ - 's|$$(top_builddir)/gst-libs/gst/tag/libgsttag-$$(GST_API_VERSION).la|${LOCALBASE}/lib/libgsttag-$$(GST_API_VERSION).la|; \ - s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-$$(GST_API_VERSION).la|${LOCALBASE}/lib/libgstaudio-$$(GST_API_VERSION).la|; \ - s|$$(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-$$(GST_API_VERSION).la|${LOCALBASE}/lib/libgstpbutils-$$(GST_API_VERSION).la|; \ - s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-$$(GST_API_VERSION).la|${LOCALBASE}/lib/libgstriff-$$(GST_API_VERSION).la|; \ - s|$$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-$$(GST_API_VERSION).la|${LOCALBASE}/lib/libgstsignalprocessor-$$(GST_API_VERSION).la|; \ - s|$$(top_builddir)/gst-libs/gst/video/libgstbasevideo-$$(GST_API_VERSION).la|${LOCALBASE}/lib/libgstbasevideo-$$(GST_API_VERSION).la|; \ - s|$$(top_builddir)/gst-libs/gst/video/libgstvideo-$$(GST_API_VERSION).la|${LOCALBASE}/lib/libgstvideo-$$(GST_API_VERSION).la|' + '/la_DEPENDENCIES/,/am__DEPENDENCIES/s,$$(top_builddir)/gst-libs/.*.la,,' -e \ + 's|$$(top_builddir)/gst-libs/gst/tag/libgsttag-$$(GST_API_VERSION).la|-lgsttag-${VERSION}|; \ + s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-$$(GST_API_VERSION).la|-lgstaudio-${VERSION}|; \ + s|$$(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-$$(GST_API_VERSION).la|-lgstpbutils-${VERSION}|; \ + s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-$$(GST_API_VERSION).la|-lgstriff-${VERSION}|; \ + s|$$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-$$(GST_API_VERSION).la|-lgstsignalprocessor-${VERSION}|; \ + s|$$(top_builddir)/gst-libs/gst/video/libgstbasevideo-$$(GST_API_VERSION).la|-lgstbasevideo-${VERSION}|; \ + s|$$(top_builddir)/gst-libs/gst/video/libgstvideo-$$(GST_API_VERSION).la|-lgstvideo-${VERSION}|; \ + s|$$(top_builddir)/gst-libs/gst/base/libgstbadbase-$$(GST_API_VERSION).la|-lgstbadbase-${VERSION}|; \ + s|$$(top_builddir)/gst-libs/gst/video/libgstbadvideo-$$(GST_API_VERSION).la|-lgstbadvideo-${VERSION}|' .endif # workaround a crash in clang 3.3 crash llvm bug # 15840 diff --git a/multimedia/gstreamer1-plugins/Makefile.common b/multimedia/gstreamer1-plugins/Makefile.common index 0cb42fe32709..679c0d656f97 100644 --- a/multimedia/gstreamer1-plugins/Makefile.common +++ b/multimedia/gstreamer1-plugins/Makefile.common @@ -33,6 +33,7 @@ BAD_GST_ALL_PLUGINS+= \ openal \ opencv \ openjpeg \ + opengl \ opus \ resindvd \ rtmp \ @@ -45,11 +46,9 @@ BAD_GST_ALL_PLUGINS+= \ # plugins not yet ported to the 1.0 API, or not portable BAD_GST_ALL_PLUGINS+= \ apexsink \ - cdaudio \ chromaprint \ decklink \ directfb \ - eglgles \ ladspa \ linsys \ lv2 \ @@ -73,11 +72,18 @@ BAD_GST_ALL_PLUGINS+= \ wayland \ xvid +# --with-egl-window-system=none --disable-opengl --disable-gles2 --disable-egl --disable-glx \ + BAD_GST_NON_PLUGINS= \ + --disable-gles2 \ + --disable-egl \ + --disable-glx \ + --disable-wayland \ --enable-bz2 \ --enable-dvb \ --enable-shm \ --enable-quicktime \ + --disable-wgl \ --disable-gsettings \ --disable-acm \ --disable-android_media \ @@ -185,7 +191,7 @@ GST_INC_DIR= include/gstreamer-${VERSION} GST_LIB_DIR= lib/gstreamer-${VERSION} # Auto create PLIST -PLIST= ${NONEXISTENT} +PLIST?= ${NONEXISTENT} # ------- plugins --------- @@ -194,22 +200,17 @@ gst_a52dec_LIB_DEPENDS= liba52.so:${PORTSDIR}/audio/liba52 # aalib gst_aalib_LIB_DEPENDS= libaa.so:${PORTSDIR}/graphics/aalib -gst_aalib_PLIST_FILES= ${GST_LIB_DIR}/libgstaasink.la \ - ${GST_LIB_DIR}/libgstaasink.so +gst_aalib_PLIST_FILES= ${GST_LIB_DIR}/libgstaasink.so # amrnb gst_amrnb_LIB_DEPENDS= libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr -gst_amrnb_PLIST_FILES= ${GST_LIB_DIR}/libgstamrnb.la \ - ${GST_LIB_DIR}/libgstamrnb.so \ +gst_amrnb_PLIST_FILES= ${GST_LIB_DIR}/libgstamrnb.so \ share/gstreamer-${VERSION}/presets/GstAmrnbEnc.prs -gst_amrnb_PLIST_DIRSTRY=share/gstreamer-${VERSION}/presets \ - share/gstreamer-${VERSION} # amrwb gst_amrwb_LIB_DEPENDS= libopencore-amrwb.so:${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 +gst_amrwb_PLIST_FILES= ${GST_LIB_DIR}/libgstamrwbdec.so # assrender gst_assrender_LIB_DEPENDS= libass.so:${PORTSDIR}/multimedia/libass @@ -228,14 +229,12 @@ gst_curl_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl # dts gst_dts_LIB_DEPENDS= libdca.so:${PORTSDIR}/multimedia/libdca -gst_dts_PLIST_FILES= ${GST_LIB_DIR}/libgstdtsdec.la \ - ${GST_LIB_DIR}/libgstdtsdec.so +gst_dts_PLIST_FILES= ${GST_LIB_DIR}/libgstdtsdec.so # libdv gst_libdv_LIB_DEPENDS= libdv.so:${PORTSDIR}/multimedia/libdv gst_libdv_GST_PLUGIN_DIR= ext/dv -gst_libdv_PLIST_FILES= ${GST_LIB_DIR}/libgstdv.la \ - ${GST_LIB_DIR}/libgstdv.so +gst_libdv_PLIST_FILES= ${GST_LIB_DIR}/libgstdv.so # dvdread gst_dvdread_LIB_DEPENDS=libdvdread.so:${PORTSDIR}/multimedia/libdvdread @@ -254,8 +253,13 @@ gst_flite_LIB_DEPENDS= libflite.so:${PORTSDIR}/audio/flite # gdk_pixbuf gst_gdk_pixbuf_USE_GNOME= gdkpixbuf2 -gst_gdk_pixbuf_PLIST_FILES= ${GST_LIB_DIR}/libgstgdkpixbuf.la \ - ${GST_LIB_DIR}/libgstgdkpixbuf.so +gst_gdk_pixbuf_PLIST_FILES= ${GST_LIB_DIR}/libgstgdkpixbuf.so + +# gl +gst_gl_USE_GL= gl glu glesv2 egl +gst_gl_CONFIGURE_ARGS= --enable-gl --enable-glx \ + --enable-egl --enable-gles2 +gst_gl_PLIST= # # gme gst_gme_LIB_DEPENDS= libgme.so:${PORTSDIR}/audio/libgme @@ -277,18 +281,15 @@ gst_lame_LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame # libcaca gst_libcaca_LIB_DEPENDS= libcaca.so:${PORTSDIR}/graphics/libcaca -gst_libcaca_PLIST_FILES= ${GST_LIB_DIR}/libgstcacasink.la \ - ${GST_LIB_DIR}/libgstcacasink.so +gst_libcaca_PLIST_FILES= ${GST_LIB_DIR}/libgstcacasink.so # libmms gst_libmms_LIB_DEPENDS= libmms.so:${PORTSDIR}/net/libmms -gst_libmms_PLIST_FILES= ${GST_LIB_DIR}/libgstmms.so \ - ${GST_LIB_DIR}/libgstmms.la +gst_libmms_PLIST_FILES= ${GST_LIB_DIR}/libgstmms.so # png gst_libpng_LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png -gst_libpng_PLIST_FILES= ${GST_LIB_DIR}/libgstpng.la \ - ${GST_LIB_DIR}/libgstpng.so +gst_libpng_PLIST_FILES= ${GST_LIB_DIR}/libgstpng.so # libvisual gst_libvisual_LIB_DEPENDS= libvisual-0.4.so:${PORTSDIR}/graphics/libvisual04 @@ -307,21 +308,16 @@ gst_mpeg2dec_LIB_DEPENDS= libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2 # neon gst_neon_LIB_DEPENDS+= libneon.so:${PORTSDIR}/www/neon29 -gst_neon_PLIST_FILES= ${GST_LIB_DIR}/libgstneonhttpsrc.la \ - ${GST_LIB_DIR}/libgstneonhttpsrc.so +gst_neon_PLIST_FILES= ${GST_LIB_DIR}/libgstneonhttpsrc.so # ogg gst_ogg_LIB_DEPENDS= libogg.so:${PORTSDIR}/audio/libogg # opencv gst_opencv_LIB_DEPENDS= libopencv_highgui.so:${PORTSDIR}/graphics/opencv -gst_opencv_PLIST_FILES= ${GST_LIB_DIR}/libgstopencv.la \ - ${GST_LIB_DIR}/libgstopencv.so \ +gst_opencv_PLIST_FILES= ${GST_LIB_DIR}/libgstopencv.so \ share/gst-plugins-bad/${VERSION}/opencv_haarcascades/fist.xml \ share/gst-plugins-bad/${VERSION}/opencv_haarcascades/palm.xml -gst_opencv_PLIST_DIRSTRY= share/gst-plugins-bad/${VERSION}/opencv_haarcascades \ - share/gst-plugins-bad/${VERSION} \ - share/gst-plugins-bad # openjpeg gst_openjpeg_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 @@ -347,8 +343,7 @@ gst_shout2_LIB_DEPENDS= libshout.so:${PORTSDIR}/audio/libshout # sidplay gst_sidplay_LIB_DEPENDS= libsidplay.so:${PORTSDIR}/audio/libsidplay -gst_sidplay_PLIST_FILES= ${GST_LIB_DIR}/libgstsid.so \ - ${GST_LIB_DIR}/libgstsid.la +gst_sidplay_PLIST_FILES= ${GST_LIB_DIR}/libgstsid.so # soundtouch gst_soundtouch_LIB_DEPENDS= libSoundTouch.so:${PORTSDIR}/audio/soundtouch @@ -356,8 +351,7 @@ gst_soundtouch_LIB_DEPENDS= libSoundTouch.so:${PORTSDIR}/audio/soundtouch # souphttpsrc gst_soup_LIB_DEPENDS= libsoup-2.4.so:${PORTSDIR}/devel/libsoup gst_soup_GST_PLUGIN_DIR=ext/soup -gst_soup_PLIST_FILES= ${GST_LIB_DIR}/libgstsouphttpsrc.la \ - ${GST_LIB_DIR}/libgstsouphttpsrc.so +gst_soup_PLIST_FILES= ${GST_LIB_DIR}/libgstsouphttpsrc.so # spandsp gst_spandsp_LIB_DEPENDS= libspandsp.so:${PORTSDIR}/comms/spandsp @@ -382,8 +376,7 @@ gst_twolame_LIB_DEPENDS= libtwolame.so:${PORTSDIR}/audio/twolame gst_gst_v4l2_BUILD_DEPENDS= v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat gst_gst_v4l2_LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l gst_gst_v4l2_RUN_DEPENDS= webcamd:${PORTSDIR}/multimedia/webcamd -gst_gst_v4l2_PLIST_FILES= ${GST_LIB_DIR}/libgstvideo4linux2.la \ - ${GST_LIB_DIR}/libgstvideo4linux2.so +gst_gst_v4l2_PLIST_FILES= ${GST_LIB_DIR}/libgstvideo4linux2.so gst_gst_v4l2_GST_PLUGIN_DIR= sys/v4l2 # vorbis @@ -392,11 +385,8 @@ gst_vorbis_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis # vpx gst_vpx_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx -gst_vpx_PLIST_FILES= ${GST_LIB_DIR}/libgstvpx.la \ - ${GST_LIB_DIR}/libgstvpx.so \ +gst_vpx_PLIST_FILES= ${GST_LIB_DIR}/libgstvpx.so \ share/gstreamer-${VERSION}/presets/GstVP8Enc.prs -gst_vpx_PLIST_DIRSTRY= share/gstreamer-${VERSION}/presets \ - share/gstreamer-${VERSION} # webp gst_webp_LIB_DEPENDS= libwebp.so:${PORTSDIR}/graphics/webp @@ -406,9 +396,7 @@ gst_webp_LIB_DEPENDS= libwebp.so:${PORTSDIR}/graphics/webp 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_x_PLIST_FILES= ${GST_LIB_DIR}/libgstximagesink.so \ ${GST_LIB_DIR}/libgstxvimagesink.so .endif @@ -417,17 +405,13 @@ gst_x_PLIST_FILES= ${GST_LIB_DIR}/libgstximagesink.la \ 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 +gst_x_PLIST_FILES= ${GST_LIB_DIR}/libgstximagesrc.so .endif # x264 gst_x264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/libx264 -gst_x264_PLIST_FILES= ${GST_LIB_DIR}/libgstx264.la \ - ${GST_LIB_DIR}/libgstx264.so \ +gst_x264_PLIST_FILES= ${GST_LIB_DIR}/libgstx264.so \ share/gstreamer-${VERSION}/presets/GstX264Enc.prs -gst_x264_PLIST_DIRSTRY= share/gstreamer-${VERSION}/presets \ - share/gstreamer-${VERSION} # xvid gst_xvid_LIB_DEPENDS= libxvidcore.so:${PORTSDIR}/multimedia/xvid @@ -445,9 +429,12 @@ gst_${GST_PLUGIN}_BUILD_DEPENDS?= gst_${GST_PLUGIN}_LIB_DEPENDS?= gst_${GST_PLUGIN}_RUN_DEPENDS?= gst_${GST_PLUGIN}_USE_XORG?= +# this should be ${PLIST} == ${NONEXISTENT} but make on 9.x and 8.x is trowing +# a fit over it. +.if ${PLIST} == "/nonexistent" 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 +.endif gst_${GST_PLUGIN}_EXTRA_LIBS?= gst_${GST_PLUGIN}_PREBUILD_DIR?= gst_${GST_PLUGIN}_GST_PLUGIN_DIR?= ext/${GST_PLUGIN} @@ -463,12 +450,11 @@ BUILD_DEPENDS+= ${gst_${GST_PLUGIN}_BUILD_DEPENDS} LIB_DEPENDS+= ${gst_${GST_PLUGIN}_LIB_DEPENDS} RUN_DEPENDS+= ${gst_${GST_PLUGIN}_RUN_DEPENDS} PLIST_FILES= ${gst_${GST_PLUGIN}_PLIST_FILES} -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} +USE_GL+= ${gst_${GST_PLUGIN}_USE_GL} .if ${gst_${GST_PLUGIN}_GLIB_SCHEMAS}!="" GLIB_SCHEMAS= ${gst_${GST_PLUGIN}_GLIB_SCHEMAS} diff --git a/multimedia/gstreamer1-plugins/distinfo b/multimedia/gstreamer1-plugins/distinfo index eafb743b95e7..3a5ed3900b03 100644 --- a/multimedia/gstreamer1-plugins/distinfo +++ b/multimedia/gstreamer1-plugins/distinfo @@ -1,8 +1,8 @@ -SHA256 (gst-plugins-base-1.2.4.tar.xz) = 4d6273dc3f5a94bcc53ccfe0711cfddd49e31371d1136bf62fa1ecc604fc6550 -SIZE (gst-plugins-base-1.2.4.tar.xz) = 2538012 -SHA256 (gst-plugins-bad-1.2.4.tar.xz) = 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca -SIZE (gst-plugins-bad-1.2.4.tar.xz) = 3272824 -SHA256 (gst-plugins-ugly-1.2.4.tar.xz) = 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 -SIZE (gst-plugins-ugly-1.2.4.tar.xz) = 844968 -SHA256 (gst-plugins-good-1.2.4.tar.xz) = c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 -SIZE (gst-plugins-good-1.2.4.tar.xz) = 2882188 +SHA256 (gst-plugins-base-1.4.4.tar.xz) = 49cd9e8f23c416b1607b43837a09833fa03e0106929d81ead2ddfde6c0ade44b +SIZE (gst-plugins-base-1.4.4.tar.xz) = 2632996 +SHA256 (gst-plugins-bad-1.4.4.tar.xz) = e41b36105c0a13a2cb1ff9f559714e839b82dc3841484cd664790fb7947e55c7 +SIZE (gst-plugins-bad-1.4.4.tar.xz) = 3821332 +SHA256 (gst-plugins-ugly-1.4.4.tar.xz) = afe2300130aaba910b8d5fab8d1fdf8b001ff4893ec1ac57b5d8766836cd81e9 +SIZE (gst-plugins-ugly-1.4.4.tar.xz) = 846420 +SHA256 (gst-plugins-good-1.4.4.tar.xz) = 2df90e99da45211c7b2525ae4ac34830a9e7784bd48c072c406c0cf014bdb277 +SIZE (gst-plugins-good-1.4.4.tar.xz) = 3025496 diff --git a/multimedia/gstreamer1-plugins/files/patch-ext_libvisual_visual.c b/multimedia/gstreamer1-plugins/files/patch-ext_libvisual_visual.c deleted file mode 100644 index 2708165b9345..000000000000 --- a/multimedia/gstreamer1-plugins/files/patch-ext_libvisual_visual.c +++ /dev/null @@ -1,13 +0,0 @@ ---- ext/libvisual/visual.c.orig 2013-03-28 03:21:27.000000000 +0000 -+++ ext/libvisual/visual.c 2013-03-28 03:22:29.000000000 +0000 -@@ -300,9 +300,9 @@ - - } - #else -- if (channels == 2) { - guint16 *ldata = visual->audio->plugpcm[0]; - guint16 *rdata = visual->audio->plugpcm[1]; -+ if (channels == 2) { - for (i = 0; i < VISUAL_SAMPLES; i++) { - ldata[i] = *adata++; - rdata[i] = *adata++; diff --git a/multimedia/gstreamer1-plugins/pkg-plist b/multimedia/gstreamer1-plugins/pkg-plist index d7da5df61029..992bc812724f 100644 --- a/multimedia/gstreamer1-plugins/pkg-plist +++ b/multimedia/gstreamer1-plugins/pkg-plist @@ -1,3 +1,4 @@ +bin/gst-device-monitor-%%VERSION%% bin/gst-discoverer-%%VERSION%% bin/gst-play-%%VERSION%% include/gstreamer-%%VERSION%%/gst/allocators/allocators.h @@ -61,6 +62,7 @@ include/gstreamer-%%VERSION%%/gst/rtsp/gstrtsprange.h include/gstreamer-%%VERSION%%/gst/rtsp/gstrtsptransport.h include/gstreamer-%%VERSION%%/gst/rtsp/gstrtspurl.h include/gstreamer-%%VERSION%%/gst/rtsp/rtsp.h +include/gstreamer-%%VERSION%%/gst/sdp/gstmikey.h include/gstreamer-%%VERSION%%/gst/sdp/gstsdp.h include/gstreamer-%%VERSION%%/gst/sdp/gstsdpmessage.h include/gstreamer-%%VERSION%%/gst/sdp/sdp.h @@ -87,6 +89,7 @@ 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-tile.h include/gstreamer-%%VERSION%%/gst/video/video.h include/gstreamer-%%VERSION%%/gst/video/videoorientation.h include/gstreamer-%%VERSION%%/gst/video/videooverlay.h @@ -101,81 +104,53 @@ lib/girepository-1.0/GstRtsp-%%VERSION%%.typelib lib/girepository-1.0/GstSdp-%%VERSION%%.typelib lib/girepository-1.0/GstTag-%%VERSION%%.typelib lib/girepository-1.0/GstVideo-%%VERSION%%.typelib -lib/gstreamer-%%VERSION%%/libgstadder.la lib/gstreamer-%%VERSION%%/libgstadder.so -lib/gstreamer-%%VERSION%%/libgstapp.la lib/gstreamer-%%VERSION%%/libgstapp.so -lib/gstreamer-%%VERSION%%/libgstaudioconvert.la lib/gstreamer-%%VERSION%%/libgstaudioconvert.so -lib/gstreamer-%%VERSION%%/libgstaudiorate.la lib/gstreamer-%%VERSION%%/libgstaudiorate.so -lib/gstreamer-%%VERSION%%/libgstaudioresample.la lib/gstreamer-%%VERSION%%/libgstaudioresample.so -lib/gstreamer-%%VERSION%%/libgstaudiotestsrc.la lib/gstreamer-%%VERSION%%/libgstaudiotestsrc.so -lib/gstreamer-%%VERSION%%/libgstencodebin.la lib/gstreamer-%%VERSION%%/libgstencodebin.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%%/libgstvideoconvert.la lib/gstreamer-%%VERSION%%/libgstvideoconvert.so -lib/gstreamer-%%VERSION%%/libgstvideorate.la lib/gstreamer-%%VERSION%%/libgstvideorate.so -lib/gstreamer-%%VERSION%%/libgstvideoscale.la lib/gstreamer-%%VERSION%%/libgstvideoscale.so -lib/gstreamer-%%VERSION%%/libgstvideotestsrc.la lib/gstreamer-%%VERSION%%/libgstvideotestsrc.so -lib/gstreamer-%%VERSION%%/libgstvolume.la lib/gstreamer-%%VERSION%%/libgstvolume.so -lib/libgstallocators-%%VERSION%%.la lib/libgstallocators-%%VERSION%%.so lib/libgstallocators-%%VERSION%%.so.0 lib/libgstallocators-%%VERSION%%.so.%%SOVERSION%% -lib/libgstapp-%%VERSION%%.la lib/libgstapp-%%VERSION%%.so lib/libgstapp-%%VERSION%%.so.0 lib/libgstapp-%%VERSION%%.so.%%SOVERSION%% -lib/libgstaudio-%%VERSION%%.la lib/libgstaudio-%%VERSION%%.so lib/libgstaudio-%%VERSION%%.so.0 lib/libgstaudio-%%VERSION%%.so.%%SOVERSION%% -lib/libgstfft-%%VERSION%%.la lib/libgstfft-%%VERSION%%.so lib/libgstfft-%%VERSION%%.so.0 lib/libgstfft-%%VERSION%%.so.%%SOVERSION%% -lib/libgstpbutils-%%VERSION%%.la lib/libgstpbutils-%%VERSION%%.so lib/libgstpbutils-%%VERSION%%.so.0 lib/libgstpbutils-%%VERSION%%.so.%%SOVERSION%% -lib/libgstriff-%%VERSION%%.la lib/libgstriff-%%VERSION%%.so lib/libgstriff-%%VERSION%%.so.0 lib/libgstriff-%%VERSION%%.so.%%SOVERSION%% -lib/libgstrtp-%%VERSION%%.la lib/libgstrtp-%%VERSION%%.so lib/libgstrtp-%%VERSION%%.so.0 lib/libgstrtp-%%VERSION%%.so.%%SOVERSION%% -lib/libgstrtsp-%%VERSION%%.la lib/libgstrtsp-%%VERSION%%.so lib/libgstrtsp-%%VERSION%%.so.0 lib/libgstrtsp-%%VERSION%%.so.%%SOVERSION%% -lib/libgstsdp-%%VERSION%%.la lib/libgstsdp-%%VERSION%%.so lib/libgstsdp-%%VERSION%%.so.0 lib/libgstsdp-%%VERSION%%.so.%%SOVERSION%% -lib/libgsttag-%%VERSION%%.la lib/libgsttag-%%VERSION%%.so lib/libgsttag-%%VERSION%%.so.0 lib/libgsttag-%%VERSION%%.so.%%SOVERSION%% -lib/libgstvideo-%%VERSION%%.la lib/libgstvideo-%%VERSION%%.so lib/libgstvideo-%%VERSION%%.so.0 lib/libgstvideo-%%VERSION%%.so.%%SOVERSION%% @@ -191,8 +166,9 @@ libdata/pkgconfig/gstreamer-rtsp-%%VERSION%%.pc libdata/pkgconfig/gstreamer-sdp-%%VERSION%%.pc libdata/pkgconfig/gstreamer-tag-%%VERSION%%.pc libdata/pkgconfig/gstreamer-video-%%VERSION%%.pc -man/man1/gst-discoverer-1.0.1.gz -man/man1/gst-play-1.0.1.gz +man/man1/gst-device-monitor-%%VERSION%%.1.gz +man/man1/gst-discoverer-%%VERSION%%.1.gz +man/man1/gst-play-%%VERSION%%.1.gz share/gir-1.0/GstAllocators-%%VERSION%%.gir share/gir-1.0/GstApp-%%VERSION%%.gir share/gir-1.0/GstAudio-%%VERSION%%.gir @@ -243,16 +219,3 @@ 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/zh_CN/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo -@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 -@dirrm include/gstreamer-%%VERSION%%/gst/rtsp -@dirrm include/gstreamer-%%VERSION%%/gst/rtp -@dirrm include/gstreamer-%%VERSION%%/gst/riff -@dirrm include/gstreamer-%%VERSION%%/gst/pbutils -@dirrm include/gstreamer-%%VERSION%%/gst/fft -@dirrm include/gstreamer-%%VERSION%%/gst/audio -@dirrm include/gstreamer-%%VERSION%%/gst/app -@dirrm include/gstreamer-%%VERSION%%/gst/allocators diff --git a/multimedia/gstreamer1/Makefile b/multimedia/gstreamer1/Makefile index da07cd935ea9..a8d88886e32b 100644 --- a/multimedia/gstreamer1/Makefile +++ b/multimedia/gstreamer1/Makefile @@ -3,7 +3,7 @@ # $MCom: ports/multimedia/gstreamer1/Makefile,v 1.5 2013/01/15 21:43:45 kwm Exp $ PORTNAME= gstreamer1 -PORTVERSION= 1.2.4 +PORTVERSION= 1.4.4 CATEGORIES= multimedia MASTER_SITES= http://gstreamer.freedesktop.org/src/gstreamer/ DISTNAME= ${PORTNAME:S/1//}-${PORTVERSION} @@ -12,12 +12,13 @@ MAINTAINER= multimedia@FreeBSD.org COMMENT= Media applications framework LICENSE= LGPL20 +LICENSE_FILE= ${WRKSRC}/COPYING PORTSCOUT= limitw:1,even CFLAGS:= ${CFLAGS} -O2 -Wno-format -USES= bison gettext gmake libtool:keepla pathfix pkgconfig tar:xz -USE_GNOME= glib20 gnomehier introspection:build +USES= bison gettext gmake libtool pathfix pkgconfig tar:xz +USE_GNOME= glib20 introspection:build GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-tests \ --disable-examples \ @@ -27,12 +28,15 @@ CONFIGURE_ARGS= --disable-tests \ CONFIGURE_ENV= ac_cv_func_register_printf_function="no" INSTALL_TARGET= install-strip PLIST_SUB= VERSION=${GST10_VERSION} \ - SOVERSION=0.204.0 + SOVERSION=0.404.0 USE_LDCONFIG= yes GST10_VERSION= 1.0 +OPTIONS_SUB= yes OPTIONS_DEFINE= LIBCHECK LIBCHECK_DESC= Unit tests support +LIBCHECK_CONFIGURE_ENABLE= check +LIBCHECK_LIB_DEPENDS= libcheck.so:${PORTSDIR}/devel/libcheck .include <bsd.port.options.mk> @@ -47,15 +51,6 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex CONFIGURE_ENV+= FLEX_PATH="${LOCALBASE}/bin/flex" .endif -.if ${PORT_OPTIONS:MLIBCHECK} -LIB_DEPENDS+= libcheck.so:${PORTSDIR}/devel/libcheck -CONFIGURE_ARGS+=--enable-check -PLIST_SUB+= CHECK="" -.else -CONFIGURE_ARGS+=--disable-check -PLIST_SUB+= CHECK="@comment " -.endif - post-patch: @${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \ ${WRKSRC}/configure diff --git a/multimedia/gstreamer1/distinfo b/multimedia/gstreamer1/distinfo index e005fbcf06cc..a67eec3c8099 100644 --- a/multimedia/gstreamer1/distinfo +++ b/multimedia/gstreamer1/distinfo @@ -1,2 +1,2 @@ -SHA256 (gstreamer-1.2.4.tar.xz) = 1e7ca67a7870a82c9ed51d51d0008cdbc550c41d64cc3ff3f9a1c2fc311b4929 -SIZE (gstreamer-1.2.4.tar.xz) = 3225208 +SHA256 (gstreamer-1.4.4.tar.xz) = f0e305d91a93d05bf9e332cd4256ca07d77f5186a4d73847b7ae6db218f2c237 +SIZE (gstreamer-1.4.4.tar.xz) = 3323860 diff --git a/multimedia/gstreamer1/files/patch-libs_gst_base_gstbasesrc.c b/multimedia/gstreamer1/files/patch-libs_gst_base_gstbasesrc.c deleted file mode 100644 index 3881355bdd94..000000000000 --- a/multimedia/gstreamer1/files/patch-libs_gst_base_gstbasesrc.c +++ /dev/null @@ -1,28 +0,0 @@ -From 63c17280408410d799e1c2f2ed49c5ab04cc80ae Mon Sep 17 00:00:00 2001 -From: Sebastian Dröge <sebastian@centricular.com> -Date: Sun, 20 Apr 2014 09:59:02 +0000 -Subject: basesrc: Make sure to always hold the LIVE_LOCK when going to the flushing label - -https://bugzilla.gnome.org/show_bug.cgi?id=728596 ---- -diff --git a/libs/gst/base/gstbasesrc.c b/libs/gst/base/gstbasesrc.c -index 9f2e52c..fc5a3af 100644 ---- libs/gst/base/gstbasesrc.c -+++ libs/gst/base/gstbasesrc.c -@@ -2684,10 +2684,12 @@ gst_base_src_loop (GstPad * pad) - if (gst_pad_check_reconfigure (pad)) { - if (!gst_base_src_negotiate (src)) { - gst_pad_mark_reconfigure (pad); -- if (GST_PAD_IS_FLUSHING (pad)) -+ if (GST_PAD_IS_FLUSHING (pad)) { -+ GST_LIVE_LOCK (src); - goto flushing; -- else -+ } else { - goto negotiate_failed; -+ } - } - } - --- -cgit v0.9.0.2-2-gbebe diff --git a/multimedia/gstreamer1/pkg-plist b/multimedia/gstreamer1/pkg-plist index 72f7075826bc..93e2a58a23b4 100644 --- a/multimedia/gstreamer1/pkg-plist +++ b/multimedia/gstreamer1/pkg-plist @@ -13,14 +13,15 @@ include/gstreamer-%%VERSION%%/gst/base/gstbitreader.h 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/gstflowcombiner.h include/gstreamer-%%VERSION%%/gst/base/gstpushsrc.h include/gstreamer-%%VERSION%%/gst/base/gsttypefindhelper.h -%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/check.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/gsttestclock.h -%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/internal-check.h +%%LIBCHECK%%include/gstreamer-%%VERSION%%/gst/check/check.h +%%LIBCHECK%%include/gstreamer-%%VERSION%%/gst/check/gstbufferstraw.h +%%LIBCHECK%%include/gstreamer-%%VERSION%%/gst/check/gstcheck.h +%%LIBCHECK%%include/gstreamer-%%VERSION%%/gst/check/gstconsistencychecker.h +%%LIBCHECK%%include/gstreamer-%%VERSION%%/gst/check/gsttestclock.h +%%LIBCHECK%%include/gstreamer-%%VERSION%%/gst/check/internal-check.h include/gstreamer-%%VERSION%%/gst/controller/controller.h include/gstreamer-%%VERSION%%/gst/controller/gstargbcontrolbinding.h include/gstreamer-%%VERSION%%/gst/controller/gstdirectcontrolbinding.h @@ -48,6 +49,10 @@ 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/gstdevice.h +include/gstreamer-%%VERSION%%/gst/gstdevicemonitor.h +include/gstreamer-%%VERSION%%/gst/gstdeviceprovider.h +include/gstreamer-%%VERSION%%/gst/gstdeviceproviderfactory.h include/gstreamer-%%VERSION%%/gst/gstelement.h include/gstreamer-%%VERSION%%/gst/gstelementfactory.h include/gstreamer-%%VERSION%%/gst/gstelementmetadata.h @@ -100,34 +105,28 @@ include/gstreamer-%%VERSION%%/gst/net/gstnettimepacket.h include/gstreamer-%%VERSION%%/gst/net/gstnettimeprovider.h lib/girepository-1.0/Gst-%%VERSION%%.typelib lib/girepository-1.0/GstBase-%%VERSION%%.typelib -%%CHECK%%lib/girepository-1.0/GstCheck-%%VERSION%%.typelib +%%LIBCHECK%%lib/girepository-1.0/GstCheck-%%VERSION%%.typelib lib/girepository-1.0/GstController-%%VERSION%%.typelib lib/girepository-1.0/GstNet-%%VERSION%%.typelib -lib/gstreamer-%%VERSION%%/libgstcoreelements.la lib/gstreamer-%%VERSION%%/libgstcoreelements.so -lib/libgstbase-%%VERSION%%.la lib/libgstbase-%%VERSION%%.so lib/libgstbase-%%VERSION%%.so.0 lib/libgstbase-%%VERSION%%.so.%%SOVERSION%% -%%CHECK%%lib/libgstcheck-%%VERSION%%.la -%%CHECK%%lib/libgstcheck-%%VERSION%%.so -%%CHECK%%lib/libgstcheck-%%VERSION%%.so.0 -%%CHECK%%lib/libgstcheck-%%VERSION%%.so.%%SOVERSION%% -lib/libgstcontroller-%%VERSION%%.la +%%LIBCHECK%%lib/libgstcheck-%%VERSION%%.so +%%LIBCHECK%%lib/libgstcheck-%%VERSION%%.so.0 +%%LIBCHECK%%lib/libgstcheck-%%VERSION%%.so.%%SOVERSION%% lib/libgstcontroller-%%VERSION%%.so lib/libgstcontroller-%%VERSION%%.so.0 lib/libgstcontroller-%%VERSION%%.so.%%SOVERSION%% -lib/libgstnet-%%VERSION%%.la lib/libgstnet-%%VERSION%%.so lib/libgstnet-%%VERSION%%.so.0 lib/libgstnet-%%VERSION%%.so.%%SOVERSION%% -lib/libgstreamer-%%VERSION%%.la lib/libgstreamer-%%VERSION%%.so lib/libgstreamer-%%VERSION%%.so.0 lib/libgstreamer-%%VERSION%%.so.%%SOVERSION%% libdata/pkgconfig/gstreamer-%%VERSION%%.pc libdata/pkgconfig/gstreamer-base-%%VERSION%%.pc -%%CHECK%%libdata/pkgconfig/gstreamer-check-%%VERSION%%.pc +%%LIBCHECK%%libdata/pkgconfig/gstreamer-check-%%VERSION%%.pc libdata/pkgconfig/gstreamer-controller-%%VERSION%%.pc libdata/pkgconfig/gstreamer-net-%%VERSION%%.pc libexec/gstreamer-%%VERSION%%/gst-plugin-scanner @@ -137,7 +136,7 @@ man/man1/gst-typefind-1.0.1.gz share/aclocal/gst-element-check-%%VERSION%%.m4 share/gir-1.0/Gst-%%VERSION%%.gir share/gir-1.0/GstBase-%%VERSION%%.gir -%%CHECK%%share/gir-1.0/GstCheck-%%VERSION%%.gir +%%LIBCHECK%%share/gir-1.0/GstCheck-%%VERSION%%.gir share/gir-1.0/GstController-%%VERSION%%.gir share/gir-1.0/GstNet-%%VERSION%%.gir share/locale/af/LC_MESSAGES/gstreamer-%%VERSION%%.mo @@ -179,13 +178,3 @@ share/locale/uk/LC_MESSAGES/gstreamer-%%VERSION%%.mo share/locale/vi/LC_MESSAGES/gstreamer-%%VERSION%%.mo share/locale/zh_CN/LC_MESSAGES/gstreamer-%%VERSION%%.mo share/locale/zh_TW/LC_MESSAGES/gstreamer-%%VERSION%%.mo -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw -@dirrm libexec/gstreamer-%%VERSION%% -@dirrm lib/gstreamer-%%VERSION%% -@dirrm include/gstreamer-%%VERSION%%/gst/net -@dirrm include/gstreamer-%%VERSION%%/gst/controller -%%CHECK%%@dirrm include/gstreamer-%%VERSION%%/gst/check -@dirrm include/gstreamer-%%VERSION%%/gst/base -@dirrm include/gstreamer-%%VERSION%%/gst -@dirrm include/gstreamer-%%VERSION%% diff --git a/multimedia/py-gstreamer1/Makefile b/multimedia/py-gstreamer1/Makefile index 9f06134f9d4f..8cd442ca8730 100644 --- a/multimedia/py-gstreamer1/Makefile +++ b/multimedia/py-gstreamer1/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= gstreamer -PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTVERSION= 1.4.0 CATEGORIES= multimedia python MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-python/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,12 +10,12 @@ PKGNAMESUFFIX= 1 DISTNAME= gst-python-${PORTVERSION} MAINTAINER= multimedia@FreeBSD.org -COMMENT= Python bindings for gstreamer +COMMENT= Python bindings for Gstreamer LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -USES= gmake libtool pathfix pkgconfig python:2 tar:bzip2 +USES= gmake libtool pathfix pkgconfig python tar:xz USE_GNOME= pygobject3 USE_GSTREAMER1= yes GNU_CONFIGURE= yes @@ -25,10 +24,4 @@ CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip -post-install: - ${SETENV} PYTHON=${PYTHON_CMD} ${SH} ${WRKSRC}/py-compile \ - --destdir ${STAGEDIR} \ - --basedir ${PYTHON_SITELIBDIR} \ - ${STAGEDIR}${PYTHON_SITELIBDIR}/pygst.py - .include <bsd.port.mk> diff --git a/multimedia/py-gstreamer1/distinfo b/multimedia/py-gstreamer1/distinfo index 98145607bac4..0aa97847dc26 100644 --- a/multimedia/py-gstreamer1/distinfo +++ b/multimedia/py-gstreamer1/distinfo @@ -1,2 +1,2 @@ -SHA256 (gst-python-1.2.1.tar.bz2) = 8823e5a9ffc51212df412652da44dc3f2a0e23295da769de2d111c770280efd4 -SIZE (gst-python-1.2.1.tar.bz2) = 410887 +SHA256 (gst-python-1.4.0.tar.xz) = b1e40c29ceb41b03f08d38aca6056054f0341d0706276326dceeec6ac8d53d3e +SIZE (gst-python-1.4.0.tar.xz) = 350316 diff --git a/multimedia/py-gstreamer1/pkg-plist b/multimedia/py-gstreamer1/pkg-plist index 783fe41433f8..48a8698e0199 100644 --- a/multimedia/py-gstreamer1/pkg-plist +++ b/multimedia/py-gstreamer1/pkg-plist @@ -1,3 +1,4 @@ +lib/gstreamer-1.0/libgstpythonplugin.so %%PYTHON_SITELIBDIR%%/gi/overrides/Gst.py %%PYTHON_SITELIBDIR%%/gi/overrides/Gst.pyc %%PYTHON_SITELIBDIR%%/gi/overrides/Gst.pyo diff --git a/multimedia/py3-gstreamer1/Makefile b/multimedia/py3-gstreamer1/Makefile index 66f883ccba0e..567d5e449120 100644 --- a/multimedia/py3-gstreamer1/Makefile +++ b/multimedia/py3-gstreamer1/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= gstreamer -PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTVERSION= 1.4.0 CATEGORIES= multimedia python MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-python/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,12 +10,12 @@ PKGNAMESUFFIX= 1 DISTNAME= gst-python-${PORTVERSION} MAINTAINER= multimedia@FreeBSD.org -COMMENT= Python bindings for gstreamer +COMMENT= Python bindings for Gstreamer LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -USES= gmake libtool pathfix pkgconfig python:3 tar:bzip2 +USES= gmake libtool pathfix pkgconfig python:3 tar:xz USE_GNOME= py3gobject3 USE_GSTREAMER1= yes GNU_CONFIGURE= yes @@ -24,13 +23,8 @@ PLIST_SUB= VERSION="${GST_VERSION}" CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip +USE_PYTHON= py3plist PLIST_SUB+= PVERSION=${PYTHON_VER:S/.//} -post-install: - ${SETENV} PYTHON=${PYTHON_CMD} ${SH} ${WRKSRC}/py-compile \ - --destdir ${STAGEDIR} \ - --basedir ${PYTHON_SITELIBDIR} \ - ${STAGEDIR}${PYTHON_SITELIBDIR}/pygst.py - .include <bsd.port.mk> diff --git a/multimedia/py3-gstreamer1/distinfo b/multimedia/py3-gstreamer1/distinfo index 98145607bac4..0aa97847dc26 100644 --- a/multimedia/py3-gstreamer1/distinfo +++ b/multimedia/py3-gstreamer1/distinfo @@ -1,2 +1,2 @@ -SHA256 (gst-python-1.2.1.tar.bz2) = 8823e5a9ffc51212df412652da44dc3f2a0e23295da769de2d111c770280efd4 -SIZE (gst-python-1.2.1.tar.bz2) = 410887 +SHA256 (gst-python-1.4.0.tar.xz) = b1e40c29ceb41b03f08d38aca6056054f0341d0706276326dceeec6ac8d53d3e +SIZE (gst-python-1.4.0.tar.xz) = 350316 diff --git a/multimedia/py3-gstreamer1/pkg-plist b/multimedia/py3-gstreamer1/pkg-plist index b90529e9579e..c17ce41e71ca 100644 --- a/multimedia/py3-gstreamer1/pkg-plist +++ b/multimedia/py3-gstreamer1/pkg-plist @@ -1,3 +1,4 @@ +lib/gstreamer-1.0/libgstpythonplugin.so %%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gst.cpython-%%PVERSION%%.pyc %%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gst.cpython-%%PVERSION%%.pyo %%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GstPbutils.cpython-%%PVERSION%%.pyc @@ -5,4 +6,3 @@ %%PYTHON_SITELIBDIR%%/gi/overrides/Gst.py %%PYTHON_SITELIBDIR%%/gi/overrides/GstPbutils.py %%PYTHON_SITELIBDIR%%/gi/overrides/_gi_gst.so -@dirrmtry %%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__ |