4:33 p.m.
Author: thl
Update of /cvs/free/rpms/xmms-wma/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11093
Modified Files:
.cvsignore sources
Added Files:
xmms-wma-1.0.5-build.patch xmms-wma.spec
Log Message:
sync with devel (after importing from freshrpms there)
xmms-wma-1.0.5-build.patch:
--- NEW FILE xmms-wma-1.0.5-build.patch ---
diff -Naupr xmms-wma-1.0.5.orig/ffmpeg-strip-wma/config.h
xmms-wma-1.0.5/ffmpeg-strip-wma/config.h
--- xmms-wma-1.0.5.orig/ffmpeg-strip-wma/config.h 2004-02-19 01:08:56.000000000 +0100
+++ xmms-wma-1.0.5/ffmpeg-strip-wma/config.h 2005-12-02 17:09:41.000000000 +0100
@@ -1,8 +1,8 @@
/* Automatically generated by configure - do not modify */
-#define ARCH_X86 1
+#undef ARCH_X86
#define TUNECPU generic
#undef HAVE_MMX
-#define __CPU__ 586
+#undef __CPU__
#define HAVE_BUILTIN_VECTOR 1
#define HAVE_LOCALTIME_R 1
#define HAVE_LRINTF 1
diff -Naupr xmms-wma-1.0.5.orig/ffmpeg-strip-wma/Makefile
xmms-wma-1.0.5/ffmpeg-strip-wma/Makefile
--- xmms-wma-1.0.5.orig/ffmpeg-strip-wma/Makefile 2004-02-23 01:47:06.000000000 +0100
+++ xmms-wma-1.0.5/ffmpeg-strip-wma/Makefile 2005-12-02 17:12:19.000000000 +0100
@@ -6,7 +6,7 @@
include config.mak
# NOTE: -I.. is needed to include config.h
-CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-D_GNU_SOURCE
+CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-D_GNU_SOURCE -fPIC
OBJS= common.o utils.o mem.o allcodecs.o futils.o cutils.o os_support.o allformats.o
parser.o \
avio.o aviobuf.o file.o simple_idct.o dsputil.o fft.o mdct.o asf.o
diff -Naupr xmms-wma-1.0.5.orig/Makefile xmms-wma-1.0.5/Makefile
--- xmms-wma-1.0.5.orig/Makefile 2004-03-03 15:47:58.000000000 +0100
+++ xmms-wma-1.0.5/Makefile 2005-12-02 17:10:48.000000000 +0100
@@ -1,6 +1,6 @@
.PHONY: all install install-home uninstall uninstall-home clean
-INSTALL_DIR := /usr/lib/xmms/Input
+INSTALL_DIR := $(xmms-config --input-plugin-dir)
INSTALL_DIR_HOME := ~/.xmms/Plugins/Input
export PLUGIN_FILE := libwma.so
@@ -13,7 +13,6 @@ export DEPS := $(SOURCES:%.c=$(DEPDIR)/%
all:
@cd ffmpeg-strip-wma; make; cd ..
@$(MAKE) --no-print-directory -f Makefile.inc
- @strip $(PLUGIN_FILE)
@echo "The plug-in has been compiled. Run one of the following:"
@echo "make install - for global (root) installation to $(INSTALL_DIR)"
@echo "make install-home - for installation to home directory
$(INSTALL_DIR_HOME)"
diff -Naupr xmms-wma-1.0.5.orig/Makefile.inc xmms-wma-1.0.5/Makefile.inc
--- xmms-wma-1.0.5.orig/Makefile.inc 2005-09-05 14:48:20.000000000 +0200
+++ xmms-wma-1.0.5/Makefile.inc 2005-12-02 17:16:01.000000000 +0100
@@ -7,7 +7,7 @@ CFLAGS += `xmms-config --cflags`
LIBS := `xmms-config --libs` -L ffmpeg-strip-wma -lffwma
$(PLUGIN_FILE): $(OBJECTS)
- $(CC) -o $@ $^ $(LIBS) -shared
+ $(CC) -o $@ $^ $(LIBS) -shared -fPIC
$(OBJDIR)/%.o: %.c
$(CC) -c -o $@ $(CFLAGS) $<
--- NEW FILE xmms-wma.spec ---
%define xmms_inputdir %(xmms-config --input-plugin-dir 2>/dev/null || echo
%{_libdir}/xmms/Input)
Summary: X MultiMedia System input plugin to play Windows Media Audio files
Name: xmms-wma
Version: 1.0.5
Release: 4%{?dist}
License: GPL
Group: Applications/Multimedia
URL: http://mcmcc.bat.ru/xmms-wma/
Source: http://mcmcc.bat.ru/xmms-wma/xmms-wma-%{version}.tar.bz2
Patch: xmms-wma-1.0.5-build.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: xmms-devel, gtk+-devel
%description
X MultiMedia System input plugin to play Windows Media Audio, aka WMA files.
This plug-in is written using the ffmpeg library (http://ffmpeg.sf.net)
written by Fabrice Bellard (to be exact, strongly advanced library).
Everything besides wma format support was removed from it to make it lighter.
Tag informations are converted from unicode to your system locale.
%prep
%setup
%patch -p1 -b .build
%build
%{__make} %{?_smp_mflags} OPTFLAGS="%{optflags} -finline-functions"
%install
%{__rm} -rf %{buildroot}
%{__install} -D -m 0755 libwma.so %{buildroot}%{xmms_inputdir}/libwma.so
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-, root, root, 0755)
%lang(ru) %doc readme.rus
%doc COPYING readme.eng
%{xmms_inputdir}/libwma.so
%changelog
* Sat Oct 18 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.0.5-4
- rebuild for RPM Fusion
* Mon Apr 10 2006 Matthias Saou <http://freshrpms.net/> 1.0.5-3
- Remove explicit xmms requirement, since we really only require the libs.
* Fri Mar 17 2006 Matthias Saou <http://freshrpms.net/> 1.0.5-2
- Release bump to drop the disttag number in FC5 build.
* Fri Dec 2 2005 Matthias Saou <http://freshrpms.net/> 1.0.5-1
- Update to 1.0.5.
- Drop gcc4 patch, got fixed in 1.0.4.1.
- Update build patch, seems like -fPIC got added at least in one place, but I
don't think it's sufficient.
* Wed Jun 15 2005 Matthias Saou <http://freshrpms.net/> 1.0.4-4
- Force -finline-functions to work around possible bug in gcc 3.x (not 4.x),
thanks to Wesley Wright again.
* Wed Jun 8 2005 Matthias Saou <http://freshrpms.net/> 1.0.4-3
- Include build patch with changes from Wesley Wright.
* Sun Jun 5 2005 Matthias Saou <http://freshrpms.net/> 1.0.4-2
- Disable explicit stripping to get useful debuginfo package.
* Sun Apr 17 2005 Matthias Saou <http://freshrpms.net/> 1.0.4-1
- Update to 1.0.4.
- Added gcc4 compile fix (http://gcc.gnu.org/ml/gcc/2005-02/msg00053.html).
* Mon Jun 7 2004 Matthias Saou <http://freshrpms.net/> 1.0.3-1
- Initial rpm package.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xmms-wma/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 18 Oct 2008 13:45:30 -0000 1.1
+++ .cvsignore 18 Oct 2008 16:33:55 -0000 1.2
@@ -0,0 +1 @@
+xmms-wma-1.0.5.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xmms-wma/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 18 Oct 2008 13:45:30 -0000 1.1
+++ sources 18 Oct 2008 16:33:55 -0000 1.2
@@ -0,0 +1 @@
+5d62a0f969617aeb40096362c7a8a506 xmms-wma-1.0.5.tar.bz2