1:17 p.m.
Author: rdieter
Update of /cvs/free/rpms/libtunepimp-extras-freeworld/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29552
Added Files:
libtunepimp-0.5.3-gcc43.patch libtunepimp-0.5.3-libmad.patch
libtunepimp-extras-freeworld.spec
Log Message:
sync w/devel branch
libtunepimp-0.5.3-gcc43.patch:
--- NEW FILE libtunepimp-0.5.3-gcc43.patch ---
diff -up libtunepimp-0.5.3/lib/metadata.cpp.gcc43 libtunepimp-0.5.3/lib/metadata.cpp
--- libtunepimp-0.5.3/lib/metadata.cpp.gcc43 2006-11-18 04:52:33.000000000 -0600
+++ libtunepimp-0.5.3/lib/metadata.cpp 2008-02-21 20:39:10.000000000 -0600
@@ -26,6 +26,7 @@
----------------------------------------------------------------------------*/
#include <math.h>
#include <stdio.h>
+#include <stdlib.h>
#include "metadata.h"
#include "../config.h"
using namespace std;
diff -up libtunepimp-0.5.3/lib/protocol.cpp.gcc43 libtunepimp-0.5.3/lib/protocol.cpp
--- libtunepimp-0.5.3/lib/protocol.cpp.gcc43 2006-11-28 14:25:04.000000000 -0600
+++ libtunepimp-0.5.3/lib/protocol.cpp 2008-02-21 20:39:10.000000000 -0600
@@ -8,6 +8,7 @@
-------------------------------------------------------------------*/
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <string>
#include <map>
#include <expat.h>
diff -up libtunepimp-0.5.3/lib/utf8/utf8util.cpp.gcc43
libtunepimp-0.5.3/lib/utf8/utf8util.cpp
--- libtunepimp-0.5.3/lib/utf8/utf8util.cpp.gcc43 2006-11-18 04:52:26.000000000 -0600
+++ libtunepimp-0.5.3/lib/utf8/utf8util.cpp 2008-02-21 20:39:10.000000000 -0600
@@ -26,6 +26,7 @@
----------------------------------------------------------------------------*/
#include <stdio.h>
+#include <stdlib.h>
#include "utf8util.h"
#include "utf8.h"
#ifdef WIN32
diff -up libtunepimp-0.5.3/lib/tunepimp.cpp.gcc43 libtunepimp-0.5.3/lib/tunepimp.cpp
--- libtunepimp-0.5.3/lib/tunepimp.cpp.gcc43 2006-11-18 04:52:33.000000000 -0600
+++ libtunepimp-0.5.3/lib/tunepimp.cpp 2008-02-21 20:39:10.000000000 -0600
@@ -30,7 +30,9 @@
#endif
#endif
+#include <string.h>
#include <stdio.h>
+#include <stdlib.h>
#include <map>
using namespace std;
diff -up libtunepimp-0.5.3/lib/c_wrapper.cpp.gcc43 libtunepimp-0.5.3/lib/c_wrapper.cpp
--- libtunepimp-0.5.3/lib/c_wrapper.cpp.gcc43 2006-11-18 04:52:33.000000000 -0600
+++ libtunepimp-0.5.3/lib/c_wrapper.cpp 2008-02-21 20:39:10.000000000 -0600
@@ -24,6 +24,7 @@
$Id: c_wrapper.cpp 8360 2006-08-07 21:05:12Z luks $
----------------------------------------------------------------------------*/
+#include <stdlib.h>
#include "tunepimp.h"
#include "mutex.h"
#include "tp_c.h"
diff -up libtunepimp-0.5.3/lib/readmeta.cpp.gcc43 libtunepimp-0.5.3/lib/readmeta.cpp
--- libtunepimp-0.5.3/lib/readmeta.cpp.gcc43 2006-11-18 04:52:33.000000000 -0600
+++ libtunepimp-0.5.3/lib/readmeta.cpp 2008-02-21 20:39:10.000000000 -0600
@@ -31,6 +31,7 @@
#endif
#include <stdio.h>
+#include <stdlib.h>
#ifndef WIN32
#include <unistd.h>
#endif
diff -up libtunepimp-0.5.3/lib/fileio.cpp.gcc43 libtunepimp-0.5.3/lib/fileio.cpp
--- libtunepimp-0.5.3/lib/fileio.cpp.gcc43 2006-11-18 04:52:33.000000000 -0600
+++ libtunepimp-0.5.3/lib/fileio.cpp 2008-02-21 20:39:10.000000000 -0600
@@ -27,6 +27,8 @@
#include <assert.h>
#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
#include <string>
#ifndef WIN32
#include <unistd.h>
diff -up libtunepimp-0.5.3/plugins/mp4/mp4.cpp.gcc43
libtunepimp-0.5.3/plugins/mp4/mp4.cpp
--- libtunepimp-0.5.3/plugins/mp4/mp4.cpp.gcc43 2006-11-18 04:51:08.000000000 -0600
+++ libtunepimp-0.5.3/plugins/mp4/mp4.cpp 2008-02-21 20:39:10.000000000 -0600
@@ -27,6 +27,7 @@
#include <string.h>
#include <stdio.h>
+#include <stdlib.h>
#include <mp4.h>
#include "metadata.h"
#include "plugin.h"
diff -up libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp.gcc43
libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp
--- libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp.gcc43 2006-11-18 04:51:07.000000000 -0600
+++ libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp 2008-02-21 20:41:35.000000000 -0600
@@ -26,6 +26,7 @@
----------------------------------------------------------------------------*/
#include <stdio.h>
+#include <stdlib.h>
#include <time.h>
#include <ctype.h>
#include <musicbrainz/mb_c.h>
diff -up libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp.gcc43
libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp
--- libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp.gcc43 2006-11-18 04:51:07.000000000
-0600
+++ libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp 2008-02-21 20:41:59.000000000 -0600
@@ -26,6 +26,7 @@
----------------------------------------------------------------------------*/
#include <stdio.h>
+#include <stdlib.h>
#include <assert.h>
#include <ctype.h>
#include <musicbrainz/mb_c.h>
diff -up libtunepimp-0.5.3/plugins/wma/wma.cpp.gcc43
libtunepimp-0.5.3/plugins/wma/wma.cpp
--- libtunepimp-0.5.3/plugins/wma/wma.cpp.gcc43 2006-11-18 04:51:28.000000000 -0600
+++ libtunepimp-0.5.3/plugins/wma/wma.cpp 2008-02-21 20:39:10.000000000 -0600
@@ -27,6 +27,7 @@
#include <string.h>
#include <stdio.h>
+#include <stdlib.h>
#include <wmafile.h>
#include "metadata.h"
#include "plugin.h"
diff -up libtunepimp-0.5.3/plugins/wma/wmafile.cpp.gcc43
libtunepimp-0.5.3/plugins/wma/wmafile.cpp
--- libtunepimp-0.5.3/plugins/wma/wmafile.cpp.gcc43 2006-11-18 04:51:28.000000000 -0600
+++ libtunepimp-0.5.3/plugins/wma/wmafile.cpp 2008-02-21 20:39:10.000000000 -0600
@@ -19,6 +19,7 @@
* USA *
***************************************************************************/
+#include <string.h>
#include <tstring.h>
#include <wmafile.h>
#include <wmatag.h>
diff -up libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h.gcc43
libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h
--- libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h.gcc43 2006-11-18 04:52:08.000000000
-0600
+++ libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h 2008-02-21 20:39:10.000000000 -0600
@@ -27,6 +27,7 @@
#ifndef __METADATA_H__
#define __METADATA_H__
+#include <string.h>
#include <string>
#include <cstdio>
libtunepimp-0.5.3-libmad.patch:
--- NEW FILE libtunepimp-0.5.3-libmad.patch ---
diff -up libtunepimp-0.5.3/configure.in.libmad libtunepimp-0.5.3/configure.in
--- libtunepimp-0.5.3/configure.in.libmad 2006-11-28 14:28:38.000000000 -0600
+++ libtunepimp-0.5.3/configure.in 2008-09-19 09:28:19.000000000 -0500
@@ -236,7 +237,7 @@ AC_CHECK_LIB(mp4v2, MP4Read, [
if test "x$use_lgpl" = "xno"; then
dnl Check for MAD decoder lib for mp3 support
- AC_CHECK_LIB(mad,mad_version,
+ PKG_CHECK_MODULES(MAD, mad,
AC_DEFINE(HAVE_LIBMAD,1,[MP3 Decode Support])
TP_PLUGINS="$TP_PLUGINS mp3"
with_mp3=yes,
@@ -245,8 +246,8 @@ if test "x$use_lgpl" = "xno"; then
echo "* the decoder from
http://www.mars.org/home/rob/proj/mpeg"
echo "* to include MP3 TRM generation capabilities."
echo "*"
- with_mp3=no
- ,-lm)
+ , with_mp3=no
+ )
else
with_mp3=no
fi
@@ -277,7 +278,6 @@ else
with_flac=no
fi
-
AC_SUBST(TP_PLUGINS)
AC_SUBST(CFLAGS)
AC_DEFINE_UNQUOTED(PREFIX, "${prefix}", "PREFIX")
diff -up libtunepimp-0.5.3/plugins/mp3/Makefile.am.libmad
libtunepimp-0.5.3/plugins/mp3/Makefile.am
--- libtunepimp-0.5.3/plugins/mp3/Makefile.am.libmad 2006-11-18 04:51:07.000000000 -0600
+++ libtunepimp-0.5.3/plugins/mp3/Makefile.am 2008-09-19 09:28:01.000000000 -0500
@@ -24,12 +24,12 @@
#
SUBDIRS = id3tag id3tag-2.3
-INCLUDES = -I$(top_srcdir)/include/tunepimp-0.5 $(INCLTDL)
+INCLUDES = -I$(top_srcdir)/include/tunepimp-0.5 $(INCLTDL) $(MAD_CFLAGS)
lib_LTLIBRARIES = mp3.la
mp3_la_SOURCES = mp3.cpp mp3decode.cpp mp3decode.h id3_meta.cpp id3_2_3_meta.cpp
mp3info.cpp
mp3_la_LDFLAGS = -module -avoid-version
-mp3_la_LIBADD = ../../lib/utf8/libutf8.la id3tag/libid3tag.la id3tag-2.3/libid3tag23.la
../../lib/libpluginsupport.la -lmad -lmusicbrainz
+mp3_la_LIBADD = ../../lib/utf8/libutf8.la id3tag/libid3tag.la id3tag-2.3/libid3tag23.la
../../lib/libpluginsupport.la $(MAD_LIBS) -lmusicbrainz
noinst_HEADERS = mp3decode.h id3_meta.h mp3info.h id3_2_3_meta.h mp3.h
--- NEW FILE libtunepimp-extras-freeworld.spec ---
Summary: Additional plugins for libtunepimp
Name: libtunepimp-extras-freeworld
Version: 0.5.3
Release: 5%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.musicbrainz.org/products/tunepimp/
# see http://musicbrainz.org/doc/libtunepimpDownload
Source0: http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# obsolete old livna package
Provides: libtunepimp-extras-nonfree = %{version}-%{release}
Obsoletes: libtunepimp-extras-nonfree < 0.5.3-5
Patch1: libtunepimp-0.5.3-gcc43.patch
Patch2: libtunepimp-0.5.3-libmad.patch
%define pkglibdir %{_libdir}/tunepimp
BuildRequires: automake libtool
BuildRequires: libmusicbrainz-devel >= 2.1.0
BuildRequires: readline-devel ncurses-devel
BuildRequires: zlib-devel
BuildRequires: libofa-devel
# These two are likely bogus (used just in examples/ ) -- Rex
BuildRequires: curl-devel
BuildRequires: expat-devel
BuildRequires: libmad-devel
%if 0%{?_with_mp4:1}
BuildRequires: libmp4v2-devel
Provides: libtunepimp-mp4 = %{version}-%{release}
%endif
Obsoletes: libtunepimp-mp3 < %{version}-%{release}
Provides: libtunepimp-mp3 = %{version}-%{release}
# Fedora's libtunepimp-0.5.x now Provides: libtunepimp5
Requires: libtunepimp5
%description
%{summary}.
%prep
%setup -q -n libtunepimp-%{version}
%patch1 -p1 -b .gcc43
%patch2 -p1 -b .libmad
libtoolize --force
aclocal
automake
%build
%configure \
--disable-static \
--disable-dependency-tracking
make %{?_smp_mflags} PLUGIN_DIR=%{pkglibdir}/plugins
%check
# sanity check
make -C plugins/mp3 PLUGIN_DIR=%{pkglibdir}/plugins
%{?_with_mp4:make -C plugins/mp4 PLUGIN_DIR=%{pkglibdir}/plugins}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT PLUGIN_DIR=%{pkglibdir}/plugins
# delete/omit everything but the mp3 plugin
rm -rf $RPM_BUILD_ROOT%{_bindir}
rm -rf $RPM_BUILD_ROOT%{_includedir}
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*
rm -f $RPM_BUILD_ROOT%{pkglibdir}/plugins/[a-l,n-z]*.tpp
rm -f $RPM_BUILD_ROOT%{pkglibdir}/plugins/m[a-o,q-z]*.tpp
rm -f $RPM_BUILD_ROOT%{pkglibdir}/plugins/mp[a-z]*.tpp
%{!?_with_mp4:rm -f $RPM_BUILD_ROOT%{pkglibdir}/plugins/mp4.tpp}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc README.LGPL COPYING
%{pkglibdir}/plugins/mp3.tpp
%{?_with_mp4:%{pkglibdir}/plugins/mp4.tpp}
%changelog
* Sun Aug 10 2008 Thorsten Leemhuis <fedora at leemhuis.info> 0.5.3-5
- rename to libtunepimp-extras-freeworld
- add provides and obsoletes for package from livna
* Thu Feb 21 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.5.3-4
- gcc43 patch
* Thu Feb 21 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.5.3-3
- omit mp4 plugin
* Fri Oct 26 2007 Rex Dieter <rdieter[AT]fedoraprojecg.org> 0.5.3-2
- respin for f8
- License: LGPLv2+
* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.3-1
- libtunepimp-0.5.3
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.2-1
- libtunepimp-0.5.2
* Tue Sep 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.1-1
- libtunepimp-0.5.1
* Wed Sep 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.3-4
- -mp3 -> -extras-nonfree
- --with-mp4 (BR: libmp4v2-devel)
* Thu Aug 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.3-2
- BR: taglib-devel readline-devel ncurses-devel
- _with_mp4: include mp4 bits via libmp4v2 (optional, not included by default)
* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.3-1
- 0.4.3
* Thu Mar 16 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.2-1
- 0.4.2
* Thu Mar 16 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0-3
- gcc41 patch
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Sat Nov 19 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0-0.lvn.2
- BR: libmusicbrainz -> libmusicbrainz-devel
- BR: libogg-devel -> libvorbis-devel
- BR: zlib-devel
* Thu Nov 17 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0-0.lvn.1
- 0.4.0
* Mon Jun 13 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.3.0-1
- gcc4 patch
- 0.3.0 (first try)