diff --git c/Mk/bsd.gstreamer.mk w/Mk/bsd.gstreamer.mk index a172cd321d49..5599634f11f4 100644 --- c/Mk/bsd.gstreamer.mk +++ w/Mk/bsd.gstreamer.mk @@ -98,7 +98,6 @@ _GSTREAMER_PLUGINS= \ pango \ pulse \ resindvd \ - schroedinger \ shout2 \ sndfile \ sndio \ @@ -137,6 +136,7 @@ _GSTREAMER_PLUGINS+= \ nas \ python \ qt4 \ + schroedinger \ sdl \ vdpau \ vp8 \ @@ -146,6 +146,7 @@ _GSTREAMER_PLUGINS+= \ # plugins only in 1.0 .if defined(USE_GSTREAMER1) _GSTREAMER_PLUGINS+= \ + aom \ assrender \ bs2b \ chromaprint \ @@ -166,6 +167,7 @@ _GSTREAMER_PLUGINS+= \ openexr \ openh264 \ openjpeg \ + openmpt \ png \ rsvg \ rtmp \ @@ -174,6 +176,7 @@ _GSTREAMER_PLUGINS+= \ srtp \ ttml \ vpx \ + vulkan \ webp \ x \ x265 \ @@ -356,6 +359,9 @@ aalib_IMPL= good annodex_DEPENDS= multimedia/gstreamer-plugins-annodex annodex_IMPL= good +aom_DEPENDS= multimedia/gstreamer-plugins-aom +aom_IMPL= bad + assrender_DEPENDS= multimedia/gstreamer-plugins-assrender assrender_IMPL= bad @@ -392,6 +398,9 @@ openexr_IMPL= bad openjpeg_DEPENDS= graphics/gstreamer-plugins-openjpeg openjpeg_IMPL= bad +openmpt_DEPENDS= audio/gstreamer-plugins-openmpt +openmpt_IMPL= bad + png_DEPENDS= graphics/gstreamer-plugins-png png_IMPL= good @@ -507,6 +516,9 @@ vp8_IMPL= bad vpx_DEPENDS= multimedia/gstreamer-plugins-vpx vpx_IMPL= good +vulkan_DEPENDS= graphics/gstreamer-plugins-vulkan +vulkan_IMPL= bad + # XXX: This is a quick solution for ports with USE_GSTREAMER=python # but without USE_PYTHON. PYTHON_PKGNAMEPREFIX?= py*- diff --git c/audio/Makefile w/audio/Makefile index 167e2d7fdcf5..4c8a160703e5 100644 --- c/audio/Makefile +++ w/audio/Makefile @@ -302,6 +302,7 @@ SUBDIR += gstreamer1-plugins-mpg123 SUBDIR += gstreamer1-plugins-musepack SUBDIR += gstreamer1-plugins-ogg + SUBDIR += gstreamer1-plugins-openmpt SUBDIR += gstreamer1-plugins-opus SUBDIR += gstreamer1-plugins-pulse SUBDIR += gstreamer1-plugins-shout2 diff --git c/audio/gstreamer1-plugins-lame/Makefile w/audio/gstreamer1-plugins-lame/Makefile index 52fd31e97db6..d4f75d8c24d6 100644 --- c/audio/gstreamer1-plugins-lame/Makefile +++ w/audio/gstreamer1-plugins-lame/Makefile @@ -6,7 +6,7 @@ CATEGORIES= audio COMMENT= GStreamer High-quality free mp3 encode plugin GST_PLUGIN= lame -DIST= ugly +DIST= good MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins diff --git c/audio/gstreamer1-plugins-mpg123/Makefile w/audio/gstreamer1-plugins-mpg123/Makefile index 2eae164eb632..52b64818f066 100644 --- c/audio/gstreamer1-plugins-mpg123/Makefile +++ w/audio/gstreamer1-plugins-mpg123/Makefile @@ -6,7 +6,7 @@ CATEGORIES= audio COMMENT= GStreamer MPEG Layer 1, 2, and 3 plugin GST_PLUGIN= mpg123 -DIST= ugly +DIST= good MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins diff --git c/audio/gstreamer1-plugins-openmpt/Makefile w/audio/gstreamer1-plugins-openmpt/Makefile new file mode 100644 index 000000000000..8d43b489c210 --- /dev/null +++ w/audio/gstreamer1-plugins-openmpt/Makefile @@ -0,0 +1,20 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= audio + +COMMENT= GStreamer OpenMPT audio decoder plugin + +GST_PLUGIN= openmpt +DIST= bad + +OPENMPT_GST_DIRS= gst-libs/gst/audio + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +pre-build: +.for dir in ${OPENMPT_GST_DIRS} + @(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}) +.endfor + +.include "${MASTERDIR}/Makefile" diff --git c/audio/gstreamer1-plugins-twolame/Makefile w/audio/gstreamer1-plugins-twolame/Makefile index fc7aff9969cb..792a7988e3ad 100644 --- c/audio/gstreamer1-plugins-twolame/Makefile +++ w/audio/gstreamer1-plugins-twolame/Makefile @@ -6,7 +6,7 @@ CATEGORIES= audio COMMENT= GStreamer High-quality free MP2 encoder plugin GST_PLUGIN= twolame -DIST= ugly +DIST= good MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins diff --git c/graphics/Makefile w/graphics/Makefile index 337929c23d00..269f562e71f7 100644 --- c/graphics/Makefile +++ w/graphics/Makefile @@ -342,6 +342,7 @@ SUBDIR += gstreamer1-plugins-openjpeg SUBDIR += gstreamer1-plugins-png SUBDIR += gstreamer1-plugins-rsvg + SUBDIR += gstreamer1-plugins-vulkan SUBDIR += gstreamer1-plugins-webp SUBDIR += gstreamer1-plugins-zbar SUBDIR += gthumb diff --git c/graphics/gstreamer1-plugins-gl/Makefile w/graphics/gstreamer1-plugins-gl/Makefile index f27732739fff..e3292275e543 100644 --- c/graphics/gstreamer1-plugins-gl/Makefile +++ w/graphics/gstreamer1-plugins-gl/Makefile @@ -6,9 +6,9 @@ CATEGORIES= graphics COMMENT= GStreamer GL graphics plugin GST_PLUGIN= gl -DIST= bad +DIST= base -GL_GST_DIRS= gst-libs/gst/allocators +GL_GST_DIRS= gst-libs/gst/allocators gst-libs/gst/video PLIST= ${.CURDIR}/pkg-plist MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins diff --git c/graphics/gstreamer1-plugins-gl/pkg-plist w/graphics/gstreamer1-plugins-gl/pkg-plist index 444074499793..d78233c9022b 100644 --- c/graphics/gstreamer1-plugins-gl/pkg-plist +++ w/graphics/gstreamer1-plugins-gl/pkg-plist @@ -2,6 +2,7 @@ include/gstreamer-%%VERSION%%/gst/gl/egl/gstegl.h include/gstreamer-%%VERSION%%/gst/gl/egl/gsteglimage.h include/gstreamer-%%VERSION%%/gst/gl/egl/gstgldisplay_egl.h include/gstreamer-%%VERSION%%/gst/gl/egl/gstglmemoryegl.h +include/gstreamer-%%VERSION%%/gst/gl/gl-prelude.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 @@ -34,6 +35,7 @@ include/gstreamer-%%VERSION%%/gst/gl/gstglfeature.h include/gstreamer-%%VERSION%%/gst/gl/gstglfilter.h include/gstreamer-%%VERSION%%/gst/gl/gstglformat.h include/gstreamer-%%VERSION%%/gst/gl/gstglframebuffer.h +include/gstreamer-%%VERSION%%/gst/gl/gstglfuncs.h include/gstreamer-%%VERSION%%/gst/gl/gstglmemory.h include/gstreamer-%%VERSION%%/gst/gl/gstglmemorypbo.h include/gstreamer-%%VERSION%%/gst/gl/gstgloverlaycompositor.h @@ -48,12 +50,13 @@ include/gstreamer-%%VERSION%%/gst/gl/gstglupload.h include/gstreamer-%%VERSION%%/gst/gl/gstglutils.h include/gstreamer-%%VERSION%%/gst/gl/gstglviewconvert.h include/gstreamer-%%VERSION%%/gst/gl/gstglwindow.h +include/gstreamer-%%VERSION%%/gst/gl/wayland/gstgldisplay_wayland.h include/gstreamer-%%VERSION%%/gst/gl/x11/gstgldisplay_x11.h -lib/girepository-%%VERSION%%/GstGL-%%VERSION%%.typelib +lib/girepository-1.0/GstGL-%%VERSION%%.typelib lib/gstreamer-%%VERSION%%/include/gst/gl/gstglconfig.h lib/gstreamer-%%VERSION%%/libgstopengl.so lib/libgstgl-%%VERSION%%.so lib/libgstgl-%%VERSION%%.so.0 lib/libgstgl-%%VERSION%%.so.%%SOVERSION%% libdata/pkgconfig/gstreamer-gl-%%VERSION%%.pc -share/gir-%%VERSION%%/GstGL-%%VERSION%%.gir +share/gir-1.0/GstGL-%%VERSION%%.gir diff --git c/graphics/gstreamer1-plugins-openjpeg/Makefile w/graphics/gstreamer1-plugins-openjpeg/Makefile index 3a246705b1ea..4ec436b31581 100644 --- c/graphics/gstreamer1-plugins-openjpeg/Makefile +++ w/graphics/gstreamer1-plugins-openjpeg/Makefile @@ -10,6 +10,6 @@ DIST= bad MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins -EXTRA_PATCHES= ${.CURDIR}/files/patch-openjpeg23 +EXTRA_PATCHES= ${.CURDIR}/files/patch-inc .include "${MASTERDIR}/Makefile" diff --git c/graphics/gstreamer1-plugins-openjpeg/files/patch-inc w/graphics/gstreamer1-plugins-openjpeg/files/patch-inc new file mode 100644 index 000000000000..1662b4301ea8 --- /dev/null +++ w/graphics/gstreamer1-plugins-openjpeg/files/patch-inc @@ -0,0 +1,30 @@ +Put the openjpeg include directory first, so that includes +$LOCALBASE/include/openjpeg-2.3/openjpeg.h instead of $LOCALBASE/include/openjpeg.h + +--- ext/openjpeg/Makefile.in.orig 2018-09-16 22:05:02.688860000 +0300 ++++ ext/openjpeg/Makefile.in 2018-09-16 22:05:11.316104000 +0300 +@@ -861,21 +861,21 @@ + @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + + libgstopenjpeg_la-gstopenjpegdec.lo: gstopenjpegdec.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopenjpeg_la_CFLAGS) $(CFLAGS) -MT libgstopenjpeg_la-gstopenjpegdec.lo -MD -MP -MF $(DEPDIR)/libgstopenjpeg_la-gstopenjpegdec.Tpo -c -o libgstopenjpeg_la-gstopenjpegdec.lo `test -f 'gstopenjpegdec.c' || echo '$(srcdir)/'`gstopenjpegdec.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(OPENJPEG_CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopenjpeg_la_CFLAGS) $(CFLAGS) -MT libgstopenjpeg_la-gstopenjpegdec.lo -MD -MP -MF $(DEPDIR)/libgstopenjpeg_la-gstopenjpegdec.Tpo -c -o libgstopenjpeg_la-gstopenjpegdec.lo `test -f 'gstopenjpegdec.c' || echo '$(srcdir)/'`gstopenjpegdec.c + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopenjpeg_la-gstopenjpegdec.Tpo $(DEPDIR)/libgstopenjpeg_la-gstopenjpegdec.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstopenjpegdec.c' object='libgstopenjpeg_la-gstopenjpegdec.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopenjpeg_la_CFLAGS) $(CFLAGS) -c -o libgstopenjpeg_la-gstopenjpegdec.lo `test -f 'gstopenjpegdec.c' || echo '$(srcdir)/'`gstopenjpegdec.c + + libgstopenjpeg_la-gstopenjpegenc.lo: gstopenjpegenc.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopenjpeg_la_CFLAGS) $(CFLAGS) -MT libgstopenjpeg_la-gstopenjpegenc.lo -MD -MP -MF $(DEPDIR)/libgstopenjpeg_la-gstopenjpegenc.Tpo -c -o libgstopenjpeg_la-gstopenjpegenc.lo `test -f 'gstopenjpegenc.c' || echo '$(srcdir)/'`gstopenjpegenc.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(OPENJPEG_CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopenjpeg_la_CFLAGS) $(CFLAGS) -MT libgstopenjpeg_la-gstopenjpegenc.lo -MD -MP -MF $(DEPDIR)/libgstopenjpeg_la-gstopenjpegenc.Tpo -c -o libgstopenjpeg_la-gstopenjpegenc.lo `test -f 'gstopenjpegenc.c' || echo '$(srcdir)/'`gstopenjpegenc.c + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopenjpeg_la-gstopenjpegenc.Tpo $(DEPDIR)/libgstopenjpeg_la-gstopenjpegenc.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstopenjpegenc.c' object='libgstopenjpeg_la-gstopenjpegenc.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopenjpeg_la_CFLAGS) $(CFLAGS) -c -o libgstopenjpeg_la-gstopenjpegenc.lo `test -f 'gstopenjpegenc.c' || echo '$(srcdir)/'`gstopenjpegenc.c + + libgstopenjpeg_la-gstopenjpeg.lo: gstopenjpeg.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopenjpeg_la_CFLAGS) $(CFLAGS) -MT libgstopenjpeg_la-gstopenjpeg.lo -MD -MP -MF $(DEPDIR)/libgstopenjpeg_la-gstopenjpeg.Tpo -c -o libgstopenjpeg_la-gstopenjpeg.lo `test -f 'gstopenjpeg.c' || echo '$(srcdir)/'`gstopenjpeg.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(OPENJPEG_CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopenjpeg_la_CFLAGS) $(CFLAGS) -MT libgstopenjpeg_la-gstopenjpeg.lo -MD -MP -MF $(DEPDIR)/libgstopenjpeg_la-gstopenjpeg.Tpo -c -o libgstopenjpeg_la-gstopenjpeg.lo `test -f 'gstopenjpeg.c' || echo '$(srcdir)/'`gstopenjpeg.c + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopenjpeg_la-gstopenjpeg.Tpo $(DEPDIR)/libgstopenjpeg_la-gstopenjpeg.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstopenjpeg.c' object='libgstopenjpeg_la-gstopenjpeg.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ diff --git c/graphics/gstreamer1-plugins-openjpeg/files/patch-openjpeg23 w/graphics/gstreamer1-plugins-openjpeg/files/patch-openjpeg23 deleted file mode 100644 index 12579a1c796b..000000000000 --- c/graphics/gstreamer1-plugins-openjpeg/files/patch-openjpeg23 +++ /dev/null @@ -1,163 +0,0 @@ ---- config.h.in.orig 2017-09-18 11:34:31 UTC -+++ config.h.in -@@ -459,6 +459,9 @@ - /* Define if OpenJPEG 2.2 is used */ - #undef HAVE_OPENJPEG_2_2 - -+/* Define if OpenJPEG 2.3 is used */ -+#undef HAVE_OPENJPEG_2_3 -+ - /* Define to enable openni2 library (used by openni2). */ - #undef HAVE_OPENNI2 - ---- configure.orig 2017-09-18 11:34:30 UTC -+++ configure -@@ -771,6 +771,8 @@ - USE_OPENJPEG_FALSE - USE_OPENJPEG_TRUE - HAVE_OPENJPEG -+OPENJPEG_2_3_LIBS -+OPENJPEG_2_3_CFLAGS - OPENJPEG_2_2_LIBS - OPENJPEG_2_2_CFLAGS - OPENJPEG_2_1_LIBS -@@ -2043,6 +2045,8 @@ - OPENJPEG_2_1_LIBS - OPENJPEG_2_2_CFLAGS - OPENJPEG_2_2_LIBS -+OPENJPEG_2_3_CFLAGS -+OPENJPEG_2_3_LIBS - OPENNI2_CFLAGS - OPENNI2_LIBS - OPUS_CFLAGS -@@ -3281,6 +3285,10 @@ - C compiler flags for OPENJPEG_2_2, overriding pkg-config - OPENJPEG_2_2_LIBS - linker flags for OPENJPEG_2_2, overriding pkg-config -+ OPENJPEG_2_3_CFLAGS -+ C compiler flags for OPENJPEG_2_3, overriding pkg-config -+ OPENJPEG_2_3_LIBS -+ linker flags for OPENJPEG_2_3, overriding pkg-config - OPENNI2_CFLAGS - C compiler flags for OPENNI2, overriding pkg-config - OPENNI2_LIBS -@@ -48938,6 +48946,106 @@ - - $as_echo "#define HAVE_OPENJPEG_2_2 1" >>confdefs.h - -+ -+ which="libopenjp2 >= 2.3" -+ required="no" -+ -+ -+pkg_failed=no -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENJPEG_2_3" >&5 -+$as_echo_n "checking for OPENJPEG_2_3... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$OPENJPEG_2_3_CFLAGS"; then -+ pkg_cv_OPENJPEG_2_3_CFLAGS="$OPENJPEG_2_3_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$which\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "$which") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_OPENJPEG_2_3_CFLAGS=`$PKG_CONFIG --cflags "$which" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$OPENJPEG_2_3_LIBS"; then -+ pkg_cv_OPENJPEG_2_3_LIBS="$OPENJPEG_2_3_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$which\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "$which") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_OPENJPEG_2_3_LIBS=`$PKG_CONFIG --libs "$which" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ OPENJPEG_2_3_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$which"` -+ else -+ OPENJPEG_2_3_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$which"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$OPENJPEG_2_3_PKG_ERRORS" >&5 -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+ -+ HAVE_OPENJPEG_2_3="no" -+ if test "x$required" = "xyes"; then -+ as_fn_error $? "$OPENJPEG_2_3_PKG_ERRORS" "$LINENO" 5 -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: $OPENJPEG_2_3_PKG_ERRORS" >&5 -+$as_echo "$as_me: $OPENJPEG_2_3_PKG_ERRORS" >&6;} -+ fi -+ -+elif test $pkg_failed = untried; then -+ -+ HAVE_OPENJPEG_2_3="no" -+ if test "x$required" = "xyes"; then -+ as_fn_error $? "$OPENJPEG_2_3_PKG_ERRORS" "$LINENO" 5 -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: $OPENJPEG_2_3_PKG_ERRORS" >&5 -+$as_echo "$as_me: $OPENJPEG_2_3_PKG_ERRORS" >&6;} -+ fi -+ -+else -+ OPENJPEG_2_3_CFLAGS=$pkg_cv_OPENJPEG_2_3_CFLAGS -+ OPENJPEG_2_3_LIBS=$pkg_cv_OPENJPEG_2_3_LIBS -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+ -+ HAVE_OPENJPEG_2_3="yes" -+ -+fi -+ -+ -+ if test x"$HAVE_OPENJPEG_2_3" = x"yes"; then -+ -+$as_echo "#define HAVE_OPENJPEG_2_3 1" >>confdefs.h -+ -+ fi - fi - fi - else ---- ext/openjpeg/gstopenjpeg.h.orig 2017-08-17 10:39:18 UTC -+++ ext/openjpeg/gstopenjpeg.h -@@ -38,7 +38,9 @@ - #define OPJ_CPRL CPRL - #else - #include --# if defined(HAVE_OPENJPEG_2_2) -+# if defined(HAVE_OPENJPEG_2_3) -+# include -+# elif defined(HAVE_OPENJPEG_2_2) - # include - # elif defined(HAVE_OPENJPEG_2_1) - # include diff --git c/graphics/gstreamer1-plugins-vulkan/Makefile w/graphics/gstreamer1-plugins-vulkan/Makefile new file mode 100644 index 000000000000..cba00529c08e --- /dev/null +++ w/graphics/gstreamer1-plugins-vulkan/Makefile @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= graphics + +COMMENT= GStreamer Vulkan graphics plugin + +GST_PLUGIN= vulkan +DIST= bad + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" diff --git c/multimedia/Makefile w/multimedia/Makefile index a2c9341e73cc..8a02494161bc 100644 --- c/multimedia/Makefile +++ w/multimedia/Makefile @@ -127,6 +127,7 @@ SUBDIR += gstreamer1-libav SUBDIR += gstreamer1-plugins SUBDIR += gstreamer1-plugins-all + SUBDIR += gstreamer1-plugins-aom SUBDIR += gstreamer1-plugins-assrender SUBDIR += gstreamer1-plugins-bad SUBDIR += gstreamer1-plugins-core @@ -145,7 +146,6 @@ SUBDIR += gstreamer1-plugins-openh264 SUBDIR += gstreamer1-plugins-resindvd SUBDIR += gstreamer1-plugins-rtmp - SUBDIR += gstreamer1-plugins-schroedinger SUBDIR += gstreamer1-plugins-smoothstreaming SUBDIR += gstreamer1-plugins-theora SUBDIR += gstreamer1-plugins-ttml diff --git c/multimedia/gstreamer1-editing-services/Makefile w/multimedia/gstreamer1-editing-services/Makefile index 5855408f5b67..20755fefdd8c 100644 --- c/multimedia/gstreamer1-editing-services/Makefile +++ w/multimedia/gstreamer1-editing-services/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gstreamer1-editing-services -PORTVERSION= 1.12.3 +PORTVERSION= 1.14.4 CATEGORIES= multimedia MASTER_SITES= http://gstreamer.freedesktop.org/src/gstreamer-editing-services/ DISTNAME= gstreamer-editing-services-${PORTVERSION} @@ -21,6 +21,6 @@ INSTALL_TARGET= install-strip CONFIGURE_ARGS= --enable-introspection=yes \ --with-bash-completion-dir=${PREFIX}/share/bash-completion/completions -PLIST_SUB= VERSION=1.0 SOVERSION=0.1203.0 +PLIST_SUB= VERSION=1.0 SOVERSION=0.1404.0 .include diff --git c/multimedia/gstreamer1-editing-services/distinfo w/multimedia/gstreamer1-editing-services/distinfo index 4a33552d5fb3..a0028e34f1e0 100644 --- c/multimedia/gstreamer1-editing-services/distinfo +++ w/multimedia/gstreamer1-editing-services/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1506169132 -SHA256 (gstreamer-editing-services-1.12.3.tar.xz) = 032e2fd040079259aec060d526bcb021c670f8d953219c229f80fdc541465f76 -SIZE (gstreamer-editing-services-1.12.3.tar.xz) = 1061796 +TIMESTAMP = 1539380544 +SHA256 (gstreamer-editing-services-1.14.4.tar.xz) = 53d1d25b356009505ae0d22c218d6c6b1215399d9f6e3fe5d7b88e156531b35f +SIZE (gstreamer-editing-services-1.14.4.tar.xz) = 1066636 diff --git c/multimedia/gstreamer1-editing-services/pkg-plist w/multimedia/gstreamer1-editing-services/pkg-plist index 360ae4fd71f6..6b67eaa1a84e 100644 --- c/multimedia/gstreamer1-editing-services/pkg-plist +++ w/multimedia/gstreamer1-editing-services/pkg-plist @@ -30,6 +30,7 @@ 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-prelude.h include/gstreamer-%%VERSION%%/ges/ges-project.h include/gstreamer-%%VERSION%%/ges/ges-screenshot.h include/gstreamer-%%VERSION%%/ges/ges-smart-adder.h @@ -59,7 +60,7 @@ 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/girepository-1.0/GES-%%VERSION%%.typelib lib/gstreamer-%%VERSION%%/libgstnle.so lib/libges-%%VERSION%%.so lib/libges-%%VERSION%%.so.0 @@ -70,4 +71,4 @@ lib/libges-%%VERSION%%.so.%%SOVERSION%% libdata/pkgconfig/gst-editing-services-%%VERSION%%.pc man/man1/ges-launch-%%VERSION%%.1.gz share/bash-completion/completions/ges-launch-%%VERSION%% -share/gir-%%VERSION%%/GES-%%VERSION%%.gir +share/gir-1.0/GES-%%VERSION%%.gir diff --git c/multimedia/gstreamer1-libav/Makefile w/multimedia/gstreamer1-libav/Makefile index e13c36113aa3..ff4ebe8c20f3 100644 --- c/multimedia/gstreamer1-libav/Makefile +++ w/multimedia/gstreamer1-libav/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= gstreamer1-libav -PORTVERSION= 1.12.3 -PORTREVISION= 2 +PORTVERSION= 1.14.4 CATEGORIES= multimedia MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-libav/ DISTNAME= gst-libav-${PORTVERSION} diff --git c/multimedia/gstreamer1-libav/distinfo w/multimedia/gstreamer1-libav/distinfo index 601ec2dcfc1c..ff5da5ace20e 100644 --- c/multimedia/gstreamer1-libav/distinfo +++ w/multimedia/gstreamer1-libav/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1506169206 -SHA256 (gst-libav-1.12.3.tar.xz) = 015ef8cab6f7fb87c8fb42642486423eff3b6e6a6bccdcd6a189f436a3619650 -SIZE (gst-libav-1.12.3.tar.xz) = 8791724 +TIMESTAMP = 1539380450 +SHA256 (gst-libav-1.14.4.tar.xz) = dfd78591901df7853eab7e56a86c34a1b03635da0d3d56b89aa577f1897865da +SIZE (gst-libav-1.14.4.tar.xz) = 9036732 diff --git c/multimedia/gstreamer1-plugins-all/Makefile w/multimedia/gstreamer1-plugins-all/Makefile index f9dd89f2c127..ec05ceca81de 100644 --- c/multimedia/gstreamer1-plugins-all/Makefile +++ w/multimedia/gstreamer1-plugins-all/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gstreamer1-plugins-all -PORTVERSION= 1.12 +PORTVERSION= 1.14 PORTREVISION= 0 CATEGORIES= multimedia diff --git c/multimedia/gstreamer1-plugins-aom/Makefile w/multimedia/gstreamer1-plugins-aom/Makefile new file mode 100644 index 000000000000..03466992d2b8 --- /dev/null +++ w/multimedia/gstreamer1-plugins-aom/Makefile @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= multimedia + +COMMENT= GStreamer (libaom) plugin + +GST_PLUGIN= aom +DIST= bad + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins + +.include "${MASTERDIR}/Makefile" diff --git c/multimedia/gstreamer1-plugins-bad/files/patch-ext_opencv_gstfacedetect.h w/multimedia/gstreamer1-plugins-bad/files/patch-ext_opencv_gstfacedetect.h index 5c91348389fc..510d5d4c08be 100644 --- c/multimedia/gstreamer1-plugins-bad/files/patch-ext_opencv_gstfacedetect.h +++ w/multimedia/gstreamer1-plugins-bad/files/patch-ext_opencv_gstfacedetect.h @@ -1,5 +1,5 @@ ---- ext/opencv/gstfacedetect.h.orig 2018-05-02 20:45:00.402253000 +0000 -+++ ext/opencv/gstfacedetect.h 2018-05-02 20:45:40.025207000 +0000 +--- ext/opencv/gstfacedetect.h.orig 2018-03-23 20:45:15 UTC ++++ ext/opencv/gstfacedetect.h @@ -50,7 +50,7 @@ #include diff --git c/multimedia/gstreamer1-plugins-bad/files/patch-ext_opencv_gsthanddetect.h w/multimedia/gstreamer1-plugins-bad/files/patch-ext_opencv_gsthanddetect.h index 4dfceb05cdbf..2e3aaa5d726a 100644 --- c/multimedia/gstreamer1-plugins-bad/files/patch-ext_opencv_gsthanddetect.h +++ w/multimedia/gstreamer1-plugins-bad/files/patch-ext_opencv_gsthanddetect.h @@ -1,5 +1,5 @@ ---- ext/opencv/gsthanddetect.h.orig 2018-05-02 20:46:12.793424000 +0000 -+++ ext/opencv/gsthanddetect.h 2018-05-02 20:46:29.272504000 +0000 +--- ext/opencv/gsthanddetect.h.orig 2018-03-23 20:45:15 UTC ++++ ext/opencv/gsthanddetect.h @@ -45,7 +45,7 @@ #ifndef __GST_HANDDETECT_H__ #define __GST_HANDDETECT_H__ diff --git c/multimedia/gstreamer1-plugins-bad/files/patch-ext_opencv_gsttemplatematch.cpp w/multimedia/gstreamer1-plugins-bad/files/patch-ext_opencv_gsttemplatematch.cpp index f52c815836b1..69fc6f89bf44 100644 --- c/multimedia/gstreamer1-plugins-bad/files/patch-ext_opencv_gsttemplatematch.cpp +++ w/multimedia/gstreamer1-plugins-bad/files/patch-ext_opencv_gsttemplatematch.cpp @@ -1,5 +1,5 @@ ---- ext/opencv/gsttemplatematch.cpp.orig 2018-05-02 20:48:22.600036000 +0000 -+++ ext/opencv/gsttemplatematch.cpp 2018-05-02 20:50:39.989630000 +0000 +--- ext/opencv/gsttemplatematch.cpp.orig 2018-03-23 20:45:15 UTC ++++ ext/opencv/gsttemplatematch.cpp @@ -64,6 +64,8 @@ #include "../../gst-libs/gst/gst-i18n-plugin.h" #include "gsttemplatematch.h" diff --git c/multimedia/gstreamer1-plugins-bad/files/patch-ext_wayland_Makefile.am w/multimedia/gstreamer1-plugins-bad/files/patch-ext_wayland_Makefile.am new file mode 100644 index 000000000000..eea3a4b95a38 --- /dev/null +++ w/multimedia/gstreamer1-plugins-bad/files/patch-ext_wayland_Makefile.am @@ -0,0 +1,11 @@ +--- ext/wayland/Makefile.am.orig 2018-09-16 17:56:27 UTC ++++ ext/wayland/Makefile.am +@@ -54,7 +54,7 @@ $(shell echo $1 | sed 's/\([a-z\-]\+\)-[a-z]\+-v[0-9]\ + endef + + %-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml +- $(AM_V_GEN)$(wayland_scanner) code < $< > $@ ++ $(AM_V_GEN)$(wayland_scanner) private-code < $< > $@ + + %-client-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml + $(AM_V_GEN)$(wayland_scanner) client-header < $< > $@ diff --git c/multimedia/gstreamer1-plugins-bad/files/patch-ext_wayland_Makefile.in w/multimedia/gstreamer1-plugins-bad/files/patch-ext_wayland_Makefile.in new file mode 100644 index 000000000000..afee6dd65800 --- /dev/null +++ w/multimedia/gstreamer1-plugins-bad/files/patch-ext_wayland_Makefile.in @@ -0,0 +1,11 @@ +--- ext/wayland/Makefile.in.orig 2018-09-16 17:59:59 UTC ++++ ext/wayland/Makefile.in +@@ -1198,7 +1198,7 @@ $(shell echo $1 | sed 's/\([a-z\-]\+\)-[a-z]\+-v[0-9]\ + endef + + %-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml +- $(AM_V_GEN)$(wayland_scanner) code < $< > $@ ++ $(AM_V_GEN)$(wayland_scanner) private-code < $< > $@ + + %-client-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml + $(AM_V_GEN)$(wayland_scanner) client-header < $< > $@ diff --git c/multimedia/gstreamer1-plugins-bad/pkg-plist w/multimedia/gstreamer1-plugins-bad/pkg-plist index 262d2d53efa6..81841e82f704 100644 --- c/multimedia/gstreamer1-plugins-bad/pkg-plist +++ w/multimedia/gstreamer1-plugins-bad/pkg-plist @@ -1,10 +1,10 @@ -include/gstreamer-%%VERSION%%/gst/allocators/badallocators.h -include/gstreamer-%%VERSION%%/gst/allocators/gstphysmemory.h -include/gstreamer-%%VERSION%%/gst/audio/gstaudioaggregator.h -include/gstreamer-%%VERSION%%/gst/base/gstaggregator.h +include/gstreamer-%%VERSION%%/gst/audio/audio-bad-prelude.h +include/gstreamer-%%VERSION%%/gst/audio/gstnonstreamaudiodecoder.h +include/gstreamer-%%VERSION%%/gst/basecamerabinsrc/basecamerabinsrc-prelude.h 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/codecparsers-prelude.h include/gstreamer-%%VERSION%%/gst/codecparsers/gsth264parser.h include/gstreamer-%%VERSION%%/gst/codecparsers/gsth265parser.h include/gstreamer-%%VERSION%%/gst/codecparsers/gstjpeg2000sampling.h @@ -18,7 +18,9 @@ include/gstreamer-%%VERSION%%/gst/codecparsers/gstvp8rangedecoder.h include/gstreamer-%%VERSION%%/gst/codecparsers/gstvp9parser.h include/gstreamer-%%VERSION%%/gst/insertbin/gstinsertbin.h include/gstreamer-%%VERSION%%/gst/interfaces/photography-enumtypes.h +include/gstreamer-%%VERSION%%/gst/interfaces/photography-prelude.h include/gstreamer-%%VERSION%%/gst/interfaces/photography.h +include/gstreamer-%%VERSION%%/gst/isoff/gstisoff.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 @@ -26,6 +28,7 @@ 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 +include/gstreamer-%%VERSION%%/gst/mpegts/mpegts-prelude.h include/gstreamer-%%VERSION%%/gst/mpegts/mpegts.h include/gstreamer-%%VERSION%%/gst/player/gstplayer-g-main-context-signal-dispatcher.h include/gstreamer-%%VERSION%%/gst/player/gstplayer-media-info.h @@ -35,16 +38,28 @@ include/gstreamer-%%VERSION%%/gst/player/gstplayer-video-overlay-video-renderer. include/gstreamer-%%VERSION%%/gst/player/gstplayer-video-renderer.h include/gstreamer-%%VERSION%%/gst/player/gstplayer-visualization.h include/gstreamer-%%VERSION%%/gst/player/gstplayer.h +include/gstreamer-%%VERSION%%/gst/player/player-prelude.h include/gstreamer-%%VERSION%%/gst/player/player.h include/gstreamer-%%VERSION%%/gst/uridownloader/gstfragment.h include/gstreamer-%%VERSION%%/gst/uridownloader/gsturidownloader.h include/gstreamer-%%VERSION%%/gst/uridownloader/gsturidownloader_debug.h +include/gstreamer-%%VERSION%%/gst/uridownloader/uridownloader-prelude.h include/gstreamer-%%VERSION%%/gst/video/gstvideoaggregator.h include/gstreamer-%%VERSION%%/gst/video/gstvideoaggregatorpad.h -lib/girepository-1.0/GstBadAllocators-%%VERSION%%.typelib +include/gstreamer-%%VERSION%%/gst/video/video-bad-prelude.h +include/gstreamer-%%VERSION%%/gst/webrtc/dtlstransport.h +include/gstreamer-%%VERSION%%/gst/webrtc/icetransport.h +include/gstreamer-%%VERSION%%/gst/webrtc/rtcsessiondescription.h +include/gstreamer-%%VERSION%%/gst/webrtc/rtpreceiver.h +include/gstreamer-%%VERSION%%/gst/webrtc/rtpsender.h +include/gstreamer-%%VERSION%%/gst/webrtc/rtptransceiver.h +include/gstreamer-%%VERSION%%/gst/webrtc/webrtc-enumtypes.h +include/gstreamer-%%VERSION%%/gst/webrtc/webrtc.h +include/gstreamer-%%VERSION%%/gst/webrtc/webrtc_fwd.h lib/girepository-1.0/GstInsertBin-%%VERSION%%.typelib lib/girepository-1.0/GstMpegts-%%VERSION%%.typelib lib/girepository-1.0/GstPlayer-%%VERSION%%.typelib +lib/girepository-1.0/GstWebRTC-%%VERSION%%.typelib lib/gstreamer-%%VERSION%%/libgstaccurip.so lib/gstreamer-%%VERSION%%/libgstadpcmdec.so lib/gstreamer-%%VERSION%%/libgstadpcmenc.so @@ -52,7 +67,7 @@ lib/gstreamer-%%VERSION%%/libgstaiff.so lib/gstreamer-%%VERSION%%/libgstasfmux.so lib/gstreamer-%%VERSION%%/libgstaudiobuffersplit.so lib/gstreamer-%%VERSION%%/libgstaudiofxbad.so -lib/gstreamer-%%VERSION%%/libgstaudiomixer.so +lib/gstreamer-%%VERSION%%/libgstaudiolatency.so lib/gstreamer-%%VERSION%%/libgstaudiomixmatrix.so lib/gstreamer-%%VERSION%%/libgstaudiovisualizers.so lib/gstreamer-%%VERSION%%/libgstautoconvert.so @@ -76,6 +91,7 @@ lib/gstreamer-%%VERSION%%/libgstgeometrictransform.so lib/gstreamer-%%VERSION%%/libgstid3tag.so lib/gstreamer-%%VERSION%%/libgstinter.so lib/gstreamer-%%VERSION%%/libgstinterlace.so +lib/gstreamer-%%VERSION%%/libgstipcpipeline.so lib/gstreamer-%%VERSION%%/libgstivfparse.so lib/gstreamer-%%VERSION%%/libgstivtc.so lib/gstreamer-%%VERSION%%/libgstjp2kdecimator.so @@ -90,6 +106,7 @@ lib/gstreamer-%%VERSION%%/libgstmxf.so lib/gstreamer-%%VERSION%%/libgstnetsim.so lib/gstreamer-%%VERSION%%/libgstpcapparse.so lib/gstreamer-%%VERSION%%/libgstpnm.so +lib/gstreamer-%%VERSION%%/libgstproxy.so lib/gstreamer-%%VERSION%%/libgstremovesilence.so lib/gstreamer-%%VERSION%%/libgstrfbsrc.so lib/gstreamer-%%VERSION%%/libgstrtponvif.so @@ -112,15 +129,9 @@ lib/gstreamer-%%VERSION%%/libgstyadif.so lib/libgstadaptivedemux-%%VERSION%%.so lib/libgstadaptivedemux-%%VERSION%%.so.0 lib/libgstadaptivedemux-%%VERSION%%.so.%%SOVERSION%% -lib/libgstbadallocators-%%VERSION%%.so -lib/libgstbadallocators-%%VERSION%%.so.0 -lib/libgstbadallocators-%%VERSION%%.so.%%SOVERSION%% lib/libgstbadaudio-%%VERSION%%.so lib/libgstbadaudio-%%VERSION%%.so.0 lib/libgstbadaudio-%%VERSION%%.so.%%SOVERSION%% -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%% @@ -133,6 +144,9 @@ lib/libgstcodecparsers-%%VERSION%%.so.%%SOVERSION%% lib/libgstinsertbin-%%VERSION%%.so lib/libgstinsertbin-%%VERSION%%.so.0 lib/libgstinsertbin-%%VERSION%%.so.%%SOVERSION%% +lib/libgstisoff-%%VERSION%%.so +lib/libgstisoff-%%VERSION%%.so.0 +lib/libgstisoff-%%VERSION%%.so.%%SOVERSION%% lib/libgstmpegts-%%VERSION%%.so lib/libgstmpegts-%%VERSION%%.so.0 lib/libgstmpegts-%%VERSION%%.so.%%SOVERSION%% @@ -145,19 +159,21 @@ lib/libgstplayer-%%VERSION%%.so.%%SOVERSION%% lib/libgsturidownloader-%%VERSION%%.so lib/libgsturidownloader-%%VERSION%%.so.0 lib/libgsturidownloader-%%VERSION%%.so.%%SOVERSION%% -libdata/pkgconfig/gstreamer-bad-allocators-%%VERSION%%.pc +lib/libgstwebrtc-%%VERSION%%.so +lib/libgstwebrtc-%%VERSION%%.so.0 +lib/libgstwebrtc-%%VERSION%%.so.%%SOVERSION%% libdata/pkgconfig/gstreamer-bad-audio-%%VERSION%%.pc -libdata/pkgconfig/gstreamer-bad-base-%%VERSION%%.pc libdata/pkgconfig/gstreamer-bad-video-%%VERSION%%.pc libdata/pkgconfig/gstreamer-codecparsers-%%VERSION%%.pc libdata/pkgconfig/gstreamer-insertbin-%%VERSION%%.pc libdata/pkgconfig/gstreamer-mpegts-%%VERSION%%.pc libdata/pkgconfig/gstreamer-player-%%VERSION%%.pc libdata/pkgconfig/gstreamer-plugins-bad-%%VERSION%%.pc -share/gir-1.0/GstBadAllocators-%%VERSION%%.gir +libdata/pkgconfig/gstreamer-webrtc-%%VERSION%%.pc share/gir-1.0/GstInsertBin-%%VERSION%%.gir share/gir-1.0/GstMpegts-%%VERSION%%.gir share/gir-1.0/GstPlayer-%%VERSION%%.gir +share/gir-1.0/GstWebRTC-%%VERSION%%.gir %%DATADIR%%-%%VERSION%%/presets/GstFreeverb.prs share/locale/af/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/az/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo diff --git c/multimedia/gstreamer1-plugins-core/Makefile w/multimedia/gstreamer1-plugins-core/Makefile index 8a8bd5c4d788..6b4e0ecf3271 100644 --- c/multimedia/gstreamer1-plugins-core/Makefile +++ w/multimedia/gstreamer1-plugins-core/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gstreamer1-plugins-core -PORTVERSION= 1.12 +PORTVERSION= 1.14 CATEGORIES= multimedia audio MASTER_SITES= # empty DISTFILES= # empty diff --git c/multimedia/gstreamer1-plugins-dash/Makefile w/multimedia/gstreamer1-plugins-dash/Makefile index 656fb400498d..bdd97a16cf01 100644 --- c/multimedia/gstreamer1-plugins-dash/Makefile +++ w/multimedia/gstreamer1-plugins-dash/Makefile @@ -8,6 +8,13 @@ COMMENT= GStreamer Dynamic Adaptive Streaming over HTTP demuxer plugin GST_PLUGIN= dash DIST= bad +DASH_GST_DIRS= gst-libs/gst/isoff + MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins +pre-build: +.for dir in ${DASH_GST_DIRS} + @(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}) +.endfor + .include "${MASTERDIR}/Makefile" diff --git c/multimedia/gstreamer1-plugins-schroedinger/Makefile w/multimedia/gstreamer1-plugins-schroedinger/Makefile deleted file mode 100644 index 01830d22594e..000000000000 --- c/multimedia/gstreamer1-plugins-schroedinger/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# $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" diff --git c/multimedia/gstreamer1-plugins-smoothstreaming/Makefile w/multimedia/gstreamer1-plugins-smoothstreaming/Makefile index e1577670a76b..ebbbde6ddca7 100644 --- c/multimedia/gstreamer1-plugins-smoothstreaming/Makefile +++ w/multimedia/gstreamer1-plugins-smoothstreaming/Makefile @@ -8,6 +8,13 @@ COMMENT= GStreamer parse and demuliplex a Smooth Streaming manifest into audio/v GST_PLUGIN= smoothstreaming DIST= bad +SMOOTH_GST_DIRS= gst-libs/gst/isoff + MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins +pre-build: +.for dir in ${SMOOTH_GST_DIRS} + @(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}) +.endfor + .include "${MASTERDIR}/Makefile" diff --git c/multimedia/gstreamer1-plugins-ugly/files/patch-ext_x264_gstx264enc.c w/multimedia/gstreamer1-plugins-ugly/files/patch-ext_x264_gstx264enc.c deleted file mode 100644 index 83ab10f11717..000000000000 --- c/multimedia/gstreamer1-plugins-ugly/files/patch-ext_x264_gstx264enc.c +++ /dev/null @@ -1,95 +0,0 @@ -From 83c38dc44622611c1f67dd26e4cb383c5aef90f6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= -Date: Wed, 28 Feb 2018 10:07:13 +0000 -Subject: x264enc: fix build with newer x264 with support for multiple bit - depths -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -libx264 used to be built for one specific bit depth, and if we -wanted to support multiple bit depths we would have to dynamically -load the right .so from different paths. That has changed now, and -libx264 can include support for multiple depths in the same lib, -so we don't need to do the dlopen() dance any more. We'll keep -the vtable stuff around until we can drop support for older x264. - -gstx264enc.c:2927:36: error: ‘x264_bit_depth’ undeclared - -https://bugzilla.gnome.org/show_bug.cgi?id=792111 - ---- ext/x264/gstx264enc.c.orig 2017-07-25 08:26:28 UTC -+++ ext/x264/gstx264enc.c -@@ -117,7 +117,9 @@ struct _GstX264EncVTable - { - GModule *module; - -+#if X264_BUILD < 153 - const int *x264_bit_depth; -+#endif - const int *x264_chroma_format; - void (*x264_encoder_close) (x264_t *); - int (*x264_encoder_delayed_frames) (x264_t *); -@@ -170,8 +172,9 @@ load_x264 (const gchar * filename) - "' from '%s'. Incompatible version?", filename); - goto error; - } -- -+#if X264_BUILD < 153 - LOAD_SYMBOL (x264_bit_depth); -+#endif - LOAD_SYMBOL (x264_chroma_format); - LOAD_SYMBOL (x264_encoder_close); - LOAD_SYMBOL (x264_encoder_delayed_frames); -@@ -288,6 +291,7 @@ gst_x264_enc_add_x264_chroma_format (GstStructure * s, - return ret; - } - -+#if X264_BUILD < 153 - static gboolean - load_x264_libraries (void) - { -@@ -326,6 +330,33 @@ load_x264_libraries (void) - return TRUE; - } - -+#else /* X264_BUILD >= 153 */ -+ -+static gboolean -+load_x264_libraries (void) -+{ -+#if X264_BIT_DEPTH == 0 /* all */ -+ vtable_8bit = &default_vtable; -+ vtable_10bit = &default_vtable; -+#elif X264_BIT_DEPTH == 8 -+ vtable_8bit = &default_vtable; -+#elif X264_BIT_DEPTH == 10 -+ vtable_10bit = &default_vtable; -+#else -+#error "unexpected X264_BIT_DEPTH value" -+#endif -+ -+#ifdef HAVE_X264_ADDITIONAL_LIBRARIES -+ GST_WARNING ("Ignoring configured additional libraries %s, using libx264 " -+ "version enabled for multiple bit depths", -+ HAVE_X264_ADDITIONAL_LIBRARIES); -+#endif -+ -+ return TRUE; -+} -+ -+#endif -+ - enum - { - ARG_0, -@@ -2897,7 +2928,9 @@ plugin_init (GstPlugin * plugin) - * if needed. We can't initialize statically because these values are not - * constant on Windows. */ - default_vtable.module = NULL; -+#if X264_BUILD < 153 - default_vtable.x264_bit_depth = &x264_bit_depth; -+#endif - default_vtable.x264_chroma_format = &x264_chroma_format; - default_vtable.x264_encoder_close = x264_encoder_close; - default_vtable.x264_encoder_delayed_frames = x264_encoder_delayed_frames; diff --git c/multimedia/gstreamer1-plugins/Makefile w/multimedia/gstreamer1-plugins/Makefile index 266051a1f0d9..9ee46d1a1675 100644 --- c/multimedia/gstreamer1-plugins/Makefile +++ w/multimedia/gstreamer1-plugins/Makefile @@ -5,7 +5,7 @@ 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}/gstreamer1-plugin-${PLUGIN}. -PORTREVISION?= 2 +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 \ @@ -26,16 +26,16 @@ RUN_DEPENDS+= iso-codes>=0:misc/iso-codes PORTSCOUT= limitw:1,even -BASE_PORTVERSION= 1.12.3 +BASE_PORTVERSION= 1.14.4 BASE_DISTNAME= gst-plugins-base-${BASE_PORTVERSION} BASE_DISTFILE= ${BASE_DISTNAME}${EXTRACT_SUFX} -BAD_PORTVERSION= 1.12.3 +BAD_PORTVERSION= 1.14.4 BAD_DISTNAME= gst-plugins-bad-${BAD_PORTVERSION} BAD_DISTFILE= ${BAD_DISTNAME}${EXTRACT_SUFX} -GOOD_PORTVERSION= 1.12.3 +GOOD_PORTVERSION= 1.14.4 GOOD_DISTNAME= gst-plugins-good-${GOOD_PORTVERSION} GOOD_DISTFILE= ${GOOD_DISTNAME}${EXTRACT_SUFX} -UGLY_PORTVERSION= 1.12.3 +UGLY_PORTVERSION= 1.14.4 UGLY_DISTNAME= gst-plugins-ugly-${UGLY_PORTVERSION} UGLY_DISTFILE= ${UGLY_DISTNAME}${EXTRACT_SUFX} DIST?= base @@ -60,7 +60,7 @@ IGNORE= DIST not specified .endif VERSION= 1.0 -SOVERSION= 0.1203.0 +SOVERSION= 0.1404.0 PLIST_SUB+= VERSION="${VERSION}" \ SOVERSION="${SOVERSION}" diff --git c/multimedia/gstreamer1-plugins/Makefile.common w/multimedia/gstreamer1-plugins/Makefile.common index e434824eba3a..1dc7454eb9e7 100644 --- c/multimedia/gstreamer1-plugins/Makefile.common +++ w/multimedia/gstreamer1-plugins/Makefile.common @@ -3,9 +3,11 @@ BASE_GST_ALL_PLUGINS= \ alsa \ cdparanoia \ + gl \ ivorbis \ libvisual \ ogg \ + opengl \ opus \ pango \ theora \ @@ -14,6 +16,7 @@ BASE_GST_ALL_PLUGINS= \ xvideo BAD_GST_ALL_PLUGINS+= \ + aom \ assrender \ bs2b \ chromaprint \ @@ -42,13 +45,12 @@ BAD_GST_ALL_PLUGINS+= \ openal \ opencv \ openexr \ - opengl \ openh264 \ openjpeg \ + openmpt \ resindvd \ rtmp \ rsvg \ - schro \ smoothstreaming \ sndfile \ soundtouch \ @@ -57,6 +59,7 @@ BAD_GST_ALL_PLUGINS+= \ srtp \ ttml \ vdpau \ + vulkan \ wayland \ webp \ webrtcdsp \ @@ -84,11 +87,11 @@ BAD_GST_NON_PLUGINS+= \ --disable-directsound \ --disable-msdk \ --disable-nvenc \ + --disable-nvdec \ --disable-sbc \ --disable-tinyalsa \ --disable-uvch264 \ --disable-vcd \ - --disable-vulkan \ --disable-wasapi \ --disable-wgl \ --disable-winks \ @@ -102,14 +105,17 @@ GOOD_GST_ALL_PLUGINS+= \ gst_v4l2 \ jack \ jpeg \ + lame \ libcaca \ libdv \ libpng \ + mpg123 \ pulse \ shout2 \ soup \ speex \ taglib \ + twolame \ vpx \ wavpack \ x @@ -132,11 +138,8 @@ UGLY_GST_ALL_PLUGINS+= \ amrwb \ cdio \ dvdread \ - lame \ mpeg2dec \ - mpg123 \ sidplay \ - twolame \ x264 UGLY_GST_NON_PLUGINS= @@ -206,6 +209,9 @@ gst_amrwb_LIB_DEPENDS= libopencore-amrwb.so:audio/opencore-amr gst_amrwb_GST_PLUGIN_DIR= ext/amrwbdec gst_amrwb_PLIST_FILES= ${GST_LIB_DIR}/libgstamrwbdec.so +# aom +gst_aom_LIB_DEPENDS= libaom.so:multimedia/aom + # assrender gst_assrender_LIB_DEPENDS= libass.so:multimedia/libass @@ -266,10 +272,13 @@ gst_gdk_pixbuf_USE_GNOME= gdkpixbuf2 gst_gdk_pixbuf_PLIST_FILES= ${GST_LIB_DIR}/libgstgdkpixbuf.so # gl +gst_gl_USES= gl gst_gl_USE_GL= gl glu glesv2 egl -gst_gl_LIB_DEPENDS= libgraphene-1.0.so:graphics/graphene +gst_gl_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat +gst_gl_LIB_DEPENDS= libgraphene-1.0.so:graphics/graphene \ + libwayland-egl.so:graphics/wayland gst_gl_CONFIGURE_ARGS= --enable-gl --enable-glx \ - --enable-egl --enable-gles2 + --enable-egl --enable-gles2 --enable-wayland gst_gl_GST_PLUGIN_DIR= gst-libs/gst/gl ext/gl gst_gl_PLIST_FILES= # @@ -280,6 +289,8 @@ gst_gme_LIB_DEPENDS= libgme.so:audio/libgme gst_gsm_LIB_DEPENDS= libgsm.so:audio/gsm # gtk3 +gst_gtk3_USES= gnome +gst_gtk3_USE_GSTREAMER1= gl gst_gtk3_USE_GNOME= cairo gdkpixbuf2 gtk30 gst_gtk3_CONFIGURE_ARGS=--enable-gtk3 gst_gtk3_GST_PLUGIN_DIR=ext/gtk @@ -313,6 +324,7 @@ gst_libcaca_PLIST_FILES= ${GST_LIB_DIR}/libgstcacasink.so # libde265 gst_libde265_LIB_DEPENDS= libde265.so:multimedia/libde265 +gst_libde265_PLIST_FILES= ${GST_LIB_DIR}/libgstde265.so # libmms gst_libmms_LIB_DEPENDS= libmms.so:net/libmms @@ -370,6 +382,9 @@ gst_openjpeg_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg # openh264 gst_openh264_LIB_DEPENDS= libopenh264.so:multimedia/openh264 +# openmpt +gst_openmpt_LIB_DEPENDS= libopenmpt.so:audio/libopenmpt + # opus gst_opus_LIB_DEPENDS= libopus.so:audio/opus @@ -422,10 +437,6 @@ gst_speex_LIB_DEPENDS= libspeex.so:audio/speex # srtp gst_srtp_LIB_DEPENDS= libsrtp.so:net/libsrtp -# schroedinger or schro for short -gst_schro_LIB_DEPENDS= libschroedinger-1.0.so:multimedia/schroedinger -gst_schro_GST_PLUGIN_DIR= ext/schroedinger - # taglib gst_taglib_LIB_DEPENDS= libtag.so:audio/taglib @@ -460,6 +471,12 @@ gst_vpx_PLIST_FILES= ${GST_LIB_DIR}/libgstvpx.so \ gst_vdpau_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau gst_vdpau_GST_PLUGIN_DIR= sys/vdpau +# vulkan +gst_vulkan_BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers +gst_vulkan_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader \ + libwayland-client.so:graphics/wayland +gst_vulkan_CONFIGURE_ARGS= --enable-wayland + # webp gst_webp_LIB_DEPENDS= libwebp.so:graphics/webp diff --git c/multimedia/gstreamer1-plugins/distinfo w/multimedia/gstreamer1-plugins/distinfo index 3d6c2f8cb847..d37352e73cca 100644 --- c/multimedia/gstreamer1-plugins/distinfo +++ w/multimedia/gstreamer1-plugins/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1506168324 -SHA256 (gst-plugins-base-1.12.3.tar.xz) = d3d37b8489d37fa0018973d850bd2067b98af335fef2fa543ee7d40359e3cea5 -SIZE (gst-plugins-base-1.12.3.tar.xz) = 3117364 -SHA256 (gst-plugins-bad-1.12.3.tar.xz) = 36d059761852bed0f1a7fcd3ef64a8aeecab95d2bca53cd6aa0f08054b1cbfec -SIZE (gst-plugins-bad-1.12.3.tar.xz) = 4707000 -SHA256 (gst-plugins-ugly-1.12.3.tar.xz) = e88ca584c94ea78eeecbf3af00ef7f134b66bdee7408aa4aa6c547235e060052 -SIZE (gst-plugins-ugly-1.12.3.tar.xz) = 903784 -SHA256 (gst-plugins-good-1.12.3.tar.xz) = 13e7f479296891fef5a686438f20ba7d534680becf2269ecc5ee24aa83b45f03 -SIZE (gst-plugins-good-1.12.3.tar.xz) = 3487448 +TIMESTAMP = 1539380228 +SHA256 (gst-plugins-base-1.14.4.tar.xz) = ca6139490e48863e7706d870ff4e8ac9f417b56f3b9e4b3ce490c13b09a77461 +SIZE (gst-plugins-base-1.14.4.tar.xz) = 3703232 +SHA256 (gst-plugins-bad-1.14.4.tar.xz) = 910b4e0e2e897e8b6d06767af1779d70057c309f67292f485ff988d087aa0de5 +SIZE (gst-plugins-bad-1.14.4.tar.xz) = 4678032 +SHA256 (gst-plugins-ugly-1.14.4.tar.xz) = ac02d837f166c35ff6ce0738e281680d0b90052cfb1f0255dcf6aaca5f0f6d23 +SIZE (gst-plugins-ugly-1.14.4.tar.xz) = 889632 +SHA256 (gst-plugins-good-1.14.4.tar.xz) = 5f8b553260cb0aac56890053d8511db1528d53cae10f0287cfce2cb2acc70979 +SIZE (gst-plugins-good-1.14.4.tar.xz) = 3792524 diff --git c/multimedia/gstreamer1-plugins/pkg-plist w/multimedia/gstreamer1-plugins/pkg-plist index b7eeb074d125..ce4eae9cbdaf 100644 --- c/multimedia/gstreamer1-plugins/pkg-plist +++ w/multimedia/gstreamer1-plugins/pkg-plist @@ -1,10 +1,13 @@ bin/gst-device-monitor-%%VERSION%% bin/gst-discoverer-%%VERSION%% bin/gst-play-%%VERSION%% +include/gstreamer-%%VERSION%%/gst/allocators/allocators-prelude.h include/gstreamer-%%VERSION%%/gst/allocators/allocators.h include/gstreamer-%%VERSION%%/gst/allocators/gstdmabuf.h include/gstreamer-%%VERSION%%/gst/allocators/gstfdmemory.h +include/gstreamer-%%VERSION%%/gst/allocators/gstphysmemory.h include/gstreamer-%%VERSION%%/gst/app/app-enumtypes.h +include/gstreamer-%%VERSION%%/gst/app/app-prelude.h include/gstreamer-%%VERSION%%/gst/app/app.h include/gstreamer-%%VERSION%%/gst/app/gstappsink.h include/gstreamer-%%VERSION%%/gst/app/gstappsrc.h @@ -14,9 +17,11 @@ include/gstreamer-%%VERSION%%/gst/audio/audio-converter.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-prelude.h include/gstreamer-%%VERSION%%/gst/audio/audio-quantize.h include/gstreamer-%%VERSION%%/gst/audio/audio-resampler.h include/gstreamer-%%VERSION%%/gst/audio/audio.h +include/gstreamer-%%VERSION%%/gst/audio/gstaudioaggregator.h include/gstreamer-%%VERSION%%/gst/audio/gstaudiobasesink.h include/gstreamer-%%VERSION%%/gst/audio/gstaudiobasesrc.h include/gstreamer-%%VERSION%%/gst/audio/gstaudiocdsrc.h @@ -29,7 +34,9 @@ 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/gstaudiostreamalign.h include/gstreamer-%%VERSION%%/gst/audio/streamvolume.h +include/gstreamer-%%VERSION%%/gst/fft/fft-prelude.h include/gstreamer-%%VERSION%%/gst/fft/fft.h include/gstreamer-%%VERSION%%/gst/fft/gstfft.h include/gstreamer-%%VERSION%%/gst/fft/gstfftf32.h @@ -46,9 +53,11 @@ include/gstreamer-%%VERSION%%/gst/pbutils/gstpluginsbaseversion.h include/gstreamer-%%VERSION%%/gst/pbutils/install-plugins.h include/gstreamer-%%VERSION%%/gst/pbutils/missing-plugins.h include/gstreamer-%%VERSION%%/gst/pbutils/pbutils-enumtypes.h +include/gstreamer-%%VERSION%%/gst/pbutils/pbutils-prelude.h include/gstreamer-%%VERSION%%/gst/pbutils/pbutils.h include/gstreamer-%%VERSION%%/gst/riff/riff-ids.h include/gstreamer-%%VERSION%%/gst/riff/riff-media.h +include/gstreamer-%%VERSION%%/gst/riff/riff-prelude.h include/gstreamer-%%VERSION%%/gst/riff/riff-read.h include/gstreamer-%%VERSION%%/gst/riff/riff.h include/gstreamer-%%VERSION%%/gst/rtp/gstrtcpbuffer.h @@ -60,6 +69,7 @@ include/gstreamer-%%VERSION%%/gst/rtp/gstrtpbuffer.h include/gstreamer-%%VERSION%%/gst/rtp/gstrtpdefs.h include/gstreamer-%%VERSION%%/gst/rtp/gstrtphdrext.h include/gstreamer-%%VERSION%%/gst/rtp/gstrtppayloads.h +include/gstreamer-%%VERSION%%/gst/rtp/rtp-prelude.h include/gstreamer-%%VERSION%%/gst/rtp/rtp.h include/gstreamer-%%VERSION%%/gst/rtsp/gstrtsp-enumtypes.h include/gstreamer-%%VERSION%%/gst/rtsp/gstrtsp.h @@ -70,14 +80,17 @@ include/gstreamer-%%VERSION%%/gst/rtsp/gstrtspmessage.h 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-prelude.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-prelude.h include/gstreamer-%%VERSION%%/gst/sdp/sdp.h include/gstreamer-%%VERSION%%/gst/tag/gsttagdemux.h include/gstreamer-%%VERSION%%/gst/tag/gsttagmux.h include/gstreamer-%%VERSION%%/gst/tag/tag-enumtypes.h +include/gstreamer-%%VERSION%%/gst/tag/tag-prelude.h include/gstreamer-%%VERSION%%/gst/tag/tag.h include/gstreamer-%%VERSION%%/gst/tag/xmpwriter.h include/gstreamer-%%VERSION%%/gst/video/colorbalance.h @@ -104,6 +117,7 @@ include/gstreamer-%%VERSION%%/gst/video/video-frame.h include/gstreamer-%%VERSION%%/gst/video/video-info.h include/gstreamer-%%VERSION%%/gst/video/video-multiview.h include/gstreamer-%%VERSION%%/gst/video/video-overlay-composition.h +include/gstreamer-%%VERSION%%/gst/video/video-prelude.h include/gstreamer-%%VERSION%%/gst/video/video-resampler.h include/gstreamer-%%VERSION%%/gst/video/video-scaler.h include/gstreamer-%%VERSION%%/gst/video/video-tile.h @@ -114,7 +128,6 @@ include/gstreamer-%%VERSION%%/gst/video/videooverlay.h lib/girepository-1.0/GstAllocators-%%VERSION%%.typelib 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/GstPbutils-%%VERSION%%.typelib lib/girepository-1.0/GstRtp-%%VERSION%%.typelib lib/girepository-1.0/GstRtsp-%%VERSION%%.typelib @@ -124,6 +137,7 @@ lib/girepository-1.0/GstVideo-%%VERSION%%.typelib lib/gstreamer-%%VERSION%%/libgstadder.so lib/gstreamer-%%VERSION%%/libgstapp.so lib/gstreamer-%%VERSION%%/libgstaudioconvert.so +lib/gstreamer-%%VERSION%%/libgstaudiomixer.so lib/gstreamer-%%VERSION%%/libgstaudiorate.so lib/gstreamer-%%VERSION%%/libgstaudioresample.so lib/gstreamer-%%VERSION%%/libgstaudiotestsrc.so @@ -191,7 +205,6 @@ 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 -share/gir-1.0/GstFft-%%VERSION%%.gir share/gir-1.0/GstPbutils-%%VERSION%%.gir share/gir-1.0/GstRtp-%%VERSION%%.gir share/gir-1.0/GstRtsp-%%VERSION%%.gir diff --git c/multimedia/gstreamer1-rtsp-server/Makefile w/multimedia/gstreamer1-rtsp-server/Makefile index 5c55f3627f82..e90429f9ab73 100644 --- c/multimedia/gstreamer1-rtsp-server/Makefile +++ w/multimedia/gstreamer1-rtsp-server/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gstreamer1-rtsp-server -PORTVERSION= 1.12.3 +PORTVERSION= 1.14.4 CATEGORIES= multimedia MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-rtsp-server/ DISTNAME= gst-rtsp-server-${PORTVERSION} @@ -17,6 +17,6 @@ USE_GNOME= glib20 introspection:build USE_GSTREAMER1= good bad INSTALL_TARGET= install-strip -PLIST_SUB= VERSION=1.0 SOVERSION=0.1203.0 +PLIST_SUB= VERSION=1.0 SOVERSION=0.1404.0 .include diff --git c/multimedia/gstreamer1-rtsp-server/distinfo w/multimedia/gstreamer1-rtsp-server/distinfo index d56b77b8af46..39a263ba1fc0 100644 --- c/multimedia/gstreamer1-rtsp-server/distinfo +++ w/multimedia/gstreamer1-rtsp-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1506170307 -SHA256 (gst-rtsp-server-1.12.3.tar.xz) = 67255971bb16029a01de66b9f9687f20d8dbf3d3bd75feb48605d0723a7c74ec -SIZE (gst-rtsp-server-1.12.3.tar.xz) = 631392 +TIMESTAMP = 1539380600 +SHA256 (gst-rtsp-server-1.14.4.tar.xz) = 3d0ece2afdcd601c175ece24e32a30bc19247b454f4eafd3deeec2533c6884f1 +SIZE (gst-rtsp-server-1.14.4.tar.xz) = 668248 diff --git c/multimedia/gstreamer1-rtsp-server/pkg-plist w/multimedia/gstreamer1-rtsp-server/pkg-plist index 389b4e75f5ab..85a8577c954a 100644 --- c/multimedia/gstreamer1-rtsp-server/pkg-plist +++ w/multimedia/gstreamer1-rtsp-server/pkg-plist @@ -6,9 +6,14 @@ include/gstreamer-%%VERSION%%/gst/rtsp-server/rtsp-media-factory-uri.h include/gstreamer-%%VERSION%%/gst/rtsp-server/rtsp-media-factory.h include/gstreamer-%%VERSION%%/gst/rtsp-server/rtsp-media.h include/gstreamer-%%VERSION%%/gst/rtsp-server/rtsp-mount-points.h +include/gstreamer-%%VERSION%%/gst/rtsp-server/rtsp-onvif-client.h +include/gstreamer-%%VERSION%%/gst/rtsp-server/rtsp-onvif-media-factory.h +include/gstreamer-%%VERSION%%/gst/rtsp-server/rtsp-onvif-media.h +include/gstreamer-%%VERSION%%/gst/rtsp-server/rtsp-onvif-server.h include/gstreamer-%%VERSION%%/gst/rtsp-server/rtsp-params.h include/gstreamer-%%VERSION%%/gst/rtsp-server/rtsp-permissions.h include/gstreamer-%%VERSION%%/gst/rtsp-server/rtsp-sdp.h +include/gstreamer-%%VERSION%%/gst/rtsp-server/rtsp-server-prelude.h include/gstreamer-%%VERSION%%/gst/rtsp-server/rtsp-server.h include/gstreamer-%%VERSION%%/gst/rtsp-server/rtsp-session-media.h include/gstreamer-%%VERSION%%/gst/rtsp-server/rtsp-session-pool.h diff --git c/multimedia/gstreamer1-vaapi/Makefile w/multimedia/gstreamer1-vaapi/Makefile index 4a68c8d88a23..c7c79b3f16ee 100644 --- c/multimedia/gstreamer1-vaapi/Makefile +++ w/multimedia/gstreamer1-vaapi/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= gstreamer1-vaapi -PORTVERSION= 1.12.3 -PORTREVISION= 4 +PORTVERSION= 1.14.4 CATEGORIES= multimedia MASTER_SITES= https://gstreamer.freedesktop.org/src/gstreamer-vaapi/ DISTNAME= gstreamer-vaapi-${PORTVERSION} @@ -16,7 +15,6 @@ LICENSE= LGPL21 LIB_DEPENDS= libva.so:multimedia/libva GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-wayland INSTALL_TARGET= install-strip USES= compiler:c11 gettext-runtime gmake gnome libtool \ pkgconfig tar:xz @@ -26,7 +24,16 @@ USE_GSTREAMER1= bad gl USE_GL= gl USE_XORG= x11 xrandr xrender xorgproto:build -# drm backend needs libudev so disable it for now. -CONFIGURE_ARGS+=--disable-drm +OPTIONS_DEFINE= DRM WAYLAND + +DRM_DESC= Raw KMS/DRM backend + +DRM_CONFIGURE_ENABLE= drm +DRM_LIB_DEPENDS= libudev.so:devel/libudev-devd \ + libdrm.so:graphics/libdrm + +WAYLAND_CONFIGURE_ENABLE= wayland +WAYLAND_LIB_DEPENDS= libva-wayland.so:multimedia/libva \ + libwayland-client.so:graphics/wayland .include diff --git c/multimedia/gstreamer1-vaapi/distinfo w/multimedia/gstreamer1-vaapi/distinfo index 7a6ccec86c0f..c8806f189f82 100644 --- c/multimedia/gstreamer1-vaapi/distinfo +++ w/multimedia/gstreamer1-vaapi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1506173891 -SHA256 (gstreamer-vaapi-1.12.3.tar.xz) = f4cdafd8fd9606a490917c8b67336e835df1219580d55421c70480fd0913744d -SIZE (gstreamer-vaapi-1.12.3.tar.xz) = 996360 +TIMESTAMP = 1539380857 +SHA256 (gstreamer-vaapi-1.14.4.tar.xz) = ce18dbfe961c6a8d31270231686075586bf7a7df62b778c8e7f5ec148251d0a3 +SIZE (gstreamer-vaapi-1.14.4.tar.xz) = 1072352 diff --git c/multimedia/gstreamer1-vaapi/files/patch-configure w/multimedia/gstreamer1-vaapi/files/patch-configure deleted file mode 100644 index 3d835c1e85a8..000000000000 --- c/multimedia/gstreamer1-vaapi/files/patch-configure +++ /dev/null @@ -1,52 +0,0 @@ ---- configure.orig 2017-09-18 12:23:59 UTC -+++ configure -@@ -18008,12 +18008,12 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_LIBVA_CFLAGS="$LIBVA_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva >= \$VAAPI_REQ libva < 0.99.0\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "libva >= $VAAPI_REQ libva < 0.99.0") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva >= \$VAAPI_REQ libva != 0.99.0\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libva >= $VAAPI_REQ libva != 0.99.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_LIBVA_CFLAGS=`$PKG_CONFIG --cflags "libva >= $VAAPI_REQ libva < 0.99.0" 2>/dev/null` -+ pkg_cv_LIBVA_CFLAGS=`$PKG_CONFIG --cflags "libva >= $VAAPI_REQ libva != 0.99.0" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -18026,12 +18026,12 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_LIBVA_LIBS="$LIBVA_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva >= \$VAAPI_REQ libva < 0.99.0\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "libva >= $VAAPI_REQ libva < 0.99.0") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva >= \$VAAPI_REQ libva != 0.99.0\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libva >= $VAAPI_REQ libva != 0.99.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_LIBVA_LIBS=`$PKG_CONFIG --libs "libva >= $VAAPI_REQ libva < 0.99.0" 2>/dev/null` -+ pkg_cv_LIBVA_LIBS=`$PKG_CONFIG --libs "libva >= $VAAPI_REQ libva != 0.99.0" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -18050,14 +18050,14 @@ else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- LIBVA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libva >= $VAAPI_REQ libva < 0.99.0"` -+ LIBVA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libva >= $VAAPI_REQ libva != 0.99.0"` - else -- LIBVA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libva >= $VAAPI_REQ libva < 0.99.0"` -+ LIBVA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libva >= $VAAPI_REQ libva != 0.99.0"` - fi - # Put the nasty error message in config.log where it belongs - echo "$LIBVA_PKG_ERRORS" >&5 - -- as_fn_error $? "Package requirements (libva >= $VAAPI_REQ libva < 0.99.0) were not met: -+ as_fn_error $? "Package requirements (libva >= $VAAPI_REQ libva != 0.99.0) were not met: - - $LIBVA_PKG_ERRORS - diff --git c/multimedia/gstreamer1-vaapi/files/patch-gst-libs_gst_vaapi_gstvaapiutils.c w/multimedia/gstreamer1-vaapi/files/patch-gst-libs_gst_vaapi_gstvaapiutils.c deleted file mode 100644 index 3490790d5ea9..000000000000 --- c/multimedia/gstreamer1-vaapi/files/patch-gst-libs_gst_vaapi_gstvaapiutils.c +++ /dev/null @@ -1,77 +0,0 @@ -From 777bba473e3ed1c7b8b7f7f0322892851c70dfd9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= - -Date: Tue, 11 Jul 2017 17:29:13 +0200 -Subject: libs: utils: libva 1.0 changed the logging - -The logging mechanism in libva has changed it's functions -signatures. This patch updates that for libva versions >= 1.0 - -https://bugzilla.gnome.org/show_bug.cgi?id=784398 - -diff --git a/gst-libs/gst/vaapi/gstvaapiutils.c b/gst-libs/gst/vaapi/gstvaapiutils.c -index 0ed1efe..c24bed7 100644 ---- gst-libs/gst/vaapi/gstvaapiutils.c -+++ gst-libs/gst/vaapi/gstvaapiutils.c -@@ -46,15 +46,43 @@ - #define STRCASE(x) case x: return STRINGIFY(x) - - #if VA_CHECK_VERSION (0,40,0) --static void --gst_vaapi_log (const char *message) -+static gchar * -+strip_msg (const char *message) - { - gchar *msg; - - msg = g_strdup (message); - if (!msg) -+ return NULL; -+ return g_strstrip (msg); -+} -+ -+#if VA_CHECK_VERSION (1,0,0) -+static void -+gst_vaapi_err (void *data, const char *message) -+{ -+ gchar *msg; -+ -+ msg = strip_msg (message); -+ if (!msg) -+ return; -+ GST_ERROR ("%s", msg); -+ g_free (msg); -+} -+#endif -+ -+static void -+gst_vaapi_log ( -+#if VA_CHECK_VERSION (1,0,0) -+ void *data, -+#endif -+ const char *message) -+{ -+ gchar *msg; -+ -+ msg = strip_msg (message); -+ if (!msg) - return; -- g_strchomp (msg); - GST_INFO ("%s", msg); - g_free (msg); - } -@@ -66,7 +94,10 @@ vaapi_initialize (VADisplay dpy) - gint major_version, minor_version; - VAStatus status; - --#if VA_CHECK_VERSION (0,40,0) -+#if VA_CHECK_VERSION (1,0,0) -+ vaSetErrorCallback (dpy, gst_vaapi_err, NULL); -+ vaSetInfoCallback (dpy, gst_vaapi_log, NULL); -+#elif VA_CHECK_VERSION (0,40,0) - vaSetInfoCallback (gst_vaapi_log); - #endif - --- -cgit v0.10.2 - diff --git c/multimedia/gstreamer1-validate/Makefile w/multimedia/gstreamer1-validate/Makefile index 405f7f4d94a5..761c749ebbe6 100644 --- c/multimedia/gstreamer1-validate/Makefile +++ w/multimedia/gstreamer1-validate/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= gstreamer1-validate -PORTVERSION= 1.12.3 -PORTREVISION= 1 +PORTVERSION= 1.14.4 CATEGORIES= multimedia MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-validate/ DISTNAME= gst-validate-${PORTVERSION} @@ -11,7 +10,8 @@ DISTNAME= gst-validate-${PORTVERSION} MAINTAINER= multimedia@FreeBSD.org COMMENT= Gstreamer element validation suite -LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib +LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \ + libgstrtspserver-1.0.so:multimedia/gstreamer1-rtsp-server USES= gettext-runtime gmake gnome libtool pathfix \ pkgconfig python:2.7 shebangfix tar:xz @@ -22,6 +22,6 @@ USE_GNOME= cairo gdkpixbuf2 gtk30 introspection:build USE_GSTREAMER1= yes INSTALL_TARGET= install-strip -PLIST_SUB= VERSION=1.0 SOVERSION=0.1203.0 +PLIST_SUB= VERSION=1.0 SOVERSION=0.1404.0 .include diff --git c/multimedia/gstreamer1-validate/distinfo w/multimedia/gstreamer1-validate/distinfo index ebc73a96f98e..834c2b70df05 100644 --- c/multimedia/gstreamer1-validate/distinfo +++ w/multimedia/gstreamer1-validate/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1506174034 -SHA256 (gst-validate-1.12.3.tar.xz) = 5139949d20274fdd702492438eeab2c9e55aa82f60aca17db27ebd3faf08489e -SIZE (gst-validate-1.12.3.tar.xz) = 674008 +TIMESTAMP = 1537267330 +SHA256 (gst-validate-1.14.3.tar.xz) = 0910f75de9028edb9f1ba0571470482365ff0c9e5373506780ea38ba0cc9f703 +SIZE (gst-validate-1.14.3.tar.xz) = 699576 diff --git c/multimedia/gstreamer1-validate/pkg-plist w/multimedia/gstreamer1-validate/pkg-plist index 441dd212f579..ca16361499f3 100644 --- c/multimedia/gstreamer1-validate/pkg-plist +++ w/multimedia/gstreamer1-validate/pkg-plist @@ -2,9 +2,11 @@ bin/gst-validate-%%VERSION%% bin/gst-validate-images-check-%%VERSION%% bin/gst-validate-launcher bin/gst-validate-media-check-%%VERSION%% +bin/gst-validate-rtsp-server-%%VERSION%% bin/gst-validate-transcoding-%%VERSION%% include/gstreamer-%%VERSION%%/gst/validate/gst-validate-bin-monitor.h include/gstreamer-%%VERSION%%/gst/validate/gst-validate-element-monitor.h +include/gstreamer-%%VERSION%%/gst/validate/gst-validate-enum-types.h include/gstreamer-%%VERSION%%/gst/validate/gst-validate-enums.h include/gstreamer-%%VERSION%%/gst/validate/gst-validate-media-info.h include/gstreamer-%%VERSION%%/gst/validate/gst-validate-monitor-factory.h @@ -22,6 +24,7 @@ include/gstreamer-%%VERSION%%/gst/validate/gst-validate-utils.h include/gstreamer-%%VERSION%%/gst/validate/media-descriptor-parser.h include/gstreamer-%%VERSION%%/gst/validate/media-descriptor-writer.h include/gstreamer-%%VERSION%%/gst/validate/media-descriptor.h +include/gstreamer-%%VERSION%%/gst/validate/validate-prelude.h include/gstreamer-%%VERSION%%/gst/validate/validate.h include/gstreamer-%%VERSION%%/lib/validate/video/gssim.h include/gstreamer-%%VERSION%%/lib/validate/video/gstvalidatessim.h @@ -106,7 +109,6 @@ share/gstreamer-%%VERSION%%/validate/scenarios/seek_backward.scenario share/gstreamer-%%VERSION%%/validate/scenarios/seek_forward.scenario share/gstreamer-%%VERSION%%/validate/scenarios/seek_forward_backward.scenario share/gstreamer-%%VERSION%%/validate/scenarios/seek_with_stop.scenario -share/gstreamer-%%VERSION%%/validate/scenarios/setup_sink_props_max_lateness.scenario share/gstreamer-%%VERSION%%/validate/scenarios/simple_seeks.scenario share/gstreamer-%%VERSION%%/validate/scenarios/switch_audio_track.scenario share/gstreamer-%%VERSION%%/validate/scenarios/switch_audio_track_while_paused.scenario diff --git c/multimedia/gstreamer1/Makefile w/multimedia/gstreamer1/Makefile index cb0e77d978df..b402269e9f91 100644 --- c/multimedia/gstreamer1/Makefile +++ w/multimedia/gstreamer1/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gstreamer -PORTVERSION= 1.12.3 +PORTVERSION= 1.14.4 CATEGORIES= multimedia MASTER_SITES= GNOME \ http://gstreamer.freedesktop.org/src/gstreamer/ @@ -28,7 +28,7 @@ CONFIGURE_ARGS= --disable-tests \ CONFIGURE_ENV= ac_cv_func_register_printf_function="no" INSTALL_TARGET= install-strip PLIST_SUB= VERSION=${GST10_VERSION} \ - SOVERSION=0.1203.0 + SOVERSION=0.1404.0 USE_LDCONFIG= yes GST10_VERSION= 1.0 diff --git c/multimedia/gstreamer1/distinfo w/multimedia/gstreamer1/distinfo index defc00398df2..7fbedb29ea8f 100644 --- c/multimedia/gstreamer1/distinfo +++ w/multimedia/gstreamer1/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1506167841 -SHA256 (gstreamer-1.12.3.tar.xz) = d388f492440897f02b01eebb033ca2d41078a3d85c0eddc030cdea5a337a216e -SIZE (gstreamer-1.12.3.tar.xz) = 3175480 +TIMESTAMP = 1539380270 +SHA256 (gstreamer-1.14.4.tar.xz) = f94f6696c5f05a3b3a9183e39c5f5c0b779f75a04c0efa497e7920afa985ffc7 +SIZE (gstreamer-1.14.4.tar.xz) = 3264324 diff --git c/multimedia/gstreamer1/files/patch-Makefile.in w/multimedia/gstreamer1/files/patch-Makefile.in index 6071ec62adf9..c1cf546a8818 100644 --- c/multimedia/gstreamer1/files/patch-Makefile.in +++ w/multimedia/gstreamer1/files/patch-Makefile.in @@ -1,9 +1,9 @@ ---- Makefile.in.orig 2015-06-07 12:59:34.071555000 +0200 -+++ Makefile.in 2015-06-07 13:00:02.869339000 +0200 -@@ -564,7 +564,7 @@ - DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-docbook +--- Makefile.in.orig 2018-09-16 12:03:27 UTC ++++ Makefile.in +@@ -569,7 +569,7 @@ top_srcdir = @top_srcdir@ + DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc aclocaldir = $(datadir)/aclocal - aclocal_DATA = gst-element-check-@GST_API_VERSION@.m4 + aclocal_DATA = gst-element-check-1.0.m4 -SUBDIRS = pkgconfig gst libs plugins tests docs po m4 common data \ +SUBDIRS = pkgconfig gst libs plugins tests po m4 common data \ $(am__append_1) diff --git c/multimedia/gstreamer1/pkg-plist w/multimedia/gstreamer1/pkg-plist index 567e1e10a1bb..ca228f861857 100644 --- c/multimedia/gstreamer1/pkg-plist +++ w/multimedia/gstreamer1/pkg-plist @@ -2,8 +2,10 @@ bin/gst-inspect-%%VERSION%% bin/gst-launch-%%VERSION%% bin/gst-stats-%%VERSION%% bin/gst-typefind-%%VERSION%% +include/gstreamer-%%VERSION%%/gst/base/base-prelude.h include/gstreamer-%%VERSION%%/gst/base/base.h include/gstreamer-%%VERSION%%/gst/base/gstadapter.h +include/gstreamer-%%VERSION%%/gst/base/gstaggregator.h include/gstreamer-%%VERSION%%/gst/base/gstbaseparse.h include/gstreamer-%%VERSION%%/gst/base/gstbasesink.h include/gstreamer-%%VERSION%%/gst/base/gstbasesrc.h @@ -17,6 +19,7 @@ include/gstreamer-%%VERSION%%/gst/base/gstflowcombiner.h include/gstreamer-%%VERSION%%/gst/base/gstpushsrc.h include/gstreamer-%%VERSION%%/gst/base/gstqueuearray.h include/gstreamer-%%VERSION%%/gst/base/gsttypefindhelper.h +include/gstreamer-%%VERSION%%/gst/check/check-prelude.h include/gstreamer-%%VERSION%%/gst/check/check.h include/gstreamer-%%VERSION%%/gst/check/gstbufferstraw.h include/gstreamer-%%VERSION%%/gst/check/gstcheck.h @@ -25,6 +28,7 @@ include/gstreamer-%%VERSION%%/gst/check/gstharness.h include/gstreamer-%%VERSION%%/gst/check/gsttestclock.h include/gstreamer-%%VERSION%%/gst/check/internal-check.h include/gstreamer-%%VERSION%%/gst/controller/controller-enumtypes.h +include/gstreamer-%%VERSION%%/gst/controller/controller-prelude.h include/gstreamer-%%VERSION%%/gst/controller/controller.h include/gstreamer-%%VERSION%%/gst/controller/gstargbcontrolbinding.h include/gstreamer-%%VERSION%%/gst/controller/gstdirectcontrolbinding.h @@ -83,6 +87,7 @@ include/gstreamer-%%VERSION%%/gst/gstplugin.h include/gstreamer-%%VERSION%%/gst/gstpluginfeature.h include/gstreamer-%%VERSION%%/gst/gstpoll.h include/gstreamer-%%VERSION%%/gst/gstpreset.h +include/gstreamer-%%VERSION%%/gst/gstpromise.h include/gstreamer-%%VERSION%%/gst/gstprotection.h include/gstreamer-%%VERSION%%/gst/gstquery.h include/gstreamer-%%VERSION%%/gst/gstregistry.h @@ -115,6 +120,7 @@ include/gstreamer-%%VERSION%%/gst/net/gstnetcontrolmessagemeta.h include/gstreamer-%%VERSION%%/gst/net/gstnettimepacket.h include/gstreamer-%%VERSION%%/gst/net/gstnettimeprovider.h include/gstreamer-%%VERSION%%/gst/net/gstptpclock.h +include/gstreamer-%%VERSION%%/gst/net/net-prelude.h include/gstreamer-%%VERSION%%/gst/net/net.h lib/girepository-1.0/Gst-%%VERSION%%.typelib lib/girepository-1.0/GstBase-%%VERSION%%.typelib diff --git c/multimedia/py-gstreamer1/Makefile w/multimedia/py-gstreamer1/Makefile index d24f2e9642ee..c22bbeb58463 100644 --- c/multimedia/py-gstreamer1/Makefile +++ w/multimedia/py-gstreamer1/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gstreamer -PORTVERSION= 1.12.3 +PORTVERSION= 1.14.4 CATEGORIES= multimedia python MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-python/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING PORTSCOUT= limitw:1,even -USES= gmake libtool localbase pathfix pkgconfig python tar:xz +USES= gmake gnome libtool localbase pathfix pkgconfig python tar:xz USE_GNOME= pygobject3 USE_PYTHON= flavors py3kplist USE_GSTREAMER1= yes diff --git c/multimedia/py-gstreamer1/distinfo w/multimedia/py-gstreamer1/distinfo index f30a50686e41..c6029bdf41ee 100644 --- c/multimedia/py-gstreamer1/distinfo +++ w/multimedia/py-gstreamer1/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1506168855 -SHA256 (gst-python-1.12.3.tar.xz) = c3f529dec1294633132690806703b80bad5752eff482eaf81f209c2aba012ba7 -SIZE (gst-python-1.12.3.tar.xz) = 388220 +TIMESTAMP = 1539380882 +SHA256 (gst-python-1.14.4.tar.xz) = d0fdb24f93b6d889f309d2f526b8ea9577e0084ff0a62b4623ef1aed52e85a1b +SIZE (gst-python-1.14.4.tar.xz) = 410040 diff --git c/multimedia/py-gstreamer1/pkg-plist w/multimedia/py-gstreamer1/pkg-plist index 48a8698e0199..a4cc5c4239ee 100644 --- c/multimedia/py-gstreamer1/pkg-plist +++ w/multimedia/py-gstreamer1/pkg-plist @@ -1,4 +1,4 @@ -lib/gstreamer-1.0/libgstpythonplugin.so +lib/gstreamer-1.0/libgstpython.so %%PYTHON_SITELIBDIR%%/gi/overrides/Gst.py %%PYTHON_SITELIBDIR%%/gi/overrides/Gst.pyc %%PYTHON_SITELIBDIR%%/gi/overrides/Gst.pyo diff --git c/x11-toolkits/gstreamer1-plugins-gtk/Makefile w/x11-toolkits/gstreamer1-plugins-gtk/Makefile index 550fb1fc0e38..76d37688f9dd 100644 --- c/x11-toolkits/gstreamer1-plugins-gtk/Makefile +++ w/x11-toolkits/gstreamer1-plugins-gtk/Makefile @@ -7,7 +7,7 @@ GST_PLUGIN_SUFFIX= -gtk COMMENT= GStreamer gtksink plugin GST_PLUGIN= gtk3 -DIST= bad +DIST= good MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins