gentoo resync : 08.01.2021

4 files changed, 26 insertions, 65 deletions

diff --git a/media-libs/bcg729/Manifest b/media-libs/bcg729/Manifest
index 01a0992d7316..f0e364c4570a 100644
--- a/media-libs/bcg729/Manifest
+++ b/media-libs/bcg729/Manifest
@@ -1,7 +1,5 @@
 AUX bcg729-4.3.0_beta-cmake-build.patch 135 BLAKE2B c3379f4327ab4f1d2a12ec31f3f0c0a3a15b0c2945da0d707d2d1b308c1860d52914b875504c0967c4b75ae42a4f7766611563c150cd0afb0acfe1369cc72116 SHA512 97fa2a52456809b2c4bac66c4c309b0d95a7a12d43eb102857339e729ede84f9a2cef9050a7232090e7b4e2f3817890d94e565051553f4cec3b7e83e69b2481c
-DIST bcg729-1.0.4.tar.gz 115641 BLAKE2B 5240fc10f8c4c32d9c9a6fc527a198fc896a8ff5ea12aa8a692808877582ac25b3fee122799cb7f6cea58db2f07cc07348da36d9f526e62f0bf62d61ef33bcfa SHA512 fdbbd2c9a807ed832ac3976301843bae854368ab281d16f792550bbda921d226fc6003c0a499561529f22eae08bc0d78b8826c2d06c859ab706d999a96967ffb
 DIST bcg729-1.1.1.tar.gz 122475 BLAKE2B 6774f6af439c9308db856be9d4bbb6db5c73e7a807b51dca6338d1506d896052a7830ade7767b45fd5a9ded0a6a0057e207bc1d5b0e33adbaed9dafb13a7bd3b SHA512 e8cc4b7486a9a29fb729ab9fd9e3c4a2155573f38cec16f5a53db3b416fc1119ea5f5a61243a8d37cb0b64580c5df1b632ff165dc7ff47421fa567dafffaacd8
-EBUILD bcg729-1.0.4-r1.ebuild 773 BLAKE2B 6d4bbbd387848015bff76c14c53c584f57b25061682edb2e7f39154bf6473f840badb8536f602b7e19bdf81701944b818ef8df9bdec541613adb3b7d4ee8b6f8 SHA512 5a10a6452874531186ddd133ace537037b0e6df4203cb283cc77f6603c08c2be3a182cc75a83232e38b24474c8fd6996526fd1ee5cbddebf74156766ed914480
-EBUILD bcg729-1.1.1.ebuild 694 BLAKE2B 1e8e0a842d057f3bb285349caa58594fa7b55eae9e9176a66455fa00b83d2dff16098726ed94d3fd8b730d7a3c3770771eba7ca31466903ef78888435a68db1d SHA512 248f4ecfa682762a20e7bcce62891580c5c7a9e8e1f286ca8542456cd1ee10a3e3de07805ee6f359282aea7966929c281ba13fbcfb0096ea30c7fce0cf311a33
-EBUILD bcg729-999999.ebuild 576 BLAKE2B 5fe0f10f4483e5873833fd05f8927622a63241f30f57f74606c553b664177f97ee84e287132ab0aff17bb315dcfe1ab1893d4f670163a6c7e8977ccbc9493e7b SHA512 bfde637d4a43ecdf4668188d0a2b6fc71a0a68cc7825fb260cc6034773b3e8a724411afba89bb7a6e74442f40370fc0f1cdfbd9eae9c2e45180bf70a286d9239
+DIST bcg729-tests-20210101.zip 33438219 BLAKE2B 93bf1538f905f2fb67d703a6275ac7d616c005efb709f4d11e838be8b06e7f87429c4114dfc3e393b7b635dca51bf75a09d676188e9e11facdf7ec45ec5e4e50 SHA512 bd97521dc620e857dc3956ffc8a0b23da86ab2dd00621247ad91f05f04a9df7ce19bda426a307188f9271341332a393cb6e85c5c7e04b85c6e92496b6ffad5fc
+EBUILD bcg729-1.1.1.ebuild 1221 BLAKE2B 9d7bb232f5b2a2c159e74b6aec66d61566e893a16e9558868089f950e152d6310d75268866ac31f8de996e7fc249e33b108341eb66cef1355dba6bc8726372ff SHA512 199dc4599680259e836f86af3ed94db724dfb7bddd62d84ed249e588ff4a1e6ace63ef4c9929c21565e1b1f81e64656606c48650279c856c2c93b620740d66b2
 MISC metadata.xml 318 BLAKE2B f7971ede10d80284559e2a3a9dc9088ff06c588d993f1b0dbcb13667a10495d0390a4ebe2c4e65b8fca8d7369c8600e7f446beb280ce04ef66debf52c0f26ba0 SHA512 b2cd9ed908992ad45a31d4f15954385f5d9bfd7f4659330695aaab3b7d1d1dcac1ed56680c77ab786ea7454b8032fb70332cdd06a74f2e40c3162bdb6d4a0a31
diff --git a/media-libs/bcg729/bcg729-1.0.4-r1.ebuild b/media-libs/bcg729/bcg729-1.0.4-r1.ebuild
deleted file mode 100644
index ce3201c782e7..000000000000
--- a/media-libs/bcg729/bcg729-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake-utils
-
-DESCRIPTION="encoder and decoder of the ITU G729 Annex A/B speech codec"
-HOMEPAGE="https://github.com/BelledonneCommunications/bcg729"
-SRC_URI="https://github.com/BelledonneCommunications/bcg729/archive/${PV/_/-}.tar.gz \
-		-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
-IUSE="static-libs"
-
-RDEPEND="
-	!media-plugins/mediastreamer-bcg729
-"
-S=${WORKDIR}/${P/_/-}
-DOCS=( AUTHORS NEWS README.md )
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_STATIC=$(usex static-libs)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/bcg729/bcg729-1.1.1.ebuild b/media-libs/bcg729/bcg729-1.1.1.ebuild
index e724197e7cff..cf638a772cfc 100644
--- a/media-libs/bcg729/bcg729-1.1.1.ebuild
+++ b/media-libs/bcg729/bcg729-1.1.1.ebuild
@@ -1,29 +1,49 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit cmake
 
+TEST_SUFFIX="tests-20210101"
 DESCRIPTION="encoder and decoder of the ITU G729 Annex A/B speech codec"
 HOMEPAGE="https://github.com/BelledonneCommunications/bcg729"
-SRC_URI="https://github.com/BelledonneCommunications/bcg729/archive/${PV/_/-}.tar.gz \
-		-> ${P}.tar.gz"
+SRC_URI="https://github.com/BelledonneCommunications/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" test? ( http://www.belledonne-communications.com/bc-downloads/${PN}-patterns.zip -> ${PN}-${TEST_SUFFIX}.zip )"
 S="${WORKDIR}/${P/_/-}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
+IUSE="test"
+RESTRICT="test"
+# Not all passing yet
+# TODO: Report upstream
+#RESTRICT="!test? ( test )"
 
+BDEPEND="test? ( app-arch/unzip )"
 RDEPEND="!media-plugins/mediastreamer-bcg729"
 
+src_prepare() {
+	sed -i -e 's/-Werror //' CMakeLists.txt || die
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_STATIC=no
+		-DENABLE_TESTS=$(usex test)
 	)
 	cmake_src_configure
 }
 
+src_test() {
+	cd "${BUILD_DIR}/test" || die
+	mv "${WORKDIR}/patterns" "${BUILD_DIR}/test/" || die
+
+	./testCampaignAll || die
+}
+
 src_install() {
 	cmake_src_install
 	find "${ED}" -name '*.la' -delete || die
diff --git a/media-libs/bcg729/bcg729-999999.ebuild b/media-libs/bcg729/bcg729-999999.ebuild
deleted file mode 100644
index 5263aff5d73a..000000000000
--- a/media-libs/bcg729/bcg729-999999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake git-r3
-
-DESCRIPTION="encoder and decoder of the ITU G729 Annex A/B speech codec"
-HOMEPAGE="https://github.com/BelledonneCommunications/bcg729"
-EGIT_REPO_URI="https://github.com/BelledonneCommunications/bcg729"
-S="${WORKDIR}/${P/_/-}"
-
-LICENSE="GPL-3"
-SLOT="0"
-RDEPEND="!media-plugins/mediastreamer-bcg729"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.0_beta-cmake-build.patch
-)
-
-src_install() {
-	cmake_src_install
-	find "${ED}" -name '*.la' -delete || die
-}