This commit was manufactured by cvs2svn to create tag 'RELEASE_4_6_1'.release/4.6.1

6 files changed, 0 insertions, 270 deletions

diff --git a/audio/zinf/files/patch-aa b/audio/zinf/files/patch-aa
deleted file mode 100644
index a28137bd431c..000000000000
--- a/audio/zinf/files/patch-aa
+++ /dev/null
@@ -1,207 +0,0 @@
---- configure.in.orig	Mon Dec 10 16:42:31 2001
-+++ configure.in	Thu Mar 14 23:34:42 2002
-@@ -179,8 +179,8 @@
-     ;;
-   freebsd*)
-     host_os="freebsd"
--    CFLAGS="$CFLAGS -D_THREAD_SAFE -pthread -I/usr/local/include"
--    LDFLAGS="$LDFLAGS -Wl,-export-dynamic -L/usr/local/lib"
-+    CFLAGS="$CFLAGS"
-+    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
-     ;;
-   netbsd*)
-     host_os="freebsd"
-@@ -331,9 +331,9 @@
-            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-      esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \
-            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
--     ac_save_CFLAGS="$CFLAGS"
-+     ac_save_CPPFLAGS="$CPPFLAGS"
-      ac_save_LIBS="$LIBS"
--     CFLAGS="$CFLAGS $ESD_CFLAGS"
-+     CPPFLAGS="$CPPFLAGS $ESD_CFLAGS"
-      LIBS="$LIBS $ESD_LIBS"
-      rm -f conf.esdtest
-      AC_MSG_CHECKING(for ESD - version >= $min_esd_version)
-@@ -392,7 +392,7 @@
- }
- 
- ],, have_esound=false, have_esound=false)
--     CFLAGS="$ac_save_CFLAGS"
-+     CPPFLAGS="$ac_save_CPPFLAGS"
-      LIBS="$ac_save_LIBS"
-      AC_LANG_RESTORE
-      rm -f conf.esdtest
-@@ -419,7 +419,7 @@
- 
- dnl optional freetype support..
- save_CPPFLAGS="$CPPFLAGS"
--CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-+CPPFLAGS="$CPPFLAGS"
- AC_LANG_SAVE
- AC_LANG_C
- AC_CHECK_HEADERS(freetype.h, have_freetype="true", have_freetype="false")
-@@ -465,9 +465,9 @@
-      gtk_config_major=`$GTK_CONFIG --version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-      gtk_config_minor=`$GTK_CONFIG --version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-      gtk_config_micro=`$GTK_CONFIG --version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
--     ac_save_CFLAGS="$CFLAGS"
-+     ac_save_CPPFLAGS="$CPPFLAGS"
-      ac_save_LIBS="$LIBS"
--     CFLAGS="$CFLAGS $GTK_CFLAGS"
-+     CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
-      LIBS="$GTK_LIBS $LIBS"
- 
-      AC_TRY_RUN([
-@@ -494,7 +494,7 @@
-          gtk_major_version, gtk_minor_version, gtk_micro_version);
-   return 1;
- }], , have_gtk=false, have_gtk=false])
--    CFLAGS="$ac_save_CFLAGS"
-+    CPPFLAGS="$ac_save_CPPFLAGS"
-     LIBS="$ac_save_LIBS" 
-     if test "$have_gtk" = "false"; then
-        AC_MSG_RESULT(no)
-@@ -515,7 +515,7 @@
-   OSINC="$OSINC -I$srcdir/ui/download/unix/include"
-   OSINC="$OSINC -I$srcdir/ui/musicbrowser/include"
-   OSINC="$OSINC -I$srcdir/ftc/kjofol"
--  CFLAGS="$CFLAGS $GTK_CFLAGS"
-+  CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
-   AC_DEFINE(HAVE_GTK)
- elif test "$host_os" = "beos"; then
-   OSDEPPLUGINS="$OSDEPPLUGINS plugins/musicbrowser.ui"
-@@ -541,17 +541,10 @@
- AC_SUBST(GTK_LIBS)
- AC_SUBST(EXTRALIBS)
- 
--AC_SUBST(CFLAGS)
-+AC_SUBST(CPPFLAGS)
- 
- dnl orbit crap
--save_CPPFLAGS="$CPPFLAGS"
--CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
--AC_LANG_SAVE
--AC_LANG_C
--AC_CHECK_HEADERS(orb/orbit.h, have_orbit="true", have_orbit="false")
--CPPFLAGS="$save_CPPFLAGS"
--AC_LANG_RESTORE
--
-+have_orbit="false"
- ORBIT_LIBS=""
- ORBIT_IDL=""
- 
-@@ -661,7 +654,7 @@
-   alsa_min_major_version=0
-   alsa_min_minor_version=5
-   alsa_min_micro_version=0
--  ac_save_CFLAGS="$CFLAGS"
-+  ac_save_CPPFLAGS="$CPPFLAGS"
-   ac_save_LIBS="$LIBS"
- 
-   LIBS="$LIBS -lasound"
-@@ -706,7 +699,7 @@
- ], , have_alsa=false, have_alsa=false
- )
-    AC_LANG_RESTORE
--   CFLAGS="$ac_save_CFLAGS"
-+   CPPFLAGS="$ac_save_CPPFLAGS"
-    LIBS="$ac_save_LIBS"
-    if test "$have_alsa" = "false"; then
-       AC_MSG_RESULT(no)
-@@ -726,6 +719,10 @@
-   AC_MSG_RESULT([compiling alsa pmo plugin])
- fi
- 
-+
-+AC_ARG_ENABLE(vorbis, [  --disable-vorbis        Don't compile the Vorbis output plugin], enable_vorbis=no, enable_vorbis=yes)
-+
-+if test "x$enable_vorbis" = "xyes"; then
- AC_CHECK_LIB(ogg, ogg_sync_init, have_ogg="yes",)
- AC_CHECK_LIB(vorbisfile, ov_info, have_vorbis="yes",, -lvorbis -logg)
- 
-@@ -736,6 +733,7 @@
-      OSDEPPLUGINS="$OSDEPPLUGINS plugins/vorbis.mdf";
-      AC_MSG_RESULT([compiling vorbis codec plugin])
-   fi 
-+fi
- fi 
- 
- ID3_LIBS=""
-@@ -749,6 +747,9 @@
- dnl Partly taken from SDL's configure.in
- dnl -------------------------------------------------------------
- 
-+AC_ARG_ENABLE(arts, [  --disable-arts          Don't compile the libArts output plugin], enable_arts=no, enable_arts=yes)
-+
-+if test "x$enable_arts" = "xyes"; then
- AC_PATH_PROG(ARTSCCONFIG, artsc-config)
- if test x$ARTSCCONFIG = x -o x$ARTSCCONFIG = x'"$ARTSCCONFIG"'; then
- : # arts isn't installed
-@@ -765,6 +766,7 @@
-      AC_MSG_RESULT([compiling arts pmo plugin])
-     ])
- fi
-+fi
- 
- AC_SUBST(ARTS_LIBS)
- AC_SUBST(EXTRALIBS)
-@@ -819,9 +821,9 @@
-   gdk_pixbuf_micro_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_config_args --version | \
-          sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-   if test "x$enable_gdk_pixbuftest" = "xyes" ; then
--    ac_save_CFLAGS="$CFLAGS"
-+    ac_save_CPPFLAGS="$CPPFLAGS"
-     ac_save_LIBS="$LIBS"
--    CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS"
-+    CPPFLAGS="$CPPFLAGS $GDK_PIXBUF_CFLAGS"
-     LIBS="$LIBS $GDK_PIXBUF_LIBS"
- dnl
- dnl Now check if the installed GDK_PIXBUF is sufficiently new. (Also sanity
-@@ -883,7 +885,7 @@
- }
- 
- ],, no_gdk_pixbuf=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
--     CFLAGS="$ac_save_CFLAGS"
-+     CPPFLAGS="$ac_save_CPPFLAGS"
-      LIBS="$ac_save_LIBS"
-    fi
- fi
-@@ -902,7 +904,7 @@
-       :
-      else
-         echo "*** Could not run GDK_PIXBUF test program, checking why..."
--        CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS"
-+        CPPFLAGS="$CPPFLAGS $GDK_PIXBUF_CFLAGS"
-         LIBS="$LIBS $GDK_PIXBUF_LIBS"
-         AC_TRY_LINK([
- #include <stdio.h>
-@@ -921,7 +923,7 @@
-         echo "*** exact error that occured. This usually means GDK_PIXBUF was incorrectly installed"
-         echo "*** or that you have moved GDK_PIXBUF since it was installed. In the latter case, you"
-         echo "*** may want to edit the gdk-pixbuf-config script: $GDK_PIXBUF_CONFIG" ])
--        CFLAGS="$ac_save_CFLAGS"
-+        CPPFLAGS="$ac_save_CPPFLAGS"
-         LIBS="$ac_save_LIBS"
-      fi
-    fi
-@@ -933,8 +935,8 @@
- AC_SUBST(GDK_PIXBUF_LIBS)
- rm -f conf.gdk_pixbuftest
- 
--CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS"
--AC_SUBST(CFLAGS)
-+CPPFLAGS="$CPPFLAGS $GDK_PIXBUF_CFLAGS"
-+AC_SUBST(CPPFLAGS)
- 
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
-@@ -944,7 +946,7 @@
-     echo "*** Download the library from "
-     echo "***     http://www.musicbrainz.org/download.html"
-     echo "***"
--  AC_MSG_ERROR(Cannot continue.)],-ldl -lm -lstdc++)
-+  AC_MSG_ERROR(Cannot continue.)],-lm -lstdc++)
- AC_LANG_RESTORE
- 
- AC_CONFIG_HEADER(config/config.h)
diff --git a/audio/zinf/files/patch-ac b/audio/zinf/files/patch-ac
deleted file mode 100644
index 9ac6033089d5..000000000000
--- a/audio/zinf/files/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.header.in.orig	Sun Jan 28 15:43:24 2001
-+++ Makefile.header.in	Sat Jun 30 07:33:57 2001
-@@ -71,7 +71,7 @@
- 
- INCLUDES = -I. -I$(srcdir)/lib/gdbm -I$(srcdir)/base/include -I$(srcdir)/config -I$(srcdir)/io/include -I$(srcdir)/ui/include -I$(srcdir)/lmc/include -I$(srcdir)/io/soundcard/unix/$(UNIX_AUDIO_API)/include -I$(srcdir)/lmc/xingmp3/include -I$(srcdir)/lmc/cd/include -I$(srcdir)/plm/portable/pmp300/sba -I$(srcdir)/lib/xml/include -I$(srcdir)/lib/zlib/include -I$(srcdir)/lib/unzip/include -I$(srcdir)/io/cd/unix/include -I$(srcdir)/base/aps -I$(srcdir)/io/wavout/include -I$(srcdir)/ui/lcd/include -I$(srcdir)/ui/irman/include -I$(srcdir)/lib/http/include -I$(srcdir)/io/signature/include -I$(srcdir)/plm/metadata/id3v2 $(OSINC)
- 
--CXXFLAGS = $(EXTRA_CXXFLAGS)
-+CXXFLAGS = @CXXFLAGS@ -D_REENTRANT
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(srcdir)/config/mkinstalldirs
- CONFIG_HEADER = ./config/config.h
-@@ -87,8 +87,8 @@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- 
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(RELOC)
--CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(CXXFLAGS)
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(RELOC)
-+CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CXXFLAGS) $(CPPFLAGS)
- CXXCOMPILE += $(RELOC)
- 
- CXXLINK = $(CXXLD) $(CXXFLAGS) $(LDFLAGS) $(RELOC) -o $@
diff --git a/audio/zinf/files/patch-ad b/audio/zinf/files/patch-ad
deleted file mode 100644
index 9e5f9a6a6c07..000000000000
--- a/audio/zinf/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile-plugins.in.orig	Tue Oct 16 13:31:05 2001
-+++ Makefile-plugins.in	Wed Dec 12 03:25:45 2001
-@@ -232,7 +232,7 @@
- UNIXFREEAMPUIOBJ += ui/freeamp/unix/src/GTKPreferenceWindow.o 
- UNIXFREEAMPUIOBJ += ui/freeamp/unix/src/GTKFileSelector.o  
- UNIXFREEAMPUIOBJ += ui/musicbrowser/unix/src/gtkmessagedialog.o
--UNIXFREEAMPUILIBS = $(TTF_LIBS) $(GDK_PIXBUF_LIBS)
-+UNIXFREEAMPUILIBS = $(TTF_LIBS) $(GDK_PIXBUF_LIBS) $(GTK_LIBS)
- 
- BEOSFREEAMPUIOBJ  = ui/freeamp/beos/src/BeOSWindow.o
- BEOSFREEAMPUIOBJ += ui/freeamp/beos/src/BeOSBitmap.o
diff --git a/audio/zinf/files/patch-io-signature-src-signaturepmo.cpp b/audio/zinf/files/patch-io-signature-src-signaturepmo.cpp
deleted file mode 100644
index c16ea2f477e1..000000000000
--- a/audio/zinf/files/patch-io-signature-src-signaturepmo.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./io/signature/src/signaturepmo.cpp.orig	Thu Oct 26 18:51:32 2000
-+++ ./io/signature/src/signaturepmo.cpp	Sun Apr  7 01:40:32 2002
-@@ -27,7 +27,6 @@
- #endif
- #include <stdio.h>
- #include <stdlib.h>
--#include <malloc.h>
- 
- /* project headers */
- #include "config.h"
diff --git a/audio/zinf/files/patch-io-wavout-src-waveoutpmo.cpp b/audio/zinf/files/patch-io-wavout-src-waveoutpmo.cpp
deleted file mode 100644
index 75775fe32538..000000000000
--- a/audio/zinf/files/patch-io-wavout-src-waveoutpmo.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./io/wavout/src/wavoutpmo.cpp.orig	Tue Oct 16 01:23:08 2001
-+++ ./io/wavout/src/wavoutpmo.cpp	Sun Apr  7 01:40:28 2002
-@@ -28,7 +28,6 @@
- #endif
- #include <stdio.h>
- #include <stdlib.h>
--#include <malloc.h>
- 
- /* project headers */
- #include "config.h"
diff --git a/audio/zinf/files/sdr2.plugin.S100.audio.rtp.mpa.freeamp b/audio/zinf/files/sdr2.plugin.S100.audio.rtp.mpa.freeamp
deleted file mode 100644
index 202e4cceee0e..000000000000
--- a/audio/zinf/files/sdr2.plugin.S100.audio.rtp.mpa.freeamp
+++ /dev/null
@@ -1,10 +0,0 @@
-media:audio
-tool:freeamp
-proto:RTP/AVP
-protoname:RTP
-
-fmt:14
-{
-  fmtname:MPEG
-}
-flags:rtp://$(ADDRESS):$(PORT)