[arch-commits] Commit in gstreamer0.10-bad-plugins/trunk (3 files)
Jan de Groot
jgc at archlinux.org
Sun Nov 30 13:42:06 UTC 2008
Date: Sunday, November 30, 2008 @ 08:42:06
Author: jgc
Revision: 19838
upgpkg: gstreamer0.10-bad-plugins 0.10.9-1
Modified:
gstreamer0.10-bad-plugins/trunk/PKGBUILD
Deleted:
gstreamer0.10-bad-plugins/trunk/dc1394-2.0.patch
gstreamer0.10-bad-plugins/trunk/gcc-4.3.patch
------------------+
PKGBUILD | 6 -
dc1394-2.0.patch | 238 -----------------------------------------------------
gcc-4.3.patch | 11 --
3 files changed, 3 insertions(+), 252 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-11-30 13:41:39 UTC (rev 19837)
+++ PKGBUILD 2008-11-30 13:42:06 UTC (rev 19838)
@@ -2,12 +2,12 @@
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=gstreamer0.10-bad-plugins
-pkgver=0.10.8
+pkgver=0.10.9
pkgrel=1
pkgdesc="GStreamer Multimedia Framework Bad Plugins (gst-plugins-bad)"
arch=(i686 x86_64)
license=('LGPL' 'GPL')
-depends=('gstreamer0.10-bad>=0.10.8' 'xvidcore' 'libdca' 'bzip2' 'libdc1394>=2.0.1' 'exempi' 'jack-audio-connection-kit' 'neon>=0.27.2' 'faac>=1.26' 'libexif' 'musicbrainz>=2.1.5' 'faad2>=2.6.1' 'libmms' 'x264>=20080625' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav>=0.1.10')
+depends=("gstreamer0.10-bad>=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394>=2.0.1' 'exempi' 'jack-audio-connection-kit' 'neon>=0.27.2' 'faac>=1.26' 'libexif' 'musicbrainz>=2.1.5' 'faad2>=2.6.1' 'libmms' 'x264>=20080625' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav>=0.1.10')
makedepends=('pkgconfig' 'ladspa')
provides=("gstreamer0.10-cdaudio=${pkgver}" "gstreamer0.10-musicbrainz=${pkgver}" "gstreamer0.10-sndfile=${pkgver}" "gstreamer0.10-mpeg2enc=${pkgver}" "gstreamer0.10-bz2=${pkgver}" "gstreamer0.10-sdl=${pkgver}" "gstreamer0.10-faac=${pkgver}" "gstreamer0.10-alsaspdif=${pkgver}" "gstreamer0.10-xvid=${pkgver}" "gstreamer0.10-faad=${pkgver}" "gstreamer0.10-musepack=${pkgver}" "gstreamer0.10-mms=${pkgver}" "gstreamer0.10-x264=${pkgver}" "gstreamer0.10-neon=${pkgver}" "gstreamer0.10-ladspa=${pkgver}" "gstreamer0.10-dts=${pkgver}" "gstreamer0.10-jack=${pkgver}" "gstreamer0.10-metadata=${pkgver}" "gst-plugins-bad=${pkgver}")
conflicts=('gstreamer0.10-cdaudio' 'gstreamer0.10-musicbrainz' 'gstreamer0.10-sndfile' 'gstreamer0.10-mpeg2enc' 'gstreamer0.10-bz2' 'gstreamer0.10-sdl' 'gstreamer0.10-faac' 'gstreamer0.10-alsaspdif' 'gstreamer0.10-xvid' 'gstreamer0.10-faad' 'gstreamer0.10-musepack' 'gstreamer0.10-mms' 'gstreamer0.10-x264' 'gstreamer0.10-neon' 'gstreamer0.10-ladspa' 'gstreamer0.10-dts' 'gstreamer0.10-jack' 'gstreamer0.10-metadata')
@@ -17,7 +17,7 @@
_relname=gst-plugins-bad
groups=('gstreamer0.10-plugins')
source=(${url}/src/${_relname}/${_relname}-${pkgver}.tar.bz2)
-md5sums=('ddc8f92dab0081f131650ad6c95908b8')
+md5sums=('ff555a86e74a9249e56b43405c8df3e4')
build() {
cd "${srcdir}/${_relname}-${pkgver}"
Deleted: dc1394-2.0.patch
===================================================================
--- dc1394-2.0.patch 2008-11-30 13:41:39 UTC (rev 19837)
+++ dc1394-2.0.patch 2008-11-30 13:42:06 UTC (rev 19838)
@@ -1,238 +0,0 @@
---- configure.ac 2008/02/25 06:29:12 1.832
-+++ configure.ac 2008/02/26 05:54:25 1.833
-@@ -361,7 +361,7 @@
- dnl *** dc1394 ***
- translit(dnm, m, l) AM_CONDITIONAL(USE_DC1394, true)
- AG_GST_CHECK_FEATURE(DC1394, [libdc1394], dc1394, [
-- PKG_CHECK_MODULES(LIBDC1394, libdc1394-2 == 2.0.0-rc5, HAVE_DC1394="yes", [
-+ PKG_CHECK_MODULES(LIBDC1394, libdc1394-2 >= 2.0.0, HAVE_DC1394="yes", [
- HAVE_DC1394="no"
- AC_MSG_RESULT(no)
- ])
---- ext/dc1394/gstdc1394.c 2008/02/07 12:05:44 1.7
-+++ ext/dc1394/gstdc1394.c 2008/02/26 05:54:26 1.8
-@@ -421,6 +421,7 @@
- switch (transition) {
- case GST_STATE_CHANGE_NULL_TO_READY:
- GST_LOG_OBJECT (src, "State change null to ready");
-+ src->dc1394 = dc1394_new ();
- break;
- case GST_STATE_CHANGE_READY_TO_PAUSED:
- GST_LOG_OBJECT (src, "State ready to paused");
-@@ -468,7 +469,7 @@
- if (src->camera && !gst_dc1394_change_camera_transmission (src, FALSE)) {
-
- if (src->camera) {
-- dc1394_free_camera (src->camera);
-+ dc1394_camera_free (src->camera);
- }
- src->camera = NULL;
-
-@@ -484,10 +485,15 @@
- case GST_STATE_CHANGE_READY_TO_NULL:
- GST_LOG_OBJECT (src, "State change ready to null");
- if (src->camera) {
-- dc1394_free_camera (src->camera);
-+ dc1394_camera_free (src->camera);
- }
- src->camera = NULL;
-
-+ if (src->dc1394) {
-+ dc1394_free (src->dc1394);
-+ }
-+ src->dc1394 = NULL;
-+
- if (src->caps) {
- gst_caps_unref (src->caps);
- src->caps = NULL;
-@@ -838,9 +844,8 @@
- {
-
- dc1394camera_t *camera = NULL;
-- dc1394camera_t **cameras = NULL;
-+ dc1394camera_list_t *cameras = NULL;
- dc1394error_t camerr;
-- guint numCameras;
- gint i, j;
- dc1394video_modes_t modes;
- dc1394framerates_t framerates;
-@@ -848,42 +853,33 @@
-
- gcaps = gst_caps_new_empty ();
-
-- camerr = dc1394_find_cameras (&cameras, &numCameras);
-+ camerr = dc1394_camera_enumerate (src->dc1394, &cameras);
-
-- if (camerr != DC1394_SUCCESS) {
-- if (camerr == DC1394_NO_CAMERA) {
-- GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND, ("There were no cameras"),
-- ("There were no cameras"));
-- } else {
-- GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND,
-- ("Can't find cameras error : %d", camerr),
-- ("Can't find cameras error : %d", camerr));
-- }
-+ if (camerr != DC1394_SUCCESS || cameras == NULL) {
-+ GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND,
-+ ("Can't find cameras error : %d", camerr),
-+ ("Can't find cameras error : %d", camerr));
- goto error;
- }
-
-- if (src->camnum > (numCameras - 1)) {
-+ if (cameras->num == 0) {
-+ GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND, ("There were no cameras"),
-+ ("There were no cameras"));
-+ goto error;
-+ }
-+
-+ if (src->camnum > (cameras->num - 1)) {
- GST_ELEMENT_ERROR (src, RESOURCE, FAILED, ("Invalid camera number"),
- ("Invalid camera number %d", src->camnum));
--
-- for (i = 0; i < numCameras; i++) {
-- if (i != src->camnum) {
-- dc1394_free_camera (cameras[i]);
-- }
-- }
- goto error;
- }
-
-- camera = cameras[src->camnum];
--
-- // free the other cameras
-- for (i = 0; i < numCameras; i++) {
-- if (i != src->camnum) {
-- dc1394_free_camera (cameras[i]);
-- }
-- }
-+ camera =
-+ dc1394_camera_new_unit (src->dc1394, cameras->ids[src->camnum].guid,
-+ cameras->ids[src->camnum].unit);
-
-- free (cameras);
-+ dc1394_camera_free_list (cameras);
-+ cameras = NULL;
-
- camerr = dc1394_video_get_supported_modes (camera, &modes);
- if (camerr != DC1394_SUCCESS) {
-@@ -897,7 +893,7 @@
-
- if (m < DC1394_VIDEO_MODE_EXIF) {
-
-- GstStructure *gs = gst_structure_empty_new ("");
-+ GstStructure *gs = gst_structure_empty_new ("video");
-
- gst_structure_set (gs, "vmode", G_TYPE_INT, m, NULL);
-
-@@ -916,7 +912,7 @@
- } else {
- // FORMAT 7
- guint maxx, maxy;
-- GstStructure *gs = gst_structure_empty_new ("");
-+ GstStructure *gs = gst_structure_empty_new ("video");
- dc1394color_codings_t colormodes;
- guint xunit, yunit;
-
-@@ -972,7 +968,7 @@
- }
-
- if (camera) {
-- dc1394_free_camera (camera);
-+ dc1394_camera_free (camera);
- }
-
- return gcaps;
-@@ -983,8 +979,13 @@
- gst_caps_unref (gcaps);
- }
-
-+ if (cameras) {
-+ dc1394_camera_free_list (cameras);
-+ cameras = NULL;
-+ }
-+
- if (camera) {
-- dc1394_free_camera (camera);
-+ dc1394_camera_free (camera);
- camera = NULL;
- }
-
-@@ -1023,24 +1024,22 @@
- static gboolean
- gst_dc1394_open_cam_with_best_caps (GstDc1394 * src)
- {
-- dc1394camera_t **cameras = NULL;
-- guint numCameras;
-- gint i;
-+ dc1394camera_list_t *cameras = NULL;
- gint err;
- int framerateconst;
-
- GST_LOG_OBJECT (src, "Opening the camera!!!");
-
-
-- if (dc1394_find_cameras (&cameras, &numCameras) != DC1394_SUCCESS) {
-+ if (dc1394_camera_enumerate (src->dc1394, &cameras) != DC1394_SUCCESS) {
- GST_ELEMENT_ERROR (src, RESOURCE, FAILED, ("Can't find cameras"),
- ("Can't find cameras"));
- goto error;
- }
-
-- GST_LOG_OBJECT (src, "Found %d cameras", numCameras);
-+ GST_LOG_OBJECT (src, "Found %d cameras", cameras->num);
-
-- if (src->camnum > (numCameras - 1)) {
-+ if (src->camnum > (cameras->num - 1)) {
- GST_ELEMENT_ERROR (src, RESOURCE, FAILED, ("Invalid camera number"),
- ("Invalid camera number"));
- goto error;
-@@ -1048,15 +1047,12 @@
-
- GST_LOG_OBJECT (src, "Opening camera : %d", src->camnum);
-
-- src->camera = cameras[src->camnum];
--
-- // free the other cameras
-- for (i = 0; i < numCameras; i++) {
-- if (i != src->camnum)
-- dc1394_free_camera (cameras[i]);
-- }
-+ src->camera =
-+ dc1394_camera_new_unit (src->dc1394, cameras->ids[src->camnum].guid,
-+ cameras->ids[src->camnum].unit);
-
-- free (cameras);
-+ dc1394_camera_free_list (cameras);
-+ cameras = NULL;
-
- // figure out mode
- framerateconst = gst_dc1394_framerate_frac_to_const (src->rate_numerator,
-@@ -1121,7 +1117,7 @@
- "Trying to cleanup the iso_channels_and_bandwidth and retrying");
-
- // try to cleanup the bandwidth and retry
-- err = dc1394_cleanup_iso_channels_and_bandwidth (src->camera);
-+ err = dc1394_iso_release_all (src->camera);
- if (err != DC1394_SUCCESS) {
- GST_ELEMENT_ERROR (src, RESOURCE, FAILED,
- ("Could not cleanup bandwidth"), ("Could not cleanup bandwidth"));
-@@ -1152,7 +1148,7 @@
- error:
-
- if (src->camera) {
-- dc1394_free_camera (src->camera);
-+ dc1394_camera_free (src->camera);
- src->camera = NULL;
- }
-
---- ext/dc1394/gstdc1394.h 2007/06/29 13:03:27 1.1
-+++ ext/dc1394/gstdc1394.h 2008/02/26 05:54:26 1.2
-@@ -63,6 +63,7 @@
- gint camnum;
- gint bufsize;
-
-+ dc1394_t * dc1394;
- dc1394camera_t * camera;
-
- GstCaps *caps;
Deleted: gcc-4.3.patch
===================================================================
--- gcc-4.3.patch 2008-11-30 13:41:39 UTC (rev 19837)
+++ gcc-4.3.patch 2008-11-30 13:42:06 UTC (rev 19838)
@@ -1,11 +0,0 @@
---- ext/mpeg2enc/gstmpeg2encpicturereader.cc.orig 2008-03-17 22:49:21.000000000 +0000
-+++ ext/mpeg2enc/gstmpeg2encpicturereader.cc 2008-03-17 22:49:54.000000000 +0000
-@@ -32,6 +32,8 @@
- #include "gstmpeg2enc.hh"
- #include "gstmpeg2encpicturereader.hh"
-
-+#include <cstring>
-+
- /*
- * Class init stuff.
- */
More information about the arch-commits
mailing list