Update to gstreamer-plugins-good-0.10.22.

This commit is contained in:
ajacoutot 2010-04-28 08:03:23 +00:00
parent 5fb6d674be
commit 18f38d7de1
9 changed files with 54 additions and 63 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.52 2010/04/06 09:21:21 kili Exp $
# $OpenBSD: Makefile,v 1.53 2010/04/28 08:03:23 ajacoutot Exp $
COMMENT-main = good elements for GStreamer
COMMENT-aalib = aalib element for GStreamer (good)
@ -7,10 +7,10 @@ COMMENT-gdk = gdk pixbuf element for GStreamer (good)
COMMENT-caca = libcaca element for GStreamer (good)
COMMENT-soup = libsoup element for GStreamer (good)
V = 0.10.21
V = 0.10.22
DISTNAME = gst-plugins-good-$V
PKGNAME-main = gstreamer-plugins-good-${V}p0v0
PKGNAME-main = gstreamer-plugins-good-${V}v0
PKGNAME-aalib = gstreamer-aalib-${V}
PKGNAME-dv = gstreamer-dv-${V}
PKGNAME-gdk = gstreamer-gdk-pixbuf-${V}
@ -36,11 +36,11 @@ 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
LIB_DEPENDS = gstreamer-0.10,gstbase-0.10:gstreamer->=0.10:$P/core
LIB_DEPENDS = gstreamer-0.10,gstbase-0.10:gstreamer->=0.10.29:$P/core
WANTLIB-main = ${WANTLIB} \
ICE SM X11 Xdamage Xext Xfixes sndio ossaudio \
gstcontroller-0.10 Xau Xdmcp \
gstcontroller-0.10 Xau Xdmcp xcb-render xcb-render-util \
pthread-stubs xcb Xrender cairo expat \
fontconfig freetype glitz ogg pixman-1 png \
stdc++ theora vorbis ORBit-2 dbus-1 dbus-glib-1
@ -83,7 +83,7 @@ LIB_DEPENDS-caca = ${LIB_DEPENDS} \
WANTLIB-soup = ${WANTLIB} \
ORBit-2 dbus-1 dbus-glib-1 gcrypt gio-2.0 \
gnome-keyring gnutls gpg-error gsttag-0.10 proxy \
sqlite3 tasn1
sqlite3 tasn1 eggdbus-1
LIB_DEPENDS-soup = ${LIB_DEPENDS} \
${MODGCONF2_LIB_DEPENDS} \
soup-2.4,soup-gnome-2.4::devel/libsoup,-gnome

View File

@ -1,5 +1,5 @@
MD5 (gst-plugins-good-0.10.21.tar.bz2) = m8XJs5Dtu5a9pC/FU+rlrg==
RMD160 (gst-plugins-good-0.10.21.tar.bz2) = cc/r6WVAn/xtbTpbCOOSP8lm//o=
SHA1 (gst-plugins-good-0.10.21.tar.bz2) = 7WGYJPXKRZK/4rL2351T8Iv182A=
SHA256 (gst-plugins-good-0.10.21.tar.bz2) = JERaHPVjAqtK1fVgVdXD2BxwS4+faHX+eKJdT3JxbSI=
SIZE (gst-plugins-good-0.10.21.tar.bz2) = 2675836
MD5 (gst-plugins-good-0.10.22.tar.bz2) = SASqoyBEr5hGkUMEmRzJ1g==
RMD160 (gst-plugins-good-0.10.22.tar.bz2) = CHhPXFVIr2Mo0MiYvQaxbC+CRX0=
SHA1 (gst-plugins-good-0.10.22.tar.bz2) = OB82A6FwSqNil5N4CCIPuMbBAvQ=
SHA256 (gst-plugins-good-0.10.22.tar.bz2) = ibpQ4OO3NVvXXJsKYIZqZ7m9HeOEWOVApXhTmYED1p8=
SIZE (gst-plugins-good-0.10.22.tar.bz2) = 2701164

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.9 2010/03/21 11:24:46 ajacoutot Exp $
--- configure.ac.orig Sat Mar 6 01:27:38 2010
+++ configure.ac Mon Mar 8 12:23:40 2010
@@ -457,6 +457,8 @@ AG_GST_CHECK_FEATURE(GST_V4L2, [Video 4 Linux 2], v4l2
$OpenBSD: patch-configure_ac,v 1.10 2010/04/28 08:03:23 ajacoutot Exp $
--- configure.ac.orig Wed Apr 28 03:48:35 2010
+++ configure.ac Wed Apr 28 09:06:22 2010
@@ -471,6 +471,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.9 2010/03/21 11:24:46 ajacoutot Exp $
#else /* Linux */
#include <linux/types.h>
#define _LINUX_TIME_H
@@ -498,6 +500,8 @@ return 0;
@@ -512,6 +514,8 @@ return 0;
#ifdef __sun /* Solaris */
#include <sys/types.h>
#include <sys/videodev2.h>
@ -19,7 +19,7 @@ $OpenBSD: patch-configure_ac,v 1.9 2010/03/21 11:24:46 ajacoutot Exp $
#else /* Linux */
#include <linux/types.h>
#define _LINUX_TIME_H
@@ -682,6 +686,21 @@ AG_GST_CHECK_FEATURE(ESD, [ESounD sound daemon], esdsi
@@ -696,6 +700,21 @@ AG_GST_CHECK_FEATURE(ESD, [ESounD sound daemon], esdsi
fi
])
@ -41,16 +41,7 @@ $OpenBSD: patch-configure_ac,v 1.9 2010/03/21 11:24:46 ajacoutot Exp $
dnl *** FLAC ***
translit(dnm, m, l) AM_CONDITIONAL(USE_FLAC, true)
AG_GST_CHECK_FEATURE(FLAC, [FLAC lossless audio], flac, [
@@ -750,7 +769,7 @@ AG_GST_CHECK_FEATURE(LIBDV, [libdv DV demuxer/decoder]
dnl *** libpng ***
translit(dnm, m, l) AM_CONDITIONAL(USE_LIBPNG, true)
AG_GST_CHECK_FEATURE(LIBPNG, [Portable Network Graphics library], png, [
- AG_GST_PKG_CHECK_MODULES(LIBPNG, libpng12)
+ AG_GST_PKG_CHECK_MODULES(LIBPNG, libpng)
])
dnl *** pulseaudio ***
@@ -963,6 +982,7 @@ AM_CONDITIONAL(USE_CAIRO, false)
@@ -977,6 +996,7 @@ AM_CONDITIONAL(USE_CAIRO, false)
AM_CONDITIONAL(USE_DIRECTSOUND, false)
AM_CONDITIONAL(USE_DV1394, false)
AM_CONDITIONAL(USE_ESD, false)
@ -58,7 +49,7 @@ $OpenBSD: patch-configure_ac,v 1.9 2010/03/21 11:24:46 ajacoutot Exp $
AM_CONDITIONAL(USE_FLAC, false)
AM_CONDITIONAL(USE_GCONF, false)
AM_CONDITIONAL(USE_GCONFTOOL, false)
@@ -1100,6 +1120,7 @@ ext/annodex/Makefile
@@ -1111,6 +1131,7 @@ ext/annodex/Makefile
ext/cairo/Makefile
ext/dv/Makefile
ext/esd/Makefile

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-sys_oss_Makefile_am,v 1.2 2009/11/29 09:17:38 ajacoutot Exp $
--- sys/oss/Makefile.am.orig Fri Feb 6 12:34:12 2009
+++ sys/oss/Makefile.am Mon Nov 23 18:28:12 2009
@@ -13,7 +13,8 @@ libgstossaudio_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) \
$OpenBSD: patch-sys_oss_Makefile_am,v 1.3 2010/04/28 08:03:23 ajacoutot Exp $
--- sys/oss/Makefile.am.orig Thu Mar 18 22:06:25 2010
+++ sys/oss/Makefile.am Wed Apr 28 09:07:15 2010
@@ -14,7 +14,8 @@ libgstossaudio_la_LIBADD = \
-lgstinterfaces-$(GST_MAJORMINOR) \
-lgstaudio-$(GST_MAJORMINOR) \
$(GST_BASE_LIBS) \
- $(GST_LIBS)
+ $(GST_LIBS) \
+ -lossaudio

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sys_oss_gstosshelper_c,v 1.3 2008/06/14 17:17:26 deanna Exp $
--- sys/oss/gstosshelper.c.orig Tue Apr 8 15:49:34 2008
+++ sys/oss/gstosshelper.c Fri Jun 13 11:06:46 2008
@@ -227,6 +227,7 @@ gst_oss_helper_rate_probe_check (GstOssProbe * probe)
$OpenBSD: patch-sys_oss_gstosshelper_c,v 1.4 2010/04/28 08:03:23 ajacoutot Exp $
--- sys/oss/gstosshelper.c.orig Fri Apr 16 19:10:22 2010
+++ sys/oss/gstosshelper.c Wed Apr 28 09:06:23 2010
@@ -228,6 +228,7 @@ gst_oss_helper_rate_probe_check (GstOssProbe * probe)
int exact_rates = 0;
gboolean checking_exact_rates = TRUE;
int n_checks = 0;
@ -9,7 +9,7 @@ $OpenBSD: patch-sys_oss_gstosshelper_c,v 1.3 2008/06/14 17:17:26 deanna Exp $
gboolean result = TRUE;
ranges = g_queue_new ();
@@ -254,6 +255,12 @@ gst_oss_helper_rate_probe_check (GstOssProbe * probe)
@@ -255,6 +256,12 @@ gst_oss_helper_rate_probe_check (GstOssProbe * probe)
* driver is seriously buggy, and probably doesn't work with other
* media libraries/apps. */
probe->min = gst_oss_helper_rate_check_rate (probe, 8000);
@ -22,7 +22,7 @@ $OpenBSD: patch-sys_oss_gstosshelper_c,v 1.3 2008/06/14 17:17:26 deanna Exp $
probe->max = gst_oss_helper_rate_check_rate (probe, 48000);
}
if (probe->min == -1 || probe->max == -1) {
@@ -278,19 +285,15 @@ gst_oss_helper_rate_probe_check (GstOssProbe * probe)
@@ -279,19 +286,15 @@ gst_oss_helper_rate_probe_check (GstOssProbe * probe)
}
n_checks++;

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sys_oss_gstosssink_c,v 1.4 2009/11/29 09:17:38 ajacoutot Exp $
--- sys/oss/gstosssink.c.orig Tue May 12 02:00:06 2009
+++ sys/oss/gstosssink.c Mon Nov 23 18:28:12 2009
@@ -111,7 +111,7 @@ enum
$OpenBSD: patch-sys_oss_gstosssink_c,v 1.5 2010/04/28 08:03:23 ajacoutot Exp $
--- sys/oss/gstosssink.c.orig Thu Mar 18 18:55:13 2010
+++ sys/oss/gstosssink.c Wed Apr 28 09:06:23 2010
@@ -103,7 +103,7 @@ enum
LAST_SIGNAL
};
@ -10,7 +10,7 @@ $OpenBSD: patch-sys_oss_gstosssink_c,v 1.4 2009/11/29 09:17:38 ajacoutot Exp $
enum
{
PROP_0,
@@ -209,7 +209,7 @@ gst_oss_sink_class_init (GstOssSinkClass * klass)
@@ -205,7 +205,7 @@ gst_oss_sink_class_init (GstOssSinkClass * klass)
g_object_class_install_property (gobject_class, PROP_DEVICE,
g_param_spec_string ("device", "Device",

View File

@ -1,16 +1,16 @@
$OpenBSD: patch-sys_oss_gstosssrc_c,v 1.4 2009/11/29 09:17:38 ajacoutot Exp $
--- sys/oss/gstosssrc.c.orig Tue May 12 02:00:06 2009
+++ sys/oss/gstosssrc.c Mon Nov 23 18:28:12 2009
@@ -73,7 +73,7 @@ GST_ELEMENT_DETAILS ("Audio Source (OSS)",
"Capture from a sound card via OSS",
"Erik Walthinsen <omega@cse.ogi.edu>, " "Wim Taymans <wim@fluendo.com>");
$OpenBSD: patch-sys_oss_gstosssrc_c,v 1.5 2010/04/28 08:03:23 ajacoutot Exp $
--- sys/oss/gstosssrc.c.orig Thu Mar 18 18:55:13 2010
+++ sys/oss/gstosssrc.c Wed Apr 28 09:06:23 2010
@@ -67,7 +67,7 @@
GST_DEBUG_CATEGORY_EXTERN (oss_debug);
#define GST_CAT_DEFAULT oss_debug
-#define DEFAULT_DEVICE "/dev/dsp"
+#define DEFAULT_DEVICE "/dev/audio"
#define DEFAULT_DEVICE_NAME ""
enum
@@ -172,7 +172,7 @@ gst_oss_src_class_init (GstOssSrcClass * klass)
@@ -169,7 +169,7 @@ gst_oss_src_class_init (GstOssSrcClass * klass)
g_object_class_install_property (gobject_class, PROP_DEVICE,
g_param_spec_string ("device", "Device",

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-sys_sunaudio_gstsunaudiosink_c,v 1.5 2009/11/29 09:17:38 ajacoutot Exp $
--- sys/sunaudio/gstsunaudiosink.c.orig Tue May 12 02:00:07 2009
+++ sys/sunaudio/gstsunaudiosink.c Mon Nov 23 18:28:12 2009
$OpenBSD: patch-sys_sunaudio_gstsunaudiosink_c,v 1.6 2010/04/28 08:03:23 ajacoutot Exp $
--- sys/sunaudio/gstsunaudiosink.c.orig Thu Mar 18 18:55:13 2010
+++ sys/sunaudio/gstsunaudiosink.c Wed Apr 28 09:06:23 2010
@@ -41,7 +41,6 @@
#include <fcntl.h>
@ -9,7 +9,7 @@ $OpenBSD: patch-sys_sunaudio_gstsunaudiosink_c,v 1.5 2009/11/29 09:17:38 ajacout
#include <unistd.h>
#include <sys/mman.h>
@@ -316,13 +315,14 @@ gst_sunaudiosink_open (GstAudioSink * asink)
@@ -312,13 +311,14 @@ gst_sunaudiosink_open (GstAudioSink * asink)
sunaudiosink->info.monitor_gain);
GST_DEBUG_OBJECT (sunaudiosink, "output_muted %d",
sunaudiosink->info.output_muted);
@ -25,7 +25,7 @@ $OpenBSD: patch-sys_sunaudio_gstsunaudiosink_c,v 1.5 2009/11/29 09:17:38 ajacout
return TRUE;
open_failed:
@@ -617,7 +617,7 @@ gst_sunaudiosink_reset (GstAudioSink * asink)
@@ -613,7 +613,7 @@ gst_sunaudiosink_reset (GstAudioSink * asink)
}
/* Flush the audio */
@ -34,7 +34,7 @@ $OpenBSD: patch-sys_sunaudio_gstsunaudiosink_c,v 1.5 2009/11/29 09:17:38 ajacout
if (ret == -1) {
GST_ELEMENT_ERROR (sunaudiosink, RESOURCE, SETTINGS, (NULL), ("%s",
strerror (errno)));
@@ -632,7 +632,7 @@ gst_sunaudiosink_reset (GstAudioSink * asink)
@@ -628,7 +628,7 @@ gst_sunaudiosink_reset (GstAudioSink * asink)
g_cond_signal (sunaudiosink->sleep_cond);

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-sys_sunaudio_gstsunaudiosrc_c,v 1.5 2009/11/29 09:17:38 ajacoutot Exp $
--- sys/sunaudio/gstsunaudiosrc.c.orig Sat May 16 00:34:32 2009
+++ sys/sunaudio/gstsunaudiosrc.c Mon Nov 23 18:28:12 2009
$OpenBSD: patch-sys_sunaudio_gstsunaudiosrc_c,v 1.6 2010/04/28 08:03:23 ajacoutot Exp $
--- sys/sunaudio/gstsunaudiosrc.c.orig Thu Mar 18 18:55:13 2010
+++ sys/sunaudio/gstsunaudiosrc.c Wed Apr 28 09:06:23 2010
@@ -42,8 +42,6 @@
#include <fcntl.h>
#include <string.h>
@ -10,7 +10,7 @@ $OpenBSD: patch-sys_sunaudio_gstsunaudiosrc_c,v 1.5 2009/11/29 09:17:38 ajacouto
#include "gstsunaudiosrc.h"
@@ -266,12 +264,14 @@ gst_sunaudiosrc_open (GstAudioSrc * asrc)
@@ -263,12 +261,14 @@ gst_sunaudiosrc_open (GstAudioSrc * asrc)
sunaudiosrc->info.monitor_gain);
GST_DEBUG_OBJECT (sunaudiosrc, "output_muted %d",
sunaudiosrc->info.output_muted);
@ -25,7 +25,7 @@ $OpenBSD: patch-sys_sunaudio_gstsunaudiosrc_c,v 1.5 2009/11/29 09:17:38 ajacouto
if (!sunaudiosrc->mixer) {
const char *audiodev;
@@ -358,7 +358,7 @@ gst_sunaudiosrc_prepare (GstAudioSrc * asrc, GstRingBu
@@ -355,7 +355,7 @@ gst_sunaudiosrc_prepare (GstAudioSrc * asrc, GstRingBu
}
@ -34,7 +34,7 @@ $OpenBSD: patch-sys_sunaudio_gstsunaudiosrc_c,v 1.5 2009/11/29 09:17:38 ajacouto
return TRUE;
}
@@ -412,7 +412,7 @@ gst_sunaudiosrc_reset (GstAudioSrc * asrc)
@@ -409,7 +409,7 @@ gst_sunaudiosrc_reset (GstAudioSrc * asrc)
}
/* Flush the audio */