From 92f06e382dbb8ae60c630f98bff6097deaf0d63e Mon Sep 17 00:00:00 2001
From: Andreas Wacknitz <A.Wacknitz@gmx.de>
Date: Tue, 14 Nov 2023 17:18:20 +0100
Subject: [PATCH] rebuild wavpack & drop 32 bit & add test results
---
components/multimedia/wavpack/manifests/sample-manifest.p5m | 10 -
/dev/null | 25 -----
components/multimedia/wavpack/Makefile | 19 ++-
components/multimedia/wavpack/pkg5 | 2
components/multimedia/wavpack/wavpack.p5m | 11 --
components/multimedia/wavpack/test/results-all.master | 194 ++++++++++++++++++++++++++++++++++++++
6 files changed, 208 insertions(+), 53 deletions(-)
diff --git a/components/multimedia/wavpack/Makefile b/components/multimedia/wavpack/Makefile
index f067362..729abf5 100644
--- a/components/multimedia/wavpack/Makefile
+++ b/components/multimedia/wavpack/Makefile
@@ -13,27 +13,34 @@
# Copyright 2022 Andreas Wacknitz
#
-BUILD_BITS= 64_and_32
+BUILD_BITS= 64
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= wavpack
COMPONENT_VERSION= 5.6.0
+COMPONENT_REVISION= 1
COMPONENT_SUMMARY= wavpack - Hybrid Lossless Audio Compression
COMPONENT_PROJECT_URL= https://www.wavpack.com/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2
COMPONENT_ARCHIVE_HASH= sha256:8cbfa15927d29bcf953db35c0cfca7424344ff43ebe4083daf161577fb839cc1
COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)$(COMPONENT_ARCHIVE)
-COMPONENT_LICENSE= BSD
COMPONENT_FMRI= audio/wavpack
COMPONENT_CLASSIFICATION= System/Multimedia Libraries
+COMPONENT_LICENSE= BSD
+COMPONENT_LICENSE_FILE= COPYING
-TEST_TARGET= $(NO_TESTS)
include $(WS_TOP)/make-rules/common.mk
-CONFIGURE_OPTIONS += --disable-static
-CONFIGURE_OPTIONS += --enable-legacy
-CONFIGURE_OPTIONS += --disable-asm
+CONFIGURE_OPTIONS += --disable-static
+CONFIGURE_OPTIONS += --enable-legacy
+
+COMPONENT_TEST_TRANSFORMS= \
+ ' -n ' \
+ ' -e "/PASS/p" ' \
+ ' -e "/pass/p" ' \
+ ' -e "/\*\*\*/p" ' \
+ ' -e "/===/p" '
# Auto-generated dependencies
REQUIRED_PACKAGES += system/library
diff --git a/components/multimedia/wavpack/manifests/sample-manifest.p5m b/components/multimedia/wavpack/manifests/sample-manifest.p5m
index 5f2e5b2..6202c05 100644
--- a/components/multimedia/wavpack/manifests/sample-manifest.p5m
+++ b/components/multimedia/wavpack/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@
#
#
-# Copyright 2022 <contributor>
+# Copyright 2023 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -23,10 +23,6 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
-file path=usr/bin/$(MACH32)/wavpack
-file path=usr/bin/$(MACH32)/wvgain
-file path=usr/bin/$(MACH32)/wvtag
-file path=usr/bin/$(MACH32)/wvunpack
file path=usr/bin/wavpack
file path=usr/bin/wvgain
file path=usr/bin/wvtag
@@ -36,10 +32,6 @@
link path=usr/lib/$(MACH64)/libwavpack.so.1 target=libwavpack.so.1.2.5
file path=usr/lib/$(MACH64)/libwavpack.so.1.2.5
file path=usr/lib/$(MACH64)/pkgconfig/wavpack.pc
-link path=usr/lib/libwavpack.so target=libwavpack.so.1.2.5
-link path=usr/lib/libwavpack.so.1 target=libwavpack.so.1.2.5
-file path=usr/lib/libwavpack.so.1.2.5
-file path=usr/lib/pkgconfig/wavpack.pc
file path=usr/share/doc/wavpack/README.md
file path=usr/share/doc/wavpack/WavPack5FileFormat.pdf
file path=usr/share/doc/wavpack/WavPack5LibraryDoc.pdf
diff --git a/components/multimedia/wavpack/pkg5 b/components/multimedia/wavpack/pkg5
index 3f55188..0ce5adf 100644
--- a/components/multimedia/wavpack/pkg5
+++ b/components/multimedia/wavpack/pkg5
@@ -1,7 +1,5 @@
{
"dependencies": [
- "SUNWcs",
- "shell/ksh93",
"system/library",
"system/library/math"
],
diff --git a/components/multimedia/wavpack/test/results-all.master b/components/multimedia/wavpack/test/results-all.master
new file mode 100644
index 0000000..fc8d623
--- /dev/null
+++ b/components/multimedia/wavpack/test/results-all.master
@@ -0,0 +1,194 @@
+ ****** pure lossless ******
+ *** 8-bit, mono ***
+test 0001...pass ( -f, 40.69%, 4.74 bps, 8910fb48d317f10ba26f9135a12a66d7)
+test 0002...pass ( -, 41.24%, 4.70 bps, 11efc8dd5f96d091642fc729bd80a358)
+test 0003...pass ( -h, 41.23%, 4.70 bps, e5aa7f6aa4f8b41dd17b64f8468b9be6)
+test 0004...pass ( -hh, 41.39%, 4.69 bps, 096b306e9fe00247b404c1a6a9cfc346)
+ *** 16-bit, mono ***
+test 0005...pass ( -f, 25.00%, 12.00 bps, 54af1fd9763353cdd5fd32595632d09d)
+test 0006...pass ( -, 25.55%, 11.91 bps, 616e4381a26012344db9a061c9bd4727)
+test 0007...pass ( -h, 25.76%, 11.88 bps, 1d47d9065cabf5f1684b37498b889fc7)
+test 0008...pass ( -hh, 26.00%, 11.84 bps, 47d38c0798d69c23019df811affc0b47)
+ *** 16-bit, stereo ***
+test 0009...pass ( -f, 26.98%, 11.68 bps, 0c7ca4548b08a4d8ceef5ca96d95c2c9)
+test 0010...pass ( -, 27.50%, 11.60 bps, 14c628667366085682dc74e0de3e6178)
+test 0011...pass ( -h, 30.60%, 11.10 bps, 65480dd713eeee0a871e89e19b7593ca)
+test 0012...pass ( -hh, 31.24%, 11.00 bps, 4ab36dfca1d26450f9bad0749264385d)
+ *** 16-bit (converted to float), stereo ***
+test 0013...pass ( -f, 63.47%, 11.69 bps, b190933cfd286ffe9097476cc8cd2e0e)
+test 0014...pass ( -, 63.73%, 11.61 bps, 10ed51a147bba3542e4b3e3adb7066d1)
+test 0015...pass ( -h, 65.05%, 11.19 bps, 849c3c4bf82ee1887ae890d294873a38)
+test 0016...pass ( -hh, 65.33%, 11.10 bps, 1fecb1314c60abdd1b9621ea48ef7a67)
+ *** 24-bit, 5.1 channels ***
+test 0017...pass ( -f, 21.75%, 18.78 bps, d31f6c8baa19d9c04ba58f5d64b43034)
+test 0018...pass ( -, 22.20%, 18.67 bps, 6102a2e653b1ea5487e5007be95a0128)
+test 0019...pass ( -h, 23.60%, 18.34 bps, c41d24d6833c729b63d82e7172b05c04)
+test 0020...pass ( -hh, 23.83%, 18.28 bps, d5c158aae4a6c899c977c060899c886e)
+ *** 24-bit (converted to float), 5.1 channels ***
+test 0021...pass ( -f, 41.28%, 18.79 bps, b8feb11a3d90855b75354d9f37ee3908)
+test 0022...pass ( -, 41.60%, 18.69 bps, 9dc356667f987a34bc7d6ac98ca8a6c6)
+test 0023...pass ( -h, 42.62%, 18.36 bps, e7f7f9c30c54b8b197b353363116cfc6)
+test 0024...pass ( -hh, 42.76%, 18.32 bps, c83dbf83f93fe94d26869d065a304980)
+ *** 32-bit integer, 5.1 channels ***
+test 0025...pass ( -f, 16.57%, 26.70 bps, 4c16e30c9c2d14c9635e667729d864ec)
+test 0026...pass ( -, 16.88%, 26.60 bps, 476b53c75db5595113ef8394d180721a)
+test 0027...pass ( -h, 17.79%, 26.31 bps, dfb8915b2bd6deb828239ffdc3c7383a)
+test 0028...pass ( -hh, 17.88%, 26.28 bps, 32198564f69958dcb8ce2736df7a0c8a)
+ *** 32-bit float stored as integer (pathological), 5.1 channels ***
+test 0029...pass ( -f, 13.34%, 27.73 bps, 28c3c1c561673360afbf11993a135140)
+test 0030...pass ( -, 13.83%, 27.57 bps, 4cb1d52b43e55017578f6435fc4bc862)
+test 0031...pass ( -h, 13.09%, 27.81 bps, d22f6a090aa2856df7597e6b10aab1fa)
+test 0032...pass ( -hh, 12.78%, 27.91 bps, 2d59b01e3e55c66bda326792a528954c)
+ *** 32-bit integer stored as float (pathological), 5.1 channels ***
+test 0033...pass ( -f, -24.99%, 40.00 bps, 89e50af739fa048798c5e1ae823f99d1)
+test 0034...pass ( -, -27.75%, 40.88 bps, d9d45294c2deb26db3b50274c7db3417)
+test 0035...pass ( -h, -30.10%, 41.63 bps, f00b41ccaf897a6260b9ab43db59beb6)
+test 0036...pass ( -hh, -34.55%, 43.06 bps, 12756ec7b4b5c895221148783c6573cf)
+ *** 32-bit float, 5.1 channels ***
+test 0037...pass ( -f, 25.63%, 23.80 bps, 80528999b7fa84fc11191409996c7686)
+test 0038...pass ( -, 26.05%, 23.66 bps, 11f43644ed9f3e2d3c9d6098d857f9aa)
+test 0039...pass ( -h, 26.97%, 23.37 bps, a079cd774a6ee23cea0ecebd396b2e10)
+test 0040...pass ( -hh, 27.05%, 23.34 bps, b58fd0840f837643e2447f3ee10bcf53)
+ ****** hybrid lossless ******
+ *** 8-bit, mono ***
+test 0041...pass ( -fb3c, 36.47%, 5.08 bps, bc959f289b1ac2a95dda68725b8cf1f9)
+test 0042...pass ( -b3c, 36.94%, 5.05 bps, 86a7c7c5d2742b6fa63205544f3a8a85)
+test 0043...pass ( -hb3c, 36.79%, 5.06 bps, 34b9ab2443f13dc9133aae241cbb01c8)
+test 0044...pass ( -hhb3c, 36.65%, 5.07 bps, 79d76a10d5f391d6b96192860f1f79b4)
+ *** 16-bit, mono ***
+test 0045...pass ( -fb3c, 22.45%, 12.41 bps, 1cc02aae5d280b805a6a5a02a18e5701)
+test 0046...pass ( -b3c, 23.12%, 12.30 bps, cf1c3ce6d499a4a43c28e5941a0555be)
+test 0047...pass ( -hb3c, 23.28%, 12.28 bps, 27aeba4013b336b75ddd1657cde29cab)
+test 0048...pass ( -hhb3c, 23.37%, 12.26 bps, ead7f9bb1ff73139f3c686fd327bad2f)
+ *** 16-bit, stereo ***
+test 0049...pass ( -fb3c, 25.22%, 11.97 bps, 121b65076f7d4880e39379c0f7495e3e)
+test 0050...pass ( -b3c, 25.79%, 11.87 bps, 78df5eb4f77c02b15eca53abf5403825)
+test 0051...pass ( -hb3c, 26.12%, 11.82 bps, f61790d7e6ab46c1ab9cacc02c93d872)
+test 0052...pass ( -hhb3c, 26.29%, 11.79 bps, beffcf034928e4adc430a36014f6b3e5)
+ *** 16-bit (converted to float), stereo ***
+test 0053...pass ( -fb3c, 62.95%, 11.86 bps, a38c88d4add694a1c29a23ccf38bb69e)
+test 0054...pass ( -b3c, 63.27%, 11.75 bps, 410ab611ba8a657920d9f6af80b09186)
+test 0055...pass ( -hb3c, 63.42%, 11.70 bps, f5033e47065832d823508d65b44964e8)
+test 0056...pass ( -hhb3c, 63.60%, 11.65 bps, 0344750dca412a1c8123b1ac5354574f)
+ *** 24-bit, 5.1 channels ***
+test 0057...pass ( -fb3c, 20.42%, 19.10 bps, a0ec862aa3dd5759fca684ccb4b2c47f)
+test 0058...pass ( -b3c, 21.06%, 18.94 bps, 3cc84bb05d2fe35ab78c7a4220ccdbe1)
+test 0059...pass ( -hb3c, 21.19%, 18.91 bps, 5ed174256d2a054f1c49ea6d75a7ef9b)
+test 0060...pass ( -hhb3c, 21.23%, 18.90 bps, 0fb3e4cdcc5001b963296d653b8b39b9)
+ *** 24-bit (converted to float), 5.1 channels ***
+test 0061...pass ( -fb3c, 40.72%, 18.97 bps, e73a93ff35ce1858a9e3080c95b1b7b1)
+test 0062...pass ( -b3c, 41.23%, 18.81 bps, f9e186082084654996e627346cb31f02)
+test 0063...pass ( -hb3c, 41.31%, 18.78 bps, d26201cae35d225e887b1a527df007a8)
+test 0064...pass ( -hhb3c, 41.40%, 18.75 bps, 2db8b9fc8b1c13c187bbf7694eaaf298)
+ *** 32-bit integer, 5.1 channels ***
+test 0065...pass ( -fb3c, 16.00%, 26.88 bps, b39c6d6286cba4c9212ef64ede2dce3e)
+test 0066...pass ( -b3c, 16.43%, 26.74 bps, c1eeedb77d8a02f6fb72812321fc1b93)
+test 0067...pass ( -hb3c, 16.40%, 26.75 bps, 1c5d9aa8d9671691f771d0944baf8e60)
+test 0068...pass ( -hhb3c, 16.49%, 26.72 bps, 91ade8f44a349c1057269a2ef4b14fb2)
+ *** 32-bit float stored as integer (pathological), 5.1 channels ***
+test 0069...pass ( -fb3c, 12.61%, 27.96 bps, 00efe461cb45ad5498b652c47c5da821)
+test 0070...pass ( -b3c, 12.80%, 27.90 bps, 8cbca20bff62415add5cce33b30cf21b)
+test 0071...pass ( -hb3c, 12.04%, 28.15 bps, 0c9e8781c79224a83767c607854aff9f)
+test 0072...pass ( -hhb3c, 11.80%, 28.22 bps, c97ddca8636afd00041120f3015b2d75)
+ *** 32-bit float, 5.1 channels ***
+test 0073...pass ( -fb3c, 25.11%, 23.97 bps, acc3b8966d20b722b3cea8e9723a96f7)
+test 0074...pass ( -b3c, 25.59%, 23.81 bps, 917a0fc273ee39e3e9f8ff85b4eab547)
+test 0075...pass ( -hb3c, 25.62%, 23.80 bps, 0bf2864b6bde93e30bd258daba9888be)
+test 0076...pass ( -hhb3c, 25.79%, 23.75 bps, 1930b53b0c139995ee926623b1fdbb52)
+ ****** hybrid lossy ******
+ *** 8-bit, mono ***
+test 0077...pass ( -fb5, 50.42%, 3.97 bps, 88dd591220fdd94022dfd5c30c4e9d64)
+test 0078...pass ( -b5, 50.33%, 3.97 bps, 213372191b5b964b0a155f1dc8102d53)
+test 0079...pass ( -hb5, 50.24%, 3.98 bps, e21e1fece201a70dd1833cf382fa94c5)
+test 0080...pass ( -hhb5, 50.05%, 4.00 bps, 38404b20c3e5775be1553a58a2725e39)
+ *** 16-bit, mono ***
+test 0081...pass ( -fb5, 68.71%, 5.01 bps, e888f45034da315a3a01e7fd277eda56)
+test 0082...pass ( -b5, 68.56%, 5.03 bps, 6f4c085afdec413c188e750efbcc26a4)
+test 0083...pass ( -hb5, 68.53%, 5.03 bps, 5e51e384a229c60bcf7f2a3bf86474ec)
+test 0084...pass ( -hhb5, 68.48%, 5.04 bps, 64174d4d658bb843ed4532a608d03385)
+ *** 16-bit, stereo ***
+test 0085...pass ( -fb5, 68.13%, 5.10 bps, b65f2272bf556e57c5f5391772c35170)
+test 0086...pass ( -b5, 67.95%, 5.13 bps, cfd736c14da7cf7d61c32e3d6ca0ca68)
+test 0087...pass ( -hb5, 67.92%, 5.13 bps, 94f0111ca962b3a16bbb2c1f1805e5ea)
+test 0088...pass ( -hhb5, 67.88%, 5.14 bps, b042c67dd3c35669c25d295bc3fe99a8)
+ *** 16-bit (converted to float), stereo ***
+test 0089...pass ( -fb5, 84.06%, 5.10 bps, e6c57e97864cbe85757de60387bb2d1b)
+test 0090...pass ( -b5, 83.99%, 5.12 bps, 815ddea5329e067b75b703ab6eb51d7d)
+test 0091...pass ( -hb5, 84.02%, 5.11 bps, a14473c54ddb8ac04bd9254c7600a262)
+test 0092...pass ( -hhb5, 83.99%, 5.12 bps, 3b1d36b2ce7073c1238d75d25d986e0a)
+ *** 24-bit, 5.1 channels ***
+test 0093...pass ( -fb5, 78.96%, 5.05 bps, e97c1667377008b95809901396c75736)
+test 0094...pass ( -b5, 78.78%, 5.09 bps, 9b227cb903d6b99f6a224bc771a0a21f)
+test 0095...pass ( -hb5, 78.62%, 5.13 bps, e767e2fd113409c971272857dfefb592)
+test 0096...pass ( -hhb5, 78.54%, 5.15 bps, b1c499d1eef364c39c0a8419bfe63ba3)
+ *** 24-bit (converted to float), 5.1 channels ***
+test 0097...pass ( -fb5, 84.19%, 5.06 bps, 2d504a38e1644e4d5fc19dc89a976ad1)
+test 0098...pass ( -b5, 84.11%, 5.08 bps, 3606b38d089db73a0a19bc97e39633bc)
+test 0099...pass ( -hb5, 84.01%, 5.12 bps, 480551ec92d5ac45caaf90e1fdbe1a0f)
+test 0100...pass ( -hhb5, 83.93%, 5.14 bps, d953ad67229ff66803553ded4f68fdc2)
+ *** 32-bit integer, 5.1 channels ***
+test 0101...pass ( -fb5, 84.11%, 5.08 bps, 8be506083e538481178b436e3369cf23)
+test 0102...pass ( -b5, 84.00%, 5.12 bps, 9edd9ff3b55ce6860c33e3f6e375daf4)
+test 0103...pass ( -hb5, 83.91%, 5.15 bps, ab323b5c4378467d914fe4f7ce9bad7c)
+test 0104...pass ( -hhb5, 83.83%, 5.17 bps, 3d0235da55527a1a2998fc5741d48f90)
+ *** 32-bit float stored as integer (pathological), 5.1 channels ***
+test 0105...pass ( -fb5, 79.98%, 6.41 bps, 36c6c65a927a7e01f7b17caff4b54ef0)
+test 0106...pass ( -b5, 79.64%, 6.51 bps, 152d9c9c33ab483bbe4e1a9316f5b9d4)
+test 0107...pass ( -hb5, 79.78%, 6.47 bps, 5acc855b219167eacfc81bc0948d6da9)
+test 0108...pass ( -hhb5, 79.71%, 6.49 bps, f81cb8f5ef6249cc2eb9ecbcd7414e4b)
+ *** 32-bit float, 5.1 channels ***
+test 0109...pass ( -fb5, 84.12%, 5.08 bps, 44739f74385f8fa3a1520509fc85b3f2)
+test 0110...pass ( -b5, 84.03%, 5.11 bps, 5c20e48932d1737d9f04383b82a43eef)
+test 0111...pass ( -hb5, 83.94%, 5.14 bps, 5a1c1fadbeee6dbf20f7b0405b720c08)
+test 0112...pass ( -hhb5, 83.86%, 5.16 bps, e3bb59e984073c09268071b27be18be4)
+ ****** hybrid lossless (but ignore wvc on decode) ******
+ *** 8-bit, mono ***
+test 0113...pass ( -fb4c, 55.55%, 3.56 bps, 416e680d47dcbea862976a4780b13793)
+test 0114...pass ( -b4c, 55.28%, 3.58 bps, 6b211e869586f25eefb0be7dac245344)
+test 0115...pass ( -hb4c, 54.95%, 3.60 bps, a177585c3c2c2215144cbc3a1ed3b388)
+test 0116...pass ( -hhb4c, 54.41%, 3.65 bps, 61584ba1577770548dbe2d1d329f838c)
+ *** 16-bit, mono ***
+test 0117...pass ( -fb4c, 73.90%, 4.18 bps, fa7f15c26975504752aea84a6688db5f)
+test 0118...pass ( -b4c, 73.71%, 4.21 bps, 7c174aba0b6563848cf0ea16f4c7bf5b)
+test 0119...pass ( -hb4c, 73.62%, 4.22 bps, 30821e0c1ab4890ca6251b93197ce272)
+test 0120...pass ( -hhb4c, 73.35%, 4.26 bps, d8ee23f0dd6074978314a495ee01a931)
+ *** 16-bit, stereo ***
+test 0121...pass ( -fb4c, 73.92%, 4.17 bps, fed2114f35841586e2af9090ca16922c)
+test 0122...pass ( -b4c, 73.76%, 4.20 bps, 84d75bc06075192e36cfff335a1f558e)
+test 0123...pass ( -hb4c, 73.61%, 4.22 bps, a5e9cfd8288139ee4b64d93d003d8c71)
+test 0124...pass ( -hhb4c, 73.43%, 4.25 bps, 9b7156b957276ad0cb8fb761c7c1e222)
+ *** 16-bit (converted to float), stereo ***
+test 0125...pass ( -fb4c, 87.14%, 4.11 bps, e6eb35d6f13cff6e19d4f7733baa91b7)
+test 0126...pass ( -b4c, 87.10%, 4.13 bps, 862924d20a85c9546379794d46afce3d)
+test 0127...pass ( -hb4c, 87.14%, 4.11 bps, 1091b7f91326880d61e10a02d9c13bc6)
+test 0128...pass ( -hhb4c, 87.11%, 4.12 bps, 59c4d8cccbe898da2e6ed0f2da0979a7)
+ *** 24-bit, 5.1 channels ***
+test 0129...pass ( -fb4c, 82.79%, 4.13 bps, af28290b62fb3660b80ed41892dc4c22)
+test 0130...pass ( -b4c, 82.63%, 4.17 bps, 3bd8cf9e28e46f2fa557a576827efb07)
+test 0131...pass ( -hb4c, 82.47%, 4.21 bps, 14985b8509e3bc7abd3124971566bf1c)
+test 0132...pass ( -hhb4c, 82.34%, 4.24 bps, b8a696b3d4d1b029416db6a5b888b8f2)
+ *** 24-bit (converted to float), 5.1 channels ***
+test 0133...pass ( -fb4c, 87.32%, 4.06 bps, dd20330fde7ef630f2fdffb9dcae7216)
+test 0134...pass ( -b4c, 87.26%, 4.08 bps, e6a24dc9b134887b11decca4cae93066)
+test 0135...pass ( -hb4c, 87.18%, 4.10 bps, ff9bf0e038963bdd6a775062ebea4fa3)
+test 0136...pass ( -hhb4c, 87.13%, 4.12 bps, ab8c0104993a78e9ec950d7148949230)
+ *** 32-bit integer, 5.1 channels ***
+test 0137...pass ( -fb4c, 87.25%, 4.08 bps, 3dd64ae56084f0cb6008435fc12c5eec)
+test 0138...pass ( -b4c, 87.18%, 4.10 bps, b6549dd4f8d70ab32ec65d45828f4c0f)
+test 0139...pass ( -hb4c, 87.11%, 4.12 bps, e841547b13bcaca8062145430b91deaf)
+test 0140...pass ( -hhb4c, 87.05%, 4.14 bps, 20e4c03ab47ff4d17d11227cdd2318f4)
+ *** 32-bit float stored as integer (pathological), 5.1 channels ***
+test 0141...pass ( -fb4c, 83.43%, 5.30 bps, ab1e7a00ceb3382b9e1640ac33333a16)
+test 0142...pass ( -b4c, 83.26%, 5.36 bps, bd32bd33d7a4706bbbca8aa32dd94d5d)
+test 0143...pass ( -hb4c, 83.46%, 5.29 bps, ccf8ffb271940c6426c42a0b19a48076)
+test 0144...pass ( -hhb4c, 83.49%, 5.28 bps, 20e1e0a7cc38a82dc26a6c15cd72c4fd)
+ *** 32-bit float, 5.1 channels ***
+test 0145...pass ( -fb4c, 87.27%, 4.07 bps, de2ccd752eab59985a3aeafd862f0dfa)
+test 0146...pass ( -b4c, 87.21%, 4.09 bps, 0cdee106323e5102bd862422c446bed0)
+test 0147...pass ( -hb4c, 87.14%, 4.12 bps, a624bb605cde11d19586327049495ac4)
+test 0148...pass ( -hhb4c, 87.08%, 4.13 bps, 2c19a11a47df8f647c77102b654af2a6)
+all tests pass
+PASS: cli/fast-tests
+=============
+1 test passed
+=============
diff --git a/components/multimedia/wavpack/wavpack.license b/components/multimedia/wavpack/wavpack.license
deleted file mode 100644
index 4eae6a4..0000000
--- a/components/multimedia/wavpack/wavpack.license
+++ /dev/null
@@ -1,25 +0,0 @@
- Copyright (c) 1998 - 2021 David Bryant
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of Conifer Software nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/components/multimedia/wavpack/wavpack.p5m b/components/multimedia/wavpack/wavpack.p5m
index fe1e82b..9b01dab 100644
--- a/components/multimedia/wavpack/wavpack.p5m
+++ b/components/multimedia/wavpack/wavpack.p5m
@@ -24,13 +24,6 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
-# Drop 32-bit binaries
-<transform path=usr/bin/$(MACH32) -> drop>
-
-file path=usr/bin/$(MACH32)/wavpack
-file path=usr/bin/$(MACH32)/wvgain
-file path=usr/bin/$(MACH32)/wvtag
-file path=usr/bin/$(MACH32)/wvunpack
file path=usr/bin/wavpack
file path=usr/bin/wvgain
file path=usr/bin/wvtag
@@ -40,10 +33,6 @@
link path=usr/lib/$(MACH64)/libwavpack.so.1 target=libwavpack.so.1.2.5
file path=usr/lib/$(MACH64)/libwavpack.so.1.2.5
file path=usr/lib/$(MACH64)/pkgconfig/wavpack.pc
-link path=usr/lib/libwavpack.so target=libwavpack.so.1.2.5
-link path=usr/lib/libwavpack.so.1 target=libwavpack.so.1.2.5
-file path=usr/lib/libwavpack.so.1.2.5
-file path=usr/lib/pkgconfig/wavpack.pc
file path=usr/share/doc/wavpack/README.md
file path=usr/share/doc/wavpack/WavPack5FileFormat.pdf
file path=usr/share/doc/wavpack/WavPack5LibraryDoc.pdf
--
Gitblit v1.9.3