Update to gstreamer-plugins-good-0.10.31.

Detail changelog available at:
http://download.gnome.org/sources/gst-plugins-good/0.10/gst-plugins-good-0.10.31.changes
This commit is contained in:
ajacoutot 2012-02-21 08:46:08 +00:00
parent 1ffad6ebf9
commit b99903998f
7 changed files with 42 additions and 62 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.81 2012/01/25 14:06:27 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.82 2012/02/21 08:46:08 ajacoutot Exp $
# XXX ossaudio(3) is only enabled to be used as a mixing device by
# audio/pulseaudio and x11/xfce4/xfce4-mixer
@ -8,19 +8,13 @@ COMMENT-aalib = aalib element for GStreamer (plugins-good)
COMMENT-dv = dv element for GStreamer (plugins-good)
COMMENT-caca = libcaca element for GStreamer (plugins-good)
V = 0.10.30
V = 0.10.31
DISTNAME = gst-plugins-good-$V
PKGNAME-main = gstreamer-plugins-good-${V}
PKGNAME-aalib = gstreamer-aalib-${V}
PKGNAME-dv = gstreamer-dv-${V}
PKGNAME-caca = gstreamer-libcaca-${V}
REVISION-main = 3
REVISION-aalib = 2
REVISION-dv = 2
REVISION-caca = 2
EPOCH-main = 0
MULTI_PACKAGES = -main -aalib \
@ -45,7 +39,7 @@ REGRESS_DEPENDS += ${BASE_PKGPATH},${i}
RUN_DEPENDS = ${BUILD_PKGPATH}
WANTLIB = glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
pcre xml2 m z gstreamer-0.10 gstbase-0.10 ffi
LIB_DEPENDS = $P/core>=0.10.30
LIB_DEPENDS = $P/core>=0.10.36
WANTLIB-main = ${WANTLIB} ${MODGCONF2_WANTLIB} gdk_pixbuf-2.0 \
ICE SM X11 Xdamage Xext Xfixes sndio ossaudio \
@ -81,7 +75,7 @@ WANTLIB-aalib= ${WANTLIB} \
LIB_DEPENDS-aalib = ${LIB_DEPENDS} \
graphics/aalib
WANTLIB-dv = ${WANTLIB} dv gstaudio-0.10 gstinterfaces-0.10
WANTLIB-dv = ${WANTLIB} dv gstaudio-0.10 gstinterfaces-0.10 gstpbutils-0.10
LIB_DEPENDS-dv = ${LIB_DEPENDS} \
multimedia/libdv \
${P}/plugins-base

View File

