aboutsummaryrefslogtreecommitdiffstats
path: root/audio/gnomemedia2
diff options
context:
space:
mode:
Diffstat (limited to 'audio/gnomemedia2')
-rw-r--r--audio/gnomemedia2/Makefile19
-rw-r--r--audio/gnomemedia2/distinfo4
-rw-r--r--audio/gnomemedia2/files/patch-ad31
-rw-r--r--audio/gnomemedia2/files/patch-configure21
-rw-r--r--audio/gnomemedia2/files/patch-gmix::prefs.c11
-rw-r--r--audio/gnomemedia2/files/patch-gmix_gmix.h11
-rw-r--r--audio/gnomemedia2/pkg-plist245
7 files changed, 178 insertions, 164 deletions
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index da9fdf9b7b71..269a01c60310 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= gnomemedia2
-PORTVERSION= 2.4.1.1
+PORTVERSION= 2.6.0
PORTREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-media/2.4
+MASTER_SITE_SUBDIR= sources/gnome-media/2.6
DISTNAME= gnome-media-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -18,21 +18,28 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Multimedia applications for the GNOME 2 desktop
RUN_DEPENDS= sox:${PORTSDIR}/audio/sox
-LIB_DEPENDS= gstplay-0.6.1:${PORTSDIR}/multimedia/gstreamer-plugins
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 13
+USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
GNOME_DESKTOP_VERSION=2
-USE_GNOME= gnomeprefix gnomehack gnomehier gnomedesktop gail
+USE_GNOME= gnomeprefix gnomehack intlhack lthack gnomehier gnomedesktop \
+ gail gstreamerplugins
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+.include <bsd.port.pre.mk>
+
post-patch:
@${REINPLACE_CMD} -e 's|[$$][(]CDROM_HOST[)]|freebsd|g' \
${WRKSRC}/gnome-cd/Makefile.in
+.if ${OSVERSION} > 501107
+ @${REINPLACE_CMD} -e 's|%%CDROM%%|acd0|' ${WRKSRC}/configure
+.else
+ @${REINPLACE_CMD} -e 's|%%CDROM%%|acd0c|' ${WRKSRC}/configure
+.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/gnomemedia2/distinfo b/audio/gnomemedia2/distinfo
index a6fff81357db..567505c6ab54 100644
--- a/audio/gnomemedia2/distinfo
+++ b/audio/gnomemedia2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-media-2.4.1.1.tar.bz2) = dce73f3f0e5bddfd5a2bd412900e5abe
-SIZE (gnome2/gnome-media-2.4.1.1.tar.bz2) = 2745842
+MD5 (gnome2/gnome-media-2.6.0.tar.bz2) = 51dd73a96cbdb8049fa9e7d2aa0af9b5
+SIZE (gnome2/gnome-media-2.6.0.tar.bz2) = 2943852
diff --git a/audio/gnomemedia2/files/patch-ad b/audio/gnomemedia2/files/patch-ad
deleted file mode 100644
index f49a888a5a99..000000000000
--- a/audio/gnomemedia2/files/patch-ad
+++ /dev/null
@@ -1,31 +0,0 @@
---- gmix/gmix.c.orig Tue Oct 8 19:40:43 2002
-+++ gmix/gmix.c Fri Oct 11 09:20:13 2002
-@@ -60,7 +60,7 @@
- #ifdef HAVE_LINUX_SOUNDCARD_H
- #include <linux/soundcard.h>
- #else
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #endif
- #endif
-
-@@ -722,6 +722,7 @@
-
- cnt = 0;
- devices = NULL;
-+ num_mixers = 0;
- device_by_name = g_hash_table_new (g_str_hash, g_str_equal);
-
- do {
-@@ -730,9 +731,8 @@
- devices = g_list_append (devices, new_device);
- g_hash_table_insert (device_by_name, new_device->info.name, new_device);
- }
-- } while (new_device);
--
-- num_mixers = cnt - 1;
-+ } while ((errno == EACCES) || (errno == EINVAL) || (errno == ENXIO) \
-+ || new_device);
- }
-
- device_info *
diff --git a/audio/gnomemedia2/files/patch-configure b/audio/gnomemedia2/files/patch-configure
index d5e0e924c1a7..2c6ea537ce3a 100644
--- a/audio/gnomemedia2/files/patch-configure
+++ b/audio/gnomemedia2/files/patch-configure
@@ -1,10 +1,11 @@
---- configure.orig Thu Jan 23 17:55:03 2003
-+++ configure Tue Feb 4 20:31:01 2003
-@@ -8336,6 +8336,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+--- configure.orig Wed Dec 31 00:49:17 2003
++++ configure Wed Dec 31 00:49:57 2003
+@@ -23190,7 +23190,7 @@
+ *FreeBSD*)
+ CDROM_HOST=freebsd
+ CDROM_HOST_FREEBSD=true
+- default_cd_device="/dev/acd0c"
++ default_cd_device="/dev/%%CDROM%%"
+ ;;
+ *Linux*)
+ CDROM_HOST=linux
diff --git a/audio/gnomemedia2/files/patch-gmix::prefs.c b/audio/gnomemedia2/files/patch-gmix::prefs.c
deleted file mode 100644
index b25b42b9748e..000000000000
--- a/audio/gnomemedia2/files/patch-gmix::prefs.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gmix/prefs.c.orig Tue May 7 00:52:42 2002
-+++ gmix/prefs.c Tue May 7 00:52:54 2002
-@@ -38,7 +38,7 @@
- #ifdef HAVE_LINUX_SOUNDCARD_H
- #include <linux/soundcard.h>
- #else
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #endif
- #endif
-
diff --git a/audio/gnomemedia2/files/patch-gmix_gmix.h b/audio/gnomemedia2/files/patch-gmix_gmix.h
deleted file mode 100644
index 600110df6a9f..000000000000
--- a/audio/gnomemedia2/files/patch-gmix_gmix.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- gmix/gmix.h.orig Sat Aug 16 15:13:57 2003
-+++ gmix/gmix.h Sat Aug 16 15:14:47 2003
-@@ -25,7 +25,7 @@
- */
- #define GMIX_VERSION 0x030000
-
--#if defined(ALSA) || defined(__FreeBSD__)
-+#if defined(ALSA) || (defined(__FreeBSD__) && !defined(SOUND_MIXER_INFO))
- /* stolen from OSS's soundcard.h */
- typedef struct mixer_info
- {
diff --git a/audio/gnomemedia2/pkg-plist b/audio/gnomemedia2/pkg-plist
index 47d38d6ba3b2..67cf88304e5e 100644
--- a/audio/gnomemedia2/pkg-plist
+++ b/audio/gnomemedia2/pkg-plist
@@ -1,4 +1,5 @@
bin/cddb-slave2-properties
+bin/gnome-audio-profiles-properties
bin/gnome-cd
bin/gnome-sound-recorder
bin/gnome-volume-control
@@ -8,32 +9,60 @@ etc/gconf/gconf.xml.defaults/apps/CDDB-Slave2/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/gnome-cd/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/system-state/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-volume-control/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/CDDB-Slave2/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gnome-cd/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/system-state/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-volume-control/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/global/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/cdlossless/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/cdlossy/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/voice/%gconf.xml
+etc/gconf/gconf.xml.defaults/system/gstreamer/%gconf.xml
+etc/gconf/gconf.xml.defaults/system/gstreamer/audio/%gconf.xml
+etc/gconf/gconf.xml.defaults/system/gstreamer/audio/global/%gconf.xml
+etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/%gconf.xml
+etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/cdlossless/%gconf.xml
+etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/cdlossy/%gconf.xml
+etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/voice/%gconf.xml
etc/gconf/schemas/CDDB-Slave2.schemas
+etc/gconf/schemas/gnome-audio-profiles.schemas
etc/gconf/schemas/gnome-cd.schemas
etc/gconf/schemas/gnome-sound-recorder.schemas
-etc/gconf/schemas/gnome-volume-control.schemas
include/cddb-slave2/cddb-slave-client.h
+include/gnome-media/profiles/audio-profile-choose.h
+include/gnome-media/profiles/audio-profile-edit.h
+include/gnome-media/profiles/audio-profile.h
+include/gnome-media/profiles/audio-profiles-edit.h
+include/gnome-media/profiles/gnome-media-profiles.h
lib/libcddb-slave2.a
lib/libcddb-slave2.so
lib/libcddb-slave2.so.0
+lib/libglade/2.0/libgnome-media-profiles.so
+lib/libgnome-media-profiles.a
+lib/libgnome-media-profiles.so
+lib/libgnome-media-profiles.so.0
libdata/bonobo/servers/GNOME_Media_CDDBSlave2.server
+libdata/pkgconfig/gnome-media-profiles.pc
libexec/CDDBSlave2
libexec/cddb-track-editor
share/gnome/applications/gnome-cd.desktop
share/gnome/applications/gnome-sound-recorder.desktop
share/gnome/applications/gnome-volume-control.desktop
+share/gnome/applications/gstreamer-properties.desktop
share/gnome/applications/reclevel.desktop
share/gnome/applications/vumeter.desktop
share/gnome/control-center-2.0/capplets/cddb-slave.desktop
-share/gnome/gnome-media-2.0/icons/gstreamer-properties.png
-share/gnome/gnome-media-2.0/interfaces/gstreamer-properties.glade
+share/gnome/gnome-media/glade/gnome-audio-profiles.glade2
+share/gnome/gnome-media/pixmaps/mixer.png
+share/gnome/gnome-media/pixmaps/phone.png
+share/gnome/gnome-media/pixmaps/tone.png
+share/gnome/gnome-media/pixmaps/video.png
share/gnome/gnome-sound-recorder/ui/gsr.xml
+share/gnome/gstreamer-properties/glade/gstreamer-properties.glade
+share/gnome/gstreamer-properties/icons/gstreamer-properties.png
share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_button.png
share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_window.png
share/gnome/help/gnome-cd/C/figures/cdplayer_window.png
@@ -48,8 +77,6 @@ share/gnome/help/gnome-cd/C/figures/rewind_button.png
share/gnome/help/gnome-cd/C/figures/stop_button.png
share/gnome/help/gnome-cd/C/gnome-cd.xml
share/gnome/help/gnome-cd/C/legal.xml
-share/gnome/help/gnome-cd/de/legal.xml
-share/gnome/help/gnome-cd/de/gnome-cd.xml
share/gnome/help/gnome-cd/de/figures/cdplayer_trackeditor_button.png
share/gnome/help/gnome-cd/de/figures/cdplayer_trackeditor_window.png
share/gnome/help/gnome-cd/de/figures/cdplayer_window.png
@@ -65,8 +92,8 @@ share/gnome/help/gnome-cd/de/figures/preferences_button.png
share/gnome/help/gnome-cd/de/figures/previous_button.png
share/gnome/help/gnome-cd/de/figures/rewind_button.png
share/gnome/help/gnome-cd/de/figures/stop_button.png
-share/gnome/help/gnome-cd/es/legal.xml
-share/gnome/help/gnome-cd/es/gnome-cd.xml
+share/gnome/help/gnome-cd/de/gnome-cd.xml
+share/gnome/help/gnome-cd/de/legal.xml
share/gnome/help/gnome-cd/es/figures/cdplayer_trackeditor_button.png
share/gnome/help/gnome-cd/es/figures/cdplayer_trackeditor_window.png
share/gnome/help/gnome-cd/es/figures/cdplayer_window.png
@@ -82,8 +109,8 @@ share/gnome/help/gnome-cd/es/figures/preferences_button.png
share/gnome/help/gnome-cd/es/figures/previous_button.png
share/gnome/help/gnome-cd/es/figures/rewind_button.png
share/gnome/help/gnome-cd/es/figures/stop_button.png
-share/gnome/help/gnome-cd/fr/legal.xml
-share/gnome/help/gnome-cd/fr/gnome-cd.xml
+share/gnome/help/gnome-cd/es/gnome-cd.xml
+share/gnome/help/gnome-cd/es/legal.xml
share/gnome/help/gnome-cd/fr/figures/cdplayer_trackeditor_button.png
share/gnome/help/gnome-cd/fr/figures/cdplayer_trackeditor_window.png
share/gnome/help/gnome-cd/fr/figures/cdplayer_window.png
@@ -99,8 +126,8 @@ share/gnome/help/gnome-cd/fr/figures/preferences_button.png
share/gnome/help/gnome-cd/fr/figures/previous_button.png
share/gnome/help/gnome-cd/fr/figures/rewind_button.png
share/gnome/help/gnome-cd/fr/figures/stop_button.png
-share/gnome/help/gnome-cd/it/legal.xml
-share/gnome/help/gnome-cd/it/gnome-cd.xml
+share/gnome/help/gnome-cd/fr/gnome-cd.xml
+share/gnome/help/gnome-cd/fr/legal.xml
share/gnome/help/gnome-cd/it/figures/cdplayer_trackeditor_button.png
share/gnome/help/gnome-cd/it/figures/cdplayer_trackeditor_window.png
share/gnome/help/gnome-cd/it/figures/cdplayer_window.png
@@ -116,25 +143,8 @@ share/gnome/help/gnome-cd/it/figures/preferences_button.png
share/gnome/help/gnome-cd/it/figures/previous_button.png
share/gnome/help/gnome-cd/it/figures/rewind_button.png
share/gnome/help/gnome-cd/it/figures/stop_button.png
-share/gnome/help/gnome-cd/sv/legal.xml
-share/gnome/help/gnome-cd/sv/gnome-cd.xml
-share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/sv/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/sv/figures/eject_button.png
-share/gnome/help/gnome-cd/sv/figures/forward_button.png
-share/gnome/help/gnome-cd/sv/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/sv/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/sv/figures/gnome-cd.png
-share/gnome/help/gnome-cd/sv/figures/next_button.png
-share/gnome/help/gnome-cd/sv/figures/pause_button.png
-share/gnome/help/gnome-cd/sv/figures/play_button.png
-share/gnome/help/gnome-cd/sv/figures/preferences_button.png
-share/gnome/help/gnome-cd/sv/figures/previous_button.png
-share/gnome/help/gnome-cd/sv/figures/rewind_button.png
-share/gnome/help/gnome-cd/sv/figures/stop_button.png
-share/gnome/help/gnome-cd/ja/legal.xml
-share/gnome/help/gnome-cd/ja/gnome-cd.xml
+share/gnome/help/gnome-cd/it/gnome-cd.xml
+share/gnome/help/gnome-cd/it/legal.xml
share/gnome/help/gnome-cd/ja/figures/cdplayer_trackeditor_button.png
share/gnome/help/gnome-cd/ja/figures/cdplayer_trackeditor_window.png
share/gnome/help/gnome-cd/ja/figures/cdplayer_window.png
@@ -150,8 +160,8 @@ share/gnome/help/gnome-cd/ja/figures/preferences_button.png
share/gnome/help/gnome-cd/ja/figures/previous_button.png
share/gnome/help/gnome-cd/ja/figures/rewind_button.png
share/gnome/help/gnome-cd/ja/figures/stop_button.png
-share/gnome/help/gnome-cd/ko/legal.xml
-share/gnome/help/gnome-cd/ko/gnome-cd.xml
+share/gnome/help/gnome-cd/ja/gnome-cd.xml
+share/gnome/help/gnome-cd/ja/legal.xml
share/gnome/help/gnome-cd/ko/figures/cdplayer_trackeditor_button.png
share/gnome/help/gnome-cd/ko/figures/cdplayer_trackeditor_window.png
share/gnome/help/gnome-cd/ko/figures/cdplayer_window.png
@@ -167,8 +177,25 @@ share/gnome/help/gnome-cd/ko/figures/preferences_button.png
share/gnome/help/gnome-cd/ko/figures/previous_button.png
share/gnome/help/gnome-cd/ko/figures/rewind_button.png
share/gnome/help/gnome-cd/ko/figures/stop_button.png
-share/gnome/help/gnome-cd/zh_CN/legal.xml
-share/gnome/help/gnome-cd/zh_CN/gnome-cd.xml
+share/gnome/help/gnome-cd/ko/gnome-cd.xml
+share/gnome/help/gnome-cd/ko/legal.xml
+share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/sv/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/sv/figures/eject_button.png
+share/gnome/help/gnome-cd/sv/figures/forward_button.png
+share/gnome/help/gnome-cd/sv/figures/gnome-cd-prefs.png
+share/gnome/help/gnome-cd/sv/figures/gnome-cd-track.png
+share/gnome/help/gnome-cd/sv/figures/gnome-cd.png
+share/gnome/help/gnome-cd/sv/figures/next_button.png
+share/gnome/help/gnome-cd/sv/figures/pause_button.png
+share/gnome/help/gnome-cd/sv/figures/play_button.png
+share/gnome/help/gnome-cd/sv/figures/preferences_button.png
+share/gnome/help/gnome-cd/sv/figures/previous_button.png
+share/gnome/help/gnome-cd/sv/figures/rewind_button.png
+share/gnome/help/gnome-cd/sv/figures/stop_button.png
+share/gnome/help/gnome-cd/sv/gnome-cd.xml
+share/gnome/help/gnome-cd/sv/legal.xml
share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_button.png
share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_window.png
share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_window.png
@@ -184,8 +211,8 @@ share/gnome/help/gnome-cd/zh_CN/figures/preferences_button.png
share/gnome/help/gnome-cd/zh_CN/figures/previous_button.png
share/gnome/help/gnome-cd/zh_CN/figures/rewind_button.png
share/gnome/help/gnome-cd/zh_CN/figures/stop_button.png
-share/gnome/help/gnome-cd/zh_TW/legal.xml
-share/gnome/help/gnome-cd/zh_TW/gnome-cd.xml
+share/gnome/help/gnome-cd/zh_CN/gnome-cd.xml
+share/gnome/help/gnome-cd/zh_CN/legal.xml
share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_trackeditor_button.png
share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_trackeditor_window.png
share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_window.png
@@ -201,15 +228,16 @@ share/gnome/help/gnome-cd/zh_TW/figures/preferences_button.png
share/gnome/help/gnome-cd/zh_TW/figures/previous_button.png
share/gnome/help/gnome-cd/zh_TW/figures/rewind_button.png
share/gnome/help/gnome-cd/zh_TW/figures/stop_button.png
+share/gnome/help/gnome-cd/zh_TW/gnome-cd.xml
+share/gnome/help/gnome-cd/zh_TW/legal.xml
share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png
share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml
share/gnome/help/gnome-sound-recorder/C/legal.xml
share/gnome/help/gnome-volume-control/C/figures/gmix-prefs.png
share/gnome/help/gnome-volume-control/C/figures/gmix.png
+share/gnome/help/gnome-volume-control/C/figures/gnome-volume-control_window.png
share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml
share/gnome/help/gnome-volume-control/C/legal.xml
-share/gnome/help/grecord/de/legal.xml
-share/gnome/help/grecord/de/grecord.xml
share/gnome/help/grecord/de/figures/grecord-prefs-path.png
share/gnome/help/grecord/de/figures/grecord-prefs-play.png
share/gnome/help/grecord/de/figures/grecord-prefs-rec.png
@@ -217,8 +245,8 @@ share/gnome/help/grecord/de/figures/grecord-prefs-sound.png
share/gnome/help/grecord/de/figures/grecord-prefs-ui.png
share/gnome/help/grecord/de/figures/grecord.png
share/gnome/help/grecord/de/figures/grecord_window.png
-share/gnome/help/grecord/es/legal.xml
-share/gnome/help/grecord/es/grecord.xml
+share/gnome/help/grecord/de/grecord.xml
+share/gnome/help/grecord/de/legal.xml
share/gnome/help/grecord/es/figures/grecord-prefs-path.png
share/gnome/help/grecord/es/figures/grecord-prefs-play.png
share/gnome/help/grecord/es/figures/grecord-prefs-rec.png
@@ -226,8 +254,8 @@ share/gnome/help/grecord/es/figures/grecord-prefs-sound.png
share/gnome/help/grecord/es/figures/grecord-prefs-ui.png
share/gnome/help/grecord/es/figures/grecord.png
share/gnome/help/grecord/es/figures/grecord_window.png
-share/gnome/help/grecord/fr/legal.xml
-share/gnome/help/grecord/fr/grecord.xml
+share/gnome/help/grecord/es/grecord.xml
+share/gnome/help/grecord/es/legal.xml
share/gnome/help/grecord/fr/figures/grecord-prefs-path.png
share/gnome/help/grecord/fr/figures/grecord-prefs-play.png
share/gnome/help/grecord/fr/figures/grecord-prefs-rec.png
@@ -235,8 +263,8 @@ share/gnome/help/grecord/fr/figures/grecord-prefs-sound.png
share/gnome/help/grecord/fr/figures/grecord-prefs-ui.png
share/gnome/help/grecord/fr/figures/grecord.png
share/gnome/help/grecord/fr/figures/grecord_window.png
-share/gnome/help/grecord/it/legal.xml
-share/gnome/help/grecord/it/grecord.xml
+share/gnome/help/grecord/fr/grecord.xml
+share/gnome/help/grecord/fr/legal.xml
share/gnome/help/grecord/it/figures/grecord-prefs-path.png
share/gnome/help/grecord/it/figures/grecord-prefs-play.png
share/gnome/help/grecord/it/figures/grecord-prefs-rec.png
@@ -244,17 +272,8 @@ share/gnome/help/grecord/it/figures/grecord-prefs-sound.png
share/gnome/help/grecord/it/figures/grecord-prefs-ui.png
share/gnome/help/grecord/it/figures/grecord.png
share/gnome/help/grecord/it/figures/grecord_window.png
-share/gnome/help/grecord/sv/legal.xml
-share/gnome/help/grecord/sv/grecord.xml
-share/gnome/help/grecord/sv/figures/grecord-prefs-path.png
-share/gnome/help/grecord/sv/figures/grecord-prefs-play.png
-share/gnome/help/grecord/sv/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/sv/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/sv/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/sv/figures/grecord.png
-share/gnome/help/grecord/sv/figures/grecord_window.png
-share/gnome/help/grecord/ja/legal.xml
-share/gnome/help/grecord/ja/grecord.xml
+share/gnome/help/grecord/it/grecord.xml
+share/gnome/help/grecord/it/legal.xml
share/gnome/help/grecord/ja/figures/grecord-prefs-path.png
share/gnome/help/grecord/ja/figures/grecord-prefs-play.png
share/gnome/help/grecord/ja/figures/grecord-prefs-rec.png
@@ -262,8 +281,8 @@ share/gnome/help/grecord/ja/figures/grecord-prefs-sound.png
share/gnome/help/grecord/ja/figures/grecord-prefs-ui.png
share/gnome/help/grecord/ja/figures/grecord.png
share/gnome/help/grecord/ja/figures/grecord_window.png
-share/gnome/help/grecord/ko/legal.xml
-share/gnome/help/grecord/ko/grecord.xml
+share/gnome/help/grecord/ja/grecord.xml
+share/gnome/help/grecord/ja/legal.xml
share/gnome/help/grecord/ko/figures/grecord-prefs-path.png
share/gnome/help/grecord/ko/figures/grecord-prefs-play.png
share/gnome/help/grecord/ko/figures/grecord-prefs-rec.png
@@ -271,8 +290,17 @@ share/gnome/help/grecord/ko/figures/grecord-prefs-sound.png
share/gnome/help/grecord/ko/figures/grecord-prefs-ui.png
share/gnome/help/grecord/ko/figures/grecord.png
share/gnome/help/grecord/ko/figures/grecord_window.png
-share/gnome/help/grecord/zh_CN/legal.xml
-share/gnome/help/grecord/zh_CN/grecord.xml
+share/gnome/help/grecord/ko/grecord.xml
+share/gnome/help/grecord/ko/legal.xml
+share/gnome/help/grecord/sv/figures/grecord-prefs-path.png
+share/gnome/help/grecord/sv/figures/grecord-prefs-play.png
+share/gnome/help/grecord/sv/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/sv/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/sv/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/sv/figures/grecord.png
+share/gnome/help/grecord/sv/figures/grecord_window.png
+share/gnome/help/grecord/sv/grecord.xml
+share/gnome/help/grecord/sv/legal.xml
share/gnome/help/grecord/zh_CN/figures/grecord-prefs-path.png
share/gnome/help/grecord/zh_CN/figures/grecord-prefs-play.png
share/gnome/help/grecord/zh_CN/figures/grecord-prefs-rec.png
@@ -280,8 +308,8 @@ share/gnome/help/grecord/zh_CN/figures/grecord-prefs-sound.png
share/gnome/help/grecord/zh_CN/figures/grecord-prefs-ui.png
share/gnome/help/grecord/zh_CN/figures/grecord.png
share/gnome/help/grecord/zh_CN/figures/grecord_window.png
-share/gnome/help/grecord/zh_TW/legal.xml
-share/gnome/help/grecord/zh_TW/grecord.xml
+share/gnome/help/grecord/zh_CN/grecord.xml
+share/gnome/help/grecord/zh_CN/legal.xml
share/gnome/help/grecord/zh_TW/figures/grecord-prefs-path.png
share/gnome/help/grecord/zh_TW/figures/grecord-prefs-play.png
share/gnome/help/grecord/zh_TW/figures/grecord-prefs-rec.png
@@ -289,6 +317,11 @@ share/gnome/help/grecord/zh_TW/figures/grecord-prefs-sound.png
share/gnome/help/grecord/zh_TW/figures/grecord-prefs-ui.png
share/gnome/help/grecord/zh_TW/figures/grecord.png
share/gnome/help/grecord/zh_TW/figures/grecord_window.png
+share/gnome/help/grecord/zh_TW/grecord.xml
+share/gnome/help/grecord/zh_TW/legal.xml
+share/gnome/help/gstreamer-properties/C/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/C/gstreamer-properties.xml
+share/gnome/help/gstreamer-properties/C/legal.xml
share/gnome/idl/GNOME_Media_CDDBSlave2.idl
share/gnome/omf/gnome-media/gnome-cd-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-C.omf 2>/dev/null || /usr/bin/true
@@ -300,12 +333,12 @@ share/gnome/omf/gnome-media/gnome-cd-fr.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-fr.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-media/gnome-cd-it.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-it.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-media/gnome-cd-sv.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-sv.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-media/gnome-cd-ja.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-ja.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-media/gnome-cd-ko.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/gnome-cd-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-sv.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf
@@ -322,16 +355,18 @@ share/gnome/omf/gnome-media/grecord-fr.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-fr.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-media/grecord-it.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-it.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-media/grecord-sv.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-sv.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-media/grecord-ja.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-ja.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-media/grecord-ko.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/grecord-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-sv.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-media/grecord-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-zh_CN.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-media/grecord-zh_TW.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-zh_TW.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/gstreamer-properties-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gstreamer-properties-C.omf 2>/dev/null || /usr/bin/true
share/gnome/pixmaps/gnome-cd.png
share/gnome/pixmaps/gnome-cd/cd.png
share/gnome/pixmaps/gnome-cd/disc.png
@@ -402,7 +437,7 @@ share/gnome/pixmaps/gnome-cd/themes/red-lcd/top.png
share/gnome/pixmaps/gnome-cd/track.png
share/gnome/pixmaps/gnome-grecord.png
share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-play.png
-share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-rec.png
+share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-record.png
share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-stop.png
share/gnome/pixmaps/gnome-mixer.png
share/gnome/pixmaps/gnome-reclevel.png
@@ -420,6 +455,7 @@ share/locale/cy/LC_MESSAGES/gnome-media-2.0.mo
share/locale/da/LC_MESSAGES/gnome-media-2.0.mo
share/locale/de/LC_MESSAGES/gnome-media-2.0.mo
share/locale/el/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/en_CA/LC_MESSAGES/gnome-media-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-media-2.0.mo
share/locale/es/LC_MESSAGES/gnome-media-2.0.mo
share/locale/et/LC_MESSAGES/gnome-media-2.0.mo
@@ -431,6 +467,7 @@ share/locale/ga/LC_MESSAGES/gnome-media-2.0.mo
share/locale/gl/LC_MESSAGES/gnome-media-2.0.mo
share/locale/he/LC_MESSAGES/gnome-media-2.0.mo
share/locale/hi/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/hr/LC_MESSAGES/gnome-media-2.0.mo
share/locale/hu/LC_MESSAGES/gnome-media-2.0.mo
share/locale/id/LC_MESSAGES/gnome-media-2.0.mo
share/locale/it/LC_MESSAGES/gnome-media-2.0.mo
@@ -445,6 +482,7 @@ share/locale/ms/LC_MESSAGES/gnome-media-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-media-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-media-2.0.mo
share/locale/no/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/pa/LC_MESSAGES/gnome-media-2.0.mo
share/locale/pl/LC_MESSAGES/gnome-media-2.0.mo
share/locale/pt/LC_MESSAGES/gnome-media-2.0.mo
share/locale/pt_BR/LC_MESSAGES/gnome-media-2.0.mo
@@ -456,6 +494,8 @@ share/locale/sq/LC_MESSAGES/gnome-media-2.0.mo
share/locale/sr/LC_MESSAGES/gnome-media-2.0.mo
share/locale/sr@Latn/LC_MESSAGES/gnome-media-2.0.mo
share/locale/sv/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/ta/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/th/LC_MESSAGES/gnome-media-2.0.mo
share/locale/tr/LC_MESSAGES/gnome-media-2.0.mo
share/locale/uk/LC_MESSAGES/gnome-media-2.0.mo
share/locale/vi/LC_MESSAGES/gnome-media-2.0.mo
@@ -470,11 +510,9 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
@dirrm share/gnome/pixmaps/gnome-cd/themes/None
@dirrm share/gnome/pixmaps/gnome-cd/themes
@dirrm share/gnome/pixmaps/gnome-cd
-@dirrm share/gnome/gnome-media-2.0/interfaces
-@dirrm share/gnome/gnome-media-2.0/icons
-@dirrm share/gnome/gnome-media-2.0
-@dirrm share/gnome/gnome-sound-recorder/ui
-@dirrm share/gnome/gnome-sound-recorder
+@dirrm share/gnome/help/gstreamer-properties/C/figures
+@dirrm share/gnome/help/gstreamer-properties/C
+@dirrm share/gnome/help/gstreamer-properties
@dirrm share/gnome/help/grecord/zh_TW/figures
@dirrm share/gnome/help/grecord/zh_TW
@dirrm share/gnome/help/grecord/zh_CN/figures
@@ -521,35 +559,56 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
@dirrm share/gnome/help/gnome-cd/C/figures
@dirrm share/gnome/help/gnome-cd/C
@dirrm share/gnome/help/gnome-cd
+@dirrm share/gnome/gstreamer-properties/icons
+@dirrm share/gnome/gstreamer-properties/glade
+@dirrm share/gnome/gstreamer-properties
+@dirrm share/gnome/gnome-sound-recorder/ui
+@dirrm share/gnome/gnome-sound-recorder
+@dirrm share/gnome/gnome-media/pixmaps
+@dirrm share/gnome/gnome-media/glade
+@dirrm share/gnome/gnome-media
+@dirrm include/gnome-media/profiles
+@dirrm include/gnome-media
@dirrm include/cddb-slave2
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-volume-control
+@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/voice
+@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/cdlossy
+@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/cdlossless
+@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles
+@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio/global
+@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio
+@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/voice
+@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/cdlossy
+@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/cdlossless
+@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles
+@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/global
+@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/system-state
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-cd
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/CDDB-Slave2
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-volume-control
@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/system-state
@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder
@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-cd
@dirrm etc/gconf/gconf.xml.defaults/apps/CDDB-Slave2
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-C.omf 2>/dev/null || /usr/bin/true
-@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-de.omf 2>/dev/null || /usr/bin/true
-@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-es.omf 2>/dev/null || /usr/bin/true
-@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-fr.omf 2>/dev/null || /usr/bin/true
-@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-it.omf 2>/dev/null || /usr/bin/true
-@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-sv.omf 2>/dev/null || /usr/bin/true
-@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-ja.omf 2>/dev/null || /usr/bin/true
-@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-ko.omf 2>/dev/null || /usr/bin/true
-@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf 2>/dev/null || /usr/bin/true
-@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-it.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-volume-control-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-C.omf 2>/dev/null || /usr/bin/true
-@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-de.omf 2>/dev/null || /usr/bin/true
-@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-es.omf 2>/dev/null || /usr/bin/true
-@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-fr.omf 2>/dev/null || /usr/bin/true
-@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-it.omf 2>/dev/null || /usr/bin/true
-@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-sv.omf 2>/dev/null || /usr/bin/true
-@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-ja.omf 2>/dev/null || /usr/bin/true
-@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-ko.omf 2>/dev/null || /usr/bin/true
-@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-zh_CN.omf 2>/dev/null || /usr/bin/true
-@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-zh_TW.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-it.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-zh_TW.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gstreamer-properties-C.omf 2>/dev/null || /usr/bin/true