[svn] r5091 - in trunk/rpms: . xmms-aac
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Wed Jan 17 13:58:07 CET 2007
Author: thias
Date: 2007-01-17 13:58:06 +0100 (Wed, 17 Jan 2007)
New Revision: 5091
Added:
trunk/rpms/xmms-aac/
trunk/rpms/xmms-aac/faad2-2.5-xmmsplugin.patch
trunk/rpms/xmms-aac/xmms-aac.spec
Log:
Initial import of separate xmms-aac package.
Added: trunk/rpms/xmms-aac/faad2-2.5-xmmsplugin.patch
===================================================================
--- trunk/rpms/xmms-aac/faad2-2.5-xmmsplugin.patch (rev 0)
+++ trunk/rpms/xmms-aac/faad2-2.5-xmmsplugin.patch 2007-01-17 12:58:06 UTC (rev 5091)
@@ -0,0 +1,103 @@
+diff -Naupr faad2.orig/configure.in faad2/configure.in
+--- faad2.orig/configure.in 2006-08-13 16:13:31.000000000 +0200
++++ faad2/configure.in 2007-01-17 13:31:35.000000000 +0100
+@@ -29,9 +29,6 @@ AM_CONFIG_HEADER(config.h)
+ AC_ARG_WITH(xmms,[ --with-xmms compile XMMS-1 plugin],
+ WITHXMMS=$withval, WITHXMMS=no)
+
+-AC_ARG_WITH(bmp,[ --with-bmp compile beep media player plugin],
+- [WITHBMP=$withval;WITHXMMS=$withval], [WITHBMP=no])
+-
+ AC_ARG_WITH(drm,[ --with-drm compile libfaad with DRM support],
+ WITHDRM=$withval, WITHDRM=no)
+
+@@ -114,12 +111,6 @@ else
+ AM_CONDITIONAL(HAVE_XMMS, false)
+ fi
+
+-if test x$WITHBMP = xyes; then
+- AC_DEFINE([HAVE_BMP], 1, [User wants beep media player plugin built])
+- AM_CONDITIONAL([HAVE_XMMS], true)
+- AM_CONDITIONAL([HAVE_BMP], true)
+-fi
+-
+ if test x$WITHDRM = xyes; then
+ AC_DEFINE(DRM, 1, [Define if you want to use libfaad together with Digital Radio Mondiale (DRM)])
+ AC_DEFINE(DRM_PS, 1, [Define if you want support for Digital Radio Mondiale (DRM) parametric stereo])
+diff -Naupr faad2.orig/plugins/Makefile.am faad2/plugins/Makefile.am
+--- faad2.orig/plugins/Makefile.am 2006-08-07 20:47:45.000000000 +0200
++++ faad2/plugins/Makefile.am 2007-01-17 13:29:01.000000000 +0100
+@@ -1,17 +1 @@
+-if HAVE_MPEG4IP_PLUG
+-if HAVE_XMMS
+-SUBDIRS = xmms mpeg4ip
+-else
+-SUBDIRS = mpeg4ip
+-endif #HAVE_XMMS
+-else
+-if HAVE_XMMS
+ SUBDIRS = xmms
+-else
+-if HAVE_BMP
+-SUBDIRS = bmp
+-else
+-SUBDIRS =
+-endif #HAVE_BMP
+-endif #HAVE_XMMS
+-endif #HAVE_MPEG4IP_PLUG
+diff -Naupr faad2.orig/plugins/xmms/src/libmp4.c faad2/plugins/xmms/src/libmp4.c
+--- faad2.orig/plugins/xmms/src/libmp4.c 2006-08-07 20:47:45.000000000 +0200
++++ faad2/plugins/xmms/src/libmp4.c 2007-01-17 13:41:10.000000000 +0100
+@@ -343,7 +343,7 @@ static void *mp4Decode(void *args)
+
+ while(bPlaying){
+ void* sampleBuffer;
+- faacDecFrameInfo frameInfo;
++ NeAACDecFrameInfo frameInfo;
+ gint rc;
+
+ if(seekPosition!=-1){
+@@ -376,7 +376,7 @@ static void *mp4Decode(void *args)
+ sampleBuffer = NeAACDecDecode(decoder, &frameInfo, buffer, bufferSize);
+ if(frameInfo.error > 0){
+ g_print("MP4: %s\n",
+- faacDecGetErrorMessage(frameInfo.error));
++ NeAACDecGetErrorMessage(frameInfo.error));
+ goto end;
+ }
+ if(buffer){
+@@ -487,7 +487,7 @@ end:
+ if(mp4_ip.output->open_audio(FMT_S16_NE,samplerate,channels) == FALSE){
+ g_print("AAC: Output Error\n");
+ g_free(buffer); buffer=0;
+- faacDecClose(decoder);
++ NeAACDecClose(decoder);
+ fclose(file);
+ mp4_ip.output->close_audio();
+ /*
+diff -Naupr faad2.orig/plugins/xmms/src/Makefile.am faad2/plugins/xmms/src/Makefile.am
+--- faad2.orig/plugins/xmms/src/Makefile.am 2006-08-07 20:47:45.000000000 +0200
++++ faad2/plugins/xmms/src/Makefile.am 2007-01-17 13:39:40.000000000 +0100
+@@ -1,19 +1,9 @@
+-if HAVE_BMP
+-libdir=$(shell pkg-config --variable=input-plugin-dir bmp)
+-local_CFLAGS=$(shell pkg-config --cflags bmp)
+-local_LDFLAGS=$(shell pkg-config --libs bmp)
+-else
+-local_CFLAGS=`$(XMMS_CONFIG) --cflags` -Wall
+-local_LDFLAGS=`$(XMMS_CONFIG) --libs`
++local_CFLAGS=`$(XMMS_CONFIG) --cflags` -I$(top_srcdir)/common/mp4ff
++local_LDFLAGS=`$(XMMS_CONFIG) --libs` -lfaad
+ libdir = `$(XMMS_CONFIG) --input-plugin-dir`
+-endif #HAVE_BMP
+ lib_LTLIBRARIES = libmp4.la
+
+-libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \
+- -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4ff
+-
+-libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \
+- $(top_builddir)/common/mp4ff/libmp4ff.la
++libmp4_la_CFLAGS = $(local_CFLAGS)
+
+ libmp4_la_LDFLAGS = -module -avoid-version $(local_LDFLAGS) -lpthread
+
Added: trunk/rpms/xmms-aac/xmms-aac.spec
===================================================================
--- trunk/rpms/xmms-aac/xmms-aac.spec (rev 0)
+++ trunk/rpms/xmms-aac/xmms-aac.spec 2007-01-17 12:58:06 UTC (rev 5091)
@@ -0,0 +1,63 @@
+# $Id$
+# Authority: matthias
+
+Summary: X MultiMedia System input plugin to play AAC files
+Name: xmms-aac
+Version: 2.5
+Release: 1
+License: GPL
+Group: Applications/Multimedia
+URL: http://www.audiocoding.com/
+Source: http://dl.sf.net/faac/faad2-%{version}.tar.gz
+Patch0: faad2-2.5-xmmsplugin.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+# Since the library version doesn't get bumped as it should, hardcode this dep
+Requires: faad2 = %{version}
+BuildRequires: autoconf, automake, libtool
+BuildRequires: xmms-devel, id3lib-devel, faad2-devel
+
+%description
+This xmms plugin reads AAC files with and without ID3 tags (version 2.x).
+AAC files are MPEG2 or MPEG4 files that can be found in MPEG4 audio files
+(.mp4). MPEG4 files with AAC inside can be read by RealPlayer or Quicktime.
+
+
+%prep
+%setup -n faad2
+%patch0 -p1 -b .xmmsplugin
+# Fix file modes (docs and sources shouldn't be executable)
+find plugins/xmms/ -type f -exec chmod 644 {} \;
+### Required to make automake < 1.7 work
+%{__perl} -pi -e 's|dnl AC_PROG_CXX|AC_PROG_CXX|' configure.in
+
+
+%build
+# This is what the README.linux file recommends
+autoreconf -vif
+%configure --with-xmms
+%{__make} -C plugins/xmms/ %{?_smp_mflags}
+
+
+%install
+%{__rm} -rf %{buildroot}
+%{__install} -D -m 0755 plugins/xmms/src/.libs/libmp4.so \
+ %{buildroot}%{_libdir}/xmms/Input/libmp4.so
+
+
+%clean
+%{__rm} -rf %{buildroot}
+
+
+%files
+%defattr(-, root, root, 0755)
+%doc COPYING plugins/xmms/AUTHORS plugins/xmms/README
+%dir %{_libdir}/xmms/Input/
+%{_libdir}/xmms/Input/libmp4.so
+
+
+%changelog
+* Tue Jan 9 2007 Matthias Saou <http://freshrpms.net/> 2.5-1
+- Fork off xmms-aac as a separate package since users seem to be requesting it.
+ (did I already mention that you should be using audacious?)
+- Include patch to remove BMP and fix build.
+
Property changes on: trunk/rpms/xmms-aac/xmms-aac.spec
___________________________________________________________________
Name: svn:keywords
+ Id
More information about the svn-commits
mailing list