From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B905A13835A for ; Sat, 16 Jan 2021 12:14:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D74CFE0828; Sat, 16 Jan 2021 12:14:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6C4B7E0828 for ; Sat, 16 Jan 2021 12:14:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 18F7F340F10 for ; Sat, 16 Jan 2021 12:14:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 45467476 for ; Sat, 16 Jan 2021 12:14:45 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1610798887.843116182c8038fb70225fa0b3b50c6008b5fef3.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/flac/, media-libs/flac/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/flac/files/flac-1.3.3-fix-zero-first-byte-md5sum-check.patch media-libs/flac/flac-1.3.3-r1.ebuild X-VCS-Directories: media-libs/flac/files/ media-libs/flac/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 843116182c8038fb70225fa0b3b50c6008b5fef3 X-VCS-Branch: master Date: Sat, 16 Jan 2021 12:14:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 093a8dec-0501-4828-b0e8-2fecb5024432 X-Archives-Hash: 0910a90a93476418251ff829d6959cc6 commit: 843116182c8038fb70225fa0b3b50c6008b5fef3 Author: Till Schäfer uni-dortmund de> AuthorDate: Fri Jan 15 09:25:53 2021 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Sat Jan 16 12:08:07 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84311618 media-libs/flac: fix zero prefix md5sum check Bug: https://bugs.gentoo.org/719792 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Till Schäfer uni-dortmund.de> Closes: https://github.com/gentoo/gentoo/pull/19064 Signed-off-by: Miroslav Šulc gentoo.org> ...ac-1.3.3-fix-zero-first-byte-md5sum-check.patch | 13 +++++ media-libs/flac/flac-1.3.3-r1.ebuild | 61 ++++++++++++++++++++++ 2 files changed, 74 insertions(+) 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 00000000000..bcad809374e --- /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 00000000000..de296da512f --- /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}/flac-1.3.3-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 +}