diff options
| author | jlam <jlam@pkgsrc.org> | 2002-06-23 18:37:12 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-06-23 18:37:12 +0000 |
| commit | e43bd7cdef06b9274e767e76147d46a933f396af (patch) | |
| tree | ec205ad7d392f8b4fb061b9510a7c3c38870f747 /audio | |
| parent | 0ce2600e1724a8db00dd3c6d8d500657dd469b43 (diff) | |
| download | pkgsrc-e43bd7cdef06b9274e767e76147d46a933f396af.tar.gz | |
Merge from pkgsrc-current to buildlink2 branch.
Diffstat (limited to 'audio')
180 files changed, 6330 insertions, 243 deletions
diff --git a/audio/Makefile b/audio/Makefile index 09e1e404a7a..675fdd36e34 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.131 2002/04/28 16:55:26 zuntum Exp $ +# $NetBSD: Makefile,v 1.131.2.1 2002/06/23 18:37:26 jlam Exp $ # COMMENT= Audio tools @@ -6,6 +6,7 @@ COMMENT= Audio tools SUBDIR+= SDL-mixer SUBDIR+= abcde SUBDIR+= amp +SUBDIR+= arts SUBDIR+= audacity SUBDIR+= aumix SUBDIR+= bladeenc @@ -56,6 +57,7 @@ SUBDIR+= flac SUBDIR+= flac-xmms SUBDIR+= freezetag SUBDIR+= gdcd +SUBDIR+= gkrellm-volume SUBDIR+= gkrellm-xmms SUBDIR+= gmodplay SUBDIR+= gmp3info @@ -73,6 +75,7 @@ SUBDIR+= id3lib SUBDIR+= id3v2 SUBDIR+= kdemultimedia SUBDIR+= kdemultimedia2 +SUBDIR+= kdemultimedia3 SUBDIR+= krio SUBDIR+= lame SUBDIR+= liba52 @@ -100,13 +103,18 @@ SUBDIR+= mp3blaster SUBDIR+= mp3check SUBDIR+= mp3info SUBDIR+= mp3to +SUBDIR+= mpegaudio SUBDIR+= mpg123 +SUBDIR+= mpg123-esound +SUBDIR+= mpg123-nas +SUBDIR+= mpg321 SUBDIR+= mserv SUBDIR+= musicbox SUBDIR+= musicbrainz SUBDIR+= nas SUBDIR+= normalize SUBDIR+= nspmod +SUBDIR+= oggasm SUBDIR+= p5-Audio-CD-disc-cover SUBDIR+= p5-MP3-Info SUBDIR+= p5-MP3-Tag @@ -114,6 +122,7 @@ SUBDIR+= py-cddb SUBDIR+= realplayer SUBDIR+= rio SUBDIR+= rio500 +SUBDIR+= rioutil SUBDIR+= rosegarden SUBDIR+= rplay SUBDIR+= rsynth @@ -122,6 +131,7 @@ SUBDIR+= sidplay SUBDIR+= snd SUBDIR+= sox SUBDIR+= spiralloops +SUBDIR+= spiralsynth SUBDIR+= splay SUBDIR+= tfmxplay SUBDIR+= timidity @@ -129,6 +139,9 @@ SUBDIR+= tosha SUBDIR+= tracker SUBDIR+= vorbis-tools SUBDIR+= wmmixer +SUBDIR+= wmmp3 +SUBDIR+= wmsmixer +SUBDIR+= wmusic SUBDIR+= wsoundprefs SUBDIR+= wsoundserver SUBDIR+= xamp @@ -146,6 +159,7 @@ SUBDIR+= xmms-dspectogram SUBDIR+= xmms-dspectralizer SUBDIR+= xmms-fmradio SUBDIR+= xmms-gdancer +SUBDIR+= xmms-mad SUBDIR+= xmms-neato SUBDIR+= xmms-sid SUBDIR+= xmms-vismsa diff --git a/audio/arts/DESCR b/audio/arts/DESCR new file mode 100644 index 00000000000..bbe8e1016a9 --- /dev/null +++ b/audio/arts/DESCR @@ -0,0 +1,5 @@ +The Analog Real-Time Synthesizer, or aRts, is a modular system for synthesizing +sound and music on a digital computer. Using small building blocks called +modules, the user can easily build complex audio processing tools. Modules +typically provide functions such as sound waveform generators, filters, audio +effects, mixing, and playback of digital audio in different file formats. diff --git a/audio/arts/Makefile b/audio/arts/Makefile new file mode 100644 index 00000000000..84bcdd3fbf7 --- /dev/null +++ b/audio/arts/Makefile @@ -0,0 +1,31 @@ +# $NetBSD: Makefile,v 1.2.2.2 2002/06/23 18:37:28 jlam Exp $ + +DISTNAME= arts-1.0.1 +CATEGORIES= audio +COMMENT= Analog Real-Time Synthesizer + +.include "../../x11/kde3/Makefile.kde3" + +CONFLICTS+= kdelibs-2* + +USE_BUILDLINK_ONLY= yes + +LIBTOOL_OVERRIDE+= ${WRKSRC}/libltdl/libtool + +BUILD_DEPENDS+= perl>=${PERL5_REQD}:../../lang/perl5 +USE_PTHREAD= native pth-syscall +.include "../../mk/bsd.prefs.mk" + +.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none" +CONFIGURE_ARGS+= --disable-threading +.endif + +.if ${OPSYS} == "NetBSD" +LIBS+= -Wl,--export-dynamic +.endif + +.include "../../audio/libaudiofile/buildlink.mk" +.include "../../mk/pthread.buildlink.mk" +.include "../../x11/kde3/buildlink.mk" +.include "../../mk/x11.buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/audio/arts/PLIST b/audio/arts/PLIST new file mode 100644 index 00000000000..be9fca2097a --- /dev/null +++ b/audio/arts/PLIST @@ -0,0 +1,160 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2002/06/23 18:37:29 jlam Exp $ +bin/artsc-config +bin/artscat +bin/artsd +bin/artsdsp +bin/artsplay +bin/artsrec +bin/artsshell +bin/artswrapper +bin/mcopidl +include/arts/anyref.h +include/arts/artsflow.h +include/arts/artsflow.idl +include/arts/artsversion.h +include/arts/asyncstream.h +include/arts/audioio.h +include/arts/audiosubsys.h +include/arts/buffer.h +include/arts/bufferqueue.h +include/arts/cache.h +include/arts/cachedwav.h +include/arts/common.h +include/arts/connect.h +include/arts/connection.h +include/arts/convert.h +include/arts/core.h +include/arts/core.idl +include/arts/cpuinfo.h +include/arts/datapacket.h +include/arts/debug.h +include/arts/delayedreturn.h +include/arts/dispatcher.h +include/arts/dynamicrequest.h +include/arts/dynamicskeleton.h +include/arts/extensionloader.h +include/arts/factory.h +include/arts/fft.h +include/arts/flowsystem.h +include/arts/idlfilereg.h +include/arts/ifacerepo_impl.h +include/arts/iomanager.h +include/arts/kmedia2.h +include/arts/kmedia2.idl +include/arts/mcopconfig.h +include/arts/mcoputils.h +include/arts/notification.h +include/arts/object.h +include/arts/objectmanager.h +include/arts/pipebuffer.h +include/arts/pool.h +include/arts/qiomanager.h +include/arts/reference.h +include/arts/referenceclean.h +include/arts/resample.h +include/arts/socketconnection.h +include/arts/soundserver.h +include/arts/soundserver.idl +include/arts/startupmanager.h +include/arts/stdsynthmodule.h +include/arts/synthschedule.h +include/arts/tcpconnection.h +include/arts/tcpserver.h +include/arts/thread.h +include/arts/type.h +include/arts/unixconnection.h +include/arts/unixserver.h +include/arts/weakreference.h +include/artsc/artsc.h +lib/libartsc.a +lib/libartsc.la +lib/libartsc.so +lib/libartsc.so.0 +lib/libartsc.so.0.0 +lib/libartscbackend.a +lib/libartscbackend.la +lib/libartscbackend.so +lib/libartscbackend.so.0 +lib/libartscbackend.so.0.0 +lib/libartsdsp.a +lib/libartsdsp.la +lib/libartsdsp.so +lib/libartsdsp.so.0 +lib/libartsdsp.so.0.0 +lib/libartsdsp_st.a +lib/libartsdsp_st.la +lib/libartsdsp_st.so +lib/libartsdsp_st.so.0 +lib/libartsdsp_st.so.0.0 +lib/libartsflow.a +lib/libartsflow.la +lib/libartsflow.so +lib/libartsflow.so.1 +lib/libartsflow.so.1.0 +lib/libartsflow_idl.a +lib/libartsflow_idl.la +lib/libartsflow_idl.so +lib/libartsflow_idl.so.1 +lib/libartsflow_idl.so.1.0 +lib/libartswavplayobject.a +lib/libartswavplayobject.la +lib/libartswavplayobject.so +lib/libartswavplayobject.so.0 +lib/libartswavplayobject.so.0.0 +lib/libkmedia2.a +lib/libkmedia2.la +lib/libkmedia2.so +lib/libkmedia2.so.1 +lib/libkmedia2.so.1.0 +lib/libkmedia2_idl.a +lib/libkmedia2_idl.la +lib/libkmedia2_idl.so +lib/libkmedia2_idl.so.1 +lib/libkmedia2_idl.so.1.0 +lib/libmcop.a +lib/libmcop.la +lib/libmcop.so +lib/libmcop.so.1 +lib/libmcop.so.1.0 +lib/libqtmcop.a +lib/libqtmcop.la +lib/libqtmcop.so +lib/libqtmcop.so.1 +lib/libqtmcop.so.1.0 +lib/libsoundserver_idl.a +lib/libsoundserver_idl.la +lib/libsoundserver_idl.so +lib/libsoundserver_idl.so.1 +lib/libsoundserver_idl.so.1.0 +lib/libx11globalcomm.a +lib/libx11globalcomm.la +lib/libx11globalcomm.so +lib/libx11globalcomm.so.1 +lib/libx11globalcomm.so.1.0 +lib/mcop/Arts/FileInputStream.mcopclass +lib/mcop/Arts/Synth_ADD.mcopclass +lib/mcop/Arts/Synth_AMAN_PLAY.mcopclass +lib/mcop/Arts/Synth_AMAN_RECORD.mcopclass +lib/mcop/Arts/Synth_BUS_DOWNLINK.mcopclass +lib/mcop/Arts/Synth_BUS_UPLINK.mcopclass +lib/mcop/Arts/Synth_FREQUENCY.mcopclass +lib/mcop/Arts/Synth_MUL.mcopclass +lib/mcop/Arts/Synth_MULTI_ADD.mcopclass +lib/mcop/Arts/Synth_PLAY.mcopclass +lib/mcop/Arts/Synth_PLAY_WAV.mcopclass +lib/mcop/Arts/Synth_RECORD.mcopclass +lib/mcop/Arts/Synth_WAVE_SIN.mcopclass +lib/mcop/Arts/WavPlayObject.mcopclass +lib/mcop/Arts/X11GlobalComm.mcopclass +lib/mcop/artsflow.mcopclass +lib/mcop/artsflow.mcoptype +lib/mcop/kmedia2.mcopclass +lib/mcop/kmedia2.mcoptype +lib/mcop/soundserver.mcopclass +lib/mcop/soundserver.mcoptype +lib/mcop/x11globalcomm.mcopclass +lib/mcop/x11globalcomm.mcoptype +@dirrm lib/mcop/Arts +@dirrm lib/mcop +@dirrm include/artsc +@dirrm include/arts diff --git a/audio/arts/buildlink.mk b/audio/arts/buildlink.mk new file mode 100644 index 00000000000..d3bb02db81b --- /dev/null +++ b/audio/arts/buildlink.mk @@ -0,0 +1,49 @@ +# $NetBSD: buildlink.mk,v 1.1.1.1.2.2 2002/06/23 18:37:29 jlam Exp $ +# +# This Makefile fragment is included by packages that use arts. +# +# To use this Makefile fragment, simply: +# +# (1) Optionally define BUILDLINK_DEPENDS.arts to the dependency pattern +# for the version of arts desired. +# (2) Include this Makefile fragment in the package Makefile, +# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header +# search path, and +# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search +# path. + +.if !defined(ARTS_BUILDLINK_MK) +ARTS_BUILDLINK_MK= # defined + +.include "../../mk/bsd.buildlink.mk" + +BUILDLINK_DEPENDS.arts?= arts>=1.0.0 +DEPENDS+= ${BUILDLINK_DEPENDS.arts}:../../audio/arts + +EVAL_PREFIX+= BUILDLINK_PREFIX.arts=arts +BUILDLINK_PREFIX.arts_DEFAULT= ${X11BASE} + +BUILDLINK_FILES.arts!= ${GREP} "^\(include\|lib\)" ${.CURDIR}/../../audio/arts/PLIST + +BUILDLINK_TARGETS.arts= arts-buildlink +BUILDLINK_TARGETS.arts+= artsc-buildlink-config-wrapper +BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.arts} + +BUILDLINK_CONFIG.artsc= \ + ${BUILDLINK_PREFIX.arts}/bin/artsc-config +BUILDLINK_CONFIG_WRAPPER.artsc= \ + ${BUILDLINK_DIR}/bin/artsc-config +REPLACE_BUILDLINK_SED+= \ + -e "s|${BUILDLINK_CONFIG_WRAPPER.artsc}|${BUILDLINK_CONFIG.artsc}|g" + +.if defined(USE_CONFIG_WRAPPER) +ARTSC_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.artsc} +CONFIGURE_ENV+= ARTSC_CONFIG="${ARTSC_CONFIG}" +MAKE_ENV+= ARTSC_CONFIG="${ARTSC_CONFIG}" +.endif + +pre-configure: ${BUILDLINK_TARGETS.arts} +arts-buildlink: _BUILDLINK_USE +artsc-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE + +.endif # ARTS_BUILDLINK_MK diff --git a/audio/arts/distinfo b/audio/arts/distinfo new file mode 100644 index 00000000000..fd24e114ff1 --- /dev/null +++ b/audio/arts/distinfo @@ -0,0 +1,10 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:37:30 jlam Exp $ + +SHA1 (arts-1.0.1.tar.bz2) = 88e845d9fa588a254e0e98bcc5391d92722bcdc2 +Size (arts-1.0.1.tar.bz2) = 1018246 bytes +SHA1 (patch-aa) = 23dd79c83f7e0905cef66e002387f44c18438fed +SHA1 (patch-ab) = c18aa3dbb98d916cba99da03e51d53ee72649e9e +SHA1 (patch-ac) = cd5cd30ff4d35de2a11a05e475dfaf5e1fb36f24 +SHA1 (patch-ad) = f030e7f34e4c32d0df6e1c0bcdb9e1bd82e687c5 +SHA1 (patch-ae) = 4913eab125a37e2cb95d1574cad5c7eb84e80956 +SHA1 (patch-af) = 9a130ccd7f56656bb55e2c5edf223c38c69be591 diff --git a/audio/arts/patches/patch-aa b/audio/arts/patches/patch-aa new file mode 100644 index 00000000000..03aa32381d6 --- /dev/null +++ b/audio/arts/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.1.1.1.2.2 2002/06/23 18:37:31 jlam Exp $ + +--- Makefile.in.orig Wed May 8 19:59:26 2002 ++++ Makefile.in +@@ -271,7 +271,7 @@ + x_libraries = @x_libraries@ + + AUTOMAKE_OPTIONS = foreign 1.4 +-COMPILE_FIRST = libltdl mcop mcopidl flow mcop_mt soundserver artsc examples tests doc ++COMPILE_FIRST = libltdl mcop mcopidl flow soundserver artsc examples tests doc + SUBDIRS = $(COMPILE_FIRST) $(TOPSUBDIRS) + EXTRA_DIST = admin + subdir = . diff --git a/audio/arts/patches/patch-ab b/audio/arts/patches/patch-ab new file mode 100644 index 00000000000..396075950ee --- /dev/null +++ b/audio/arts/patches/patch-ab @@ -0,0 +1,68 @@ +$NetBSD: patch-ab,v 1.1.1.1.2.2 2002/06/23 18:37:33 jlam Exp $ + +--- artsc/artsdsp.c.orig Fri Jul 27 11:49:53 2001 ++++ artsc/artsdsp.c +@@ -127,6 +127,9 @@ + + static void artsdsp_doinit() + { ++#if defined(__NetBSD__) ++ void *handle; ++#endif + const char *env; + artsdsp_init = 1; + +@@ -139,6 +142,18 @@ + mmapemu = env && !strcmp(env,"1"); + + /* resolve original symbols */ ++#if defined(__NetBSD__) ++ handle = dlopen(NULL, DL_LAZY); ++ orig_open = (orig_open_ptr)dlsym(handle,"open"); ++ orig_close = (orig_close_ptr)dlsym(handle,"close"); ++ orig_write = (orig_write_ptr)dlsym(handle,"write"); ++ orig_ioctl = (orig_ioctl_ptr)dlsym(handle,"_oss_ioctl"); ++ orig_mmap = (orig_mmap_ptr)dlsym(handle,"mmap"); ++ orig_munmap = (orig_munmap_ptr)dlsym(handle,"munmap"); ++ orig_fopen = (orig_fopen_ptr)dlsym(handle,"fopen"); ++ orig_access = (orig_access_ptr)dlsym(handle,"access"); ++ (void) dlclose(handle); ++#else + orig_open = (orig_open_ptr)dlsym(RTLD_NEXT,"open"); + orig_close = (orig_close_ptr)dlsym(RTLD_NEXT,"close"); + orig_write = (orig_write_ptr)dlsym(RTLD_NEXT,"write"); +@@ -147,6 +162,7 @@ + orig_munmap = (orig_munmap_ptr)dlsym(RTLD_NEXT,"munmap"); + orig_fopen = (orig_fopen_ptr)dlsym(RTLD_NEXT,"fopen"); + orig_access = (orig_access_ptr)dlsym(RTLD_NEXT,"access"); ++#endif + } + + static void artsdspdebug(const char *fmt,...) +@@ -230,13 +246,18 @@ + return sndfd; + } + ++#if defined(__NetBSD__) ++int _oss_ioctl (int fd, unsigned long request, void *argp) ++#else + int ioctl (int fd, ioctl_request_t request, ...) ++#endif + { + static int channels; + static int bits; + static int speed; + int space, size, latency, odelay; + ++#if !defined(__NetBSD__) + /* + * FreeBSD needs ioctl with varargs. However I have no idea how to "forward" + * the variable args ioctl to the orig_ioctl routine. So I expect the ioctl +@@ -248,6 +269,7 @@ + va_start(args,request); + argp = va_arg(args, void *); + va_end(args); ++#endif + + CHECK_INIT(); + diff --git a/audio/arts/patches/patch-ac b/audio/arts/patches/patch-ac new file mode 100644 index 00000000000..9c02a280254 --- /dev/null +++ b/audio/arts/patches/patch-ac @@ -0,0 +1,22 @@ +$NetBSD: patch-ac,v 1.1.1.1.2.2 2002/06/23 18:37:33 jlam Exp $ + +--- flow/cpuinfo.cc.orig Wed May 8 19:57:52 2002 ++++ flow/cpuinfo.cc +@@ -204,6 +204,9 @@ + : /* no input */ + : "memory" + ); ++#if defined(__NetBSD__) ++ CpuInfo::s_flags = 0; ++#else + // SSE must be supported by the OS, if it's not, any SSE insn will + // trigger an invalid opcode exception, to check for this, a SIGILL + // handler is installed and a SSE insn run. If the handler is called, +@@ -226,6 +229,7 @@ + } + signal(SIGILL, oldHandler); + } ++#endif + #endif /* HAVE_X86_SSE */ + } + diff --git a/audio/arts/patches/patch-ad b/audio/arts/patches/patch-ad new file mode 100644 index 00000000000..2bcd3c60d3e --- /dev/null +++ b/audio/arts/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1.1.1.2.2 2002/06/23 18:37:34 jlam Exp $ + +--- soundserver/Makefile.am.orig Wed May 8 19:57:54 2002 ++++ soundserver/Makefile.am +@@ -45,7 +45,7 @@ + bin_PROGRAMS = artsd artsplay artscat artswrapper artsshell artsrec + + artsd_LDADD = libsoundserver_idl.la $(FLOWLIBS) \ +- $(top_builddir)/mcop_mt/libmcop_mt.la $(USE_THREADS) ++ $(top_builddir)/mcop/libmcop.la $(USE_THREADS) + artsd_SOURCES = soundserverv2_impl.cc soundserver_impl.cc simplesoundserver_impl.cc artsd.cc cpuusage.cc samplestorage_impl.cc + + artscat_LDADD = libsoundserver_idl.la $(FLOWLIBS) diff --git a/audio/arts/patches/patch-ae b/audio/arts/patches/patch-ae new file mode 100644 index 00000000000..9c80d1644ad --- /dev/null +++ b/audio/arts/patches/patch-ae @@ -0,0 +1,22 @@ +$NetBSD: patch-ae,v 1.1.1.1.2.2 2002/06/23 18:37:35 jlam Exp $ + +--- soundserver/Makefile.in.orig Wed May 8 19:59:27 2002 ++++ soundserver/Makefile.in +@@ -303,7 +303,7 @@ + bin_PROGRAMS = artsd artsplay artscat artswrapper artsshell artsrec + + artsd_LDADD = libsoundserver_idl.la $(FLOWLIBS) \ +- $(top_builddir)/mcop_mt/libmcop_mt.la $(USE_THREADS) ++ $(top_builddir)/mcop/libmcop.la $(USE_THREADS) + + artsd_SOURCES = soundserverv2_impl.cc soundserver_impl.cc simplesoundserver_impl.cc artsd.cc cpuusage.cc samplestorage_impl.cc + +@@ -395,7 +395,7 @@ + @KDE_USE_FINAL_TRUE@artsd_OBJECTS = $(artsd_final_OBJECTS) + artsd_DEPENDENCIES = libsoundserver_idl.la \ + $(top_builddir)/flow/libartsflow.la \ +- $(top_builddir)/mcop_mt/libmcop_mt.la ++ $(top_builddir)/mcop/libmcop.la + artsd_LDFLAGS = + am_artsplay_OBJECTS = artsplay.$(OBJEXT) + #>- artsplay_OBJECTS = $(am_artsplay_OBJECTS) diff --git a/audio/arts/patches/patch-af b/audio/arts/patches/patch-af new file mode 100644 index 00000000000..44f38ea9e27 --- /dev/null +++ b/audio/arts/patches/patch-af @@ -0,0 +1,14 @@ +$NetBSD: patch-af,v 1.1.1.1.2.2 2002/06/23 18:37:35 jlam Exp $ + +--- flow/gsl/gslcommon.c.orig Thu May 30 13:24:35 2002 ++++ flow/gsl/gslcommon.c +@@ -23,7 +23,9 @@ + #include <fcntl.h> + #include <sys/utsname.h> + #include <string.h> ++#if !defined(__NetBSD__) + #include <sched.h> ++#endif + #include <errno.h> + #include <sys/poll.h> + #include <sys/stat.h> diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile index 5619acd1b77..5aa37e18cf0 100644 --- a/audio/audacity/Makefile +++ b/audio/audacity/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.5 2002/03/13 17:36:35 fredb Exp $ +# $NetBSD: Makefile,v 1.5.2.1 2002/06/23 18:37:36 jlam Exp $ # DISTNAME= audacity-src-0.96 PKGNAME= audacity-0.96 PKGREVISION= 1 CATEGORIES= audio -MASTER_SITES= http://prdownloads.sourceforge.net/audacity/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=audacity/} EXTRACT_SUFX= .tgz MAINTAINER= packages@netbsd.org diff --git a/audio/audacity/patches/patch-ae b/audio/audacity/patches/patch-ae index 65b9df4d5a6..35a7cd20d00 100644 --- a/audio/audacity/patches/patch-ae +++ b/audio/audacity/patches/patch-ae @@ -1,3 +1,4 @@ +$NetBSD: patch-ae,v 1.2.2.1 2002/06/23 18:37:37 jlam Exp $ --- Makefile.in.orig Sun Jul 29 03:17:54 2001 +++ Makefile.in Tue Jul 31 19:28:20 2001 @@ -8,7 +8,7 @@ diff --git a/audio/disc-cover/Makefile b/audio/disc-cover/Makefile index a0bb201773b..07a9b187daa 100644 --- a/audio/disc-cover/Makefile +++ b/audio/disc-cover/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2001/11/26 10:00:36 jlam Exp $ +# $NetBSD: Makefile,v 1.3.2.1 2002/06/23 18:37:38 jlam Exp $ # -DISTNAME= disc-cover-1.2.2 +DISTNAME= disc-cover-1.3.1 CATEGORIES= audio MASTER_SITES= http://www.liacs.nl/~jvhemert/disc-cover/download/unstable/ diff --git a/audio/disc-cover/distinfo b/audio/disc-cover/distinfo index 15f153b008b..6e0bccfbfdd 100644 --- a/audio/disc-cover/distinfo +++ b/audio/disc-cover/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2001/11/26 10:00:36 jlam Exp $ +$NetBSD: distinfo,v 1.4.2.1 2002/06/23 18:37:39 jlam Exp $ -SHA1 (disc-cover-1.2.2.tar.gz) = e5af63e361c66b7ab301c3472cd31af9d542cd30 -Size (disc-cover-1.2.2.tar.gz) = 42151 bytes +SHA1 (disc-cover-1.3.1.tar.gz) = 8195ebe3cce3727fc378e00208bb92dcc2b793d1 +Size (disc-cover-1.3.1.tar.gz) = 47445 bytes diff --git a/audio/esound/Makefile b/audio/esound/Makefile index 3be1b049e23..d3fde455475 100644 --- a/audio/esound/Makefile +++ b/audio/esound/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.30.2.2 2002/06/21 23:04:57 jlam Exp $ +# $NetBSD: Makefile,v 1.30.2.3 2002/06/23 18:37:40 jlam Exp $ -DISTNAME= esound-0.2.25 +DISTNAME= esound-0.2.26 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/esound/} @@ -19,5 +19,6 @@ EGDIR= ${PREFIX}/share/examples/esound CONF_FILES= ${EGDIR}/esd.conf ${PKG_SYSCONFDIR}/esd.conf .include "../../audio/libaudiofile/buildlink2.mk" + .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/esound/PLIST b/audio/esound/PLIST index f9d9fdbdf35..d93ae575a9e 100644 --- a/audio/esound/PLIST +++ b/audio/esound/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2002/04/29 08:40:27 wiz Exp $ +@comment $NetBSD: PLIST,v 1.4.2.1 2002/06/23 18:37:41 jlam Exp $ bin/esd bin/esd-config bin/esdcat @@ -14,7 +14,7 @@ lib/libesd.a lib/libesd.la lib/libesd.so lib/libesd.so.2 -lib/libesd.so.2.25 +lib/libesd.so.2.26 lib/pkgconfig/esound.pc share/aclocal/esd.m4 share/examples/esound/esd.conf diff --git a/audio/esound/distinfo b/audio/esound/distinfo index 35824ad9868..51001eab32a 100644 --- a/audio/esound/distinfo +++ b/audio/esound/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2002/04/29 08:40:27 wiz Exp $ +$NetBSD: distinfo,v 1.5.2.1 2002/06/23 18:37:41 jlam Exp $ -SHA1 (esound-0.2.25.tar.gz) = c72b333e666f6bd8668bc0ebe75c7e817fbfa139 -Size (esound-0.2.25.tar.gz) = 339560 bytes +SHA1 (esound-0.2.26.tar.gz) = dffa3424120b896b879a2ea95f2c495a49dadc45 +Size (esound-0.2.26.tar.gz) = 349513 bytes SHA1 (patch-aa) = fe632a5514073f8d898fef5182a1047b9f2a44c9 SHA1 (patch-ab) = af59f6f254812c082566a1c483aec511deed0819 SHA1 (patch-ac) = 8c68050320c80363b831745eb17cc0703acbaf24 diff --git a/audio/gkrellm-volume/DESCR b/audio/gkrellm-volume/DESCR new file mode 100644 index 00000000000..ece565f5008 --- /dev/null +++ b/audio/gkrellm-volume/DESCR @@ -0,0 +1,2 @@ +gkrellm-volume is a gkrellm plugin to control all your mixer volumes. +It also allows to save/restore volumes between sessions. diff --git a/audio/gkrellm-volume/Makefile b/audio/gkrellm-volume/Makefile new file mode 100644 index 00000000000..8e4480f2639 --- /dev/null +++ b/audio/gkrellm-volume/Makefile @@ -0,0 +1,19 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:37:43 jlam Exp $ + +DISTNAME= volume-0.8 +PKGNAME= gkrellm-${DISTNAME} +WRKSRC= ${WRKDIR}/volume +CATEGORIES= audio +MASTER_SITES= http://gkrellm.luon.net/files/ + +MAINTAINER= jmmv@hispabsd.org +HOMEPAGE= http://gkrellm.luon.net/volume.phtml +COMMENT= gkrellm volume mixer plugin + +DEPENDS+= gkrellm-1.2.*:../../sysutils/gkrellm + +USE_PTHREAD= native pth + +.include "../../graphics/imlib/buildlink.mk" +.include "../../x11/gtk/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/audio/gkrellm-volume/PLIST b/audio/gkrellm-volume/PLIST new file mode 100644 index 00000000000..9593ef99228 --- /dev/null +++ b/audio/gkrellm-volume/PLIST @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.4.2 2002/06/23 18:37:44 jlam Exp $ +lib/gkrellm/plugins/volume.so diff --git a/audio/gkrellm-volume/distinfo b/audio/gkrellm-volume/distinfo new file mode 100644 index 00000000000..2d029f28b8a --- /dev/null +++ b/audio/gkrellm-volume/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.2.2.2 2002/06/23 18:37:44 jlam Exp $ + +SHA1 (volume-0.8.tar.gz) = 7348c8fc41bdc6c236442748ef3c803851a151f8 +Size (volume-0.8.tar.gz) = 8395 bytes +SHA1 (patch-aa) = adf96e0bd1e2b65e85394c4c50ce1db587b73195 +SHA1 (patch-ab) = 9281f2e550134887bfbc99464ab79987f4a26183 diff --git a/audio/gkrellm-volume/patches/patch-aa b/audio/gkrellm-volume/patches/patch-aa new file mode 100644 index 00000000000..7fe16008e9c --- /dev/null +++ b/audio/gkrellm-volume/patches/patch-aa @@ -0,0 +1,57 @@ +$NetBSD: patch-aa,v 1.2.2.2 2002/06/23 18:37:45 jlam Exp $ + +--- Makefile.orig Fri Jun 23 19:47:00 2000 ++++ Makefile +@@ -1,27 +1,19 @@ + # Makefile for GKrellM volume plugin + +-# Linux +-GTK_CONFIG = gtk-config +-SYSLIB = -lpthread +- +-# FreeBSD +-#GTK_CONFIG = gtk12-config +-#SYSLIB = +- +-PLUGIN_DIR = /usr/share/gkrellm/plugins ++PLUGIN_DIR = ${LOCALBASE}/lib/gkrellm/plugins + GKRELLM_INCLUDE = -I/usr/local/include + +-GTK_INCLUDE = `$(GTK_CONFIG) --cflags` +-GTK_LIB = `$(GTK_CONFIG) --libs` ++GTK_INCLUDE = `gtk-config --cflags` ++GTK_LIB = `gtk-config --libs` + + IMLIB_INCLUDE = `imlib-config --cflags-gdk` + IMLIB_LIB = `imlib-config --libs-gdk` + +-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GKRELLM_INCLUDE) +-LIBS = $(GTK_LIB) $(IMLIB_LIB) $(SYSLIB) +-LFLAGS = -shared ++CFLAGS+= -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GKRELLM_INCLUDE) ++LIBS+= $(GTK_LIB) $(IMLIB_LIB) $(SYSLIB) ++LFLAGS+= -shared -lpthread -lossaudio + +-CC = gcc $(CFLAGS) $(FLAGS) ++CC = gcc $(CFLAGS) + + INSTALL = install -c + INSTALL_PROGRAM = $(INSTALL) -s +@@ -30,9 +22,6 @@ + + all: volume.so + +-freebsd: +- make GTK_CONFIG=gtk12-config SYSLIB=all +- + volume.so: $(OBJS) + $(CC) $(OBJS) -o volume.so $(LIBS) $(LFLAGS) + +@@ -40,6 +29,7 @@ + rm -f *.o core *.so* *.bak *~ + + install: ++ mkdir -p $(PLUGIN_DIR) + $(INSTALL_PROGRAM) volume.so $(PLUGIN_DIR) + + volume.c.o: volume.c diff --git a/audio/gkrellm-volume/patches/patch-ab b/audio/gkrellm-volume/patches/patch-ab new file mode 100644 index 00000000000..42a93152c46 --- /dev/null +++ b/audio/gkrellm-volume/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.2.2.2 2002/06/23 18:37:46 jlam Exp $ + +--- volume.c.orig Wed Nov 22 21:35:42 2000 ++++ volume.c +@@ -19,6 +19,8 @@ + + #ifdef __FreeBSD__ + #include <machine/soundcard.h> ++#elif __NetBSD__ ++#include <soundcard.h> + #else + #include <sys/soundcard.h> + #endif diff --git a/audio/gkrellm-xmms/Makefile b/audio/gkrellm-xmms/Makefile index 812901c7480..177519f28d3 100644 --- a/audio/gkrellm-xmms/Makefile +++ b/audio/gkrellm-xmms/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2002/03/13 17:36:36 fredb Exp $ +# $NetBSD: Makefile,v 1.3.2.1 2002/06/23 18:37:47 jlam Exp $ -DISTNAME= gkrellmms-0.5.5 -PKGNAME= gkrellm-xmms-0.5.5 -PKGREVISION= 1 +DISTNAME= gkrellmms-0.5.6 +PKGNAME= gkrellm-xmms-0.5.6 WRKSRC= ${WRKDIR}/gkrellmms CATEGORIES= audio MASTER_SITES= http://gkrellm.luon.net/files/ @@ -12,7 +11,7 @@ HOMEPAGE= http://gkrellm.luon.net/gkrellmms.phtml COMMENT= gkrellm xmms plugin DEPENDS+= xmms>=1.2.5:../xmms -DEPENDS+= gkrellm-1.2.*:../../sysutils/gkrellm +DEPENDS+= gkrellm>=1.2.11:../../sysutils/gkrellm pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins diff --git a/audio/gkrellm-xmms/distinfo b/audio/gkrellm-xmms/distinfo index 34e017311c6..76c3bc2a3b6 100644 --- a/audio/gkrellm-xmms/distinfo +++ b/audio/gkrellm-xmms/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/10/30 13:22:05 damon Exp $ +$NetBSD: distinfo,v 1.1.1.1.2.1 2002/06/23 18:37:47 jlam Exp $ -SHA1 (gkrellmms-0.5.5.tar.gz) = afdf60b51f2cd974943364c377ea6f45edeb7ea8 -Size (gkrellmms-0.5.5.tar.gz) = 26721 bytes +SHA1 (gkrellmms-0.5.6.tar.gz) = a657f47c5e8f5a874c0ad0b91e238147065593bc +Size (gkrellmms-0.5.6.tar.gz) = 27249 bytes SHA1 (patch-aa) = f0b0c9266046bcea9b97fd9ae57f41b595d1eb11 diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index 3175efa1c21..5d7df20571b 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/03/13 17:36:36 fredb Exp $ +# $NetBSD: Makefile,v 1.11.2.1 2002/06/23 18:37:48 jlam Exp $ DISTNAME= gnome-media-1.2.3 PKGREVISION= 1 @@ -15,6 +15,7 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES USE_X11BASE= YES USE_GMAKE= YES +BUILD_USES_MSGFMT= YES CONFIGURE_ENV+= XGETTEXT="${LOCALBASE}/bin/xgettext" CPPFLAGS+= -I${LOCALBASE}/include diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile index f381f387376..c030e3a8260 100644 --- a/audio/icecast/Makefile +++ b/audio/icecast/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2002/03/18 01:41:31 mrg Exp $ +# $NetBSD: Makefile,v 1.6.2.1 2002/06/23 18:37:49 jlam Exp $ # -DISTNAME= icecast-1.3.11 +DISTNAME= icecast-1.3.12 CATEGORIES= audio MASTER_SITES= http://www.icecast.org/releases/ diff --git a/audio/icecast/distinfo b/audio/icecast/distinfo index cb660bfa7aa..b95ddb50254 100644 --- a/audio/icecast/distinfo +++ b/audio/icecast/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2002/03/18 01:41:31 mrg Exp $ +$NetBSD: distinfo,v 1.4.2.1 2002/06/23 18:37:49 jlam Exp $ -SHA1 (icecast-1.3.11.tar.gz) = 20191e1baff1becf9f28b2fd6e0395aa475b5b39 -Size (icecast-1.3.11.tar.gz) = 267709 bytes +SHA1 (icecast-1.3.12.tar.gz) = bacb760390453718de536b85979ff3a9a73c7710 +Size (icecast-1.3.12.tar.gz) = 269822 bytes SHA1 (patch-aa) = 169202f563e4e2812d8d532264dcdb4f9ffc8df2 -SHA1 (patch-ab) = 8724c2085a36caf4908067a29267bbd7a0f4e103 +SHA1 (patch-ab) = 80d2bb39512bffadf8015e6804a32212762b8294 diff --git a/audio/icecast/patches/patch-ab b/audio/icecast/patches/patch-ab index e550dbf19b0..2f5bb86e48d 100644 --- a/audio/icecast/patches/patch-ab +++ b/audio/icecast/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1.1.1 2000/11/21 06:02:28 hubertf Exp $ +$NetBSD: patch-ab,v 1.1.1.1.2.1 2002/06/23 18:37:50 jlam Exp $ ---- configure.orig Tue Nov 21 06:35:44 2000 -+++ configure -@@ -880,15 +880,15 @@ +--- configure.orig Thu Apr 11 00:50:20 2002 ++++ configure Wed May 15 09:22:11 2002 +@@ -877,15 +877,15 @@ ICECAST_BINDIR=${prefix}/bin ICECAST_SBINDIR=${prefix}/bin ICECAST_ETCDIR=conf diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile index cef37cd4d8b..59f7a031d2f 100644 --- a/audio/id3lib/Makefile +++ b/audio/id3lib/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2002/01/08 17:49:12 drochner Exp $ +# $NetBSD: Makefile,v 1.3.2.1 2002/06/23 18:37:51 jlam Exp $ # DISTNAME= id3lib-3.8.0pre2 PKGNAME= id3lib-3.8.0.0.2 CATEGORIES= audio -MASTER_SITES= http://prdownloads.sourceforge.net/id3lib/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=id3lib/} MAINTAINER= packages@netbsd.org HOMEPAGE= http://id3lib.sourceforge.net/ diff --git a/audio/id3v2/Makefile b/audio/id3v2/Makefile index e427a86fa55..d6c39f635c8 100644 --- a/audio/id3v2/Makefile +++ b/audio/id3v2/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/04/19 14:35:29 zuntum Exp $ +# $NetBSD: Makefile,v 1.1.1.1.2.1 2002/06/23 18:37:52 jlam Exp $ -DISTNAME= id3v2-0.1.6 +DISTNAME= id3v2-0.1.7 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=id3v2/} MAINTAINER= jmmv@hispabsd.org -HOMEPAGE= http://id3v2.sourceforge.net +HOMEPAGE= http://id3v2.sourceforge.net/ COMMENT= Command line editor for id3v2 tags .include "../../audio/id3lib/buildlink.mk" diff --git a/audio/id3v2/PLIST b/audio/id3v2/PLIST index 24944cf5648..925e9ff161e 100644 --- a/audio/id3v2/PLIST +++ b/audio/id3v2/PLIST @@ -1,2 +1,3 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/04/19 14:35:29 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.2.1 2002/06/23 18:37:52 jlam Exp $ bin/id3v2 +man/man1/id3v2.1 diff --git a/audio/id3v2/distinfo b/audio/id3v2/distinfo index b9d91351c9a..265fda29686 100644 --- a/audio/id3v2/distinfo +++ b/audio/id3v2/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/04/19 14:35:29 zuntum Exp $ +$NetBSD: distinfo,v 1.1.1.1.2.1 2002/06/23 18:37:53 jlam Exp $ -SHA1 (id3v2-0.1.6.tar.gz) = 66bf3f40ac56f88e3d9358c73dec739d5757ff85 -Size (id3v2-0.1.6.tar.gz) = 20998 bytes -SHA1 (patch-aa) = 002bed6cf9de5a5c6ce33362676536237f464464 +SHA1 (id3v2-0.1.7.tar.gz) = 1d9766fda33d0bcdde46751e89bf1cfb6c23716e +Size (id3v2-0.1.7.tar.gz) = 54132 bytes +SHA1 (patch-aa) = 64eac05e1894a811fd3518ec4a7799117e640f60 diff --git a/audio/id3v2/patches/patch-aa b/audio/id3v2/patches/patch-aa index 56c1d823fb6..54b884f3ff5 100644 --- a/audio/id3v2/patches/patch-aa +++ b/audio/id3v2/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/04/19 14:35:29 zuntum Exp $ +$NetBSD: patch-aa,v 1.1.1.1.2.1 2002/06/23 18:37:54 jlam Exp $ ---- Makefile.orig Sat Apr 13 12:07:11 2002 -+++ Makefile Sat Apr 13 12:07:47 2002 -@@ -1,10 +1,10 @@ +--- Makefile.orig Tue Apr 16 11:35:31 2002 ++++ Makefile Thu Jun 13 00:28:19 2002 +@@ -1,10 +1,11 @@ all: id3v2 id3v2: Makefile convert.cpp list.cpp id3v2.cpp convert.cpp @@ -12,6 +12,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/04/19 14:35:29 zuntum Exp $ install: all - cp id3v2 /usr/local/bin/ + cp id3v2 ${LOCALBASE}/bin ++ cp id3v2.1 ${LOCALBASE}/man/man1 clean: rm -f id3v2 core diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile index 978ec648c23..372346a0aeb 100644 --- a/audio/kdemultimedia2/Makefile +++ b/audio/kdemultimedia2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/03/13 17:36:37 fredb Exp $ +# $NetBSD: Makefile,v 1.10.2.1 2002/06/23 18:37:55 jlam Exp $ DISTNAME= kdemultimedia-2.2.2 PKGREVISION= 1 @@ -10,8 +10,8 @@ COMMENT= KDE audio tools BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde DEPENDS+= xanim>=2.80.0:../../graphics/xanim -BUILDLINK_DEPENDS.pth= pth>=1.4.0 USE_BUILDLINK_ONLY= YES +USE_PTHREAD= native pth CONFIGURE_ENV+= ac_cv_path_kde_artsplug_compiles="${ARTSCCONFIG}" @@ -21,7 +21,7 @@ CONFIGURE_ENV+= ac_cv_path_kde_artsplug_compiles="${ARTSCCONFIG}" LIBS= -Wl,--export-dynamic .endif -.include "../../devel/pth/buildlink.mk" +.include "../../mk/pthread.buildlink.mk" .include "../../x11/kde2/buildlink.mk" .include "../../x11/kdebase2/buildlink.mk" .include "../../mk/x11.buildlink.mk" diff --git a/audio/kdemultimedia3/DESCR b/audio/kdemultimedia3/DESCR new file mode 100644 index 00000000000..4e93cb4097a --- /dev/null +++ b/audio/kdemultimedia3/DESCR @@ -0,0 +1,2 @@ +The kdemultimedia module of KDE provides various sound and movie +format players. diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile new file mode 100644 index 00000000000..dd8da531d17 --- /dev/null +++ b/audio/kdemultimedia3/Makefile @@ -0,0 +1,32 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:37:56 jlam Exp $ + +DISTNAME= kdemultimedia-3.0.1 +CATEGORIES= audio +COMMENT= Audio tools for the KDE integrated X11 desktop + +.include "../../x11/kde3/Makefile.kde3" + +DEPENDS+= xanim>=2.80.0:../../graphics/xanim + +USE_BUILDLINK_ONLY= YES + +#USE_CONFIG_WRAPPER= yes # $GTK_CONFIG +#CONFIGURE_ENV+= ac_cv_path_kde_artsplug_compiles="${ARTSC_CONFIG}" + +USE_PTHREAD= native pth-syscall +.include "../../mk/bsd.prefs.mk" + +.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none" +CONFIGURE_ARGS+= --disable-threading +.endif + +.if ${OPSYS} == "NetBSD" +LIBS= -Wl,--export-dynamic +.endif + +.include "../../mk/pthread.buildlink.mk" +.include "../../audio/arts/buildlink.mk" +.include "../../x11/kde3/buildlink.mk" +.include "../../x11/kdebase3/buildlink.mk" +.include "../../mk/x11.buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/audio/kdemultimedia3/PLIST b/audio/kdemultimedia3/PLIST new file mode 100644 index 00000000000..702678e22a1 --- /dev/null +++ b/audio/kdemultimedia3/PLIST @@ -0,0 +1,1155 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2002/06/23 18:37:57 jlam Exp $ +bin/aktion +bin/artsbuilder +bin/artscontrol +bin/kaboodle +bin/kmid +bin/kmidi +bin/kmix +bin/kmixctrl +bin/kscd +bin/midisend +bin/mpeglibartsplay +bin/noatun +bin/sf2cfg +bin/timidity +bin/workman2cddb.pl +bin/yaf-cdda +bin/yaf-mpgplay +bin/yaf-splay +bin/yaf-tplay +bin/yaf-vorbis +bin/yaf-yuv +include/arts/artsbuilder.h +include/arts/artsbuilder.idl +include/arts/artsgui.h +include/arts/artsgui.idl +include/arts/artsmidi.h +include/arts/artsmidi.idl +include/arts/artsmodules.h +include/arts/artsmodules.idl +include/arts/kartswidget.h +include/cmodule.h +include/effectview.h +include/equalizerview.h +include/ksaver.h +include/mimetypetree.h +include/mpeglib/decoder/cddaPlugin.h +include/mpeglib/decoder/command.h +include/mpeglib/decoder/commandPipe.h +include/mpeglib/decoder/decoderPlugin.h +include/mpeglib/decoder/mpegPlugin.h +include/mpeglib/decoder/mpgPlugin.h +include/mpeglib/decoder/nukePlugin.h +include/mpeglib/decoder/splayPlugin.h +include/mpeglib/decoder/tplayPlugin.h +include/mpeglib/decoder/vorbisPlugin.h +include/mpeglib/decoder/yuvPlugin.h +include/mpeglib/frame/IOFrameQueue.h +include/mpeglib/frame/audioFrame.h +include/mpeglib/frame/audioFrameQueue.h +include/mpeglib/frame/floatFrame.h +include/mpeglib/frame/frame.h +include/mpeglib/frame/frameQueue.h +include/mpeglib/frame/framer.h +include/mpeglib/frame/pcmFrame.h +include/mpeglib/frame/rawDataBuffer.h +include/mpeglib/frame/rawFrame.h +include/mpeglib/input/bufferInputStream.h +include/mpeglib/input/cddaInputStream.h +include/mpeglib/input/cdromInputStream.h +include/mpeglib/input/fileInputStream.h +include/mpeglib/input/httpInputStream.h +include/mpeglib/input/inputDetector.h +include/mpeglib/input/inputPlugin.h +include/mpeglib/input/inputStream.h +include/mpeglib/input/threadSafeInputStream.h +include/mpeglib/mpegutil/mpegStreamPlayer.h +include/mpeglib/mpegutil/mpegSystemHeader.h +include/mpeglib/mpegutil/mpegSystemStream.h +include/mpeglib/mpegutil/mpegVideoLength.h +include/mpeglib/mpegutil/pesSystemStream.h +include/mpeglib/mpegutil/psSystemStream.h +include/mpeglib/mpegutil/tsSystemStream.h +include/mpeglib/oggvorbis/oggFrame.h +include/mpeglib/oggvorbis/ovFramer.h +include/mpeglib/oggvorbis/vorbisDecoder.h +include/mpeglib/oggvorbis/vorbisInfo.h +include/mpeglib/output/artsOutputStream.h +include/mpeglib/output/audioTime.h +include/mpeglib/output/avSyncer.h +include/mpeglib/output/dspX11OutputStream.h +include/mpeglib/output/outPlugin.h +include/mpeglib/output/outputStream.h +include/mpeglib/output/pluginInfo.h +include/mpeglib/output/threadSafeOutputStream.h +include/mpeglib/splay/mpegAudioFrame.h +include/mpeglib/splay/mpegAudioInfo.h +include/mpeglib/splay/splayDecoder.h +include/mpeglib/util/abstract/abs_thread.h +include/mpeglib/util/abstract/threadQueue.h +include/mpeglib/util/dynBuffer.h +include/mpeglib/util/file/fileAccess.h +include/mpeglib/util/render/pictureArray.h +include/mpeglib/util/render/yuvPicture.h +include/mpeglib/util/syncClock.h +include/mpeglib/util/timeStamp.h +include/mpeglib/util/timeStampArray.h +include/mpeglib/util/timeWrapper.h +include/mpeglib/util/yaf/yafcore/buffer.h +include/mpeglib/util/yaf/yafcore/inputDecoder.h +include/mpeglib/util/yaf/yafcore/inputInterface.h +include/mpeglib/util/yaf/yafcore/outputInterface.h +include/mpeglib/util/yaf/yafcore/yaf_control.h +include/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h +include/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h +include/mpeglib/util/yaf/yafxplayer/yafOutputStream.h +include/mpeglib_artsplug/decoderBaseObject.h +include/mpeglib_artsplug/decoderBaseObject.idl +include/mpeglib_artsplug/decoderBaseObject_impl.h +include/mpeglib_artsplug/splayPlayObject.h +include/mpeglib_artsplug/splayPlayObject.idl +include/mpeglib_artsplug/splayPlayObject_impl.h +include/noatun/app.h +include/noatun/controls.h +include/noatun/conversion.h +include/noatun/downloader.h +include/noatun/effects.h +include/noatun/engine.h +include/noatun/equalizer.h +include/noatun/noatunarts.h +include/noatun/player.h +include/noatun/playlist.h +include/noatun/playlistsaver.h +include/noatun/plugin.h +include/noatun/pluginloader.h +include/noatun/pref.h +include/noatun/scrollinglabel.h +include/noatun/stdaction.h +include/noatun/stereobuttonaction.h +include/noatun/tags.h +include/noatun/winskinvis.h +include/plugin_deps.h +lib/kaboodle.a +lib/kaboodle.la +lib/kaboodle.so +lib/kde3/kcm_kmix.a +lib/kde3/kcm_kmix.la +lib/kde3/kcm_kmix.so +lib/kde3/kfile_m3u.a +lib/kde3/kfile_m3u.la +lib/kde3/kfile_m3u.so +lib/kde3/kfile_mp3.a +lib/kde3/kfile_mp3.la +lib/kde3/kfile_mp3.so +lib/kde3/kfile_wav.a +lib/kde3/kfile_wav.la +lib/kde3/kfile_wav.so +lib/kde3/kmix_panelapplet.a +lib/kde3/kmix_panelapplet.la +lib/kde3/kmix_panelapplet.so +lib/kde3/kmix_panelapplet.so.1 +lib/kde3/kmix_panelapplet.so.1.0 +lib/kde3/noatun.a +lib/kde3/noatun.la +lib/kde3/noatun.so +lib/kde3/noatun_dcopiface.a +lib/kde3/noatun_dcopiface.la +lib/kde3/noatun_dcopiface.so +lib/kde3/noatun_excellent.a +lib/kde3/noatun_excellent.la +lib/kde3/noatun_excellent.so +lib/kde3/noatun_htmlexport.a +lib/kde3/noatun_htmlexport.la +lib/kde3/noatun_htmlexport.so +lib/kde3/noatun_infrared.a +lib/kde3/noatun_infrared.la +lib/kde3/noatun_infrared.so +lib/kde3/noatun_kaiman.a +lib/kde3/noatun_kaiman.la +lib/kde3/noatun_kaiman.so +lib/kde3/noatun_keyz.a +lib/kde3/noatun_keyz.la +lib/kde3/noatun_keyz.so +lib/kde3/noatun_kjofol.a +lib/kde3/noatun_kjofol.la +lib/kde3/noatun_kjofol.so +lib/kde3/noatun_marquis.a +lib/kde3/noatun_marquis.la +lib/kde3/noatun_marquis.so +lib/kde3/noatun_metatag.a +lib/kde3/noatun_metatag.la +lib/kde3/noatun_metatag.so +lib/kde3/noatun_monoscope.a +lib/kde3/noatun_monoscope.la +lib/kde3/noatun_monoscope.so +lib/kde3/noatun_net.a +lib/kde3/noatun_net.la +lib/kde3/noatun_net.so +lib/kde3/noatun_splitplaylist.a +lib/kde3/noatun_splitplaylist.la +lib/kde3/noatun_splitplaylist.so +lib/kde3/noatun_systray.a +lib/kde3/noatun_systray.la +lib/kde3/noatun_systray.so +lib/kde3/noatun_ui.a +lib/kde3/noatun_ui.la +lib/kde3/noatun_ui.so +lib/kde3/noatun_voiceprint.a +lib/kde3/noatun_voiceprint.la +lib/kde3/noatun_voiceprint.so +lib/kde3/noatun_winskin.a +lib/kde3/noatun_winskin.la +lib/kde3/noatun_winskin.so +lib/kmix.a +lib/kmix.la +lib/kmix.so +lib/kmixctrl.a +lib/kmixctrl.la +lib/kmixctrl.so +lib/libaktion.a +lib/libaktion.la +lib/libaktion.so +lib/libaktion.so.1 +lib/libaktion.so.1.0 +lib/libarts_mpeglib-0.3.0.so +lib/libarts_mpeglib-0.3.0.so.0 +lib/libarts_mpeglib-0.3.0.so.0.3 +lib/libarts_mpeglib.a +lib/libarts_mpeglib.la +lib/libarts_mpeglib.so +lib/libarts_splay.a +lib/libarts_splay.la +lib/libarts_splay.so +lib/libarts_splay.so.0 +lib/libarts_splay.so.0.0 +lib/libartsbuilder.a +lib/libartsbuilder.la +lib/libartsbuilder.so +lib/libartsbuilder.so.0 +lib/libartsbuilder.so.0.0 +lib/libartseffects.a +lib/libartseffects.la +lib/libartseffects.so +lib/libartsgui.a +lib/libartsgui.la +lib/libartsgui.so +lib/libartsgui.so.0 +lib/libartsgui.so.0.0 +lib/libartsgui_idl.a +lib/libartsgui_idl.la +lib/libartsgui_idl.so +lib/libartsgui_idl.so.0 +lib/libartsgui_idl.so.0.0 +lib/libartsgui_kde.a +lib/libartsgui_kde.la +lib/libartsgui_kde.so +lib/libartsgui_kde.so.0 +lib/libartsgui_kde.so.0.0 +lib/libartsmidi.a +lib/libartsmidi.la +lib/libartsmidi.so +lib/libartsmidi.so.0 +lib/libartsmidi.so.0.0 +lib/libartsmidi_idl.a +lib/libartsmidi_idl.la +lib/libartsmidi_idl.so +lib/libartsmidi_idl.so.0 +lib/libartsmidi_idl.so.0.0 +lib/libartsmodules.a +lib/libartsmodules.la +lib/libartsmodules.so +lib/libartsmodules.so.0 +lib/libartsmodules.so.0.0 +lib/libaudiofilearts.a +lib/libaudiofilearts.la +lib/libaudiofilearts.so +lib/libdummy.a +lib/libdummy.la +lib/libdummy.so +lib/libdummy.so.0 +lib/libdummy.so.0.0 +lib/libkaboodle_main.a +lib/libkaboodle_main.la +lib/libkaboodle_main.so +lib/libkaboodle_main.so.0 +lib/libkaboodle_main.so.0.0 +lib/libkaboodlepart.a +lib/libkaboodlepart.la +lib/libkaboodlepart.so +lib/libkmidpart.a +lib/libkmidpart.la +lib/libkmidpart.so +lib/libkmidpart.so.1 +lib/libkmidpart.so.1.0 +lib/libkmix_main.a +lib/libkmix_main.la +lib/libkmix_main.so +lib/libkmix_main.so.0 +lib/libkmix_main.so.0.0 +lib/libkmixctrl_main.a +lib/libkmixctrl_main.la +lib/libkmixctrl_main.so +lib/libkmixctrl_main.so.0 +lib/libkmixctrl_main.so.0.0 +lib/libmpeg-0.3.0.so +lib/libmpeg.a +lib/libmpeg.la +lib/libmpeg.so +lib/libnoatun.a +lib/libnoatun.la +lib/libnoatun.so +lib/libnoatun.so.0 +lib/libnoatun.so.0.0 +lib/libnoatun_main.a +lib/libnoatun_main.la +lib/libnoatun_main.so +lib/libnoatun_main.so.0 +lib/libnoatun_main.so.0.0 +lib/libnoatunarts.a +lib/libnoatunarts.la +lib/libnoatunarts.so +lib/libnoatuncontrols.a +lib/libnoatuncontrols.la +lib/libnoatuncontrols.so +lib/libnoatuncontrols.so.0 +lib/libnoatuncontrols.so.0.0 +lib/libnoatuntags.a +lib/libnoatuntags.la +lib/libnoatuntags.so +lib/libnoatuntags.so.0 +lib/libnoatuntags.so.0.0 +lib/libwinskinvis.a +lib/libwinskinvis.la +lib/libwinskinvis.so +lib/libworkman.a +lib/libworkman.la +lib/libworkman.so +lib/libworkman.so.5 +lib/libworkman.so.5.3 +lib/libyafcore.a +lib/libyafcore.la +lib/libyafcore.so +lib/libyafcore.so.0 +lib/libyafcore.so.0.0 +lib/libyafxplayer.a +lib/libyafxplayer.la +lib/libyafxplayer.so +lib/libyafxplayer.so.0 +lib/libyafxplayer.so.0.0 +lib/mcop/Arts/ArtsBuilderLoader.mcopclass +lib/mcop/Arts/Button.mcopclass +lib/mcop/Arts/Effect_WAVECAPTURE.mcopclass +lib/mcop/Arts/Environment/Container.mcopclass +lib/mcop/Arts/Environment/InstrumentItem.mcopclass +lib/mcop/Arts/Environment/InstrumentItemGuiFactory.mcopclass +lib/mcop/Arts/Environment/MixerItem.mcopclass +lib/mcop/Arts/Fader.mcopclass +lib/mcop/Arts/FreeverbGuiFactory.mcopclass +lib/mcop/Arts/GenericGuiFactory.mcopclass +lib/mcop/Arts/GraphLine.mcopclass +lib/mcop/Arts/HBox.mcopclass +lib/mcop/Arts/LineEdit.mcopclass +lib/mcop/Arts/LocalFactory.mcopclass +lib/mcop/Arts/MidiManager.mcopclass +lib/mcop/Arts/MixerGuiFactory.mcopclass +lib/mcop/Arts/MonoSimpleMixerChannel.mcopclass +lib/mcop/Arts/MonoSimpleMixerChannelGuiFactory.mcopclass +lib/mcop/Arts/Poti.mcopclass +lib/mcop/Arts/SimpleMixerChannel.mcopclass +lib/mcop/Arts/SimpleMixerChannelGuiFactory.mcopclass +lib/mcop/Arts/SpinBox.mcopclass +lib/mcop/Arts/StereoFirEqualizerGuiFactory.mcopclass +lib/mcop/Arts/StructureBuilder.mcopclass +lib/mcop/Arts/StructureDesc.mcopclass +lib/mcop/Arts/Synth_ATAN_SATURATE.mcopclass +lib/mcop/Arts/Synth_AUTOPANNER.mcopclass +lib/mcop/Arts/Synth_BRICKWALL_LIMITER.mcopclass +lib/mcop/Arts/Synth_CAPTURE_WAV.mcopclass +lib/mcop/Arts/Synth_CDELAY.mcopclass +lib/mcop/Arts/Synth_COMPRESSOR.mcopclass +lib/mcop/Arts/Synth_DATA.mcopclass +lib/mcop/Arts/Synth_DEBUG.mcopclass +lib/mcop/Arts/Synth_DELAY.mcopclass +lib/mcop/Arts/Synth_ENVELOPE_ADSR.mcopclass +lib/mcop/Arts/Synth_FM_SOURCE.mcopclass +lib/mcop/Arts/Synth_FREEVERB.mcopclass +lib/mcop/Arts/Synth_FX_CFLANGER.mcopclass +lib/mcop/Arts/Synth_MIDI_DEBUG.mcopclass +lib/mcop/Arts/Synth_MIDI_TEST.mcopclass +lib/mcop/Arts/Synth_MOOG_VCF.mcopclass +lib/mcop/Arts/Synth_NIL.mcopclass +lib/mcop/Arts/Synth_NOISE.mcopclass +lib/mcop/Arts/Synth_PITCH_SHIFT.mcopclass +lib/mcop/Arts/Synth_PLAY_PAT.mcopclass +lib/mcop/Arts/Synth_PSCALE.mcopclass +lib/mcop/Arts/Synth_RC.mcopclass +lib/mcop/Arts/Synth_SEQUENCE.mcopclass +lib/mcop/Arts/Synth_SHELVE_CUTOFF.mcopclass +lib/mcop/Arts/Synth_STD_EQUALIZER.mcopclass +lib/mcop/Arts/Synth_STEREO_FIR_EQUALIZER.mcopclass +lib/mcop/Arts/Synth_STEREO_PITCH_SHIFT.mcopclass +lib/mcop/Arts/Synth_TREMOLO.mcopclass +lib/mcop/Arts/Synth_WAVE_PULSE.mcopclass +lib/mcop/Arts/Synth_WAVE_SOFTSAW.mcopclass +lib/mcop/Arts/Synth_WAVE_SQUARE.mcopclass +lib/mcop/Arts/Synth_WAVE_TRI.mcopclass +lib/mcop/Arts/Synth_XFADE.mcopclass +lib/mcop/Arts/VBox.mcopclass +lib/mcop/Arts/Widget.mcopclass +lib/mcop/Arts/audiofilePlayObject.mcopclass +lib/mcop/CDDAPlayObject.mcopclass +lib/mcop/ExtraStereo.mcopclass +lib/mcop/ExtraStereoGuiFactory.mcopclass +lib/mcop/MP3PlayObject.mcopclass +lib/mcop/MPGPlayObject.mcopclass +lib/mcop/NULLPlayObject.mcopclass +lib/mcop/Noatun/Equalizer.mcopclass +lib/mcop/Noatun/EqualizerSSE.mcopclass +lib/mcop/Noatun/FFTScope.mcopclass +lib/mcop/Noatun/FFTScopeStereo.mcopclass +lib/mcop/Noatun/Listener.mcopclass +lib/mcop/Noatun/RawScope.mcopclass +lib/mcop/Noatun/RawScopeStereo.mcopclass +lib/mcop/Noatun/Session.mcopclass +lib/mcop/Noatun/StereoEffectStack.mcopclass +lib/mcop/Noatun/StereoVolumeControl.mcopclass +lib/mcop/Noatun/StereoVolumeControlSSE.mcopclass +lib/mcop/Noatun/WinSkinFFT.mcopclass +lib/mcop/OGGPlayObject.mcopclass +lib/mcop/RawWriter.mcopclass +lib/mcop/SplayPlayObject.mcopclass +lib/mcop/VCDPlayObject.mcopclass +lib/mcop/VoiceRemoval.mcopclass +lib/mcop/WAVPlayObject.mcopclass +lib/mcop/artsbuilder.mcopclass +lib/mcop/artsbuilder.mcoptype +lib/mcop/artseffects.mcopclass +lib/mcop/artseffects.mcoptype +lib/mcop/artsgui.mcopclass +lib/mcop/artsgui.mcoptype +lib/mcop/artsmidi.mcopclass +lib/mcop/artsmidi.mcoptype +lib/mcop/artsmodules.mcopclass +lib/mcop/artsmodules.mcoptype +lib/mcop/audiofilearts.mcopclass +lib/mcop/audiofilearts.mcoptype +lib/mcop/noatunarts.mcopclass +lib/mcop/noatunarts.mcoptype +lib/mcop/winskinvis.mcopclass +lib/mcop/winskinvis.mcoptype +share/doc/kde/HTML/en/aktion/aktion.png +share/doc/kde/HTML/en/aktion/aktiontoolbar.png +share/doc/kde/HTML/en/aktion/common +share/doc/kde/HTML/en/aktion/index.cache.bz2 +share/doc/kde/HTML/en/aktion/index.docbook +share/doc/kde/HTML/en/artsbuilder/apis.docbook +share/doc/kde/HTML/en/artsbuilder/arts-structure.png +share/doc/kde/HTML/en/artsbuilder/artsbuilder.docbook +share/doc/kde/HTML/en/artsbuilder/common +share/doc/kde/HTML/en/artsbuilder/detail.docbook +share/doc/kde/HTML/en/artsbuilder/digitalaudio.docbook +share/doc/kde/HTML/en/artsbuilder/faq.docbook +share/doc/kde/HTML/en/artsbuilder/future.docbook +share/doc/kde/HTML/en/artsbuilder/glossary.docbook +share/doc/kde/HTML/en/artsbuilder/gui.docbook +share/doc/kde/HTML/en/artsbuilder/helping.docbook +share/doc/kde/HTML/en/artsbuilder/images/Doc_MODUL.png +share/doc/kde/HTML/en/artsbuilder/images/Gui_AUDIO_MANAGER.png +share/doc/kde/HTML/en/artsbuilder/images/Gui_INSTRUMENT_MAPPER.png +share/doc/kde/HTML/en/artsbuilder/images/Gui_LABEL.png +share/doc/kde/HTML/en/artsbuilder/images/Gui_MIXER.png +share/doc/kde/HTML/en/artsbuilder/images/Gui_PANEL.png +share/doc/kde/HTML/en/artsbuilder/images/Gui_POTI.png +share/doc/kde/HTML/en/artsbuilder/images/Gui_SLIDER.png +share/doc/kde/HTML/en/artsbuilder/images/Gui_SUBPANEL.png +share/doc/kde/HTML/en/artsbuilder/images/Gui_WINDOW.png +share/doc/kde/HTML/en/artsbuilder/images/Interface_MIDI_NOTE.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_ADD.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_ATAN_SATURATE.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_BUS_DOWNLINK.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_BUS_UPLINK.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_CDELAY.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_COMPRESSOR.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_DEBUG.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_DELAY.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_ENVELOPE_ADSR.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_FILEPLAY.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_FM_SOURCE.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_FREQUENCY.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_MIDI_DEBUG.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_MIDI_ROUTER.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_MUL.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_NIL.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_PLAY.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_PLAY_AKAI.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_PLAY_AKAIS.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_PLAY_WAV.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_PSCALE.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_RC.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_SEQUENCE.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_SHELVE_CUTOFF.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_STD_EQUALIZER.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_STRUCT_KILL.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_WAVE_SIN.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_WAVE_SQUARE.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_WAVE_TRI.png +share/doc/kde/HTML/en/artsbuilder/images/Synth_XFADE.png +share/doc/kde/HTML/en/artsbuilder/images/schema1.png +share/doc/kde/HTML/en/artsbuilder/images/schema2.png +share/doc/kde/HTML/en/artsbuilder/images/schema3.png +share/doc/kde/HTML/en/artsbuilder/images/schema4.png +share/doc/kde/HTML/en/artsbuilder/index.cache.bz2 +share/doc/kde/HTML/en/artsbuilder/index.docbook +share/doc/kde/HTML/en/artsbuilder/mcop.docbook +share/doc/kde/HTML/en/artsbuilder/midi.docbook +share/doc/kde/HTML/en/artsbuilder/midiintro.docbook +share/doc/kde/HTML/en/artsbuilder/modules.docbook +share/doc/kde/HTML/en/artsbuilder/porting.docbook +share/doc/kde/HTML/en/artsbuilder/references.docbook +share/doc/kde/HTML/en/artsbuilder/tools.docbook +share/doc/kde/HTML/en/kmid/common +share/doc/kde/HTML/en/kmid/index.cache.bz2 +share/doc/kde/HTML/en/kmid/index.docbook +share/doc/kde/HTML/en/kmidi/FAQ +share/doc/kde/HTML/en/kmidi/common +share/doc/kde/HTML/en/kmidi/index.cache.bz2 +share/doc/kde/HTML/en/kmidi/index.docbook +share/doc/kde/HTML/en/kmix/common +share/doc/kde/HTML/en/kmix/index.cache.bz2 +share/doc/kde/HTML/en/kmix/index.docbook +share/doc/kde/HTML/en/kscd/common +share/doc/kde/HTML/en/kscd/index.cache.bz2 +share/doc/kde/HTML/en/kscd/index.docbook +share/doc/kde/HTML/en/kscd/kscd.png +share/doc/kde/HTML/en/kscd/kscd11.png +share/doc/kde/HTML/en/kscd/kscd12.png +share/doc/kde/HTML/en/kscd/kscd13.png +share/doc/kde/HTML/en/kscd/kscd14.png +share/doc/kde/HTML/en/kscd/kscd15.png +share/doc/kde/HTML/en/kscd/kscd16.png +share/doc/kde/HTML/en/kscd/kscd18.png +share/doc/kde/HTML/en/kscd/kscd19.png +share/doc/kde/HTML/en/kscd/kscd2.png +share/doc/kde/HTML/en/kscd/kscd2a.png +share/doc/kde/HTML/en/kscd/kscd3.png +share/doc/kde/HTML/en/kscd/kscd4.png +share/doc/kde/HTML/en/kscd/kscd5.png +share/doc/kde/HTML/en/kscd/kscd6.png +share/doc/kde/HTML/en/kscd/kscd7.png +share/doc/kde/HTML/en/kscd/kscd8.png +share/doc/kde/HTML/en/kscd/kscd9.png +share/doc/kde/HTML/en/noatun/common +share/doc/kde/HTML/en/noatun/index.cache.bz2 +share/doc/kde/HTML/en/noatun/index.docbook +share/kde/applnk/Multimedia/aktion.desktop +share/kde/applnk/Multimedia/artsbuilder.desktop +share/kde/applnk/Multimedia/artscontrol.desktop +share/kde/applnk/Multimedia/kaboodle.desktop +share/kde/applnk/Multimedia/kmid.desktop +share/kde/applnk/Multimedia/kmidi.desktop +share/kde/applnk/Multimedia/kmix.desktop +share/kde/applnk/Multimedia/kscd.desktop +share/kde/applnk/Multimedia/noatun.desktop +share/kde/applnk/Multimedia/timidity.desktop +share/kde/applnk/Settings/Sound/kmixcfg.desktop +share/kde/apps/aktion/aktion_part.rc +share/kde/apps/aktion/toolbar/ak_maximize.png +share/kde/apps/aktion/toolbar/ak_setup.png +share/kde/apps/aktion/toolbar/aktion_logo.png +share/kde/apps/aktion/toolbar/avanzar.png +share/kde/apps/aktion/toolbar/ayuda.png +share/kde/apps/aktion/toolbar/double.png +share/kde/apps/aktion/toolbar/fullscreen.png +share/kde/apps/aktion/toolbar/half.png +share/kde/apps/aktion/toolbar/original.png +share/kde/apps/aktion/toolbar/parar.png +share/kde/apps/aktion/toolbar/pause.png +share/kde/apps/aktion/toolbar/retroceder.png +share/kde/apps/aktion/toolbar/tocar.png +share/kde/apps/artsbuilder/artsbuilderui.rc +share/kde/apps/artsbuilder/examples/README +share/kde/apps/artsbuilder/examples/example_adsr.arts +share/kde/apps/artsbuilder/examples/example_atan_saturate.arts +share/kde/apps/artsbuilder/examples/example_autopanner.arts +share/kde/apps/artsbuilder/examples/example_brickwall.arts +share/kde/apps/artsbuilder/examples/example_bus.arts +share/kde/apps/artsbuilder/examples/example_capture_wav.arts +share/kde/apps/artsbuilder/examples/example_cdelay.arts +share/kde/apps/artsbuilder/examples/example_cflanger.arts +share/kde/apps/artsbuilder/examples/example_data.arts +share/kde/apps/artsbuilder/examples/example_delay.arts +share/kde/apps/artsbuilder/examples/example_dtmf1.arts +share/kde/apps/artsbuilder/examples/example_equalizer.arts +share/kde/apps/artsbuilder/examples/example_fm.arts +share/kde/apps/artsbuilder/examples/example_freeverb.arts +share/kde/apps/artsbuilder/examples/example_moog.arts +share/kde/apps/artsbuilder/examples/example_multi_add.arts +share/kde/apps/artsbuilder/examples/example_noise.arts +share/kde/apps/artsbuilder/examples/example_pitchshift.arts +share/kde/apps/artsbuilder/examples/example_play_wave.arts +share/kde/apps/artsbuilder/examples/example_pscale.arts +share/kde/apps/artsbuilder/examples/example_pulse.arts +share/kde/apps/artsbuilder/examples/example_rc.arts +share/kde/apps/artsbuilder/examples/example_record.arts +share/kde/apps/artsbuilder/examples/example_sequence.arts +share/kde/apps/artsbuilder/examples/example_shelve_cutoff.arts +share/kde/apps/artsbuilder/examples/example_sine.arts +share/kde/apps/artsbuilder/examples/example_softsaw.arts +share/kde/apps/artsbuilder/examples/example_square.arts +share/kde/apps/artsbuilder/examples/example_stereobeep.arts +share/kde/apps/artsbuilder/examples/example_tremolo.arts +share/kde/apps/artsbuilder/examples/example_tri.arts +share/kde/apps/artsbuilder/examples/example_xfade.arts +share/kde/apps/artsbuilder/examples/instrument_arts_all.arts-map +share/kde/apps/artsbuilder/examples/instrument_chirpdrum.arts +share/kde/apps/artsbuilder/examples/instrument_deepdrum.arts +share/kde/apps/artsbuilder/examples/instrument_full_square.arts +share/kde/apps/artsbuilder/examples/instrument_hihat.arts +share/kde/apps/artsbuilder/examples/instrument_neworgan.arts +share/kde/apps/artsbuilder/examples/instrument_nokind.arts +share/kde/apps/artsbuilder/examples/instrument_organ2.arts +share/kde/apps/artsbuilder/examples/instrument_simple_sin.arts +share/kde/apps/artsbuilder/examples/instrument_simple_square.arts +share/kde/apps/artsbuilder/examples/instrument_simple_tri.arts +share/kde/apps/artsbuilder/examples/instrument_slide.arts +share/kde/apps/artsbuilder/examples/instrument_slide1.arts +share/kde/apps/artsbuilder/examples/instrument_square.arts +share/kde/apps/artsbuilder/examples/instrument_tri.arts +share/kde/apps/artsbuilder/examples/template_Empty_Structure.arts +share/kde/apps/artsbuilder/examples/template_Instrument.arts +share/kde/apps/artsbuilder/examples/todo/effect_delay.arts +share/kde/apps/artsbuilder/examples/todo/effect_delay_alone.arts +share/kde/apps/artsbuilder/examples/todo/effect_flanger_alone.arts +share/kde/apps/artsbuilder/examples/todo/instrument_flexible_slide.arts +share/kde/apps/artsbuilder/examples/todo/instrument_flexible_slide_GUI.arts +share/kde/apps/artsbuilder/examples/todo/instrument_fm_horn.arts +share/kde/apps/artsbuilder/examples/todo/instrument_moog_vcf_tune.arts +share/kde/apps/artsbuilder/examples/todo/instrument_moog_vcf_tune_GUI.arts +share/kde/apps/artsbuilder/examples/todo/mixer_element_eq.arts +share/kde/apps/artsbuilder/examples/todo/mixer_element_eqfx.arts +share/kde/apps/artsbuilder/examples/todo/mixer_element_simple.arts +share/kde/apps/artsbuilder/examples/todo/template_Instrument_GUI.arts +share/kde/apps/artsbuilder/examples/todo/template_Mixer_Element.arts +share/kde/apps/artsbuilder/pics/Synth_ADD.xpm +share/kde/apps/artsbuilder/pics/Synth_AMAN_PLAY.xpm +share/kde/apps/artsbuilder/pics/Synth_ATAN_SATURATE.xpm +share/kde/apps/artsbuilder/pics/Synth_BUS_DOWNLINK.xpm +share/kde/apps/artsbuilder/pics/Synth_BUS_UPLINK.xpm +share/kde/apps/artsbuilder/pics/Synth_DEBUG.xpm +share/kde/apps/artsbuilder/pics/Synth_ENVELOPE_ADSR.xpm +share/kde/apps/artsbuilder/pics/Synth_FILEPLAY.xpm +share/kde/apps/artsbuilder/pics/Synth_MIDI_DEBUG.xpm +share/kde/apps/artsbuilder/pics/Synth_MOOG_VCF.xpm +share/kde/apps/artsbuilder/pics/Synth_MUL.xpm +share/kde/apps/artsbuilder/pics/Synth_MULTI_ADD.xpm +share/kde/apps/artsbuilder/pics/Synth_PLAY.xpm +share/kde/apps/artsbuilder/pics/Synth_PLAY_WAV.xpm +share/kde/apps/artsbuilder/pics/Synth_PSCALE.xpm +share/kde/apps/artsbuilder/pics/Synth_RC.xpm +share/kde/apps/artsbuilder/pics/Synth_SEQUENCE.xpm +share/kde/apps/artsbuilder/pics/Synth_SHELVE_CUTOFF.xpm +share/kde/apps/artsbuilder/pics/Synth_WAVE_SAW.xpm +share/kde/apps/artsbuilder/pics/Synth_WAVE_SIN.xpm +share/kde/apps/artsbuilder/pics/Synth_WAVE_SQUARE.xpm +share/kde/apps/artsbuilder/pics/Synth_WAVE_TRI.xpm +share/kde/apps/artsbuilder/pics/Synth_XFADE.xpm +share/kde/apps/artscontrol/artscontrol.rc +share/kde/apps/artscontrol/artsmidimanagerview.rc +share/kde/apps/kaboodle/icons/hicolor/16x16/actions/kaboodleloop.png +share/kde/apps/kaboodle/icons/hicolor/22x22/actions/kaboodleloop.png +share/kde/apps/kaboodle/kaboodlepartui.rc +share/kde/apps/kaboodle/kaboodleui.rc +share/kde/apps/kconf_update/noatun.upd +share/kde/apps/kconf_update/noatun20update +share/kde/apps/kicker/applets/kmixapplet.desktop +share/kde/apps/kmid/DiesIrae.kar +share/kde/apps/kmid/Guantanamera.kar +share/kde/apps/kmid/MariaDeLasMercedes.kar +share/kde/apps/kmid/OFortuna.kar +share/kde/apps/kmid/fm/drums.o3 +share/kde/apps/kmid/fm/drums.sb +share/kde/apps/kmid/fm/std.o3 +share/kde/apps/kmid/fm/std.sb +share/kde/apps/kmid/icons/button1.xpm +share/kde/apps/kmid/icons/button2.xpm +share/kde/apps/kmid/icons/hicolor/16x16/actions/piano.png +share/kde/apps/kmid/icons/hicolor/16x16/actions/volume.png +share/kde/apps/kmid/icons/hicolor/22x22/actions/piano.png +share/kde/apps/kmid/icons/hicolor/22x22/actions/volume.png +share/kde/apps/kmid/icons/hicolor/32x32/actions/piano.png +share/kde/apps/kmid/icons/hicolor/32x32/actions/volume.png +share/kde/apps/kmid/icons/keyboard.xpm +share/kde/apps/kmid/kmid_partui.rc +share/kde/apps/kmid/kmidui.rc +share/kde/apps/kmid/maps/YamahaPSR500.map +share/kde/apps/kmid/maps/YamahaPSS790.map +share/kde/apps/kmid/maps/YamahaQY10.map +share/kde/apps/kmid/maps/gm.map +share/kde/apps/kmidi/Axel_Elf.mid +share/kde/apps/kmidi/Cavatina.mid +share/kde/apps/kmidi/Georgia.mid +share/kde/apps/kmidi/Malaguena.mid +share/kde/apps/kmidi/Mission_Impossible.mid +share/kde/apps/kmidi/Mr_Postman.mid +share/kde/apps/kmidi/Take_The_A_Train-Seq_by_Dianne_Lewandowski.mid +share/kde/apps/kmidi/Vangelis-Chung_Kuo.mid +share/kde/apps/kmidi/config/BITMAPS/arrow.xbm +share/kde/apps/kmidi/config/BITMAPS/back.xbm +share/kde/apps/kmidi/config/BITMAPS/check.xbm +share/kde/apps/kmidi/config/BITMAPS/fwd.xbm +share/kde/apps/kmidi/config/BITMAPS/fwrd.xbm +share/kde/apps/kmidi/config/BITMAPS/next.xbm +share/kde/apps/kmidi/config/BITMAPS/off.xbm +share/kde/apps/kmidi/config/BITMAPS/on.xbm +share/kde/apps/kmidi/config/BITMAPS/pause.xbm +share/kde/apps/kmidi/config/BITMAPS/play.xbm +share/kde/apps/kmidi/config/BITMAPS/prev.xbm +share/kde/apps/kmidi/config/BITMAPS/quit.xbm +share/kde/apps/kmidi/config/BITMAPS/restart.xbm +share/kde/apps/kmidi/config/BITMAPS/stop.xbm +share/kde/apps/kmidi/config/BITMAPS/tback.xbm +share/kde/apps/kmidi/config/BITMAPS/timidity.xbm +share/kde/apps/kmidi/config/BITMAPS/tnext.xbm +share/kde/apps/kmidi/config/BITMAPS/tpause.xbm +share/kde/apps/kmidi/config/BITMAPS/tprev.xbm +share/kde/apps/kmidi/config/BITMAPS/tquit.xbm +share/kde/apps/kmidi/config/chaos12-voices +share/kde/apps/kmidi/config/chaos8-voices +share/kde/apps/kmidi/config/drums +share/kde/apps/kmidi/config/gravis.cfg +share/kde/apps/kmidi/config/gsdrum.cfg +share/kde/apps/kmidi/config/guitar +share/kde/apps/kmidi/config/megadrum +share/kde/apps/kmidi/config/megainst +share/kde/apps/kmidi/config/midia.cfg +share/kde/apps/kmidi/config/mt32.cfg +share/kde/apps/kmidi/config/patch/acbass.pat +share/kde/apps/kmidi/config/patch/cymride1.pat +share/kde/apps/kmidi/config/patch/hihatcl.pat +share/kde/apps/kmidi/config/patch/kick1.pat +share/kde/apps/kmidi/config/patch/kick2.pat +share/kde/apps/kmidi/config/patch/nylongt2.pat +share/kde/apps/kmidi/config/patch/sologrnd.pat +share/kde/apps/kmidi/config/piano +share/kde/apps/kmidi/config/piano+guitar +share/kde/apps/kmidi/config/pila-voices +share/kde/apps/kmidi/config/sound-canvas-drums +share/kde/apps/kmidi/config/timidity.cfg +share/kde/apps/kmidi/config/wowpats.cfg +share/kde/apps/kmidi/pics/kmidilogo.png +share/kde/apps/kmix/kmixui.rc +share/kde/apps/kmix/pics/kmixdocked.png +share/kde/apps/kmix/pics/mix_audio.png +share/kde/apps/kmix/pics/mix_bass.png +share/kde/apps/kmix/pics/mix_cd.png +share/kde/apps/kmix/pics/mix_ext.png +share/kde/apps/kmix/pics/mix_microphone.png +share/kde/apps/kmix/pics/mix_midi.png +share/kde/apps/kmix/pics/mix_recmon.png +share/kde/apps/kmix/pics/mix_surround.png +share/kde/apps/kmix/pics/mix_treble.png +share/kde/apps/kmix/pics/mix_unknown.png +share/kde/apps/kmix/pics/mix_video.png +share/kde/apps/kmix/pics/mix_volume.png +share/kde/apps/kscd/pics/cdsmall.xpm +share/kde/apps/kscd/pics/kscdlogo.xpm +share/kde/apps/noatun/dcopiface.plugin +share/kde/apps/noatun/eq.preset/preset.dance +share/kde/apps/noatun/eq.preset/preset.jazz +share/kde/apps/noatun/eq.preset/preset.metal +share/kde/apps/noatun/eq.preset/preset.trance +share/kde/apps/noatun/eq.preset/preset.zero +share/kde/apps/noatun/excellent.plugin +share/kde/apps/noatun/excellentui.rc +share/kde/apps/noatun/htmlexport.plugin +share/kde/apps/noatun/icons/hicolor/16x16/actions/effect.png +share/kde/apps/noatun/icons/hicolor/16x16/actions/noatunback.png +share/kde/apps/noatun/icons/hicolor/16x16/actions/noatunforward.png +share/kde/apps/noatun/icons/hicolor/16x16/actions/noatunpause.png +share/kde/apps/noatun/icons/hicolor/16x16/actions/noatunplay.png +share/kde/apps/noatun/icons/hicolor/16x16/actions/noatunplaylist.png +share/kde/apps/noatun/icons/hicolor/16x16/actions/noatunstop.png +share/kde/apps/noatun/icons/hicolor/16x16/actions/noatuntray.png +share/kde/apps/noatun/icons/hicolor/16x16/actions/noatuntraypause.png +share/kde/apps/noatun/icons/hicolor/16x16/actions/noatuntrayplay.png +share/kde/apps/noatun/icons/hicolor/16x16/actions/noatuntraystop.png +share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunback.png +share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunfback.png +share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunfforward.png +share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunforward.png +share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunloopnone.png +share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunloopplaylist.png +share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunlooprandom.png +share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunloopsong.png +share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunpause.png +share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunplay.png +share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunplaylist.png +share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunstop.png +share/kde/apps/noatun/icons/hicolor/22x22/actions/noatuntiny.png +share/kde/apps/noatun/icons/hicolor/32x32/actions/effect.png +share/kde/apps/noatun/icons/hicolor/48x48/actions/effect.png +share/kde/apps/noatun/infrared.plugin +share/kde/apps/noatun/kaiman.plugin +share/kde/apps/noatun/kaimanui.rc +share/kde/apps/noatun/keyz.plugin +share/kde/apps/noatun/kjofolui.plugin +share/kde/apps/noatun/kjskins/HexoBronx/HexoBronx.rc +share/kde/apps/noatun/kjskins/HexoBronx/Makefile.am +share/kde/apps/noatun/kjskins/HexoBronx/README.txt +share/kde/apps/noatun/kjskins/HexoBronx/active.png +share/kde/apps/noatun/kjskins/HexoBronx/eckig_font.png +share/kde/apps/noatun/kjskins/HexoBronx/font.png +share/kde/apps/noatun/kjskins/HexoBronx/inactive.png +share/kde/apps/noatun/kjskins/HexoBronx/mask.png +share/kde/apps/noatun/kjskins/HexoBronx/pitch.png +share/kde/apps/noatun/kjskins/HexoBronx/splash.png +share/kde/apps/noatun/kjskins/HexoBronx/time_font.png +share/kde/apps/noatun/kjskins/HexoBronx/volume.png +share/kde/apps/noatun/kjskins/HexoBronx/volume_pitch_font.png +share/kde/apps/noatun/kjskins/kjofol/Makefile.am +share/kde/apps/noatun/kjskins/kjofol/kjofol.dck +share/kde/apps/noatun/kjskins/kjofol/kjofol.pl +share/kde/apps/noatun/kjskins/kjofol/kjofol.rc +share/kde/apps/noatun/kjskins/kjofol/kjofol.wsh +share/kde/apps/noatun/kjskins/kjofol/sg.png +share/kde/apps/noatun/kjskins/kjofol/sg_num.png +share/kde/apps/noatun/kjskins/kjofol/sg_seek.bmp +share/kde/apps/noatun/kjskins/kjofol/sg_seek.png +share/kde/apps/noatun/kjskins/kjofol/sg_text.png +share/kde/apps/noatun/kjskins/kjofol/sgdock.png +share/kde/apps/noatun/kjskins/kjofol/sgdock2.png +share/kde/apps/noatun/kjskins/kjofol/sgdocksk.png +share/kde/apps/noatun/kjskins/kjofol/sgdockvp.png +share/kde/apps/noatun/kjskins/kjofol/sgeq.png +share/kde/apps/noatun/kjskins/kjofol/sgpitch.png +share/kde/apps/noatun/kjskins/kjofol/sgpitchp.png +share/kde/apps/noatun/kjskins/kjofol/sgplist.png +share/kde/apps/noatun/kjskins/kjofol/sgplist2.png +share/kde/apps/noatun/kjskins/kjofol/sgpres1.png +share/kde/apps/noatun/kjskins/kjofol/sgpres2.png +share/kde/apps/noatun/kjskins/kjofol/sgpres3.png +share/kde/apps/noatun/kjskins/kjofol/sgvol.png +share/kde/apps/noatun/kjskins/kjofol/sgvolnum.png +share/kde/apps/noatun/kjskins/kjofol/sgvolpos.png +share/kde/apps/noatun/kjskins/kjofol/sgwshad.png +share/kde/apps/noatun/kjskins/kjofol/sgwshad2.png +share/kde/apps/noatun/kjskins/kjofol/sgwshdsk.png +share/kde/apps/noatun/kjskins/kjofol/sgwshvol.png +share/kde/apps/noatun/kjskins/kjofol/sgwshvp.png +share/kde/apps/noatun/kjskins/phong/p_eq.png +share/kde/apps/noatun/kjskins/phong/p_main.png +share/kde/apps/noatun/kjskins/phong/p_mainback.png +share/kde/apps/noatun/kjskins/phong/p_numbers.png +share/kde/apps/noatun/kjskins/phong/p_playback.png +share/kde/apps/noatun/kjskins/phong/p_playlist.png +share/kde/apps/noatun/kjskins/phong/p_propos.png +share/kde/apps/noatun/kjskins/phong/p_text.png +share/kde/apps/noatun/kjskins/phong/p_volbar.png +share/kde/apps/noatun/kjskins/phong/p_volpos.png +share/kde/apps/noatun/kjskins/phong/phong.dck +share/kde/apps/noatun/kjskins/phong/phong.rc +share/kde/apps/noatun/kjskins/phong/phong.wsh +share/kde/apps/noatun/kjskins/phong/phong_readme.txt +share/kde/apps/noatun/kjskins/vibrocentric/i_base.png +share/kde/apps/noatun/kjskins/vibrocentric/i_base2.png +share/kde/apps/noatun/kjskins/vibrocentric/i_eq.png +share/kde/apps/noatun/kjskins/vibrocentric/i_font.png +share/kde/apps/noatun/kjskins/vibrocentric/i_pl.png +share/kde/apps/noatun/kjskins/vibrocentric/i_pl2.png +share/kde/apps/noatun/kjskins/vibrocentric/i_pro.png +share/kde/apps/noatun/kjskins/vibrocentric/i_text.png +share/kde/apps/noatun/kjskins/vibrocentric/i_vol.png +share/kde/apps/noatun/kjskins/vibrocentric/i_volpos.png +share/kde/apps/noatun/kjskins/vibrocentric/vibrocentric.dck +share/kde/apps/noatun/kjskins/vibrocentric/vibrocentric.rc +share/kde/apps/noatun/kjskins/vibrocentric/vibrocentric.wsh +share/kde/apps/noatun/kjskins/vibrocentric/vibrocentric_readme.txt +share/kde/apps/noatun/magictable +share/kde/apps/noatun/marquis.plugin +share/kde/apps/noatun/metatag.plugin +share/kde/apps/noatun/monoscope.plugin +share/kde/apps/noatun/net.plugin +share/kde/apps/noatun/noatunui.plugin +share/kde/apps/noatun/skins/kaiman/car-preset/btn_exit.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_iconify.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_list.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_next.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_p1.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_p2.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_p3.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_p4.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_p5.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_p6.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_play.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_prev.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_sml.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_stop.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_voldn.png +share/kde/apps/noatun/skins/kaiman/car-preset/btn_volup.png +share/kde/apps/noatun/skins/kaiman/car-preset/digbig.png +share/kde/apps/noatun/skins/kaiman/car-preset/digmed.png +share/kde/apps/noatun/skins/kaiman/car-preset/letters.png +share/kde/apps/noatun/skins/kaiman/car-preset/main.png +share/kde/apps/noatun/skins/kaiman/car-preset/monoster.png +share/kde/apps/noatun/skins/kaiman/car-preset/posbar.png +share/kde/apps/noatun/skins/kaiman/car-preset/random.png +share/kde/apps/noatun/skins/kaiman/car-preset/repeat.png +share/kde/apps/noatun/skins/kaiman/car-preset/skindata +share/kde/apps/noatun/skins/kaiman/car-preset/status.png +share/kde/apps/noatun/skins/kaiman/car-preset/volume.png +share/kde/apps/noatun/skins/kaiman/circle/back.png +share/kde/apps/noatun/skins/kaiman/circle/back_mask.png +share/kde/apps/noatun/skins/kaiman/circle/back_sm.png +share/kde/apps/noatun/skins/kaiman/circle/back_sm_mask.png +share/kde/apps/noatun/skins/kaiman/circle/bar_pos.png +share/kde/apps/noatun/skins/kaiman/circle/bar_vol.png +share/kde/apps/noatun/skins/kaiman/circle/btn_exit.png +share/kde/apps/noatun/skins/kaiman/circle/btn_iconify.png +share/kde/apps/noatun/skins/kaiman/circle/btn_list.png +share/kde/apps/noatun/skins/kaiman/circle/btn_mode.png +share/kde/apps/noatun/skins/kaiman/circle/btn_next.png +share/kde/apps/noatun/skins/kaiman/circle/btn_play.png +share/kde/apps/noatun/skins/kaiman/circle/btn_pref.png +share/kde/apps/noatun/skins/kaiman/circle/btn_prev.png +share/kde/apps/noatun/skins/kaiman/circle/btn_repeat.png +share/kde/apps/noatun/skins/kaiman/circle/btn_shuffle.png +share/kde/apps/noatun/skins/kaiman/circle/btn_sm_exit.png +share/kde/apps/noatun/skins/kaiman/circle/btn_sm_iconify.png +share/kde/apps/noatun/skins/kaiman/circle/btn_sm_mode.png +share/kde/apps/noatun/skins/kaiman/circle/btn_sm_next.png +share/kde/apps/noatun/skins/kaiman/circle/btn_sm_play.png +share/kde/apps/noatun/skins/kaiman/circle/btn_sm_prev.png +share/kde/apps/noatun/skins/kaiman/circle/btn_sm_stop.png +share/kde/apps/noatun/skins/kaiman/circle/btn_stop.png +share/kde/apps/noatun/skins/kaiman/circle/dig.png +share/kde/apps/noatun/skins/kaiman/circle/digsml.png +share/kde/apps/noatun/skins/kaiman/circle/letters.png +share/kde/apps/noatun/skins/kaiman/circle/skindata +share/kde/apps/noatun/skins/kaiman/circle/status.png +share/kde/apps/noatun/skins/kaiman/k9/README +share/kde/apps/noatun/skins/kaiman/k9/conf.jpg +share/kde/apps/noatun/skins/kaiman/k9/conf.png +share/kde/apps/noatun/skins/kaiman/k9/eject.jpg +share/kde/apps/noatun/skins/kaiman/k9/icon.jpg +share/kde/apps/noatun/skins/kaiman/k9/icon.png +share/kde/apps/noatun/skins/kaiman/k9/kill.jpg +share/kde/apps/noatun/skins/kaiman/k9/kill.png +share/kde/apps/noatun/skins/kaiman/k9/knine-nfont.jpg +share/kde/apps/noatun/skins/kaiman/k9/knine-nfont.png +share/kde/apps/noatun/skins/kaiman/k9/knine-nfont2.jpg +share/kde/apps/noatun/skins/kaiman/k9/knine-nfont2.png +share/kde/apps/noatun/skins/kaiman/k9/knine-normal2.jpg +share/kde/apps/noatun/skins/kaiman/k9/knine-normal2.png +share/kde/apps/noatun/skins/kaiman/k9/knine-vfont.jpg +share/kde/apps/noatun/skins/kaiman/k9/knine-vfont.png +share/kde/apps/noatun/skins/kaiman/k9/long2.jpg +share/kde/apps/noatun/skins/kaiman/k9/mask.png +share/kde/apps/noatun/skins/kaiman/k9/newtext.jpg +share/kde/apps/noatun/skins/kaiman/k9/newtext.png +share/kde/apps/noatun/skins/kaiman/k9/next.jpg +share/kde/apps/noatun/skins/kaiman/k9/pause.jpg +share/kde/apps/noatun/skins/kaiman/k9/play.jpg +share/kde/apps/noatun/skins/kaiman/k9/pos_item.jpg +share/kde/apps/noatun/skins/kaiman/k9/repeat.jpg +share/kde/apps/noatun/skins/kaiman/k9/repeat.png +share/kde/apps/noatun/skins/kaiman/k9/reverse.jpg +share/kde/apps/noatun/skins/kaiman/k9/shuffle.jpg +share/kde/apps/noatun/skins/kaiman/k9/shuffle.png +share/kde/apps/noatun/skins/kaiman/k9/skindata +share/kde/apps/noatun/skins/kaiman/k9/small-k.jpg +share/kde/apps/noatun/skins/kaiman/k9/small-k.png +share/kde/apps/noatun/skins/kaiman/k9/square.jpg +share/kde/apps/noatun/skins/kaiman/k9/square.png +share/kde/apps/noatun/skins/kaiman/k9/status.jpg +share/kde/apps/noatun/skins/kaiman/k9/status.png +share/kde/apps/noatun/skins/kaiman/k9/stop.jpg +share/kde/apps/noatun/skins/kaiman/k9/trans-pos.png +share/kde/apps/noatun/skins/kaiman/k9/trans-slide.png +share/kde/apps/noatun/skins/winamp/Winamp/BALANCE.BMP +share/kde/apps/noatun/skins/winamp/Winamp/CBUTTONS.BMP +share/kde/apps/noatun/skins/winamp/Winamp/FONT.BMP +share/kde/apps/noatun/skins/winamp/Winamp/MAIN.BMP +share/kde/apps/noatun/skins/winamp/Winamp/MONOSTER.BMP +share/kde/apps/noatun/skins/winamp/Winamp/NUMS_EX.BMP +share/kde/apps/noatun/skins/winamp/Winamp/PLAYPAUS.BMP +share/kde/apps/noatun/skins/winamp/Winamp/POSBAR.BMP +share/kde/apps/noatun/skins/winamp/Winamp/SHUFREP.BMP +share/kde/apps/noatun/skins/winamp/Winamp/SPEC.BMP +share/kde/apps/noatun/skins/winamp/Winamp/TEXT.BMP +share/kde/apps/noatun/skins/winamp/Winamp/TITLEBAR.BMP +share/kde/apps/noatun/skins/winamp/Winamp/VISCOLOR.TXT +share/kde/apps/noatun/skins/winamp/Winamp/VOLUME.BMP +share/kde/apps/noatun/splitplaylist.plugin +share/kde/apps/noatun/systray.plugin +share/kde/apps/noatun/systrayui.rc +share/kde/apps/noatun/voiceprint.plugin +share/kde/apps/noatun/winskin.plugin +share/kde/config/aktionrc +share/kde/icons/hicolor/16x16/actions/artsbuilderexecute.png +share/kde/icons/hicolor/16x16/apps/aktion.png +share/kde/icons/hicolor/16x16/apps/artsbuilder.png +share/kde/icons/hicolor/16x16/apps/artscontrol.png +share/kde/icons/hicolor/16x16/apps/kaboodle.png +share/kde/icons/hicolor/16x16/apps/kmid.png +share/kde/icons/hicolor/16x16/apps/kmidi.png +share/kde/icons/hicolor/16x16/apps/kmix.png +share/kde/icons/hicolor/16x16/apps/kscd.png +share/kde/icons/hicolor/16x16/apps/noatun.png +share/kde/icons/hicolor/22x22/actions/artsbuilderexecute.png +share/kde/icons/hicolor/22x22/apps/kaboodle.png +share/kde/icons/hicolor/22x22/apps/noatun.png +share/kde/icons/hicolor/32x32/apps/aktion.png +share/kde/icons/hicolor/32x32/apps/kaboodle.png +share/kde/icons/hicolor/32x32/apps/kmid.png +share/kde/icons/hicolor/32x32/apps/kmidi.png +share/kde/icons/hicolor/32x32/apps/kmix.png +share/kde/icons/hicolor/32x32/apps/kscd.png +share/kde/icons/hicolor/32x32/apps/noatun.png +share/kde/icons/hicolor/48x48/apps/kaboodle.png +share/kde/icons/hicolor/48x48/apps/kmid.png +share/kde/icons/hicolor/48x48/apps/kmidi.png +share/kde/icons/hicolor/48x48/apps/kmix.png +share/kde/icons/hicolor/48x48/apps/kscd.png +share/kde/icons/hicolor/48x48/apps/noatun.png +share/kde/icons/locolor/32x32/apps/kaboodle.png +share/kde/mimelnk/application/x-artsbuilder.desktop +share/kde/mimelnk/audio/x-karaoke.desktop +share/kde/mimelnk/text/xmcd.desktop +share/kde/services/kaboodle_component.desktop +share/kde/services/kfile_m3u.desktop +share/kde/services/kfile_mp3.desktop +share/kde/services/kfile_wav.desktop +share/kde/services/kmixctrl_restore.desktop +share/kde/servicetypes/audiomidi.desktop +@comment dirrm share/kde/servicetypes +@comment dirrm share/kde/services +@comment dirrm share/kde/mimelnk/text +@comment dirrm share/kde/mimelnk/audio +@comment dirrm share/kde/mimelnk/application +@comment dirrm share/kde/icons/locolor/32x32/apps +@comment dirrm share/kde/icons/hicolor/48x48/apps +@comment dirrm share/kde/icons/hicolor/32x32/apps +@comment dirrm share/kde/icons/hicolor/22x22/apps +@comment dirrm share/kde/icons/hicolor/22x22/actions +@comment dirrm share/kde/icons/hicolor/16x16/apps +@comment dirrm share/kde/icons/hicolor/16x16/actions +@comment dirrm share/kde/config +@dirrm share/kde/apps/noatun/skins/winamp/Winamp +@dirrm share/kde/apps/noatun/skins/winamp +@dirrm share/kde/apps/noatun/skins/kaiman/k9 +@dirrm share/kde/apps/noatun/skins/kaiman/circle +@dirrm share/kde/apps/noatun/skins/kaiman/car-preset +@dirrm share/kde/apps/noatun/skins/kaiman +@dirrm share/kde/apps/noatun/skins +@dirrm share/kde/apps/noatun/kjskins/vibrocentric +@dirrm share/kde/apps/noatun/kjskins/phong +@dirrm share/kde/apps/noatun/kjskins/kjofol +@dirrm share/kde/apps/noatun/kjskins/HexoBronx +@dirrm share/kde/apps/noatun/kjskins +@dirrm share/kde/apps/noatun/icons/hicolor/48x48/actions +@dirrm share/kde/apps/noatun/icons/hicolor/48x48 +@dirrm share/kde/apps/noatun/icons/hicolor/32x32/actions +@dirrm share/kde/apps/noatun/icons/hicolor/32x32 +@dirrm share/kde/apps/noatun/icons/hicolor/22x22/actions +@dirrm share/kde/apps/noatun/icons/hicolor/22x22 +@dirrm share/kde/apps/noatun/icons/hicolor/16x16/actions +@dirrm share/kde/apps/noatun/icons/hicolor/16x16 +@dirrm share/kde/apps/noatun/icons/hicolor +@dirrm share/kde/apps/noatun/icons +@dirrm share/kde/apps/noatun/eq.preset +@dirrm share/kde/apps/noatun +@dirrm share/kde/apps/kscd/pics +@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/soundtrack +@dirrm share/kde/apps/kscd/cddb/soundtrack +@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/rock +@dirrm share/kde/apps/kscd/cddb/rock +@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/reggae +@dirrm share/kde/apps/kscd/cddb/reggae +@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/newage +@dirrm share/kde/apps/kscd/cddb/newage +@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/misc +@dirrm share/kde/apps/kscd/cddb/misc +@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/jazz +@dirrm share/kde/apps/kscd/cddb/jazz +@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/folk +@dirrm share/kde/apps/kscd/cddb/folk +@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/data +@dirrm share/kde/apps/kscd/cddb/data +@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/country +@dirrm share/kde/apps/kscd/cddb/country +@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/classical +@dirrm share/kde/apps/kscd/cddb/classical +@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/blues +@dirrm share/kde/apps/kscd/cddb/blues +@dirrm share/kde/apps/kscd/cddb +@dirrm share/kde/apps/kscd +@dirrm share/kde/apps/kmix/pics +@dirrm share/kde/apps/kmix +@dirrm share/kde/apps/kmidi/pics +@dirrm share/kde/apps/kmidi/config/patch +@dirrm share/kde/apps/kmidi/config/BITMAPS +@dirrm share/kde/apps/kmidi/config +@dirrm share/kde/apps/kmidi +@dirrm share/kde/apps/kmid/maps +@dirrm share/kde/apps/kmid/icons/hicolor/32x32/actions +@dirrm share/kde/apps/kmid/icons/hicolor/32x32 +@dirrm share/kde/apps/kmid/icons/hicolor/22x22/actions +@dirrm share/kde/apps/kmid/icons/hicolor/22x22 +@dirrm share/kde/apps/kmid/icons/hicolor/16x16/actions +@dirrm share/kde/apps/kmid/icons/hicolor/16x16 +@dirrm share/kde/apps/kmid/icons/hicolor +@dirrm share/kde/apps/kmid/icons +@dirrm share/kde/apps/kmid/fm +@dirrm share/kde/apps/kmid +@comment dirrm share/kde/apps/kicker/applets +@comment dirrm share/kde/apps/kconf_update +@dirrm share/kde/apps/kaboodle/icons/hicolor/22x22/actions +@dirrm share/kde/apps/kaboodle/icons/hicolor/22x22 +@dirrm share/kde/apps/kaboodle/icons/hicolor/16x16/actions +@dirrm share/kde/apps/kaboodle/icons/hicolor/16x16 +@dirrm share/kde/apps/kaboodle/icons/hicolor +@dirrm share/kde/apps/kaboodle/icons +@dirrm share/kde/apps/kaboodle +@dirrm share/kde/apps/artscontrol +@dirrm share/kde/apps/artsbuilder/pics +@dirrm share/kde/apps/artsbuilder/examples/todo +@dirrm share/kde/apps/artsbuilder/examples +@dirrm share/kde/apps/artsbuilder +@dirrm share/kde/apps/aktion/toolbar +@dirrm share/kde/apps/aktion +@comment dirrm share/kde/apps +@comment dirrm share/kde/applnk/Settings/Sound +@comment dirrm share/kde/applnk/Multimedia +@dirrm share/doc/kde/HTML/en/noatun +@dirrm share/doc/kde/HTML/en/kscd +@dirrm share/doc/kde/HTML/en/kmix +@dirrm share/doc/kde/HTML/en/kmidi +@dirrm share/doc/kde/HTML/en/kmid +@dirrm share/doc/kde/HTML/en/artsbuilder/images +@dirrm share/doc/kde/HTML/en/artsbuilder +@dirrm share/doc/kde/HTML/en/aktion +@comment dirrm share/doc/kde/HTML/en +@dirrm lib/mcop/Noatun +@dirrm lib/mcop/Arts/Environment +@comment dirrm lib/mcop/Arts +@comment dirrm lib/mcop +@comment dirrm lib/kde3 +@dirrm include/noatun +@dirrm include/mpeglib_artsplug +@dirrm include/mpeglib/util/yaf/yafxplayer +@dirrm include/mpeglib/util/yaf/yafcore +@dirrm include/mpeglib/util/yaf +@dirrm include/mpeglib/util/render +@dirrm include/mpeglib/util/file +@dirrm include/mpeglib/util/abstract +@dirrm include/mpeglib/util +@dirrm include/mpeglib/splay +@dirrm include/mpeglib/output +@dirrm include/mpeglib/oggvorbis +@dirrm include/mpeglib/mpegutil +@dirrm include/mpeglib/input +@dirrm include/mpeglib/frame +@dirrm include/mpeglib/decoder +@dirrm include/mpeglib +@comment dirrm include/arts diff --git a/audio/kdemultimedia3/distinfo b/audio/kdemultimedia3/distinfo new file mode 100644 index 00000000000..015a32be1d0 --- /dev/null +++ b/audio/kdemultimedia3/distinfo @@ -0,0 +1,32 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:37:58 jlam Exp $ + +SHA1 (kdemultimedia-3.0.1.tar.bz2) = 0d957474431d636d429f64003f38beee48dd97f3 +Size (kdemultimedia-3.0.1.tar.bz2) = 5789849 bytes +SHA1 (patch-aa) = e7b1587d8efb48c48484ca90ed9c7d8fe8d7bc94 +SHA1 (patch-ab) = 85b8216b50ab22435835b07e068d326563d0e217 +SHA1 (patch-ac) = ffc738496170c34c8c3ee84544ec1eeac27992ec +SHA1 (patch-ad) = 7821e0466fb29f7ca9692df817fcdd833a12b791 +SHA1 (patch-ae) = 23ccdd4f77aae953bc0ab3ab88c73dbcb3d2ba62 +SHA1 (patch-af) = 07038f3523e1fbc44aa999c9d7ba7b4e9d4f3367 +SHA1 (patch-ag) = aee2716c219e7e6c977cf74b0640ae7528f0755e +SHA1 (patch-ah) = 1dd023976df014a217fcaf39f7ea4280b9f011d8 +SHA1 (patch-ai) = 6d4ff2feecbe66380dc3d08f7a95076c0b0524e2 +SHA1 (patch-aj) = 4da67d4d4a509f933335baa4395d08ae406958ab +SHA1 (patch-ak) = c55b86b33aadc563360b4dfddf46ef1110a79765 +SHA1 (patch-al) = dece03fdff70a1414fb2bb566170092188285536 +SHA1 (patch-am) = a2119b0882b3d4790c8dcfe925e05157844478fa +SHA1 (patch-an) = 2ec87bdfea4d19c71bfece3a58ce2bd8c5c1eee6 +SHA1 (patch-ao) = a31e51c87c76664188515fd1640608cef3a33927 +SHA1 (patch-ap) = 3f072d45cfe5b0d57eab27c90a37afec3bd0d5c0 +SHA1 (patch-aq) = 6918d9ff057873dc0e25fa8e37c64160d4a19302 +SHA1 (patch-ar) = a0f31a40a2e671dacfe3c00706bc5068e648a472 +SHA1 (patch-as) = 434f297212876a0f189221a2b09fbb2c04676fd7 +SHA1 (patch-at) = 33a3f9b2d6b1890150c39294354e71d0d571ab85 +SHA1 (patch-au) = 877c2150000dc7c7344f5e4ab86ebc3b691f3e34 +SHA1 (patch-av) = 1b14a5c0bb9ae5979cc6e07c34dffe0fbefdc2be +SHA1 (patch-aw) = 87444988e9109f2d59dc7168c4f2337d0c1a7168 +SHA1 (patch-ax) = efd01de997033aa2cebd0ba5d875b4d547bfd624 +SHA1 (patch-ay) = d4f6d85e802d9b05b00a659bf9b4fbf96d3b81bc +SHA1 (patch-az) = 90f457bb6d4c5b7186533c168aefde4abd4ba94b +SHA1 (patch-ba) = 5cee048125a71eb5a1358966c0a61c4553eff24c +SHA1 (patch-bb) = f8d2ad72945566dd575f21c7f3f25ca7a720ecb3 diff --git a/audio/kdemultimedia3/patches/patch-aa b/audio/kdemultimedia3/patches/patch-aa new file mode 100644 index 00000000000..a7ce5c4266f --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-aa @@ -0,0 +1,172 @@ +$NetBSD: patch-aa,v 1.1.1.1.2.2 2002/06/23 18:38:00 jlam Exp $ + +--- configure.orig Tue May 14 01:53:41 2002 ++++ configure +@@ -22016,6 +22016,40 @@ + echo "$as_me:22016: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "ac_cv_lib_vm='-lXxf86dga -lXxf86vm'" ++ ++ lib=Xxf86dga ++ shared_lib_found=no ++ for i in ${LDFLAGS}; do ++ case "$i" in ++ -L*) ++ dir=`echo $i | sed "s,^-L,,"` ++ if [ -e $dir/lib${lib}.so ] || ++ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then ++ shared_lib_found=yes ++ break; ++ fi ++ esac ++ done ++ if [ "$shared_lib_found" = "no" ]; then ++ eval "ac_cv_lib_vm=no" ++ fi ++ ++ lib=Xxf86vm ++ shared_lib_found=no ++ for i in ${LDFLAGS}; do ++ case "$i" in ++ -L*) ++ dir=`echo $i | sed "s,^-L,,"` ++ if [ -e $dir/lib${lib}.so ] || ++ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then ++ shared_lib_found=yes ++ break; ++ fi ++ esac ++ done ++ if [ "$shared_lib_found" = "no" ]; then ++ eval "ac_cv_lib_vm=no" ++ fi + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -22767,7 +22801,7 @@ + au_enable_sun=yes + ;; + *-*-netbsd*) +- au_enable_sun=yes ++ au_enable_oss=yes + ;; + *-*-openbsd*) + au_enable_sun=yes +@@ -22788,7 +22822,7 @@ + echo "${ECHO_T}yes - <sys/soundcard.h>" >&6 + else + case "$target" in +- *linux*|*freebsd*|*bsdi*) ++ *linux*|*freebsd*|*bsdi*|*netbsd*) + echo "$as_me:22792: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + ;; +@@ -26625,6 +26659,7 @@ + *-*-*bsdi*) kscd_compile=yes;; + *-*-*freebsd*) kscd_compile=yes;; + *-*-*openbsd*) kscd_compile=yes;; ++ *-*-*netbsd*) kscd_compile=yes;; + *-*-*bsd*) kscd_compile=no;; + *) kscd_compile=yes;; + esac +@@ -26688,7 +26723,7 @@ + fi + done + +-for ac_header in sys/soundcard.h machine/soundcard.h linux/soundcard.h ++for ac_header in soundcard.h sys/soundcard.h machine/soundcard.h linux/soundcard.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + echo "$as_me:26694: checking for $ac_header" >&5 +@@ -27007,7 +27042,22 @@ + echo "$as_me:27007: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ++ lib=Xxf86dga ++ shared_lib_found=no ++ for i in ${LDFLAGS}; do ++ case "$i" in ++ -L*) ++ dir=`echo $i | sed "s,^-L,,"` ++ if [ -e $dir/lib${lib}.so ] || ++ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then ++ shared_lib_found=yes ++ break; ++ fi ++ esac ++ done ++ if [ "$shared_lib_found" = "yes" ]; then + x11_dga2=yes ++ fi + + else + echo "$as_me: failed program was:" >&5 +@@ -27056,7 +27106,22 @@ + echo "$as_me:27056: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ++ lib=Xv ++ shared_lib_found=no ++ for i in ${LDFLAGS}; do ++ case "$i" in ++ -L*) ++ dir=`echo $i | sed "s,^-L,,"` ++ if [ -e $dir/lib${lib}.so ] || ++ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then ++ shared_lib_found=yes ++ break; ++ fi ++ esac ++ done ++ if [ "$shared_lib_found" = "yes" ]; then + x11_xv=yes ++ fi + + else + echo "$as_me: failed program was:" >&5 +@@ -27105,7 +27170,22 @@ + echo "$as_me:27105: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ++ lib=Xxf86vm ++ shared_lib_found=no ++ for i in ${LDFLAGS}; do ++ case "$i" in ++ -L*) ++ dir=`echo $i | sed "s,^-L,,"` ++ if [ -e $dir/lib${lib}.so ] || ++ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then ++ shared_lib_found=yes ++ break; ++ fi ++ esac ++ done ++ if [ "$shared_lib_found" = "yes" ]; then + x11_xvidmode=yes ++ fi + + else + echo "$as_me: failed program was:" >&5 +@@ -27381,6 +27461,9 @@ + kde_mpeglib_compiles=no + + case "$OS_TYPE" in ++ NetBSD) ++ kde_mpeglib_compiles=yes ++ ;; + FreeBSD) + kde_mpeglib_compiles=yes + ;; +@@ -27647,9 +27730,10 @@ + ;; + + NetBSD) +- echo "$as_me:27650: result: NetBSD :Unknown hardware. You will have problems!!" >&5 +-echo "${ECHO_T}NetBSD :Unknown hardware. You will have problems!!" >&6 ++ echo "$as_me:27650: result: using -lpthread" >&5 ++echo $ECHO_N "using -lpthread... $ECHO_C" >&6 + OS_TYPE="BSD" ++ LIBPTHREAD="-lpthread" + + cat >>confdefs.h <<\EOF + #define OS_BSD 1 diff --git a/audio/kdemultimedia3/patches/patch-ab b/audio/kdemultimedia3/patches/patch-ab new file mode 100644 index 00000000000..e9471b891ba --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ab @@ -0,0 +1,48 @@ +$NetBSD: patch-ab,v 1.1.1.1.2.2 2002/06/23 18:38:00 jlam Exp $ + +--- kaboodle/Makefile.am.orig Fri Jul 27 01:53:45 2001 ++++ kaboodle/Makefile.am +@@ -2,7 +2,7 @@ + + SUBDIRS = pics actions + +-lib_LTLIBRARIES = libkaboodlepart.la kaboodle.la ++lib_LTLIBRARIES = libkaboodlepart.la libkaboodle_main.la kaboodle.la + + libkaboodlepart_la_SOURCES = conf.cpp \ + controls.cpp \ +@@ -15,25 +15,24 @@ + libkaboodlepart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries) + libkaboodlepart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde + +-kaboodle_la_SOURCES = main.cpp \ ++kaboodle_la_SOURCES = kaboodle_main.cpp ++kaboodle_la_LIBADD = libkaboodle_main.la ++kaboodle_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version ++ ++libkaboodle_main_la_SOURCES = main.cpp \ + kaboodleapp.cpp \ + userinterface.cpp + +-kaboodle_la_LIBADD = libkaboodlepart.la +-kaboodle_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version ++libkaboodle_main_la_LIBADD = libkaboodlepart.la ++libkaboodle_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + bin_PROGRAMS = kaboodle + +-kaboodle_LDADD = kaboodle.la ++kaboodle_LDADD = libkaboodle_main.la + kaboodle_LDFLAGS = $(all_libraries) $(KDE_RPATH) +-kaboodle_SOURCES = dummy.cpp ++kaboodle_SOURCES = kaboodle_main.cpp + + libkaboodlepart_la_METASOURCES = AUTO +- +-CLEANFILES = dummy.cpp +- +-dummy.cpp: +- echo > dummy.cpp + + applnk_DATA = kaboodle.desktop + applnkdir = $(kde_appsdir)/Multimedia diff --git a/audio/kdemultimedia3/patches/patch-ac b/audio/kdemultimedia3/patches/patch-ac new file mode 100644 index 00000000000..0b9a088fafc --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ac @@ -0,0 +1,275 @@ +$NetBSD: patch-ac,v 1.1.1.1.2.2 2002/06/23 18:38:01 jlam Exp $ + +--- kaboodle/Makefile.in.orig Tue May 14 01:53:25 2002 ++++ kaboodle/Makefile.in +@@ -293,7 +293,7 @@ + + SUBDIRS = pics actions + +-lib_LTLIBRARIES = libkaboodlepart.la kaboodle.la ++lib_LTLIBRARIES = libkaboodlepart.la libkaboodle_main.la kaboodle.la + + libkaboodlepart_la_SOURCES = conf.cpp \ + controls.cpp \ +@@ -307,24 +307,26 @@ + libkaboodlepart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries) + libkaboodlepart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde + +-kaboodle_la_SOURCES = main.cpp \ ++kaboodle_la_SOURCES = kaboodle_main.cpp ++kaboodle_la_LIBADD = libkaboodle_main.la ++kaboodle_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version ++ ++libkaboodle_main_la_SOURCES = main.cpp \ + kaboodleapp.cpp \ + userinterface.cpp + + +-kaboodle_la_LIBADD = libkaboodlepart.la +-kaboodle_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version ++libkaboodle_main_la_LIBADD = libkaboodlepart.la ++libkaboodle_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + bin_PROGRAMS = kaboodle + +-kaboodle_LDADD = kaboodle.la ++kaboodle_LDADD = libkaboodle_main.la + kaboodle_LDFLAGS = $(all_libraries) $(KDE_RPATH) +-kaboodle_SOURCES = dummy.cpp ++kaboodle_SOURCES = kaboodle_main.cpp + + #>- libkaboodlepart_la_METASOURCES = AUTO + +-CLEANFILES = dummy.cpp +- + applnk_DATA = kaboodle.desktop + applnkdir = $(kde_appsdir)/Multimedia + +@@ -337,15 +339,20 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(lib_LTLIBRARIES) + +-kaboodle_la_DEPENDENCIES = libkaboodlepart.la +-am_kaboodle_la_OBJECTS = main.lo kaboodleapp.lo userinterface.lo ++kaboodle_la_DEPENDENCIES = libkaboodle_main.la ++am_kaboodle_la_OBJECTS = kaboodle_main.lo + #>- kaboodle_la_OBJECTS = $(am_kaboodle_la_OBJECTS) ++#>+ 1 ++kaboodle_la_OBJECTS = kaboodle_main.lo ++libkaboodle_main_la_DEPENDENCIES = libkaboodlepart.la ++am_libkaboodle_main_la_OBJECTS = main.lo kaboodleapp.lo userinterface.lo ++#>- libkaboodle_main_la_OBJECTS = $(am_libkaboodle_main_la_OBJECTS) + #>+ 5 +-kaboodle_la_final_OBJECTS = kaboodle_la.all_cpp.lo +-kaboodle_la_nofinal_OBJECTS = main.lo kaboodleapp.lo userinterface.lo \ +- kaboodle_la_meta_unload.lo +-@KDE_USE_FINAL_FALSE@kaboodle_la_OBJECTS = $(kaboodle_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@kaboodle_la_OBJECTS = $(kaboodle_la_final_OBJECTS) ++libkaboodle_main_la_final_OBJECTS = libkaboodle_main_la.all_cpp.lo ++libkaboodle_main_la_nofinal_OBJECTS = main.lo kaboodleapp.lo userinterface.lo \ ++ libkaboodle_main_la_meta_unload.lo ++@KDE_USE_FINAL_FALSE@libkaboodle_main_la_OBJECTS = $(libkaboodle_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libkaboodle_main_la_OBJECTS = $(libkaboodle_main_la_final_OBJECTS) + libkaboodlepart_la_DEPENDENCIES = + am_libkaboodlepart_la_OBJECTS = conf.lo controls.lo engine.lo \ + kaboodle_factory.lo kaboodle_part.lo player.lo videoembed.lo +@@ -360,11 +367,11 @@ + bin_PROGRAMS = kaboodle$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +-am_kaboodle_OBJECTS = dummy.$(OBJEXT) ++am_kaboodle_OBJECTS = kaboodle_main.$(OBJEXT) + #>- kaboodle_OBJECTS = $(am_kaboodle_OBJECTS) + #>+ 1 +-kaboodle_OBJECTS = dummy.$(OBJEXT) +-kaboodle_DEPENDENCIES = kaboodle.la ++kaboodle_OBJECTS = kaboodle_main.$(OBJEXT) ++kaboodle_DEPENDENCIES = libkaboodle_main.la + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -373,8 +380,9 @@ + LIBS = @LIBS@ + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp + @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/conf.Plo $(DEPDIR)/controls.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/engine.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/kaboodle_factory.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/engine.Plo $(DEPDIR)/kaboodle_factory.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kaboodle_main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kaboodle_main.Po \ + @AMDEP_TRUE@ $(DEPDIR)/kaboodle_part.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/kaboodleapp.Plo $(DEPDIR)/main.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/player.Plo $(DEPDIR)/userinterface.Plo \ +@@ -398,8 +406,8 @@ + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ +-DIST_SOURCES = $(kaboodle_la_SOURCES) $(libkaboodlepart_la_SOURCES) \ +- $(kaboodle_SOURCES) ++DIST_SOURCES = $(kaboodle_la_SOURCES) $(libkaboodle_main_la_SOURCES) \ ++ $(libkaboodlepart_la_SOURCES) $(kaboodle_SOURCES) + DATA = $(applnk_DATA) $(data_DATA) $(kde_services_DATA) + + +@@ -409,7 +417,7 @@ + uninstall-recursive check-recursive installcheck-recursive + DIST_COMMON = AUTHORS Makefile.am Makefile.in + DIST_SUBDIRS = $(SUBDIRS) +-SOURCES = $(kaboodle_la_SOURCES) $(libkaboodlepart_la_SOURCES) $(kaboodle_SOURCES) ++SOURCES = $(kaboodle_la_SOURCES) $(libkaboodle_main_la_SOURCES) $(libkaboodlepart_la_SOURCES) $(kaboodle_SOURCES) + + #>- all: all-recursive + #>+ 1 +@@ -458,6 +466,8 @@ + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + kaboodle.la: $(kaboodle_la_OBJECTS) $(kaboodle_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kaboodle_la_LDFLAGS) $(kaboodle_la_OBJECTS) $(kaboodle_la_LIBADD) $(LIBS) ++libkaboodle_main.la: $(libkaboodle_main_la_OBJECTS) $(libkaboodle_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkaboodle_main_la_LDFLAGS) $(libkaboodle_main_la_OBJECTS) $(libkaboodle_main_la_LIBADD) $(LIBS) + #>- libkaboodlepart.la: $(libkaboodlepart_la_OBJECTS) $(libkaboodlepart_la_DEPENDENCIES) + #>+ 2 + @KDE_USE_CLOSURE_TRUE@libkaboodlepart.la: libkaboodlepart.la.closure $(libkaboodlepart_la_OBJECTS) $(libkaboodlepart_la_DEPENDENCIES) +@@ -499,9 +509,10 @@ + + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/conf.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/controls.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/engine.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kaboodle_factory.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kaboodle_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kaboodle_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kaboodle_part.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kaboodleapp.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ +@@ -677,7 +688,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=README-USERS kaboodle.desktop kaboodle_part.h conf.h kaboodle_factory.h engine.h kaboodlepartui.rc kaboodle_component.desktop videoembed.h player.h kaboodleapp.h kaboodleui.rc controls.h userinterface.h ++KDE_DIST=kaboodleapp.h kaboodle_factory.h libkaboodlepart.la.closure engine.h controls.h kaboodlepartui.rc kaboodleui.rc README-USERS kaboodle.desktop kaboodle_component.desktop kaboodle_part.h conf.h videoembed.h player.h dummy.cpp userinterface.h + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -739,7 +750,6 @@ + mostlyclean-generic: + + clean-generic: +- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* +@@ -818,9 +828,6 @@ + uninstall-libLTLIBRARIES uninstall-recursive + + +-dummy.cpp: +- echo > dummy.cpp +- + messages: rc.cpp + $(XGETTEXT) rc.cpp *.cpp *.h -o $(podir)/kaboodle.pot + # Tell versions [3.59,3.63) of GNU make to not export all variables. +@@ -891,16 +898,16 @@ + + + #>+ 12 +-kaboodle_la_meta_unload.cpp: kaboodleapp.moc userinterface.moc +- @echo 'creating kaboodle_la_meta_unload.cpp' +- @-rm -f kaboodle_la_meta_unload.cpp ++libkaboodle_main_la_meta_unload.cpp: kaboodleapp.moc userinterface.moc ++ @echo 'creating libkaboodle_main_la_meta_unload.cpp' ++ @-rm -f libkaboodle_main_la_meta_unload.cpp + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kaboodle_la[] = {' > kaboodle_la_meta_unload.cpp ;\ +- cat kaboodleapp.moc userinterface.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kaboodle_la_meta_unload.cpp ;\ +- echo '0};' >> kaboodle_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kaboodle_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kaboodle_la)' >> kaboodle_la_meta_unload.cpp ;\ +- else echo > kaboodle_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkaboodle_main_la[] = {' > libkaboodle_main_la_meta_unload.cpp ;\ ++ cat kaboodleapp.moc userinterface.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkaboodle_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkaboodle_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkaboodle_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkaboodle_main_la)' >> libkaboodle_main_la_meta_unload.cpp ;\ ++ else echo > libkaboodle_main_la_meta_unload.cpp; fi + + + #>+ 12 +@@ -918,14 +925,14 @@ + + #>+ 3 + clean-moc-classes: +- -rm -f kaboodle_la_meta_unload.cpp libkaboodlepart_la_meta_unload.cpp ++ -rm -f libkaboodle_main_la_meta_unload.cpp libkaboodlepart_la_meta_unload.cpp + + #>+ 11 +-kaboodle_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kaboodleapp.cpp $(srcdir)/userinterface.cpp kaboodle_la_meta_unload.cpp ++kaboodle_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaboodle_main.cpp + @echo 'creating kaboodle_la.all_cpp.cpp ...'; \ + rm -f kaboodle_la.all_cpp.files kaboodle_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kaboodle_la.all_cpp.final; \ +- for file in main.cpp kaboodleapp.cpp userinterface.cpp kaboodle_la_meta_unload.cpp ; do \ ++ for file in kaboodle_main.cpp ; do \ + echo "#include \"$$file\"" >> kaboodle_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaboodle_la.all_cpp.final; \ + done; \ +@@ -933,7 +940,19 @@ + rm -f kaboodle_la.all_cpp.final kaboodle_la.all_cpp.files + + #>+ 11 +-libkaboodlepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/conf.cpp $(srcdir)/controls.cpp $(srcdir)/engine.cpp $(srcdir)/kaboodle_factory.cpp $(srcdir)/kaboodle_part.cpp $(srcdir)/player.cpp $(srcdir)/videoembed.cpp libkaboodlepart_la_meta_unload.cpp kaboodle_part.moc controls.moc kaboodleapp.moc userinterface.moc kaboodle_factory.moc conf.moc player.moc videoembed.moc engine.moc ++libkaboodle_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kaboodleapp.cpp $(srcdir)/userinterface.cpp libkaboodle_main_la_meta_unload.cpp ++ @echo 'creating libkaboodle_main_la.all_cpp.cpp ...'; \ ++ rm -f libkaboodle_main_la.all_cpp.files libkaboodle_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkaboodle_main_la.all_cpp.final; \ ++ for file in main.cpp kaboodleapp.cpp userinterface.cpp libkaboodle_main_la_meta_unload.cpp ; do \ ++ echo "#include \"$$file\"" >> libkaboodle_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkaboodle_main_la.all_cpp.final; \ ++ done; \ ++ cat libkaboodle_main_la.all_cpp.final libkaboodle_main_la.all_cpp.files > libkaboodle_main_la.all_cpp.cpp; \ ++ rm -f libkaboodle_main_la.all_cpp.final libkaboodle_main_la.all_cpp.files ++ ++#>+ 11 ++libkaboodlepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/conf.cpp $(srcdir)/controls.cpp $(srcdir)/engine.cpp $(srcdir)/kaboodle_factory.cpp $(srcdir)/kaboodle_part.cpp $(srcdir)/player.cpp $(srcdir)/videoembed.cpp $(srcdir)/libkaboodlepart_la_meta_unload.cpp kaboodle_part.moc controls.moc kaboodleapp.moc userinterface.moc kaboodle_factory.moc conf.moc player.moc videoembed.moc engine.moc + @echo 'creating libkaboodlepart_la.all_cpp.cpp ...'; \ + rm -f libkaboodlepart_la.all_cpp.files libkaboodlepart_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkaboodlepart_la.all_cpp.final; \ +@@ -945,11 +964,11 @@ + rm -f libkaboodlepart_la.all_cpp.final libkaboodlepart_la.all_cpp.files + + #>+ 11 +-kaboodle.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++kaboodle.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaboodle_main.cpp + @echo 'creating kaboodle.all_cpp.cpp ...'; \ + rm -f kaboodle.all_cpp.files kaboodle.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kaboodle.all_cpp.final; \ +- for file in dummy.cpp ; do \ ++ for file in kaboodle_main.cpp ; do \ + echo "#include \"$$file\"" >> kaboodle.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaboodle.all_cpp.final; \ + done; \ +@@ -958,20 +977,20 @@ + + #>+ 3 + clean-final: +- -rm -f kaboodle_la.all_cpp.cpp libkaboodlepart_la.all_cpp.cpp kaboodle.all_cpp.cpp ++ -rm -f kaboodle_la.all_cpp.cpp libkaboodle_main_la.all_cpp.cpp libkaboodlepart_la.all_cpp.cpp kaboodle.all_cpp.cpp + + #>+ 2 + final: +- $(MAKE) kaboodle_la_OBJECTS="$(kaboodle_la_final_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_final_OBJECTS)" all-am ++ $(MAKE) libkaboodle_main_la_OBJECTS="$(libkaboodle_main_la_final_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) kaboodle_la_OBJECTS="$(kaboodle_la_final_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_final_OBJECTS)" install-am ++ $(MAKE) libkaboodle_main_la_OBJECTS="$(libkaboodle_main_la_final_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) kaboodle_la_OBJECTS="$(kaboodle_la_nofinal_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_nofinal_OBJECTS)" all-am ++ $(MAKE) libkaboodle_main_la_OBJECTS="$(libkaboodle_main_la_nofinal_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) kaboodle_la_OBJECTS="$(kaboodle_la_nofinal_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkaboodle_main_la_OBJECTS="$(libkaboodle_main_la_nofinal_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/audio/kdemultimedia3/patches/patch-ad b/audio/kdemultimedia3/patches/patch-ad new file mode 100644 index 00000000000..308bba312da --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ad @@ -0,0 +1,34 @@ +$NetBSD: patch-ad,v 1.1.1.1.2.2 2002/06/23 18:38:02 jlam Exp $ + +--- kaboodle/kaboodle_main.cpp.orig Thu May 30 20:46:07 2002 ++++ kaboodle/kaboodle_main.cpp +@@ -0,0 +1,29 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ * ++ */ ++ ++extern "C" int kdemain(int argc, char* argv[]); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/audio/kdemultimedia3/patches/patch-ae b/audio/kdemultimedia3/patches/patch-ae new file mode 100644 index 00000000000..2225c8fb376 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ae @@ -0,0 +1,15 @@ +$NetBSD: patch-ae,v 1.1.1.1.2.2 2002/06/23 18:38:03 jlam Exp $ + +--- kaboodle/main.cpp.orig Fri Aug 31 13:34:04 2001 ++++ kaboodle/main.cpp +@@ -42,7 +42,9 @@ + { 0, 0, 0} + }; + +-int main(int argc, char **argv) ++extern "C" int kdemain(int, char**); ++ ++int kdemain(int argc, char **argv) + { + KCmdLineArgs::init( argc, argv, KaboodleFactory::aboutData()); + KCmdLineArgs::addCmdLineOptions(options); diff --git a/audio/kdemultimedia3/patches/patch-af b/audio/kdemultimedia3/patches/patch-af new file mode 100644 index 00000000000..f8e61194694 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1.1.1.2.2 2002/06/23 18:38:04 jlam Exp $ + +--- kmidi/Makefile.in.orig Tue May 14 01:53:26 2002 ++++ kmidi/Makefile.in +@@ -409,7 +409,7 @@ + kmidiframe.$(OBJEXT) kmidifiledlg.$(OBJEXT) \ + qttableview.$(OBJEXT) \ + kmidi_meta_unload.o +-kmidi_LDADD = $(LDADD) ++kmidi_LDADD = $(LIBOSSAUDIO) $(LDADD) + kmidi_DEPENDENCIES = + kmidi_LDFLAGS = + am_sf2cfg_OBJECTS = sf2cfg.$(OBJEXT) readsbk.$(OBJEXT) diff --git a/audio/kdemultimedia3/patches/patch-ag b/audio/kdemultimedia3/patches/patch-ag new file mode 100644 index 00000000000..e07fed95fbe --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ag @@ -0,0 +1,23 @@ +$NetBSD: patch-ag,v 1.1.1.1.2.2 2002/06/23 18:38:05 jlam Exp $ + +--- kmidi/TIMIDITY/Makefile.in.orig Tue May 14 01:53:26 2002 ++++ kmidi/TIMIDITY/Makefile.in +@@ -300,8 +300,8 @@ + + INCLUDES = $(X_INCLUDES) `$(ARTSCCONFIG) --cflags` + AM_CFLAGS = -DDEFAULT_PATH=\"$(TIMID_DIR)\" $(EXTRATDEFS) $(EXTRATCFLAGS) +-LDFLAGS = `$(ARTSCCONFIG) --libs` +-LDADD = $(LIBALIB) $(LIBAUDIO) $(LIBMME) $(EXTRATLIBS) $(X_LIBS) -lm ++timidity_LDFLAGS = `$(ARTSCCONFIG) --libs` ++LDADD = $(LIBOSSAUDIO) $(LIBALIB) $(LIBAUDIO) $(LIBMME) $(EXTRATLIBS) $(X_LIBS) -lm + + # Where to install the patches, config files, and MIDI files. + # If you change this, it's a good idea to recompile the binary, +@@ -386,7 +386,6 @@ + @KDE_USE_FINAL_TRUE@timidity_OBJECTS = $(timidity_final_OBJECTS) + timidity_LDADD = $(LDADD) + timidity_DEPENDENCIES = +-timidity_LDFLAGS = + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) diff --git a/audio/kdemultimedia3/patches/patch-ah b/audio/kdemultimedia3/patches/patch-ah new file mode 100644 index 00000000000..9bc5f111556 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ah @@ -0,0 +1,16 @@ +$NetBSD: patch-ah,v 1.1.1.1.2.2 2002/06/23 18:38:05 jlam Exp $ + +--- kmidi/b_out.cpp.orig Thu Apr 12 10:09:23 2001 ++++ kmidi/b_out.cpp +@@ -16,6 +16,11 @@ + #include <linux/soundcard.h> + #endif + ++#ifdef __NetBSD__ ++#include <sys/ioctl.h> ++#include <soundcard.h> ++#endif ++ + #ifdef __FreeBSD__ + #include <machine/soundcard.h> + #endif diff --git a/audio/kdemultimedia3/patches/patch-ai b/audio/kdemultimedia3/patches/patch-ai new file mode 100644 index 00000000000..4e86bb72274 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ai @@ -0,0 +1,50 @@ +$NetBSD: patch-ai,v 1.1.1.1.2.2 2002/06/23 18:38:06 jlam Exp $ + +--- kmidi/linux_a.cpp.orig Fri Jan 19 09:17:50 2001 ++++ kmidi/linux_a.cpp +@@ -36,6 +36,13 @@ + #include <linux/soundcard.h> + #endif + ++#ifdef __NetBSD__ ++#include <stdio.h> ++#include <sys/ioctl.h> ++#include <soundcard.h> ++#endif ++ ++ + #ifdef __FreeBSD__ + #include <stdio.h> + #include <machine/soundcard.h> +@@ -76,6 +83,9 @@ + #ifdef LINUX_SECOND_DEVICE + "Linux 2nd dsp device", 'D', + "/dev/dsp1", ++#elif defined(__NetBSD__) ++ "NetBSD audio device", 'd', ++ "/dev/sound", + #else + "Linux dsp device", 'd', + "/dev/dsp", +@@ -320,13 +330,21 @@ + static void flush_output(void) + { + output_data(0, 0); ++#if defined(__NetBSD__) ++ ioctl(dpm.fd, SNDCTL_DSP_SYNC, NULL); ++#else + ioctl(dpm.fd, SNDCTL_DSP_SYNC); ++#endif + } + + static void purge_output(void) + { + b_out(dpm.id_character, dpm.fd, 0, -1); ++#if defined(__NetBSD__) ++ ioctl(dpm.fd, SNDCTL_DSP_RESET, NULL); ++#else + ioctl(dpm.fd, SNDCTL_DSP_RESET); ++#endif + } + + #endif /* defined(__linux__) || defined(__FreeBSD__) || defined(__bsdi__) */ diff --git a/audio/kdemultimedia3/patches/patch-aj b/audio/kdemultimedia3/patches/patch-aj new file mode 100644 index 00000000000..6eb57f7a395 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-aj @@ -0,0 +1,59 @@ +$NetBSD: patch-aj,v 1.1.1.1.2.2 2002/06/23 18:38:07 jlam Exp $ + +--- kmix/Makefile.am.orig Wed May 8 19:29:16 2002 ++++ kmix/Makefile.am +@@ -2,7 +2,7 @@ + INCLUDES= $(all_includes) + + bin_PROGRAMS = kmix kmixctrl +-lib_LTLIBRARIES = kmix.la kmixctrl.la ++lib_LTLIBRARIES = libkmix_main.la kmix.la libkmixctrl_main.la kmixctrl.la + kde_module_LTLIBRARIES = kmix_panelapplet.la + + +@@ -12,22 +12,30 @@ + + + METASOURCES = AUTO +-kmix_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ ++libkmix_main_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ + kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp \ + volume.cpp kledbutton.cpp mixdevicewidget.cpp +-kmix_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) ++libkmix_main_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) ++libkmix_main_la_LDFLAGS = $(all_libraries) ++ ++kmix_la_SOURCES = kmix_main.cpp ++kmix_la_LIBADD = libkmix_main.la + kmix_la_LDFLAGS = $(all_libraries) -module -avoid-version + +-kmix_SOURCES = dummy.cpp +-kmix_LDADD = kmix.la ++kmix_SOURCES = kmix_main.cpp ++kmix_LDADD = libkmix_main.la + kmix_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +-kmixctrl_SOURCES = dummy.cpp +-kmixctrl_LDADD = kmixctrl.la ++kmixctrl_SOURCES = kmixctrl_main.cpp ++kmixctrl_LDADD = libkmixctrl_main.la + kmixctrl_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +-kmixctrl_la_SOURCES = kmixctrl.cpp channel.cpp mixer.cpp volume.cpp +-kmixctrl_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) ++libkmixctrl_main_la_SOURCES = kmixctrl.cpp channel.cpp mixer.cpp volume.cpp ++libkmixctrl_main_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) ++libkmixctrl_main_la_LDFLAGS = $(all_libraries) ++ ++kmixctrl_la_SOURCES = kmixctrl_main.cpp ++kmixctrl_la_LIBADD = libkmixctrl_main.la + kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version + + kmix_panelapplet_la_METASOURCES=AUTO +@@ -58,6 +66,3 @@ + + messages: rc.cpp + $(XGETTEXT) *.cpp -o $(podir)/kmix.pot +- +-dummy.cpp: +- echo > dummy.cpp diff --git a/audio/kdemultimedia3/patches/patch-ak b/audio/kdemultimedia3/patches/patch-ak new file mode 100644 index 00000000000..f3f3b027668 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ak @@ -0,0 +1,387 @@ +$NetBSD: patch-ak,v 1.1.1.1.2.2 2002/06/23 18:38:07 jlam Exp $ + +--- kmix/Makefile.in.orig Tue May 14 01:53:26 2002 ++++ kmix/Makefile.in +@@ -293,7 +293,7 @@ + INCLUDES = $(all_includes) + + bin_PROGRAMS = kmix kmixctrl +-lib_LTLIBRARIES = kmix.la kmixctrl.la ++lib_LTLIBRARIES = libkmix_main.la kmix.la libkmixctrl_main.la kmixctrl.la + kde_module_LTLIBRARIES = kmix_panelapplet.la + + noinst_HEADERS = kmix.h kmixdockwidget.h kmixprefdlg.h kmixerwidget.h \ +@@ -302,23 +302,31 @@ + + + METASOURCES = AUTO +-kmix_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ ++libkmix_main_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ + kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp \ + volume.cpp kledbutton.cpp mixdevicewidget.cpp + +-kmix_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) ++libkmix_main_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) ++libkmix_main_la_LDFLAGS = $(all_libraries) ++ ++kmix_la_SOURCES = kmix_main.cpp ++kmix_la_LIBADD = libkmix_main.la + kmix_la_LDFLAGS = $(all_libraries) -module -avoid-version + +-kmix_SOURCES = dummy.cpp +-kmix_LDADD = kmix.la ++kmix_SOURCES = kmix_main.cpp ++kmix_LDADD = libkmix_main.la + kmix_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +-kmixctrl_SOURCES = dummy.cpp +-kmixctrl_LDADD = kmixctrl.la ++kmixctrl_SOURCES = kmixctrl_main.cpp ++kmixctrl_LDADD = libkmixctrl_main.la + kmixctrl_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +-kmixctrl_la_SOURCES = kmixctrl.cpp channel.cpp mixer.cpp volume.cpp +-kmixctrl_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) ++libkmixctrl_main_la_SOURCES = kmixctrl.cpp channel.cpp mixer.cpp volume.cpp ++libkmixctrl_main_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) ++libkmixctrl_main_la_LDFLAGS = $(all_libraries) ++ ++kmixctrl_la_SOURCES = kmixctrl_main.cpp ++kmixctrl_la_LIBADD = libkmixctrl_main.la + kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version + + #>- kmix_panelapplet_la_METASOURCES = AUTO +@@ -352,19 +360,11 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) + +-kmix_la_DEPENDENCIES = +-am_kmix_la_OBJECTS = main.lo kmix.lo kmixdockwidget.lo kmixprefdlg.lo \ +- kmixerwidget.lo channel.lo mixer.lo ksmallslider.lo volume.lo \ +- kledbutton.lo mixdevicewidget.lo ++kmix_la_DEPENDENCIES = libkmix_main.la ++am_kmix_la_OBJECTS = kmix_main.lo + #>- kmix_la_OBJECTS = $(am_kmix_la_OBJECTS) +-#>+ 7 +-kmix_la_final_OBJECTS = kmix_la.all_cpp.lo +-kmix_la_nofinal_OBJECTS = main.lo kmix.lo kmixdockwidget.lo kmixprefdlg.lo \ +- kmixerwidget.lo channel.lo mixer.lo ksmallslider.lo volume.lo \ +- kledbutton.lo mixdevicewidget.lo \ +- kmix_la_meta_unload.lo +-@KDE_USE_FINAL_FALSE@kmix_la_OBJECTS = $(kmix_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@kmix_la_OBJECTS = $(kmix_la_final_OBJECTS) ++#>+ 1 ++kmix_la_OBJECTS = kmix_main.lo + kmix_panelapplet_la_DEPENDENCIES = + am_kmix_panelapplet_la_OBJECTS = kmixapplet.lo kmixerwidget.lo \ + channel.lo mixer.lo ksmallslider.lo volume.lo kledbutton.lo \ +@@ -378,28 +378,48 @@ + kmix_panelapplet_la_meta_unload.lo + @KDE_USE_FINAL_FALSE@kmix_panelapplet_la_OBJECTS = $(kmix_panelapplet_la_nofinal_OBJECTS) + @KDE_USE_FINAL_TRUE@kmix_panelapplet_la_OBJECTS = $(kmix_panelapplet_la_final_OBJECTS) +-kmixctrl_la_DEPENDENCIES = +-am_kmixctrl_la_OBJECTS = kmixctrl.lo channel.lo mixer.lo volume.lo ++kmixctrl_la_DEPENDENCIES = libkmixctrl_main.la ++am_kmixctrl_la_OBJECTS = kmixctrl_main.lo + #>- kmixctrl_la_OBJECTS = $(am_kmixctrl_la_OBJECTS) +-#>+ 5 +-kmixctrl_la_final_OBJECTS = kmixctrl_la.all_cpp.lo +-kmixctrl_la_nofinal_OBJECTS = kmixctrl.lo channel.lo mixer.lo volume.lo \ +- kmixctrl_la_meta_unload.lo +-@KDE_USE_FINAL_FALSE@kmixctrl_la_OBJECTS = $(kmixctrl_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@kmixctrl_la_OBJECTS = $(kmixctrl_la_final_OBJECTS) ++#>+ 1 ++kmixctrl_la_OBJECTS = kmixctrl_main.lo ++libkmix_main_la_DEPENDENCIES = ++am_libkmix_main_la_OBJECTS = main.lo kmix.lo kmixdockwidget.lo \ ++ kmixprefdlg.lo kmixerwidget.lo channel.lo mixer.lo \ ++ ksmallslider.lo volume.lo kledbutton.lo mixdevicewidget.lo ++#>- libkmix_main_la_OBJECTS = $(am_libkmix_main_la_OBJECTS) ++#>+ 7 ++libkmix_main_la_final_OBJECTS = libkmix_main_la.all_cpp.lo ++libkmix_main_la_nofinal_OBJECTS = main.lo kmix.lo kmixdockwidget.lo \ ++ kmixprefdlg.lo kmixerwidget.lo channel.lo mixer.lo \ ++ ksmallslider.lo volume.lo kledbutton.lo mixdevicewidget.lo \ ++ libkmix_main_la_meta_unload.lo ++@KDE_USE_FINAL_FALSE@libkmix_main_la_OBJECTS = $(libkmix_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libkmix_main_la_OBJECTS = $(libkmix_main_la_final_OBJECTS) ++libkmixctrl_main_la_DEPENDENCIES = ++am_libkmixctrl_main_la_OBJECTS = kmixctrl.lo channel.lo mixer.lo \ ++ volume.lo ++#>- libkmixctrl_main_la_OBJECTS = $(am_libkmixctrl_main_la_OBJECTS) ++#>+ 6 ++libkmixctrl_main_la_final_OBJECTS = libkmixctrl_main_la.all_cpp.lo ++libkmixctrl_main_la_nofinal_OBJECTS = kmixctrl.lo channel.lo mixer.lo \ ++ volume.lo \ ++ libkmixctrl_main_la_meta_unload.lo ++@KDE_USE_FINAL_FALSE@libkmixctrl_main_la_OBJECTS = $(libkmixctrl_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libkmixctrl_main_la_OBJECTS = $(libkmixctrl_main_la_final_OBJECTS) + bin_PROGRAMS = kmix$(EXEEXT) kmixctrl$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +-am_kmix_OBJECTS = dummy.$(OBJEXT) ++am_kmix_OBJECTS = kmix_main.$(OBJEXT) + #>- kmix_OBJECTS = $(am_kmix_OBJECTS) + #>+ 1 +-kmix_OBJECTS = dummy.$(OBJEXT) +-kmix_DEPENDENCIES = kmix.la +-am_kmixctrl_OBJECTS = dummy.$(OBJEXT) ++kmix_OBJECTS = kmix_main.$(OBJEXT) ++kmix_DEPENDENCIES = libkmix_main.la ++am_kmixctrl_OBJECTS = kmixctrl_main.$(OBJEXT) + #>- kmixctrl_OBJECTS = $(am_kmixctrl_OBJECTS) + #>+ 1 +-kmixctrl_OBJECTS = dummy.$(OBJEXT) +-kmixctrl_DEPENDENCIES = kmixctrl.la ++kmixctrl_OBJECTS = kmixctrl_main.$(OBJEXT) ++kmixctrl_DEPENDENCIES = libkmixctrl_main.la + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -407,9 +427,11 @@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp +-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/channel.Plo $(DEPDIR)/dummy.Po \ +- @AMDEP_TRUE@ $(DEPDIR)/kledbutton.Plo $(DEPDIR)/kmix.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/kmixapplet.Plo $(DEPDIR)/kmixctrl.Plo \ ++@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/channel.Plo $(DEPDIR)/kledbutton.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kmix.Plo $(DEPDIR)/kmix_main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kmix_main.Po $(DEPDIR)/kmixapplet.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kmixctrl.Plo $(DEPDIR)/kmixctrl_main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kmixctrl_main.Po \ + @AMDEP_TRUE@ $(DEPDIR)/kmixdockwidget.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/kmixerwidget.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/kmixprefdlg.Plo \ +@@ -436,7 +458,9 @@ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ + DIST_SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) \ +- $(kmixctrl_la_SOURCES) $(kmix_SOURCES) $(kmixctrl_SOURCES) ++ $(kmixctrl_la_SOURCES) $(libkmix_main_la_SOURCES) \ ++ $(libkmixctrl_main_la_SOURCES) $(kmix_SOURCES) \ ++ $(kmixctrl_SOURCES) + DATA = $(apps_DATA) $(lnk_DATA) $(rc_DATA) $(services_DATA) + + HEADERS = $(noinst_HEADERS) +@@ -448,7 +472,7 @@ + uninstall-recursive check-recursive installcheck-recursive + DIST_COMMON = $(noinst_HEADERS) AUTHORS Makefile.am Makefile.in + DIST_SUBDIRS = $(SUBDIRS) +-SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) $(kmixctrl_la_SOURCES) $(kmix_SOURCES) $(kmixctrl_SOURCES) ++SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) $(kmixctrl_la_SOURCES) $(libkmix_main_la_SOURCES) $(libkmixctrl_main_la_SOURCES) $(kmix_SOURCES) $(kmixctrl_SOURCES) + + #>- all: all-recursive + #>+ 1 +@@ -523,6 +547,10 @@ + $(CXXLINK) -rpath $(kde_moduledir) $(kmix_panelapplet_la_LDFLAGS) $(kmix_panelapplet_la_OBJECTS) $(kmix_panelapplet_la_LIBADD) $(LIBS) + kmixctrl.la: $(kmixctrl_la_OBJECTS) $(kmixctrl_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kmixctrl_la_LDFLAGS) $(kmixctrl_la_OBJECTS) $(kmixctrl_la_LIBADD) $(LIBS) ++libkmix_main.la: $(libkmix_main_la_OBJECTS) $(libkmix_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkmix_main_la_LDFLAGS) $(libkmix_main_la_OBJECTS) $(libkmix_main_la_LIBADD) $(LIBS) ++libkmixctrl_main.la: $(libkmixctrl_main_la_OBJECTS) $(libkmixctrl_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkmixctrl_main_la_LDFLAGS) $(libkmixctrl_main_la_OBJECTS) $(libkmixctrl_main_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) +@@ -561,11 +589,14 @@ + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/channel.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kledbutton.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmix.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmix_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmix_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmixapplet.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmixctrl.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmixctrl_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmixctrl_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmixdockwidget.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmixerwidget.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmixprefdlg.Plo@am__quote@ +@@ -760,7 +791,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=mixer_irix.h mixer_hpux.cpp resource.h mixer_irix.cpp mixer_sun.h mixer_none.cpp mixer_none.h mixer_alsa.cpp kmixapplet.desktop colorwidget.ui kmix-platforms.cpp configure.in.in mixer_hpux.h kmixui.rc kmixctrl_restore.desktop mixer_oss.cpp mixer_sun.cpp mixer_oss.h mixer_alsa.h ++KDE_DIST=colorwidget.ui kmix-platforms.cpp configure.in.in mixer_hpux.h mixer_irix.h mixer_hpux.cpp kmixui.rc kmixctrl_restore.desktop resource.h mixer_oss.cpp mixer_irix.cpp mixer_sun.h mixer_sun.cpp mixer_none.cpp mixer_none.h mixer_oss.h mixer_alsa.cpp kmixapplet.desktop mixer_alsa.h + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -914,9 +945,6 @@ + + messages: rc.cpp + $(XGETTEXT) *.cpp -o $(podir)/kmix.pot +- +-dummy.cpp: +- echo > dummy.cpp + # 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: +@@ -1003,19 +1031,6 @@ + + + #>+ 12 +-kmix_la_meta_unload.cpp: kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc +- @echo 'creating kmix_la_meta_unload.cpp' +- @-rm -f kmix_la_meta_unload.cpp +- @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kmix_la[] = {' > kmix_la_meta_unload.cpp ;\ +- cat kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kmix_la_meta_unload.cpp ;\ +- echo '0};' >> kmix_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kmix_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kmix_la)' >> kmix_la_meta_unload.cpp ;\ +- else echo > kmix_la_meta_unload.cpp; fi +- +- +-#>+ 12 + kmix_panelapplet_la_meta_unload.cpp: mixdevicewidget.moc ksmallslider.moc colorwidget.moc mixer.moc kmixapplet.moc kledbutton.moc kmixerwidget.moc + @echo 'creating kmix_panelapplet_la_meta_unload.cpp' + @-rm -f kmix_panelapplet_la_meta_unload.cpp +@@ -1029,28 +1044,41 @@ + + + #>+ 12 +-kmixctrl_la_meta_unload.cpp: mixer.moc +- @echo 'creating kmixctrl_la_meta_unload.cpp' +- @-rm -f kmixctrl_la_meta_unload.cpp ++libkmix_main_la_meta_unload.cpp: kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc ++ @echo 'creating libkmix_main_la_meta_unload.cpp' ++ @-rm -f libkmix_main_la_meta_unload.cpp ++ @if test ${kde_qtver} = 2; then \ ++ echo 'static const char * _metalist_libkmix_main_la[] = {' > libkmix_main_la_meta_unload.cpp ;\ ++ cat kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkmix_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkmix_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkmix_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkmix_main_la)' >> libkmix_main_la_meta_unload.cpp ;\ ++ else echo > libkmix_main_la_meta_unload.cpp; fi ++ ++ ++#>+ 12 ++libkmixctrl_main_la_meta_unload.cpp: mixer.moc ++ @echo 'creating libkmixctrl_main_la_meta_unload.cpp' ++ @-rm -f libkmixctrl_main_la_meta_unload.cpp + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kmixctrl_la[] = {' > kmixctrl_la_meta_unload.cpp ;\ +- cat mixer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kmixctrl_la_meta_unload.cpp ;\ +- echo '0};' >> kmixctrl_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kmixctrl_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kmixctrl_la)' >> kmixctrl_la_meta_unload.cpp ;\ +- else echo > kmixctrl_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkmixctrl_main_la[] = {' > libkmixctrl_main_la_meta_unload.cpp ;\ ++ cat mixer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkmixctrl_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkmixctrl_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkmixctrl_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkmixctrl_main_la)' >> libkmixctrl_main_la_meta_unload.cpp ;\ ++ else echo > libkmixctrl_main_la_meta_unload.cpp; fi + + + #>+ 3 + clean-moc-classes: +- -rm -f kmix_la_meta_unload.cpp kmix_panelapplet_la_meta_unload.cpp kmixctrl_la_meta_unload.cpp ++ -rm -f kmix_panelapplet_la_meta_unload.cpp libkmix_main_la_meta_unload.cpp libkmixctrl_main_la_meta_unload.cpp + + #>+ 11 +-kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp kmix_la_meta_unload.cpp ++kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in kmix_main.cpp + @echo 'creating kmix_la.all_cpp.cpp ...'; \ + rm -f kmix_la.all_cpp.files kmix_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kmix_la.all_cpp.final; \ +- for file in main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp volume.cpp kledbutton.cpp mixdevicewidget.cpp kmix_la_meta_unload.cpp ; do \ ++ for file in kmix_main.cpp ; do \ + echo "#include \"$$file\"" >> kmix_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmix_la.all_cpp.final; \ + done; \ +@@ -1070,11 +1098,11 @@ + rm -f kmix_panelapplet_la.all_cpp.final kmix_panelapplet_la.all_cpp.files + + #>+ 11 +-kmixctrl_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixctrl.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/volume.cpp kmixctrl_la_meta_unload.cpp ++kmixctrl_la.all_cpp.cpp: $(srcdir)/Makefile.in kmixctrl_main.cpp + @echo 'creating kmixctrl_la.all_cpp.cpp ...'; \ + rm -f kmixctrl_la.all_cpp.files kmixctrl_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kmixctrl_la.all_cpp.final; \ +- for file in kmixctrl.cpp channel.cpp mixer.cpp volume.cpp kmixctrl_la_meta_unload.cpp ; do \ ++ for file in kmixctrl_main.cpp ; do \ + echo "#include \"$$file\"" >> kmixctrl_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmixctrl_la.all_cpp.final; \ + done; \ +@@ -1082,11 +1110,35 @@ + rm -f kmixctrl_la.all_cpp.final kmixctrl_la.all_cpp.files + + #>+ 11 +-kmix.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++libkmix_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp libkmix_main_la_meta_unload.cpp ++ @echo 'creating libkmix_main_la.all_cpp.cpp ...'; \ ++ rm -f libkmix_main_la.all_cpp.files libkmix_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkmix_main_la.all_cpp.final; \ ++ for file in main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp volume.cpp kledbutton.cpp mixdevicewidget.cpp libkmix_main_la_meta_unload.cpp ; do \ ++ echo "#include \"$$file\"" >> libkmix_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkmix_main_la.all_cpp.final; \ ++ done; \ ++ cat libkmix_main_la.all_cpp.final libkmix_main_la.all_cpp.files > libkmix_main_la.all_cpp.cpp; \ ++ rm -f libkmix_main_la.all_cpp.final libkmix_main_la.all_cpp.files ++ ++#>+ 11 ++libkmixctrl_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixctrl.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/volume.cpp libkmixctrl_main_la_meta_unload.cpp ++ @echo 'creating libkmixctrl_main_la.all_cpp.cpp ...'; \ ++ rm -f libkmixctrl_main_la.all_cpp.files libkmixctrl_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkmixctrl_main_la.all_cpp.final; \ ++ for file in kmixctrl.cpp channel.cpp mixer.cpp volume.cpp libkmixctrl_main_la_meta_unload.cpp ; do \ ++ echo "#include \"$$file\"" >> libkmixctrl_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkmixctrl_main_la.all_cpp.final; \ ++ done; \ ++ cat libkmixctrl_main_la.all_cpp.final libkmixctrl_main_la.all_cpp.files > libkmixctrl_main_la.all_cpp.cpp; \ ++ rm -f libkmixctrl_main_la.all_cpp.final libkmixctrl_main_la.all_cpp.files ++ ++#>+ 11 ++kmix.all_cpp.cpp: $(srcdir)/Makefile.in kmix_main.cpp + @echo 'creating kmix.all_cpp.cpp ...'; \ + rm -f kmix.all_cpp.files kmix.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kmix.all_cpp.final; \ +- for file in dummy.cpp ; do \ ++ for file in kmix_main.cpp ; do \ + echo "#include \"$$file\"" >> kmix.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmix.all_cpp.final; \ + done; \ +@@ -1094,11 +1146,11 @@ + rm -f kmix.all_cpp.final kmix.all_cpp.files + + #>+ 11 +-kmixctrl.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++kmixctrl.all_cpp.cpp: $(srcdir)/Makefile.in kmixctrl_main.cpp + @echo 'creating kmixctrl.all_cpp.cpp ...'; \ + rm -f kmixctrl.all_cpp.files kmixctrl.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kmixctrl.all_cpp.final; \ +- for file in dummy.cpp ; do \ ++ for file in kmixctrl_main.cpp ; do \ + echo "#include \"$$file\"" >> kmixctrl.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmixctrl.all_cpp.final; \ + done; \ +@@ -1107,20 +1159,20 @@ + + #>+ 3 + clean-final: +- -rm -f kmix_la.all_cpp.cpp kmix_panelapplet_la.all_cpp.cpp kmixctrl_la.all_cpp.cpp kmix.all_cpp.cpp kmixctrl.all_cpp.cpp ++ -rm -f kmix_la.all_cpp.cpp kmix_panelapplet_la.all_cpp.cpp kmixctrl_la.all_cpp.cpp libkmix_main_la.all_cpp.cpp libkmixctrl_main_la.all_cpp.cpp kmix.all_cpp.cpp kmixctrl.all_cpp.cpp + + #>+ 2 + final: +- $(MAKE) kmix_la_OBJECTS="$(kmix_la_final_OBJECTS)" kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_final_OBJECTS)" kmixctrl_la_OBJECTS="$(kmixctrl_la_final_OBJECTS)" all-am ++ $(MAKE) kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_final_OBJECTS)" libkmix_main_la_OBJECTS="$(libkmix_main_la_final_OBJECTS)" libkmixctrl_main_la_OBJECTS="$(libkmixctrl_main_la_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) kmix_la_OBJECTS="$(kmix_la_final_OBJECTS)" kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_final_OBJECTS)" kmixctrl_la_OBJECTS="$(kmixctrl_la_final_OBJECTS)" install-am ++ $(MAKE) kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_final_OBJECTS)" libkmix_main_la_OBJECTS="$(libkmix_main_la_final_OBJECTS)" libkmixctrl_main_la_OBJECTS="$(libkmixctrl_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) kmix_la_OBJECTS="$(kmix_la_nofinal_OBJECTS)" kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_nofinal_OBJECTS)" kmixctrl_la_OBJECTS="$(kmixctrl_la_nofinal_OBJECTS)" all-am ++ $(MAKE) kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_nofinal_OBJECTS)" libkmix_main_la_OBJECTS="$(libkmix_main_la_nofinal_OBJECTS)" libkmixctrl_main_la_OBJECTS="$(libkmixctrl_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) kmix_la_OBJECTS="$(kmix_la_nofinal_OBJECTS)" kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_nofinal_OBJECTS)" kmixctrl_la_OBJECTS="$(kmixctrl_la_nofinal_OBJECTS)" install-am ++ $(MAKE) kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_nofinal_OBJECTS)" libkmix_main_la_OBJECTS="$(libkmix_main_la_nofinal_OBJECTS)" libkmixctrl_main_la_OBJECTS="$(libkmixctrl_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/audio/kdemultimedia3/patches/patch-al b/audio/kdemultimedia3/patches/patch-al new file mode 100644 index 00000000000..f3e855d85c8 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-al @@ -0,0 +1,34 @@ +$NetBSD: patch-al,v 1.1.1.1.2.2 2002/06/23 18:38:08 jlam Exp $ + +--- kmix/kmix_main.cpp.orig Thu May 30 20:46:07 2002 ++++ kmix/kmix_main.cpp +@@ -0,0 +1,29 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ * ++ */ ++ ++extern "C" int kdemain(int argc, char* argv[]); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/audio/kdemultimedia3/patches/patch-am b/audio/kdemultimedia3/patches/patch-am new file mode 100644 index 00000000000..4c727eec5bb --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-am @@ -0,0 +1,15 @@ +$NetBSD: patch-am,v 1.1.1.1.4.2 2002/06/23 18:38:08 jlam Exp $ + +--- kmix/kmixctrl.cpp.orig Sun Jan 6 04:17:43 2002 ++++ kmix/kmixctrl.cpp +@@ -44,7 +44,9 @@ + // INSERT YOUR COMMANDLINE OPTIONS HERE + }; + +-int main(int argc, char *argv[]) ++extern "C" int kdemain(int argc, char *argv[]); ++ ++int kdemain(int argc, char *argv[]) + { + KLocale::setMainCatalogue("kmix"); + KAboutData aboutData( "kmixctrl", I18N_NOOP("KMixCtrl"), diff --git a/audio/kdemultimedia3/patches/patch-an b/audio/kdemultimedia3/patches/patch-an new file mode 100644 index 00000000000..37675560556 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-an @@ -0,0 +1,34 @@ +$NetBSD: patch-an,v 1.1.1.1.2.2 2002/06/23 18:38:08 jlam Exp $ + +--- kmix/kmixctrl_main.cpp.orig Thu May 30 20:46:08 2002 ++++ kmix/kmixctrl_main.cpp +@@ -0,0 +1,29 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ * ++ */ ++ ++extern "C" int kdemain(int argc, char* argv[]); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/audio/kdemultimedia3/patches/patch-ao b/audio/kdemultimedia3/patches/patch-ao new file mode 100644 index 00000000000..2430913f2a8 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ao @@ -0,0 +1,15 @@ +$NetBSD: patch-ao,v 1.1.1.1.4.2 2002/06/23 18:38:09 jlam Exp $ + +--- kmix/main.cpp.orig Sun Jan 6 04:17:43 2002 ++++ kmix/main.cpp +@@ -37,7 +37,9 @@ + // INSERT YOUR COMMANDLINE OPTIONS HERE + }; + +-int main(int argc, char *argv[]) ++extern "C" int kdemain(int, char *[]); ++ ++int kdemain(int argc, char *argv[]) + { + KAboutData aboutData( "kmix", I18N_NOOP("KMix"), + APP_VERSION, description, KAboutData::License_GPL, diff --git a/audio/kdemultimedia3/patches/patch-ap b/audio/kdemultimedia3/patches/patch-ap new file mode 100644 index 00000000000..67884472b16 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ap @@ -0,0 +1,37 @@ +$NetBSD: patch-ap,v 1.1.1.1.2.2 2002/06/23 18:38:10 jlam Exp $ + +--- kscd/libwm/include/wm_config.h.orig Wed May 8 19:29:23 2002 ++++ kscd/libwm/include/wm_config.h +@@ -128,11 +128,31 @@ + *** ****** ** ** ****** ****** ** ****** ** * ********** + *** ****** ** ** ** ** **** *** *********** + ******************************************************************/ +-#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) || defined(__NetBSD) ++#if defined(__FreeBSD__) || defined(__FreeBSD) + + #define DEFAULT_CD_DEVICE "/dev/rmatcd0c" + ++ + #endif /* freebsd */ ++ ++/****************************************************************** ++ * NetBSD ++ ****************************************************************** ++ *** *** ** ** ** **** *** ***************** ++ *** ** ** ******** **** ** ** ****** * **************** ++ *** * * ** ****** **** ****** **** ** *************** ++ *** ** ** ******** **** ** ****** ** * **************** ++ *** *** ** **** **** **** *** ***************** ++ ******************************************************************/ ++#if defined(__NetBSD__) || defined(__NetBSD) ++ ++#if defined(__i386__) ++#define DEFAULT_CD_DEVICE "/dev/rcd0d" ++#else ++#define DEFAULT_CD_DEVICE "/dev/rcd0c" ++#endif ++ ++#endif /* netbsd */ + + /****************************************************************** + * HP-UX diff --git a/audio/kdemultimedia3/patches/patch-aq b/audio/kdemultimedia3/patches/patch-aq new file mode 100644 index 00000000000..044ba30b22e --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-aq @@ -0,0 +1,44 @@ +$NetBSD: patch-aq,v 1.1.1.1.2.2 2002/06/23 18:38:11 jlam Exp $ + +--- kscd/libwm/plat_freebsd.c.orig Fri Jan 11 03:19:57 2002 ++++ kscd/libwm/plat_freebsd.c +@@ -34,3 +34,3 @@ + +-#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) || defined (__NetBSD) ++#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) + +@@ -52,3 +52,3 @@ + +-#if defined(__NetBSD__) || defined(__OpenBSD__) ++#if defined(__OpenBSD__) + # define MSF_MINUTES 1 +@@ -59,2 +59,5 @@ + # include "/sys/scsi/scsi_cd.h" ++#elif defined(__NetBSD__) ++#include <sys/scsiio.h> ++#include <dev/scsipi/scsipi_cd.h> + #else +@@ -235,7 +238,2 @@ + dopos: +-#ifdef __NetBSD__ +- *pos = scd.what.position.absaddr[MSF_MINUTES] * 60 * 75 + +- scd.what.position.absaddr[MSF_SECONDS] * 75 + +- scd.what.position.absaddr[MSF_FRAMES]; +-#else + *pos = scd.what.position.absaddr.msf.minute * 60 * 75 + +@@ -243,3 +241,2 @@ + scd.what.position.absaddr.msf.frame; +-#endif + *track = scd.what.position.track_number; +@@ -310,7 +307,2 @@ + +-#ifdef __NetBSD__ +- *startframe = toc_buffer.addr[MSF_MINUTES]*60*75 + +- toc_buffer.addr[MSF_SECONDS] * 75 + +- toc_buffer.addr[MSF_FRAMES]; +-#else + *startframe = toc_buffer.addr.msf.minute*60*75 + +@@ -318,3 +310,2 @@ + toc_buffer.addr.msf.frame; +-#endif + diff --git a/audio/kdemultimedia3/patches/patch-ar b/audio/kdemultimedia3/patches/patch-ar new file mode 100644 index 00000000000..0c67d2173ce --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ar @@ -0,0 +1,13 @@ +$NetBSD: patch-ar,v 1.1.1.1.4.2 2002/06/23 18:38:12 jlam Exp $ + +--- mpeglib/lib/util/audio/Makefile.in.orig Tue May 14 01:53:27 2002 ++++ mpeglib/lib/util/audio/Makefile.in +@@ -311,7 +311,7 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(noinst_LTLIBRARIES) + +-libaudio_la_LDFLAGS = ++libaudio_la_LDFLAGS = $(LIBOSSAUDIO) + libaudio_la_LIBADD = + am_libaudio_la_OBJECTS = audioIO.lo dspWrapper.lo + #>- libaudio_la_OBJECTS = $(am_libaudio_la_OBJECTS) diff --git a/audio/kdemultimedia3/patches/patch-as b/audio/kdemultimedia3/patches/patch-as new file mode 100644 index 00000000000..9072639d04f --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-as @@ -0,0 +1,31 @@ +$NetBSD: patch-as,v 1.1.1.1.2.2 2002/06/23 18:38:13 jlam Exp $ + +--- mpeglib/lib/util/audio/audioIO_Linux.cpp.orig Tue Jun 5 19:55:39 2001 ++++ mpeglib/lib/util/audio/audioIO_Linux.cpp +@@ -40,7 +40,7 @@ + #include <sys/soundcard.h> + #else + // fallback: +-#include <linux/soundcard.h> ++#include <soundcard.h> /* NetBSD has <soundcard.h> */ + + #endif + #endif +@@ -48,7 +48,7 @@ + + /* optimal fragment size */ + +-int AUSIZ = 0; ++int ausiz = 0; + + // declare these static to effectively isolate the audio device + +@@ -147,7 +147,7 @@ + exit(0); + } + +- if (ioctl(audio_fd, SNDCTL_DSP_GETBLKSIZE, &AUSIZ) == -1) { ++ if (ioctl(audio_fd, SNDCTL_DSP_GETBLKSIZE, &ausiz) == -1) { + perror("Unable to get fragment size\n"); + exit(0); + } diff --git a/audio/kdemultimedia3/patches/patch-at b/audio/kdemultimedia3/patches/patch-at new file mode 100644 index 00000000000..df3c0da3019 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-at @@ -0,0 +1,16 @@ +$NetBSD: patch-at,v 1.1.1.1.2.2 2002/06/23 18:38:13 jlam Exp $ + +--- mpeglib/lib/util/render/x11/imageDeskX11.cpp.orig Thu Jan 11 15:40:00 2001 ++++ mpeglib/lib/util/render/x11/imageDeskX11.cpp +@@ -397,7 +397,11 @@ + } + + int bestMode = -1; ++#if defined(__NetBSD__) ++ int border, minBorder = INT_MAX; ++#else + int border, minBorder = MAXINT; ++#endif + + for (i = 0; i < vm_count; i++) { + printf("mode %d: %dx%d\n",i, vm_modelines[i]->hdisplay,vm_modelines[i]->vdisplay); diff --git a/audio/kdemultimedia3/patches/patch-au b/audio/kdemultimedia3/patches/patch-au new file mode 100644 index 00000000000..ed1b16ff9f0 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-au @@ -0,0 +1,15 @@ +$NetBSD: patch-au,v 1.1.1.1.2.2 2002/06/23 18:38:13 jlam Exp $ + +--- mpeglib/lib/util/render/x11/imageDeskX11.h.orig Wed Dec 6 18:42:08 2000 ++++ mpeglib/lib/util/render/x11/imageDeskX11.h +@@ -13,7 +13,10 @@ + + #ifndef __IMAGEDESKX11_H + #define __IMAGEDESKX11_H ++#if defined(__NetBSD__) ++#else + #include <values.h> ++#endif + #include "xinit.h" + + #include "../imageBase.h" diff --git a/audio/kdemultimedia3/patches/patch-av b/audio/kdemultimedia3/patches/patch-av new file mode 100644 index 00000000000..30fad45166c --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-av @@ -0,0 +1,12 @@ +$NetBSD: patch-av,v 1.1.1.1.2.2 2002/06/23 18:38:14 jlam Exp $ + +--- mpeglib/lib/util/render/x11/imageXVDesk.h.orig Thu Dec 21 17:47:58 2000 ++++ mpeglib/lib/util/render/x11/imageXVDesk.h +@@ -21,7 +21,6 @@ + + #include <iostream.h> + #include <stdio.h> +-#include <semaphore.h> + + //#undef X11_XV + diff --git a/audio/kdemultimedia3/patches/patch-aw b/audio/kdemultimedia3/patches/patch-aw new file mode 100644 index 00000000000..7241720a0da --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-aw @@ -0,0 +1,18 @@ +$NetBSD: patch-aw,v 1.1.1.1.2.2 2002/06/23 18:38:15 jlam Exp $ + +--- mpeglib/lib/util/render/x11/x11Surface.cpp.orig Wed Aug 8 13:04:28 2001 ++++ mpeglib/lib/util/render/x11/x11Surface.cpp +@@ -267,8 +267,13 @@ + XSizeHints hints; + hints.flags = PMaxSize; + if (HAS_RESIZE(newImage)) { ++#if defined(__NetBSD__) ++ hints.max_width = INT_MAX; ++ hints.max_height = INT_MAX; ++#else + hints.max_width = MAXINT; + hints.max_height = MAXINT; ++#endif + } else { + hints.max_width = xWindow->width; + hints.max_height = xWindow->height; diff --git a/audio/kdemultimedia3/patches/patch-ax b/audio/kdemultimedia3/patches/patch-ax new file mode 100644 index 00000000000..8a64db8ce67 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ax @@ -0,0 +1,16 @@ +$NetBSD: patch-ax,v 1.1.1.1.2.2 2002/06/23 18:38:16 jlam Exp $ + +--- mpeglib/lib/util/render/x11/x11Surface.h.orig Wed Aug 8 13:04:28 2001 ++++ mpeglib/lib/util/render/x11/x11Surface.h +@@ -14,7 +14,11 @@ + #ifndef __X11SURFACE_H + #define __X11SURFACE_H + ++#if defined(__NetBSD__) ++#include <limits.h> ++#else + #include <values.h> ++#endif + #include "xinit.h" + #include "../surface.h" + #include "initDisplay.h" diff --git a/audio/kdemultimedia3/patches/patch-ay b/audio/kdemultimedia3/patches/patch-ay new file mode 100644 index 00000000000..77dcbe74f31 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ay @@ -0,0 +1,36 @@ +$NetBSD: patch-ay,v 1.1.1.1.2.2 2002/06/23 18:38:17 jlam Exp $ + +--- noatun/Makefile.am.orig Sun Mar 3 07:50:51 2002 ++++ noatun/Makefile.am +@@ -4,22 +4,22 @@ + + KDE_ICON = AUTO + ++lib_LTLIBRARIES = libnoatun_main.la + kde_module_LTLIBRARIES = noatun.la +-noatun_la_SOURCES = main.cpp joinhandler.cpp joinhandler.skel ++libnoatun_main_la_SOURCES = main.cpp joinhandler.cpp joinhandler.skel ++libnoatun_main_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) ++libnoatun_main_la_LIBADD = -lqtmcop -lkmedia2_idl -lsoundserver_idl $(top_builddir)/noatun/library/libnoatun.la ++ ++noatun_la_SOURCES = noatun_main.cpp + noatun_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version +-noatun_la_LIBADD = -lqtmcop -lkmedia2_idl -lsoundserver_idl $(top_builddir)/noatun/library/libnoatun.la ++noatun_la_LIBADD = libnoatun_main.la + + bin_PROGRAMS = noatun +-noatun_SOURCES = dummy.cpp ++noatun_SOURCES = noatun_main.cpp + noatun_LDFLAGS = $(all_libraries) $(KDE_RPATH) +-noatun_LDADD = $(LIB_KIO) noatun.la ++noatun_LDADD = libnoatun_main.la + + METASOURCES = AUTO +- +-CLEANFILES = dummy.cpp +- +-dummy.cpp: +- echo > dummy.cpp + + applnk_DATA = noatun.desktop + applnkdir = $(kde_appsdir)/Multimedia diff --git a/audio/kdemultimedia3/patches/patch-az b/audio/kdemultimedia3/patches/patch-az new file mode 100644 index 00000000000..6ff10fc82aa --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-az @@ -0,0 +1,342 @@ +$NetBSD: patch-az,v 1.1.1.1.2.2 2002/06/23 18:38:17 jlam Exp $ + +--- noatun/Makefile.in.orig Tue May 14 01:53:28 2002 ++++ noatun/Makefile.in +@@ -295,22 +295,25 @@ + + KDE_ICON = AUTO + ++lib_LTLIBRARIES = libnoatun_main.la + kde_module_LTLIBRARIES = noatun.la +-#>- noatun_la_SOURCES = main.cpp joinhandler.cpp joinhandler.skel ++#>- libnoatun_main_la_SOURCES = main.cpp joinhandler.cpp joinhandler.skel + #>+ 1 +-noatun_la_SOURCES=main.cpp joinhandler.cpp joinhandler_skel.cpp ++libnoatun_main_la_SOURCES=main.cpp joinhandler.cpp joinhandler_skel.cpp ++libnoatun_main_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) ++libnoatun_main_la_LIBADD = -lqtmcop -lkmedia2_idl -lsoundserver_idl $(top_builddir)/noatun/library/libnoatun.la ++ ++noatun_la_SOURCES = noatun_main.cpp + noatun_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version +-noatun_la_LIBADD = -lqtmcop -lkmedia2_idl -lsoundserver_idl $(top_builddir)/noatun/library/libnoatun.la ++noatun_la_LIBADD = libnoatun_main.la + + bin_PROGRAMS = noatun +-noatun_SOURCES = dummy.cpp ++noatun_SOURCES = noatun_main.cpp + noatun_LDFLAGS = $(all_libraries) $(KDE_RPATH) +-noatun_LDADD = $(LIB_KIO) noatun.la ++noatun_LDADD = libnoatun_main.la + + #>- METASOURCES = AUTO + +-CLEANFILES = dummy.cpp +- + applnk_DATA = noatun.desktop + applnkdir = $(kde_appsdir)/Multimedia + +@@ -328,25 +331,31 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(kde_module_LTLIBRARIES) ++LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) + +-noatun_la_DEPENDENCIES = $(top_builddir)/noatun/library/libnoatun.la +-am_noatun_la_OBJECTS = main.lo joinhandler.lo +-#>- noatun_la_OBJECTS = $(am_noatun_la_OBJECTS) ++libnoatun_main_la_DEPENDENCIES = \ ++ $(top_builddir)/noatun/library/libnoatun.la ++am_libnoatun_main_la_OBJECTS = main.lo joinhandler.lo ++#>- libnoatun_main_la_OBJECTS = $(am_libnoatun_main_la_OBJECTS) + #>+ 4 +-noatun_la_final_OBJECTS = noatun_la.all_cpp.lo +-noatun_la_nofinal_OBJECTS = main.lo joinhandler.lo joinhandler_skel.lo +-@KDE_USE_FINAL_FALSE@noatun_la_OBJECTS = $(noatun_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@noatun_la_OBJECTS = $(noatun_la_final_OBJECTS) ++libnoatun_main_la_final_OBJECTS = libnoatun_main_la.all_cpp.lo ++libnoatun_main_la_nofinal_OBJECTS = main.lo joinhandler.lo joinhandler_skel.lo ++@KDE_USE_FINAL_FALSE@libnoatun_main_la_OBJECTS = $(libnoatun_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libnoatun_main_la_OBJECTS = $(libnoatun_main_la_final_OBJECTS) ++noatun_la_DEPENDENCIES = libnoatun_main.la ++am_noatun_la_OBJECTS = noatun_main.lo ++#>- noatun_la_OBJECTS = $(am_noatun_la_OBJECTS) ++#>+ 1 ++noatun_la_OBJECTS = noatun_main.lo + bin_PROGRAMS = noatun$(EXEEXT) + update_PROGRAMS = noatun20update$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) $(update_PROGRAMS) + +-am_noatun_OBJECTS = dummy.$(OBJEXT) ++am_noatun_OBJECTS = noatun_main.$(OBJEXT) + #>- noatun_OBJECTS = $(am_noatun_OBJECTS) + #>+ 1 +-noatun_OBJECTS = dummy.$(OBJEXT) +-noatun_DEPENDENCIES = noatun.la ++noatun_OBJECTS = noatun_main.$(OBJEXT) ++noatun_DEPENDENCIES = libnoatun_main.la + am_noatun20update_OBJECTS = noatun20update.$(OBJEXT) + #>- noatun20update_OBJECTS = $(am_noatun20update_OBJECTS) + #>+ 1 +@@ -359,8 +368,9 @@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp +-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/joinhandler.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/noatun20update.Po ++@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/joinhandler.Plo $(DEPDIR)/main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/noatun20update.Po \ ++ @AMDEP_TRUE@ $(DEPDIR)/noatun_main.Plo $(DEPDIR)/noatun_main.Po + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 2 +@@ -380,8 +390,8 @@ + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ +-DIST_SOURCES = $(noatun_la_SOURCES) $(noatun_SOURCES) \ +- $(noatun20update_SOURCES) ++DIST_SOURCES = $(libnoatun_main_la_SOURCES) $(noatun_la_SOURCES) \ ++ $(noatun_SOURCES) $(noatun20update_SOURCES) + DATA = $(applnk_DATA) $(presets_DATA) $(update_DATA) + + +@@ -391,7 +401,7 @@ + uninstall-recursive check-recursive installcheck-recursive + DIST_COMMON = COPYING Makefile.am Makefile.in TODO + DIST_SUBDIRS = $(SUBDIRS) +-SOURCES = $(noatun_la_SOURCES) $(noatun_SOURCES) $(noatun20update_SOURCES) ++SOURCES = $(libnoatun_main_la_SOURCES) $(noatun_la_SOURCES) $(noatun_SOURCES) $(noatun20update_SOURCES) + + #>- all: all-recursive + #>+ 1 +@@ -438,6 +448,27 @@ + + clean-kde_moduleLTLIBRARIES: + -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES) ++install-libLTLIBRARIES: $(lib_LTLIBRARIES) ++ @$(NORMAL_INSTALL) ++ $(mkinstalldirs) $(DESTDIR)$(libdir) ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ if test -f $$p; then \ ++ echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \ ++ $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \ ++ else :; fi; \ ++ done ++ ++uninstall-libLTLIBRARIES: ++ @$(NORMAL_UNINSTALL) ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ ++ done ++ ++clean-libLTLIBRARIES: ++ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) ++libnoatun_main.la: $(libnoatun_main_la_OBJECTS) $(libnoatun_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libnoatun_main_la_LDFLAGS) $(libnoatun_main_la_OBJECTS) $(libnoatun_main_la_LIBADD) $(LIBS) + noatun.la: $(noatun_la_OBJECTS) $(noatun_la_DEPENDENCIES) + $(CXXLINK) -rpath $(kde_moduledir) $(noatun_la_LDFLAGS) $(noatun_la_OBJECTS) $(noatun_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) +@@ -501,10 +532,11 @@ + distclean-compile: + -rm -f *.tab.c + +-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/joinhandler.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/noatun20update.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/noatun_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/noatun_main.Po@am__quote@ + + distclean-depend: + -rm -rf $(DEPDIR) +@@ -674,7 +706,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=avideoframe.cc hi22-app-noatun.png hi48-app-noatun.png noatun.desktop hi32-app-noatun.png preset.dance CHANGES preset.jazz FILES preset.metal hi16-app-noatun.png preset.trance joinhandler.h noatun.upd configure.in.in avideoframe.h preset.zero artsvideo.idl ++KDE_DIST=preset.trance artsvideo.idl joinhandler.h CHANGES avideoframe.cc noatun.upd configure.in.in preset.jazz hi22-app-noatun.png noatun hi48-app-noatun.png noatun.desktop FILES avideoframe.h preset.metal joinhandler.kidl hi16-app-noatun.png noatun20update preset.zero hi32-app-noatun.png preset.dance dummy.cpp + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -714,9 +746,11 @@ + check-am: all-am + check: check-recursive + all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) ++install-binPROGRAMS: install-libLTLIBRARIES ++ + installdirs: installdirs-recursive + installdirs-am: +- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(bindir) $(DESTDIR)$(updatedir) $(DESTDIR)$(applnkdir) $(DESTDIR)$(presetsdir) $(DESTDIR)$(updatedir) ++ $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(updatedir) $(DESTDIR)$(applnkdir) $(DESTDIR)$(presetsdir) $(DESTDIR)$(updatedir) + + install: install-recursive + install-exec: install-exec-recursive +@@ -734,7 +768,6 @@ + mostlyclean-generic: + + clean-generic: +- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* +@@ -747,10 +780,12 @@ + clean: kde-rpo-clean clean-recursive + + #>- clean-am: clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \ +-#>- clean-libtool clean-updatePROGRAMS mostlyclean-am +-#>+ 2 ++#>- clean-libLTLIBRARIES clean-libtool clean-updatePROGRAMS \ ++#>- mostlyclean-am ++#>+ 3 + clean-am: clean-idl clean-final clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \ +- clean-libtool clean-updatePROGRAMS mostlyclean-am ++ clean-libLTLIBRARIES clean-libtool clean-updatePROGRAMS \ ++ mostlyclean-am + + distclean: distclean-recursive + +@@ -773,9 +808,9 @@ + install-data-am: install-kde-icons install-applnkDATA \ + install-presetsDATA install-updateDATA install-updatePROGRAMS + +-#>- install-exec-am: install-binPROGRAMS ++#>- install-exec-am: install-binPROGRAMS install-libLTLIBRARIES + #>+ 1 +-install-exec-am: install-kde_moduleLTLIBRARIES install-binPROGRAMS ++install-exec-am: install-kde_moduleLTLIBRARIES install-binPROGRAMS install-libLTLIBRARIES + + install-info: install-info-recursive + +@@ -794,43 +829,42 @@ + + #>- uninstall-am: uninstall-applnkDATA uninstall-binPROGRAMS \ + #>- uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ +-#>- uninstall-presetsDATA uninstall-updateDATA \ +-#>- uninstall-updatePROGRAMS ++#>- uninstall-libLTLIBRARIES uninstall-presetsDATA \ ++#>- uninstall-updateDATA uninstall-updatePROGRAMS + #>+ 4 + uninstall-am: uninstall-kde-icons uninstall-applnkDATA uninstall-binPROGRAMS \ + uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ +- uninstall-presetsDATA uninstall-updateDATA \ +- uninstall-updatePROGRAMS ++ uninstall-libLTLIBRARIES uninstall-presetsDATA \ ++ uninstall-updateDATA uninstall-updatePROGRAMS + + uninstall-info: uninstall-info-recursive + + .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \ +- clean-libtool clean-recursive clean-updatePROGRAMS distclean \ +- distclean-compile distclean-depend distclean-generic \ +- distclean-libtool distclean-recursive distclean-tags distdir \ +- dvi dvi-am dvi-recursive info info-am info-recursive install \ +- install-am install-applnkDATA install-binPROGRAMS install-data \ ++ clean-libLTLIBRARIES clean-libtool clean-recursive \ ++ clean-updatePROGRAMS distclean distclean-compile \ ++ distclean-depend distclean-generic distclean-libtool \ ++ distclean-recursive distclean-tags distdir dvi dvi-am \ ++ dvi-recursive info info-am info-recursive install install-am \ ++ install-applnkDATA install-binPROGRAMS install-data \ + install-data-am install-data-recursive install-exec \ + install-exec-am install-exec-recursive install-info \ + install-info-am install-info-recursive \ +- install-kde_moduleLTLIBRARIES install-man install-presetsDATA \ +- install-recursive install-strip install-updateDATA \ +- install-updatePROGRAMS installcheck installcheck-am installdirs \ +- installdirs-am installdirs-recursive maintainer-clean \ +- maintainer-clean-generic maintainer-clean-recursive mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- mostlyclean-recursive tags tags-recursive uninstall \ +- uninstall-am uninstall-applnkDATA uninstall-binPROGRAMS \ +- uninstall-info-am uninstall-info-recursive \ +- uninstall-kde_moduleLTLIBRARIES uninstall-presetsDATA \ ++ install-kde_moduleLTLIBRARIES install-libLTLIBRARIES \ ++ install-man install-presetsDATA install-recursive install-strip \ ++ install-updateDATA install-updatePROGRAMS installcheck \ ++ installcheck-am installdirs installdirs-am \ ++ installdirs-recursive maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-recursive mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ++ tags tags-recursive uninstall uninstall-am uninstall-applnkDATA \ ++ uninstall-binPROGRAMS uninstall-info-am \ ++ uninstall-info-recursive uninstall-kde_moduleLTLIBRARIES \ ++ uninstall-libLTLIBRARIES uninstall-presetsDATA \ + uninstall-recursive uninstall-updateDATA \ + uninstall-updatePROGRAMS + + +-dummy.cpp: +- echo > dummy.cpp +- + messages: + $(EXTRACTRC) `find . -name "*.rc"` > rc.cpp + $(XGETTEXT) rc.cpp `find . -name "*.cc" -o -name "*.cpp" -print` -o $(podir)/noatun.pot +@@ -877,11 +911,23 @@ + + + #>+ 11 +-noatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/joinhandler.cpp joinhandler_skel.cpp ++libnoatun_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/joinhandler.cpp $(srcdir)/joinhandler_skel.cpp ++ @echo 'creating libnoatun_main_la.all_cpp.cpp ...'; \ ++ rm -f libnoatun_main_la.all_cpp.files libnoatun_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libnoatun_main_la.all_cpp.final; \ ++ for file in main.cpp joinhandler.cpp joinhandler_skel.cpp ; do \ ++ echo "#include \"$$file\"" >> libnoatun_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libnoatun_main_la.all_cpp.final; \ ++ done; \ ++ cat libnoatun_main_la.all_cpp.final libnoatun_main_la.all_cpp.files > libnoatun_main_la.all_cpp.cpp; \ ++ rm -f libnoatun_main_la.all_cpp.final libnoatun_main_la.all_cpp.files ++ ++#>+ 11 ++noatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatun_main.cpp + @echo 'creating noatun_la.all_cpp.cpp ...'; \ + rm -f noatun_la.all_cpp.files noatun_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> noatun_la.all_cpp.final; \ +- for file in main.cpp joinhandler.cpp joinhandler_skel.cpp ; do \ ++ for file in noatun_main.cpp ; do \ + echo "#include \"$$file\"" >> noatun_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> noatun_la.all_cpp.final; \ + done; \ +@@ -889,11 +935,11 @@ + rm -f noatun_la.all_cpp.final noatun_la.all_cpp.files + + #>+ 11 +-noatun.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++noatun.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatun_main.cpp + @echo 'creating noatun.all_cpp.cpp ...'; \ + rm -f noatun.all_cpp.files noatun.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> noatun.all_cpp.final; \ +- for file in dummy.cpp ; do \ ++ for file in noatun_main.cpp ; do \ + echo "#include \"$$file\"" >> noatun.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> noatun.all_cpp.final; \ + done; \ +@@ -914,20 +960,20 @@ + + #>+ 3 + clean-final: +- -rm -f noatun_la.all_cpp.cpp noatun.all_cpp.cpp noatun20update.all_cpp.cpp ++ -rm -f libnoatun_main_la.all_cpp.cpp noatun_la.all_cpp.cpp noatun.all_cpp.cpp noatun20update.all_cpp.cpp + + #>+ 2 + final: +- $(MAKE) noatun_la_OBJECTS="$(noatun_la_final_OBJECTS)" all-am ++ $(MAKE) libnoatun_main_la_OBJECTS="$(libnoatun_main_la_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) noatun_la_OBJECTS="$(noatun_la_final_OBJECTS)" install-am ++ $(MAKE) libnoatun_main_la_OBJECTS="$(libnoatun_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) noatun_la_OBJECTS="$(noatun_la_nofinal_OBJECTS)" all-am ++ $(MAKE) libnoatun_main_la_OBJECTS="$(libnoatun_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) noatun_la_OBJECTS="$(noatun_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libnoatun_main_la_OBJECTS="$(libnoatun_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/audio/kdemultimedia3/patches/patch-ba b/audio/kdemultimedia3/patches/patch-ba new file mode 100644 index 00000000000..e293f9946ba --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-ba @@ -0,0 +1,15 @@ +$NetBSD: patch-ba,v 1.1.1.1.2.2 2002/06/23 18:38:18 jlam Exp $ + +--- noatun/main.cpp.orig Wed May 8 19:29:25 2002 ++++ noatun/main.cpp +@@ -24,7 +24,9 @@ + { 0, 0, 0} + }; + +-int main(int argc, char **argv) ++extern "C" int kdemain(int, char **); ++ ++int kdemain(int argc, char **argv) + { + KAboutData aboutData("noatun", I18N_NOOP("Noatun"), + version, description, KAboutData::License_BSD, diff --git a/audio/kdemultimedia3/patches/patch-bb b/audio/kdemultimedia3/patches/patch-bb new file mode 100644 index 00000000000..123b07abbc1 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-bb @@ -0,0 +1,33 @@ +$NetBSD: patch-bb,v 1.1.1.1.2.2 2002/06/23 18:38:19 jlam Exp $ + +--- noatun/noatun_main.cpp.orig Thu May 30 20:46:08 2002 ++++ noatun/noatun_main.cpp +@@ -0,0 +1,28 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++extern "C" int kdemain(int, char* []); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/audio/lame/Makefile b/audio/lame/Makefile index da64186528e..e845dd4ed43 100644 --- a/audio/lame/Makefile +++ b/audio/lame/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2002/01/07 16:38:31 wiz Exp $ +# $NetBSD: Makefile,v 1.17.2.1 2002/06/23 18:38:20 jlam Exp $ # -VERS= 3.91 +VERS= 3.92 DISTNAME= lame-${VERS} CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lame/} \ diff --git a/audio/lame/distinfo b/audio/lame/distinfo index bceea5faa0d..0b926db236b 100644 --- a/audio/lame/distinfo +++ b/audio/lame/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2002/01/07 16:38:32 wiz Exp $ +$NetBSD: distinfo,v 1.5.2.1 2002/06/23 18:38:20 jlam Exp $ -SHA1 (lame-3.91.tar.gz) = 84759b675f000688cd287fb99a9b407d05df8da4 -Size (lame-3.91.tar.gz) = 873212 bytes +SHA1 (lame-3.92.tar.gz) = 97be7804c7c89b088726124163de94b7432d5ea4 +Size (lame-3.92.tar.gz) = 970894 bytes SHA1 (patch-aa) = cfab96bd36d765cb31c1dcb5259553e10b72af8e SHA1 (patch-ab) = 9cde28d5ab39e3d10a832d49852d059c04af8419 -SHA1 (patch-ac) = d488e6fc8f98362a4750dede9e4c19bcded14ed3 +SHA1 (patch-ac) = 1d84de13fc16187687fe1cd85f61c458df98772b diff --git a/audio/lame/patches/patch-ac b/audio/lame/patches/patch-ac index 15b5dc29476..dab06648186 100644 --- a/audio/lame/patches/patch-ac +++ b/audio/lame/patches/patch-ac @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.2 2002/01/07 16:38:32 wiz Exp $ +$NetBSD: patch-ac,v 1.2.2.1 2002/06/23 18:38:21 jlam Exp $ ---- frontend/Makefile.in.orig Sun Nov 11 15:57:48 2001 +--- frontend/Makefile.in.orig Fri Apr 12 21:38:18 2002 +++ frontend/Makefile.in -@@ -162,7 +162,7 @@ - @WITH_BRHIST_FALSE@mp3x_SOURCES = mp3x.c gtkanal.c gpkplotting.c $(common_sources) +@@ -166,7 +166,7 @@ + @WITH_BRHIST_FALSE@mp3x__EXEEXT__SOURCES = mp3x.c gtkanal.c gpkplotting.c $(common_sources) CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ -LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ -static +LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ - mp3x_LDADD = $(LDADD) @GTK_LIBS@ + mp3x__EXEEXT__LDADD = $(LDADD) @GTK_LIBS@ diff --git a/audio/liba52/Makefile b/audio/liba52/Makefile index 949a302b271..dda0de7b8ca 100644 --- a/audio/liba52/Makefile +++ b/audio/liba52/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2001/12/11 04:01:34 wiz Exp $ +# $NetBSD: Makefile,v 1.2.2.1 2002/06/23 18:38:21 jlam Exp $ # -DISTNAME= a52dec-0.7.1b -PKGNAME= ${DISTNAME:S/a52dec/liba52/:S/1b/1.2/} +DISTNAME= a52dec-0.7.3 +PKGNAME= ${DISTNAME:S/a52dec/liba52/} CATEGORIES= audio MASTER_SITES= http://liba52.sourceforge.net/files/ diff --git a/audio/liba52/PLIST b/audio/liba52/PLIST index 8ed1e6ef165..12b2158e606 100644 --- a/audio/liba52/PLIST +++ b/audio/liba52/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2001/12/10 19:49:46 veego Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.2.1 2002/06/23 18:38:22 jlam Exp $ include/a52dec/a52.h +include/a52dec/attributes.h include/a52dec/audio_out.h include/a52dec/mm_accel.h lib/liba52.a diff --git a/audio/liba52/distinfo b/audio/liba52/distinfo index 231431f0aad..d4aec2775eb 100644 --- a/audio/liba52/distinfo +++ b/audio/liba52/distinfo @@ -1,10 +1,8 @@ -$NetBSD: distinfo,v 1.2 2002/01/21 21:31:31 wiz Exp $ +$NetBSD: distinfo,v 1.2.2.1 2002/06/23 18:38:22 jlam Exp $ -SHA1 (a52dec-0.7.1b.tar.gz) = 3c46c3acaa922d4c1a246b7390a1c7d64eec5fc0 -Size (a52dec-0.7.1b.tar.gz) = 174184 bytes -SHA1 (patch-aa) = 441e8aa547200e8e32aeabb9a437837ced602b23 -SHA1 (patch-ab) = 50c7507e8a6dd532355377b6049864345beb35fb -SHA1 (patch-ac) = 7f527572156438deac3c6a77a2e631f68f9894d5 -SHA1 (patch-ad) = cba44f6e8cfcdfd8139f33dd84363cfa1bde7a62 -SHA1 (patch-ae) = 59f4c3c666b084e016edbb7efb09a12e217298ba -SHA1 (patch-af) = 2e6ec857bb7b99eb8ea6c27cc997fbf495033575 +SHA1 (a52dec-0.7.3.tar.gz) = cb59c2499215cecd9e79de8cb20b1f3d8232fc6b +Size (a52dec-0.7.3.tar.gz) = 235944 bytes +SHA1 (patch-aa) = f31a0e354ab7f1111c03196bf1a11d7caab0f1e9 +SHA1 (patch-ab) = c51a5d3176705d773e42ceddc1d35c31f112302a +SHA1 (patch-ac) = eb8ef17e2fdb20e34a32c629415b77b123c5a625 +SHA1 (patch-ad) = 2186a4ac36cf44f021fbc1a4d8e7d31b96b71531 diff --git a/audio/liba52/patches/patch-aa b/audio/liba52/patches/patch-aa index 10fa083c0a9..a3fb8f9ad7f 100644 --- a/audio/liba52/patches/patch-aa +++ b/audio/liba52/patches/patch-aa @@ -1,16 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/12/10 19:49:46 veego Exp $ +$NetBSD: patch-aa,v 1.1.1.1.2.1 2002/06/23 18:38:23 jlam Exp $ ---- configure-orig Fri Aug 31 11:39:53 2001 -+++ configure Wed Oct 10 21:18:49 2001 -@@ -2663,6 +2663,11 @@ - #define LIBAO_SOLARIS - EOF - ;; +--- libao/configure.incl.orig Sun Feb 17 10:23:15 2002 ++++ libao/configure.incl Thu Jun 13 10:27:49 2002 +@@ -19,6 +19,8 @@ + case "$host" in + *-sun-solaris*) + AC_DEFINE([LIBAO_SOLARIS],,[libao solaris support]);; + *-netbsd*) -+ cat >> confdefs.h <<\EOF -+#define LIBAO_SOLARIS -+EOF -+;; ++ AC_DEFINE([LIBAO_SOLARIS],,[libao solaris compat support]);; esac fi diff --git a/audio/liba52/patches/patch-ab b/audio/liba52/patches/patch-ab index 3acd3ba53aa..112416ba321 100644 --- a/audio/liba52/patches/patch-ab +++ b/audio/liba52/patches/patch-ab @@ -1,10 +1,16 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/12/10 19:49:46 veego Exp $ +$NetBSD: patch-ab,v 1.1.1.1.2.1 2002/06/23 18:38:23 jlam Exp $ ---- configure.in-orig Fri Aug 31 11:36:47 2001 -+++ configure.in Thu Oct 11 00:13:14 2001 -@@ -92,4 +92,4 @@ +--- configure.orig Thu Feb 21 08:55:21 2002 ++++ configure Thu Jun 13 10:12:43 2002 +@@ -8802,6 +8802,11 @@ + #define LIBAO_SOLARIS + EOF + ;; ++ *-netbsd*) ++cat >> confdefs.h <<\EOF ++#define LIBAO_SOLARIS ++EOF ++;; + esac + fi - AC_C_ATTRIBUTE_ALIGNED - --AC_OUTPUT(Makefile autotools/Makefile include/Makefile test/Makefile doc/Makefile src/Makefile liba52/Makefile libao/Makefile) -+AC_OUTPUT(Makefile autotools/Makefile include/Makefile liba52/Makefile) diff --git a/audio/liba52/patches/patch-ac b/audio/liba52/patches/patch-ac index 8fb0affda89..f985570a5f0 100644 --- a/audio/liba52/patches/patch-ac +++ b/audio/liba52/patches/patch-ac @@ -1,22 +1,9 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/12/10 19:49:46 veego Exp $ +$NetBSD: patch-ac,v 1.1.1.1.2.1 2002/06/23 18:38:24 jlam Exp $ ---- configure-orig Fri Aug 31 11:39:53 2001 -+++ configure Thu Oct 11 00:13:56 2001 -@@ -2857,7 +2857,7 @@ - ac_given_srcdir=$srcdir - ac_given_INSTALL="$INSTALL" +--- Makefile.am.orig Mon Dec 17 00:23:45 2001 ++++ Makefile.am Thu Jun 13 10:04:13 2002 +@@ -1,3 +1,3 @@ +-SUBDIRS = autotools include doc liba52 libao src vc++ test ++SUBDIRS = autotools include liba52 --trap 'rm -fr `echo "Makefile autotools/Makefile include/Makefile test/Makefile doc/Makefile src/Makefile liba52/Makefile libao/Makefile include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -+trap 'rm -fr `echo "Makefile autotools/Makefile include/Makefile liba52/Makefile include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 - EOF - cat >> $CONFIG_STATUS <<EOF - -@@ -2967,7 +2967,7 @@ - - cat >> $CONFIG_STATUS <<EOF - --CONFIG_FILES=\${CONFIG_FILES-"Makefile autotools/Makefile include/Makefile test/Makefile doc/Makefile src/Makefile liba52/Makefile libao/Makefile"} -+CONFIG_FILES=\${CONFIG_FILES-"Makefile autotools/Makefile include/Makefile liba52/Makefile"} - EOF - cat >> $CONFIG_STATUS <<\EOF - for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then + EXTRA_DIST = HISTORY bootstrap diff --git a/audio/liba52/patches/patch-ad b/audio/liba52/patches/patch-ad index 89a4c437aee..49bed65e3ca 100644 --- a/audio/liba52/patches/patch-ad +++ b/audio/liba52/patches/patch-ad @@ -1,9 +1,13 @@ -$NetBSD: patch-ad,v 1.1.1.1 2001/12/10 19:49:46 veego Exp $ +$NetBSD: patch-ad,v 1.1.1.1.2.1 2002/06/23 18:38:24 jlam Exp $ ---- Makefile.am-orig Wed Aug 15 20:36:52 2001 -+++ Makefile.am Thu Oct 11 00:15:31 2001 -@@ -1,3 +1,3 @@ --SUBDIRS = autotools include doc liba52 libao src test +--- Makefile.in.orig Thu Feb 21 08:58:36 2002 ++++ Makefile.in Thu Jun 13 10:03:57 2002 +@@ -76,7 +76,7 @@ + STRIP = @STRIP@ + VERSION = @VERSION@ + +-SUBDIRS = autotools include doc liba52 libao src vc++ test +SUBDIRS = autotools include liba52 - EXTRA_DIST = bootstrap + EXTRA_DIST = HISTORY bootstrap + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/audio/liba52/patches/patch-ae b/audio/liba52/patches/patch-ae deleted file mode 100644 index aaba3f24550..00000000000 --- a/audio/liba52/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2001/12/10 19:49:46 veego Exp $ - ---- Makefile.in-orig Fri Aug 31 11:40:06 2001 -+++ Makefile.in Thu Oct 11 00:15:42 2001 -@@ -72,7 +72,7 @@ - RANLIB = @RANLIB@ - VERSION = @VERSION@ - --SUBDIRS = autotools include doc liba52 libao src test -+SUBDIRS = autotools include liba52 - - EXTRA_DIST = bootstrap - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/audio/liba52/patches/patch-af b/audio/liba52/patches/patch-af deleted file mode 100644 index 2091efe30bf..00000000000 --- a/audio/liba52/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.1 2002/01/21 21:31:32 wiz Exp $ - ---- liba52/bitstream.c.orig Wed Aug 15 14:36:53 2001 -+++ liba52/bitstream.c -@@ -38,7 +38,7 @@ - { - int align; - -- align = (int)buf & 3; -+ align = (long)buf & 3; - buffer_start = (uint32_t *) (buf - align); - bits_left = 0; - bitstream_get (align * 8); diff --git a/audio/libao/buildlink.mk b/audio/libao/buildlink.mk index 09c41e1efdc..2733a8b9743 100644 --- a/audio/libao/buildlink.mk +++ b/audio/libao/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2002/01/02 12:23:48 lukem Exp $ +# $NetBSD: buildlink.mk,v 1.3.2.1 2002/06/23 18:38:25 jlam Exp $ # # This Makefile fragment is included by packages that use libao. # @@ -12,8 +12,8 @@ # (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search # path. -.if !defined(LIGAO_BUILDLINK_MK) -LIGAO_BUILDLINK_MK= # defined +.if !defined(LIBAO_BUILDLINK_MK) +LIBAO_BUILDLINK_MK= # defined .include "../../mk/bsd.buildlink.mk" @@ -33,4 +33,4 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.libao} pre-configure: ${BUILDLINK_TARGETS.libao} libao-buildlink: _BUILDLINK_USE -.endif # LIGAO_BUILDLINK_MK +.endif # LIBAO_BUILDLINK_MK diff --git a/audio/mad/buildlink.mk b/audio/mad/buildlink.mk new file mode 100644 index 00000000000..8222bae9fab --- /dev/null +++ b/audio/mad/buildlink.mk @@ -0,0 +1,39 @@ +# $NetBSD: buildlink.mk,v 1.1.2.2 2002/06/23 18:38:26 jlam Exp $ +# +# This Makefile fragment is included by packages that use mad. +# +# To use this Makefile fragment, simply: +# +# (1) Optionally define BUILDLINK_DEPENDS.mad to the dependency pattern +# for the version of mad desired. +# (2) Include this Makefile fragment in the package Makefile, +# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header +# search path, and +# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search +# path. + +.if !defined(MAD_BUILDLINK_MK) +MAD_BUILDLINK_MK= # defined + +.include "../../mk/bsd.buildlink.mk" + +BUILDLINK_DEPENDS.mad?= mad>=0.14.2b +DEPENDS+= ${BUILDLINK_DEPENDS.mad}:../../audio/mad + +BUILDLINK_PREFIX.mad= ${LOCALBASE} +BUILDLINK_FILES.mad= include/id3tag.h +BUILDLINK_FILES.mad+= include/mad.h +BUILDLINK_FILES.mad+= lib/libid3tag.* +BUILDLINK_FILES.mad+= lib/libmad.* + +#.include "../../audio/libaudiofile/buildlink.mk" +.include "../../audio/esound/buildlink.mk" +.include "../../devel/gettext-lib/buildlink.mk" + +BUILDLINK_TARGETS.mad= mad-buildlink +BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.mad} + +pre-configure: ${BUILDLINK_TARGETS.mad} +mad-buildlink: _BUILDLINK_USE + +.endif # MAD_BUILDLINK_MK diff --git a/audio/mp3_check/Makefile b/audio/mp3_check/Makefile index 7520d34a670..a924e2370a5 100644 --- a/audio/mp3_check/Makefile +++ b/audio/mp3_check/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2002/01/21 11:34:56 wiz Exp $ +# $NetBSD: Makefile,v 1.2.2.1 2002/06/23 18:38:27 jlam Exp $ # DISTNAME= mp3_check-1.98 CATEGORIES= audio -MASTER_SITES= http://prdownloads.sourceforge.net/mp3check/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mp3check/} MAINTAINER= packages@netbsd.org HOMEPAGE= http://mp3check.sourceforge.net/ diff --git a/audio/mpegaudio/DESCR b/audio/mpegaudio/DESCR new file mode 100644 index 00000000000..63783832e10 --- /dev/null +++ b/audio/mpegaudio/DESCR @@ -0,0 +1 @@ +mpegaudio is an MPEG/audio Layer 1 and Layer 2 software package. diff --git a/audio/mpegaudio/Makefile b/audio/mpegaudio/Makefile new file mode 100644 index 00000000000..178788c21af --- /dev/null +++ b/audio/mpegaudio/Makefile @@ -0,0 +1,16 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:38:29 jlam Exp $ + +DISTNAME= mpegaudio +PKGNAME= mpegaudio-3.9 +CATEGORIES= audio +MASTER_SITES= ftp://ftp.ise.fhg.de/pub/graphics/mpeg/ +EXTRACT_SUFX= .tar.Z + +MAINTAINER= packages@netbsd.org +COMMENT= MPEG/audio Layer 1 and Layer 2 encoder/decoder package + +post-install: + ${INSTALL_MAN} ${FILESDIR}/mpeg_musicin.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${FILESDIR}/mpeg_musicout.1 ${PREFIX}/man/man1 + +.include "../../mk/bsd.pkg.mk" diff --git a/audio/mpegaudio/PLIST b/audio/mpegaudio/PLIST new file mode 100644 index 00000000000..354ce0622f6 --- /dev/null +++ b/audio/mpegaudio/PLIST @@ -0,0 +1,28 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.48.2 2002/06/23 18:38:29 jlam Exp $ +bin/mpeg_musicin +bin/mpeg_musicout +lib/mpegaudio/tables/1cb0 +lib/mpegaudio/tables/1cb1 +lib/mpegaudio/tables/1cb2 +lib/mpegaudio/tables/1th0 +lib/mpegaudio/tables/1th1 +lib/mpegaudio/tables/1th2 +lib/mpegaudio/tables/2cb0 +lib/mpegaudio/tables/2cb1 +lib/mpegaudio/tables/2cb2 +lib/mpegaudio/tables/2th0 +lib/mpegaudio/tables/2th1 +lib/mpegaudio/tables/2th2 +lib/mpegaudio/tables/absthr_0 +lib/mpegaudio/tables/absthr_1 +lib/mpegaudio/tables/absthr_2 +lib/mpegaudio/tables/alloc_0 +lib/mpegaudio/tables/alloc_1 +lib/mpegaudio/tables/alloc_2 +lib/mpegaudio/tables/alloc_3 +lib/mpegaudio/tables/dewindow +lib/mpegaudio/tables/enwindow +man/man1/mpeg_musicin.1 +man/man1/mpeg_musicout.1 +@dirrm lib/mpegaudio/tables +@dirrm lib/mpegaudio diff --git a/audio/mpegaudio/distinfo b/audio/mpegaudio/distinfo new file mode 100644 index 00000000000..53bfd9e683e --- /dev/null +++ b/audio/mpegaudio/distinfo @@ -0,0 +1,8 @@ +$NetBSD: distinfo,v 1.1.1.1.12.2 2002/06/23 18:38:30 jlam Exp $ + +SHA1 (mpegaudio.tar.Z) = 75a801c4aff290b4e0c7cdb2b07991c630955fbf +Size (mpegaudio.tar.Z) = 144707 bytes +SHA1 (patch-aa) = 7b61fd9effe57086d2d2f669fd5b5235a8854e03 +SHA1 (patch-ab) = 67758b144d384aea66509e508e79112a052b8369 +SHA1 (patch-ac) = f6d43ceaf9640289c6cdf0ff8db6f2ca9bc02ca1 +SHA1 (patch-ad) = 1fb96e8132ae322f377184f119a0e519dee9f21d diff --git a/audio/mpegaudio/files/mpeg_musicin.1 b/audio/mpegaudio/files/mpeg_musicin.1 new file mode 100644 index 00000000000..70e00d405ad --- /dev/null +++ b/audio/mpegaudio/files/mpeg_musicin.1 @@ -0,0 +1,122 @@ +.\" Copyright (c) 1997 Andreas Klemm <andreas@FreeBSD.org>. Neuss. +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD: ports/audio/mpegaudio/files/mpeg_musicin.1,v 1.2 1999/08/29 10:56:51 peter Exp $ +.Dd August 17, 1997 +.Dt MPEG_MUSICIN 1 +.Os +.Sh NAME +.Nm mpeg_musicin +.Nd MPEG/audio Layer 1 and Layer 2 decoder +.Sh SYNOPSIS +.Nm mpeg_musicin +queries for all arguments, or +.br +.Nm mpeg_musicin +.Op Fl l Ar lay +.br +.Op Fl m Ar mode +.br +.Op Fl p Ar psy +.br +.Op Fl s Ar sfrq +.br +.Op Fl b Ar br +.br +.Op Fl d Ar emp +.br +.Op Fl c +.br +.Op Fl o +.br +.Op Fl e +.br +inputCM +.br +.Op Ar outBS +.br +.Sh DESCRIPTION +The encoder and decoder software are configured to output +the coded audio bitstreams as a string of hexadecimal ascii +characters. For greater compression efficiency, compile flag, +BS_FORMAT, in common.h can be switched to configure the bitstream +reading and writing routines to process raw binary bitstreams. +.br +The decoder program has a very crude implementation of bitstream +synchword detection. It may not be able to correctly decode valid +bitstreams which have false synchword patterns in the ancillary data +portion of the bitstream. +.Sh RESTRICTIONS +The software implements levels I and II and psychophysical auditory +models I and II as described in the ISO 3-11171 rev 1 standard. +There are future plans to implement level III. +.br +The input/output audio data may either be headerless raw 16 bit data +or alternatively an AIFF formatted file (Audio Interchange File Format) +with certain limitations. +.br +For more information on the AIFF format see the postscript file +/sgi/aiff-c.9.26.91.ps at the anonymous ftp site FTP.SGI.COM +(192.48.153.1). +.br +The AIFF formatted file is a convenient way for storing sampling rate +of the audio file. +.br +The encoder and decoder software are configured to output the coded +audio bitstreams as a string of hexadecimal ascii characters. +For greater compression efficiency, compile flag, BS_FORMAT, +in common.h can be switched to configure the bitstream reading +and writing routines to process raw binary bitstreams. +.br +This software has been run and verified on a large variety of +computers and operating systems. In particular UNIX, MS_DOS (with +MicroSoft C version 6), Macintosh, AIX Platform (RS6000) and Convex. +.Sh OPTIONS +.Bl -tag -width Ds +.It Sy -l lay +use layer <lay> coding (default: 2) +.It Sy -m mode +channel mode : s/d/j/m (default: s) +.It Sy -p psy +psychoacoustic model 1/2 (default: 2) +.It Sy -s sfrq +input smpl rate in kHz (default: 44.1) +.It Sy -b br +total bitrate in kbps (default: 384) +.It Sy -d emp +de-emphasis n/5/c (default: n) +.It Sy -c +mark as copyright +.It Sy -o +mark as original +.It Sy -e +add error protection +.It Sy inputPCM +input PCM sound file (standard or AIFF) +.It Sy outBS +output bit stream of encoded audio (dflt inName+.mpg) +.Sh SEE ALSO +.Xr mpeg_musicout 1 +.Sh HISTORY +Written by Andreas Klemm, August 17, 1997 diff --git a/audio/mpegaudio/files/mpeg_musicout.1 b/audio/mpegaudio/files/mpeg_musicout.1 new file mode 100644 index 00000000000..cba817497e6 --- /dev/null +++ b/audio/mpegaudio/files/mpeg_musicout.1 @@ -0,0 +1,94 @@ +.\" Copyright (c) 1997 Andreas Klemm <andreas@FreeBSD.org>. Neuss. +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD: ports/audio/mpegaudio/files/mpeg_musicout.1,v 1.2 1999/08/29 10:56:51 peter Exp $ +.Dd August 17, 1997 +.Dt MPEG_MUSICOUT 1 +.Os +.Sh NAME +.Nm mpeg_musicout +.Nd MPEG/audio Layer 1 and Layer 2 encoder +.Sh SYNOPSIS +.Nm mpeg_musicout +queries for all arguments, or +.br +.Nm mpeg_musicout +.Op Fl A +.br +.Op Fl s Ar sb +.br +inputBS +.br +.Op Ar outPCM +.br +.Sh DESCRIPTION +The encoder and decoder software are configured to output +the coded audio bitstreams as a string of hexadecimal ascii +characters. For greater compression efficiency, compile flag, +BS_FORMAT, in common.h can be switched to configure the bitstream +reading and writing routines to process raw binary bitstreams. +.br +The decoder program has a very crude implementation of bitstream +synchword detection. It may not be able to correctly decode valid +bitstreams which have false synchword patterns in the ancillary data +portion of the bitstream. +.Sh RESTRICTIONS +The software implements levels I and II and psychophysical auditory +models I and II as described in the ISO 3-11171 rev 1 standard. +There are future plans to implement level III. +.br +The input/output audio data may either be headerless raw 16 bit data +or alternatively an AIFF formatted file (Audio Interchange File Format) +with certain limitations. +.br +For more information on the AIFF format see the postscript file +/sgi/aiff-c.9.26.91.ps at the anonymous ftp site FTP.SGI.COM +(192.48.153.1). +.br +The AIFF formatted file is a convenient way for storing sampling rate +of the audio file. +.br +The encoder and decoder software are configured to output the coded +audio bitstreams as a string of hexadecimal ascii characters. +For greater compression efficiency, compile flag, BS_FORMAT, +in common.h can be switched to configure the bitstream reading +and writing routines to process raw binary bitstreams. +.br +This software has been run and verified on a large variety of +computers and operating systems. In particular UNIX, MS_DOS (with +MicroSoft C version 6), Macintosh, AIX Platform (RS6000) and Convex. +.Sh OPTIONS +.Bl -tag -width Ds +.It Sy -A +write an AIFF output PCM sound file +.It Sy -s sb +resynth only up to this sb (debugging only) +.It Sy inputBS +input bit stream of encoded audio +.It Sy outPCM +output PCM sound file (dflt inName+.dec) +.Sh SEE ALSO +.Xr mpeg_musicin 1 +.Sh HISTORY +Written by Andreas Klemm, August 17, 1997 diff --git a/audio/mpegaudio/patches/patch-aa b/audio/mpegaudio/patches/patch-aa new file mode 100644 index 00000000000..f2b229a60c6 --- /dev/null +++ b/audio/mpegaudio/patches/patch-aa @@ -0,0 +1,30 @@ +$NetBSD: patch-aa,v 1.1.1.1.48.2 2002/06/23 18:38:34 jlam Exp $ + +--- Makefile.orig Wed Jan 5 02:47:50 1994 ++++ Makefile +@@ -1,10 +1,21 @@ + ALL : musicin musicout + +-CFLAGS = -O2 +-LDFLAGS= ++CFLAGS += -DPREFIX=\"${PREFIX}\" ++ ++all: musicin musicout + + musicin: musicin.o common.o encode.o subs.o psy.o tonal.o +- cc $(LDFLAGS) -o musicin musicin.o common.o encode.o subs.o psy.o tonal.o -lm ++ ${CC} -o musicin musicin.o common.o encode.o subs.o psy.o tonal.o -lm + + musicout: musicout.o common.o decode.o subs.o +- cc $(LDFLAGS) musicout.o common.o decode.o subs.o -o musicout -lm ++ ${CC} musicout.o common.o decode.o subs.o -o musicout -lm ++ ++clean: ++ rm -f *.core *.o musicin musicout ++ ++install: ++ ${BSD_INSTALL_PROGRAM} musicin ${PREFIX}/bin/mpeg_musicin ++ ${BSD_INSTALL_PROGRAM} musicout ${PREFIX}/bin/mpeg_musicout ++ ${BSD_INSTALL_DATA_DIR} ${PREFIX}/lib/mpegaudio/tables ++ ${BSD_INSTALL_DATA} tables/* ${PREFIX}/lib/mpegaudio/tables/ ++ diff --git a/audio/mpegaudio/patches/patch-ab b/audio/mpegaudio/patches/patch-ab new file mode 100644 index 00000000000..08d08aa69ae --- /dev/null +++ b/audio/mpegaudio/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1.1.1.48.2 2002/06/23 18:38:35 jlam Exp $ + +--- common.h.orig Wed Jan 5 02:42:00 1994 ++++ common.h +@@ -73,7 +73,7 @@ + #endif + + #ifdef UNIX +-#define TABLES_PATH "tables" /* to find data files */ ++#define TABLES_PATH PREFIX "/lib/mpegaudio/tables" /* to find data files */ + /* name of environment variable holding path of table files */ + #define MPEGTABENV "MPEGTABLES" + #define PATH_SEPARATOR "/" /* how to build paths */ diff --git a/audio/mpegaudio/patches/patch-ac b/audio/mpegaudio/patches/patch-ac new file mode 100644 index 00000000000..9d634ed4f87 --- /dev/null +++ b/audio/mpegaudio/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1.1.1.22.2 2002/06/23 18:38:35 jlam Exp $ + +--- musicin.c.orig Wed Jan 5 02:13:44 1994 ++++ musicin.c +@@ -101,6 +101,8 @@ + #include "common.h" + #include "encoder.h" + ++#include <stdlib.h> ++ + /* Global variable definitions for "musicin.c" */ + + FILE *musicin; diff --git a/audio/mpegaudio/patches/patch-ad b/audio/mpegaudio/patches/patch-ad new file mode 100644 index 00000000000..598e7021320 --- /dev/null +++ b/audio/mpegaudio/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1.1.1.22.2 2002/06/23 18:38:36 jlam Exp $ + +--- musicout.c.orig Wed Jan 5 05:39:27 1994 ++++ musicout.c +@@ -58,6 +58,8 @@ + #include "common.h" + #include "decoder.h" + ++#include <stdlib.h> ++ + /******************************************************************** + /* + /* This part contains the MPEG I decoder for Layers I & II. diff --git a/audio/mpg123-esound/DESCR b/audio/mpg123-esound/DESCR new file mode 100644 index 00000000000..23e1d559a36 --- /dev/null +++ b/audio/mpg123-esound/DESCR @@ -0,0 +1,4 @@ +mpg123-esound reads one or more files (or standard input if +``-'' is specified) or URLs and plays them on the EsounD +(default) or outputs them to stdout. file/URL is assumed to be +an MPEG-1/2 audio bit stream. diff --git a/audio/mpg123-esound/Makefile b/audio/mpg123-esound/Makefile new file mode 100644 index 00000000000..68258b04c4e --- /dev/null +++ b/audio/mpg123-esound/Makefile @@ -0,0 +1,66 @@ +# $NetBSD: Makefile,v 1.2.2.2 2002/06/23 18:38:39 jlam Exp $ + +DISTNAME= mpg123-0.59r +PKGNAME= mpg123-esound-0.59.18 +CATEGORIES= audio +MASTER_SITES= http://www.mpg123.de/mpg123/ \ + http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/ + +PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ +PATCHFILES= mpg123-059r-v6-20000713b.diff.gz + +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://www.mpg123.de/ +COMMENT= Command-line player for mpeg layer 1, 2 and 3 audio with EsounD + +BUILD_DEFS+= USE_INET6 +DIST_SUBDIR= mpg123 + +PATCHDIR= ../mpg123/patches +FILESDIR= ../mpg123/files + +USE_BUILDLINK_ONLY= # defined + +# for OBJECT_FMT +.include "../../mk/bsd.prefs.mk" + +.if (${MACHINE_ARCH} == "i386") +.if (${OBJECT_FMT} == "ELF") +ALL_TARGET= netbsd-i386-elf-esd +.else +ALL_TARGET= netbsd-i386-esd +.endif +.elif (${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32") +ALL_TARGET= netbsd-arm-esd +.elif (${MACHINE_ARCH} == "m68k") +ALL_TARGET= netbsd-m68k-esd +.else +ALL_TARGET= ${LOWER_OPSYS}-esd +.endif + +.if ${OPSYS} == "SunOS" +ALL_TARGET= solaris-gcc-esd +.endif + +.if defined(USE_INET6) && ${USE_INET6} == "YES" +CPPFLAGS+= -DINET6 +.endif + +MAKE_FLAGS+= PREFIX="${PREFIX}" + +pre-patch: + ${LN} -s . ${WRKSRC}/mpg123 + +post-patch: + ${RM} -f ${WRKSRC}/mpg123 + ${CP} ${FILESDIR}/decode_i586_.s ${WRKSRC}/ + cd ${WRKSRC} ; ${MV} decode_i586.s decode_i586.s.orig ;\ + ${SED} \ + -e 's@^/@#/@g' \ + <decode_i586.s.orig >decode_i586.s + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/mpg123 ${PREFIX}/bin/mpg123-esound + +.include "../esound/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/audio/mpg123-esound/PLIST b/audio/mpg123-esound/PLIST new file mode 100644 index 00000000000..7cdbbf93a3e --- /dev/null +++ b/audio/mpg123-esound/PLIST @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST,v 1.1.2.2 2002/06/23 18:38:40 jlam Exp $ +bin/mpg123-esound diff --git a/audio/mpg123-esound/distinfo b/audio/mpg123-esound/distinfo new file mode 100644 index 00000000000..b808890ed6e --- /dev/null +++ b/audio/mpg123-esound/distinfo @@ -0,0 +1,21 @@ +$NetBSD: distinfo,v 1.4.2.2 2002/06/23 18:38:41 jlam Exp $ + +SHA1 (mpg123/mpg123-0.59r.tar.gz) = c32fe242f4506d218bd19a51a4034da9fdc79493 +Size (mpg123/mpg123-0.59r.tar.gz) = 159028 bytes +SHA1 (mpg123/mpg123-059r-v6-20000713b.diff.gz) = fab11489b6a1ab79d6c29787161f1c05e492dc0b +Size (mpg123/mpg123-059r-v6-20000713b.diff.gz) = 5600 bytes +SHA1 (patch-aa) = 5f5310e52c8a7b17bc675d6d3b21ea629f644b40 +SHA1 (patch-ab) = ffc387d93f0f2832e49796c80be26e908defa3a7 +SHA1 (patch-ac) = 06a5037e27ddd4cc34e5348c09e702f9740173c5 +SHA1 (patch-ad) = e9b2b874a95a67139c7d48e74492eb64dfa815f0 +SHA1 (patch-ae) = 9ac13c978bdf498cbd5e9fa0777a51559fdb2403 +SHA1 (patch-af) = 309075bc6fd4b689b711f0ae84f2e5c829609452 +SHA1 (patch-ag) = c27b6a441573939dc23268a6937905d038d6a66b +SHA1 (patch-ah) = e1419bc6d25360d0825041028b6b3f485bcf5f43 +SHA1 (patch-ai) = 021c5bb2baa56327d486bf134b537ac5c6aa8fba +SHA1 (patch-aj) = 910b2834c34e617c492a3c72e4d2185d3eb53ecc +SHA1 (patch-ak) = b30898cff26859eca0d23ea8cfdd461920b978a8 +SHA1 (patch-al) = 88dec640d40e6a3f1828096a4ff7b5a4dbd0a222 +SHA1 (patch-am) = 661c1f95f65145f4e08706eb3f6fe975118a2822 +SHA1 (patch-an) = 08917e1825adcfd870bb2c61ae865339da7c45ef +SHA1 (patch-ao) = 40961a43cc3dbebf71deee1c240907896d297304 diff --git a/audio/mpg123-nas/DESCR b/audio/mpg123-nas/DESCR new file mode 100644 index 00000000000..7a9eb80829d --- /dev/null +++ b/audio/mpg123-nas/DESCR @@ -0,0 +1,6 @@ +mpg123 reads one or more files (or standard input if ``-'' is +specified) or URLs and plays them to the NAS device (default) or +outputs them to a specified file or to stdout. + +File(s) and/or URL contents are assumed to be MPEG-1.0/2.0 audio +layer 1, 2, or 3 bit streams. diff --git a/audio/mpg123-nas/Makefile b/audio/mpg123-nas/Makefile new file mode 100644 index 00000000000..3f6fe79a5ef --- /dev/null +++ b/audio/mpg123-nas/Makefile @@ -0,0 +1,66 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:38:42 jlam Exp $ +# + +DISTNAME= mpg123-0.59r +PKGNAME= mpg123-nas-0.59.18 +CATEGORIES= audio +MASTER_SITES= http://www.mpg123.de/mpg123/ \ + http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/ + +PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ \ + http://www.unix-ag.org/Linux-Alpha/Packages/ +PATCHFILES= mpg123-059r-v6-20000713b.diff.gz l3.diff.gz + +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://www.mpg123.de/ +COMMENT= Command-line player for mpeg layer 1, 2 and 3 audio with NAS output + +BUILD_DEFS+= USE_INET6 +DIST_SUBDIR= mpg123 +FILESDIR= ${.CURDIR}/../mpg123/files + +CONFLICTS+= mpg123-[0-9]* + +USE_X11BASE= # defined +USE_BUILDLINK_ONLY= # defined + +# for OBJECT_FMT +.include "../../mk/bsd.prefs.mk" + +.if (${MACHINE_ARCH} == "i386") +.if (${OBJECT_FMT} == "ELF") +ALL_TARGET= netbsd-i386-elf +.else +ALL_TARGET= netbsd-i386 +.endif +.elif (${MACHINE_ARCH} == "arm32") +ALL_TARGET= netbsd-arm32 +.elif (${MACHINE_ARCH} == "m68k") +ALL_TARGET= netbsd-m68k +.else +ALL_TARGET= ${LOWER_OPSYS} +.endif + +.if ${OPSYS} == "SunOS" +ALL_TARGET= solaris-gcc +.endif + +.if defined(USE_INET6) && ${USE_INET6} == "YES" +CPPFLAGS+= -DINET6 +.endif + +MAKE_FLAGS+= PREFIX="${PREFIX}" + +pre-patch: + ${LN} -s . ${WRKSRC}/mpg123 + +post-patch: + ${RM} -f ${WRKSRC}/mpg123 + ${CP} ${FILESDIR}/decode_i586_.s ${WRKSRC}/ + cd ${WRKSRC} ; ${MV} decode_i586.s decode_i586.s.orig ;\ + ${SED} \ + -e 's@^/@#/@g' \ + <decode_i586.s.orig >decode_i586.s + +.include "../../audio/nas/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/audio/mpg123-nas/PLIST b/audio/mpg123-nas/PLIST new file mode 100644 index 00000000000..e15419b9c38 --- /dev/null +++ b/audio/mpg123-nas/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.50.2 2002/06/23 18:38:43 jlam Exp $ +bin/mpg123 +man/man1/mpg123.1 diff --git a/audio/mpg123-nas/distinfo b/audio/mpg123-nas/distinfo new file mode 100644 index 00000000000..9f3ec873d40 --- /dev/null +++ b/audio/mpg123-nas/distinfo @@ -0,0 +1,20 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:38:44 jlam Exp $ + +SHA1 (mpg123/mpg123-0.59r.tar.gz) = c32fe242f4506d218bd19a51a4034da9fdc79493 +Size (mpg123/mpg123-0.59r.tar.gz) = 159028 bytes +SHA1 (mpg123/mpg123-059r-v6-20000713b.diff.gz) = fab11489b6a1ab79d6c29787161f1c05e492dc0b +Size (mpg123/mpg123-059r-v6-20000713b.diff.gz) = 5600 bytes +SHA1 (mpg123/l3.diff.gz) = 657c83289c565a246275dcab378f9c9acf5f9f9e +Size (mpg123/l3.diff.gz) = 689 bytes +SHA1 (patch-aa) = 1c9cdf05eeba7c0e10dc720e27de6c5b0e818322 +SHA1 (patch-ab) = ffc387d93f0f2832e49796c80be26e908defa3a7 +SHA1 (patch-ac) = 06a5037e27ddd4cc34e5348c09e702f9740173c5 +SHA1 (patch-ad) = e9b2b874a95a67139c7d48e74492eb64dfa815f0 +SHA1 (patch-ae) = 9ac13c978bdf498cbd5e9fa0777a51559fdb2403 +SHA1 (patch-af) = 309075bc6fd4b689b711f0ae84f2e5c829609452 +SHA1 (patch-ag) = c27b6a441573939dc23268a6937905d038d6a66b +SHA1 (patch-ah) = e1419bc6d25360d0825041028b6b3f485bcf5f43 +SHA1 (patch-ai) = da0d329fd6cd039db27cffcc1063144e1e56943f +SHA1 (patch-aj) = 910b2834c34e617c492a3c72e4d2185d3eb53ecc +SHA1 (patch-ak) = b30898cff26859eca0d23ea8cfdd461920b978a8 +SHA1 (patch-al) = 88dec640d40e6a3f1828096a4ff7b5a4dbd0a222 diff --git a/audio/mpg123-nas/patches/patch-aa b/audio/mpg123-nas/patches/patch-aa new file mode 100644 index 00000000000..918aa78c705 --- /dev/null +++ b/audio/mpg123-nas/patches/patch-aa @@ -0,0 +1,74 @@ +$NetBSD: patch-aa,v 1.1.1.1.2.2 2002/06/23 18:38:45 jlam Exp $ + +--- Makefile.orig Mon Feb 26 10:58:56 2001 ++++ Makefile +@@ -54,6 +54,10 @@ + @echo "make aix-tk3play IBM AIX" + @echo "make os2 IBM OS/2" + @echo "make netbsd NetBSD" ++ @echo "make netbsd-arm32 NetBSD for strongarm" ++ @echo "make netbsd-i386 NetBSD optimized for i386" ++ @echo "make netbsd-i386-elf NetBSD optimized for i386, ELF format" ++ @echo "make netbsd-m68k NetBSD optimized for m68k" + @echo "make bsdos BSDI BSD/OS" + @echo "make bsdos4 BSDI BSD/OS 4.0" + @echo "make bsdos-nas BSDI BSD/OS with NAS support" +@@ -377,6 +381,34 @@ + -funroll-all-loops -finline-functions' \ + mpg123-make + ++netbsd-i386-elf: ++ $(MAKE) CC=cc AUDIO_LIB='-laudio -lXt' \ ++ OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \ ++ audio_nas.o term.o' \ ++ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ ++ -funroll-all-loops -ffast-math -DROT_I386 \ ++ -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \ ++ -DREAD_MMAP -DNAS -DNETBSD -DTERM_CONTROL' \ ++ mpg123-make ++ ++netbsd-m68k: ++ $(MAKE) CC=cc AUDIO_LIB='-laudio -lXt' \ ++ OBJECTS='decode.o dct64.o audio_nas.o term.o' \ ++ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \ ++ -ffast-math -DREAL_IS_FLOAT \ ++ -DUSE_MMAP -DNAS -DNETBSD -DM68K_ASSEM -DTERM_CONTROL' \ ++ mpg123-make ++ ++netbsd-arm32: ++ $(MAKE) CC=cc AUDIO_LIB='-laudio -lXt' \ ++ OBJECTS='decode.o dct64.o audio_nas.o term.o' \ ++ CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \ ++ -funroll-all-loops -finline-functions -ffast-math \ ++ -march=armv4 -mtune=strongarm -mcpu=strongarm \ ++ -DREAL_IS_FIXED -DUSE_MMAP -DREAD_MMAP -DTERM_CONTROL \ ++ -DNAS -DNETBSD' \ ++ mpg123-make ++ + solaris-gcc-esd: + $(MAKE) CC=gcc LDFLAGS='-lsocket -lnsl' \ + AUDIO_LIB='-lesd -lresolv' \ +@@ -496,18 +528,18 @@ + + netbsd: + $(MAKE) CC=cc LDFLAGS= \ +- OBJECTS='decode.o dct64.o audio_sun.o' \ ++ OBJECTS='decode.o dct64.o audio_nas.o term.o' AUDIO_LIB='-laudio -lXt' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math \ +- -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ ++ -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNAS -DNETBSD' \ + mpg123-make + + netbsd-i386: + $(MAKE) CC=cc LDFLAGS= \ +- OBJECTS='decode_i386.o dct64_i386.o audio_sun.o' \ +- CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \ ++ OBJECTS='decode_i386.o dct64_i386.o audio_nas.o term.o' AUDIO_LIB='-laudio -lXt' \ ++ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math -DROT_I386 \ +- -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ ++ -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNAS -DNETBSD' \ + mpg123-make + + bsdos: diff --git a/audio/mpg123-nas/patches/patch-ab b/audio/mpg123-nas/patches/patch-ab new file mode 100644 index 00000000000..4186688ac7e --- /dev/null +++ b/audio/mpg123-nas/patches/patch-ab @@ -0,0 +1,23 @@ +$NetBSD: patch-ab,v 1.1.1.1.2.2 2002/06/23 18:38:46 jlam Exp $ + +--- mpg123.c.orig Tue Jun 15 22:21:36 1999 ++++ mpg123.c Sun Jul 18 21:20:19 1999 +@@ -177,6 +177,9 @@ + _exit(0); + default: /* parent */ + xfermem_init_writer (buffermem); ++ if (xfermem_block(XF_WRITER, buffermem) == XF_CMD_TERMINATE) { ++ intflag = TRUE; ++ } + param.outmode = DECODE_BUFFER; + } + } +@@ -918,7 +921,7 @@ + { + const char *term_type; + term_type = getenv("TERM"); +- if (!strcmp(term_type,"xterm")) ++ if (term_type && !strcmp(term_type,"xterm")) + { + fprintf(stderr, "\033]0;%s\007", filename); + } diff --git a/audio/mpg123-nas/patches/patch-ac b/audio/mpg123-nas/patches/patch-ac new file mode 100644 index 00000000000..ef634c769c6 --- /dev/null +++ b/audio/mpg123-nas/patches/patch-ac @@ -0,0 +1,31 @@ +$NetBSD: patch-ac,v 1.1.1.1.2.2 2002/06/23 18:38:47 jlam Exp $ + +--- audio_sun.c.orig Thu Feb 4 13:22:34 1999 ++++ audio_sun.c Mon Sep 27 09:17:00 1999 +@@ -17,6 +17,8 @@ + + #include "mpg123.h" + ++extern int outburst; ++ + #ifndef SPARCLINUX + #include <sys/filio.h> + #ifdef SUNOS +@@ -78,6 +80,17 @@ + } + + #ifndef NETBSD ++ AUDIO_INITINFO(&ainfo); ++ if(ioctl(ai->fn, AUDIO_GETINFO, &ainfo) == -1) ++ return -1; ++#ifdef SOLARIS ++ outburst = MAXOUTBURST; ++#else ++ outburst = ainfo.blocksize; ++#endif ++ if(outburst > MAXOUTBURST) ++ outburst = MAXOUTBURST; ++ + AUDIO_INITINFO(&ainfo); + + if(ai->output > 0) diff --git a/audio/mpg123-nas/patches/patch-ad b/audio/mpg123-nas/patches/patch-ad new file mode 100644 index 00000000000..b904ea09be3 --- /dev/null +++ b/audio/mpg123-nas/patches/patch-ad @@ -0,0 +1,75 @@ +$NetBSD: patch-ad,v 1.1.1.1.2.2 2002/06/23 18:38:47 jlam Exp $ + +--- dct64.c.orig Sat Sep 20 21:16:04 1997 ++++ dct64.c Thu Aug 12 23:28:33 1999 +@@ -29,7 +29,7 @@ + for(i=15;i>=0;i--) + *bs++ = (*b1++ + *--b2); + for(i=15;i>=0;i--) +- *bs++ = (*--b2 - *b1++) * *--costab; ++ *bs++ = REAL_MUL((*--b2 - *b1++), *--costab); + + b1 = bufs; + costab = pnts[1]+8; +@@ -39,13 +39,13 @@ + for(i=7;i>=0;i--) + *bs++ = (*b1++ + *--b2); + for(i=7;i>=0;i--) +- *bs++ = (*--b2 - *b1++) * *--costab; ++ *bs++ = REAL_MUL((*--b2 - *b1++), *--costab); + b2 += 32; + costab += 8; + for(i=7;i>=0;i--) + *bs++ = (*b1++ + *--b2); + for(i=7;i>=0;i--) +- *bs++ = (*b1++ - *--b2) * *--costab; ++ *bs++ = REAL_MUL((*b1++ - *--b2), *--costab); + b2 += 32; + } + +@@ -58,12 +58,12 @@ + for(i=3;i>=0;i--) + *bs++ = (*b1++ + *--b2); + for(i=3;i>=0;i--) +- *bs++ = (*--b2 - *b1++) * costab[i]; ++ *bs++ = REAL_MUL((*--b2 - *b1++), costab[i]); + b2 += 16; + for(i=3;i>=0;i--) + *bs++ = (*b1++ + *--b2); + for(i=3;i>=0;i--) +- *bs++ = (*b1++ - *--b2) * costab[i]; ++ *bs++ = REAL_MUL((*b1++ - *--b2), costab[i]); + b2 += 16; + } + +@@ -75,13 +75,13 @@ + { + *bs++ = (*b1++ + *--b2); + *bs++ = (*b1++ + *--b2); +- *bs++ = (*--b2 - *b1++) * costab[1]; +- *bs++ = (*--b2 - *b1++) * costab[0]; ++ *bs++ = REAL_MUL((*--b2 - *b1++), costab[1]); ++ *bs++ = REAL_MUL((*--b2 - *b1++), costab[0]); + b2 += 8; + *bs++ = (*b1++ + *--b2); + *bs++ = (*b1++ + *--b2); +- *bs++ = (*b1++ - *--b2) * costab[1]; +- *bs++ = (*b1++ - *--b2) * costab[0]; ++ *bs++ = REAL_MUL((*b1++ - *--b2), costab[1]); ++ *bs++ = REAL_MUL((*b1++ - *--b2), costab[0]); + b2 += 8; + } + bs = bufs; +@@ -92,10 +92,10 @@ + real v0,v1; + v0=*b1++; v1 = *b1++; + *bs++ = (v0 + v1); +- *bs++ = (v0 - v1) * (*costab); ++ *bs++ = REAL_MUL((v0 - v1), (*costab)); + v0=*b1++; v1 = *b1++; + *bs++ = (v0 + v1); +- *bs++ = (v1 - v0) * (*costab); ++ *bs++ = REAL_MUL((v1 - v0), (*costab)); + } + + } diff --git a/audio/mpg123-nas/patches/patch-ae b/audio/mpg123-nas/patches/patch-ae new file mode 100644 index 00000000000..b893b92fc54 --- /dev/null +++ b/audio/mpg123-nas/patches/patch-ae @@ -0,0 +1,16 @@ +$NetBSD: patch-ae,v 1.1.1.1.2.2 2002/06/23 18:38:48 jlam Exp $ + +--- dct64_i486.c.orig Thu Nov 19 21:42:36 1998 ++++ dct64_i486.c Mon Aug 16 01:49:16 1999 +@@ -47,7 +47,11 @@ + #define SETOUT(out,n,expr) out[FIR_BUFFER_SIZE*(n)]=(expr) + #define MUL(a,b) (((a)*(b)) >> 15) + #define MULL(a,b) (((long long)(a)*(long long)(b)) >> 15) ++#ifdef REAL_IS_FIXED ++#define TOINT(a) ((a) * 32768 / (int)REAL_FACTOR) ++#else + #define TOINT(a) ((int)((a)*32768.0)) ++#endif + + void dct64_1_486(int *out0,int *out1,int *b1,int *b2) + { diff --git a/audio/mpg123-nas/patches/patch-af b/audio/mpg123-nas/patches/patch-af new file mode 100644 index 00000000000..a6377375a0a --- /dev/null +++ b/audio/mpg123-nas/patches/patch-af @@ -0,0 +1,19 @@ +$NetBSD: patch-af,v 1.1.1.1.2.2 2002/06/23 18:38:49 jlam Exp $ + +--- audio.c.orig Mon Nov 23 08:16:24 1998 ++++ audio.c Wed Apr 7 16:23:29 1999 +@@ -81,10 +81,14 @@ + k1 = NUM_RATES; + } + ++#ifndef NETBSD + if(audio_open(&ai1) < 0) { + perror("audio"); + exit(1); + } ++#else ++ audio_open(&ai1); ++#endif + + for(i=0;i<NUM_CHANNELS;i++) { + for(j=0;j<NUM_RATES;j++) { diff --git a/audio/mpg123-nas/patches/patch-ag b/audio/mpg123-nas/patches/patch-ag new file mode 100644 index 00000000000..90b01d17d91 --- /dev/null +++ b/audio/mpg123-nas/patches/patch-ag @@ -0,0 +1,123 @@ +$NetBSD: patch-ag,v 1.1.1.1.2.2 2002/06/23 18:38:50 jlam Exp $ + +--- decode.c.orig Tue Jan 26 23:47:05 1999 ++++ decode.c Tue Oct 12 01:19:18 1999 +@@ -13,9 +13,9 @@ + #include "mpg123.h" + + #define WRITE_SAMPLE(samples,sum,clip) \ +- if( (sum) > 32767.0) { *(samples) = 0x7fff; (clip)++; } \ +- else if( (sum) < -32768.0) { *(samples) = -0x8000; (clip)++; } \ +- else { *(samples) = sum; } ++ if( (sum) > REAL_PLUS_32767) { *(samples) = 0x7fff; (clip)++; } \ ++ else if( (sum) < REAL_MINUS_32768) { *(samples) = -0x8000; (clip)++; } \ ++ else { *(samples) = REAL_TO_SHORT(sum); } + + int synth_1to1_8bit(real *bandPtr,int channel,unsigned char *samples,int *pnt) + { +@@ -156,36 +156,36 @@ + for (j=16;j;j--,window+=0x10,samples+=step) + { + real sum; +- sum = *window++ * *b0++; +- sum -= *window++ * *b0++; +- sum += *window++ * *b0++; +- sum -= *window++ * *b0++; +- sum += *window++ * *b0++; +- sum -= *window++ * *b0++; +- sum += *window++ * *b0++; +- sum -= *window++ * *b0++; +- sum += *window++ * *b0++; +- sum -= *window++ * *b0++; +- sum += *window++ * *b0++; +- sum -= *window++ * *b0++; +- sum += *window++ * *b0++; +- sum -= *window++ * *b0++; +- sum += *window++ * *b0++; +- sum -= *window++ * *b0++; ++ sum = REAL_MUL(*window++, *b0++); ++ sum -= REAL_MUL(*window++, *b0++); ++ sum += REAL_MUL(*window++, *b0++); ++ sum -= REAL_MUL(*window++, *b0++); ++ sum += REAL_MUL(*window++, *b0++); ++ sum -= REAL_MUL(*window++, *b0++); ++ sum += REAL_MUL(*window++, *b0++); ++ sum -= REAL_MUL(*window++, *b0++); ++ sum += REAL_MUL(*window++, *b0++); ++ sum -= REAL_MUL(*window++, *b0++); ++ sum += REAL_MUL(*window++, *b0++); ++ sum -= REAL_MUL(*window++, *b0++); ++ sum += REAL_MUL(*window++, *b0++); ++ sum -= REAL_MUL(*window++, *b0++); ++ sum += REAL_MUL(*window++, *b0++); ++ sum -= REAL_MUL(*window++, *b0++); + + WRITE_SAMPLE(samples,sum,clip); + } + + { + real sum; +- sum = window[0x0] * b0[0x0]; +- sum += window[0x2] * b0[0x2]; +- sum += window[0x4] * b0[0x4]; +- sum += window[0x6] * b0[0x6]; +- sum += window[0x8] * b0[0x8]; +- sum += window[0xA] * b0[0xA]; +- sum += window[0xC] * b0[0xC]; +- sum += window[0xE] * b0[0xE]; ++ sum = REAL_MUL(window[0x0], b0[0x0]); ++ sum += REAL_MUL(window[0x2], b0[0x2]); ++ sum += REAL_MUL(window[0x4], b0[0x4]); ++ sum += REAL_MUL(window[0x6], b0[0x6]); ++ sum += REAL_MUL(window[0x8], b0[0x8]); ++ sum += REAL_MUL(window[0xA], b0[0xA]); ++ sum += REAL_MUL(window[0xC], b0[0xC]); ++ sum += REAL_MUL(window[0xE], b0[0xE]); + WRITE_SAMPLE(samples,sum,clip); + b0-=0x10,window-=0x20,samples+=step; + } +@@ -194,22 +194,22 @@ + for (j=15;j;j--,b0-=0x20,window-=0x10,samples+=step) + { + real sum; +- sum = -*(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; +- sum -= *(--window) * *b0++; ++ sum = -REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); ++ sum -= REAL_MUL(*(--window), *b0++); + + WRITE_SAMPLE(samples,sum,clip); + } +@@ -219,5 +219,3 @@ + + return clip; + } +- +- diff --git a/audio/mpg123-nas/patches/patch-ah b/audio/mpg123-nas/patches/patch-ah new file mode 100644 index 00000000000..86dc9d7f754 --- /dev/null +++ b/audio/mpg123-nas/patches/patch-ah @@ -0,0 +1,22 @@ +$NetBSD: patch-ah,v 1.1.1.1.2.2 2002/06/23 18:38:50 jlam Exp $ + +--- equalizer.c.orig Tue Feb 2 03:47:35 1999 ++++ equalizer.c Mon Aug 16 02:08:31 1999 +@@ -13,7 +13,7 @@ + + if(equalfile) { + for(i=0;i<32;i++) +- bandPtr[i] *= equalizer[channel][i]; ++ bandPtr[i] = REAL_MUL(bandPtr[i], equalizer[channel][i]); + } + + /* if(param.equalizer & 0x2) { +@@ -28,7 +28,7 @@ + { + int i; + for(i=0;i<576;i++) { +- bandPtr[i] *= equalizerband[channel][i]; ++ bandPtr[i] = REAL_MUL(bandPtr[i], equalizerband[channel][i]); + } + } + diff --git a/audio/mpg123-nas/patches/patch-ai b/audio/mpg123-nas/patches/patch-ai new file mode 100644 index 00000000000..e0535f9a92a --- /dev/null +++ b/audio/mpg123-nas/patches/patch-ai @@ -0,0 +1,780 @@ +$NetBSD: patch-ai,v 1.1.1.1.2.2 2002/06/23 18:38:51 jlam Exp $ + +--- layer3.c.orig Thu Apr 22 01:25:18 1999 ++++ layer3.c Mon Aug 16 02:02:01 1999 +@@ -109,54 +109,54 @@ + int i,j,k,l; + + for(i=-256;i<118+4;i++) +- gainpow2[i+256] = pow((double)2.0,-0.25 * (double) (i+210) ); ++ gainpow2[i+256] = DOUBLE_TO_REAL(pow((double)2.0,-0.25 * (double) (i+210) )); + + for(i=0;i<8207;i++) +- ispow[i] = pow((double)i,(double)4.0/3.0); ++ ispow[i] = DOUBLE_TO_REAL(pow((double)i,(double)4.0/3.0)); + + for (i=0;i<8;i++) { + static double Ci[8]={-0.6,-0.535,-0.33,-0.185,-0.095,-0.041,-0.0142,-0.0037}; + double sq=sqrt(1.0+Ci[i]*Ci[i]); +- aa_cs[i] = 1.0/sq; +- aa_ca[i] = Ci[i]/sq; ++ aa_cs[i] = DOUBLE_TO_REAL(1.0/sq); ++ aa_ca[i] = DOUBLE_TO_REAL(Ci[i]/sq); + } + + for(i=0;i<18;i++) { +- win[0][i] = win[1][i] = 0.5 * sin( M_PI / 72.0 * (double) (2*(i+0) +1) ) / cos ( M_PI * (double) (2*(i+0) +19) / 72.0 ); +- win[0][i+18] = win[3][i+18] = 0.5 * sin( M_PI / 72.0 * (double) (2*(i+18)+1) ) / cos ( M_PI * (double) (2*(i+18)+19) / 72.0 ); ++ win[0][i] = win[1][i] = DOUBLE_TO_REAL(0.5 * sin( M_PI / 72.0 * (double) (2*(i+0) +1) ) / cos ( M_PI * (double) (2*(i+0) +19) / 72.0 )); ++ win[0][i+18] = win[3][i+18] = DOUBLE_TO_REAL(0.5 * sin( M_PI / 72.0 * (double) (2*(i+18)+1) ) / cos ( M_PI * (double) (2*(i+18)+19) / 72.0 )); + } + for(i=0;i<6;i++) { +- win[1][i+18] = 0.5 / cos ( M_PI * (double) (2*(i+18)+19) / 72.0 ); +- win[3][i+12] = 0.5 / cos ( M_PI * (double) (2*(i+12)+19) / 72.0 ); +- win[1][i+24] = 0.5 * sin( M_PI / 24.0 * (double) (2*i+13) ) / cos ( M_PI * (double) (2*(i+24)+19) / 72.0 ); +- win[1][i+30] = win[3][i] = 0.0; +- win[3][i+6 ] = 0.5 * sin( M_PI / 24.0 * (double) (2*i+1) ) / cos ( M_PI * (double) (2*(i+6 )+19) / 72.0 ); ++ win[1][i+18] = DOUBLE_TO_REAL(0.5 / cos ( M_PI * (double) (2*(i+18)+19) / 72.0 )); ++ win[3][i+12] = DOUBLE_TO_REAL(0.5 / cos ( M_PI * (double) (2*(i+12)+19) / 72.0 )); ++ win[1][i+24] = DOUBLE_TO_REAL(0.5 * sin( M_PI / 24.0 * (double) (2*i+13) ) / cos ( M_PI * (double) (2*(i+24)+19) / 72.0 )); ++ win[1][i+30] = win[3][i] = DOUBLE_TO_REAL(0.0); ++ win[3][i+6 ] = DOUBLE_TO_REAL(0.5 * sin( M_PI / 24.0 * (double) (2*i+1) ) / cos ( M_PI * (double) (2*(i+6 )+19) / 72.0 )); + } + + for(i=0;i<9;i++) +- COS9[i] = cos( M_PI / 18.0 * (double) i); ++ COS9[i] = DOUBLE_TO_REAL(cos( M_PI / 18.0 * (double) i)); + + for(i=0;i<9;i++) +- tfcos36[i] = 0.5 / cos ( M_PI * (double) (i*2+1) / 36.0 ); ++ tfcos36[i] = DOUBLE_TO_REAL(0.5 / cos ( M_PI * (double) (i*2+1) / 36.0 )); + for(i=0;i<3;i++) +- tfcos12[i] = 0.5 / cos ( M_PI * (double) (i*2+1) / 12.0 ); ++ tfcos12[i] = DOUBLE_TO_REAL(0.5 / cos ( M_PI * (double) (i*2+1) / 12.0 )); + +- COS6_1 = cos( M_PI / 6.0 * (double) 1); +- COS6_2 = cos( M_PI / 6.0 * (double) 2); ++ COS6_1 = DOUBLE_TO_REAL(cos( M_PI / 6.0 * (double) 1)); ++ COS6_2 = DOUBLE_TO_REAL(cos( M_PI / 6.0 * (double) 2)); + + #ifdef NEW_DCT9 +- cos9[0] = cos(1.0*M_PI/9.0); +- cos9[1] = cos(5.0*M_PI/9.0); +- cos9[2] = cos(7.0*M_PI/9.0); +- cos18[0] = cos(1.0*M_PI/18.0); +- cos18[1] = cos(11.0*M_PI/18.0); +- cos18[2] = cos(13.0*M_PI/18.0); ++ cos9[0] = DOUBLE_TO_REAL(cos(1.0*M_PI/9.0)); ++ cos9[1] = DOUBLE_TO_REAL(cos(5.0*M_PI/9.0)); ++ cos9[2] = DOUBLE_TO_REAL(cos(7.0*M_PI/9.0)); ++ cos18[0] = DOUBLE_TO_REAL(cos(1.0*M_PI/18.0)); ++ cos18[1] = DOUBLE_TO_REAL(cos(11.0*M_PI/18.0)); ++ cos18[2] = DOUBLE_TO_REAL(cos(13.0*M_PI/18.0)); + #endif + + for(i=0;i<12;i++) { +- win[2][i] = 0.5 * sin( M_PI / 24.0 * (double) (2*i+1) ) / cos ( M_PI * (double) (2*i+7) / 24.0 ); ++ win[2][i] = DOUBLE_TO_REAL(0.5 * sin( M_PI / 24.0 * (double) (2*i+1) ) / cos ( M_PI * (double) (2*i+7) / 24.0 )); + for(j=0;j<6;j++) +- COS1[i][j] = cos( M_PI / 24.0 * (double) ((2*i+7)*(2*j+1)) ); ++ COS1[i][j] = DOUBLE_TO_REAL(cos( M_PI / 24.0 * (double) ((2*i+7)*(2*j+1)) )); + } + + for(j=0;j<4;j++) { +@@ -169,10 +169,10 @@ + + for(i=0;i<16;i++) { + double t = tan( (double) i * M_PI / 12.0 ); +- tan1_1[i] = t / (1.0+t); +- tan2_1[i] = 1.0 / (1.0 + t); +- tan1_2[i] = M_SQRT2 * t / (1.0+t); +- tan2_2[i] = M_SQRT2 / (1.0 + t); ++ tan1_1[i] = DOUBLE_TO_REAL(t / (1.0+t)); ++ tan2_1[i] = DOUBLE_TO_REAL(1.0 / (1.0 + t)); ++ tan1_2[i] = DOUBLE_TO_REAL(M_SQRT2 * t / (1.0+t)); ++ tan2_2[i] = DOUBLE_TO_REAL(M_SQRT2 / (1.0 + t)); + + for(j=0;j<2;j++) { + double base = pow(2.0,-0.25*(j+1.0)); +@@ -183,10 +183,10 @@ + else + p2 = pow(base,i*0.5); + } +- pow1_1[j][i] = p1; +- pow2_1[j][i] = p2; +- pow1_2[j][i] = M_SQRT2 * p1; +- pow2_2[j][i] = M_SQRT2 * p2; ++ pow1_1[j][i] = DOUBLE_TO_REAL(p1); ++ pow2_1[j][i] = DOUBLE_TO_REAL(p2); ++ pow1_2[j][i] = DOUBLE_TO_REAL(M_SQRT2 * p1); ++ pow2_2[j][i] = DOUBLE_TO_REAL(M_SQRT2 * p2); + } + } + +@@ -713,22 +713,22 @@ + num -= h->linbits+1; + mask <<= h->linbits; + if(mask < 0) +- *xrpnt = -ispow[x] * v; ++ *xrpnt = REAL_MUL(-ispow[x], v); + else +- *xrpnt = ispow[x] * v; ++ *xrpnt = REAL_MUL(ispow[x], v); + mask <<= 1; + } + else if(x) { + max[lwin] = cb; + if(mask < 0) +- *xrpnt = -ispow[x] * v; ++ *xrpnt = REAL_MUL(-ispow[x], v); + else +- *xrpnt = ispow[x] * v; ++ *xrpnt = REAL_MUL(ispow[x], v); + num--; + mask <<= 1; + } + else +- *xrpnt = 0.0; ++ *xrpnt = DOUBLE_TO_REAL(0.0); + xrpnt += step; + if(y == 15 && h->linbits) { + max[lwin] = cb; +@@ -737,22 +737,22 @@ + num -= h->linbits+1; + mask <<= h->linbits; + if(mask < 0) +- *xrpnt = -ispow[y] * v; ++ *xrpnt = REAL_MUL(-ispow[y], v); + else +- *xrpnt = ispow[y] * v; ++ *xrpnt = REAL_MUL(ispow[y], v); + mask <<= 1; + } + else if(y) { + max[lwin] = cb; + if(mask < 0) +- *xrpnt = -ispow[y] * v; ++ *xrpnt = REAL_MUL(-ispow[y], v); + else +- *xrpnt = ispow[y] * v; ++ *xrpnt = REAL_MUL(ispow[y], v); + num--; + mask <<= 1; + } + else +- *xrpnt = 0.0; ++ *xrpnt = DOUBLE_TO_REAL(0.0); + xrpnt += step; + } + } +@@ -804,7 +804,7 @@ + mask <<= 1; + } + else +- *xrpnt = 0.0; ++ *xrpnt = DOUBLE_TO_REAL(0.0); + xrpnt += step; + } + } +@@ -812,8 +812,8 @@ + if(lwin < 3) { /* short band? */ + while(1) { + for(;mc > 0;mc--) { +- *xrpnt = 0.0; xrpnt += 3; /* short band -> step=3 */ +- *xrpnt = 0.0; xrpnt += 3; ++ *xrpnt = DOUBLE_TO_REAL(0.0); xrpnt += 3; /* short band -> step=3 */ ++ *xrpnt = DOUBLE_TO_REAL(0.0); xrpnt += 3; + } + if(m >= me) + break; +@@ -887,22 +887,22 @@ + num -= h->linbits+1; + mask <<= h->linbits; + if(mask < 0) +- *xrpnt++ = -ispow[x] * v; ++ *xrpnt++ = REAL_MUL(-ispow[x], v); + else +- *xrpnt++ = ispow[x] * v; ++ *xrpnt++ = REAL_MUL(ispow[x], v); + mask <<= 1; + } + else if(x) { + max = cb; + if(mask < 0) +- *xrpnt++ = -ispow[x] * v; ++ *xrpnt++ = REAL_MUL(-ispow[x], v); + else +- *xrpnt++ = ispow[x] * v; ++ *xrpnt++ = REAL_MUL(ispow[x], v); + num--; + mask <<= 1; + } + else +- *xrpnt++ = 0.0; ++ *xrpnt++ = DOUBLE_TO_REAL(0.0); + + if (y == 15 && h->linbits) { + max = cb; +@@ -911,22 +911,22 @@ + num -= h->linbits+1; + mask <<= h->linbits; + if(mask < 0) +- *xrpnt++ = -ispow[y] * v; ++ *xrpnt++ = REAL_MUL(-ispow[y], v); + else +- *xrpnt++ = ispow[y] * v; ++ *xrpnt++ = REAL_MUL(ispow[y], v); + mask <<= 1; + } + else if(y) { + max = cb; + if(mask < 0) +- *xrpnt++ = -ispow[y] * v; ++ *xrpnt++ = REAL_MUL(-ispow[y], v); + else +- *xrpnt++ = ispow[y] * v; ++ *xrpnt++ = REAL_MUL(ispow[y], v); + num--; + mask <<= 1; + } + else +- *xrpnt++ = 0.0; ++ *xrpnt++ = DOUBLE_TO_REAL(0.0); + } + } + +@@ -974,7 +974,7 @@ + mask <<= 1; + } + else +- *xrpnt++ = 0.0; ++ *xrpnt++ = DOUBLE_TO_REAL(0.0); + } + } + +@@ -987,7 +987,7 @@ + num = 0; + + while(xrpnt < &xr[SBLIMIT][0]) +- *xrpnt++ = 0.0; ++ *xrpnt++ = DOUBLE_TO_REAL(0.0); + + while( part2remain > 16 ) { + getbits(16); /* Dismiss stuffing Bits */ +@@ -1065,8 +1065,8 @@ + t1 = tab1[is_p]; t2 = tab2[is_p]; + for (; sb > 0; sb--,idx+=3) { + real v = xr[0][idx]; +- xr[0][idx] = v * t1; +- xr[1][idx] = v * t2; ++ xr[0][idx] = REAL_MUL(v, t1); ++ xr[1][idx] = REAL_MUL(v, t2); + } + } + } +@@ -1087,8 +1087,8 @@ + t1 = tab1[is_p]; t2 = tab2[is_p]; + for ( ; sb > 0; sb--,idx+=3 ) { + real v = xr[0][idx]; +- xr[0][idx] = v * t1; +- xr[1][idx] = v * t2; ++ xr[0][idx] = REAL_MUL(v, t1); ++ xr[1][idx] = REAL_MUL(v, t2); + } + } + } /* end for(lwin; .. ; . ) */ +@@ -1108,8 +1108,8 @@ + t1 = tab1[is_p]; t2 = tab2[is_p]; + for ( ; sb > 0; sb--,idx++) { + real v = xr[0][idx]; +- xr[0][idx] = v * t1; +- xr[1][idx] = v * t2; ++ xr[0][idx] = REAL_MUL(v, t1); ++ xr[1][idx] = REAL_MUL(v, t2); + } + } + else +@@ -1128,8 +1128,8 @@ + t1 = tab1[is_p]; t2 = tab2[is_p]; + for ( ; sb > 0; sb--,idx++) { + real v = xr[0][idx]; +- xr[0][idx] = v * t1; +- xr[1][idx] = v * t2; ++ xr[0][idx] = REAL_MUL(v, t1); ++ xr[1][idx] = REAL_MUL(v, t2); + } + } + else +@@ -1143,8 +1143,8 @@ + + for ( sb = bi->longDiff[21]; sb > 0; sb--,idx++ ) { + real v = xr[0][idx]; +- xr[0][idx] = v * t1; +- xr[1][idx] = v * t2; ++ xr[0][idx] = REAL_MUL(v, t1); ++ xr[1][idx] = REAL_MUL(v, t2); + } + } + } /* ... */ +@@ -1177,8 +1177,8 @@ + for(ss=7;ss>=0;ss--) + { /* upper and lower butterfly inputs */ + register real bu = *--xr2,bd = *xr1; +- *xr2 = (bu * (*cs) ) - (bd * (*ca) ); +- *xr1++ = (bd * (*cs++) ) + (bu * (*ca++) ); ++ *xr2 = REAL_MUL(bu, *cs) - REAL_MUL(bd, *ca); ++ *xr1++ = REAL_MUL(bd, *cs++) + REAL_MUL(bu, *ca++); + } + } + } +@@ -1252,8 +1252,8 @@ + { + real t0, t1, t2; + +- t0 = COS6_2 * (in[8] + in[16] - in[4]); +- t1 = COS6_2 * in[12]; ++ t0 = REAL_MUL(COS6_2, (in[8] + in[16] - in[4])); ++ t1 = REAL_MUL(COS6_2, in[12]); + + t3 = in[0]; + t2 = t3 - t1 - t1; +@@ -1261,16 +1261,16 @@ + tmp[4] = t2 + t0 + t0; + t3 += t1; + +- t2 = COS6_1 * (in[10] + in[14] - in[2]); ++ t2 = REAL_MUL(COS6_1, (in[10] + in[14] - in[2])); + tmp[1] -= t2; + tmp[7] += t2; + } + { + real t0, t1, t2; + +- t0 = cos9[0] * (in[4] + in[8] ); +- t1 = cos9[1] * (in[8] - in[16]); +- t2 = cos9[2] * (in[4] + in[16]); ++ t0 = REAL_MUL(cos9[0], (in[4] + in[8] )); ++ t1 = REAL_MUL(cos9[1], (in[8] - in[16])); ++ t2 = REAL_MUL(cos9[2], (in[4] + in[16])); + + tmp[2] = tmp[6] = t3 - t0 - t2; + tmp[0] = tmp[8] = t3 + t0 + t1; +@@ -1280,9 +1280,9 @@ + { + real t1, t2, t3; + +- t1 = cos18[0] * (in[2] + in[10]); +- t2 = cos18[1] * (in[10] - in[14]); +- t3 = COS6_1 * in[6]; ++ t1 = REAL_MUL(cos18[0], (in[2] + in[10])); ++ t2 = REAL_MUL(cos18[1], (in[10] - in[14])); ++ t3 = REAL_MUL(COS6_1, in[6]); + + { + real t0 = t1 + t2 + t3; +@@ -1293,7 +1293,7 @@ + t2 -= t3; + t1 -= t3; + +- t3 = cos18[2] * (in[2] + in[14]); ++ t3 = REAL_MUL(cos18[2], (in[2] + in[14])); + + t1 += t3; + tmp[3] += t1; +@@ -1308,35 +1308,35 @@ + { + real t0, t1, t2, t3, t4, t5, t6, t7; + +- t1 = COS6_2 * in[12]; +- t2 = COS6_2 * (in[8] + in[16] - in[4]); ++ t1 = REAL_MUL(COS6_2, in[12]); ++ t2 = REAL_MUL(COS6_2, (in[8] + in[16] - in[4])); + + t3 = in[0] + t1; + t4 = in[0] - t1 - t1; + t5 = t4 - t2; + tmp[4] = t4 + t2 + t2; + +- t0 = cos9[0] * (in[4] + in[8]); +- t1 = cos9[1] * (in[8] - in[16]); ++ t0 = REAL_MUL(cos9[0], (in[4] + in[8])); ++ t1 = REAL_MUL(cos9[1], (in[8] - in[16])); + +- t2 = cos9[2] * (in[4] + in[16]); ++ t2 = REAL_MUL(cos9[2], (in[4] + in[16])); + + t6 = t3 - t0 - t2; + t0 += t3 + t1; + t3 += t2 - t1; + +- t2 = cos18[0] * (in[2] + in[10]); +- t4 = cos18[1] * (in[10] - in[14]); +- t7 = COS6_1 * in[6]; ++ t2 = REAL_MUL(cos18[0], (in[2] + in[10])); ++ t4 = REAL_MUL(cos18[1], (in[10] - in[14])); ++ t7 = REAL_MUL(COS6_1, in[6]); + + t1 = t2 + t4 + t7; + tmp[0] = t0 + t1; + tmp[8] = t0 - t1; +- t1 = cos18[2] * (in[2] + in[14]); ++ t1 = REAL_MUL(cos18[2], (in[2] + in[14])); + t2 += t1 - t7; + + tmp[3] = t3 + t2; +- t0 = COS6_1 * (in[10] + in[14] - in[2]); ++ t0 = REAL_MUL(COS6_1, (in[10] + in[14] - in[2])); + tmp[5] = t3 - t2; + + t4 -= t1 + t7; +@@ -1351,53 +1351,53 @@ + { + real t0, t1, t2, t3, t4, t5, t6, t7; + +- t1 = COS6_2 * in[13]; +- t2 = COS6_2 * (in[9] + in[17] - in[5]); ++ t1 = REAL_MUL(COS6_2, in[13]); ++ t2 = REAL_MUL(COS6_2, (in[9] + in[17] - in[5])); + + t3 = in[1] + t1; + t4 = in[1] - t1 - t1; + t5 = t4 - t2; + +- t0 = cos9[0] * (in[5] + in[9]); +- t1 = cos9[1] * (in[9] - in[17]); ++ t0 = REAL_MUL(cos9[0], (in[5] + in[9])); ++ t1 = REAL_MUL(cos9[1], (in[9] - in[17])); + +- tmp[13] = (t4 + t2 + t2) * tfcos36[17-13]; +- t2 = cos9[2] * (in[5] + in[17]); ++ tmp[13] = REAL_MUL((t4 + t2 + t2), tfcos36[17-13]); ++ t2 = REAL_MUL(cos9[2], (in[5] + in[17])); + + t6 = t3 - t0 - t2; + t0 += t3 + t1; + t3 += t2 - t1; + +- t2 = cos18[0] * (in[3] + in[11]); +- t4 = cos18[1] * (in[11] - in[15]); +- t7 = COS6_1 * in[7]; ++ t2 = REAL_MUL(cos18[0], (in[3] + in[11])); ++ t4 = REAL_MUL(cos18[1], (in[11] - in[15])); ++ t7 = REAL_MUL(COS6_1, in[7]); + + t1 = t2 + t4 + t7; +- tmp[17] = (t0 + t1) * tfcos36[17-17]; +- tmp[9] = (t0 - t1) * tfcos36[17-9]; +- t1 = cos18[2] * (in[3] + in[15]); ++ tmp[17] = REAL_MUL((t0 + t1), tfcos36[17-17]); ++ tmp[9] = REAL_MUL((t0 - t1), tfcos36[17-9]); ++ t1 = REAL_MUL(cos18[2], (in[3] + in[15])); + t2 += t1 - t7; + +- tmp[14] = (t3 + t2) * tfcos36[17-14]; +- t0 = COS6_1 * (in[11] + in[15] - in[3]); +- tmp[12] = (t3 - t2) * tfcos36[17-12]; ++ tmp[14] = REAL_MUL((t3 + t2), tfcos36[17-14]); ++ t0 = REAL_MUL(COS6_1, (in[11] + in[15] - in[3])); ++ tmp[12] = REAL_MUL((t3 - t2), tfcos36[17-12]); + + t4 -= t1 + t7; + +- tmp[16] = (t5 - t0) * tfcos36[17-16]; +- tmp[10] = (t5 + t0) * tfcos36[17-10]; +- tmp[15] = (t6 + t4) * tfcos36[17-15]; +- tmp[11] = (t6 - t4) * tfcos36[17-11]; ++ tmp[16] = REAL_MUL((t5 - t0), tfcos36[17-16]); ++ tmp[10] = REAL_MUL((t5 + t0), tfcos36[17-10]); ++ tmp[15] = REAL_MUL((t6 + t4), tfcos36[17-15]); ++ tmp[11] = REAL_MUL((t6 - t4), tfcos36[17-11]); + } + + #define MACRO(v) { \ + real tmpval; \ + tmpval = tmp[(v)] + tmp[17-(v)]; \ +- out2[9+(v)] = tmpval * w[27+(v)]; \ +- out2[8-(v)] = tmpval * w[26-(v)]; \ ++ out2[9+(v)] = REAL_MUL(tmpval, w[27+(v)]); \ ++ out2[8-(v)] = REAL_MUL(tmpval, w[26-(v)]); \ + tmpval = tmp[(v)] - tmp[17-(v)]; \ +- ts[SBLIMIT*(8-(v))] = out1[8-(v)] + tmpval * w[8-(v)]; \ +- ts[SBLIMIT*(9+(v))] = out1[9+(v)] + tmpval * w[9+(v)]; } ++ ts[SBLIMIT*(8-(v))] = out1[8-(v)] + REAL_MUL(tmpval, w[8-(v)]); \ ++ ts[SBLIMIT*(9+(v))] = out1[9+(v)] + REAL_MUL(tmpval, w[9+(v)]); } + + { + register real *out2 = o2; +@@ -1422,20 +1422,20 @@ + + #define MACRO0(v) { \ + real tmp; \ +- out2[9+(v)] = (tmp = sum0 + sum1) * w[27+(v)]; \ +- out2[8-(v)] = tmp * w[26-(v)]; } \ ++ out2[9+(v)] = REAL_MUL((tmp = sum0 + sum1), w[27+(v)]); \ ++ out2[8-(v)] = REAL_MUL(tmp, w[26-(v)]); } \ + sum0 -= sum1; \ +- ts[SBLIMIT*(8-(v))] = out1[8-(v)] + sum0 * w[8-(v)]; \ +- ts[SBLIMIT*(9+(v))] = out1[9+(v)] + sum0 * w[9+(v)]; ++ ts[SBLIMIT*(8-(v))] = out1[8-(v)] + REAL_MUL(sum0, w[8-(v)]); \ ++ ts[SBLIMIT*(9+(v))] = out1[9+(v)] + REAL_MUL(sum0, w[9+(v)]); + #define MACRO1(v) { \ + real sum0,sum1; \ + sum0 = tmp1a + tmp2a; \ +- sum1 = (tmp1b + tmp2b) * tfcos36[(v)]; \ ++ sum1 = REAL_MUL((tmp1b + tmp2b), tfcos36[(v)]); \ + MACRO0(v); } + #define MACRO2(v) { \ + real sum0,sum1; \ + sum0 = tmp2a - tmp1a; \ +- sum1 = (tmp2b - tmp1b) * tfcos36[(v)]; \ ++ sum1 = REAL_MUL((tmp2b - tmp1b), tfcos36[(v)]); \ + MACRO0(v); } + + register const real *c = COS9; +@@ -1446,17 +1446,17 @@ + + real ta33,ta66,tb33,tb66; + +- ta33 = in[2*3+0] * c[3]; +- ta66 = in[2*6+0] * c[6] + in[2*0+0]; +- tb33 = in[2*3+1] * c[3]; +- tb66 = in[2*6+1] * c[6] + in[2*0+1]; ++ ta33 = REAL_MUL(in[2*3+0], c[3]); ++ ta66 = REAL_MUL(in[2*6+0], c[6]); ++ tb33 = REAL_MUL(in[2*3+1], c[3]); ++ tb66 = REAL_MUL(in[2*6+1], c[6]); + + { + real tmp1a,tmp2a,tmp1b,tmp2b; +- tmp1a = in[2*1+0] * c[1] + ta33 + in[2*5+0] * c[5] + in[2*7+0] * c[7]; +- tmp1b = in[2*1+1] * c[1] + tb33 + in[2*5+1] * c[5] + in[2*7+1] * c[7]; +- tmp2a = in[2*2+0] * c[2] + in[2*4+0] * c[4] + ta66 + in[2*8+0] * c[8]; +- tmp2b = in[2*2+1] * c[2] + in[2*4+1] * c[4] + tb66 + in[2*8+1] * c[8]; ++ tmp1a = REAL_MUL(in[2*1+0], c[1]) + ta33 + REAL_MUL(in[2*5+0], c[5]) + REAL_MUL(in[2*7+0], c[7]); ++ tmp1b = REAL_MUL(in[2*1+1], c[1]) + tb33 + REAL_MUL(in[2*5+1], c[5]) + REAL_MUL(in[2*7+1], c[7]); ++ tmp2a = REAL_MUL(in[2*2+0], c[2]) + REAL_MUL(in[2*4+0], c[4]) + ta66 + REAL_MUL(in[2*8+0], c[8]); ++ tmp2b = REAL_MUL(in[2*2+1], c[2]) + REAL_MUL(in[2*4+1], c[4]) + tb66 + REAL_MUL(in[2*8+1], c[8]); + + MACRO1(0); + MACRO2(8); +@@ -1464,10 +1464,10 @@ + + { + real tmp1a,tmp2a,tmp1b,tmp2b; +- tmp1a = ( in[2*1+0] - in[2*5+0] - in[2*7+0] ) * c[3]; +- tmp1b = ( in[2*1+1] - in[2*5+1] - in[2*7+1] ) * c[3]; +- tmp2a = ( in[2*2+0] - in[2*4+0] - in[2*8+0] ) * c[6] - in[2*6+0] + in[2*0+0]; +- tmp2b = ( in[2*2+1] - in[2*4+1] - in[2*8+1] ) * c[6] - in[2*6+1] + in[2*0+1]; ++ tmp1a = REAL_MUL(( in[2*1+0] - in[2*5+0] - in[2*7+0] ), c[3]); ++ tmp1b = REAL_MUL(( in[2*1+1] - in[2*5+1] - in[2*7+1] ), c[3]); ++ tmp2a = REAL_MUL(( in[2*2+0] - in[2*4+0] - in[2*8+0] ), c[6]) - in[2*6+0] + in[2*0+0]; ++ tmp2b = REAL_MUL(( in[2*2+1] - in[2*4+1] - in[2*8+1] ), c[6]) - in[2*6+1] + in[2*0+1]; + + MACRO1(1); + MACRO2(7); +@@ -1475,10 +1475,10 @@ + + { + real tmp1a,tmp2a,tmp1b,tmp2b; +- tmp1a = in[2*1+0] * c[5] - ta33 - in[2*5+0] * c[7] + in[2*7+0] * c[1]; +- tmp1b = in[2*1+1] * c[5] - tb33 - in[2*5+1] * c[7] + in[2*7+1] * c[1]; +- tmp2a = - in[2*2+0] * c[8] - in[2*4+0] * c[2] + ta66 + in[2*8+0] * c[4]; +- tmp2b = - in[2*2+1] * c[8] - in[2*4+1] * c[2] + tb66 + in[2*8+1] * c[4]; ++ tmp1a = REAL_MUL(in[2*1+0], c[5]) - ta33 - REAL_MUL(in[2*5+0], c[7]) + REAL_MUL(in[2*7+0], c[1]); ++ tmp1b = REAL_MUL(in[2*1+1], c[5]) - tb33 - REAL_MUL(in[2*5+1], c[7]) + REAL_MUL(in[2*7+1], c[1]); ++ tmp2a = - REAL_MUL(in[2*2+0], c[8]) - REAL_MUL(in[2*4+0], c[2]) + ta66 + REAL_MUL(in[2*8+0], c[4]); ++ tmp2b = - REAL_MUL(in[2*2+1], c[8]) - REAL_MUL(in[2*4+1], c[2]) + tb66 + REAL_MUL(in[2*8+1], c[4]); + + MACRO1(2); + MACRO2(6); +@@ -1486,10 +1486,10 @@ + + { + real tmp1a,tmp2a,tmp1b,tmp2b; +- tmp1a = in[2*1+0] * c[7] - ta33 + in[2*5+0] * c[1] - in[2*7+0] * c[5]; +- tmp1b = in[2*1+1] * c[7] - tb33 + in[2*5+1] * c[1] - in[2*7+1] * c[5]; +- tmp2a = - in[2*2+0] * c[4] + in[2*4+0] * c[8] + ta66 - in[2*8+0] * c[2]; +- tmp2b = - in[2*2+1] * c[4] + in[2*4+1] * c[8] + tb66 - in[2*8+1] * c[2]; ++ tmp1a = REAL_MUL(in[2*1+0], c[7]) - ta33 + REAL_MUL(in[2*5+0], c[1]) - REAL_MUL(in[2*7+0], c[5]); ++ tmp1b = REAL_MUL(in[2*1+1], c[7]) - tb33 + REAL_MUL(in[2*5+1], c[1]) - REAL_MUL(in[2*7+1], c[5]); ++ tmp2a = - REAL_MUL(in[2*2+0], c[4]) + REAL_MUL(in[2*4+0], c[8]) + ta66 - REAL_MUL(in[2*8+0], c[2]); ++ tmp2b = - REAL_MUL(in[2*2+1], c[4]) + REAL_MUL(in[2*4+1], c[8]) + tb66 - REAL_MUL(in[2*8+1], c[2]); + + MACRO1(3); + MACRO2(5); +@@ -1498,7 +1498,7 @@ + { + real sum0,sum1; + sum0 = in[2*0+0] - in[2*2+0] + in[2*4+0] - in[2*6+0] + in[2*8+0]; +- sum1 = (in[2*0+1] - in[2*2+1] + in[2*4+1] - in[2*6+1] + in[2*8+1] ) * tfcos36[4]; ++ sum1 = REAL_MUL((in[2*0+1] - in[2*2+1] + in[2*4+1] - in[2*6+1] + in[2*8+1] ), tfcos36[4]); + MACRO0(4); + } + } +@@ -1522,19 +1522,19 @@ + \ + in5 += in3; in3 += in1; \ + \ +- in2 *= COS6_1; \ +- in3 *= COS6_1; \ ++ in2 = REAL_MUL(in2, COS6_1); \ ++ in3 = REAL_MUL(in3, COS6_1); \ + + #define DCT12_PART2 \ +- in0 += in4 * COS6_2; \ ++ in0 += REAL_MUL(in4, COS6_2); \ + \ + in4 = in0 + in2; \ + in0 -= in2; \ + \ +- in1 += in5 * COS6_2; \ ++ in1 += REAL_MUL(in5, COS6_2); \ + \ +- in5 = (in1 + in3) * tfcos12[0]; \ +- in1 = (in1 - in3) * tfcos12[2]; \ ++ in5 = REAL_MUL((in1 + in3), tfcos12[0]); \ ++ in1 = REAL_MUL((in1 - in3), tfcos12[2]); \ + \ + in3 = in4 + in5; \ + in4 -= in5; \ +@@ -1554,27 +1554,27 @@ + { + real tmp0,tmp1 = (in0 - in4); + { +- real tmp2 = (in1 - in5) * tfcos12[1]; ++ real tmp2 = REAL_MUL((in1 - in5), tfcos12[1]); + tmp0 = tmp1 + tmp2; + tmp1 -= tmp2; + } +- ts[(17-1)*SBLIMIT] = out1[17-1] + tmp0 * wi[11-1]; +- ts[(12+1)*SBLIMIT] = out1[12+1] + tmp0 * wi[6+1]; +- ts[(6 +1)*SBLIMIT] = out1[6 +1] + tmp1 * wi[1]; +- ts[(11-1)*SBLIMIT] = out1[11-1] + tmp1 * wi[5-1]; ++ ts[(17-1)*SBLIMIT] = out1[17-1] + REAL_MUL(tmp0, wi[11-1]); ++ ts[(12+1)*SBLIMIT] = out1[12+1] + REAL_MUL(tmp0, wi[6+1]); ++ ts[(6 +1)*SBLIMIT] = out1[6 +1] + REAL_MUL(tmp1, wi[1]); ++ ts[(11-1)*SBLIMIT] = out1[11-1] + REAL_MUL(tmp1, wi[5-1]); + } + + DCT12_PART2 + +- ts[(17-0)*SBLIMIT] = out1[17-0] + in2 * wi[11-0]; +- ts[(12+0)*SBLIMIT] = out1[12+0] + in2 * wi[6+0]; +- ts[(12+2)*SBLIMIT] = out1[12+2] + in3 * wi[6+2]; +- ts[(17-2)*SBLIMIT] = out1[17-2] + in3 * wi[11-2]; +- +- ts[(6+0)*SBLIMIT] = out1[6+0] + in0 * wi[0]; +- ts[(11-0)*SBLIMIT] = out1[11-0] + in0 * wi[5-0]; +- ts[(6+2)*SBLIMIT] = out1[6+2] + in4 * wi[2]; +- ts[(11-2)*SBLIMIT] = out1[11-2] + in4 * wi[5-2]; ++ ts[(17-0)*SBLIMIT] = out1[17-0] + REAL_MUL(in2, wi[11-0]); ++ ts[(12+0)*SBLIMIT] = out1[12+0] + REAL_MUL(in2, wi[6+0]); ++ ts[(12+2)*SBLIMIT] = out1[12+2] + REAL_MUL(in3, wi[6+2]); ++ ts[(17-2)*SBLIMIT] = out1[17-2] + REAL_MUL(in3, wi[11-2]); ++ ++ ts[(6 +0)*SBLIMIT] = out1[6+0] + REAL_MUL(in0, wi[0]); ++ ts[(11-0)*SBLIMIT] = out1[11-0] + REAL_MUL(in0, wi[5-0]); ++ ts[(6 +2)*SBLIMIT] = out1[6+2] + REAL_MUL(in4, wi[2]); ++ ts[(11-2)*SBLIMIT] = out1[11-2] + REAL_MUL(in4, wi[5-2]); + } + + in++; +@@ -1588,27 +1588,27 @@ + { + real tmp0,tmp1 = (in0 - in4); + { +- real tmp2 = (in1 - in5) * tfcos12[1]; ++ real tmp2 = REAL_MUL((in1 - in5), tfcos12[1]); + tmp0 = tmp1 + tmp2; + tmp1 -= tmp2; + } +- out2[5-1] = tmp0 * wi[11-1]; +- out2[0+1] = tmp0 * wi[6+1]; +- ts[(12+1)*SBLIMIT] += tmp1 * wi[1]; +- ts[(17-1)*SBLIMIT] += tmp1 * wi[5-1]; ++ out2[5-1] = REAL_MUL(tmp0, wi[11-1]); ++ out2[0+1] = REAL_MUL(tmp0, wi[6+1]); ++ ts[(12+1)*SBLIMIT] += REAL_MUL(tmp1, wi[1]); ++ ts[(17-1)*SBLIMIT] += REAL_MUL(tmp1, wi[5-1]); + } + + DCT12_PART2 + +- out2[5-0] = in2 * wi[11-0]; +- out2[0+0] = in2 * wi[6+0]; +- out2[0+2] = in3 * wi[6+2]; +- out2[5-2] = in3 * wi[11-2]; +- +- ts[(12+0)*SBLIMIT] += in0 * wi[0]; +- ts[(17-0)*SBLIMIT] += in0 * wi[5-0]; +- ts[(12+2)*SBLIMIT] += in4 * wi[2]; +- ts[(17-2)*SBLIMIT] += in4 * wi[5-2]; ++ out2[5-0] = REAL_MUL(in2, wi[11-0]); ++ out2[0+0] = REAL_MUL(in2, wi[6+0]); ++ out2[0+2] = REAL_MUL(in3, wi[6+2]); ++ out2[5-2] = REAL_MUL(in3, wi[11-2]); ++ ++ ts[(12+0)*SBLIMIT] += REAL_MUL(in0, wi[0]); ++ ts[(17-0)*SBLIMIT] += REAL_MUL(in0, wi[5-0]); ++ ts[(12+2)*SBLIMIT] += REAL_MUL(in4, wi[2]); ++ ts[(17-2)*SBLIMIT] += REAL_MUL(in4, wi[5-2]); + } + + in++; +@@ -1623,27 +1623,27 @@ + { + real tmp0,tmp1 = (in0 - in4); + { +- real tmp2 = (in1 - in5) * tfcos12[1]; ++ real tmp2 = REAL_MUL((in1 - in5), tfcos12[1]); + tmp0 = tmp1 + tmp2; + tmp1 -= tmp2; + } +- out2[11-1] = tmp0 * wi[11-1]; +- out2[6 +1] = tmp0 * wi[6+1]; +- out2[0+1] += tmp1 * wi[1]; +- out2[5-1] += tmp1 * wi[5-1]; ++ out2[11-1] = REAL_MUL(tmp0, wi[11-1]); ++ out2[6 +1] = REAL_MUL(tmp0, wi[6+1]); ++ out2[0+1] += REAL_MUL(tmp1, wi[1]); ++ out2[5-1] += REAL_MUL(tmp1, wi[5-1]); + } + + DCT12_PART2 + +- out2[11-0] = in2 * wi[11-0]; +- out2[6 +0] = in2 * wi[6+0]; +- out2[6 +2] = in3 * wi[6+2]; +- out2[11-2] = in3 * wi[11-2]; +- +- out2[0+0] += in0 * wi[0]; +- out2[5-0] += in0 * wi[5-0]; +- out2[0+2] += in4 * wi[2]; +- out2[5-2] += in4 * wi[5-2]; ++ out2[11-0] = REAL_MUL(in2, wi[11-0]); ++ out2[6 +0] = REAL_MUL(in2, wi[6+0]); ++ out2[6 +2] = REAL_MUL(in3, wi[6+2]); ++ out2[11-2] = REAL_MUL(in3, wi[11-2]); ++ ++ out2[0+0] += REAL_MUL(in0, wi[0]); ++ out2[5-0] += REAL_MUL(in0, wi[5-0]); ++ out2[0+2] += REAL_MUL(in4, wi[2]); ++ out2[5-2] += REAL_MUL(in4, wi[5-2]); + } + } + +@@ -1693,7 +1693,7 @@ + int i; + for(i=0;i<SSLIMIT;i++) { + tspnt[i*SBLIMIT] = *rawout1++; +- *rawout2++ = 0.0; ++ *rawout2++ = DOUBLE_TO_REAL(0.0); + } + } + } +@@ -1865,5 +1865,3 @@ + + return clip; + } +- +- diff --git a/audio/mpg123-nas/patches/patch-aj b/audio/mpg123-nas/patches/patch-aj new file mode 100644 index 00000000000..a8037fb728d --- /dev/null +++ b/audio/mpg123-nas/patches/patch-aj @@ -0,0 +1,42 @@ +$NetBSD: patch-aj,v 1.1.1.1.2.2 2002/06/23 18:38:51 jlam Exp $ + +--- mpg123.h.orig Sat May 29 00:51:58 1999 ++++ mpg123.h Tue Oct 12 01:17:16 1999 +@@ -56,8 +56,37 @@ + # define real float + #elif defined(REAL_IS_LONG_DOUBLE) + # define real long double ++#elif defined(REAL_IS_FIXED) ++# define real long ++ ++# define REAL_RADIX 15 ++# define REAL_FACTOR (32.0 * 1024.0) ++ ++# define REAL_PLUS_32767 ( 32767 << REAL_RADIX ) ++# define REAL_MINUS_32768 ( -32768 << REAL_RADIX ) ++ ++# define DOUBLE_TO_REAL(x) ((int)((x) * REAL_FACTOR)) ++# define REAL_TO_SHORT(x) ((x) >> REAL_RADIX) ++# define REAL_MUL(x, y) (((long long)(x) * (long long)(y)) >> REAL_RADIX) ++ + #else + # define real double ++#endif ++ ++#ifndef DOUBLE_TO_REAL ++# define DOUBLE_TO_REAL(x) (x) ++#endif ++#ifndef REAL_TO_SHORT ++# define REAL_TO_SHORT(x) (x) ++#endif ++#ifndef REAL_PLUS_32767 ++# define REAL_PLUS_32767 32767.0 ++#endif ++#ifndef REAL_MINUS_32768 ++# define REAL_MINUS_32768 -32768.0 ++#endif ++#ifndef REAL_MUL ++# define REAL_MUL(x, y) ((x) * (y)) + #endif + + #ifdef __GNUC__ diff --git a/audio/mpg123-nas/patches/patch-ak b/audio/mpg123-nas/patches/patch-ak new file mode 100644 index 00000000000..46266d67975 --- /dev/null +++ b/audio/mpg123-nas/patches/patch-ak @@ -0,0 +1,40 @@ +$NetBSD: patch-ak,v 1.1.1.1.2.2 2002/06/23 18:38:52 jlam Exp $ + +--- tabinit.c.orig Mon Feb 15 23:55:11 1999 ++++ tabinit.c Thu Aug 12 17:31:33 1999 +@@ -56,7 +56,7 @@ + kr=0x10>>i; divv=0x40>>i; + costab = pnts[i]; + for(k=0;k<kr;k++) +- costab[k] = 1.0 / (2.0 * cos(M_PI * ((double) k * 2.0 + 1.0) / (double) divv)); ++ costab[k] = DOUBLE_TO_REAL(1.0 / (2.0 * cos(M_PI * ((double) k * 2.0 + 1.0) / (double) divv))); + #ifdef USE_3DNOW + for(k=0;k<kr;k++) + costab[k+kr] = -costab[k]; +@@ -69,7 +69,7 @@ + for(i=0,j=0;i<256;i++,j++,idx+=32) + { + if(idx < 512+16) +- decwin[idx+16] = decwin[idx] = (double) intwinbase[j] / 65536.0 * (double) scaleval; ++ decwin[idx+16] = decwin[idx] = DOUBLE_TO_REAL((double) intwinbase[j] / 65536.0 * (double) scaleval); + + if(i % 32 == 31) + idx -= 1023; +@@ -80,7 +80,7 @@ + for( /* i=256 */ ;i<512;i++,j--,idx+=32) + { + if(idx < 512+16) +- decwin[idx+16] = decwin[idx] = (double) intwinbase[j] / 65536.0 * (double) scaleval; ++ decwin[idx+16] = decwin[idx] = DOUBLE_TO_REAL((double) intwinbase[j] / 65536.0 * (double) scaleval); + + if(i % 32 == 31) + idx -= 1023; +@@ -91,7 +91,7 @@ + #ifdef USE_3DNOW + if(!param.down_sample) { + for(i=0;i<512+32;i++) { +- decwin[512+31-i] *= 65536.0; /* allows faster clipping in 3dnow code */ ++ decwin[512+31-i] = REAL_MUL(decwin[512+31-i], 65536.0); /* allows faster clipping in 3dnow code */ + decwin[512+32+i] = decwin[512+31-i]; + } + } diff --git a/audio/mpg123-nas/patches/patch-al b/audio/mpg123-nas/patches/patch-al new file mode 100644 index 00000000000..f83030220db --- /dev/null +++ b/audio/mpg123-nas/patches/patch-al @@ -0,0 +1,40 @@ +$NetBSD: patch-al,v 1.1.1.1.2.2 2002/06/23 18:38:52 jlam Exp $ + +--- readers.c.orig Thu Mar 4 11:03:49 1999 ++++ readers.c Sat May 12 20:09:05 2001 +@@ -1,5 +1,9 @@ + #include <stdlib.h> + ++#ifdef __NetBSD__ ++#include <sys/param.h> ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> +@@ -251,7 +255,12 @@ + return -1; + + mapend = mapbuf + len; +- ++ ++#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104030000) ++ if(madvise(mapbuf, mapend-mapbuf, MADV_SEQUENTIAL) < 0) ++ fprintf(stderr,"madvise failed, continuing anyways..\n"); ++#endif ++ + if(param.verbose > 1) + fprintf(stderr,"Using memory mapped IO for this stream.\n"); + +@@ -268,6 +276,11 @@ + + static void mapped_close(struct reader *rds) + { ++#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104030000) ++ if(madvise(mapbuf, mapend-mapbuf, MADV_FREE) < 0) ++ fprintf(stderr,"madvise failed, continuing anyways..\n"); ++#endif ++ + munmap((void *)mapbuf,mapend-mapbuf); + if (rds->flags & READER_FD_OPENED) + close(rds->filept); diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile index 9fde9bd3dfd..472c2d6d7d1 100644 --- a/audio/mpg123/Makefile +++ b/audio/mpg123/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.32 2002/04/25 16:34:15 abs Exp $ +# $NetBSD: Makefile,v 1.32.2.1 2002/06/23 18:38:37 jlam Exp $ DISTNAME= mpg123-0.59r -PKGREVISION= 1 PKGNAME= mpg123-0.59.18 +PKGREVISION= 2 CATEGORIES= audio MASTER_SITES= http://www.mpg123.de/mpg123/ \ http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/ @@ -14,6 +14,8 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.mpg123.de/ COMMENT= Command-line player for mpeg layer 1, 2 and 3 audio +CONFLICTS+= mpg123-nas-[0-9]* + BUILD_DEFS+= USE_INET6 DIST_SUBDIR= mpg123 diff --git a/audio/mpg123/distinfo b/audio/mpg123/distinfo index 38c1a533394..37ef94114df 100644 --- a/audio/mpg123/distinfo +++ b/audio/mpg123/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.8 2002/04/25 16:34:15 abs Exp $ +$NetBSD: distinfo,v 1.8.2.1 2002/06/23 18:38:37 jlam Exp $ SHA1 (mpg123/mpg123-0.59r.tar.gz) = c32fe242f4506d218bd19a51a4034da9fdc79493 Size (mpg123/mpg123-0.59r.tar.gz) = 159028 bytes SHA1 (mpg123/mpg123-059r-v6-20000713b.diff.gz) = fab11489b6a1ab79d6c29787161f1c05e492dc0b Size (mpg123/mpg123-059r-v6-20000713b.diff.gz) = 5600 bytes -SHA1 (patch-aa) = d48107632e452cf443710edbb6376ef381aba41c +SHA1 (patch-aa) = 5f5310e52c8a7b17bc675d6d3b21ea629f644b40 SHA1 (patch-ab) = ffc387d93f0f2832e49796c80be26e908defa3a7 SHA1 (patch-ac) = 06a5037e27ddd4cc34e5348c09e702f9740173c5 SHA1 (patch-ad) = e9b2b874a95a67139c7d48e74492eb64dfa815f0 @@ -18,3 +18,4 @@ SHA1 (patch-ak) = b30898cff26859eca0d23ea8cfdd461920b978a8 SHA1 (patch-al) = 88dec640d40e6a3f1828096a4ff7b5a4dbd0a222 SHA1 (patch-am) = 661c1f95f65145f4e08706eb3f6fe975118a2822 SHA1 (patch-an) = 08917e1825adcfd870bb2c61ae865339da7c45ef +SHA1 (patch-ao) = 40961a43cc3dbebf71deee1c240907896d297304 diff --git a/audio/mpg123/patches/patch-aa b/audio/mpg123/patches/patch-aa index 6ce8e8b6cff..4ee32dc198e 100644 --- a/audio/mpg123/patches/patch-aa +++ b/audio/mpg123/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.17 2002/04/25 16:34:16 abs Exp $ +$NetBSD: patch-aa,v 1.17.2.1 2002/06/23 18:38:37 jlam Exp $ ---- Makefile.orig Thu Feb 28 10:17:44 2002 -+++ Makefile Thu Feb 28 10:19:04 2002 -@@ -54,6 +54,10 @@ +--- Makefile.orig Sun Jun 23 03:50:48 2002 ++++ Makefile +@@ -54,6 +54,15 @@ @echo "make aix-tk3play IBM AIX" @echo "make os2 IBM OS/2" @echo "make netbsd NetBSD" @@ -10,19 +10,44 @@ $NetBSD: patch-aa,v 1.17 2002/04/25 16:34:16 abs Exp $ + @echo "make netbsd-i386 NetBSD optimized for i386" + @echo "make netbsd-i386-elf NetBSD optimized for i386, ELF format" + @echo "make netbsd-m68k NetBSD optimized for m68k" ++ @echo "make netbsd-esd NetBSD with EsounD" ++ @echo "make netbsd-arm-esd NetBSD for strongarm with EsounD" ++ @echo "make netbsd-i386-esd NetBSD optimized for i386 with EsounD" ++ @echo "make netbsd-i386-elf-esd NetBSD optimized for i386, ELF format with EsounD" ++ @echo "make netbsd-m68k-esd NetBSD optimized for m68k with EsounD" @echo "make bsdos BSDI BSD/OS" @echo "make bsdos4 BSDI BSD/OS 4.0" @echo "make bsdos-nas BSDI BSD/OS with NAS support" -@@ -377,6 +381,34 @@ - -funroll-all-loops -finline-functions' \ +@@ -496,18 +505,100 @@ + + netbsd: + $(MAKE) CC=cc LDFLAGS= \ +- OBJECTS='decode.o dct64.o audio_sun.o' \ ++ OBJECTS='decode.o dct64.o audio_sun.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \ +- -funroll-all-loops -ffast-math \ +- -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ ++ -funroll-all-loops -ffast-math -DREAD_MMAP \ ++ -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \ mpg123-make + netbsd-i386: + $(MAKE) CC=cc LDFLAGS= \ +- OBJECTS='decode_i386.o dct64_i386.o audio_sun.o' \ +- CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \ ++ OBJECTS='decode_i386.o dct64_i386.o audio_sun.o term.o' \ ++ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ ++ -funroll-all-loops -ffast-math -DROT_I386 -DREAD_MMAP \ ++ -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \ ++ mpg123-make ++ +netbsd-i386-elf: + $(MAKE) CC=cc LDFLAGS= \ + OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \ + audio_sun.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ -+ -funroll-all-loops -ffast-math -DROT_I386 \ + -funroll-all-loops -ffast-math -DROT_I386 \ +- -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ + -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \ + -DREAD_MMAP -DNETBSD -DTERM_CONTROL' \ + mpg123-make @@ -45,32 +70,58 @@ $NetBSD: patch-aa,v 1.17 2002/04/25 16:34:16 abs Exp $ + -DNETBSD' \ + mpg123-make + - solaris-gcc-esd: - $(MAKE) CC=gcc LDFLAGS='-lsocket -lnsl' \ - AUDIO_LIB='-lesd -lresolv' \ -@@ -496,18 +528,18 @@ - - netbsd: - $(MAKE) CC=cc LDFLAGS= \ -- OBJECTS='decode.o dct64.o audio_sun.o' \ -+ OBJECTS='decode.o dct64.o audio_sun.o term.o' \ - CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \ -- -funroll-all-loops -ffast-math \ -- -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ ++netbsd-esd: ++ $(MAKE) CC=cc LDFLAGS= \ ++ AUDIO_LIB="`$(ESD_CONFIG) --libs`" \ ++ OBJECTS='decode.o dct64.o audio_esd.o term.o' \ ++ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math -DREAD_MMAP \ -+ -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \ - mpg123-make - - netbsd-i386: - $(MAKE) CC=cc LDFLAGS= \ -- OBJECTS='decode_i386.o dct64_i386.o audio_sun.o' \ -- CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \ -- -funroll-all-loops -ffast-math -DROT_I386 \ -- -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ -+ OBJECTS='decode_i386.o dct64_i386.o audio_sun.o term.o' \ ++ -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \ ++ `$(ESD_CONFIG) --cflags`' \ ++ mpg123-make ++ ++netbsd-i386-esd: ++ $(MAKE) CC=cc LDFLAGS= \ ++ AUDIO_LIB="`$(ESD_CONFIG) --libs`" \ ++ OBJECTS='decode_i386.o dct64_i386.o audio_esd.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math -DROT_I386 -DREAD_MMAP \ -+ -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \ ++ -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \ ++ `$(ESD_CONFIG) --cflags`' \ ++ mpg123-make ++ ++netbsd-i386-elf-esd: ++ echo GETBITS: $(GETBITS) ++ $(MAKE) CC=cc LDFLAGS= \ ++ AUDIO_LIB="`$(ESD_CONFIG) --libs`" \ ++ OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \ ++ audio_esd.o term.o' \ ++ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ ++ -funroll-all-loops -ffast-math -DROT_I386 \ ++ -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \ ++ -DREAD_MMAP -DNETBSD -DTERM_CONTROL \ ++ `$(ESD_CONFIG) --cflags`' \ ++ mpg123-make ++ ++netbsd-m68k-esd: ++ $(MAKE) CC=cc LDFLAGS= \ ++ AUDIO_LIB="`$(ESD_CONFIG) --libs`" \ ++ OBJECTS='decode.o dct64.o audio_esd.o term.o' \ ++ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \ ++ -ffast-math -DREAL_IS_FLOAT -DREAD_MMAP \ ++ -DUSE_MMAP -DNETBSD -DM68K_ASSEM -DTERM_CONTROL \ ++ `$(ESD_CONFIG) --cflags`' \ ++ mpg123-make ++ ++netbsd-arm-esd: ++ $(MAKE) CC=cc LDFLAGS= \ ++ AUDIO_LIB="`$(ESD_CONFIG) --libs`" \ ++ OBJECTS='decode.o dct64.o audio_esd.o term.o' \ ++ CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \ ++ -funroll-all-loops -finline-functions -ffast-math \ ++ -march=armv4 -mtune=strongarm -mcpu=strongarm \ ++ -DREAL_IS_FIXED -DUSE_MMAP -DREAD_MMAP -DTERM_CONTROL \ ++ -DNETBSD `$(ESD_CONFIG) --cflags`' \ mpg123-make bsdos: diff --git a/audio/mpg123/patches/patch-ao b/audio/mpg123/patches/patch-ao new file mode 100644 index 00000000000..c1cd6f49385 --- /dev/null +++ b/audio/mpg123/patches/patch-ao @@ -0,0 +1,24 @@ +$NetBSD: patch-ao,v 1.1.2.2 2002/06/23 18:38:38 jlam Exp $ + +--- audio_esd.c.orig Sat May 29 00:06:29 1999 ++++ audio_esd.c +@@ -8,6 +8,10 @@ + #include <stropts.h> + #include <sys/conf.h> + #endif ++#ifdef NETBSD ++#include <sys/ioctl.h> ++#include <sys/audioio.h> ++#endif + + static unsigned esd_rate = 0, esd_format = 0, esd_channels = 0; + +@@ -75,7 +79,7 @@ + else if (ai->rate > esd_rate) + return -1; + +- ai->fn = esd_play_stream_fallback(format, ai->rate, esdserver, "mpg123"); ++ ai->fn = esd_play_stream_fallback(format, ai->rate, NULL/*esdserver*/, "mpg123"); + return (ai->fn); + } + diff --git a/audio/mpg321/DESCR b/audio/mpg321/DESCR new file mode 100644 index 00000000000..a94c5a30ae9 --- /dev/null +++ b/audio/mpg321/DESCR @@ -0,0 +1,10 @@ +mpg321 is a Free replacement for mpg123, a very popular command-line mp3 +player. mpg123 is used for frontends, as an mp3 player and as an mp3 to +wave file decoder (primarily for use with CD-recording software.) In all +of these capacities, mpg321 can be used as a drop-in replacement for +mpg123. + +mpg321 is a project conceived and written by Joe Drew <hoserhead@woot.net>. +It uses code from the MAD distribution by Rob Leslie; XMMS; and plaympeg +from the SMPEG distribution. mpg321 is licensed under the GNU General +Public License version 2, as documented in the 'COPYING' file. diff --git a/audio/mpg321/Makefile b/audio/mpg321/Makefile new file mode 100644 index 00000000000..86228bb826a --- /dev/null +++ b/audio/mpg321/Makefile @@ -0,0 +1,16 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:38:53 jlam Exp $ + +DISTNAME= mpg321-0.2.10 +CATEGORIES= audio +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpg321/} + +MAINTAINER= rxg@netbsd.org +HOMEPAGE= http://mpg321.sourceforge.net/ +COMMENT= Free replacement for mpg123 + +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --disable-mpg123-symlink + +.include "../../audio/libao/buildlink.mk" +.include "../../audio/mad/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/audio/mpg321/PLIST b/audio/mpg321/PLIST new file mode 100644 index 00000000000..765507d1233 --- /dev/null +++ b/audio/mpg321/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.50.2 2002/06/23 18:38:54 jlam Exp $ +bin/mpg321 +man/man1/mpg321.1 diff --git a/audio/mpg321/distinfo b/audio/mpg321/distinfo new file mode 100644 index 00000000000..a82a68863ce --- /dev/null +++ b/audio/mpg321/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.4.2 2002/06/23 18:38:55 jlam Exp $ + +SHA1 (mpg321-0.2.10.tar.gz) = 90268d0d187ddd7625d143b95791cb39a1630b79 +Size (mpg321-0.2.10.tar.gz) = 113449 bytes diff --git a/audio/mserv/Makefile b/audio/mserv/Makefile index d7fc81a9d88..a1efa13b818 100644 --- a/audio/mserv/Makefile +++ b/audio/mserv/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2002/02/15 00:42:31 hubertf Exp $ +# $NetBSD: Makefile,v 1.2.2.1 2002/06/23 18:38:56 jlam Exp $ # DISTNAME= mserv-0.33 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= audio MASTER_SITES= http://www.mserv.org/download/ @@ -10,6 +10,8 @@ MAINTAINER= martin@netbsd.org HOMEPAGE= http://www.mserv.org/ COMMENT= local centralised music server environment +DEPENDS+= mpg123-[0-9]*:../mpg123 + ALL_TARGET= default REPLACE_PERL= mserv/mservedit webclient/main.cgi webclient/margin.cgi webclient/mserv.cgi diff --git a/audio/mserv/PLIST b/audio/mserv/PLIST index 018ff1cbb22..e8c563b21c0 100644 --- a/audio/mserv/PLIST +++ b/audio/mserv/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2002/02/12 14:22:14 martin Exp $ +@comment $NetBSD: PLIST,v 1.1.2.1 2002/06/23 18:38:56 jlam Exp $ bin/mserv bin/mservcmd bin/mservedit @@ -9,4 +9,12 @@ lib/libmservplus.a man/man1/mserv.1 man/man1/mservcmd.1 share/mserv/english.lang +share/mserv/webclient/README +share/mserv/webclient/back.gif +share/mserv/webclient/index.html +share/mserv/webclient/main.cgi +share/mserv/webclient/margin.cgi +share/mserv/webclient/mserv.cgi +share/mserv/webclient/mserv7.gif +@dirrm share/mserv/webclient @dirrm share/mserv diff --git a/audio/mserv/distinfo b/audio/mserv/distinfo index dee3578f9d1..5016bc7d1c9 100644 --- a/audio/mserv/distinfo +++ b/audio/mserv/distinfo @@ -1,6 +1,12 @@ -$NetBSD: distinfo,v 1.2 2002/02/12 14:49:46 martin Exp $ +$NetBSD: distinfo,v 1.2.2.1 2002/06/23 18:38:57 jlam Exp $ SHA1 (mserv-0.33.tar.gz) = 4aa66852057942341d9da9c6f839d7ee250f6785 Size (mserv-0.33.tar.gz) = 136456 bytes -SHA1 (patch-aa) = 14cd015a4d8a02daf7708c566026ae6c985f3260 -SHA1 (patch-ab) = ba829dd06621a8034989e8e44812a3937b7002cd +SHA1 (patch-aa) = 1b98fc3141aa2991697d3ce243b1d36b7c396c79 +SHA1 (patch-ab) = a8c5fa8039b92318afae6e48329e799e3acc226a +SHA1 (patch-ac) = a84b11a87a794980570c8c4fbbd66d4e68a13a3e +SHA1 (patch-ad) = 62fbf36cd77f10909602baefcb1d6ab031bc3010 +SHA1 (patch-ae) = 0b2dd28cfc3a9845a1543f08738e0251334f1b87 +SHA1 (patch-af) = 2d35f18de17ddb98a5b5d8b8fd101b5fe8290e59 +SHA1 (patch-ag) = eed5668942fdc801685aeda8aa2c31ec24d03729 +SHA1 (patch-ah) = 23c8b611ea84670aea10bcc4b12f9670cf15a060 diff --git a/audio/mserv/patches/patch-aa b/audio/mserv/patches/patch-aa index 82876d97dbe..0eb053fa88f 100644 --- a/audio/mserv/patches/patch-aa +++ b/audio/mserv/patches/patch-aa @@ -1,13 +1,19 @@ -$NetBSD: patch-aa,v 1.1 2002/02/12 14:22:15 martin Exp $ +$NetBSD: patch-aa,v 1.1.2.1 2002/06/23 18:38:57 jlam Exp $ ---- mserv/defines.h.orig Thu Jul 13 23:35:18 2000 -+++ mserv/defines.h Tue Feb 12 14:49:02 2002 -@@ -57,7 +57,7 @@ - #define MISCINFOLEN 128 +--- Makefile.orig Sat Jul 15 18:29:10 2000 ++++ Makefile +@@ -2,11 +2,11 @@ + BASE = ${shell basename ${PWD}} - /* maximum number of tracks in each album */ --#define TRACKSPERALBUM 200 -+#define TRACKSPERALBUM 1200 + default: +- (cd mserv; ./configure) ++ (cd mserv; ./configure --prefix=${PREFIX} --datadir=${PREFIX}/share) + (cd mserv; make DEFS=${DEFS}) +- (cd mservcli; ./configure) ++ (cd mservcli; ./configure --prefix=${PREFIX} --datadir=${PREFIX}/share) + (cd mservcli; make DEFS=${DEFS}) +- (cd mservutils; ./configure) ++ (cd mservutils; ./configure --prefix=${PREFIX} --datadir=${PREFIX}/share) + (cd mservutils; make DEFS=${DEFS}) - /* maximum language line length */ - #define LANGLINELEN 1024 + install: diff --git a/audio/mserv/patches/patch-ab b/audio/mserv/patches/patch-ab index 756ef58bab8..f9fa94eb967 100644 --- a/audio/mserv/patches/patch-ab +++ b/audio/mserv/patches/patch-ab @@ -1,19 +1,14 @@ -$NetBSD: patch-ab,v 1.2 2002/02/12 14:49:46 martin Exp $ +$NetBSD: patch-ab,v 1.2.2.1 2002/06/23 18:38:58 jlam Exp $ ---- Makefile.orig Sat Jul 15 20:29:10 2000 -+++ Makefile Tue Feb 12 15:13:35 2002 -@@ -2,11 +2,11 @@ - BASE = ${shell basename ${PWD}} +--- mserv/config.h.in.orig Tue Jan 25 19:59:08 2000 ++++ mserv/config.h.in +@@ -11,6 +11,9 @@ + #define RETSIGTYPE void - default: -- (cd mserv; ./configure) -+ (cd mserv; ./configure --prefix=${PREFIX} --datadir=${PREFIX}/share) - (cd mserv; make DEFS=${DEFS}) -- (cd mservcli; ./configure) -+ (cd mservcli; ./configure --prefix=${PREFIX} --datadir=${PREFIX}/share) - (cd mservcli; make DEFS=${DEFS}) -- (cd mservutils; ./configure) -+ (cd mservutils; ./configure --prefix=${PREFIX} --datadir=${PREFIX}/share) - (cd mservutils; make DEFS=${DEFS}) + /* Define if we have soundcard.h */ ++#undef HAVE_SOUNDCARD_H ++ ++/* Define if we have sys/soundcard.h */ + #undef HAVE_SYS_SOUNDCARD_H - install: + /* Define if we have strsep() */ diff --git a/audio/mserv/patches/patch-ac b/audio/mserv/patches/patch-ac new file mode 100644 index 00000000000..51d1a7f41c8 --- /dev/null +++ b/audio/mserv/patches/patch-ac @@ -0,0 +1,12 @@ +$NetBSD: patch-ac,v 1.1.2.2 2002/06/23 18:38:58 jlam Exp $ + +--- mserv/configure.in.orig Tue Jan 25 19:59:11 2000 ++++ mserv/configure.in +@@ -28,6 +28,7 @@ + AC_CHECK_LIB(socket, main, XTRA_LIBS="$XTRA_LIBS -lsocket") + AC_CHECK_LIB(malloc, main, XTRA_LIBS="$XTRA_LIBS -lmalloc") + AC_CHECK_LIB(crypt, crypt, XTRA_LIBS="$XTRA_LIBS -lcrypt") ++ AC_CHECK_LIB(ossaudio, _oss_ioctl, XTRA_LIBS="$XTRA_LIBS -lossaudio") + AC_CHECK_LIB(nsl, inet_ntoa, XTRA_LIBS="$XTRA_LIBS -lnsl") + # AC_CHECK_LIB(resolv, main, XTRA_LIBS="$XTRA_LIBS -lresolv") + diff --git a/audio/mserv/patches/patch-ad b/audio/mserv/patches/patch-ad new file mode 100644 index 00000000000..d08d1c3377c --- /dev/null +++ b/audio/mserv/patches/patch-ad @@ -0,0 +1,51 @@ +$NetBSD: patch-ad,v 1.1.2.2 2002/06/23 18:38:59 jlam Exp $ + +--- mserv/configure.orig Sat Jul 15 18:33:45 2000 ++++ mserv/configure +@@ -1201,6 +1201,46 @@ + echo "$ac_t""no" 1>&6 + fi + ++ echo $ac_n "checking for _oss_ioctl in -lossaudio""... $ac_c" 1>&6 ++echo "configure:1206: checking for _oss_ioctl in -lossaudio" >&5 ++ac_lib_var=`echo ossaudio'_'_oss_ioctl | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lossaudio $LIBS" ++cat > conftest.$ac_ext <<EOF ++#line 1214 "configure" ++#include "confdefs.h" ++/* Override any gcc2 internal prototype to avoid an error. */ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char _oss_ioctl(); ++ ++int main() { ++_oss_ioctl() ++; return 0; } ++EOF ++if { (eval echo configure:1225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" ++ ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ XTRA_LIBS="$XTRA_LIBS -lossaudio" ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ + echo $ac_n "checking for inet_ntoa in -lnsl""... $ac_c" 1>&6 + echo "configure:1206: checking for inet_ntoa in -lnsl" >&5 + ac_lib_var=`echo nsl'_'inet_ntoa | sed 'y%./+-%__p_%'` diff --git a/audio/mserv/patches/patch-ae b/audio/mserv/patches/patch-ae new file mode 100644 index 00000000000..fab9ca32d8a --- /dev/null +++ b/audio/mserv/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1.2.2 2002/06/23 18:38:59 jlam Exp $ + +--- mserv/defconf.c.orig Thu Jul 13 21:20:42 2000 ++++ mserv/defconf.c +@@ -15,7 +15,7 @@ + + # Define player invokation methods + # mservplay is our special wrapper, the first parameter is a 'nice' level +-mpg123=/usr/local/bin/mpg123 -b 1024 ++mpg123=" PATH_MPG123 " -b 1024 + freeamp=/usr/local/bin/freeamp -ui mpg123 + mservplay=/usr/local/bin/mservplay 0 mpg123 -b 1024 + diff --git a/audio/mserv/patches/patch-af b/audio/mserv/patches/patch-af new file mode 100644 index 00000000000..1d6d12906fc --- /dev/null +++ b/audio/mserv/patches/patch-af @@ -0,0 +1,24 @@ +$NetBSD: patch-af,v 1.1.2.2 2002/06/23 18:39:00 jlam Exp $ + +--- mserv/defines.h.orig Thu Jul 13 21:35:18 2000 ++++ mserv/defines.h +@@ -16,6 +16,10 @@ + #define PATH_LANGUAGE SHAREDIR "/english.lang" + */ + ++#ifndef PATH_MPG123 ++#define PATH_MPG123 BINDIR "/mpg123" ++#endif ++ + /* maximum amount to queue in each output buffer */ + #define OUTBUFLEN 32*1024 + +@@ -57,7 +61,7 @@ + #define MISCINFOLEN 128 + + /* maximum number of tracks in each album */ +-#define TRACKSPERALBUM 200 ++#define TRACKSPERALBUM 250 + + /* maximum language line length */ + #define LANGLINELEN 1024 diff --git a/audio/mserv/patches/patch-ag b/audio/mserv/patches/patch-ag new file mode 100644 index 00000000000..a89ec3641b6 --- /dev/null +++ b/audio/mserv/patches/patch-ag @@ -0,0 +1,15 @@ +$NetBSD: patch-ag,v 1.1.2.2 2002/06/23 18:39:01 jlam Exp $ + +--- mserv/mservplay.c.orig Tue Jan 25 19:59:16 2000 ++++ mserv/mservplay.c +@@ -14,10 +14,6 @@ + #include "defines.h" + #include "misc.h" + +-#ifndef PATH_MPG123 +-#define PATH_MPG123 "/usr/local/bin/mpg123" +-#endif +- + int main(int argc, char *argv[]) + { + const pid_t pid = getpid(); diff --git a/audio/mserv/patches/patch-ah b/audio/mserv/patches/patch-ah new file mode 100644 index 00000000000..2ebe163f408 --- /dev/null +++ b/audio/mserv/patches/patch-ah @@ -0,0 +1,15 @@ +$NetBSD: patch-ah,v 1.1.2.2 2002/06/23 18:39:02 jlam Exp $ + +--- mserv/opt.c.orig Thu Jul 13 21:14:41 2000 ++++ mserv/opt.c +@@ -164,8 +164,8 @@ + /* special case - player variable is an indirected to another variable */ + if ((val = conf_getvalue("player")) == NULL) { + if (mserv_verbose) +- printf("No player specified, defaulting to /usr/local/bin/mpg123\n"); +- opt_player = "/usr/local/bin/mpg123"; ++ printf("No player specified, defaulting to " PATH_MPG123 "\n"); ++ opt_player = PATH_MPG123; + } else { + if ((opt_player = conf_getvalue(val)) == NULL) { + fprintf(stderr, "%s: player setting '%s' not found\n", progname, diff --git a/audio/nas/Makefile b/audio/nas/Makefile index 5267a4a9bf5..ba59fd3481e 100644 --- a/audio/nas/Makefile +++ b/audio/nas/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/08/22 17:38:56 jlam Exp $ +# $NetBSD: Makefile,v 1.15.2.1 2002/06/23 18:39:02 jlam Exp $ # FreeBSD ID: Makefile,v 1.8 1997/01/06 12:04:12 jkh Exp # @@ -7,7 +7,7 @@ PKGNAME= ${DISTNAME:S/.src//} WRKSRC= ${WRKDIR}/${PKGNAME} CATEGORIES= audio MASTER_SITES= http://radscan.com/nas/ \ - ${MASTER_SITE_XCONTRIB:=audio/nas/} + ftp://ftp.uni-duisburg.de/Sound/NAS/ \ MAINTAINER= packages@netbsd.org HOMEPAGE= http://radscan.com/nas.html diff --git a/audio/oggasm/DESCR b/audio/oggasm/DESCR new file mode 100644 index 00000000000..574c49858eb --- /dev/null +++ b/audio/oggasm/DESCR @@ -0,0 +1,5 @@ +Oggasm is a program that makes converting your mp3 collection into oggs +at all but painless process. Using oggenc and mpg321(or mpg123), with perl +glueing it all together, oggasm is able to go through an entire collection, +identify id3 tags and then convert those mp3s into oggs while keeping +the id3 tags intact. diff --git a/audio/oggasm/Makefile b/audio/oggasm/Makefile new file mode 100644 index 00000000000..5c7f3d6ef40 --- /dev/null +++ b/audio/oggasm/Makefile @@ -0,0 +1,27 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:39:04 jlam Exp $ +# + +DISTNAME= oggasm_1.4.0 +PKGNAME= ${DISTNAME:S/_/-/} +CATEGORIES= audio +MASTER_SITES= http://oggasm.sourceforge.net/ + +MAINTAINER= rxg@netbsd.org +HOMEPAGE= http://oggasm.sourceforge.net/ +COMMENT= perform batch conversion of mp3s into oggs + +DEPENDS+= mpg123>=0.59.18:../../audio/mpg123 +DEPENDS+= vorbis-tools>=1.0.0.7:../../audio/vorbis-tools +DEPENDS+= p5-MP3-Info>=1.00:../../audio/p5-MP3-Info + +USE_PERL5= yes +REPLACE_PERL= ${WRKSRC}/oggasm + +NO_BUILD= yes +WRKSRC= ${WRKDIR}/${PKGNAME} + +do-install: + ${INSTALL_SCRIPT} ${WRKSRC}/oggasm ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/oggasm.1 ${PREFIX}/man/man1 + +.include "../../mk/bsd.pkg.mk" diff --git a/audio/oggasm/PLIST b/audio/oggasm/PLIST new file mode 100644 index 00000000000..708e430c795 --- /dev/null +++ b/audio/oggasm/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.50.2 2002/06/23 18:39:05 jlam Exp $ +bin/oggasm +man/man1/oggasm.1 diff --git a/audio/oggasm/distinfo b/audio/oggasm/distinfo new file mode 100644 index 00000000000..f228ead4324 --- /dev/null +++ b/audio/oggasm/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.12.2 2002/06/23 18:39:06 jlam Exp $ + +SHA1 (oggasm_1.4.0.tar.gz) = 3a418b63b2b681a42ec1198a0c94b0f2209d1374 +Size (oggasm_1.4.0.tar.gz) = 35042 bytes diff --git a/audio/p5-MP3-Info/Makefile b/audio/p5-MP3-Info/Makefile index 0cc77810c40..3a1bbf05bac 100644 --- a/audio/p5-MP3-Info/Makefile +++ b/audio/p5-MP3-Info/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/03/02 02:30:34 rxg Exp $ +# $NetBSD: Makefile,v 1.1.1.1.2.1 2002/06/23 18:39:07 jlam Exp $ -DISTNAME= MP3-Info-1.00 -PKGNAME= p5-MP3-Info-1.00 +DISTNAME= MP3-Info-1.01 +PKGNAME= p5-${DISTNAME} CATEGORIES= audio perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=MP3/} -MAINTAINER= rxg@netbsd.org +MAINTAINER= packages@netbsd.org HOMEPAGE= http://search.cpan.org/search?module=MP3::Info COMMENT= Manipulate / fetch info from MP3 audio files diff --git a/audio/p5-MP3-Info/distinfo b/audio/p5-MP3-Info/distinfo index 63e187b9850..1a1d7961aab 100644 --- a/audio/p5-MP3-Info/distinfo +++ b/audio/p5-MP3-Info/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/03/02 02:30:34 rxg Exp $ +$NetBSD: distinfo,v 1.1.1.1.2.1 2002/06/23 18:39:07 jlam Exp $ -SHA1 (MP3-Info-1.00.tar.gz) = d97914b52bfdf5abe475298026e506ed901ff306 -Size (MP3-Info-1.00.tar.gz) = 49795 bytes +SHA1 (MP3-Info-1.01.tar.gz) = 78434f1487343e549c5cfe5465b266288b66d810 +Size (MP3-Info-1.01.tar.gz) = 51394 bytes diff --git a/audio/rioutil/DESCR b/audio/rioutil/DESCR new file mode 100644 index 00000000000..f1576c62c5b --- /dev/null +++ b/audio/rioutil/DESCR @@ -0,0 +1,3 @@ +This program will talk to usb based diamond mm products (with +exception of the rio500, try rio500.sourceforge.net). This code +will be maintained until the first release of libpdmp. diff --git a/audio/rioutil/Makefile b/audio/rioutil/Makefile new file mode 100644 index 00000000000..85eaac41de8 --- /dev/null +++ b/audio/rioutil/Makefile @@ -0,0 +1,26 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:39:09 jlam Exp $ +# + +DISTNAME= rioutil-1.1.2alpha +PKGNAME= rioutil-1.1.2.0.1 +CATEGORIES= audio +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rioutil/} + +MAINTAINER= schmonz@netbsd.org +HOMEPAGE= http://rioutil.sourceforge.net/ +COMMENT= program and library to interface with Rio 600, 800, Nike psa[play + +USE_BUILDLINK_ONLY= # defined + +USE_LIBTOOL= # defined +LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +GNU_CONFIGURE= # defined +CONFIGURE_ARGS+= --with-libusb + +# on NetBSD, we need a recent urio.c +ONLY_FOR_PLATFORM= NetBSD-1.5Z-* NetBSD-1.5Z[A-Z]-* NetBSD-1.[6-9]*-* \ + Darwin-*-* Linux-*-* + +.include "../../audio/id3lib/buildlink.mk" +.include "../../devel/libusb/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/audio/rioutil/PLIST b/audio/rioutil/PLIST new file mode 100644 index 00000000000..1371eb91df0 --- /dev/null +++ b/audio/rioutil/PLIST @@ -0,0 +1,10 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2002/06/23 18:39:10 jlam Exp $ +bin/riofck +bin/rioutil +include/rio.h +lib/librioutil.a +lib/librioutil.la +lib/librioutil.so +lib/librioutil.so.1 +lib/librioutil.so.1.0 +man/man1/rioutil.1 diff --git a/audio/rioutil/distinfo b/audio/rioutil/distinfo new file mode 100644 index 00000000000..fd244f17385 --- /dev/null +++ b/audio/rioutil/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:39:10 jlam Exp $ + +SHA1 (rioutil-1.1.2alpha.tar.gz) = d7cd8f21d1337946b7530b8d36d3d1ce2e2e818d +Size (rioutil-1.1.2alpha.tar.gz) = 277773 bytes +SHA1 (patch-aa) = 3a5adf41ff1bcf56f2178fb31b31c207dd608a65 diff --git a/audio/rioutil/patches/patch-aa b/audio/rioutil/patches/patch-aa new file mode 100644 index 00000000000..74d45b30597 --- /dev/null +++ b/audio/rioutil/patches/patch-aa @@ -0,0 +1,24 @@ +$NetBSD: patch-aa,v 1.1.1.1.2.2 2002/06/23 18:39:11 jlam Exp $ + +--- src/Makefile.in.orig Sat Mar 2 00:23:48 2002 ++++ src/Makefile.in +@@ -201,14 +201,14 @@ + + bin_PROGRAMS = rioutil riofck + +-INCLUDES = -I$(top_srcdir)/include -I/usr/local/include ++INCLUDES = -I$(top_srcdir)/include + + riofck_SOURCES = fckrio.c + rioutil_SOURCES = main.c getopt.c getopt1.c main.h getopt.h +-@MACOSX_TRUE@rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la -lIOKit +-@MACOSX_FALSE@rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la +-@MACOSX_TRUE@riofck_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la -lIOKit +-@MACOSX_FALSE@riofck_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la ++@MACOSX_TRUE@rioutil_LDADD = $(top_srcdir)/librioutil/librioutil.la -lIOKit ++@MACOSX_FALSE@rioutil_LDADD = $(top_srcdir)/librioutil/librioutil.la ++@MACOSX_TRUE@riofck_LDADD = $(top_srcdir)/librioutil/librioutil.la -lIOKit ++@MACOSX_FALSE@riofck_LDADD = $(top_srcdir)/librioutil/librioutil.la + @MACOSX_TRUE@CFLGS = -traditional-cpp + + CFLAGS = -g -O3 diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile index f25222b6594..18d2da3a51e 100644 --- a/audio/spiralloops/Makefile +++ b/audio/spiralloops/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/08/12 22:27:05 zuntum Exp $ +# $NetBSD: Makefile,v 1.1.1.1.2.1 2002/06/23 18:39:12 jlam Exp $ # DISTNAME= SpiralLoops-2.0.0 @@ -15,7 +15,6 @@ ONLY_FOR_PLATFORM= *-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \ *-*-hpcmips *-*-hpcsh *-*-i386 *-*-pc532 *-*-pmax \ *-*-vax -USE_X11= yes USE_GMAKE= yes GNU_CONFIGURE= yes @@ -23,4 +22,5 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/SpiralLoops ${PREFIX}/bin .include "../../x11/fltk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/spiralloops/distinfo b/audio/spiralloops/distinfo index 6e6090868a3..8fabdda2cba 100644 --- a/audio/spiralloops/distinfo +++ b/audio/spiralloops/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/08/12 22:27:05 zuntum Exp $ +$NetBSD: distinfo,v 1.1.1.1.2.1 2002/06/23 18:39:13 jlam Exp $ SHA1 (SpiralLoops-2.0.0.tar.gz) = 47d9caa17f20827abef7708bff212bb3fad58a72 Size (SpiralLoops-2.0.0.tar.gz) = 85458 bytes -SHA1 (patch-aa) = 611b2f7738d73a16665a5bf13714b8ebff73dafd +SHA1 (patch-aa) = faae8e528ab46b7a83d53719fca07588e45407a2 SHA1 (patch-ab) = 8d21e1615909f94c750f1cf3afbf46f7e0cfdb83 SHA1 (patch-ac) = 4a1675489e169d8ce9090eeaabf8c30ceb047897 SHA1 (patch-ad) = 09c1734e875335dae92afef7bbbd4fdc6821eb1f diff --git a/audio/spiralloops/patches/patch-aa b/audio/spiralloops/patches/patch-aa index dedc1e53ee6..2b1dab243b3 100644 --- a/audio/spiralloops/patches/patch-aa +++ b/audio/spiralloops/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/08/12 22:27:05 zuntum Exp $ +$NetBSD: patch-aa,v 1.1.1.1.2.1 2002/06/23 18:39:14 jlam Exp $ --- Makefile.in.orig Mon May 7 14:42:59 2001 +++ Makefile.in @@ -8,11 +8,11 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/08/12 22:27:05 zuntum Exp $ CXXFLAGS= -pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused -INCPATH = -I/usr/X11R6/include -LINK = g++ -+INCPATH = -I${X11BASE}/include -+LINK = g++ -Wl,-R${X11BASE}/lib ++INCPATH = -I${BUILDLINK_X11_DIR}/include -I${BUILDLINK_DIR}/include ++LINK = g++ -Wl,-R${X11BASE}/lib -Wl,-R${X11PREFIX}/lib LFLAGS = -LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl -+LIBS = -L${X11BASE}/lib -lfltk -lGL -lXext -lX11 -lm -lossaudio ++LIBS = -L${BUILDLINK_X11_DIR}/lib -L${BUILDLINK_DIR}/lib -lfltk -lGL -lXext -lX11 -lm -lossaudio MOC = moc UIC = TAR = tar -cf diff --git a/audio/spiralsynth/DESCR b/audio/spiralsynth/DESCR new file mode 100644 index 00000000000..a3aa24211d0 --- /dev/null +++ b/audio/spiralsynth/DESCR @@ -0,0 +1,6 @@ +Spiral Synth is a physically modelled polyphonic analogue synthesizer for +Linux or BSD. It is capable of creating the kind of sounds made by +hardware analogue synths, the noises used in electronic music. You can +also use it to make stranger sounds too. Midi is supported, including +velocity detection, mapped to the volume of the oscillators (But you can +also use the PC keyboard to play the synth). diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile new file mode 100644 index 00000000000..32df9432f12 --- /dev/null +++ b/audio/spiralsynth/Makefile @@ -0,0 +1,29 @@ +# $NetBSD: Makefile,v 1.2.2.2 2002/06/23 18:39:16 jlam Exp $ +# + +DISTNAME= SpiralSynth-0.1.7 +PKGNAME= spiralsynth-0.1.7 +CATEGORIES= audio +MASTER_SITES= http://www.pawfal.org/Software/SpiralSynth/dload/ + +MAINTAINER= collver@linuxfreemail.com +HOMEPAGE= http://www.pawfal.org/Software/SpiralSynth/ +COMMENT= polyphonic analogue softsynth + +# only runs correctly on little-endian machines +ONLY_FOR_PLATFORM= *-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \ + *-*-hpcmips *-*-hpcsh *-*-i386 *-*-pc532 *-*-pmax \ + *-*-vax + +USE_GMAKE= yes +GNU_CONFIGURE= yes + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/SpiralSynth ${PREFIX}/bin + ${INSTALL_DATA_DIR} ${PREFIX}/share/spiralsynth + ${INSTALL_DATA} ${WRKSRC}/.SpiralPatches.bank \ + ${WRKSRC}/.Spiralrc ${PREFIX}/share/spiralsynth + +.include "../../x11/fltk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/audio/spiralsynth/PLIST b/audio/spiralsynth/PLIST new file mode 100644 index 00000000000..0e3c7698582 --- /dev/null +++ b/audio/spiralsynth/PLIST @@ -0,0 +1,5 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.48.2 2002/06/23 18:39:16 jlam Exp $ +bin/SpiralSynth +share/spiralsynth/.SpiralPatches.bank +share/spiralsynth/.Spiralrc +@dirrm share/spiralsynth diff --git a/audio/spiralsynth/distinfo b/audio/spiralsynth/distinfo new file mode 100644 index 00000000000..79d414f7dcf --- /dev/null +++ b/audio/spiralsynth/distinfo @@ -0,0 +1,7 @@ +$NetBSD: distinfo,v 1.2.2.2 2002/06/23 18:39:17 jlam Exp $ + +SHA1 (SpiralSynth-0.1.7.tar.gz) = 8b66749b940c9dcfcd4a71c319ac233139014204 +Size (SpiralSynth-0.1.7.tar.gz) = 62393 bytes +SHA1 (patch-aa) = d54ff8dbdcad1fd65487b2db6eada7b7947141e1 +SHA1 (patch-ab) = eea5f0a97ccc796a176d48b2acfe61f6a455e51f +SHA1 (patch-ad) = 207bc32f2991f99ba2e907a417d127f0073b3d24 diff --git a/audio/spiralsynth/patches/patch-aa b/audio/spiralsynth/patches/patch-aa new file mode 100644 index 00000000000..20457b7c650 --- /dev/null +++ b/audio/spiralsynth/patches/patch-aa @@ -0,0 +1,18 @@ +$NetBSD: patch-aa,v 1.2.2.2 2002/06/23 18:39:18 jlam Exp $ + +--- Makefile.in.orig Tue Aug 14 20:12:55 2001 ++++ Makefile.in +@@ -11,10 +11,10 @@ + CXX = g++ + CFLAGS = -pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused + CXXFLAGS= -pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused +-INCPATH = -I/usr/X11R6/include +-LINK = g++ ++INCPATH = -I${BUILDLINK_X11_DIR}/include -I${BUILDLINK_DIR}/include ++LINK = g++ -Wl,-R${X11BASE}/lib -Wl,-R${X11PREFIX}/lib + LFLAGS = +-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm ++LIBS = -L${BUILDLINK_X11_DIR}/lib -L${BUILDLINK_DIR}/lib -lfltk -lGL -lXext -lX11 -lm -lossaudio + MOC = moc + + TAR = tar -cf diff --git a/audio/spiralsynth/patches/patch-ab b/audio/spiralsynth/patches/patch-ab new file mode 100644 index 00000000000..63e04101af7 --- /dev/null +++ b/audio/spiralsynth/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1.1.1.2.2 2002/06/23 18:39:19 jlam Exp $ + +--- SpiralInfo.C.orig Sun Nov 26 07:52:43 2000 ++++ SpiralInfo.C +@@ -41,7 +41,7 @@ + float SpiralInfo::VALUECONV = 1.0f/MAXSAMPLE; + bool SpiralInfo::WANTMIDI = true; + int SpiralInfo::FILTERGRAN = 50; +-string SpiralInfo::OUTPUTFILE = "/dev/dsp"; ++string SpiralInfo::OUTPUTFILE = "/dev/sound"; + string SpiralInfo::MIDIFILE = "/dev/midi"; + int SpiralInfo::POLY = 2; + bool SpiralInfo::REALTIMEOUT = true; diff --git a/audio/spiralsynth/patches/patch-ad b/audio/spiralsynth/patches/patch-ad new file mode 100644 index 00000000000..d12545c4c98 --- /dev/null +++ b/audio/spiralsynth/patches/patch-ad @@ -0,0 +1,25 @@ +$NetBSD: patch-ad,v 1.1.1.1.10.2 2002/06/23 18:39:20 jlam Exp $ + +--- SpiralSound/Output.h.orig Sun Nov 26 07:52:46 2000 ++++ SpiralSound/Output.h +@@ -16,6 +16,7 @@ + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + ++#include <sys/ioctl.h> + #include <sys/types.h> + #include <stdio.h> + #include <fcntl.h> +@@ -25,12 +26,10 @@ + #else + #if defined (__NetBSD__) || defined (__OpenBSD__) + #include <soundcard.h> /* OSS emulation */ +-#undef ioctl + #else /* BSDI, Linux, Solaris */ + #include <sys/soundcard.h> + #endif /* __NetBSD__ or __OpenBSD__ */ + #endif /* __FreeBSD__ */ +-#include <sys/ioctl.h> + #include <limits.h> + + #include "SpiralInfo.h" diff --git a/audio/wmmixer/distinfo b/audio/wmmixer/distinfo index cb1ee38badb..bf9bdb5fe05 100644 --- a/audio/wmmixer/distinfo +++ b/audio/wmmixer/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2001/05/08 15:48:48 agc Exp $ +$NetBSD: distinfo,v 1.2.2.1 2002/06/23 18:39:21 jlam Exp $ -SHA1 (wmmixer-1.0-beta1.tgz) = dcef049f9a817b09644930cee99e0989448452a5 -Size (wmmixer-1.0-beta1.tgz) = 18891 bytes +SHA1 (wmmixer-1.0-beta1.tgz) = b8695455e1a7364aa337feb924f059db9a5856fe +Size (wmmixer-1.0-beta1.tgz) = 18801 bytes diff --git a/audio/wmmp3/DESCR b/audio/wmmp3/DESCR new file mode 100644 index 00000000000..de618cd9381 --- /dev/null +++ b/audio/wmmp3/DESCR @@ -0,0 +1,6 @@ +wmmp3 is an mpg123 frontend. It is a small X application that will also +work as a windowmaker dock app. + +All user options are contained in a config file, ~/.wmmp3 . There is a +sample.wmmp3 file in the distribution that can be used as an +example/template. diff --git a/audio/wmmp3/Makefile b/audio/wmmp3/Makefile new file mode 100644 index 00000000000..e02c0e417fd --- /dev/null +++ b/audio/wmmp3/Makefile @@ -0,0 +1,27 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:39:23 jlam Exp $ + +DISTNAME= wmmp3-0.12 +CATEGORIES= audio +MASTER_SITES= http://www.dotfiles.com/software/wmmp3/ + +MAINTAINER= rxg@netbsd.org +HOMEPAGE= http://www.dotfiles.com/software/wmmp3/ +COMMENT= front-end for mpg123 in a Window Maker dockapp + +DEPENDS+= mpg123>=0.59.18:../../audio/mpg123 + +GNU_CONFIGURE= yes +USE_X11BASE= yes + +post-patch: + ${MV} ${WRKSRC}/sample.wmmp3 ${WRKSRC}/sample.wmmp3.orig + ${SED} -e 's:/usr/local:'${LOCALBASE}':g' \ + ${WRKSRC}/sample.wmmp3.orig > ${WRKSRC}/sample.wmmp3 + +post-install: + @${ECHO} "===> Installing sample.wmmp3 in ${PREFIX}/share/examples" + ${INSTALL_DATA} ${WRKSRC}/sample.wmmp3 ${PREFIX}/share/examples + +.include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/audio/wmmp3/PLIST b/audio/wmmp3/PLIST new file mode 100644 index 00000000000..cfb0d45bc20 --- /dev/null +++ b/audio/wmmp3/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.50.2 2002/06/23 18:39:24 jlam Exp $ +bin/wmmp3 +share/examples/sample.wmmp3 diff --git a/audio/wmmp3/distinfo b/audio/wmmp3/distinfo new file mode 100644 index 00000000000..933a88e4215 --- /dev/null +++ b/audio/wmmp3/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.12.2 2002/06/23 18:39:25 jlam Exp $ + +SHA1 (wmmp3-0.12.tar.gz) = 439e19550c58fe31db8c1bcf2985c56f62d7bc1f +Size (wmmp3-0.12.tar.gz) = 43977 bytes diff --git a/audio/wmsmixer/DESCR b/audio/wmsmixer/DESCR new file mode 100644 index 00000000000..90fae2baf0e --- /dev/null +++ b/audio/wmsmixer/DESCR @@ -0,0 +1,3 @@ +WMsmixer is a hack to wmmixer which makes some changes to the +display and adds a few new features, most notably scrollwheel +support. It also includes a numeric volume indicator. diff --git a/audio/wmsmixer/Makefile b/audio/wmsmixer/Makefile new file mode 100644 index 00000000000..d86622985ec --- /dev/null +++ b/audio/wmsmixer/Makefile @@ -0,0 +1,25 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:39:26 jlam Exp $ +# + +DISTNAME= wmsmixer-0.5 +CATEGORIES= audio +MASTER_SITES= http://www.hibernaculum.net/download/ + +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://www.hibernaculum.net/wmsmixer.html +COMMENT= Another mixer designed for WindowMaker (dockapp) + +USE_IMAKE= YES +NO_INSTALL_MANPAGES= YES + +pre-build: + ${TOUCH} ${WRKSRC}/wmsmixer.man + +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmsmixer + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/wmsmixer + ${INSTALL_DATA} ${WRKSRC}/home.wmsmixer ${PREFIX}/share/examples/wmsmixer + ${INSTALL_DATA} ${WRKSRC}/README.wmmixer ${PREFIX}/share/doc/wmsmixer/README.wmsmixer + +.include "../../graphics/xpm/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/audio/wmsmixer/PLIST b/audio/wmsmixer/PLIST new file mode 100644 index 00000000000..71089426e7b --- /dev/null +++ b/audio/wmsmixer/PLIST @@ -0,0 +1,6 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.48.2 2002/06/23 18:39:27 jlam Exp $ +bin/wmsmixer +share/examples/wmsmixer/home.wmsmixer +share/doc/wmsmixer/README.wmsmixer +@dirrm share/examples/wmsmixer +@dirrm share/doc/wmsmixer diff --git a/audio/wmsmixer/distinfo b/audio/wmsmixer/distinfo new file mode 100644 index 00000000000..dd3eb5f0275 --- /dev/null +++ b/audio/wmsmixer/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:39:27 jlam Exp $ + +SHA1 (wmsmixer-0.5.tar.gz) = 55cfd1293eac8c6abab20d4a64f3989993ff3e28 +Size (wmsmixer-0.5.tar.gz) = 26208 bytes diff --git a/audio/wmusic/DESCR b/audio/wmusic/DESCR new file mode 100644 index 00000000000..fe3f2d626e1 --- /dev/null +++ b/audio/wmusic/DESCR @@ -0,0 +1,3 @@ +wmusic is a dockapp that remote-controls xmms. Features include +VCR-style controls, Time and Playlist display, supa style rotating +arrow, hiding of the xmms windows and reactive interface. diff --git a/audio/wmusic/Makefile b/audio/wmusic/Makefile new file mode 100644 index 00000000000..bc6d03efb77 --- /dev/null +++ b/audio/wmusic/Makefile @@ -0,0 +1,26 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:39:29 jlam Exp $ + +DISTNAME= wmusic-1.4.7 +CATEGORIES= audio windowmaker +MASTER_SITES= http://hadess.net/files/ + +MAINTAINER= ptiJo@noos.fr +HOMEPAGE= http://hadess.net/code.shtml +COMMENT= WindowMaker dockable remote for xmms + +USE_BUILDLINK_ONLY= yes + +GNU_CONFIGURE= yes +USE_GMAKE= yes + +do-install: + @${INSTALL_PROGRAM} ${WRKSRC}/src/wmusic ${PREFIX}/bin + @${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \ + ${PREFIX}/share/doc/wmusic + @${INSTALL_DATA} -d ${WRKSRC}/README ${PREFIX}/share/doc/wmusic + @${INSTALL_DATA} -d ${WRKSRC}/COPYING ${PREFIX}/share/doc/wmusic + +.include "../../audio/xmms/buildlink.mk" +.include "../../graphics/xpm/buildlink.mk" +.include "../../x11/gtk/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/audio/wmusic/PLIST b/audio/wmusic/PLIST new file mode 100644 index 00000000000..2d8a79d7854 --- /dev/null +++ b/audio/wmusic/PLIST @@ -0,0 +1,4 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.4.2 2002/06/23 18:39:30 jlam Exp $ +bin/wmusic +@exec ${MKDIR} %D/share/doc/wmusic +@dirrm share/doc/wmusic diff --git a/audio/wmusic/distinfo b/audio/wmusic/distinfo new file mode 100644 index 00000000000..b54c9dfe676 --- /dev/null +++ b/audio/wmusic/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:39:30 jlam Exp $ + +MD5 (wmusic-1.4.7.tar.gz) = accd0711d89e4049174a2554e1c61958 +SHA1 (patch-ab) = 09d3a444a69b077c4145af45361ab3a257f104af diff --git a/audio/wmusic/patches/patch-ab b/audio/wmusic/patches/patch-ab new file mode 100644 index 00000000000..026d8e8b0b9 --- /dev/null +++ b/audio/wmusic/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1.1.1.8.2 2002/06/23 18:39:31 jlam Exp $ + +--- src/Makefile.in.orig Mon Apr 30 00:59:12 2001 ++++ src/Makefile.in Mon Apr 30 00:59:20 2001 +@@ -9,7 +9,7 @@ + ../libdockapp/dapixmap.c ../libdockapp/darect.c + OBJS = $(SRCS:.c=.o) + +-CFLAGS = -Wall -g -O2 -I. -I../libdockapp `@PATH_GTKCONFIG@ --cflags` \ ++CFLAGS += -Wall -g -I. -I../libdockapp `@PATH_GTKCONFIG@ --cflags` \ + `@PATH_XMMSCONFIG@ --cflags` \ + -DDATA_DIR=\"`@PATH_XMMSCONFIG@ --data-dir`\" + LDFLAGS = @LIBS@ -lXpm `@PATH_GTKCONFIG@ --libs` `@PATH_XMMSCONFIG@ --libs` \ diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile index 40c37cb84c8..a2818ec2ecf 100644 --- a/audio/xanalyser/Makefile +++ b/audio/xanalyser/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/04/23 03:33:26 schmonz Exp $ +# $NetBSD: Makefile,v 1.1.1.1.2.1 2002/06/23 18:39:32 jlam Exp $ # DISTNAME= xanalyser-1.21 +PKGREVISION= 1 CATEGORIES= audio MASTER_SITES= ftp://ftp.suse.com/pub/people/arvin/private/ EXTRACT_SUFX= .tar.bz2 @@ -15,5 +16,6 @@ GNU_CONFIGURE= # defined .include "../../graphics/xpm/buildlink.mk" .include "../../mk/motif.buildlink.mk" +.include "../../mk/ossaudio.buildlink.mk" .include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/xanalyser/PLIST b/audio/xanalyser/PLIST index 4ea41c402af..28e9e169422 100644 --- a/audio/xanalyser/PLIST +++ b/audio/xanalyser/PLIST @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/04/23 03:33:26 schmonz Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.2.1 2002/06/23 18:39:33 jlam Exp $ bin/xanalyser +lib/X11/app-defaults/XAnalyser man/man1/xanalyser.1 diff --git a/audio/xanalyser/distinfo b/audio/xanalyser/distinfo index 6da44a91e9f..909b66b7099 100644 --- a/audio/xanalyser/distinfo +++ b/audio/xanalyser/distinfo @@ -4,9 +4,10 @@ Size (xanalyser-1.21.tar.bz2) = 58542 bytes SHA1 (patch-aa) = 29651c643550679f647b54726fb8d25579cdaaf7 SHA1 (patch-ab) = bee615a58bd041c2b31645d3d312798c1dd5606d SHA1 (patch-ac) = 78f5f22951a918291c7ab5c61110c4ec2e9cf8b8 -SHA1 (patch-ad) = c37bac9f9630ad63618cbad58af89f051c1fe5d8 +SHA1 (patch-ad) = 7cfcc00ad3bc221264e0480020cfab613b01c359 SHA1 (patch-ae) = db464b9a91db329473e7d774b7fb53d977b258af SHA1 (patch-af) = bf6af0c140a802fb98e82e82ecbfb7240696db09 SHA1 (patch-ag) = 0ae5680df966e534d76d04cddf6a78259d87cbfe SHA1 (patch-ah) = a8bae5da6db1098ce1520cc49e167fc5999b0dda SHA1 (patch-ai) = 6805fc79e0c3135f6f22eb0b91c68cacd96c483c +SHA1 (patch-aj) = 2a6549638be3d3d25126b0938a11572ffe1c6564 diff --git a/audio/xanalyser/patches/patch-ad b/audio/xanalyser/patches/patch-ad index dd9895b094a..b5daa4a017b 100644 --- a/audio/xanalyser/patches/patch-ad +++ b/audio/xanalyser/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/04/23 03:33:27 schmonz Exp $ +$NetBSD: patch-ad,v 1.1.1.1.2.1 2002/06/23 18:39:34 jlam Exp $ ---- src/Makefile.in.orig Wed Jan 23 14:49:25 2002 +--- src/Makefile.in.orig Thu Jan 24 03:49:25 2002 +++ src/Makefile.in @@ -73,7 +73,7 @@ xanalyser_SOURCES = Analyser.cc Analyser.h DSP.cc DSP.h Sample.cc Sample.h Scope.cc Scope.h XAnalyser.ad.h control.cc control.h fft.cc fft.h help.cc help.h help.txt.h main.cc main.h utils.cc utils.h Trans.h @@ -22,3 +22,16 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/04/23 03:33:27 schmonz Exp $ help.cc: help.txt.h +@@ -311,8 +311,8 @@ + txt2c help.txt > help.txt.h + + install-data-hook: +- mkdir -p $(DESTDIR)/usr/X11R6/lib/X11/app-defaults +- cp XAnalyser.ad $(DESTDIR)/usr/X11R6/lib/X11/app-defaults/XAnalyser ++ mkdir -p $(DESTDIR)$(prefix)/lib/X11/app-defaults ++ cp XAnalyser.ad $(DESTDIR)$(prefix)/lib/X11/app-defaults/XAnalyser + + # 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. + + diff --git a/audio/xanalyser/patches/patch-aj b/audio/xanalyser/patches/patch-aj new file mode 100644 index 00000000000..ddc5a7fbdeb --- /dev/null +++ b/audio/xanalyser/patches/patch-aj @@ -0,0 +1,12 @@ +$NetBSD: patch-aj,v 1.1.2.2 2002/06/23 18:39:35 jlam Exp $ + +--- src/utils.cc.orig Sat Dec 1 19:37:13 2001 ++++ src/utils.cc +@@ -7,6 +7,7 @@ + + #include <stdio.h> + #include <math.h> ++#include <ctype.h> + + #include <X11/Xlib.h> + #include <Xm/Xm.h> diff --git a/audio/xmms-mad/DESCR b/audio/xmms-mad/DESCR new file mode 100644 index 00000000000..fd23afe87da --- /dev/null +++ b/audio/xmms-mad/DESCR @@ -0,0 +1,7 @@ +xmms-mad is an input plugin for xmms that uses libmad to decode MPEG +layer 1/2/3 file and streams. Current featured include: + local mp3 file playback + shoutchast/icecast stream playback + seeking + ID3 tag parsing + http header parsing diff --git a/audio/xmms-mad/Makefile b/audio/xmms-mad/Makefile new file mode 100644 index 00000000000..6033d2d573b --- /dev/null +++ b/audio/xmms-mad/Makefile @@ -0,0 +1,28 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 18:39:37 jlam Exp $ +# + +DISTNAME= xmms-mad-0.0.9 +CATEGORIES= audio +MASTER_SITES= http://www.superduper.net/downloads/xmms-mad/ + +MAINTAINER= jmcneill@netbsd.org +HOMEPAGE= http://www.superduper.net/xmms-mad/ +COMMENT= Input plugin for XMMS that uses libmad + +DEPENDS+= mad>=0.14:../../audio/mad + +GNU_CONFIGURE= YES +CONFIGURE_ENV+= LDFLAGS="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib" +CONFIGURE_ENV+= CFLAGS="-I${LOCALBASE}/include" +CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1 + +.include "../../mk/bsd.prefs.mk" + +.if (${OPSYS} == NetBSD) +CPPFLAGS+= -DHAVE_NANOSLEEP=1 +.endif + +.include "../../audio/xmms/buildlink.mk" +.include "../../mk/ossaudio.buildlink.mk" +.include "../../mk/x11.buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/audio/xmms-mad/PLIST b/audio/xmms-mad/PLIST new file mode 100644 index 00000000000..da3418a984c --- /dev/null +++ b/audio/xmms-mad/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.10.2 2002/06/23 18:39:38 jlam Exp $ +lib/xmms/Input/libxmmsmad.la +lib/xmms/Input/libxmmsmad.so diff --git a/audio/xmms-mad/distinfo b/audio/xmms-mad/distinfo new file mode 100644 index 00000000000..7f20db705b7 --- /dev/null +++ b/audio/xmms-mad/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 18:39:38 jlam Exp $ + +SHA1 (xmms-mad-0.0.9.tar.gz) = b8743ff110ef0c61062f25cdd0f8a591f43b789c +Size (xmms-mad-0.0.9.tar.gz) = 203320 bytes +SHA1 (patch-aa) = f502b03b845cb54078c5d086f6bcf88ca8e8111f +SHA1 (patch-ab) = 556c28f55718acc0bb1178c107fa22bd120a5660 diff --git a/audio/xmms-mad/patches/patch-aa b/audio/xmms-mad/patches/patch-aa new file mode 100644 index 00000000000..18c36857372 --- /dev/null +++ b/audio/xmms-mad/patches/patch-aa @@ -0,0 +1,14 @@ +$NetBSD: patch-aa,v 1.1.1.1.2.2 2002/06/23 18:39:39 jlam Exp $ + +--- src/decoder.c.orig Sat May 25 21:06:58 2002 ++++ src/decoder.c Sat May 25 21:07:05 2002 +@@ -205,6 +205,9 @@ + /* main loop */ + do + { ++#ifdef __NetBSD__ ++ pthread_yield_np(); ++#endif + if (info->stop) + break; + if (seek_skip) diff --git a/audio/xmms-mad/patches/patch-ab b/audio/xmms-mad/patches/patch-ab new file mode 100644 index 00000000000..01331506d7a --- /dev/null +++ b/audio/xmms-mad/patches/patch-ab @@ -0,0 +1,24 @@ +$NetBSD: patch-ab,v 1.1.1.1.2.2 2002/06/23 18:39:40 jlam Exp $ + +--- src/xmms-mad.c.orig Sat May 25 21:07:02 2002 ++++ src/xmms-mad.c Sat May 25 21:07:05 2002 +@@ -83,6 +83,9 @@ + printf ("waiting for thread\n"); + #endif /* DEBUG */ + pthread_join (decode_thread, 0); ++#ifdef __NetBSD__ ++ pthread_yield_np (); ++#endif + #ifdef DEBUG + printf ("thread done\n"); + #endif /* DEBUG */ +@@ -99,6 +102,9 @@ + info.playing = 1; + input_get_info (&info); + pthread_create (&decode_thread, 0, decode, (void *) &info); ++#ifdef __NetBSD__ ++ pthread_yield_np (); ++#endif + } + } + |