rpms/gst-mixer/devel gst-mixer-2.26.0-rebrand.patch, NONE, 1.1 gst-mixer-2.26.0-switch.patch, NONE, 1.1 gst-mixer.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Adam Williamson
adamwill at fedoraproject.org
Mon May 4 21:12:37 UTC 2009
Author: adamwill
Update of /cvs/pkgs/rpms/gst-mixer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30868/devel
Modified Files:
.cvsignore sources
Added Files:
gst-mixer-2.26.0-rebrand.patch gst-mixer-2.26.0-switch.patch
gst-mixer.spec import.log
Log Message:
- initial import (based on gnome-media spec)
gst-mixer-2.26.0-rebrand.patch:
--- NEW FILE gst-mixer-2.26.0-rebrand.patch ---
--- gnome-media-dirty/gst-mixer/gnome-volume-control.desktop.in.in 2009-04-27 13:42:03.684021984 -0700
+++ gnome-media-dirty/gst-mixer/gnome-volume-control.desktop.in.in.new 2009-04-27 14:35:45.306021777 -0700
@@ -1,16 +1,16 @@
[Desktop Entry]
Encoding=UTF-8
-_Name=Volume Control
-_Comment=Adjust the volume level
-Exec=gnome-volume-control
+_Name=Advanced Volume Control
+_Comment=Full hardware access volume control
+Exec=gst-mixer
Icon=multimedia-volume-control
StartupNotify=true
X-Info=Gnome Mixer
Terminal=false
Type=Application
Categories=GNOME;GTK;AudioVideo;Settings;HardwareSettings;
-X-GNOME-DocPath=gst-mixer/gnome-volume-control.xml
+X-GNOME-DocPath=gst-mixer/gst-mixer.xml
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-media
-X-GNOME-Bugzilla-Component=gnome-volume-control
+X-GNOME-Bugzilla-Component=gst-mixer
X-GNOME-Bugzilla-Version=@VERSION@
--- gnome-media-dirty/gst-mixer/gnome-volume-control.schemas.in 2009-04-27 13:42:03.684021984 -0700
+++ gnome-media-dirty/gst-mixer/gnome-volume-control.schemas.in.new 2009-04-27 14:23:10.198147405 -0700
@@ -2,9 +2,9 @@
<gconfschemafile>
<schemalist>
<schema>
- <key>/schemas/apps/gnome-volume-control/ui/window_height</key>
- <applyto>/apps/gnome-volume-control/ui/window_height</applyto>
- <owner>gnome-volume-control</owner>
+ <key>/schemas/apps/gst-mixer/ui/window_height</key>
+ <applyto>/apps/gst-mixer/ui/window_height</applyto>
+ <owner>gst-mixer</owner>
<type>int</type>
<default>-1</default>
<locale name="C">
@@ -14,9 +14,9 @@
</schema>
<schema>
- <key>/schemas/apps/gnome-volume-control/ui/window_width</key>
- <applyto>/apps/gnome-volume-control/ui/window_width</applyto>
- <owner>gnome-volume-control</owner>
+ <key>/schemas/apps/gst-mixer/ui/window_width</key>
+ <applyto>/apps/gst-mixer/ui/window_width</applyto>
+ <owner>gst-mixer</owner>
<type>int</type>
<default>500</default>
<locale name="C">
--- gnome-media-dirty/gst-mixer/Makefile.am 2009-04-27 13:42:03.684021984 -0700
+++ gnome-media-dirty/gst-mixer/Makefile.am.new 2009-04-27 14:27:35.002397016 -0700
@@ -4,10 +4,10 @@
@INTLTOOL_DESKTOP_RULE@
@INTLTOOL_SCHEMAS_RULE@
-Desktop_in_files = gnome-volume-control.desktop.in.in
+Desktop_in_files = gst-mixer.desktop.in.in
Desktop_DATA = $(Desktop_in_files:.desktop.in.in=.desktop)
schemadir=$(GCONF_SCHEMA_FILE_DIR)
-schema_DATA=gnome-volume-control.schemas
+schema_DATA=gst-mixer.schemas
install-schemas:
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) || true
@@ -19,7 +19,7 @@
endif
EXTRA_DIST = $(Desktop_in_files) \
- gnome-volume-control.schemas.in
+ gst-mixer.schemas.in
CLEANFILES = $(Desktop_DATA) $(schema_DATA)
--- gnome-media-dirty/gst-mixer/src/Makefile.am 2009-04-27 13:42:03.689021762 -0700
+++ gnome-media-dirty/gst-mixer/src/Makefile.am.new 2009-04-27 14:29:50.791032216 -0700
@@ -11,9 +11,9 @@
-DDATA_DIR=\""$(pkgdatadir)"\" \
-DPIX_DIR=\""$(pkgdatadir)/pixmaps"\"
-bin_PROGRAMS = gnome-volume-control
+bin_PROGRAMS = gst-mixer
-gnome_volume_control_SOURCES = \
+gst_mixer_SOURCES = \
button.c \
element.c \
main.c \
@@ -33,7 +33,7 @@
window.h \
misc.h
-gnome_volume_control_LDFLAGS = \
+gst_mixer_LDFLAGS = \
$(GVC_ST_LIBS) \
$(GSTMIXER_LIBS)
--- gnome-media-dirty/gst-mixer/doc/Makefile.am 2009-04-27 13:42:03.687021893 -0700
+++ gnome-media-dirty/gst-mixer/doc/Makefile.am.new 2009-04-27 15:29:35.626416724 -0700
@@ -1,6 +1,6 @@
include $(top_srcdir)/gnome-doc-utils.make
dist-hook: doc-dist-hook
-DOC_MODULE = gnome-volume-control
+DOC_MODULE = gst-mixer
DOC_ENTITIES = legal.xml
DOC_INCLUDES =
DOC_FIGURES = figures/gnome-volume-control_window.png
--- gnome-media-dirty/po/POTFILES.in 2009-04-27 13:42:03.625403777 -0700
+++ gnome-media-dirty/po/POTFILES.in.new 2009-04-27 15:33:17.775022080 -0700
@@ -30,8 +30,8 @@
grecord/gnome-sound-recorder.schemas.in.in
grecord/src/gnome-recorder.c
grecord/src/gsr-window.c
-gst-mixer/gnome-volume-control.desktop.in.in
-gst-mixer/gnome-volume-control.schemas.in
+gst-mixer/gst-mixer.desktop.in.in
+gst-mixer/gst-mixer.schemas.in
gst-mixer/src/element.c
gst-mixer/src/main.c
gst-mixer/src/misc.c
--- gnome-media-dirty/configure.ac 2009-04-27 13:42:03.722022151 -0700
+++ gnome-media-dirty/configure.ac.new 2009-04-27 15:37:53.984022242 -0700
@@ -363,7 +363,7 @@
dnl i18n
dnl=======================================================================
-GETTEXT_PACKAGE=gnome-media-2.0
+GETTEXT_PACKAGE=gst-mixer-2.0
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the Gettext package name])
AM_GLIB_GNU_GETTEXT
@@ -738,7 +738,7 @@
cddb-slave2/cddb-slave.desktop.in
gnome-cd/gnome-cd.desktop.in
grecord/gnome-sound-recorder.desktop.in
-gst-mixer/gnome-volume-control.desktop.in
+gst-mixer/gst-mixer.desktop.in
gstreamer-properties/gstreamer-properties.desktop.in
vu-meter/reclevel.desktop.in
vu-meter/vumeter.desktop.in
--- gnome-media-dirty/gst-mixer/src/keys.h 2009-04-27 13:42:03.689021762 -0700
+++ gnome-media-dirty/gst-mixer/src/keys.h.new 2009-04-27 16:05:26.560273019 -0700
@@ -25,7 +25,7 @@
G_BEGIN_DECLS
#define GNOME_VOLUME_CONTROL_KEY_DIR \
- "/apps/gnome-volume-control"
+ "/apps/gst-mixer"
#define GNOME_VOLUME_CONTROL_KEY(key) \
GNOME_VOLUME_CONTROL_KEY_DIR "/" key
gst-mixer-2.26.0-switch.patch:
--- NEW FILE gst-mixer-2.26.0-switch.patch ---
#
# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/345645
# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=576022
# Desciption: Fixes whitelist bug by reverting to 2.24 behaviour.
#
diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gst-mixer/src/element.c gnome-media-2.26.0.new/gst-mixer/src/element.c
--- gnome-media-2.26.0/gst-mixer/src/element.c 2009-03-04 23:54:53.000000000 +0000
+++ gnome-media-2.26.0.new/gst-mixer/src/element.c 2009-03-26 14:20:07.000000000 +0000
@@ -133,6 +133,14 @@
{ "front", FALSE },
{ NULL, FALSE }
};
+
+ /* Reset the whitelist. This is a hack to fix bugs LP:345645, 576022 */
+ if (track == NULL)
+ {
+ for (i = 0; list[i].label != NULL; i++)
+ list[i].done = FALSE;
+ return TRUE;
+ }
for (i = 0; !found && list[i].label != NULL; i++) {
gchar *label_l = NULL;
@@ -304,6 +312,7 @@
}
/* show */
+ gnome_volume_control_element_whitelist (NULL);
for (item = gst_mixer_list_tracks (el->mixer);
item != NULL; item = item->next) {
GstMixerTrack *track = item->data;
diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gst-mixer/src/preferences.c gnome-media-2.26.0.new/gst-mixer/src/preferences.c
--- gnome-media-2.26.0/gst-mixer/src/preferences.c 2009-03-04 23:54:53.000000000 +0000
+++ gnome-media-2.26.0.new/gst-mixer/src/preferences.c 2009-03-26 14:20:20.000000000 +0000
@@ -309,6 +309,7 @@
gst_object_replace ((GstObject **) &prefs->mixer, GST_OBJECT (element));
/* add all tracks */
+ gnome_volume_control_element_whitelist (NULL);
for (item = gst_mixer_list_tracks (mixer);
item != NULL; item = item->next) {
GstMixerTrack *track = item->data;
--- NEW FILE gst-mixer.spec ---
%global gettext_package gst-mixer-2.0
Summary: Legacy gnome-volume-control for advanced use cases
Name: gst-mixer
Version: 2.26.0
Release: 2%{?dist}
License: GPLv2+ and GFDL
Group: Applications/Multimedia
Source: http://download.gnome.org/sources/gnome-media/2.26/gnome-media-%{version}.tar.bz2
# Renames the app from 'gnome-volume-control' to 'gst-mixer'
Patch0: gst-mixer-2.26.0-rebrand.patch
# Fixes Launchpad bug #345645 (patch from that report / upstream)
Patch1: gst-mixer-2.26.0-switch.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://www.gnome.org
ExcludeArch: s390 s390x
Requires(post): scrollkeeper >= 0.1.4
Requires(postun): scrollkeeper >= 0.1.4
Requires(post): GConf2 >= 2.14
Requires(pre): GConf2 >= 2.14
Requires(preun): GConf2 >= 2.14
BuildRequires: gtk2-devel >= 2.10.0
BuildRequires: libgnome-devel >= 2.13.7
BuildRequires: libgnomeui-devel >= 2.13.2
BuildRequires: libglade2-devel
BuildRequires: GConf2-devel
BuildRequires: gstreamer-devel >= 0.10.3
BuildRequires: gstreamer-plugins-base-devel >= 0.10.3
BuildRequires: dbus-glib-devel
BuildRequires: libcanberra-devel
BuildRequires: gnome-doc-utils
BuildRequires: intltool
BuildRequires: unique-devel
# for patch 0
BuildRequires: autoconf automake libtool
#For stuff dropped from this 'alternate' package
Requires: gnome-media
%description
This package contains the pre-GNOME 2.26 version of the GNOME
volume control application, renamed 'gst-mixer' (the name it carries
in the source tree). It is provided to cover use cases the new
GNOME volume control application cannot handle.
%prep
%setup -q -n gnome-media-%{version}
%patch0 -p1
%patch1 -p1
mv gst-mixer/gnome-volume-control.desktop.in.in gst-mixer/gst-mixer.desktop.in.in
mv gst-mixer/gnome-volume-control.schemas.in gst-mixer/gst-mixer.schemas.in
mv gst-mixer/doc/gnome-volume-control.omf.in gst-mixer/doc/gst-mixer.omf.in
mv gst-mixer/doc/C/gnome-volume-control.xml gst-mixer/doc/C/gst-mixer.xml
autoreconf -f -i
%build
# try to work around a problem where gst-inspect does
# not find playbin the first time around
DBUS_FATAL_WARNINGS=0 /usr/bin/gst-inspect-0.10 --print-all > /dev/null
%configure --disable-schemas-install --enable-gnomecd=no --enable-cddbslave=no --enable-gstmix --disable-pulseaudio --disable-grecord --disable-esound --disable-gstprops --disable-profiles
make #%{?_smp_mflags}
# strip unneeded translations from .mo files
# ideally intltool (ha!) would do that for us
# http://bugzilla.gnome.org/show_bug.cgi?id=474987
cd po
grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
mv POTFILES.keep POTFILES.in
intltool-update --pot
for p in *.po; do
msgmerge $p %{gettext_package}.pot > $p.out
msgfmt -o `basename $p .po`.gmo $p.out
done
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.*a
rm -rf $RPM_BUILD_ROOT%{_libdir}/libglade/2.0/lib*.*a
rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
# We don't want all this in this 'alternative' package: we'll
# require gnome-media (see above) to let the 'master' package
# provide it
rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/status
rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-media/sounds
rm -rf $RPM_BUILD_ROOT%{_datadir}/sounds
# save space by linking identical images in translated docs
for helpdir in $RPM_BUILD_ROOT%{_datadir}/gnome/help/*; do
for f in $helpdir/C/figures/*.png; do
b="$(basename $f)"
for d in $helpdir/*; do
if [ -d "$d" -a "$d" != "$helpdir/C" ]; then
g="$d/figures/$b"
if [ -f "$g" ]; then
if cmp -s $f $g; then
rm "$g"; ln -s "../../C/figures/$b" "$g"
fi
fi
fi
done
done
done
%find_lang %{gettext_package} --all-name --with-gnome
%clean
rm -rf $RPM_BUILD_ROOT
%post
scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
%{_sysconfdir}/gconf/schemas/gst-mixer.schemas \
> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%pre
if [ "$1" -gt 1 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
if [ -f %{_sysconfdir}/gconf/schemas/gst-mixer.schemas ] ; then
gconftool-2 --makefile-uninstall-rule \
%{_sysconfdir}/gconf/schemas/gst-mixer.schemas \
> /dev/null || :
fi
fi
%preun
if [ "$1" -eq 0 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
if [ -f %{_sysconfdir}/gconf/schemas/gst-mixer.schemas ] ; then
gconftool-2 --makefile-uninstall-rule \
%{_sysconfdir}/gconf/schemas/gst-mixer.schemas \
> /dev/null || :
fi
fi
%postun
scrollkeeper-update -q || :
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%files -f %{gettext_package}.lang
%defattr(-, root, root)
%doc AUTHORS COPYING NEWS README
%{_sysconfdir}/gconf/schemas/gst-mixer.schemas
%{_datadir}/icons/hicolor/16x16/devices/*
%{_datadir}/gnome-media/pixmaps
%{_datadir}/applications/*
%{_bindir}/*
%changelog
* Fri May 1 2009 Adam Williamson <awilliam at redhat.com> - 2.26.0-2
- Drop a bunch of %%defines in the spec as recommended for review
* Tue Apr 28 2009 Adam Williamson <awilliam at redhat.com> - 2.26.0-1
- Initial Fedora package based on gnome-media spec
--- NEW FILE import.log ---
gst-mixer-2_26_0-2_aw_fc11:HEAD:gst-mixer-2.26.0-2.aw_fc11.src.rpm:1241470822
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gst-mixer/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 4 May 2009 20:36:03 -0000 1.1
+++ .cvsignore 4 May 2009 21:12:06 -0000 1.2
@@ -0,0 +1 @@
+gnome-media-2.26.0.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gst-mixer/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 4 May 2009 20:36:03 -0000 1.1
+++ sources 4 May 2009 21:12:06 -0000 1.2
@@ -0,0 +1 @@
+3d519bc7d812aed8f6e4288b6d3cdf26 gnome-media-2.26.0.tar.bz2
More information about the fedora-extras-commits
mailing list