cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pick up libmp3lame.so if it's installed; proddeb by a mail from Anthony

Browse Source 
Campbell.
While here, don't offer to download libmp3lame of ffmpeg.
This commit is contained in:
ajacoutot 2018-11-03 13:42:33 +00:00
parent d57269e0be
commit f4b87b4457
3 changed files with 68 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/audacity/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.51 2018/11/03 13:26:27 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.52 2018/11/03 13:42:33 ajacoutot Exp $
COMMENT= free audio editor
V= 1.3.9
DISTNAME= audacity-minsrc-${V}
PKGNAME= audacity-${V}
REVISION= 14
REVISION= 15
CATEGORIES= audio
EXTRACT_SUFX= .tar.bz2

42
audio/audacity/patches/patch-src_export_ExportMP3_cpp
View File

@ -1,18 +1,44 @@
$OpenBSD: patch-src_export_ExportMP3_cpp,v 1.9 2009/10/28 18:40:13 jakemsr Exp $
--- src/export/ExportMP3.cpp.orig Mon Aug 31 03:45:40 2009
+++ src/export/ExportMP3.cpp Sat Oct 17 14:29:54 2009
@@ -575,8 +575,9 @@ class FindDialog : public wxDialog (public)
$OpenBSD: patch-src_export_ExportMP3_cpp,v 1.10 2018/11/03 13:42:33 ajacoutot Exp $
Index: src/export/ExportMP3.cpp
--- src/export/ExportMP3.cpp.orig
+++ src/export/ExportMP3.cpp
@@ -575,8 +575,6 @@ class FindDialog : public wxDialog (public)
mPathText = S.AddTextBox(wxT(""), mLibPath.GetFullPath(), 0);
}
S.Id(ID_BROWSE).AddButton(_("Browse..."), wxALIGN_RIGHT);
- S.AddVariableText(_("To get a free copy of Lame, click here -->"), true);
+/* S.AddVariableText(_("To get a free copy of Lame, click here -->"), true);
S.Id(ID_DLOAD).AddButton(_("Download"), wxALIGN_RIGHT);
+*/
- S.Id(ID_DLOAD).AddButton(_("Download"), wxALIGN_RIGHT);
}
S.EndMultiColumn();
@@ -1361,7 +1362,7 @@ wxString MP3Exporter::GetLibraryName()
@@ -613,12 +611,6 @@ class FindDialog : public wxDialog (public)
}
}
- void OnDownload(wxCommandEvent & event)
- {
- wxString page = wxT("http://www.audacityteam.org/manual/index.php?title=FAQ:Installation_and_Plug-Ins%23How_do_I_download_and_install_the_LAME_MP3_encoder.3F");
- ::OpenInDefaultBrowser(page);
- }
-
wxString GetLibPath()
{
return mLibPath.GetFullPath();
@@ -639,7 +631,6 @@ class FindDialog : public wxDialog (public)
BEGIN_EVENT_TABLE(FindDialog, wxDialog)
EVT_BUTTON(ID_BROWSE, FindDialog::OnBrowse)
- EVT_BUTTON(ID_DLOAD, FindDialog::OnDownload)
END_EVENT_TABLE()
//----------------------------------------------------------------------------
@@ -1356,12 +1347,12 @@ wxString MP3Exporter::GetLibraryPath()
wxString MP3Exporter::GetLibraryName()
{
- return wxT("libmp3lame.so.0");
+ return wxT("libmp3lame.so");
}
wxString MP3Exporter::GetLibraryTypeString()
{

32
audio/audacity/patches/patch-src_prefs_LibraryPrefs_cpp Normal file
View File

@ -0,0 +1,32 @@
$OpenBSD: patch-src_prefs_LibraryPrefs_cpp,v 1.1 2018/11/03 13:42:33 ajacoutot Exp $
Index: src/prefs/LibraryPrefs.cpp
--- src/prefs/LibraryPrefs.cpp.orig
+++ src/prefs/LibraryPrefs.cpp
@@ -91,11 +91,6 @@ void LibraryPrefs::PopulateOrExchange(ShuttleGui & S)
wxALL | wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL);
S.Id(ID_MP3_FIND_BUTTON).AddButton(_("&Locate..."),
wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL);
- S.AddVariableText(_("LAME MP3 Library:"),
- true,
- wxALL | wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL);
- S.Id(ID_MP3_DOWN_BUTTON).AddButton(_("&Download"),
- wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL);
}
S.EndTwoColumn();
}
@@ -123,14 +118,7 @@ void LibraryPrefs::PopulateOrExchange(ShuttleGui & S)
S.Id(ID_FFMPEG_FIND_BUTTON);
wxButton *bfnd = S.AddButton(_("&Locate..."),
wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL);
- S.AddVariableText(_("FFmpeg Library:"),
- true,
- wxALL | wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL);
- S.Id(ID_FFMPEG_DOWN_BUTTON);
- wxButton *bdwn = S.AddButton(_("&Download"),
- wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL);
#if !defined(USE_FFMPEG)
- bdwn->Enable(FALSE);
bfnd->Enable(FALSE);
#endif
}