[pkgsrc/trunk]: pkgsrc/audio/xmms-flac apply patch from rtr: build libtool co...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/audio/xmms-flac apply patch from rtr: build libtool co...
From: grant <grant%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:07:41 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/ac9efed2c2b2
branches:  trunk
changeset: 463196:ac9efed2c2b2
user:      grant <grant%pkgsrc.org@localhost>
date:      Sat Nov 01 06:49:54 2003 +0000

description:
apply patch from rtr: build libtool convenience libraries instead of
regular libraries so the required symbols from libplugin_common.a are
included.

fixes PR pkg/21857.

bump PKGREVISION.

diffstat:

 audio/xmms-flac/Makefile         |    4 +-
 audio/xmms-flac/distinfo         |   12 ++-
 audio/xmms-flac/patches/patch-ab |  151 +++++++++++++++++++++++++++++++++++++++
 audio/xmms-flac/patches/patch-ac |  123 +++++++++++++++++++++++++++++++
 audio/xmms-flac/patches/patch-ad |  113 +++++++++++++++++++++++++++++
 audio/xmms-flac/patches/patch-ae |  121 +++++++++++++++++++++++++++++++
 audio/xmms-flac/patches/patch-af |   32 ++++++++
 audio/xmms-flac/patches/patch-ag |   39 ++++++++++
 audio/xmms-flac/patches/patch-ah |   30 +++++++
 audio/xmms-flac/patches/patch-ai |   24 ++++++
 audio/xmms-flac/patches/patch-aj |   24 ++++++
 audio/xmms-flac/patches/patch-ak |   24 ++++++
 12 files changed, 694 insertions(+), 3 deletions(-)

diffs (truncated from 756 to 300 lines):

diff -r 634cf791622b -r ac9efed2c2b2 audio/xmms-flac/Makefile
--- a/audio/xmms-flac/Makefile  Sat Nov 01 04:03:18 2003 +0000
+++ b/audio/xmms-flac/Makefile  Sat Nov 01 06:49:54 2003 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/07/19 08:59:12 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2003/11/01 06:49:54 grant Exp $
 #
 
 DISTNAME=      flac-1.1.0
 PKGNAME=       xmms-flac-1.1.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    audio archivers
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=flac/}
 
diff -r 634cf791622b -r ac9efed2c2b2 audio/xmms-flac/distinfo
--- a/audio/xmms-flac/distinfo  Sat Nov 01 04:03:18 2003 +0000
+++ b/audio/xmms-flac/distinfo  Sat Nov 01 06:49:54 2003 +0000
@@ -1,5 +1,15 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/07/19 08:59:12 wiz Exp $
+$NetBSD: distinfo,v 1.2 2003/11/01 06:49:54 grant Exp $
 
 SHA1 (flac-1.1.0.tar.gz) = 80334c1ebc693fb92e01f5a55ed332fbe9809592
 Size (flac-1.1.0.tar.gz) = 1201861 bytes
 SHA1 (patch-aa) = d042e72b8e12631004b2403b40c5b004fc71ea8b
