[gentoo-commits] repo/gentoo:master commit in: media-libs/libsamplerate/files/, media-libs/libsamplerate/

[Andreas Sturmlechner]

commit:     74842883030c94f2c2f53ac0c2056cbd03777dbb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  4 16:17:58 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep  4 16:34:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74842883

media-libs/libsamplerate: Fix file collision with media-sound/sndfile-tools

Bug: https://bugs.gentoo.org/645256
Closes: https://bugs.gentoo.org/408849
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/libsamplerate-0.1.9-htmldocdir.patch     | 53 ++++++++++++++++++++++
 .../libsamplerate-0.1.9-no-sndfile-resample.patch  | 34 ++++++++++++++
 .../libsamplerate/libsamplerate-0.1.9-r1.ebuild    | 42 +++++++++++++++++
 3 files changed, 129 insertions(+)

diff --git a/media-libs/libsamplerate/files/libsamplerate-0.1.9-htmldocdir.patch b/media-libs/libsamplerate/files/libsamplerate-0.1.9-htmldocdir.patch
new file mode 100644
index 00000000000..cedcd312433
--- /dev/null
+++ b/media-libs/libsamplerate/files/libsamplerate-0.1.9-htmldocdir.patch
@@ -0,0 +1,53 @@
+From 06fea5c39b186955194e85ada50724465c39033d Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@g.o>
+Date: Sat, 10 Jun 2017 15:48:00 +0200
+Subject: [PATCH] Remove htmldocdir variable
+
+* Autoconf and Automake provide a variable (htmldir)
+  for this already.
+
+* asturm 2020-09-04: Rebased onto 0.1.9
+---
+ configure.ac    | 10 ----------
+ doc/Makefile.am |  6 +-----
+ 2 files changed, 1 insertion(+), 15 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0ce20e9..6d5e692 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -264,21 +264,11 @@ AS_CASE([$target_os],
+ 		;;
+ 	esac
+ 
+-htmldocdir=$prefix/share/doc/libsamplerate0-dev/html
+-
+-if test $prefix = "NONE" ; then
+-	htmldocdir=/usr/local/share/doc/libsamplerate0-dev/html
+-else
+-	htmldocdir=$prefix/share/doc/libsamplerate0-dev/html
+-	fi
+-
+ #====================================================================================
+ # Now use the information from the checking stage.
+ 
+ AC_DEFINE_UNQUOTED(OS_IS_WIN32, ${os_is_win32}, [Set to 1 if compiling for Win32])
+ 
+-AC_SUBST(htmldocdir)
+-
+ AC_SUBST(SHLIB_VERSION_ARG)
+ AC_SUBST(SHARED_VERSION_INFO)
+ AC_SUBST(OS_SPECIFIC_INCLUDES)
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index be86d64..cbc9963 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,7 +1,3 @@
+-htmldir = $(htmldocdir)
+-html_DATA = SRC.png SRC.css index.html license.html history.html download.html \
++dist_html_DATA = SRC.png SRC.css index.html license.html history.html download.html \
+ 				lists.html quality.html win32.html faq.html api.html \
+ 				api_simple.html api_callback.html api_full.html api_misc.html
+-
+-EXTRA_DIST = $(html_DATA)
+-

diff --git a/media-libs/libsamplerate/files/libsamplerate-0.1.9-no-sndfile-resample.patch b/media-libs/libsamplerate/files/libsamplerate-0.1.9-no-sndfile-resample.patch
new file mode 100644
index 00000000000..ae515602d81
--- /dev/null
+++ b/media-libs/libsamplerate/files/libsamplerate-0.1.9-no-sndfile-resample.patch
@@ -0,0 +1,34 @@
+From bf39835df4eba7b2ec2d5c5e7d1d40397942c3b0 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@g.o>
+Date: Sat, 27 Jan 2018 14:12:35 +0100
+Subject: [PATCH] Move `sndfile-resample` to sndfile-tools package
+
+* Fixes https://bugs.gentoo.org/645258
+
+* asturm 2020-09-04: Rebased onto 0.1.9
+
+---
+ Makefile.am                 |   7 -
+ 1 file changed, 7 deletions(-)
+
+--- a/examples/Makefile.am	2014-11-30 11:44:50.000000000 +0100
++++ b/examples/Makefile.am	2020-09-04 17:30:07.824611967 +0200
+@@ -1,8 +1,6 @@
+ # This file was automatically generated
+ # DO NOT EDIT!
+ 
+-bin_PROGRAMS = sndfile-resample
+-
+ EXTRA_PROGRAMS = varispeed-play timewarp-file
+ 
+ SAMPLERATEDIR =../src
+@@ -15,9 +13,6 @@
+ 
+ #===============================================================================
+ 
+-sndfile_resample_SOURCES = sndfile-resample.c
+-sndfile_resample_LDADD = $(SAMPLERATEDIR)/libsamplerate.la $(SNDFILE_LIBS)
+-
+ varispeed_play_SOURCES = varispeed-play.c audio_out.c audio_out.h
+ varispeed_play_LDADD = $(SAMPLERATEDIR)/libsamplerate.la $(SNDFILE_LIBS) $(OS_SPECIFIC_LINKS)
+ 

diff --git a/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild b/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild
new file mode 100644
index 00000000000..1fb03648cc2
--- /dev/null
+++ b/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio"
+HOMEPAGE="http://www.mega-nerd.com/SRC/"
+SRC_URI="http://www.mega-nerd.com/SRC/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.1.3-dontbuild-tests-examples.patch"
+	"${FILESDIR}/${PN}-0.1.8-lm.patch"
+	"${FILESDIR}/${P}-htmldocdir.patch"
+	"${FILESDIR}/${P}-no-sndfile-resample.patch" # bugs 408849, 645256
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-fftw
+		--disable-sndfile
+		--disable-static
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -type f -delete || die
+}