devel/xosd xosd-defaults.patch,NONE,1.1 xosd.spec,1.7,1.8
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Thu Mar 17 21:57:11 UTC 2005
Author: scop
Update of /cvs/extras/devel/xosd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27914
Modified Files:
xosd.spec
Added Files:
xosd-defaults.patch
Log Message:
Add BMP plugin subpackage, improve default config.
xosd-defaults.patch:
--- NEW FILE xosd-defaults.patch ---
diff -Naru xosd-2.2.14.orig/src/bmp_plugin/bmp_osd.c xosd-2.2.14/src/bmp_plugin/bmp_osd.c
--- xosd-2.2.14.orig/src/bmp_plugin/bmp_osd.c 2004-11-17 21:26:56.000000000 +0200
+++ xosd-2.2.14/src/bmp_plugin/bmp_osd.c 2005-03-17 23:42:25.000000000 +0200
@@ -177,8 +177,8 @@
colour = NULL;
font = NULL;
timeout = 3;
- offset = 50;
- h_offset = 0;
+ offset = 60;
+ h_offset = 60;
shadow_offset = 1;
outline_offset = 0;
pos = XOSD_bottom;
diff -Naru xosd-2.2.14.orig/src/libxosd/xosd.c xosd-2.2.14/src/libxosd/xosd.c
--- xosd-2.2.14.orig/src/libxosd/xosd.c 2004-11-17 21:27:11.000000000 +0200
+++ xosd-2.2.14/src/libxosd/xosd.c 2005-03-17 23:43:48.000000000 +0200
@@ -24,7 +24,7 @@
#define XOFFSET 10
const char *osd_default_font =
- "-misc-fixed-medium-r-semicondensed--*-*-*-*-c-*-*-*";
+ "-*-luxi sans-*-r-*-*-17-*-*-*-*-*-*-*";
#if 0
"-adobe-helvetica-bold-r-*-*-10-*";
#endif
diff -Naru xosd-2.2.14.orig/src/xmms_plugin/xmms_osd.c xosd-2.2.14/src/xmms_plugin/xmms_osd.c
--- xosd-2.2.14.orig/src/xmms_plugin/xmms_osd.c 2004-11-04 21:47:50.000000000 +0200
+++ xosd-2.2.14/src/xmms_plugin/xmms_osd.c 2005-03-17 23:42:11.000000000 +0200
@@ -177,8 +177,8 @@
colour = NULL;
font = NULL;
timeout = 3;
- offset = 50;
- h_offset = 0;
+ offset = 60;
+ h_offset = 60;
shadow_offset = 1;
outline_offset = 0;
pos = XOSD_bottom;
Index: xosd.spec
===================================================================
RCS file: /cvs/extras/devel/xosd/xosd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xosd.spec 29 Nov 2004 18:40:26 -0000 1.7
+++ xosd.spec 17 Mar 2005 21:57:09 -0000 1.8
@@ -1,8 +1,9 @@
-%define plugdir %(xmms-config --general-plugin-dir 2>/dev/null)
+%define xmms_plugdir %(xmms-config --general-plugin-dir 2>/dev/null)
+%define bmp_plugdir %(pkg-config bmp --variable=general_plugin_dir 2>/dev/null)
Name: xosd
Version: 2.2.14
-Release: 1
+Release: 2
Summary: On-screen display library for X
Group: System Environment/Libraries
@@ -10,9 +11,11 @@
URL: http://www.ignavus.net/software.html
Source: http://ftp.debian.org/debian/pool/main/x/xosd/xosd_2.2.14.orig.tar.gz
Patch0: %{name}-aclocal18.patch
+Patch1: %{name}-defaults.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk+-devel >= 1:1.2.2, gdk-pixbuf-devel >= 1:0.22.0, xmms-devel
+BuildRequires: bmp-devel
%description
XOSD displays text on your screen, sounds simple right? The difference
@@ -32,19 +35,29 @@
display.
%package -n xmms-%{name}
-Summary: An XMMS plugin for on-screen display using the XOSD library
+Summary: XMMS plugin for on-screen display using the XOSD library
Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}, xmms
Obsoletes: %{name}-xmms <= 2.2.12
%description -n xmms-%{name}
-An X MultiMedia System plugin to display information on-screen through
+X MultiMedia System plugin to display information on-screen through
+the XOSD library, similarly to TV OSD.
+
+%package -n bmp-%{name}
+Summary: BMP plugin for on-screen display using the XOSD library
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}, bmp
+
+%description -n bmp-%{name}
+Beep Media Player plugin to display information on-screen through
the XOSD library, similarly to TV OSD.
%prep
%setup -q
%patch0 -p0
+%patch1 -p1
%build
@@ -56,7 +69,7 @@
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT{%{_libdir},%{plugdir}}/*.la
+rm -f $RPM_BUILD_ROOT{%{_libdir},%{xmms_plugdir},%{bmp_plugdir}}/*.la
%clean
@@ -87,10 +100,18 @@
%files -n xmms-%{name}
%defattr(-,root,root,-)
-%{plugdir}/*.so
+%{xmms_plugdir}/*.so
+
+%files -n bmp-%{name}
+%defattr(-,root,root,-)
+%{bmp_plugdir}/*.so
%changelog
+* Thu Mar 17 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.2.14-2
+- Add Beep Media Player plugin subpackage.
+- Improve default font and plugin OSD placement.
+
* Mon Nov 29 2004 Ville Skyttä <ville.skytta at iki.fi> - 2.2.14-1
- Update to 2.2.14 (from Debian).
- Drop pre-FC1 gdk-pixbuf compatibility kludges.
More information about the fedora-extras-commits
mailing list