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 81664139694 for ; Sat, 3 Jun 2017 20:52:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E791321C07E; Sat, 3 Jun 2017 20:52:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B66DA21C07B for ; Sat, 3 Jun 2017 20:52:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 B6A55341884 for ; Sat, 3 Jun 2017 20:52:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4C6967475 for ; Sat, 3 Jun 2017 20:52:47 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1496523126.0a8189aa0fac03f213c968ba973bbe21ee178dbc.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/flac-image/, media-sound/flac-image/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/flac-image/files/flac-image-1.00-add-missing-string-include.patch media-sound/flac-image/files/flac-image-1.00-fix-build-system.patch media-sound/flac-image/flac-image-1.00.ebuild X-VCS-Directories: media-sound/flac-image/ media-sound/flac-image/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 0a8189aa0fac03f213c968ba973bbe21ee178dbc X-VCS-Branch: master Date: Sat, 3 Jun 2017 20:52:47 +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-Archives-Salt: 077c9b48-46ea-4176-b4ad-d4a03912f856 X-Archives-Hash: 5e5786c454a43733d6660651fb82bcac commit: 0a8189aa0fac03f213c968ba973bbe21ee178dbc Author: David Seifert gentoo org> AuthorDate: Sat Jun 3 20:12:04 2017 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Jun 3 20:52:06 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a8189aa media-sound/flac-image: [QA] Various fixes Package-Manager: Portage-2.3.6, Repoman-2.3.2 ...lac-image-1.00-add-missing-string-include.patch | 10 +++++++ .../files/flac-image-1.00-fix-build-system.patch | 18 ++++++++++++ media-sound/flac-image/flac-image-1.00.ebuild | 33 +++++++++------------- 3 files changed, 42 insertions(+), 19 deletions(-) diff --git a/media-sound/flac-image/files/flac-image-1.00-add-missing-string-include.patch b/media-sound/flac-image/files/flac-image-1.00-add-missing-string-include.patch new file mode 100644 index 00000000000..0ba842c7ee0 --- /dev/null +++ b/media-sound/flac-image/files/flac-image-1.00-add-missing-string-include.patch @@ -0,0 +1,10 @@ +--- a/flac-image.c ++++ b/flac-image.c +@@ -15,6 +15,7 @@ + */ + + #include ++#include + #include + #include + #include diff --git a/media-sound/flac-image/files/flac-image-1.00-fix-build-system.patch b/media-sound/flac-image/files/flac-image-1.00-fix-build-system.patch new file mode 100644 index 00000000000..2cd8c538b47 --- /dev/null +++ b/media-sound/flac-image/files/flac-image-1.00-fix-build-system.patch @@ -0,0 +1,18 @@ +Fix Makefile to respect user variables + +--- a/Makefile ++++ b/Makefile +@@ -3,9 +3,8 @@ + # by default, you probably need to add -I/usr/whereever/flac to CFLAGS and + # -L/usr/lib/whereever to the link step. + +-CFLAGS="-Wall -g" +- + flac-image: flac-image.o +- gcc -o flac-image -lFLAC flac-image.o ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lFLAC + +-flac-image: flac-image.c flac-image.h +\ No newline at end of file ++flac-image.o: flac-image.c flac-image.h ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< diff --git a/media-sound/flac-image/flac-image-1.00.ebuild b/media-sound/flac-image/flac-image-1.00.ebuild index 916e238fbae..78ea6acddc7 100644 --- a/media-sound/flac-image/flac-image-1.00.ebuild +++ b/media-sound/flac-image/flac-image-1.00.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=6 -inherit eutils +inherit toolchain-funcs -DESCRIPTION="Utility for stuffing image files (e.g. album cover art) into metadata blocks in FLAC files" +DESCRIPTION="Utility for adding image files (e.g. album cover art) to metadata of FLAC files" HOMEPAGE="http://www.singingtree.com/software/" SRC_URI="http://www.singingtree.com/software/${PN}.tar.gz -> ${P}.tar.gz" # FIXME: no version in tarball, but also no updates for a long time. So it's ok. -LICENSE="BSD" +LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" @@ -18,23 +18,18 @@ IUSE="" DEPEND="media-libs/flac" RDEPEND="${DEPEND}" -S="${WORKDIR}" +S=${WORKDIR} -# compile helper -_compile() { - local CC="$(tc-getCC)" - echo "${CC} ${@}" && "${CC}" "${@}" -} +PATCHES=( + "${FILESDIR}"/${PN}-1.00-add-missing-string-include.patch + "${FILESDIR}"/${PN}-1.00-fix-build-system.patch +) -src_prepare() { - sed -i -e "s:^\(#include \):\1\n#include :g" "${PN}.c" - rm -f -- "${PN}" # remove pre-compiled binary -} +src_configure() { + # remove pre-compiled binary + rm -f "${PN}" || die -src_compile() { - # Makefile is both simple and broken, so we compile the binary ourself. - _compile ${CFLAGS} ${LDFLAGS} -o "${PN}" "${PN}.c" -lFLAC \ - || die "compile failed" + tc-export CC } src_install() {