rpms/bmp/devel beep.png, NONE, 1.1 bmp-0.9.7-default-alsa.patch, NONE, 1.1 bmp-0.9.7-default-skin.patch, NONE, 1.1 bmp-0.9.7-readmacro.patch, NONE, 1.1 bmp.sh, NONE, 1.1 bmp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Wed Mar 16 17:24:51 UTC 2005
Author: mschwendt
Update of /cvs/extras/rpms/bmp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7326/devel
Modified Files:
.cvsignore sources
Added Files:
beep.png bmp-0.9.7-default-alsa.patch
bmp-0.9.7-default-skin.patch bmp-0.9.7-readmacro.patch bmp.sh
bmp.spec
Log Message:
auto-import bmp-0.9.7-4 on branch devel from bmp-0.9.7-4.src.rpm
bmp-0.9.7-default-alsa.patch:
--- NEW FILE bmp-0.9.7-default-alsa.patch ---
diff -Nur bmp-0.9.7-orig/beep/main.c bmp-0.9.7/beep/main.c
--- bmp-0.9.7-orig/beep/main.c 2004-12-04 10:04:24.000000000 +0100
+++ bmp-0.9.7/beep/main.c 2005-03-16 18:03:12.000000000 +0100
@@ -504,9 +504,9 @@
cfg.gentitle_format = g_strdup("%p - %t");
if (!cfg.outputplugin) {
-#ifdef HAVE_OSS
+#ifdef HAVE_ALSA
cfg.outputplugin = g_build_filename(PLUGIN_DIR, plugin_dir_list[0],
- PLUGIN_FILENAME("OSS"), NULL);
+ PLUGIN_FILENAME("ALSA"), NULL);
#else
/* FIXME: This implicitly means the output plugin that is
* first in the alphabet will be used (usually the disk writer
bmp-0.9.7-default-skin.patch:
--- NEW FILE bmp-0.9.7-default-skin.patch ---
diff -Nur bmp-0.9.7/beep/main.c bmp-0.9.7-modified/beep/main.c
--- bmp-0.9.7/beep/main.c 2004-12-04 10:04:24.000000000 +0100
+++ bmp-0.9.7-modified/beep/main.c 2005-01-28 23:54:17.938968912 +0100
@@ -144,7 +144,7 @@
0.0, /* equalizer preamp */
{0, 0, 0, 0, 0, /* equalizer bands */
0, 0, 0, 0, 0},
- NULL, /* skin */
+ "/usr/share/xmms/Skins/Bluecurve-xmms.zip", /* skin */
NULL, /* output plugin */
NULL, /* file selector path */
NULL, /* playlist path */
bmp-0.9.7-readmacro.patch:
--- NEW FILE bmp-0.9.7-readmacro.patch ---
--- bmp-0.9.7-orig/libbeep/configfile.c 2004-06-23 01:50:53.000000000 +0200
+++ bmp-0.9.7/libbeep/configfile.c 2005-03-11 13:53:06.000000000 +0100
@@ -83,7 +83,7 @@
const gchar * section, const gchar * key,
XmmsCfgValueType value_type, gpointer * value)
{
- return xmms_cfg_value_type_func[value_type].read(config_file,
+ return (xmms_cfg_value_type_func[value_type].read)(config_file,
section, key, value);
}
@@ -91,7 +91,7 @@
const gchar * section, const gchar * key,
XmmsCfgValueType value_type, gpointer * value)
{
- xmms_cfg_value_type_func[value_type].read(config_file,
+ (xmms_cfg_value_type_func[value_type].read)(config_file,
section, key, value);
}
--- NEW FILE bmp.sh ---
#!/bin/sh
# Colon-separated directory path to look for
# additional skins. See man beep-media-player.
export SKINSDIR=/usr/share/xmms/Skins
--- NEW FILE bmp.spec ---
Name: bmp
Version: 0.9.7
Release: 4
Summary: GTK2 based port of the XMMS media player
Group: Applications/Multimedia
License: GPL
URL: http://beepmp.sourceforge.net/
# The original source files contain an mp3 decoder. It is removed in the
# -patched- file
# Source0: http://dl.sf.net/beepmp/bmp-%{version}.tar.gz
Source0: bmp-patched-%{version}.tar.gz
Source1: bmp.sh
Source2: beep.png
Patch0: bmp-0.9.7-readmacro.patch
Patch1: bmp-0.9.7-default-skin.patch
Patch2: bmp-0.9.7-default-alsa.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pkgconfig gtk2-devel esound-devel libvorbis-devel
BuildRequires: zlib-devel desktop-file-utils alsa-lib-devel
BuildRequires: gnome-vfs2-devel libglade2-devel
#BuildRequires: id3lib-devel
# Package seems to miscompile on PPC, possibly a endianess issue
ExcludeArch: ppc
%description
BMP (Beep Media Player) is a media player that currently uses a skinned
user interface based on Winamp 2.x skins. It is based on ("forked off")
XMMS.
%package devel
Summary: Development files for the Beep Media Player
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
Development files for the Beep Media Player
%prep
%setup -q
# Fix the improper use of read as a function name
%patch0 -p1 -b .readmacro
# Use the XMMS Bluecurve skin by default
%patch1 -p1 -b .default-skin
%patch2 -p1 -b .default-alsa
%build
%configure \
%ifarch %{ix86}
--enable-simd \
%endif
--disable-mp3 \
--enable-gconf \
--enable-gnome-vfs
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
perl -pi -e 's/svg/png/ ; s/^(Categories=.+[^;\n])$/\1;/' beep/bmp.desktop
desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category X-Fedora \
--add-category Application \
beep/bmp.desktop
rm -f $RPM_BUILD_ROOT%{_datadir}/applications/bmp.desktop
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
# Shell variables
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
# Replace icon
rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/bmp.svg
install -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/bmp.png
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog FAQ NEWS README TODO
%{_bindir}/*
%{_libdir}/*.so.*
%{_libdir}/bmp
%{_datadir}/bmp
%{_mandir}/man[^3]/*
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%config(noreplace) %{_sysconfdir}/profile.d/bmp.sh
%files devel
%defattr(-,root,root,-)
%{_includedir}/bmp
%{_libdir}/*.so
%{_libdir}/pkgconfig/*
%changelog
* Wed Mar 16 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.9.7-4
- Apply common spec cleanup and corrections.
- Add patch to make ALSA output driver the default.
* Sun Mar 13 2005 Ralf Ertzinger <ralf at skytale.net> 0.9.7-3
- More changes from livna
* Fri Mar 11 2005 Ralf Ertzinger <ralf at skytale.net> 0.9.7-2
- Added bmp.sh, default-skin patch from livna package
- Removed mp3 plugin code
* Fri Mar 11 2005 Ralf Ertzinger <ralf at skytale.net> 0.9.7-1
- Initial build for Fedora Extras
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bmp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 16 Mar 2005 17:21:19 -0000 1.1
+++ .cvsignore 16 Mar 2005 17:24:48 -0000 1.2
@@ -0,0 +1 @@
+bmp-patched-0.9.7.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bmp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 16 Mar 2005 17:21:19 -0000 1.1
+++ sources 16 Mar 2005 17:24:48 -0000 1.2
@@ -0,0 +1 @@
+bcfd525c376ff9ece8f935d34bdcb56e bmp-patched-0.9.7.tar.gz
More information about the fedora-extras-commits
mailing list