2:07 p.m.
Author: rdieter
Update of /cvs/free/rpms/libtunepimp-extras-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25012
Modified Files:
libtunepimp-extras-freeworld.spec
Added Files:
libtunepimp-0.5.3-libmad.patch
Log Message:
use cleaner/simpler pkg-config approach wrt libmad, see if it helps build failures
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 08:58:53.000000000 -0500
@@ -236,7 +236,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 +245,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
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:03:13.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
diff -up libtunepimp-0.5.3/plugins/mp3/Makefile.in.libmad
libtunepimp-0.5.3/plugins/mp3/Makefile.in
--- libtunepimp-0.5.3/plugins/mp3/Makefile.in.libmad 2008-09-19 08:59:22.000000000 -0500
+++ libtunepimp-0.5.3/plugins/mp3/Makefile.in 2008-09-19 09:03:38.000000000 -0500
@@ -243,11 +243,11 @@ top_srcdir = @top_srcdir@
#
#
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
all: all-recursive
Index: libtunepimp-extras-freeworld.spec
===================================================================
RCS file:
/cvs/free/rpms/libtunepimp-extras-freeworld/devel/libtunepimp-extras-freeworld.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libtunepimp-extras-freeworld.spec 15 Sep 2008 15:42:36 -0000 1.3
+++ libtunepimp-extras-freeworld.spec 19 Sep 2008 14:07:56 -0000 1.4
@@ -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
BuildRequires: libmusicbrainz-devel >= 2.1.0
BuildRequires: readline-devel ncurses-devel
BuildRequires: zlib-devel
@@ -49,6 +51,10 @@
%setup -q -n libtunepimp-%{version}
%patch1 -p1 -b .gcc43
+%patch2 -p1 -b .libmad
+
+aclocal
+automake
%build