+SHA1 (patch-ab) = 9af3011f6ebd822e456e78fbdb05136ac726f306
+SHA1 (patch-ac) = 28729a99b5d3f0d1fd5b85087c4af5683ddc392e
+SHA1 (patch-ad) = 6b4922a0f8706312c4b2132372bdccd3cd03df96
+SHA1 (patch-ae) = a5d28183e32afd52414301320fe686cfb1bbd0e3
+SHA1 (patch-af) = 49863b850dd2bef161e64e8618f2abefe9a47d36
+SHA1 (patch-ag) = 0ef1dca734dce63e25b3acef843edaf2c897196f
+SHA1 (patch-ah) = db168f9c9b8ca75d19ee7e25a607e991bbdc3d2f
+SHA1 (patch-ai) = a6930d09f8c15300b950f8b3f01054b0089e6dae
+SHA1 (patch-aj) = 8c3568e45bcf553ea9ecfb127d3e7714ab3b609a
+SHA1 (patch-ak) = c2eccea299cd8d943ea1e1787dba692c80e2d128
diff -r 634cf791622b -r ac9efed2c2b2 audio/xmms-flac/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/xmms-flac/patches/patch-ab  Sat Nov 01 06:49:54 2003 +0000
@@ -0,0 +1,151 @@
+--- src/plugin_common/Makefile.in.orig 2003-01-26 05:42:38.000000000 +1100
++++ src/plugin_common/Makefile.in      2003-10-31 14:41:00.000000000 +1100
+@@ -90,6 +90,7 @@
+ LN_S = @LN_S@
+ LTLIB = @LTLIB@
+ LTLIBICONV = @LTLIBICONV@
++LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ NASM = @NASM@
+ OBJDUMP = @OBJDUMP@
+@@ -121,7 +122,7 @@
+ 
+ INCLUDES = -I$(top_srcdir)/include @ID3LIB_CFLAGS@
+ 
+-noinst_LIBRARIES = libplugin_common.a
++noinst_LTLIBRARIES = libplugin_common.la
+ 
+ noinst_HEADERS = \
+       all.h \
+@@ -136,7 +137,7 @@
+       vorbiscomment.h
+ 
+ 
+-libplugin_common_a_SOURCES = \
++libplugin_common_la_SOURCES = \
+       canonical_tag.c \
+       charset.c \
+       dither.c \
+@@ -155,15 +156,14 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+-LIBRARIES = $(noinst_LIBRARIES)
++LTLIBRARIES = $(noinst_LTLIBRARIES)
+ 
+-libplugin_common_a_AR = $(AR) cru
+-libplugin_common_a_LIBADD =
+-am_libplugin_common_a_OBJECTS = canonical_tag.$(OBJEXT) \
+-      charset.$(OBJEXT) dither.$(OBJEXT) id3v1.$(OBJEXT) \
+-      id3v2.$(OBJEXT) replaygain_synthesis.$(OBJEXT) \
+-      vorbiscomment.$(OBJEXT)
+-libplugin_common_a_OBJECTS = $(am_libplugin_common_a_OBJECTS)
++libplugin_common_la_LIBADD =
++am_libplugin_common_la_OBJECTS = canonical_tag.lo \
++      charset.lo dither.lo id3v1.lo \
++      id3v2.lo replaygain_synthesis.lo \
++      vorbiscomment.lo
++libplugin_common_la_OBJECTS = $(am_libplugin_common_la_OBJECTS)
+ 
+ DEFS = @DEFS@
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+@@ -172,11 +172,11 @@
+ LIBS = @LIBS@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/canonical_tag.Po \
+-@AMDEP_TRUE@  ./$(DEPDIR)/charset.Po ./$(DEPDIR)/dither.Po \
+-@AMDEP_TRUE@  ./$(DEPDIR)/id3v1.Po ./$(DEPDIR)/id3v2.Po \
+-@AMDEP_TRUE@  ./$(DEPDIR)/replaygain_synthesis.Po \
+-@AMDEP_TRUE@  ./$(DEPDIR)/vorbiscomment.Po
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/canonical_tag.Plo \
++@AMDEP_TRUE@  ./$(DEPDIR)/charset.Plo ./$(DEPDIR)/dither.Plo \
++@AMDEP_TRUE@  ./$(DEPDIR)/id3v1.Plo ./$(DEPDIR)/id3v2.Plo \
++@AMDEP_TRUE@  ./$(DEPDIR)/replaygain_synthesis.Plo \
++@AMDEP_TRUE@  ./$(DEPDIR)/vorbiscomment.Plo
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+@@ -185,7 +185,7 @@
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+       $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ CFLAGS = @CFLAGS@
+-DIST_SOURCES = $(libplugin_common_a_SOURCES)
++DIST_SOURCES = $(libplugin_common_la_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+ 
+ 
+@@ -195,7 +195,7 @@
+       uninstall-recursive check-recursive installcheck-recursive
+ DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in
+ DIST_SUBDIRS = $(SUBDIRS)
+-SOURCES = $(libplugin_common_a_SOURCES)
++SOURCES = $(libplugin_common_la_SOURCES)
+ 
+ all: all-recursive
+ 
+@@ -209,12 +209,10 @@
+ 
+ AR = ar
+ 
+-clean-noinstLIBRARIES:
+-      -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+-libplugin_common.a: $(libplugin_common_a_OBJECTS) $(libplugin_common_a_DEPENDENCIES) 
+-      -rm -f libplugin_common.a
+-      $(libplugin_common_a_AR) libplugin_common.a $(libplugin_common_a_OBJECTS) $(libplugin_common_a_LIBADD)
+-      $(RANLIB) libplugin_common.a
++clean-noinstLTLIBRARIES:
++      -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
++libplugin_common.la: $(libplugin_common_la_OBJECTS) $(libplugin_common_la_DEPENDENCIES) 
++      $(LINK) $(libplugin_common_la_LDFLAGS) $(libplugin_common_la_OBJECTS) $(libplugin_common_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+       -rm -f *.$(OBJEXT) core *.core
+@@ -222,13 +220,13 @@
+ distclean-compile:
+       -rm -f *.tab.c
+ 
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/canonical_tag.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/charset.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id3v1.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id3v2.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/replaygain_synthesis.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vorbiscomment.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/canonical_tag.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/charset.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id3v1.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id3v2.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/replaygain_synthesis.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vorbiscomment.Plo@am__quote@
+ 
+ distclean-depend:
+       -rm -rf ./$(DEPDIR)
+@@ -398,7 +396,7 @@
+       done
+ check-am: all-am
+ check: check-recursive
+-all-am: Makefile $(LIBRARIES) $(HEADERS)
++all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs: installdirs-recursive
+ installdirs-am:
+ 
+@@ -428,7 +426,7 @@
+       @echo "it deletes files that may require special tools to rebuild."
+ clean: clean-recursive
+ 
+-clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
++clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+       mostlyclean-am
+ 
+ distclean: distclean-recursive
+@@ -468,7 +466,7 @@
+ uninstall-info: uninstall-info-recursive
+ 
+ .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
+-      clean-generic clean-libtool clean-noinstLIBRARIES \
++      clean-generic clean-libtool clean-noinstLTLIBRARIES \
+       clean-recursive distclean distclean-compile distclean-depend \
+       distclean-generic distclean-libtool distclean-recursive \
+       distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
diff -r 634cf791622b -r ac9efed2c2b2 audio/xmms-flac/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/xmms-flac/patches/patch-ac  Sat Nov 01 06:49:54 2003 +0000
@@ -0,0 +1,123 @@
+--- src/share/grabbag/Makefile.in.orig 2003-10-31 13:55:26.000000000 +1100
++++ src/share/grabbag/Makefile.in      2003-10-31 14:08:10.000000000 +1100
+@@ -90,6 +90,7 @@
+ LN_S = @LN_S@
+ LTLIB = @LTLIB@
+ LTLIBICONV = @LTLIBICONV@
++LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ NASM = @NASM@
+ OBJDUMP = @OBJDUMP@
+@@ -119,9 +120,9 @@
+ 
+ INCLUDES = -I$(top_srcdir)/include
+ 
+-noinst_LIBRARIES = libgrabbag.a
++noinst_LTLIBRARIES = libgrabbag.la
+ 
+-libgrabbag_a_SOURCES = \
++libgrabbag_la_SOURCES = \
+       cuesheet.c \
+       file.c \
+       replaygain.c \
+@@ -136,13 +137,12 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+-LIBRARIES = $(noinst_LIBRARIES)
++LTLIBRARIES = $(noinst_LTLIBRARIES)
+ 
+-libgrabbag_a_AR = $(AR) cru
+-libgrabbag_a_LIBADD =
+-am_libgrabbag_a_OBJECTS = cuesheet.$(OBJEXT) file.$(OBJEXT) \
+-      replaygain.$(OBJEXT) seektable.$(OBJEXT)
+-libgrabbag_a_OBJECTS = $(am_libgrabbag_a_OBJECTS)
++libgrabbag_la_LIBADD =
++am_libgrabbag_la_OBJECTS = cuesheet.lo file.lo \
++      replaygain.lo seektable.lo
++libgrabbag_la_OBJECTS = $(am_libgrabbag_la_OBJECTS)
+ 
+ DEFS = @DEFS@
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+@@ -151,8 +151,8 @@
+ LIBS = @LIBS@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cuesheet.Po ./$(DEPDIR)/file.Po \
+-@AMDEP_TRUE@  ./$(DEPDIR)/replaygain.Po ./$(DEPDIR)/seektable.Po
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cuesheet.Plo ./$(DEPDIR)/file.Plo \
++@AMDEP_TRUE@  ./$(DEPDIR)/replaygain.Plo ./$(DEPDIR)/seektable.Plo
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+@@ -161,9 +161,9 @@
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+       $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ CFLAGS = @CFLAGS@
+-DIST_SOURCES = $(libgrabbag_a_SOURCES)
++DIST_SOURCES = $(libgrabbag_la_SOURCES)
+ DIST_COMMON = Makefile.am Makefile.in
+-SOURCES = $(libgrabbag_a_SOURCES)
++SOURCES = $(libgrabbag_la_SOURCES)
+ 
+ all: all-am
+ 
+@@ -177,23 +177,20 @@
+ 
+ AR = ar
+ 
+-clean-noinstLIBRARIES:
+-      -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+-libgrabbag.a: $(libgrabbag_a_OBJECTS) $(libgrabbag_a_DEPENDENCIES) 
+-      -rm -f libgrabbag.a
+-      $(libgrabbag_a_AR) libgrabbag.a $(libgrabbag_a_OBJECTS) $(libgrabbag_a_LIBADD)
+-      $(RANLIB) libgrabbag.a
+-
++clean-noinstLTLIBRARIES:
++      -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
++libgrabbag.la: $(libgrabbag_la_OBJECTS) $(libgrabbag_la_DEPENDENCIES) 
++      $(LINK) $(libgrabbag_la_LDFLAGS) $(libgrabbag_la_OBJECTS) $(libgrabbag_la_LIBADD) $(LIBS)
+ mostlyclean-compile:
+       -rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+       -rm -f *.tab.c
+ 
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cuesheet.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/replaygain.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seektable.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cuesheet.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/replaygain.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seektable.Plo@am__quote@
+ 
+ distclean-depend:
+       -rm -rf ./$(DEPDIR)
+@@ -290,7 +287,7 @@
+       done
+ check-am: all-am
+ check: check-am
+-all-am: Makefile $(LIBRARIES)
++all-am: Makefile $(LTLIBRARIES)
+ 
+ installdirs:
+ 
+@@ -320,7 +317,7 @@
Prev by Date: [pkgsrc/trunk]: pkgsrc/sysutils/xbattbar make xbattbar work in the presense o...
Next by Date: [pkgsrc/trunk]: pkgsrc/audio/xmms-flac add rcsids.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/sysutils/xbattbar make xbattbar work in the presense o...
Next by Thread: [pkgsrc/trunk]: pkgsrc/audio/xmms-flac add rcsids.
Indexes:
Home | Main Index | Thread Index | Old Index