- system-libs.mk: update libmad build

archive-patches/libmad-pc-fix.diff

@@ -1,14 +0,0 @@
---- libmad-0.15.0b/mad.pc	1970-01-01 01:00:00.000000000 +0100
-+++ libmad-0.15.0bnew/mad.pc	2003-09-10 17:51:26.000000000 +0200
-@@ -0,0 +1,11 @@
-+prefix=
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/lib
-+includedir=${prefix}/include
-+
-+Name: mad
-+Description: MPEG Audio Decoder
-+Requires:
-+Version: 0.15.1b
-+Libs: -L${libdir} -lmad -lm
-+Cflags: -I${includedir}

archive-patches/libmad-pc.patch

@@ -0,0 +1,62 @@
+--- libmad-0.15.1b/configure.ac
++++ libmad-0.15.1b/configure.ac
+@@ -26,9 +26,9 @@
+ 
+ AC_CONFIG_SRCDIR([decoder.h])
+ 
+-AM_INIT_AUTOMAKE
+-
+-AM_CONFIG_HEADER([config.h])
++AM_INIT_AUTOMAKE([foreign])
++
++AC_CONFIG_HEADERS([config.h])
+ 
+ dnl System type.
+ 
+@@ -429,5 +428,5 @@
+ dnl AC_SUBST(LTLIBOBJS)
+ 
+ AC_CONFIG_FILES([Makefile msvc++/Makefile  \
+-	libmad.list])
++	libmad.list mad.pc])
+ AC_OUTPUT
+--- libmad-0.15.1b/mad.pc.in
++++ libmad-0.15.1b/mad.pc.in
+@@ -0,0 +1,14 @@
++# libmad pkg-config source file
++
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: mad
++Description: MPEG Audio Decoder
++Version: @VERSION@
++Requires:
++Conflicts:
++Libs: -L${libdir} -lmad -lm
++Cflags: -I${includedir}
+--- libmad-0.15.1b/Makefile.am
++++ libmad-0.15.1b/Makefile.am
+@@ -24,6 +24,9 @@
+ SUBDIRS =		
+ DIST_SUBDIRS =		msvc++
+ 
++pkgconfigdir =		$(libdir)/pkgconfig
++pkgconfig_DATA =	mad.pc
++
+ lib_LTLIBRARIES =	libmad.la
+ include_HEADERS =	mad.h
+ 
+@@ -34,7 +37,8 @@
+ minimad_LDADD =		libmad.la
+ 
+ EXTRA_DIST =		mad.h.sed  \
+-			CHANGES COPYRIGHT CREDITS README TODO VERSION
++			CHANGES COPYRIGHT CREDITS README TODO VERSION \
++			mad.pc.in
+ 
+ exported_headers =	version.h fixed.h bit.h timer.h stream.h frame.h  \
+ 			synth.h decoder.h
+

make/system-libs.mk

@@ -1126,7 +1126,7 @@ LIBMAD_VER = 0.15.1b
 $(ARCHIVE)/libmad-$(LIBMAD_VER).tar.gz:
 	$(WGET) http://downloads.sourceforge.net/project/mad/libmad/$(LIBMAD_VER)/libmad-$(LIBMAD_VER).tar.gz
 
-LIBMAD_PATCH  = libmad-pc-fix.diff
+LIBMAD_PATCH  = libmad-pc.patch
 LIBMAD_PATCH += libmad-frame_length.diff
 LIBMAD_PATCH += libmad-mips-h-constraint-removal.patch
 LIBMAD_PATCH += libmad-remove-deprecated-cflags.patch
@@ -1138,7 +1138,6 @@ $(D)/libmad: $(ARCHIVE)/libmad-$(LIBMAD_VER).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/libmad-$(LIBMAD_VER).tar.gz
 	$(CHDIR)/libmad-$(LIBMAD_VER); \
 		$(call apply_patches, $(LIBMAD_PATCH)); \
-		touch NEWS AUTHORS ChangeLog; \
 		autoreconf -fi; \
 		$(CONFIGURE) \
 			--prefix= \
@@ -1148,8 +1147,8 @@ $(D)/libmad: $(ARCHIVE)/libmad-$(LIBMAD_VER).tar.gz | $(TARGET_DIR)
 			--enable-sso \
 			; \
 		$(MAKE) all; \
-		make install DESTDIR=$(TARGET_DIR); \
-		sed "s!^prefix=.*!prefix=$(TARGET_DIR)!;" mad.pc > $(PKG_CONFIG_PATH)/libmad.pc
+		make install DESTDIR=$(TARGET_DIR)
+	$(REWRITE_PKGCONF)/mad.pc
 	$(REWRITE_LIBTOOL)/libmad.la
 	$(REMOVE)/libmad-$(LIBMAD_VER)
 	$(TOUCH)