diff options
Diffstat (limited to 'audio')
-rw-r--r-- | audio/Makefile | 2 | ||||
-rw-r--r-- | audio/audacious-dumb/Makefile | 32 | ||||
-rw-r--r-- | audio/audacious-dumb/distinfo | 2 | ||||
-rw-r--r-- | audio/audacious-dumb/pkg-descr | 4 | ||||
-rw-r--r-- | audio/audacious-dumb/pkg-plist | 1 | ||||
-rw-r--r-- | audio/rezound/Makefile | 117 | ||||
-rw-r--r-- | audio/rezound/distinfo | 2 | ||||
-rw-r--r-- | audio/rezound/files/050_all_portaudio19.patch | 196 | ||||
-rw-r--r-- | audio/rezound/files/patch-64bit-fixes | 78 | ||||
-rw-r--r-- | audio/rezound/files/patch-fix-raw-save | 78 | ||||
-rw-r--r-- | audio/rezound/files/patch-missing-includes | 42 | ||||
-rw-r--r-- | audio/rezound/files/patch-src-PoolFile-TStaticPoolAccesser.h | 20 | ||||
-rw-r--r-- | audio/rezound/files/patch-src_backend_AStatusComm.cpp | 19 | ||||
-rw-r--r-- | audio/rezound/files/patch-src_backend_CFLACSoundTranslator.cpp | 69 | ||||
-rw-r--r-- | audio/rezound/files/patch-src_backend_CSound_defs.h | 13 | ||||
-rw-r--r-- | audio/rezound/pkg-descr | 4 | ||||
-rw-r--r-- | audio/rezound/pkg-plist | 15 |
17 files changed, 0 insertions, 694 deletions
diff --git a/audio/Makefile b/audio/Makefile index 82af6af..198bc30 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -35,7 +35,6 @@ SUBDIR += asunder SUBDIR += atunes SUBDIR += aubio - SUBDIR += audacious-dumb SUBDIR += audacity SUBDIR += audex SUBDIR += audiere @@ -650,7 +649,6 @@ SUBDIR += rem SUBDIR += resid SUBDIR += rexima - SUBDIR += rezound SUBDIR += rhythmbox SUBDIR += rio500 SUBDIR += rioutil diff --git a/audio/audacious-dumb/Makefile b/audio/audacious-dumb/Makefile deleted file mode 100644 index bc9968f..0000000 --- a/audio/audacious-dumb/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# Created by: Emanuel Haupt <ehaupt@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= audacious-dumb -PORTVERSION= 0.83 -PORTREVISION= 1 -CATEGORIES= audio -MASTER_SITES= http://www.netswarm.net/misc/ \ - LOCAL/ehaupt - -MAINTAINER= ehaupt@FreeBSD.org -COMMENT= Audacious plugin that support the IT, XM, S3M, or MOD formats - -LICENSE= GPLv2 - -RUN_DEPENDS= audacious:${PORTSDIR}/multimedia/audacious -BUILD_DEPENDS= audacious:${PORTSDIR}/multimedia/audacious \ - ${LOCALBASE}/lib/libdumb.a:${PORTSDIR}/audio/dumb - -BROKEN= Does not compile with audacious 3.6.x. -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2016-02-29 -USES= gmake pkgconfig -USE_LDCONFIG= yes - -post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/Makefile - -post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/audacious/Input/dumb.so - -.include <bsd.port.mk> diff --git a/audio/audacious-dumb/distinfo b/audio/audacious-dumb/distinfo deleted file mode 100644 index cb2c78b..0000000 --- a/audio/audacious-dumb/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (audacious-dumb-0.83.tar.gz) = c9d218228b2dcbbbaea12b0ff8e1782d0fe5b7b8028fccd0f946db3c6b05517c -SIZE (audacious-dumb-0.83.tar.gz) = 19325 diff --git a/audio/audacious-dumb/pkg-descr b/audio/audacious-dumb/pkg-descr deleted file mode 100644 index cbc192a..0000000 --- a/audio/audacious-dumb/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -Audacious Input Plugin that supports the DUMB MODPlaying engine. It supports -the IT, XM, S3M and MOD audio format. - -WWW: http://www.netswarm.net diff --git a/audio/audacious-dumb/pkg-plist b/audio/audacious-dumb/pkg-plist deleted file mode 100644 index 7d75706..0000000 --- a/audio/audacious-dumb/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -lib/audacious/Input/dumb.so diff --git a/audio/rezound/Makefile b/audio/rezound/Makefile deleted file mode 100644 index 431ac7f..0000000 --- a/audio/rezound/Makefile +++ /dev/null @@ -1,117 +0,0 @@ -# Created by: Alexey Dokuchaev <danfe@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= rezound -DISTVERSION= 0.12.3beta -PORTREVISION= 23 -CATEGORIES= audio -MASTER_SITES= SF/${PORTNAME}/ReZound/${DISTVERSION} - -MAINTAINER= danfe@FreeBSD.org -COMMENT= Graphical audio file editor - -LICENSE= GPLv2 - -BROKEN= Fails to configure with gcc, fails to link with clang -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2016-02-29 - -LIB_DEPENDS= libFOX-1.4.so:${PORTSDIR}/x11-toolkits/fox14 - -USES= bison -GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -LIBS+= -lX11 -CONFIGURE_ARGS= --disable-alsa -MAKE_JOBS_UNSAFE= yes -CONFIGURE_ENV= ac_cv_path_RESWRAP=${LOCALBASE}/bin/fox-1.4/reswrap - -OPTIONS_DEFINE= LARGEFILE JACK AUDIOFILE PORTAUDIO OGG VORBIS FLAC FFTW \ - SOUNDTOUCH LADSPA LAME CDRDAO DOCS BROKEN_NLS -OPTIONS_DEFAULT= AUDIOFILE PORTAUDIO OGG VORBIS FLAC SOUNDTOUCH \ - LADSPA LAME - -LARGEFILE_DESC= Use 64-bit file I/O -FFTW_DESC= Use fast Fourier transform routines -CDRDAO_DESC= Burning audio files to CD support -BROKEN_NLS_DESC= ${NLS_DESC} (broken!) - -LARGEFILE_CONFIGURE_ON= --enable-largefile -JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack -AUDIOFILE_LIB_DEPENDS= libaudiofile.so:${PORTSDIR}/audio/libaudiofile -PORTAUDIO_LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio -OGG_LIB_DEPENDS= libogg.so:${PORTSDIR}/audio/libogg -VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis -FLAC_LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac -FFTW_LIB_DEPENDS= libfftw.so:${PORTSDIR}/math/fftw -SOUNDTOUCH_LIB_DEPENDS= libSoundTouch.so:${PORTSDIR}/audio/soundtouch -LADSPA_RUN_DEPENDS= ${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa -LADSPA_CONFIGURE_OFF= --disable-ladspa -LAME_RUN_DEPENDS= lame:${PORTSDIR}/audio/lame -CDRDAO_RUN_DEPENDS= cdrdao:${PORTSDIR}/sysutils/cdrdao - -EXTRA_PATCHES= ${FILESDIR}/050_all_portaudio19.patch:-p1 - -.include <bsd.port.options.mk> - -# NLS support is broken as of recent versions of libstdc++; rezound dies at -# startup with "locale::facet::_S_create_c_locale name not valid" exception -.if ${PORT_OPTIONS:MBROKEN_NLS} # Enable only if you know what you're doing -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MPORTAUDIO} -LIBS+= -lportaudio -.endif - -post-patch: .SILENT - ${REINPLACE_CMD} -E '/atoll|round|nearbyint/d' \ - ${WRKSRC}/config/platform/bsd.h - ${REINPLACE_CMD} -E 's,(_nl_expand_alias \()\),\1...), ; \ - /^C(XX)?FLAGS=/d ; /CXXFLAGS="\$$CXXFLAGS -[gW]/d ; \ - /^return /s,\(int\)( n?gettext),(long)\1,' \ - ${WRKSRC}/configure - ${REINPLACE_CMD} -e 's,WORDS_BIGENDIN,WORDS_BIGENDIAN,' \ - ${WRKSRC}/src/backend/COSSSoundPlayer.cpp - ${REINPLACE_CMD} -e 's,$$(prefix)/doc,$$(datadir)/doc,' \ - ${WRKSRC}/config/am_include.mk ${WRKSRC}/Makefile.in \ - ${WRKSRC}/src/Makefile.in ${WRKSRC}/src/misc/Makefile.in \ - ${WRKSRC}/src/misc/CNestedDataFile/Makefile.in \ - ${WRKSRC}/src/PoolFile/Makefile.in \ - ${WRKSRC}/src/backend/DSP/Makefile.in \ - ${WRKSRC}/src/backend/Makefile.in \ - ${WRKSRC}/src/backend/File/Makefile.in \ - ${WRKSRC}/src/backend/Edits/Makefile.in \ - ${WRKSRC}/src/backend/Effects/Makefile.in \ - ${WRKSRC}/src/backend/Filters/Makefile.in \ - ${WRKSRC}/src/backend/Looping/Makefile.in \ - ${WRKSRC}/src/backend/Generate/Makefile.in \ - ${WRKSRC}/src/backend/Remaster/Makefile.in \ - ${WRKSRC}/src/backend/LADSPA/Makefile.in \ - ${WRKSRC}/src/frontend_fox/Makefile.in -# Fix some sloppy C++ coding which upsets Clang - ${REINPLACE_CMD} -e '/&string_to_anytype/s,static ,,' \ - ${WRKSRC}/src/misc/CNestedDataFile/anytype.h - ${REINPLACE_CMD} -e 's,push_back((,this->&,' \ - ${WRKSRC}/src/misc/auto_array.h - ${REINPLACE_CMD} -e 's,overflowWrite(,this->&,' \ - ${WRKSRC}/src/PoolFile/TPoolAccesser.cpp - ${REINPLACE_CMD} -e 's,map<string,map<const string,' \ - ${WRKSRC}/src/PoolFile/TPoolFile.cpp -.if ${PORT_OPTIONS:MDOCS} - ${REINPLACE_CMD} -e '/AUTHORS/d; /COPYING/d' ${WRKSRC}/Makefile.in -.else - ${REINPLACE_CMD} -e 's/ install-pkgdocDATA$$//' ${WRKSRC}/Makefile.in -.endif - -.if ${PORT_OPTIONS:MPORTAUDIO} -post-configure: - ${ECHO_CMD} "#define ENABLE_PORTAUDIO_V19 1" >> ${WRKSRC}/config/config.h -.endif - -.include <bsd.port.mk> diff --git a/audio/rezound/distinfo b/audio/rezound/distinfo deleted file mode 100644 index fc0fd62..0000000 --- a/audio/rezound/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (rezound-0.12.3beta.tar.gz) = 9a895f7011048df3485c9ab29b6abf3c4ac8eb4b8842164c42e34b8f0b76426f -SIZE (rezound-0.12.3beta.tar.gz) = 1792882 diff --git a/audio/rezound/files/050_all_portaudio19.patch b/audio/rezound/files/050_all_portaudio19.patch deleted file mode 100644 index 3757e91..0000000 --- a/audio/rezound/files/050_all_portaudio19.patch +++ /dev/null @@ -1,196 +0,0 @@ -Index: rezound-0.12.3beta/configure.ac -=================================================================== ---- rezound-0.12.3beta.orig/configure.ac -+++ rezound-0.12.3beta/configure.ac -@@ -372,13 +372,22 @@ AC_ARG_ENABLE( - - # handle the --enable-portaudio flag - AH_TEMPLATE(ENABLE_PORTAUDIO) -+AH_TEMPLATE(ENABLE_PORTAUDIO_V19) - if test -z "$enable_standalone"; then - AC_ARG_ENABLE( - portaudio, - AC_HELP_STRING([--enable/disable-portaudio],[enable/disable ReZound to use PortAudio for audio I/O]), - [ - if [[ "$enableval" = "yes" ]] -- then -+ then -+ PKG_CHECK_MODULES(PORTAUDIO_19,portaudio-2.0 >= 0.21 ,[portaudio_v19=yes],:) -+ if test "x$portaudio_v19" = "xyes"; then -+ AC_DEFINE(ENABLE_PORTAUDIO) -+ AC_DEFINE(ENABLE_PORTAUDIO_V19) -+ LIBS="$LIBS $PORTAUDIO_19_LIBS" -+ AC_MSG_RESULT([*** enabling libportaudio v19 for audio I/O]) -+ using_portaudio=1 -+ else - # --enable-portaudio was given - # Require that the portaudio library can be found - AC_CHECK_LIB( -@@ -404,12 +413,21 @@ if test -z "$enable_standalone"; then - - AC_MSG_ERROR([***** libportaudio.a not found (http://www.portaudio.com) *****]) - ) -+ fi - else - AC_MSG_RESULT([*** disabling libportaudio for audio I/O]) - fi - ], - [ # action if neither enable or disable flag was given - # if libportaudio and portaudio.h are found, then enable it -+ PKG_CHECK_MODULES(PORTAUDIO_19,portaudio-2.0 >= 0.21 ,[portaudio_v19=yes],:) -+ if test "x$portaudio_v19" = "xyes"; then -+ AC_DEFINE(ENABLE_PORTAUDIO) -+ AC_DEFINE(ENABLE_PORTAUDIO_V19) -+ LIBS="$LIBS $PORTAUDIO_19_LIBS" -+ AC_MSG_RESULT([*** enabling libportaudio v19 for audio I/O]) -+ using_portaudio=1 -+ else - AC_CHECK_LIB( - portaudio, - Pa_Initialize, -@@ -430,6 +448,7 @@ if test -z "$enable_standalone"; then - ] - )] - ) -+ fi - ] - ) - else -Index: rezound-0.12.3beta/src/backend/CPortAudioSoundPlayer.cpp -=================================================================== ---- rezound-0.12.3beta.orig/src/backend/CPortAudioSoundPlayer.cpp -+++ rezound-0.12.3beta/src/backend/CPortAudioSoundPlayer.cpp -@@ -70,6 +70,24 @@ void CPortAudioSoundPlayer::initialize() - - - // open a PortAudio stream -+#ifdef ENABLE_PORTAUDIO_V19 -+ PaStreamParameters output = { gPortAudioOutputDevice, -+ gDesiredOutputChannelCount, -+ sampleFormat, -+ Pa_GetDeviceInfo(gPortAudioOutputDevice)->defaultLowOutputLatency , -+ NULL}; -+ -+ err = Pa_OpenStream( -+ &stream, -+ NULL, -+ &output, -+ gDesiredOutputSampleRate, -+ gDesiredOutputBufferSize * gDesiredOutputBufferCount, -+ paClipOff|paDitherOff, -+ CPortAudioSoundPlayer::PortAudioCallback, -+ this); -+ -+#else - err = Pa_OpenStream( - &stream, - paNoDevice, /* recording parameter, we're not recording */ -@@ -86,6 +104,7 @@ void CPortAudioSoundPlayer::initialize() - paClipOff|paDitherOff, - CPortAudioSoundPlayer::PortAudioCallback, - this); -+#endif - - if(err!=paNoError) - throw runtime_error(string(__func__)+" -- error opening PortAudio stream -- "+Pa_GetErrorText(err)); -@@ -156,7 +175,11 @@ void CPortAudioSoundPlayer::doneRecordin - } - - -+#ifdef ENABLE_PORTAUDIO_V19 -+int CPortAudioSoundPlayer::PortAudioCallback(const void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,const PaStreamCallbackTimeInfo* outTime, PaStreamCallbackFlags statusFlags, void *userData) -+#else - int CPortAudioSoundPlayer::PortAudioCallback(void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,PaTimestamp outTime,void *userData) -+#endif - { - try - { -Index: rezound-0.12.3beta/src/backend/CPortAudioSoundPlayer.h -=================================================================== ---- rezound-0.12.3beta.orig/src/backend/CPortAudioSoundPlayer.h -+++ rezound-0.12.3beta/src/backend/CPortAudioSoundPlayer.h -@@ -45,10 +45,14 @@ public: - - private: - bool initialized; -- PortAudioStream *stream; -+ PaStream *stream; - bool supportsFullDuplex; - -+#ifdef ENABLE_PORTAUDIO_V19 -+ static int PortAudioCallback(const void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,const PaStreamCallbackTimeInfo* outTime, PaStreamCallbackFlags statusFlags, void *userData); -+#else - static int PortAudioCallback(void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,PaTimestamp outTime,void *userData); -+#endif - - }; - -Index: rezound-0.12.3beta/src/backend/CPortAudioSoundRecorder.cpp -=================================================================== ---- rezound-0.12.3beta.orig/src/backend/CPortAudioSoundRecorder.cpp -+++ rezound-0.12.3beta/src/backend/CPortAudioSoundRecorder.cpp -@@ -65,6 +65,24 @@ void CPortAudioSoundRecorder::initialize - ASoundRecorder::initialize(sound); - - // open a PortAudio stream -+#ifdef ENABLE_PORTAUDIO_V19 -+ PaStreamParameters input = { -+ gPortAudioOutputDevice, -+ sound->getChannelCount(), -+ sampleFormat, -+ Pa_GetDeviceInfo(gPortAudioOutputDevice)->defaultLowInputLatency , -+ NULL}; -+ err = Pa_OpenStream( -+ &stream, -+ &input, -+ NULL, -+ sound->getSampleRate(), -+ BUFFER_SIZE_FRAMES*12, -+ paClipOff|paDitherOff, -+ CPortAudioSoundRecorder::PortAudioCallback, -+ this); -+ -+#else - err = Pa_OpenStream( - &stream, - gPortAudioOutputDevice, -@@ -81,6 +99,7 @@ void CPortAudioSoundRecorder::initialize - paClipOff|paDitherOff, - CPortAudioSoundRecorder::PortAudioCallback, - this); -+#endif - - if(err!=paNoError) - throw runtime_error(string(__func__)+" -- error opening PortAudio stream -- "+Pa_GetErrorText(err)); -@@ -131,7 +150,11 @@ void CPortAudioSoundRecorder::redo() - Pa_StartStream(stream); - } - -+#ifdef ENABLE_PORTAUDIO_V19 -+int CPortAudioSoundRecorder::PortAudioCallback(const void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,const PaStreamCallbackTimeInfo* outTime, PaStreamCallbackFlags statusFlags, void *userData) -+#else - int CPortAudioSoundRecorder::PortAudioCallback(void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,PaTimestamp outTime,void *userData) -+#endif - { - try - { -Index: rezound-0.12.3beta/src/backend/CPortAudioSoundRecorder.h -=================================================================== ---- rezound-0.12.3beta.orig/src/backend/CPortAudioSoundRecorder.h -+++ rezound-0.12.3beta/src/backend/CPortAudioSoundRecorder.h -@@ -42,10 +42,14 @@ public: - void redo(); - - private: -- PortAudioStream *stream; -+ PaStream *stream; - bool initialized; - -+#ifdef ENABLE_PORTAUDIO_V19 -+ static int PortAudioCallback(const void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,const PaStreamCallbackTimeInfo* outTime, PaStreamCallbackFlags statusFlags, void *userData); -+#else - static int PortAudioCallback(void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,PaTimestamp outTime,void *userData); -+#endif - }; - - #endif // ENABLE_PORTAUDIO diff --git a/audio/rezound/files/patch-64bit-fixes b/audio/rezound/files/patch-64bit-fixes deleted file mode 100644 index 25ff2f4..0000000 --- a/audio/rezound/files/patch-64bit-fixes +++ /dev/null @@ -1,78 +0,0 @@ ---- src/frontend_fox/CMainWindow.cpp.orig 2007-01-14 05:48:07.000000000 +0600 -+++ src/frontend_fox/CMainWindow.cpp 2011-07-10 00:43:26.743617695 +0700 -@@ -438,7 +438,7 @@ - - long CMainWindow::onSoundListChange(FXObject *sender,FXSelector sel,void *ptr) - { -- FXint index=(FXint)ptr; -+ FXint index=(uintptr_t)ptr; - - if(index>=0 && index<soundList->getNumItems()) - { -@@ -1853,13 +1853,13 @@ - - if(pos==0 && FXSELID(sel)==ID_SHUTTLE_BACKWARD) - { -- if((unsigned)ptr > 1/*came from keyboard event*/) enableAutoRepeat(getApp()->getDisplay(),false); // QQQ -+ if((uintptr_t)ptr > 1/*came from keyboard event*/) enableAutoRepeat(getApp()->getDisplay(),false); // QQQ - shuttleDial->setValue(pos-inc); - onShuttleChange(sender,sel,ptr); - } - else if(pos==0 && FXSELID(sel)==ID_SHUTTLE_FORWARD) - { -- if((unsigned)ptr > 1/*came from keyboard event*/) enableAutoRepeat(getApp()->getDisplay(),false); // QQQ -+ if((uintptr_t)ptr > 1/*came from keyboard event*/) enableAutoRepeat(getApp()->getDisplay(),false); // QQQ - shuttleDial->setValue(pos+inc); - onShuttleChange(sender,sel,ptr); - } ---- src/frontend_fox/CMp3Dialog.cpp.orig 2004-06-19 10:53:18.000000000 +0700 -+++ src/frontend_fox/CMp3Dialog.cpp 2011-07-10 00:28:06.789412062 +0700 -@@ -170,7 +170,7 @@ - - long CMp3Dialog::onRadioButton(FXObject *sender,FXSelector sel,void *ptr) - { -- if((int)ptr==0) // only act when ptr==1 when it's getting checked -+ if(ptr==0) // only act when ptr==1 when it's getting checked - return 1; - - // turn off all buttons ---- src/frontend_fox/COggDialog.cpp.orig 2004-02-11 11:11:17.000000000 +0600 -+++ src/frontend_fox/COggDialog.cpp 2011-07-10 00:27:51.332341401 +0700 -@@ -136,7 +136,7 @@ - - long COggDialog::onRadioButton(FXObject *sender,FXSelector sel,void *ptr) - { -- if((int)ptr==0) // only act when ptr==1 when it's getting checked -+ if(ptr==0) // only act when ptr==1 when it's getting checked - return 1; - - // turn off all buttons ---- src/frontend_fox/CPasteChannelsDialog.cpp.orig 2005-02-09 14:17:36.000000000 +0600 -+++ src/frontend_fox/CPasteChannelsDialog.cpp 2011-07-10 00:26:51.192066310 +0700 -@@ -206,7 +206,7 @@ - { - pasteChannels.clear(); - -- actionParameters->setValue<unsigned>(_("MixMethod"),(unsigned)(mixTypeComboBox->getItemData(mixTypeComboBox->getCurrentItem()))); -+ actionParameters->setValue<unsigned>(_("MixMethod"),(uintptr_t)(mixTypeComboBox->getItemData(mixTypeComboBox->getCurrentItem()))); - - if(repeatTypeComboBox->getCurrentItem()==0) - { // repeating it a given number of times ---- src/misc/AThread.h.orig 2003-07-09 01:31:57.000000000 +0700 -+++ src/misc/AThread.h 2011-07-10 00:14:55.142793847 +0700 -@@ -131,13 +131,13 @@ - catch(exception &e) - { - thread->running=false; -- fprintf(stderr,"exception was thrown within thread -- ID: 0x%x;\nmessage: %s\naborting\n",(unsigned)thread->threadID,e.what());fflush(stderr); -+ fprintf(stderr,"exception was thrown within thread -- ID: 0x%p;\nmessage: %s\naborting\n",thread->threadID,e.what());fflush(stderr); - abort(); - } - catch(...) - { - thread->running=false; -- fprintf(stderr,"unhandled exception was thrown within thread -- ID: 0x%x; aborting\n",(unsigned)thread->threadID);fflush(stderr); -+ fprintf(stderr,"unhandled exception was thrown within thread -- ID: 0x%p; aborting\n",thread->threadID);fflush(stderr); - abort(); - } - return(NULL); diff --git a/audio/rezound/files/patch-fix-raw-save b/audio/rezound/files/patch-fix-raw-save deleted file mode 100644 index f2421b0..0000000 --- a/audio/rezound/files/patch-fix-raw-save +++ /dev/null @@ -1,78 +0,0 @@ ---- src/backend/CrawSoundTranslator.cpp.orig -+++ src/backend/CrawSoundTranslator.cpp -@@ -132,6 +132,13 @@ - // get user preferences for saving the raw data - static bool parametersGotten=false; - static AFrontendHooks::RawParameters parameters; -+ -+ // init parameters which cannot be changed by the RAW parameters dialog -+ parameters.channelCount=sound->getChannelCount(); -+ parameters.sampleRate=sound->getSampleRate(); -+ parameters.dataLength=sound->getLength(); -+ parameters.dataOffset=0; -+ - useLastUserPrefs&=parametersGotten; - if(!useLastUserPrefs) - { ---- src/frontend_fox/CRawDialog.cpp.orig -+++ src/frontend_fox/CRawDialog.cpp -@@ -137,8 +137,11 @@ - - if(execute(PLACEMENT_SCREEN)) - { -- parameters.channelCount=atoi(channelsCountComboBox->getText().text()); -- parameters.sampleRate=atoi(sampleRateComboBox->getText().text()); -+ // don't apply values of hidden GUI controls -+ if (showLoadRawParameters) { -+ parameters.channelCount=atoi(channelsCountComboBox->getText().text()); -+ parameters.sampleRate=atoi(sampleRateComboBox->getText().text()); -+ } - - switch(sampleFormatComboBox->getCurrentItem()) - { -@@ -158,19 +161,22 @@ - - parameters.endian= byteOrderToggleButton->getState() ? AFrontendHooks::RawParameters::eBigEndian : AFrontendHooks::RawParameters::eLittleEndian; - -- if(atoi(dataOffsetTextBox->getText().text())<0) -- { -- Error(_("invalid negative data offset")); -- return(false); -- } -- parameters.dataOffset=atoi(dataOffsetTextBox->getText().text()); -- -- if(atoi(dataLengthTextBox->getText().text())<0) -- { -- Error(_("invalid negative data length")); -- return(false); -+ // don't apply values of hidden GUI controls -+ if (showLoadRawParameters) { -+ if(atoi(dataOffsetTextBox->getText().text())<0) -+ { -+ Error(_("invalid negative data offset")); -+ return(false); -+ } -+ parameters.dataOffset=atoi(dataOffsetTextBox->getText().text()); -+ -+ if(atoi(dataLengthTextBox->getText().text())<0) -+ { -+ Error(_("invalid negative data length")); -+ return(false); -+ } -+ parameters.dataLength=atoi(dataLengthTextBox->getText().text()); - } -- parameters.dataLength=atoi(dataLengthTextBox->getText().text()); - - return(true); - } ---- src/frontend_fox/CRawDialog.h.orig -+++ src/frontend_fox/CRawDialog.h -@@ -37,7 +37,7 @@ - CRawDialog(FXWindow *mainWindow); - virtual ~CRawDialog(); - -- bool show(AFrontendHooks::RawParameters ¶meters,bool showOffsetAndLengthParameters); -+ bool show(AFrontendHooks::RawParameters ¶meters,bool showLoadRawParameters); - - //long onRadioButton(FXObject *sender,FXSelector sel,void *ptr); - diff --git a/audio/rezound/files/patch-missing-includes b/audio/rezound/files/patch-missing-includes deleted file mode 100644 index 6298f4c..0000000 --- a/audio/rezound/files/patch-missing-includes +++ /dev/null @@ -1,42 +0,0 @@ ---- src/backend/CPortAudioSoundPlayer.cpp.orig -+++ src/backend/CPortAudioSoundPlayer.cpp -@@ -23,6 +23,7 @@ - #ifdef ENABLE_PORTAUDIO - - #include <stdio.h> -+#include <string.h> - - #include <stdexcept> - ---- src/backend/CPortAudioSoundRecorder.cpp.orig -+++ src/backend/CPortAudioSoundRecorder.cpp -@@ -22,6 +22,8 @@ - - #ifdef ENABLE_PORTAUDIO - -+#include <cstdio> -+ - #include <stdexcept> - - #include "settings.h" ---- src/backend/Generate/CGenerateNoiseAction.cpp.orig -+++ src/backend/Generate/CGenerateNoiseAction.cpp -@@ -23,6 +23,8 @@ - - #include "../CActionParameters.h" - -+#include <cstdlib> -+ - CGenerateNoiseAction::CGenerateNoiseAction(const AActionFactory *factory,const CActionSound *actionSound,const double _noiseLength,const double _volume,const NoiseTypes _noiseType,const StereoImage _stereoImage,const double _maxParticleVelocity): - AAction(factory,actionSound), - noiseLength(_noiseLength), // seconds ---- src/backend/Remaster/CAdaptiveNormalizeAction.cpp.orig -+++ src/backend/Remaster/CAdaptiveNormalizeAction.cpp -@@ -20,6 +20,7 @@ - - #include "CAdaptiveNormalizeAction.h" - -+#include <cstdio> - #include <utility> - - #include "../CActionParameters.h" diff --git a/audio/rezound/files/patch-src-PoolFile-TStaticPoolAccesser.h b/audio/rezound/files/patch-src-PoolFile-TStaticPoolAccesser.h deleted file mode 100644 index 3d83569..0000000 --- a/audio/rezound/files/patch-src-PoolFile-TStaticPoolAccesser.h +++ /dev/null @@ -1,20 +0,0 @@ ---- src/PoolFile/TStaticPoolAccesser.h.orig -+++ src/PoolFile/TStaticPoolAccesser.h -@@ -43,7 +43,7 @@ public: - - - // stream-like access methods -- void read(pool_element_t buffer[],const l_addr_t count) const; -+ void read(pool_element_t buffer[],l_addr_t count) const; - void write(const pool_element_t buffer[],const l_addr_t count); - - void seek(const l_addr_t where); -@@ -112,7 +112,7 @@ public: - mutable l_addr_t position; - - -- void overflowWrite(const pool_element_t buffer[],const l_addr_t count,const bool append); -+ void overflowWrite(const pool_element_t buffer[],l_addr_t count,const bool append); - - void cacheBlock(const l_addr_t where) const; - diff --git a/audio/rezound/files/patch-src_backend_AStatusComm.cpp b/audio/rezound/files/patch-src_backend_AStatusComm.cpp deleted file mode 100644 index e9f52f2..0000000 --- a/audio/rezound/files/patch-src_backend_AStatusComm.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- src/backend/AStatusComm.cpp.orig Sun May 1 09:53:40 2005 -+++ src/backend/AStatusComm.cpp Mon May 16 21:35:32 2005 -@@ -94,12 +94,12 @@ - - // --- CStatusBar -------------------------------------- - --#include <sys/timeb.h> -+#include <sys/time.h> - static unsigned long getCurrentMilliseconds() - { -- struct timeb tb; -- ftime(&tb); -- return (unsigned long)tb.time*1000UL+(unsigned long)tb.millitm; -+ struct timeval tp; -+ (void)gettimeofday(&tp, NULL); -+ return (unsigned long)tp.tv_sec*1000UL+(unsigned long)tp.tv_usec/1000UL; - } - - CStatusBar::CStatusBar(const string title,const sample_pos_t firstValue,const sample_pos_t lastValue,const bool showCancelButton) : diff --git a/audio/rezound/files/patch-src_backend_CFLACSoundTranslator.cpp b/audio/rezound/files/patch-src_backend_CFLACSoundTranslator.cpp deleted file mode 100644 index b1dcb25..0000000 --- a/audio/rezound/files/patch-src_backend_CFLACSoundTranslator.cpp +++ /dev/null @@ -1,69 +0,0 @@ ---- src/backend/CFLACSoundTranslator.cpp.orig 2005-05-01 06:39:38.000000000 +0200 -+++ src/backend/CFLACSoundTranslator.cpp 2008-03-28 18:08:28.000000000 +0100 -@@ -75,15 +75,15 @@ public: - for(unsigned t=0;t<MAX_CHANNELS;t++) - accessers[t]=NULL; - -- set_filename(filename.c_str()); -+ //set_filename(filename.c_str()); - - set_metadata_ignore_all(); - //set_metadata_respond(FLAC__METADATA_TYPE_VORBIS_COMMENT); - //set_metadata_respond(FLAC__METADATA_TYPE_CUESHEET); - -- State s=init(); -- if(s!=FLAC__FILE_DECODER_OK) -- throw runtime_error(string(__func__)+" -- "+s.as_cstring()); -+ FLAC__StreamDecoderInitStatus s=init(filename.c_str()); -+ if(s!=FLAC__STREAM_DECODER_INIT_STATUS_OK) -+ throw runtime_error(string(__func__)+" -- "+FLAC__StreamDecoderInitStatusString[s]); - } - - virtual ~MyFLACDecoderFile() -@@ -170,7 +170,7 @@ protected: - - // update status bar and detect user cancel - FLAC__uint64 filePosition; -- FLAC__file_decoder_get_decode_position(decoder_, &filePosition); -+ FLAC__stream_decoder_get_decode_position(decoder_, &filePosition); - return statusBar.update(filePosition) ? FLAC__STREAM_DECODER_WRITE_STATUS_ABORT : FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE; - } - -@@ -215,7 +215,7 @@ private: - bool CFLACSoundTranslator::onLoadSound(const string filename,CSound *sound) const - { - MyFLACDecoderFile f(filename,sound); -- return f.process_until_end_of_file(); -+ return f.process_until_end_of_stream(); - } - - -@@ -258,7 +258,7 @@ bool CFLACSoundTranslator::onSaveSound(c - - MyFLACEncoderFile f(saveLength); - -- f.set_filename(filename.c_str()); -+ //f.set_filename(filename.c_str()); - - f.set_channels(sound->getChannelCount()); - -@@ -274,8 +274,8 @@ bool CFLACSoundTranslator::onSaveSound(c - //f.set_metadata(...) // ??? to do to set cues and user notes, etc - - -- MyFLACEncoderFile::State s=f.init(); -- if(s==FLAC__STREAM_ENCODER_OK) -+ FLAC__StreamEncoderInitStatus s=f.init(filename.c_str()); -+ if(s==FLAC__STREAM_ENCODER_INIT_STATUS_OK) - { - #define BUFFER_SIZE 65536 - TAutoBuffer<FLAC__int32> buffers[MAX_CHANNELS]; -@@ -328,7 +328,7 @@ bool CFLACSoundTranslator::onSaveSound(c - return true; - } - else -- throw runtime_error(string(__func__)+" -- error creating FLAC encoder -- "+s.as_cstring()); -+ throw runtime_error(string(__func__)+" -- error creating FLAC encoder -- "+FLAC__StreamEncoderInitStatusString[s]); - - } - diff --git a/audio/rezound/files/patch-src_backend_CSound_defs.h b/audio/rezound/files/patch-src_backend_CSound_defs.h deleted file mode 100644 index c45e4e8..0000000 --- a/audio/rezound/files/patch-src_backend_CSound_defs.h +++ /dev/null @@ -1,13 +0,0 @@ ---- src/backend/CSound_defs.h.orig 2004-06-18 10:45:47.000000000 +0800 -+++ src/backend/CSound_defs.h 2012-07-06 14:10:05.000000000 +0800 -@@ -50,6 +50,10 @@ - #define MAX_LENGTH (0x7fffffffffffffffLL-(1024LL*1024LL)) - - #include <math.h> -+ extern "C" { -+ long double logl(long double); -+ long double expl(long double); -+ } - #define sample_fpos_floor(a) (floorl(a)) - #define sample_fpos_ceil(a) (ceill(a)) - #define sample_fpos_round(a) (nearbyintl(a)) diff --git a/audio/rezound/pkg-descr b/audio/rezound/pkg-descr deleted file mode 100644 index 6eb1da8..0000000 --- a/audio/rezound/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -ReZound aims to be a stable, open source, and graphical audio file editor -primarily for but not limited to the Linux operating system. - -WWW: http://rezound.sourceforge.net/ diff --git a/audio/rezound/pkg-plist b/audio/rezound/pkg-plist deleted file mode 100644 index 0cb77b2..0000000 --- a/audio/rezound/pkg-plist +++ /dev/null @@ -1,15 +0,0 @@ -bin/rezound -%%DATADIR%%/icon_logo_32.gif -%%DATADIR%%/impulse_hall1.wav -%%DATADIR%%/key_bindings.dat -%%DATADIR%%/menu.dat -%%DATADIR%%/presets.dat -%%NLS%%share/locale/de/LC_MESSAGES/rezound.mo -%%NLS%%share/locale/fr/LC_MESSAGES/rezound.mo -%%NLS%%share/locale/es/LC_MESSAGES/rezound.mo -%%NLS%%share/locale/fi/LC_MESSAGES/rezound.mo -%%NLS%%share/locale/ru/LC_MESSAGES/rezound.mo -%%PORTDOCS%%%%DOCSDIR%%/Features.txt -%%PORTDOCS%%%%DOCSDIR%%/FrontendFoxFeatures.txt -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README |