aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.gstreamer.mk3
-rw-r--r--audio/gstreamer1-plugins-opus/Makefile2
-rw-r--r--graphics/gstreamer1-plugins-opencv/Makefile2
-rw-r--r--multimedia/gstreamer1-libav/Makefile2
-rw-r--r--multimedia/gstreamer1-libav/distinfo4
-rw-r--r--multimedia/gstreamer1-plugins-bad/pkg-plist1
-rw-r--r--multimedia/gstreamer1-plugins-rtmp/Makefile2
-rw-r--r--multimedia/gstreamer1-plugins-x264/Makefile2
-rw-r--r--multimedia/gstreamer1-plugins/Makefile13
-rw-r--r--multimedia/gstreamer1-plugins/Makefile.common7
-rw-r--r--multimedia/gstreamer1-plugins/distinfo16
-rw-r--r--multimedia/gstreamer1/Makefile2
-rw-r--r--multimedia/gstreamer1/distinfo4
13 files changed, 35 insertions, 25 deletions
diff --git a/Mk/bsd.gstreamer.mk b/Mk/bsd.gstreamer.mk
index 95f3e3d063f9..6a09b92b7b36 100644
--- a/Mk/bsd.gstreamer.mk
+++ b/Mk/bsd.gstreamer.mk
@@ -90,7 +90,8 @@ _GSTREAMER_PLUGINS+= \
.if defined(USE_GSTREAMER1)
_GSTREAMER_PLUGINS+= \
assrender curl dvdread kate libav modplug openjpeg png rtmp \
- spandsp vaapi vpx webp x ximagesrc zbar
+ spandsp vpx webp x ximagesrc zbar
+# vaapi?
.endif
# other plugins
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/graphics/gstreamer1-plugins-opencv/Makefile b/graphics/gstreamer1-plugins-opencv/Makefile
index 9cb4c45a27fd..6887f7bfc3d0 100644
--- a/graphics/gstreamer1-plugins-opencv/Makefile
+++ b/graphics/gstreamer1-plugins-opencv/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= graphics
COMMENT= Gstreamer opencv real time computer vision plugin
diff --git a/multimedia/gstreamer1-libav/Makefile b/multimedia/gstreamer1-libav/Makefile
index 97049e1d4ee0..1efc3878cbaa 100644
--- a/multimedia/gstreamer1-libav/Makefile
+++ b/multimedia/gstreamer1-libav/Makefile
@@ -3,7 +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.1
+PORTVERSION= 1.2.2
CATEGORIES= multimedia
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-libav/
DISTNAME= gst-libav-${PORTVERSION}
diff --git a/multimedia/gstreamer1-libav/distinfo b/multimedia/gstreamer1-libav/distinfo
index 4eb5d81f276a..d74b01963bfe 100644
--- a/multimedia/gstreamer1-libav/distinfo
+++ b/multimedia/gstreamer1-libav/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gst-libav-1.2.1.tar.xz) = fd152b7aec56ae76ad58b9759913a8bfe1792bdf64f260d0acaba75b75076676
-SIZE (gst-libav-1.2.1.tar.xz) = 4575744
+SHA256 (gst-libav-1.2.2.tar.xz) = 585eb7971006100ad771a852e07bd2f3e23bcc6eb0b1253a40b5a0e40e4e7418
+SIZE (gst-libav-1.2.2.tar.xz) = 4577584
diff --git a/multimedia/gstreamer1-plugins-bad/pkg-plist b/multimedia/gstreamer1-plugins-bad/pkg-plist
index a1ebeeac4b51..a091a5461215 100644
--- a/multimedia/gstreamer1-plugins-bad/pkg-plist
+++ b/multimedia/gstreamer1-plugins-bad/pkg-plist
@@ -12,6 +12,7 @@ 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/gstmpegts-enumtypes.h
include/gstreamer-%%VERSION%%/gst/mpegts/gstmpegtsdescriptor.h
include/gstreamer-%%VERSION%%/gst/mpegts/gstmpegtssection.h
include/gstreamer-%%VERSION%%/gst/mpegts/mpegts.h
diff --git a/multimedia/gstreamer1-plugins-rtmp/Makefile b/multimedia/gstreamer1-plugins-rtmp/Makefile
index 2c3cf6ecd6d4..bcffa9864852 100644
--- a/multimedia/gstreamer1-plugins-rtmp/Makefile
+++ b/multimedia/gstreamer1-plugins-rtmp/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= multimedia
COMMENT= Gstreamer rtmp plugin
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 ced463ff558c..88100e819a3a 100644
--- a/multimedia/gstreamer1-plugins/Makefile
+++ b/multimedia/gstreamer1-plugins/Makefile
@@ -27,16 +27,16 @@ RUN_DEPENDS+= iso-codes>=0:${PORTSDIR}/misc/iso-codes
PORTSCOUT= limitw:1,even
-BASE_PORTVERSION= 1.2.1
+BASE_PORTVERSION= 1.2.2
BASE_DISTNAME= gst-plugins-base-${BASE_PORTVERSION}
BASE_DISTFILE= ${BASE_DISTNAME}${EXTRACT_SUFX}
-BAD_PORTVERSION= 1.2.1
+BAD_PORTVERSION= 1.2.2
BAD_DISTNAME= gst-plugins-bad-${BAD_PORTVERSION}
BAD_DISTFILE= ${BAD_DISTNAME}${EXTRACT_SUFX}
-GOOD_PORTVERSION= 1.2.1
+GOOD_PORTVERSION= 1.2.2
GOOD_DISTNAME= gst-plugins-good-${GOOD_PORTVERSION}
GOOD_DISTFILE= ${GOOD_DISTNAME}${EXTRACT_SUFX}
-UGLY_PORTVERSION= 1.2.1
+UGLY_PORTVERSION= 1.2.2
UGLY_DISTNAME= gst-plugins-ugly-${UGLY_PORTVERSION}
UGLY_DISTFILE= ${UGLY_DISTNAME}${EXTRACT_SUFX}
DIST?= base
@@ -135,8 +135,9 @@ DEFAULT_DVD_DEVICE=/dev/cd0
post-patch:
.if ${DIST}=="bad"
-# @${REINPLACE_CMD} -e 's|opencv <= 2.3.1|opencv <= 2.3.99|g' \
-# ${WRKSRC}/configure
+# custom rule to fix opencv detection in configure
+ @${REINPLACE_CMD} -e 's|opencv <= 2.4.6.1|opencv <= 2.4.7|g' \
+ ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|g' \
${WRKSRC}/ext/resindvd/resindvdbin.c \
${WRKSRC}/ext/resindvd/resindvdsrc.c
diff --git a/multimedia/gstreamer1-plugins/Makefile.common b/multimedia/gstreamer1-plugins/Makefile.common
index 1acd8b201205..0f3c21b06e44 100644
--- a/multimedia/gstreamer1-plugins/Makefile.common
+++ b/multimedia/gstreamer1-plugins/Makefile.common
@@ -315,6 +315,13 @@ 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 \
+ 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/openjpeg
diff --git a/multimedia/gstreamer1-plugins/distinfo b/multimedia/gstreamer1-plugins/distinfo
index 91ff978dbbc5..18782b2db15a 100644
--- a/multimedia/gstreamer1-plugins/distinfo
+++ b/multimedia/gstreamer1-plugins/distinfo
@@ -1,8 +1,8 @@
-SHA256 (gst-plugins-base-1.2.1.tar.xz) = de2444a5c150d4e4b680364d7c0414cd8b015d95b305ff65d65a17683379532f
-SIZE (gst-plugins-base-1.2.1.tar.xz) = 2512216
-SHA256 (gst-plugins-bad-1.2.1.tar.xz) = f33e7c81fcb742fe50b73ad87ef8a4baa7d6b59c5002a10bf63c8dee22404929
-SIZE (gst-plugins-bad-1.2.1.tar.xz) = 3276352
-SHA256 (gst-plugins-ugly-1.2.1.tar.xz) = 35ae5d45de54827604e24f57f54ab30a5ab2245b4c4120977273eb11d19c2395
-SIZE (gst-plugins-ugly-1.2.1.tar.xz) = 843228
-SHA256 (gst-plugins-good-1.2.1.tar.xz) = 660fa02dbe01086fcf702d87acc0ba5dde2559d6a11ecf438874afe504c50517
-SIZE (gst-plugins-good-1.2.1.tar.xz) = 2875300
+SHA256 (gst-plugins-base-1.2.2.tar.xz) = fa90cf21eac0a77f9393100356aef99ae42072c31dc218d3ae2e7f86cd5ced69
+SIZE (gst-plugins-base-1.2.2.tar.xz) = 2514808
+SHA256 (gst-plugins-bad-1.2.2.tar.xz) = 63e78db11b482d0529a0bde01e2ac23fd32c7cb99a5508b53ee4ca1051871b2c
+SIZE (gst-plugins-bad-1.2.2.tar.xz) = 3278380
+SHA256 (gst-plugins-ugly-1.2.2.tar.xz) = 4b6aac272a5be0d68f365ef6fba0f829fc5c1d1d601bb4dd9e85f5289b2b56c3
+SIZE (gst-plugins-ugly-1.2.2.tar.xz) = 843424
+SHA256 (gst-plugins-good-1.2.2.tar.xz) = 6c090f00e8e4588f12807bd9fbb06a03b84a512c93e84d928123ee4a42228a81
+SIZE (gst-plugins-good-1.2.2.tar.xz) = 2877792
diff --git a/multimedia/gstreamer1/Makefile b/multimedia/gstreamer1/Makefile
index ae524f195f53..b63fa550e189 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.1
+PORTVERSION= 1.2.2
CATEGORIES= multimedia
MASTER_SITES= http://gstreamer.freedesktop.org/src/gstreamer/
DISTNAME= ${PORTNAME:S/1//}-${PORTVERSION}
diff --git a/multimedia/gstreamer1/distinfo b/multimedia/gstreamer1/distinfo
index 1dc16cc3497d..07a3158708b1 100644
--- a/multimedia/gstreamer1/distinfo
+++ b/multimedia/gstreamer1/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gstreamer-1.2.1.tar.xz) = a4523d2471bca6cd0059a32e3b042f50faa4dadc6439852af8b43ca3f17d1fc9
-SIZE (gstreamer-1.2.1.tar.xz) = 3191504
+SHA256 (gstreamer-1.2.2.tar.xz) = b9f12137ab663edc6c37429b38ca7911074b9c2a829267fe855d4e57d916a0b6
+SIZE (gstreamer-1.2.2.tar.xz) = 3194712