[arch-commits] Commit in gstreamer0.10-base-plugins/repos (3 files)
Jan de Groot
jgc at archlinux.org
Sun Jun 22 18:01:11 UTC 2008
Date: Sunday, June 22, 2008 @ 14:01:09
Author: jgc
Revision: 3415
Merged revisions 2379-3413 via svnmerge from
svn+ssh://svn.archlinux.org/home/svn-packages/gstreamer0.10-base-plugins/trunk
........
r3279 | jgc | 2008-06-21 21:36:42 +0000 (Sat, 21 Jun 2008) | 1 line
upgpkg: gstreamer0.10-base-plugins 0.10.20-1
........
Modified:
gstreamer0.10-base-plugins/repos/extra-x86_64/ (properties)
gstreamer0.10-base-plugins/repos/extra-x86_64/PKGBUILD
Deleted:
gstreamer0.10-base-plugins/repos/extra-x86_64/gstreamer-0.10.19-alsasink-mixed-record-playback-tracks.patch
---------------------------------------------------------------+
PKGBUILD | 12 --
gstreamer-0.10.19-alsasink-mixed-record-playback-tracks.patch | 60 ----------
2 files changed, 5 insertions(+), 67 deletions(-)
Property changes on: gstreamer0.10-base-plugins/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
- /gstreamer0.10-base-plugins/trunk:1-2378
+ /gstreamer0.10-base-plugins/trunk:1-3413
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2008-06-22 18:00:28 UTC (rev 3414)
+++ extra-x86_64/PKGBUILD 2008-06-22 18:01:09 UTC (rev 3415)
@@ -2,12 +2,12 @@
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=gstreamer0.10-base-plugins
-pkgver=0.10.19
-pkgrel=2
+pkgver=0.10.20
+pkgrel=1
pkgdesc="GStreamer Multimedia Framework Base Plugins (gst-plugins-base)"
arch=(i686 x86_64)
license=('GPL' 'LGPL')
-depends=('gstreamer0.10-base>=0.10.18-2' 'gnome-vfs>=2.22.0' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora')
+depends=('gstreamer0.10-base>=0.10.20' 'gnome-vfs>=2.22.0' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora')
makedepends=('pkgconfig')
replaces=('gstreamer0.10-alsa' 'gstreamer0.10-theora' 'gstreamer0.10-libvisual' 'gstreamer0.10-pango' 'gstreamer0.10-cdparanoia' 'gstreamer0.10-vorbis' 'gstreamer0.10-gnomevfs' 'gstreamer0.10-ogg')
conflicts=('gstreamer0.10-alsa' 'gstreamer0.10-theora' 'gstreamer0.10-libvisual' 'gstreamer0.10-pango' 'gstreamer0.10-cdparanoia' 'gstreamer0.10-vorbis' 'gstreamer0.10-gnomevfs' 'gstreamer0.10-ogg')
@@ -16,13 +16,11 @@
url="http://gstreamer.freedesktop.org/"
groups=('gstreamer0.10-plugins')
_relname=gst-plugins-base
-source=(${url}/src/${_relname}/${_relname}-${pkgver}.tar.bz2
- gstreamer-0.10.19-alsasink-mixed-record-playback-tracks.patch)
-md5sums=('9c9614cbb6497b7fee1c954b9d5ae3b7' '0505a174ec5cfa17d6d71514ab7b1887')
+source=(${url}/src/${_relname}/${_relname}-${pkgver}.tar.bz2)
+md5sums=('180dd3452438b31fba732d2216e55eb6')
build() {
cd ${startdir}/src/${_relname}-${pkgver}
- patch -Np1 -i ${startdir}/src/gstreamer-0.10.19-alsasink-mixed-record-playback-tracks.patch || return 1
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--disable-static --enable-experimental \
--disable-docs-build --disable-plugin-docs \
Deleted: extra-x86_64/gstreamer-0.10.19-alsasink-mixed-record-playback-tracks.patch
===================================================================
--- extra-x86_64/gstreamer-0.10.19-alsasink-mixed-record-playback-tracks.patch 2008-06-22 18:00:28 UTC (rev 3414)
+++ extra-x86_64/gstreamer-0.10.19-alsasink-mixed-record-playback-tracks.patch 2008-06-22 18:01:09 UTC (rev 3415)
@@ -1,60 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' gst-plugins-base0.10-0.10.18/ext/alsa/gstalsamixertrack.c gst-plugins-base0.10-0.10.18.new/ext/alsa/gstalsamixertrack.c
---- gst-plugins-base0.10-0.10.18/ext/alsa/gstalsamixertrack.c 2008-03-03 22:29:49.000000000 +0000
-+++ gst-plugins-base0.10-0.10.18.new/ext/alsa/gstalsamixertrack.c 2008-04-10 15:15:15.000000000 +0100
-@@ -75,28 +75,40 @@
- alsa_track->alsa_flags = 0;
- alsa_track->capture_group = -1;
-
-+ /* common flags */
- if (snd_mixer_selem_has_common_volume (alsa_track->element))
- alsa_track->alsa_flags |= GST_ALSA_MIXER_TRACK_VOLUME;
-
-- if (snd_mixer_selem_has_playback_volume (alsa_track->element))
-- alsa_track->alsa_flags |= GST_ALSA_MIXER_TRACK_PVOLUME;
--
-- if (snd_mixer_selem_has_capture_volume (alsa_track->element))
-- alsa_track->alsa_flags |= GST_ALSA_MIXER_TRACK_CVOLUME;
--
- if (snd_mixer_selem_has_common_switch (alsa_track->element))
- alsa_track->alsa_flags |= GST_ALSA_MIXER_TRACK_SWITCH;
-
-- if (snd_mixer_selem_has_playback_switch (alsa_track->element))
-- alsa_track->alsa_flags |= GST_ALSA_MIXER_TRACK_PSWITCH;
--
-- if (snd_mixer_selem_has_capture_switch (alsa_track->element)) {
-- alsa_track->alsa_flags |= GST_ALSA_MIXER_TRACK_CSWITCH;
--
-- if (snd_mixer_selem_has_capture_switch_exclusive (alsa_track->element)) {
-- alsa_track->alsa_flags |= GST_ALSA_MIXER_TRACK_CSWITCH_EXCL;
-- alsa_track->capture_group =
-- snd_mixer_selem_get_capture_group (alsa_track->element);
-+ /* Since we create two separate mixer track objects for alsa elements that
-+ * support both playback and capture, we're going to 'hide' the alsa flags
-+ * that don't pertain to this mixer track from alsa_flags, otherwise
-+ * gst_alsa_mixer_track_update() is going to do things we don't want */
-+
-+ /* playback flags */
-+ if ((GST_MIXER_TRACK (alsa_track)->flags & GST_MIXER_TRACK_OUTPUT)) {
-+ if (snd_mixer_selem_has_playback_volume (alsa_track->element))
-+ alsa_track->alsa_flags |= GST_ALSA_MIXER_TRACK_PVOLUME;
-+
-+ if (snd_mixer_selem_has_playback_switch (alsa_track->element))
-+ alsa_track->alsa_flags |= GST_ALSA_MIXER_TRACK_PSWITCH;
-+ }
-+
-+ /* capture flags */
-+ if ((GST_MIXER_TRACK (alsa_track)->flags & GST_MIXER_TRACK_INPUT)) {
-+ if (snd_mixer_selem_has_capture_volume (alsa_track->element))
-+ alsa_track->alsa_flags |= GST_ALSA_MIXER_TRACK_CVOLUME;
-+
-+ if (snd_mixer_selem_has_capture_switch (alsa_track->element)) {
-+ alsa_track->alsa_flags |= GST_ALSA_MIXER_TRACK_CSWITCH;
-+
-+ if (snd_mixer_selem_has_capture_switch_exclusive (alsa_track->element)) {
-+ alsa_track->alsa_flags |= GST_ALSA_MIXER_TRACK_CSWITCH_EXCL;
-+ alsa_track->capture_group =
-+ snd_mixer_selem_get_capture_group (alsa_track->element);
-+ }
- }
- }
-
More information about the arch-commits
mailing list