pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/audio/xmms-flac Update xmms-flac to version 1.1.1 to m...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4c6dd0194951
branches:  trunk
changeset: 481980:4c6dd0194951
user:      ben <ben%pkgsrc.org@localhost>
date:      Fri Oct 15 22:56:50 2004 +0000

description:
Update xmms-flac to version 1.1.1 to match recent flac update.
This addresses PR#27198.

diffstat:

 audio/xmms-flac/Makefile         |    7 +-
 audio/xmms-flac/distinfo         |   20 +----
 audio/xmms-flac/patches/patch-aa |   13 ---
 audio/xmms-flac/patches/patch-ab |  153 ---------------------------------------
 audio/xmms-flac/patches/patch-ac |  125 -------------------------------
 audio/xmms-flac/patches/patch-ad |  115 -----------------------------
 audio/xmms-flac/patches/patch-ae |  123 -------------------------------
 audio/xmms-flac/patches/patch-af |   34 --------
 audio/xmms-flac/patches/patch-ag |   41 ----------
 audio/xmms-flac/patches/patch-ah |   32 --------
 audio/xmms-flac/patches/patch-ai |   26 ------
 audio/xmms-flac/patches/patch-aj |   26 ------
 audio/xmms-flac/patches/patch-ak |   26 ------
 audio/xmms-flac/patches/patch-al |   26 ------
 audio/xmms-flac/patches/patch-am |   26 ------
 audio/xmms-flac/patches/patch-an |   13 +++
 16 files changed, 20 insertions(+), 786 deletions(-)

diffs (truncated from 876 to 300 lines):

diff -r e78772d8e931 -r 4c6dd0194951 audio/xmms-flac/Makefile
--- a/audio/xmms-flac/Makefile  Fri Oct 15 22:46:10 2004 +0000
+++ b/audio/xmms-flac/Makefile  Fri Oct 15 22:56:50 2004 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2004/10/03 00:13:11 tv Exp $
+# $NetBSD: Makefile,v 1.10 2004/10/15 22:56:50 ben Exp $
 #
 
-DISTNAME=      flac-1.1.0
-PKGNAME=       xmms-flac-1.1.0
-PKGREVISION=   5
+DISTNAME=      flac-1.1.1
+PKGNAME=       xmms-flac-1.1.1
 CATEGORIES=    audio archivers
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=flac/}
 
diff -r e78772d8e931 -r 4c6dd0194951 audio/xmms-flac/distinfo
--- a/audio/xmms-flac/distinfo  Fri Oct 15 22:46:10 2004 +0000
+++ b/audio/xmms-flac/distinfo  Fri Oct 15 22:56:50 2004 +0000
@@ -1,17 +1,5 @@
-$NetBSD: distinfo,v 1.4 2003/12/21 17:51:46 ben Exp $
+$NetBSD: distinfo,v 1.5 2004/10/15 22:56:50 ben 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) = d3dba90ffc3f560743e719a1e1274acd9e5cfc0c
-SHA1 (patch-ac) = f2a5b9998df3682bb2a2c734590608e2622afd04
-SHA1 (patch-ad) = 7d606f83c6d589c3a4b2649ceeea9fe77f291735
-SHA1 (patch-ae) = 38ae3834497d7ddaaabf238c556c0ca6ba740b79
-SHA1 (patch-af) = 596514addde67b16ac5ffc1fc24bf802947bf320
-SHA1 (patch-ag) = 173c631752cab3b65a46ae3d83a672e98f572e60
-SHA1 (patch-ah) = 5742c347c346895ccff41f766fc900c1d9bc4cd3
-SHA1 (patch-ai) = 52f9c97d671658377ae1504170db13224a86711e
-SHA1 (patch-aj) = d9912239495bd7e6f8dea12124cd3c9cd62b2673
-SHA1 (patch-ak) = e128338b8a757dba1e97c79f3262b3eeae4daca7
-SHA1 (patch-al) = b6e8d2e70e0553392e37640bed26e27aeaa19640
-SHA1 (patch-am) = 36c5f057b3ec43979dc8401885632a31fb3255b7
+SHA1 (flac-1.1.1.tar.gz) = 97832e5acad2f20867aafc30f219e47d26b853ac
+Size (flac-1.1.1.tar.gz) = 1467204 bytes
+SHA1 (patch-an) = c020d3ce6f69cc35f695480ea1e4cfa26d29e03b
diff -r e78772d8e931 -r 4c6dd0194951 audio/xmms-flac/patches/patch-aa
--- a/audio/xmms-flac/patches/patch-aa  Fri Oct 15 22:46:10 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/07/19 08:59:12 wiz Exp $
-
---- src/libFLAC/ia32/Makefile.in.orig  Sat Feb 15 00:49:15 2003
-+++ src/libFLAC/ia32/Makefile.in
-@@ -352,7 +352,7 @@ uninstall-am: uninstall-info-am
- 
- 
- .nasm.lo:
--      $(LIBTOOL) --mode=compile $(STRIP_FPIC) $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) -i$(srcdir)/ $< -o $@
-+      $(LIBTOOL) --tag=CC --mode=compile $(STRIP_FPIC) $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) -i$(srcdir)/ $< -o $@
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff -r e78772d8e931 -r 4c6dd0194951 audio/xmms-flac/patches/patch-ab
--- a/audio/xmms-flac/patches/patch-ab  Fri Oct 15 22:46:10 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,153 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/11/01 08:28:47 grant Exp $
-
---- 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 e78772d8e931 -r 4c6dd0194951 audio/xmms-flac/patches/patch-ac
--- a/audio/xmms-flac/patches/patch-ac  Fri Oct 15 22:46:10 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2003/11/01 08:28:47 grant Exp $
-
---- 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)



Home | Main Index | Thread Index | Old Index