From 37edf56f03fbcb7020ace4139e7ab099a49bf3c0 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Mon, 10 Jul 2017 16:52:57 +0200
Subject: [PATCH] libmad: fix missing pkg-config file (#1503)

---
 media-libs/libmad/libmad-0.15.1b.recipe       | 10 +--
 media-libs/libmad/patches/libmad-0.15.1.patch | 12 ----
 .../libmad/patches/libmad-0.15.1b.patchset    | 69 +++++++++++++++++++
 3 files changed, 72 insertions(+), 19 deletions(-)
 delete mode 100644 media-libs/libmad/patches/libmad-0.15.1.patch
 create mode 100644 media-libs/libmad/patches/libmad-0.15.1b.patchset

diff --git a/media-libs/libmad/libmad-0.15.1b.recipe b/media-libs/libmad/libmad-0.15.1b.recipe
index 64eb53de7..4d624cdea 100644
--- a/media-libs/libmad/libmad-0.15.1b.recipe
+++ b/media-libs/libmad/libmad-0.15.1b.recipe
@@ -6,9 +6,10 @@ Layer III (i.e. MP3) -- are fully implemented."
 HOMEPAGE="http://mad.sourceforge.net/"
 COPYRIGHT="2000-2004 Underbit Technologies, Inc."
 LICENSE="GNU GPL v2"
-REVISION="5"
+REVISION="6"
 SOURCE_URI="ftp://ftp.mars.org/pub/mpeg/libmad-0.15.1b.tar.gz"
 CHECKSUM_SHA256="bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690"
+PATCHES="libmad-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -33,9 +34,7 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:aclocal_1.13
 	cmd:autoconf
-	cmd:automake_1.13
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
@@ -46,11 +45,8 @@ BUILD()
 {
 	touch NEWS AUTHORS ChangeLog
 	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
-	libtoolize --force --copy --install
-	aclocal-1.13
 	sed -i 's/$optimize -fforce-mem/$optimize/g' configure.ac
-	autoconf
-	automake-1.13
+	autoreconf -vfi
 	runConfigure ./configure
 	make $jobArgs
 }
diff --git a/media-libs/libmad/patches/libmad-0.15.1.patch b/media-libs/libmad/patches/libmad-0.15.1.patch
deleted file mode 100644
index a6659378d..000000000
--- a/media-libs/libmad/patches/libmad-0.15.1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN libmad-0.15.1b/configure.ac libmad-0.15.1b-haiku/configure.ac
---- libmad-0.15.1b/configure.ac	2004-01-23 09:41:32.061341696 +0000
-+++ libmad-0.15.1b-haiku/configure.ac	2010-09-16 12:16:45.656146432 +0000
-@@ -140,8 +140,6 @@
-     case "$optimize" in
- 	-O|"-O "*)
- 	    optimize="-O"
--	    optimize="$optimize -fforce-mem"
--	    optimize="$optimize -fforce-addr"
- 	    : #x optimize="$optimize -finline-functions"
- 	    : #- optimize="$optimize -fstrength-reduce"
- 	    optimize="$optimize -fthread-jumps"
diff --git a/media-libs/libmad/patches/libmad-0.15.1b.patchset b/media-libs/libmad/patches/libmad-0.15.1b.patchset
new file mode 100644
index 000000000..012521588
--- /dev/null
+++ b/media-libs/libmad/patches/libmad-0.15.1b.patchset
@@ -0,0 +1,69 @@
+From d1a2ec4920a67b27e24c0f7a573c4da8e5e9993e Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Sun, 9 Jul 2017 21:31:30 +0200
+Subject: libmad, fix missing pkg-config file
+
+
+diff --git a/Makefile.am b/Makefile.am
+index ad5c596..bf617e3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -21,7 +21,7 @@
+ 
+ ## Process this file with automake to produce Makefile.in
+ 
+-SUBDIRS =		
++SUBDIRS =
+ DIST_SUBDIRS =		msvc++
+ 
+ lib_LTLIBRARIES =	libmad.la
+@@ -30,7 +30,7 @@ include_HEADERS =	mad.h
+ EXTRA_PROGRAMS =	minimad
+ 
+ minimad_SOURCES =	minimad.c
+-minimad_INCLUDES =	
++minimad_INCLUDES =
+ minimad_LDADD =		libmad.la
+ 
+ EXTRA_DIST =		mad.h.sed  \
+@@ -59,6 +59,9 @@ INCLUDES =		$(FPM) $(ASO)
+ BUILT_SOURCES =		mad.h
+ CLEANFILES =		mad.h
+ 
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = mad.pc
++
+ ## From the libtool documentation on library versioning:
+ ##
+ ## CURRENT
+diff --git a/configure.ac b/configure.ac
+index 9b79399..bbb8502 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -429,5 +429,5 @@ dnl LTLIBOBJS=`echo "$LIBOBJS" | sed -e 's/\.o/.lo/g'`
+ dnl AC_SUBST(LTLIBOBJS)
+ 
+ AC_CONFIG_FILES([Makefile msvc++/Makefile  \
+-	libmad.list])
++	libmad.list mad.pc])
+ AC_OUTPUT
+diff --git a/mad.pc.in b/mad.pc.in
+new file mode 100644
+index 0000000..6b906ba
+--- /dev/null
++++ b/mad.pc.in
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: mad
++Description: MPEG Audio Decoder library
++Requires:
++Version: @VERSION@
++Libs: -L${libdir} -libmad
++Cflags: -I${includedir}
+-- 
+2.7.0
+