Accepting request 67951 from multimedia:apps
Accepted submit request 67951 from user licensedigger OBS-URL: https://build.opensuse.org/request/show/67951 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/audacity?expand=0&rev=42
This commit is contained in:
Sascha Peilicke
Git OBS Bridge
commit
88a8048fa6
7
_service
7
_service
@ -3,11 +3,6 @@
|
||||
<service name="download_url">
|
||||
<param name="protocol">http</param>
|
||||
<param name="host">audacity.googlecode.com</param>
|
||||
<param name="path">/files/audacity-minsrc-1.3.12-beta.tar.bz2</param>
|
||||
</service>
|
||||
<service name="verify_file">
|
||||
<param name="file">_service:download_url:audacity-minsrc-1.3.12-beta.tar.bz2</param>
|
||||
<param name="verifier">sha256</param>
|
||||
<param name="checksum">f0f55839ca3013d2e43e5114c73d195bc34503685aeab683eafca4d1bbf3b768</param>
|
||||
<param name="path">/files/audacity-minsrc-1.3.13-beta.tar.bz2</param>
|
||||
</service>
|
||||
</services>
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f0f55839ca3013d2e43e5114c73d195bc34503685aeab683eafca4d1bbf3b768
|
||||
size 6087920
|
||||
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4c2eda638e16e16dfddd202e86ccbe1d170b04c26cfb2c12ffcba0b79e7e1e83
|
||||
size 6450901
|
||||
@ -1,45 +0,0 @@
|
||||
Index: audacity-src-1.3.12-beta/src/prefs/DevicePrefs.cpp
|
||||
===================================================================
|
||||
--- audacity-src-1.3.12-beta.orig/src/prefs/DevicePrefs.cpp
|
||||
+++ audacity-src-1.3.12-beta/src/prefs/DevicePrefs.cpp
|
||||
@@ -193,6 +193,16 @@ void DevicePrefs::OnHost(wxCommandEvent
|
||||
wxArrayString playnames;
|
||||
wxArrayString recordnames;
|
||||
|
||||
+ int playDeviceNum = -1; // use device name from gPrefs
|
||||
+ if ( mPlayDevice == wxT("") ) {
|
||||
+ playDeviceNum = Pa_GetDefaultOutputDevice();
|
||||
+ }
|
||||
+ int recDeviceNum = -1; // use device name from gPrefs
|
||||
+ if ( mRecordDevice == wxT("") ) {
|
||||
+ recDeviceNum = Pa_GetDefaultInputDevice();
|
||||
+ }
|
||||
+
|
||||
+
|
||||
int devindex; /* temp variable to hold the numeric ID of each device in turn */
|
||||
|
||||
for (int i = 0; i < nDevices; i++) {
|
||||
@@ -205,7 +215,10 @@ void DevicePrefs::OnHost(wxCommandEvent
|
||||
if (info->maxOutputChannels > 0) {
|
||||
playnames.Add(name);
|
||||
devindex = mPlay->Append(name, (void *) info);
|
||||
- if (device == mPlayDevice) { /* if this is the default device, select it */
|
||||
+ if (playDeviceNum == i) {
|
||||
+ mPlay->SetSelection(index);
|
||||
+ }
|
||||
+ else if (device == mPlayDevice) {
|
||||
mPlay->SetSelection(devindex);
|
||||
}
|
||||
}
|
||||
@@ -213,7 +226,10 @@ void DevicePrefs::OnHost(wxCommandEvent
|
||||
if (info->maxInputChannels > 0) {
|
||||
recordnames.Add(name);
|
||||
devindex = mRecord->Append(name, (void *) info);
|
||||
- if (device == mRecordDevice) {
|
||||
+ if (recDeviceNum == i) {
|
||||
+ mRecord->SetSelection(index);
|
||||
+ }
|
||||
+ else if (device == mRecordDevice) {
|
||||
mRecord->SetSelection(devindex);
|
||||
}
|
||||
}
|
||||
@ -1,44 +0,0 @@
|
||||
Index: src/FFmpeg.cpp
|
||||
===================================================================
|
||||
--- src/FFmpeg.cpp.orig
|
||||
+++ src/FFmpeg.cpp
|
||||
@@ -204,7 +204,7 @@ static int ufile_read(URLContext *h, uns
|
||||
return ret;
|
||||
}
|
||||
|
||||
-static int ufile_write(URLContext *h, unsigned char *buf, int size)
|
||||
+static int ufile_write(URLContext *h, const unsigned char *buf, int size)
|
||||
{
|
||||
return (int) ((wxFile *) h->priv_data)->Write(buf, size);
|
||||
}
|
||||
@@ -356,7 +356,7 @@ int ufile_fopen_input(AVFormatContext **
|
||||
}
|
||||
// Otherwize, resort to extension matching if available
|
||||
else if (fmt1->extensions) {
|
||||
- if (FFmpegLibsInst->match_ext(filename, fmt1->extensions)) {
|
||||
+ if (FFmpegLibsInst->av_match_ext(filename, fmt1->extensions)) {
|
||||
score = 50;
|
||||
}
|
||||
}
|
||||
@@ -829,7 +829,7 @@ bool FFmpegLibs::InitLibs(wxString libpa
|
||||
INITDYN(avformat,av_open_input_file);
|
||||
INITDYN(avformat,av_open_input_stream);
|
||||
INITDYN(avformat,get_buffer);
|
||||
- INITDYN(avformat,match_ext);
|
||||
+ INITDYN(avformat,av_match_ext);
|
||||
|
||||
#if FFMPEG_STABLE
|
||||
INITDYN(avformat,av_init_packet);
|
||||
Index: src/FFmpeg.h
|
||||
===================================================================
|
||||
--- src/FFmpeg.h.orig
|
||||
+++ src/FFmpeg.h
|
||||
@@ -224,7 +224,7 @@ public:
|
||||
AVStream* (*av_new_stream) (AVFormatContext *s, int id);
|
||||
AVFormatContext* (*av_alloc_format_context) (void);
|
||||
AVOutputFormat* (*guess_format) (const char *short_name, const char *filename, const char *mime_type);
|
||||
- int (*match_ext) (const char *filename, const char *extensions);
|
||||
+ int (*av_match_ext) (const char *filename, const char *extensions);
|
||||
int (*av_write_trailer) (AVFormatContext *s);
|
||||
int (*av_interleaved_write_frame) (AVFormatContext *s, AVPacket *pkt);
|
||||
int (*av_write_frame) (AVFormatContext *s, AVPacket *pkt);
|
||||
@ -1,17 +0,0 @@
|
||||
Index: src/FFmpeg.cpp
|
||||
===================================================================
|
||||
--- src/FFmpeg.cpp.orig
|
||||
+++ src/FFmpeg.cpp
|
||||
@@ -895,9 +895,9 @@ bool FFmpegLibs::InitLibs(wxString libpa
|
||||
mAVFormatVersion = wxString::Format(wxT("%d.%d.%d"),avfver >> 16 & 0xFF, avfver >> 8 & 0xFF, avfver & 0xFF);
|
||||
mAVUtilVersion = wxString::Format(wxT("%d.%d.%d"),avuver >> 16 & 0xFF, avuver >> 8 & 0xFF, avuver & 0xFF);
|
||||
|
||||
- wxLogMessage(wxT("AVCodec version 0x%06x - %s (built against 0x%06x - %s)"),avcver,mAVCodecVersion.c_str(),LIBAVCODEC_VERSION_INT,wxString::FromUTF8(AV_STRINGIFY(LIBAVCODEC_VERSION)).c_str());
|
||||
- wxLogMessage(wxT("AVFormat version 0x%06x - %s (built against 0x%06x - %s)"),avfver,mAVFormatVersion.c_str(),LIBAVFORMAT_VERSION_INT,wxString::FromUTF8(AV_STRINGIFY(LIBAVFORMAT_VERSION)).c_str());
|
||||
- wxLogMessage(wxT("AVUtil version 0x%06x - %s (built against 0x%06x - %s)"),avuver,mAVUtilVersion.c_str(),LIBAVUTIL_VERSION_INT,wxString::FromUTF8(AV_STRINGIFY(LIBAVUTIL_VERSION)).c_str());
|
||||
+ wxLogMessage(wxT("AVCodec version 0x%06x - %s (built against %s)"),avcver,mAVCodecVersion.c_str(),wxString::FromUTF8(AV_STRINGIFY(LIBAVCODEC_VERSION_MAYOR)).c_str());
|
||||
+ wxLogMessage(wxT("AVFormat version 0x%06x - %s (built against %s)"),avfver,mAVFormatVersion.c_str(),wxString::FromUTF8(AV_STRINGIFY(LIBAVFORMAT_VERSION_MAYOR)).c_str());
|
||||
+ wxLogMessage(wxT("AVUtil version 0x%06x - %s (built against %s)"),avuver,mAVUtilVersion.c_str(),wxString::FromUTF8(AV_STRINGIFY(LIBAVUTIL_VERSION_MAYOR)).c_str());
|
||||
|
||||
int avcverdiff = (avcver >> 16 & 0xFF) - int(LIBAVCODEC_VERSION_MAJOR);
|
||||
int avfverdiff = (avfver >> 16 & 0xFF) - int(LIBAVFORMAT_VERSION_MAJOR);
|
||||
@ -1,28 +0,0 @@
|
||||
Index: audacity-src-1.3.11-beta/lib-src/portmixer/configure.ac
|
||||
===================================================================
|
||||
--- audacity-src-1.3.11-beta.orig/lib-src/portmixer/configure.ac
|
||||
+++ audacity-src-1.3.11-beta/lib-src/portmixer/configure.ac
|
||||
@@ -64,10 +64,6 @@ AC_EGREP_HEADER([PaWinMME_GetStreamInput
|
||||
if [[ $have_support = "no" ]] ; then
|
||||
AC_MSG_WARN("Missing support in pa_win_wmme.h");
|
||||
fi
|
||||
-AC_EGREP_HEADER([PaMacCore_GetStreamInputDevice], [pa_mac_core.h], , [have_support=no])
|
||||
-if [[ $have_support = "no" ]] ; then
|
||||
- AC_MSG_WARN("Missing support in pa_mac_core.h");
|
||||
-fi
|
||||
AC_EGREP_HEADER([PaOSS_GetStreamInputDevice], [pa_unix_oss.h], , [have_support=no])
|
||||
if [[ $have_support = "no" ]] ; then
|
||||
AC_MSG_WARN("Missing support in pa_unix_oss.h");
|
||||
Index: audacity-src-1.3.11-beta/lib-src/portmixer/configure
|
||||
===================================================================
|
||||
--- audacity-src-1.3.11-beta.orig/lib-src/portmixer/configure 2010-01-18 22:34:54.000000000 +0100
|
||||
+++ audacity-src-1.3.11-beta/lib-src/portmixer/configure 2010-03-15 17:16:42.000000000 +0100
|
||||
@@ -3542,8 +3542,6 @@ _ACEOF
|
||||
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||
$EGREP "PaMacCore_GetStreamInputDevice" >/dev/null 2>&1; then
|
||||
:
|
||||
-else
|
||||
- have_support=no
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
Index: lib-src/libnyquist/nyquist/xlisp/xlbfun.c
|
||||
===================================================================
|
||||
--- lib-src/libnyquist/nyquist/xlisp/xlbfun.c.orig
|
||||
+++ lib-src/libnyquist/nyquist/xlisp/xlbfun.c
|
||||
@@ -603,6 +603,7 @@ LVAL xcleanup(void)
|
||||
{
|
||||
xllastarg();
|
||||
xlcleanup();
|
||||
+ return (NIL);
|
||||
}
|
||||
|
||||
/* xtoplevel - special form 'top-level' */
|
||||
@@ -610,6 +611,7 @@ LVAL xtoplevel(void)
|
||||
{
|
||||
xllastarg();
|
||||
xltoplevel();
|
||||
+ return (NIL);
|
||||
}
|
||||
|
||||
/* xcontinue - special form 'continue' */
|
||||
@@ -617,6 +619,7 @@ LVAL xcontinue(void)
|
||||
{
|
||||
xllastarg();
|
||||
xlcontinue();
|
||||
+ return (NIL);
|
||||
}
|
||||
|
||||
/* xevalhook - eval hook function */
|
||||
Index: lib-src/libnyquist/nyquist/xlisp/xlread.c
|
||||
===================================================================
|
||||
--- lib-src/libnyquist/nyquist/xlisp/xlread.c.orig
|
||||
+++ lib-src/libnyquist/nyquist/xlisp/xlread.c
|
||||
@@ -335,6 +335,8 @@ int readone(LVAL fptr, LVAL *pval)
|
||||
/* handle illegal characters */
|
||||
else
|
||||
xlerror("illegal character",cvfixnum((FIXTYPE)ch));
|
||||
+
|
||||
+ return (FALSE);
|
||||
}
|
||||
|
||||
/* rmhash - read macro for '#' */
|
||||
@ -1,3 +1,33 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 18 00:00:00 CET 2011 - detlef@links2linux.de
|
||||
|
||||
- Update to version 1.3.13
|
||||
|
||||
* Numerous bug fixes
|
||||
- Crashes on Windows when clicking in the track or in effects dialogs.
|
||||
- Crashes on OS X when closing or quitting.
|
||||
- Warning (on by default) now provided when importing uncompressed audio
|
||||
files and when read-directly uncompressed files are missing.
|
||||
- Full support added for later versions of the optional FFmpeg library up
|
||||
to current FFmpeg HEAD. More compatible U-Law/A-Law exports.
|
||||
- VST effects processing restored to full speed. Hang fixed when launching
|
||||
on OS X 10.5 PPC with VST effects present.
|
||||
- (OS X) Files imported from iTunes could create invalid characters in the
|
||||
.aup project file. See here for help re-opening older projects that have
|
||||
this error.
|
||||
- (Linux) Crashes or stalled recordings using the pulse device. Crashes
|
||||
using Play-at-Speed if Audacity was configured with libsamplerate.
|
||||
* Changes and Improvements
|
||||
- Control Toolbar renamed to Transport Toolbar. Input/output selection
|
||||
moved from Mixer Toolbar to improved Device Toolbar (on by default).
|
||||
- New "Sync-Lock Tracks" feature (turned on in the Tracks menu).
|
||||
- Equalization now supports importing and exporting curves. Noise Removal
|
||||
improvements including new option to isolate noise.
|
||||
- Improved Automatic Crash Recovery with all project changes autosaved.
|
||||
- New "Extended Import" Preferences for specifying audio file importers.
|
||||
- (Windows and Linux) Close button now quits on closing the last window
|
||||
while File > Close clears to a new, empty project.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 28 16:29:51 CET 2010 - sbrabec@suse.cz
|
||||
|
||||
|
||||
@ -53,8 +53,8 @@ BuildRequires: libmad-devel
|
||||
%if %{with twolame}
|
||||
BuildRequires: libtwolame-devel
|
||||
%endif
|
||||
Version: 1.3.12
|
||||
Release: 8
|
||||
Version: 1.3.13
|
||||
Release: 1
|
||||
License: GPLv2+
|
||||
Summary: A Free, Cross-Platform Digital Audio Editor
|
||||
Url: http://audacity.sourceforge.net/
|
||||
@ -64,13 +64,6 @@ Source1: %{name}.png
|
||||
Source2: %{name}-license-nyquist
|
||||
# PATCH-FIX-OPENSUSE %{name}-no_buildstamp.patch reddwarf@opensuse.org -- this patch removes the buildstamp
|
||||
Patch0: %{name}-no_buildstamp.patch
|
||||
Patch5: %{name}-retval.patch
|
||||
Patch12: %{name}-audiodevdefaults.patch
|
||||
Patch13: audacity-nomac.patch
|
||||
# PATCH-FIX-OPENSUSE %{name}-ffmpeg_match_ext.patch reddwarf@opensuse.org -- Fix ffmpeg support with versions after 2010-03-08. Upstream knows the problem but doesn't wants the patch right now.
|
||||
Patch14: %{name}-ffmpeg_match_ext.patch
|
||||
# PATCH-FIX-OPENSUSE %{name}-no_exact_ffmpeg_version.patch reddwarf@opensuse.org -- remove referene to minor/micro ffmpeg versions so build-compare can do its work
|
||||
Patch15: %{name}-no_exact_ffmpeg_version.patch
|
||||
Patch16: %{name}-implicit.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%if %suse_version > 1130
|
||||
@ -88,11 +81,6 @@ physical memory size of your computer.
|
||||
%prep
|
||||
%setup -q -n %{name}-src-%{version}-beta
|
||||
%patch0
|
||||
%patch5
|
||||
%patch12 -p1
|
||||
%patch13 -p1
|
||||
%patch14
|
||||
%patch15
|
||||
%patch16
|
||||
%{__cp} %{S:2} LICENSE_NYQUIST.txt
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user