From 16f75796affa7ec618fb9f62a30f7927dca1f05b Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sat, 1 Jun 2019 02:19:23 +0200
Subject: [PATCH] - system-libs.mk: update libid3tag build

---
 archive-patches/libid3tag-pc.patch | 65 ++++++++++++++++++++++++++++++
 archive-patches/libid3tag.diff     | 14 -------
 make/system-libs-extra.mk          |  9 +++--
 3 files changed, 71 insertions(+), 17 deletions(-)
 create mode 100644 archive-patches/libid3tag-pc.patch
 delete mode 100644 archive-patches/libid3tag.diff

diff --git a/archive-patches/libid3tag-pc.patch b/archive-patches/libid3tag-pc.patch
new file mode 100644
index 00000000..fb816985
--- /dev/null
+++ b/archive-patches/libid3tag-pc.patch
@@ -0,0 +1,65 @@
+diff --git a/configure.ac b/configure.ac
+index a0a0237..dd23b06 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -26,9 +26,9 @@
+ 
+ AC_CONFIG_SRCDIR([id3tag.h])
+ 
+-AM_INIT_AUTOMAKE
+-
+-AM_CONFIG_HEADER([config.h])
++AM_INIT_AUTOMAKE([foreign])
++
++AC_CONFIG_HEADERS([config.h])
+ 
+ dnl System type.
+ 
+@@ -201,5 +201,5 @@ dnl LTLIBOBJS=`echo "$LIBOBJS" | sed -e 's/\.o/.lo/g'`
+ dnl AC_SUBST(LTLIBOBJS)
+ 
+ AC_CONFIG_FILES([Makefile msvc++/Makefile  \
+-	libid3tag.list])
++	libid3tag.list id3tag.pc])
+ AC_OUTPUT
+diff --git a/id3tag.pc.in b/id3tag.pc.in
+new file mode 100644
+index 0000000..0704d8c
+--- /dev/null
++++ b/id3tag.pc.in
+@@ -0,0 +1,11 @@
++prefix=
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
++
++Name: id3tag
++Description: ID3 tag reading library
++Requires:
++Version: 0.15.1b
++Libs: -L${libdir} -lid3tag -lz
++Cflags: -I${includedir}
+diff --git a/Makefile.am b/Makefile.am
+index 3ee9aa6..dd08c2c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -24,6 +24,9 @@
+ SUBDIRS =		
+ DIST_SUBDIRS =		msvc++
+ 
++pkgconfigdir =		$(libdir)/pkgconfig
++pkgconfig_DATA =	id3tag.pc
++
+ lib_LTLIBRARIES =	libid3tag.la
+ include_HEADERS =	id3tag.h
+ 
+@@ -70,7 +73,8 @@ version_age =		3
+ version_info =		$(version_current):$(version_revision):$(version_age)
+ 
+ EXTRA_DIST =		genre.dat.sed  \
+-			CHANGES COPYRIGHT CREDITS README TODO VERSION
++			CHANGES COPYRIGHT CREDITS README TODO VERSION \
++			id3tag.pc.in
+ 
+ if DEBUG
+ debug = debug.c debug.h
diff --git a/archive-patches/libid3tag.diff b/archive-patches/libid3tag.diff
deleted file mode 100644
index 9e87a017..00000000
--- a/archive-patches/libid3tag.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- libid3tag-0.15.0b/id3tag.pc	1970-01-01 01:00:00.000000000 +0100
-+++ libid3tag-0.15.0bnew/id3tag.pc	2003-09-10 17:56:53.000000000 +0200
-@@ -0,0 +1,11 @@
-+prefix=
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/lib
-+includedir=${prefix}/include
-+
-+Name: id3tag
-+Description: ID3 tag reading library
-+Requires:
-+Version: 0.15.1b
-+Libs: -L${libdir} -lid3tag -lz
-+Cflags: -I${includedir}
diff --git a/make/system-libs-extra.mk b/make/system-libs-extra.mk
index 4747c71f..792cb0ba 100644
--- a/make/system-libs-extra.mk
+++ b/make/system-libs-extra.mk
@@ -8,18 +8,21 @@ LIBID3TAG_VER = 0.15.1b
 $(ARCHIVE)/libid3tag-$(LIBID3TAG_VER).tar.gz:
 	$(WGET) http://downloads.sourceforge.net/project/mad/libid3tag/$(LIBID3TAG_VER)/libid3tag-$(LIBID3TAG_VER).tar.gz
 
+LIBID3TAG_PATCH  = libid3tag-pc.patch
+
 $(D)/libid3tag: $(D)/zlib $(ARCHIVE)/libid3tag-$(LIBID3TAG_VER).tar.gz | $(TARGET_DIR)
 	$(REMOVE)/libid3tag-$(LIBID3TAG_VER)
 	$(UNTAR)/libid3tag-$(LIBID3TAG_VER).tar.gz
 	$(CHDIR)/libid3tag-$(LIBID3TAG_VER); \
-		$(PATCH)/libid3tag.diff; \
+		$(call apply_patches, $(LIBID3TAG_PATCH)); \
+		autoreconf -fi; \
 		$(CONFIGURE) \
 			--prefix= \
 			--enable-shared=yes \
 			; \
 		$(MAKE) all; \
-		make install DESTDIR=$(TARGET_DIR); \
-		sed "s!^prefix=.*!prefix=$(TARGET_DIR)!;" id3tag.pc > $(PKG_CONFIG_PATH)/libid3tag.pc
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
+	$(REWRITE_PKGCONF)/id3tag.pc
 	$(REWRITE_LIBTOOL)/libid3tag.la
 	$(REMOVE)/libid3tag-$(LIBID3TAG_VER)
 	$(TOUCH)