Skip to content

Commit

Permalink
Update WavPack from 5.6.0 to 5.7.0
Browse files Browse the repository at this point in the history 
- Checkout release 5.7.0 of WavPack. The previously used
  commit in CUETools was e03e8e2 (tag 5.6.0).
- Use the following commands, to update the WavPack submodule to
  commit 63dd3fa (tag 5.7.0):
    pushd ThirdParty/WavPack/
    git fetch
    git checkout 63dd3fa3b69fc236cc17886af6d4bd7dbe856125
    popd
- Update submodule_WavPack_CUETools.patch accordingly
  • Loading branch information
@c72578
c72578 committed Mar 2, 2024
1 parent fa6b2b2 commit 38e480a
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion ThirdParty/WavPack
Submodule WavPack updated 84 files
+78 −118 CMakeLists.txt
+1 −1 COPYING
+275 −0 ChangeLog
+34 −20 Makefile.am
+31 −0 NEWS
+1 −1 README.md
+0 −55 acinclude.m4
+50 −26 audition/cool_wv4.c
+ − audition/readme.odt
+ − audition/readme.pdf
+1 −1 autogen.sh
+25 −11 cli/aiff.c
+1 −5 cli/aiff_write.c
+1 −1 cli/all-tests
+1 −6 cli/caff.c
+1 −1 cli/caff_write.c
+2 −6 cli/dsdiff.c
+1 −1 cli/dsdiff_write.c
+2 −6 cli/dsf.c
+1 −1 cli/dsf_write.c
+1 −1 cli/fast-tests
+366 −167 cli/import_id3.c
+0 −4 cli/md5.c
+1 −4 cli/md5.h
+25 −15 cli/riff.c
+1 −1 cli/riff_write.c
+9 −5 cli/utils.c
+7 −2 cli/utils.h
+1 −5 cli/wave64.c
+1 −1 cli/wave64_write.c
+325 −142 cli/wavpack.c
+50 −33 cli/wvgain.c
+2 −2 cli/wvparser.c
+7 −11 cli/wvtag.c
+186 −128 cli/wvtest.c
+79 −44 cli/wvunpack.c
+23 −28 configure.ac
+ − doc/WavPack5LibraryDoc.odt
+ − doc/WavPack5LibraryDoc.pdf
+79 −16 doc/wavpack_doc.html
+9 −2 include/wavpack.h
+1 −1 license.txt
+265 −425 man/wavpack.1
+0 −368 man/wavpack.xml
+48 −112 man/wvgain.1
+0 −129 man/wvgain.xml
+100 −165 man/wvtag.1
+0 −205 man/wvtag.xml
+211 −397 man/wvunpack.1
+0 −322 man/wvunpack.xml
+65 −24 src/common_utils.c
+2 −2 src/decorr_utils.c
+1 −1 src/entropy_utils.c
+33 −38 src/extra1.c
+38 −43 src/extra2.c
+5 −5 src/libwavpack.vcxproj
+13 −41 src/open_filename.c
+1 −1 src/open_legacy.c
+1 −1 src/open_raw.c
+59 −16 src/open_utils.c
+193 −147 src/pack.c
+5 −6 src/pack_dns.c
+13 −28 src/pack_dsd.c
+510 −79 src/pack_utils.c
+4 −4 src/read_words.c
+38 −36 src/unpack.c
+4 −4 src/unpack3.c
+3 −0 src/unpack3.h
+3 −3 src/unpack3_seek.c
+1 −1 src/unpack_armv7.S
+17 −8 src/unpack_dsd.c
+15 −2 src/unpack_floats.c
+18 −18 src/unpack_seek.c
+321 −96 src/unpack_utils.c
+121 −23 src/wavpack_local.h
+3 −3 src/wavpack_version.h
+4 −4 src/write_words.c
+10 −0 wavpack.sln
+5 −5 wavpackdll/wavpackdll.rc
+4 −4 wavpackexe/wavpack.vcxproj
+11 −4 winamp/in_wv.c
+5 −5 wvgainexe/wvgain.vcxproj
+205 −0 wvtestexe/wvtest.vcxproj
+4 −4 wvunpackexe/wvunpack.vcxproj
26 changes: 13 additions & 13 deletions ThirdParty/submodule_WavPack_CUETools.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ index fd59f60..dcbf0b5 100644
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/src/libwavpack.vcxproj b/src/libwavpack.vcxproj
index 3d586d6..7e4523b 100644
index c9d3d40..5a01068 100644
--- a/src/libwavpack.vcxproj
+++ b/src/libwavpack.vcxproj
@@ -1,5 +1,5 @@
Expand Down Expand Up @@ -97,8 +97,8 @@ index 3d586d6..7e4523b 100644
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;ENABLE_DSD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;NO_TAGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;ENABLE_DSD;ENABLE_THREADS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;ENABLE_THREADS;NO_TAGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
Expand All @@ -110,8 +110,8 @@ index 3d586d6..7e4523b 100644
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;ENABLE_DSD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;NO_TAGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;ENABLE_DSD;ENABLE_THREADS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;ENABLE_THREADS;NO_TAGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
Expand All @@ -123,8 +123,8 @@ index 3d586d6..7e4523b 100644
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
- <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;ENABLE_DSD;OPT_ASM_X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;NO_TAGS;OPT_ASM_X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;ENABLE_DSD;ENABLE_THREADS;OPT_ASM_X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;ENABLE_THREADS;NO_TAGS;OPT_ASM_X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling />
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
Expand All @@ -136,8 +136,8 @@ index 3d586d6..7e4523b 100644
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
- <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;ENABLE_DSD;OPT_ASM_X64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;NO_TAGS;OPT_ASM_X64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;ENABLE_DSD;ENABLE_THREADS;OPT_ASM_X64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;ENABLE_THREADS;NO_TAGS;OPT_ASM_X64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling />
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
Expand Down Expand Up @@ -184,7 +184,7 @@ index 3d586d6..7e4523b 100644
<ClCompile Include="pack_utils.c" />
<ClCompile Include="read_words.c" />
diff --git a/wavpackdll/wavpackdll.vcxproj b/wavpackdll/wavpackdll.vcxproj
index 2d97667..92e220d 100644
index 2d97667..6143fe1 100644
--- a/wavpackdll/wavpackdll.vcxproj
+++ b/wavpackdll/wavpackdll.vcxproj
@@ -1,5 +1,5 @@
Expand Down Expand Up @@ -416,7 +416,7 @@ index 2d97667..92e220d 100644
/export:WavpackGetChannelLayout /export:WavpackSetFileInformation
/export:WavpackSetConfiguration64 /export:WavpackSetChannelLayout
diff --git a/wavpackexe/wavpack.vcxproj b/wavpackexe/wavpack.vcxproj
index 5d4e2fe..d38b409 100644
index 9cbf0d8..c6ee402 100644
--- a/wavpackexe/wavpack.vcxproj
+++ b/wavpackexe/wavpack.vcxproj
@@ -1,5 +1,5 @@
Expand Down Expand Up @@ -527,7 +527,7 @@ index e7b87ad..516ddee 100644
<WholeProgramOptimization>false</WholeProgramOptimization>
</PropertyGroup>
diff --git a/wvgainexe/wvgain.vcxproj b/wvgainexe/wvgain.vcxproj
index b7331b9..81cf728 100644
index 8c1dde4..55fa560 100644
--- a/wvgainexe/wvgain.vcxproj
+++ b/wvgainexe/wvgain.vcxproj
@@ -1,5 +1,5 @@
Expand Down Expand Up @@ -597,7 +597,7 @@ index b593ab8..3e9fc24 100644
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/wvunpackexe/wvunpack.vcxproj b/wvunpackexe/wvunpack.vcxproj
index ef39827..133a4de 100644
index 1888d0d..4aa3fab 100644
--- a/wvunpackexe/wvunpack.vcxproj
+++ b/wvunpackexe/wvunpack.vcxproj
@@ -1,5 +1,5 @@
Expand Down

0 comments on commit 38e480a

Please sign in to comment.