Git commit df6640205e71d3a3378c35a5a5fad6a19c19c10d by Thomas Eschenbacher. Committed on 05/11/2017 at 12:45. Pushed by eschenbacher into branch 'master'.
switched on MP3 support per default, removed Q&A entry about MP3 and patent issues from handbook M +1 -0 CHANGES M +1 -19 doc/en/index.docbook M +1 -3 kwave.spec.in M +1 -1 plugins/codec_mp3/CMakeLists.txt https://commits.kde.org/kwave/df6640205e71d3a3378c35a5a5fad6a19c19c10d diff --git a/CHANGES b/CHANGES index 18f1cc13..b695ddfc 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,7 @@ xx.xx.x [xxxx-xx-xx] + * switched on MP3 support per default * new plugin: export to K3b project file * reduced flicker of position widget * bugfix: deleting labels per menu did not work diff --git a/doc/en/index.docbook b/doc/en/index.docbook index d3b57de8..d11bfcbb 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -1147,7 +1147,7 @@ The plans for future include support for import and also export filters for more formats and maybe some filter that uses a user-definable script with a call to an external filter, so that even formats not supported - by <literal>SoX</literal> (like MP3) can be read and/or written. + by <literal>SoX</literal> can be read and/or written. </para> </sect2> @@ -7641,24 +7641,6 @@ </answer> </qandaentry> - <qandaentry> - <question> - <para> - What about MP3 support? - </para> - </question> - <answer> - <para> - Well, as long as there are patent issues, we support only MP3 - import through the mad library and export via the external - program <ulink url="&url_lame;">lame</ulink>. - Additionally you need to have the permission to use code - covered by the MP3 patents when generating a Kwave package - for distributing! - </para> - </answer> - </qandaentry> - <!-- <qandaentry> <question> diff --git a/kwave.spec.in b/kwave.spec.in index f06afa69..e2cc1586 100644 --- a/kwave.spec.in +++ b/kwave.spec.in @@ -126,7 +126,6 @@ BuildRequires: rsvg-view BuildRequires: update-desktop-files %define EXTRA_OPTS "" -%define MP3ENABLED "-DWITH_MP3=OFF" %define FDUPES %fdupes -s %{buildroot} %if 0%{?suse_version} == 1315 # Leap 42.1 still uses old plugin dir @@ -185,7 +184,6 @@ BuildRequires: qt5-qtmultimedia-devel >= %{qt5_min_version} BuildRequires: poxml %define EXTRA_OPTS "" -%define MP3ENABLED "-DWITH_MP3=OFF" %define FDUPES fdupes -s %{buildroot} %define _kf5_applicationsdir /usr/share/applications/ %define _kf5_appsdir /usr/share @@ -238,7 +236,7 @@ mkdir build cd build CXXFLAGS="${CXXFLAGS} ${RPM_OPT_FLAGS}" CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}" \ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - ${CONFIGURE_OPTS} %{MP3ENABLED} %{EXTRA_OPTS} .. + ${CONFIGURE_OPTS} %{EXTRA_OPTS} .. cd - make -C build %{?jobs:-j %jobs} diff --git a/plugins/codec_mp3/CMakeLists.txt b/plugins/codec_mp3/CMakeLists.txt index 5b3c9b37..5e00f1a7 100644 --- a/plugins/codec_mp3/CMakeLists.txt +++ b/plugins/codec_mp3/CMakeLists.txt @@ -22,7 +22,7 @@ # # ############################################################################# -OPTION(WITH_MP3 "enable support for mp3 files [default=off]" OFF) +OPTION(WITH_MP3 "enable support for mp3 files [default=on]" ON) IF (WITH_MP3) #############################################################################
