Author: rdieter Update of /cvs/free/rpms/libtunepimp-extras-freeworld/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv29107 Modified Files: libtunepimp-extras-freeworld.spec Added Files: libtunepimp-0.5.3-libmad.patch Log Message: libmad patch 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 Index: libtunepimp-extras-freeworld.spec =================================================================== RCS file: /cvs/free/rpms/libtunepimp-extras-freeworld/F-9/libtunepimp-extras-freeworld.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libtunepimp-extras-freeworld.spec 19 Sep 2008 13:42:29 -0000 1.1 +++ libtunepimp-extras-freeworld.spec 3 Oct 2008 13:16:30 -0000 1.2 @@ -16,9 +16,11 @@ 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 @@ -49,6 +51,11 @@ %setup -q -n libtunepimp-%{version} %patch1 -p1 -b .gcc43 +%patch2 -p1 -b .libmad + +libtoolize --force +aclocal +automake %build