diff options
author | lukem <lukem@pkgsrc.org> | 2002-11-15 15:27:57 +0000 |
---|---|---|
committer | lukem <lukem@pkgsrc.org> | 2002-11-15 15:27:57 +0000 |
commit | 6f75f9eaa26398f47d81a912b553e73aae03a13e (patch) | |
tree | 238c68ba44d06592f0a3b3e83cc0861c3fda193d | |
parent | 22c2363e3505119885771517622ec50334c3c2a2 (diff) | |
download | pkgsrc-6f75f9eaa26398f47d81a912b553e73aae03a13e.tar.gz |
Update to flac-xmms 1.0.4, to track the update of flac to 1.0.4.
(Many thanks to Nick Hudson for helping me get this to work.)
-rw-r--r-- | audio/flac-xmms/Makefile | 8 | ||||
-rw-r--r-- | audio/flac-xmms/distinfo | 11 | ||||
-rw-r--r-- | audio/flac-xmms/patches/patch-aa | 37 | ||||
-rw-r--r-- | audio/flac-xmms/patches/patch-ab | 33 | ||||
-rw-r--r-- | audio/flac-xmms/patches/patch-ac | 22 | ||||
-rw-r--r-- | audio/flac-xmms/patches/patch-ad | 160 |
6 files changed, 240 insertions, 31 deletions
diff --git a/audio/flac-xmms/Makefile b/audio/flac-xmms/Makefile index 2dd0498878f..10f638796a7 100644 --- a/audio/flac-xmms/Makefile +++ b/audio/flac-xmms/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2002/09/06 06:45:07 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2002/11/15 15:27:57 lukem Exp $ # -DISTNAME= flac-1.0.3 -PKGNAME= flac-xmms-1.0.3 +DISTNAME= flac-1.0.4 +PKGNAME= flac-xmms-1.0.4 CATEGORIES= audio archivers MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flac/} @@ -20,6 +20,8 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool XMMS_WRKSRC= ${WRKSRC}/src/plugin_xmms do-build: + @cd ${XMMS_WRKSRC}/../plugin_common && ${SETENV} ${MAKE_ENV} \ + ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${ALL_TARGET} @cd ${XMMS_WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${ALL_TARGET} diff --git a/audio/flac-xmms/distinfo b/audio/flac-xmms/distinfo index fd4e5373f95..d7ec991fa44 100644 --- a/audio/flac-xmms/distinfo +++ b/audio/flac-xmms/distinfo @@ -1,5 +1,8 @@ -$NetBSD: distinfo,v 1.4 2002/09/06 06:45:08 jlam Exp $ +$NetBSD: distinfo,v 1.5 2002/11/15 15:27:57 lukem Exp $ -SHA1 (flac-1.0.3.tar.gz) = 72106148c43f938df441d227f4b6198cfcadfdb8 -Size (flac-1.0.3.tar.gz) = 591337 bytes -SHA1 (patch-aa) = e023e9dc3ca0899adc6522d6b2cc2e43b4342423 +SHA1 (flac-1.0.4.tar.gz) = d16beeb8b1f37044d59ba7f2b80a2c3c8db3e7e3 +Size (flac-1.0.4.tar.gz) = 1011175 bytes +SHA1 (patch-aa) = 319601528fa2491bd381779154b667bde222dad4 +SHA1 (patch-ab) = 029c27ef609c5e25ec37e99945b43a40b10640e2 +SHA1 (patch-ac) = 7894bafded56bd7d74665b862094ae8dfb3169b0 +SHA1 (patch-ad) = 2cc15122a4f1adadf2d76e207fb60dd3bef63b81 diff --git a/audio/flac-xmms/patches/patch-aa b/audio/flac-xmms/patches/patch-aa index f0227721ba5..36d3ab9af1d 100644 --- a/audio/flac-xmms/patches/patch-aa +++ b/audio/flac-xmms/patches/patch-aa @@ -1,31 +1,20 @@ -$NetBSD: patch-aa,v 1.2 2002/09/06 06:45:09 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2002/11/15 15:27:59 lukem Exp $ ---- src/plugin_xmms/Makefile.in.orig Wed Jul 3 14:01:59 2002 -+++ src/plugin_xmms/Makefile.in -@@ -102,7 +102,7 @@ FLaC__USIZE32 = @FLaC__USIZE32@ - FLaC__USIZE64 = @FLaC__USIZE64@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +--- src/plugin_xmms/Makefile.am.orig Tue Sep 10 06:11:30 2002 ++++ src/plugin_xmms/Makefile.am +@@ -32,7 +32,7 @@ INCLUDES = -I$(top_srcdir)/src + xmmsinputplugindir = @XMMS_INPUT_PLUGIN_DIR@ + # Don't build a static library -LIBTOOL = $(top_builddir)/libtool-disable-static +LIBTOOL = $(top_builddir)/libtool - LN_S = @LN_S@ - NASM = @NASM@ - OBJDUMP = @OBJDUMP@ -@@ -134,7 +134,7 @@ xmmsinputplugindir = @XMMS_INPUT_PLUGIN_ xmmsinputplugin_LTLIBRARIES = libxmms-flac.la - libxmms_flac_la_SOURCES = plugin.c --libxmms_flac_la_LIBADD = $(top_builddir)/src/libFLAC/libFLAC.la @XMMS_LIBS@ -+libxmms_flac_la_LIBADD = $(libdir)/libFLAC.la @XMMS_LIBS@ - #libxmms_flac_la_LIBADD = -L$(top_builddir)/src/libFLAC/.libs -lFLAC @XMMS_LIBS@ - libxmms_flac_la_LDFLAGS = -module -avoid-version - subdir = src/plugin_xmms -@@ -142,7 +142,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m - CONFIG_CLEAN_FILES = - LTLIBRARIES = $(xmmsinputplugin_LTLIBRARIES) - --libxmms_flac_la_DEPENDENCIES = $(top_builddir)/src/libFLAC/libFLAC.la -+libxmms_flac_la_DEPENDENCIES = - am_libxmms_flac_la_OBJECTS = plugin.lo - libxmms_flac_la_OBJECTS = $(am_libxmms_flac_la_OBJECTS) +@@ -52,5 +52,5 @@ endif + # for fix info see: + # http://lists.freshrpms.net/pipermail/rpm-list/2002-April/000746.html + # the workaround is the extra '-L$(top_builddir)/src/libFLAC/.libs' +-libxmms_flac_la_LIBADD = $(top_builddir)/src/plugin_common/libplugin_common.a $(top_builddir)/src/libFLAC/libFLAC.la -L$(top_builddir)/src/libFLAC/.libs @XMMS_LIBS@ @ID3LIB_LIBS@ ++libxmms_flac_la_LIBADD = $(top_builddir)/src/plugin_common/libplugin_common.la $(libdir)/libFLAC.la @XMMS_LIBS@ @ID3LIB_LIBS@ + libxmms_flac_la_LDFLAGS = -module -avoid-version diff --git a/audio/flac-xmms/patches/patch-ab b/audio/flac-xmms/patches/patch-ab new file mode 100644 index 00000000000..be87d876029 --- /dev/null +++ b/audio/flac-xmms/patches/patch-ab @@ -0,0 +1,33 @@ +$NetBSD: patch-ab,v 1.1 2002/11/15 15:27:59 lukem Exp $ + +--- src/plugin_xmms/Makefile.in.orig Wed Sep 25 14:53:42 2002 ++++ src/plugin_xmms/Makefile.in +@@ -108,7 +108,7 @@ LIB = @LIB@ + LIBICONV = @LIBICONV@ + + # Don't build a static library +-LIBTOOL = $(top_builddir)/libtool-disable-static ++LIBTOOL = $(top_builddir)/libtool + LN_S = @LN_S@ + LTLIB = @LTLIB@ + LTLIBICONV = @LTLIBICONV@ +@@ -166,7 +166,7 @@ plugin_sources = charset.c configure.c p + # for fix info see: + # http://lists.freshrpms.net/pipermail/rpm-list/2002-April/000746.html + # the workaround is the extra '-L$(top_builddir)/src/libFLAC/.libs' +-libxmms_flac_la_LIBADD = $(top_builddir)/src/plugin_common/libplugin_common.a $(top_builddir)/src/libFLAC/libFLAC.la -L$(top_builddir)/src/libFLAC/.libs @XMMS_LIBS@ @ID3LIB_LIBS@ ++libxmms_flac_la_LIBADD = $(top_builddir)/src/plugin_common/libplugin_common.la $(libdir)/libFLAC.la @XMMS_LIBS@ @ID3LIB_LIBS@ + libxmms_flac_la_LDFLAGS = -module -avoid-version + subdir = src/plugin_xmms + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -174,8 +174,8 @@ CONFIG_CLEAN_FILES = + LTLIBRARIES = $(xmmsinputplugin_LTLIBRARIES) + + libxmms_flac_la_DEPENDENCIES = \ +- $(top_builddir)/src/plugin_common/libplugin_common.a \ +- $(top_builddir)/src/libFLAC/libFLAC.la ++ $(top_builddir)/src/plugin_common/libplugin_common.la \ ++ $(libdir)/libFLAC.la + am__objects_1 = charset.lo configure.lo plugin.lo wrap_id3.lo + @FLaC__HAS_ID3LIB_TRUE@am_libxmms_flac_la_OBJECTS = $(am__objects_1) + @FLaC__HAS_ID3LIB_FALSE@am_libxmms_flac_la_OBJECTS = $(am__objects_1) diff --git a/audio/flac-xmms/patches/patch-ac b/audio/flac-xmms/patches/patch-ac new file mode 100644 index 00000000000..a96b37226ab --- /dev/null +++ b/audio/flac-xmms/patches/patch-ac @@ -0,0 +1,22 @@ +$NetBSD: patch-ac,v 1.1 2002/11/15 15:28:00 lukem Exp $ + +--- src/plugin_common/Makefile.am.orig Thu Sep 12 01:33:40 2002 ++++ src/plugin_common/Makefile.am +@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign + + INCLUDES = -I$(top_srcdir)/include @ID3LIB_CFLAGS@ + +-noinst_LIBRARIES = libplugin_common.a ++noinst_LTLIBRARIES = libplugin_common.la + + noinst_HEADERS = \ + all.h \ +@@ -16,7 +16,7 @@ noinst_HEADERS = \ + locale_hack.h \ + vorbiscomment.h + +-libplugin_common_a_SOURCES = \ ++libplugin_common_la_SOURCES = \ + canonical_tag.c \ + charset.c \ + dither.c \ diff --git a/audio/flac-xmms/patches/patch-ad b/audio/flac-xmms/patches/patch-ad new file mode 100644 index 00000000000..63da61e6e11 --- /dev/null +++ b/audio/flac-xmms/patches/patch-ad @@ -0,0 +1,160 @@ +$NetBSD: patch-ad,v 1.1 2002/11/15 15:28:00 lukem Exp $ + +--- src/plugin_common/Makefile.in.orig Wed Sep 25 14:53:41 2002 ++++ src/plugin_common/Makefile.in +@@ -118,7 +118,7 @@ AUTOMAKE_OPTIONS = foreign + + INCLUDES = -I$(top_srcdir)/include @ID3LIB_CFLAGS@ + +-noinst_LIBRARIES = libplugin_common.a ++noinst_LTLIBRARIES = libplugin_common.la + + noinst_HEADERS = \ + all.h \ +@@ -131,7 +131,7 @@ noinst_HEADERS = \ + vorbiscomment.h + + +-libplugin_common_a_SOURCES = \ ++libplugin_common_la_SOURCES = \ + canonical_tag.c \ + charset.c \ + dither.c \ +@@ -148,14 +148,13 @@ EXTRA_DIST = \ + subdir = src/plugin_common + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + 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) vorbiscomment.$(OBJEXT) +-libplugin_common_a_OBJECTS = $(am_libplugin_common_a_OBJECTS) ++libplugin_common_la_LDFLAGS = ++libplugin_common_la_LIBADD = ++am_libplugin_common_la_OBJECTS = canonical_tag.lo charset.lo dither.lo \ ++ id3v1.lo id3v2.lo vorbiscomment.lo ++libplugin_common_la_OBJECTS = $(am_libplugin_common_la_OBJECTS) + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) +@@ -164,10 +163,10 @@ LDFLAGS = @LDFLAGS@ + 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)/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)/vorbiscomment.Plo + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +@@ -176,11 +175,11 @@ CCLD = $(CC) + 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) + + DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in +-SOURCES = $(libplugin_common_a_SOURCES) ++SOURCES = $(libplugin_common_la_SOURCES) + + all: all-am + +@@ -192,14 +191,16 @@ $(srcdir)/Makefile.in: Makefile.am $(t + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + +-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) ++ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ ++ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ++ test -z "$dir" && dir=.; \ ++ echo "rm -f \"$${dir}/so_locations\""; \ ++ rm -f "$${dir}/so_locations"; \ ++ done ++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 +@@ -207,12 +208,12 @@ mostlyclean-compile: + 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)/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)/vorbiscomment.Plo@am__quote@ + + distclean-depend: + -rm -rf ./$(DEPDIR) +@@ -309,7 +310,7 @@ distdir: $(DISTFILES) + done + check-am: all-am + check: check-am +-all-am: Makefile $(LIBRARIES) $(HEADERS) ++all-am: Makefile $(LTLIBRARIES) $(HEADERS) + + installdirs: + +@@ -339,7 +340,7 @@ maintainer-clean-generic: + @echo "it deletes files that may require special tools to rebuild." + clean: clean-am + +-clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ ++clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ + mostlyclean-am + + distclean: distclean-am +@@ -377,15 +378,16 @@ mostlyclean-am: mostlyclean-compile most + uninstall-am: uninstall-info-am + + .PHONY: GTAGS all all-am check check-am clean clean-generic \ +- clean-libtool clean-noinstLIBRARIES distclean distclean-compile \ +- distclean-depend distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am info info-am install \ +- install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- tags uninstall uninstall-am uninstall-info-am ++ clean-libtool clean-noinstLTLIBRARIES distclean \ ++ distclean-compile distclean-depend distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am info \ ++ info-am install install-am install-data install-data-am \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-libtool tags uninstall uninstall-am \ ++ uninstall-info-am + + + debug: |