diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2000-11-29 11:22:55 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2000-11-29 11:22:55 +0000 |
| commit | d956447f833975008aff281f0bdd4ebf90133670 (patch) | |
| tree | f8119317549fa2fdc3118037ed8bdb9629da37f1 /audio/xmms/files | |
| parent | - Add pre-generated aclocal.m4, because aclocal sucks if several versions of (diff) | |
Update to 1.2.4
PR: 23160
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=35506
Diffstat (limited to 'audio/xmms/files')
| -rw-r--r-- | audio/xmms/files/patch-ad | 30 | ||||
| -rw-r--r-- | audio/xmms/files/patch-ae | 10 | ||||
| -rw-r--r-- | audio/xmms/files/patch-af | 8 |
3 files changed, 29 insertions, 19 deletions
diff --git a/audio/xmms/files/patch-ad b/audio/xmms/files/patch-ad index 0b26a5e0f80b..638bfcf41154 100644 --- a/audio/xmms/files/patch-ad +++ b/audio/xmms/files/patch-ad @@ -1,28 +1,38 @@ ---- configure.orig Wed Sep 20 00:30:29 2000 -+++ configure Wed Sep 27 12:22:43 2000 -@@ -4022,7 +4022,9 @@ - echo "$ac_t""no" 1>&6 +--- configure.orig Tue Nov 28 16:12:16 2000 ++++ configure Tue Nov 28 16:12:52 2000 +@@ -4033,6 +4033,9 @@ fi -- + +if [ x"${HAVE_ESOUND}" != x"yes" ]; then + have_esd=no +fi if test "x$have_esd" = xyes; then HAVE_ESD_TRUE= -@@ -4303,7 +4305,9 @@ - +@@ -4314,6 +4317,9 @@ rm -f conf.mikmodtest -- + +if [ x"${HAVE_MIKMOD}" != x"yes" ]; then + have_mikmod=no +fi if test "x$have_mikmod" = xyes; then HAVE_MIKMOD_TRUE= -@@ -7171,14 +7175,14 @@ +@@ -4574,6 +4580,11 @@ + + rm -f conf.vorbistest + ++if [ x"${HAVE_VORBIS}" != x"yes" ]; then ++ have_ogg=no ++ have_vorbis=no ++fi ++ + have_oggvorbis=no + if test "x$have_ogg" = xyes + then +@@ -7551,14 +7562,14 @@ if test -n "$GCC" then @@ -39,7 +49,7 @@ ARCH_DEFINES="-DI386_ASSEM" arch_type=ix86 ;; -@@ -7885,10 +7889,6 @@ +@@ -8315,10 +8326,6 @@ *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac diff --git a/audio/xmms/files/patch-ae b/audio/xmms/files/patch-ae index 8eea92cf33e2..e013d1c99109 100644 --- a/audio/xmms/files/patch-ae +++ b/audio/xmms/files/patch-ae @@ -1,6 +1,6 @@ ---- Makefile.in.orig Mon Jul 31 10:27:32 2000 -+++ Makefile.in Mon Jul 31 10:27:49 2000 -@@ -147,7 +147,10 @@ +--- Makefile.in.orig Tue Nov 28 14:55:51 2000 ++++ Makefile.in Tue Nov 28 14:57:22 2000 +@@ -152,7 +152,10 @@ sidplay_library = @sidplay_library@ xmmsdir = @xmmsdir@ @@ -8,11 +8,11 @@ +SUBDIRS = intl libxmms xmms Output Input Effect General Visualization wmxmms po +.ifdef HAVE_GNOME +SUBDIRS += gnomexmms -+.endif ++.endif bin_SCRIPTS = xmms-config -@@ -205,9 +205,9 @@ +@@ -211,9 +214,9 @@ rm -f $(srcdir)/stamp-h.in; \ $(MAKE) $(srcdir)/stamp-h.in; \ else :; fi diff --git a/audio/xmms/files/patch-af b/audio/xmms/files/patch-af index 014ca1b56704..eccc666a3f35 100644 --- a/audio/xmms/files/patch-af +++ b/audio/xmms/files/patch-af @@ -1,6 +1,6 @@ ---- Output/Makefile.in.orig Mon Jan 31 10:44:32 2000 -+++ Output/Makefile.in Sun Feb 27 01:37:39 2000 -@@ -125,7 +125,10 @@ +--- Output/Makefile.in.orig Tue Nov 28 14:58:15 2000 ++++ Output/Makefile.in Tue Nov 28 14:58:46 2000 +@@ -152,7 +152,10 @@ sidplay_library = @sidplay_library@ xmmsdir = @xmmsdir@ @@ -8,7 +8,7 @@ +SUBDIRS = OSS disk_writer +.if defined(HAVE_ESOUND) || defined(HAVE_GNOME) +SUBDIRS += esd -+.endif ++.endif mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = |