gentoo resync : 22.01.2021

3 files changed, 76 insertions, 0 deletions

diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index f92549bab1ef..35d21eb0e10a 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,3 +1,5 @@
+AUX flac-1.3.3-fix-zero-first-byte-md5sum-check.patch 813 BLAKE2B 83c327bebf5b813a52a533e2860887313e065cb0fdda807539e20dcef68203aaf5903622f8eae3b3016e6b6259b3af841facb6dfc9ab735d6f87b43a5e3b8974 SHA512 c5f5d13298a7c3c18e7b8ffa0c10ab0427331ac393672443b54686465f833712c522c1e55f834823804dcdbcdb5deb742d65f6edd30e271d980c4337a61a4480
 DIST flac-1.3.3.tar.xz 1044472 BLAKE2B 14acf10e5bce54767a8e3c9bfd0b80c388011e35c7e6a814672f8048d5350b4e6f54c6df4f704e611fa4a796fcfcb6aca1ed798f542cd6abe181210f9f6e33f6 SHA512 d6417e14fab0c41b2df369e5e39ce62a5f588e491af4d465b0162f74e171e5549b2f061867f344bfbf8aaccd246bf5f2acd697e532a2c7901c920c69429b1a28
+EBUILD flac-1.3.3-r1.ebuild 1644 BLAKE2B 511e2666915aba97d5cf0d23729bb4cd081325f2b5939fa8428e633d4aaef60d736968c0600749428c0cb41948f0866b0fb1779c39dce188d38d438aaf159785 SHA512 9621ba9081de2673dcafb26d6d84aa38e36cce5c3aee314ad658e8cab87851b2a05d57494d8dfe2ea70b706a11b4295dd9b7c1bd861da55a69b2eaf9a0c54a31
 EBUILD flac-1.3.3.ebuild 1573 BLAKE2B f7be916b09a5c039a7476293f6249e5001a88f7ec28a20eb0924bb84f879dbe77ba30435709a4e5b9933a2e0c6ce0bff6f02d9bf406c9d9473957f2afcbdcc46 SHA512 cac94617c638560ff703dde9f1998de293df1d3ed3d81d46ab9f1929f3330f9dfc2bfea36eb7b78df58cbe753358b9ad9d91d9daf1a325497f48d398a0cd37c7
 MISC metadata.xml 327 BLAKE2B dee4aea4020b899879f83487d34853963264b68e7a7e8c509571bc353a5b20fde4d7f78899b900bf4214f5d488f088523090d4f41e8542f069e9a4eb7791c2ad SHA512 a4e6ad50d3089ff980a07a6ea6f7fcc22e3efc4da4c5721492aae001861fa185f12d68fc5effb55ccce8d67042b7a605c28096f4bca88f2ba9d5b4eb2593d14c
diff --git a/media-libs/flac/files/flac-1.3.3-fix-zero-first-byte-md5sum-check.patch b/media-libs/flac/files/flac-1.3.3-fix-zero-first-byte-md5sum-check.patch
new file mode 100644
index 000000000000..bcad809374e3
--- /dev/null
+++ b/media-libs/flac/files/flac-1.3.3-fix-zero-first-byte-md5sum-check.patch
@@ -0,0 +1,13 @@
+diff --git a/src/flac/decode.c b/src/flac/decode.c
+index c26d3f60..bd3f6524 100644
+--- a/src/flac/decode.c
++++ b/src/flac/decode.c
+@@ -1307,7 +1307,7 @@ void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMet
+ 	if(metadata->type == FLAC__METADATA_TYPE_STREAMINFO) {
+ 		FLAC__uint64 skip, until;
+ 		decoder_session->got_stream_info = true;
+-		decoder_session->has_md5sum = memcmp(metadata->data.stream_info.md5sum, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 16);
++		decoder_session->has_md5sum = memcmp(metadata->data.stream_info.md5sum, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 16) != 0;
+ 		decoder_session->bps = metadata->data.stream_info.bits_per_sample;
+ 		decoder_session->channels = metadata->data.stream_info.channels;
+ 		decoder_session->sample_rate = metadata->data.stream_info.sample_rate;
diff --git a/media-libs/flac/flac-1.3.3-r1.ebuild b/media-libs/flac/flac-1.3.3-r1.ebuild
new file mode 100644
index 000000000000..fc6ee1ef776f
--- /dev/null
+++ b/media-libs/flac/flac-1.3.3-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="free lossless audio encoder and decoder"
+HOMEPAGE="https://xiph.org/flac/"
+SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
+
+LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cxx debug ogg cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_x86_sse static-libs"
+
+RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	abi_x86_32? ( dev-lang/nasm )
+"
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+	!elibc_uclibc? ( sys-devel/gettext )
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-zero-first-byte-md5sum-check.patch" )
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-doxygen-docs
+		--disable-examples
+		--disable-xmms-plugin
+		$([[ ${CHOST} == *-darwin* ]] && echo "--disable-asm-optimizations")
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_ppc_vsx vsx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable cxx cpplibs)
+		$(use_enable debug)
+		$(use_enable ogg)
+		$(use_enable static-libs static)
+
+		# cross-compile fix (bug #521446)
+		# no effect if ogg support is disabled
+		--with-ogg
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	if [[ ${UID} != 0 ]]; then
+		emake -j1 check
+	else
+		ewarn "Tests will fail if ran as root, skipping."
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}