@ -1,5 +1,5 @@
MD5 (gst-plugins-good-0.10.30.tar.bz2) = Yv16PvGHxPmbPXw1LVja6Q==
RMD160 (gst-plugins-good-0.10.30.tar.bz2) = 45VV3o76h6+XZMrTLxHgCVToKpE=
SHA1 (gst-plugins-good-0.10.30.tar.bz2) = nHinUbsvIK1Qodr2hg4AmOBJX1o=
SHA256 (gst-plugins-good-0.10.30.tar.bz2) = sSy6kLJ9hCPNCoCJOQmNGds5ls+5v1KFB8YyF4LglfY=
SIZE (gst-plugins-good-0.10.30.tar.bz2) = 3361361
MD5 (gst-plugins-good-0.10.31.tar.bz2) = JPmKKUorUh4bKUEr2tri5g==
RMD160 (gst-plugins-good-0.10.31.tar.bz2) = 2f7ZV7om0FX3vMuQeb1D+q4Vt+U=
SHA1 (gst-plugins-good-0.10.31.tar.bz2) = tF/AGxM/wjYX+lAd2TB6kPRns5Y=
SHA256 (gst-plugins-good-0.10.31.tar.bz2) = fieEDkCnky7y3AMtcgH59Br8rwtDfa9dHUTcltnjWsY=
SIZE (gst-plugins-good-0.10.31.tar.bz2) = 3390378

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.17 2012/01/25 14:06:27 ajacoutot Exp $
--- configure.ac.orig Wed Jun 15 18:46:51 2011
+++ configure.ac Wed Jan 25 05:45:27 2012
@@ -515,6 +515,8 @@ AG_GST_CHECK_FEATURE(GST_V4L2, [Video 4 Linux 2], v4l2
$OpenBSD: patch-configure_ac,v 1.18 2012/02/21 08:46:08 ajacoutot Exp $
--- configure.ac.orig Tue Feb 21 00:26:32 2012
+++ configure.ac Tue Feb 21 09:16:15 2012
@@ -516,6 +516,8 @@ AG_GST_CHECK_FEATURE(GST_V4L2, [Video 4 Linux 2], v4l2
#ifdef __sun /* Solaris */
#include <sys/types.h>
#include <sys/videodev2.h>
@ -10,7 +10,7 @@ $OpenBSD: patch-configure_ac,v 1.17 2012/01/25 14:06:27 ajacoutot Exp $
#else /* Linux */
#include <linux/types.h>
#define _LINUX_TIME_H
@@ -556,6 +558,8 @@ return 0;
@@ -557,6 +559,8 @@ return 0;
#ifdef __sun /* Solaris */
#include <sys/types.h>
#include <sys/videodev2.h>
@ -19,8 +19,8 @@ $OpenBSD: patch-configure_ac,v 1.17 2012/01/25 14:06:27 ajacoutot Exp $
#else /* Linux */
#include <linux/types.h>
#define _LINUX_TIME_H
@@ -933,6 +937,21 @@ AG_GST_CHECK_FEATURE(SHOUT2, [Shoutcast/Icecast client
fi
@@ -903,6 +907,21 @@ AG_GST_CHECK_FEATURE(SHOUT2, [Shoutcast/Icecast client
AG_GST_PKG_CHECK_MODULES(SHOUT2, shout >= 2.0)
])
+dnl *** sndio ***
@ -41,7 +41,7 @@ $OpenBSD: patch-configure_ac,v 1.17 2012/01/25 14:06:27 ajacoutot Exp $
dnl *** soup ***
translit(dnm, m, l) AM_CONDITIONAL(USE_SOUP, true)
AG_GST_CHECK_FEATURE(SOUP, [soup http client plugin (2.4)], souphttpsrc, [
@@ -1072,6 +1091,7 @@ AM_CONDITIONAL(USE_OSX_AUDIO, false)
@@ -1042,6 +1061,7 @@ AM_CONDITIONAL(USE_OSX_AUDIO, false)
AM_CONDITIONAL(USE_OSX_VIDEO, false)
AM_CONDITIONAL(USE_PULSE, false)
AM_CONDITIONAL(USE_SHOUT2, false)
@ -49,7 +49,7 @@ $OpenBSD: patch-configure_ac,v 1.17 2012/01/25 14:06:27 ajacoutot Exp $
AM_CONDITIONAL(USE_SOUP, false)
AM_CONDITIONAL(USE_SPEEX, false)
AM_CONDITIONAL(USE_SUNAUDIO, false)
@@ -1203,6 +1223,7 @@ ext/libpng/Makefile
@@ -1173,6 +1193,7 @@ ext/libpng/Makefile
ext/pulse/Makefile
ext/raw1394/Makefile
ext/shout2/Makefile

View File

@ -1,18 +0,0 @@
$OpenBSD: patch-gst_goom_plugin_info_c,v 1.2 2011/07/17 06:44:25 ajacoutot Exp $
From df3cee6606bed13d2edc8480ed244d480ab4790c Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@openbsd.org>
Date: Sat, 16 Jul 2011 22:47:50 +0000
Subject: goom: fix build on PPC on openbsd
--- gst/goom/plugin_info.c.orig Tue Jun 14 01:24:11 2011
+++ gst/goom/plugin_info.c Sun Jul 17 08:43:58 2011
@@ -35,8 +35,6 @@
#if defined (HAVE_CPU_PPC64) || defined (HAVE_CPU_PPC)
-#include <sys/types.h>
-#include <sys/sysctl.h>
#include "ppc_zoom_ultimate.h"
#include "ppc_drawings.h"
#endif /* HAVE_CPU_PPC64 || HAVE_CPU_PPC */

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-gst_udp_gstmultiudpsink_c,v 1.1 2009/11/29 09:17:38 ajacoutot Exp $
--- gst/udp/gstmultiudpsink.c.orig Mon Nov 23 19:34:37 2009
+++ gst/udp/gstmultiudpsink.c Mon Nov 23 19:35:13 2009
@@ -41,6 +41,11 @@
#include <errno.h>
#include <string.h>
$OpenBSD: patch-gst_udp_gstmultiudpsink_c,v 1.2 2012/02/21 08:46:08 ajacoutot Exp $
--- gst/udp/gstmultiudpsink.c.orig Thu Feb 16 00:48:07 2012
+++ gst/udp/gstmultiudpsink.c Tue Feb 21 09:16:15 2012
@@ -43,6 +43,11 @@
#include "gst/glib-compat-private.h"
+// iovec
+#ifdef __OpenBSD__

View File

@ -1,7 +1,10 @@
$OpenBSD: patch-sys_v4l2_gstv4l2object_c,v 1.4 2011/05/15 08:32:09 ajacoutot Exp $
--- sys/v4l2/gstv4l2object.c.orig Tue Mar 8 12:34:55 2011
+++ sys/v4l2/gstv4l2object.c Sun May 15 01:29:56 2011
@@ -1530,8 +1530,8 @@ gst_v4l2_object_probe_caps_for_format_and_size (GstV4l
$OpenBSD: patch-sys_v4l2_gstv4l2object_c,v 1.5 2012/02/21 08:46:08 ajacoutot Exp $
No more anonymous unions in video(4).
--- sys/v4l2/gstv4l2object.c.orig Fri Dec 30 14:59:13 2011
+++ sys/v4l2/gstv4l2object.c Tue Feb 21 09:20:10 2012
@@ -1588,8 +1588,8 @@ gst_v4l2_object_probe_caps_for_format_and_size (GstV4l
g_value_init (&rate, GST_TYPE_FRACTION);
do {
@ -12,7 +15,7 @@ $OpenBSD: patch-sys_v4l2_gstv4l2object_c,v 1.4 2011/05/15 08:32:09 ajacoutot Exp
if (num > G_MAXINT || denom > G_MAXINT) {
/* let us hope we don't get here... */
@@ -1563,8 +1563,8 @@ gst_v4l2_object_probe_caps_for_format_and_size (GstV4l
@@ -1621,8 +1621,8 @@ gst_v4l2_object_probe_caps_for_format_and_size (GstV4l
g_value_init (&max, GST_TYPE_FRACTION);
/* get the min */
@ -23,7 +26,7 @@ $OpenBSD: patch-sys_v4l2_gstv4l2object_c,v 1.4 2011/05/15 08:32:09 ajacoutot Exp
if (minnum > G_MAXINT || mindenom > G_MAXINT) {
minnum >>= 1;
mindenom >>= 1;
@@ -1574,8 +1574,8 @@ gst_v4l2_object_probe_caps_for_format_and_size (GstV4l
@@ -1632,8 +1632,8 @@ gst_v4l2_object_probe_caps_for_format_and_size (GstV4l
gst_value_set_fraction (&min, minnum, mindenom);
/* get the max */
@ -34,7 +37,7 @@ $OpenBSD: patch-sys_v4l2_gstv4l2object_c,v 1.4 2011/05/15 08:32:09 ajacoutot Exp
if (maxnum > G_MAXINT || maxdenom > G_MAXINT) {
maxnum >>= 1;
maxdenom >>= 1;
@@ -1586,8 +1586,8 @@ gst_v4l2_object_probe_caps_for_format_and_size (GstV4l
@@ -1644,8 +1644,8 @@ gst_v4l2_object_probe_caps_for_format_and_size (GstV4l
gst_value_set_fraction (&max, maxnum, maxdenom);
/* get the step */
@ -45,7 +48,7 @@ $OpenBSD: patch-sys_v4l2_gstv4l2object_c,v 1.4 2011/05/15 08:32:09 ajacoutot Exp
if (num > G_MAXINT || denom > G_MAXINT) {
num >>= 1;
denom >>= 1;
@@ -1638,15 +1638,15 @@ gst_v4l2_object_probe_caps_for_format_and_size (GstV4l
@@ -1696,15 +1696,15 @@ gst_v4l2_object_probe_caps_for_format_and_size (GstV4l
g_value_init (&rates, GST_TYPE_FRACTION_RANGE);
@ -65,7 +68,7 @@ $OpenBSD: patch-sys_v4l2_gstv4l2object_c,v 1.4 2011/05/15 08:32:09 ajacoutot Exp
if (maxnum > G_MAXINT || maxdenom > G_MAXINT) {
maxnum >>= 1;
maxdenom >>= 1;
@@ -1741,10 +1741,10 @@ gst_v4l2_object_probe_caps_for_format (GstV4l2Object *
@@ -1800,10 +1800,10 @@ gst_v4l2_object_probe_caps_for_format (GstV4l2Object *
if (size.type == V4L2_FRMSIZE_TYPE_DISCRETE) {
do {
GST_LOG_OBJECT (v4l2object->element, "got discrete frame size %dx%d",
@ -79,7 +82,7 @@ $OpenBSD: patch-sys_v4l2_gstv4l2object_c,v 1.4 2011/05/15 08:32:09 ajacoutot Exp
if (w && h) {
tmp =
@@ -1762,21 +1762,21 @@ gst_v4l2_object_probe_caps_for_format (GstV4l2Object *
@@ -1821,21 +1821,21 @@ gst_v4l2_object_probe_caps_for_format (GstV4l2Object *
} else if (size.type == V4L2_FRMSIZE_TYPE_STEPWISE) {
GST_DEBUG_OBJECT (v4l2object->element, "we have stepwise frame sizes:");
GST_DEBUG_OBJECT (v4l2object->element, "min width: %d",
@ -102,15 +105,15 @@ $OpenBSD: patch-sys_v4l2_gstv4l2object_c,v 1.4 2011/05/15 08:32:09 ajacoutot Exp
+ size.un.stepwise.step_height);
- for (w = size.stepwise.min_width, h = size.stepwise.min_height;
- w < size.stepwise.max_width && h < size.stepwise.max_height;
- w <= size.stepwise.max_width && h <= size.stepwise.max_height;
- w += size.stepwise.step_width, h += size.stepwise.step_height) {
+ for (w = size.un.stepwise.min_width, h = size.un.stepwise.min_height;
+ w < size.un.stepwise.max_width && h < size.un.stepwise.max_height;
+ w <= size.un.stepwise.max_width && h <= size.un.stepwise.max_height;
+ w += size.un.stepwise.step_width, h += size.un.stepwise.step_height) {
if (w == 0 || h == 0)
continue;
@@ -1794,18 +1794,18 @@ gst_v4l2_object_probe_caps_for_format (GstV4l2Object *
@@ -1853,18 +1853,18 @@ gst_v4l2_object_probe_caps_for_format (GstV4l2Object *
GST_DEBUG_OBJECT (v4l2object->element, "we have continuous frame sizes:");
GST_DEBUG_OBJECT (v4l2object->element, "min width: %d",

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.27 2012/01/25 14:06:27 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.28 2012/02/21 08:46:08 ajacoutot Exp $
@conflict gstreamer-plugins-bad-<0.10.22
@conflict gstreamer-jpeg-*
@conflict gstreamer-png-*
@ -157,6 +157,7 @@ share/locale/da/LC_MESSAGES/gst-plugins-good-${VERSION}.mo
share/locale/de/LC_MESSAGES/gst-plugins-good-${VERSION}.mo
share/locale/el/LC_MESSAGES/gst-plugins-good-${VERSION}.mo
share/locale/en_GB/LC_MESSAGES/gst-plugins-good-${VERSION}.mo
share/locale/eo/LC_MESSAGES/gst-plugins-good-${VERSION}.mo
share/locale/es/LC_MESSAGES/gst-plugins-good-${VERSION}.mo
share/locale/eu/LC_MESSAGES/gst-plugins-good-${VERSION}.mo
share/locale/fi/LC_MESSAGES/gst-plugins-good-${VERSION}.mo