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 71D6A1382C5 for ; Sun, 21 Jun 2020 13:21:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52FE0E0894; Sun, 21 Jun 2020 13:21:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 2DBFEE0894 for ; Sun, 21 Jun 2020 13:21:14 +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 DD3EB34FB92 for ; Sun, 21 Jun 2020 13:21:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0517A2B2 for ; Sun, 21 Jun 2020 13:21:09 +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: <1592745598.77f077259f2455e3d6219462ec3f178f6fd8541c.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/ogmtools/files/, media-sound/ogmtools/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/ogmtools/files/ogmtools-1.5-fix-autotools.patch media-sound/ogmtools/ogmtools-1.5-r2.ebuild X-VCS-Directories: media-sound/ogmtools/ media-sound/ogmtools/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 77f077259f2455e3d6219462ec3f178f6fd8541c X-VCS-Branch: master Date: Sun, 21 Jun 2020 13:21:09 +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: c258c911-bc1c-40b4-95b7-ca8960c06606 X-Archives-Hash: 66dd7f72884569fc81f789045d469269 commit: 77f077259f2455e3d6219462ec3f178f6fd8541c Author: David Seifert gentoo org> AuthorDate: Sun Jun 21 13:19:58 2020 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Jun 21 13:19:58 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77f07725 media-sound/ogmtools: [QA] Fix build system Closes: https://bugs.gentoo.org/724678 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: David Seifert gentoo.org> .../files/ogmtools-1.5-fix-autotools.patch | 44 ++++++++++++++++++++++ media-sound/ogmtools/ogmtools-1.5-r2.ebuild | 29 +++++++++----- 2 files changed, 63 insertions(+), 10 deletions(-) diff --git a/media-sound/ogmtools/files/ogmtools-1.5-fix-autotools.patch b/media-sound/ogmtools/files/ogmtools-1.5-fix-autotools.patch new file mode 100644 index 00000000000..74aba946306 --- /dev/null +++ b/media-sound/ogmtools/files/ogmtools-1.5-fix-autotools.patch @@ -0,0 +1,44 @@ +--- a/avilib/Makefile.am ++++ b/avilib/Makefile.am +@@ -7,7 +7,8 @@ + + INCLUDES = -I./ + +-CFLAGS=-O3 -funroll-loops -ffast-math -DLINUX -Wall @CFLAGS@ ++AM_CFLAGS=-Wall ++AM_CPPFLAGS=-DLINUX + libavi_a_SOURCES = avilib.c avidump.c avimisc.c xio.c + + EXTRA_DIST = avilib.h README.avilib +--- a/configure.in ++++ b/configure.in +@@ -8,6 +8,7 @@ + AC_PROG_GCC_TRADITIONAL + AC_PROG_CPP + AC_PROG_RANLIB ++AM_PROG_AR + + XIPH_PATH_OGG() + XIPH_PATH_VORBIS() +@@ -31,7 +32,7 @@ + dnl Check for headers + AC_HEADER_STDC() + +-CFLAGS="-Wall -Wno-sign-compare @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@" +-CXXFLAGS="-Wall -Wno-sign-compare @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@" ++CFLAGS+=" -Wall -Wno-sign-compare" ++CXXFLAGS+=" -Wall -Wno-sign-compare" + + AC_OUTPUT(Makefile avilib/Makefile) +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,6 +2,9 @@ + + AUTOMAKE_OPTIONS = dist-zip foreign + ++AM_CFLAGS=$(OGG_CFLAGS) $(VORBIS_CFLAGS) $(AVILIB_CFLAGS) $(DEBUG_CFLAGS) $(PROFILING_CFLAGS) ++AM_CXXFLAGS=$(OGG_CFLAGS) $(VORBIS_CFLAGS) $(AVILIB_CFLAGS) $(DEBUG_CFLAGS) $(PROFILING_CFLAGS) ++ + SUBDIRS = avilib + + if HAVE_LIBDVDREAD diff --git a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild index 7e1a4b01a91..28fb209d7f3 100644 --- a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild +++ b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + +inherit autotools DESCRIPTION="Information, extraction or creation for OGG media streams" HOMEPAGE="https://www.bunkus.org/videotools/ogmtools/" @@ -12,20 +14,27 @@ SLOT="0" KEYWORDS="amd64 ppc ppc64 sparc x86" IUSE="dvd" -RDEPEND="dvd? ( media-libs/libdvdread ) - media-sound/vorbis-tools" +RDEPEND=" + media-sound/vorbis-tools + dvd? ( media-libs/libdvdread )" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}/${P}-comments.patch" - "${FILESDIR}/${P}-endian-fix.patch" - "${FILESDIR}/${P}-vorbis_verbosity.patch" - "${FILESDIR}/${P}-summary_length.patch" + "${FILESDIR}"/${P}-comments.patch + "${FILESDIR}"/${P}-endian-fix.patch + "${FILESDIR}"/${P}-vorbis_verbosity.patch + "${FILESDIR}"/${P}-summary_length.patch + "${FILESDIR}"/${P}-fix-autotools.patch ) +src_prepare() { + default + mv configure.{in,ac} || die + eautoreconf +} + src_configure() { - econf \ - $(use_with dvd dvdread) + econf $(use_with dvd dvdread) } src_install() {