* [gentoo-commits] repo/gentoo:master commit in: media-libs/soxr/files/, media-libs/soxr/
@ 2017-06-16 9:36 Alexis Ballier
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier @ 2017-06-16 9:36 UTC (permalink / raw
To: gentoo-commits
commit: d2c8c9e1808fb97548ae0592df5aae2517c6a05a
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 16 09:35:01 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Jun 16 09:36:30 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2c8c9e1
media-libs/soxr: remove old
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-libs/soxr/Manifest | 1 -
media-libs/soxr/files/libsuffix.patch | 13 -------------
media-libs/soxr/soxr-0.1.0.ebuild | 35 -----------------------------------
3 files changed, 49 deletions(-)
diff --git a/media-libs/soxr/Manifest b/media-libs/soxr/Manifest
index e51f4c53310..c4cf73794a9 100644
--- a/media-libs/soxr/Manifest
+++ b/media-libs/soxr/Manifest
@@ -1,3 +1,2 @@
-DIST soxr-0.1.0-Source.tar.xz 78900 SHA256 12ce532a3045a3f6942736ac3417c6cafe0204896eb86537527d79723ddbffb1 SHA512 c11ad01461adde4ebd9db63d130b96c2e0335b75f166d7d966da7d2efa54495dfdf5cda271b806816945f880e61e4e9e0c6b29df7735f33b6adf3a857b336c85 WHIRLPOOL 8125926d8802d89f2a70b5f400df1c9452dc689fb94af0e3da54dcf8ba396a8cd5f325460ecb41af441c70dffe5639bad17b0ecd105426794482a2284f3eee77
DIST soxr-0.1.1-Source.tar.xz 80716 SHA256 dcc16868d1a157079316f84233afcc2b52dd0bd541dd8439dc25bceb306faac2 SHA512 377d9c0bb72cd673f89021a86da18861d35ab52f773afd97b6b5f7a2fa8e78865f3484cab4b795ceafacbbb34be6b77efeaaed75c66a839d5e891d70f00d6679 WHIRLPOOL bde1b4a0069200b5352c065a15e7296f6b58c902585ae384a3b2c31e38daa86db6df4d05c948072f83db0a1bb11364e21b02814bf0f65fb6ad625a3b38d618e8
DIST soxr-0.1.2-Source.tar.xz 83760 SHA256 54e6f434f1c491388cd92f0e3c47f1ade082cc24327bdc43762f7d1eefe0c275 SHA512 ee902c1bc713e05b748f917d78222b68b5fe01d43f405e0954c21ce4d1ee494d01000caa79f696cb8d202c662a4c4d958b332dae034d6f929e0480abf27cd07c WHIRLPOOL 77ea4be0fc57d4dadca9779c7fda5ed75532d220f3fa36afdfba12746e0a76344bfdfdb085d353432e83fe3f94ae7b8c79e6993e9e68f0e1f19a2da74ca97bfe
diff --git a/media-libs/soxr/files/libsuffix.patch b/media-libs/soxr/files/libsuffix.patch
deleted file mode 100644
index e22512b7818..00000000000
--- a/media-libs/soxr/files/libsuffix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: soxr-0.1.0-Source/CMakeLists.txt
-===================================================================
---- soxr-0.1.0-Source.orig/CMakeLists.txt
-+++ soxr-0.1.0-Source/CMakeLists.txt
-@@ -180,7 +180,7 @@ if (NOT DEFINED BIN_INSTALL_DIR)
- set (BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin")
- endif ()
- if (NOT DEFINED LIB_INSTALL_DIR)
-- set (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib")
-+ set (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
- endif ()
- if (NOT DEFINED INCLUDE_INSTALL_DIR)
- set (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include")
diff --git a/media-libs/soxr/soxr-0.1.0.ebuild b/media-libs/soxr/soxr-0.1.0.ebuild
deleted file mode 100644
index a0d6781c179..00000000000
--- a/media-libs/soxr/soxr-0.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-multilib
-
-MY_P=${P}-Source
-DESCRIPTION="The SoX Resampler library"
-HOMEPAGE="https://sourceforge.net/p/soxr/wiki/Home/"
-SRC_URI="mirror://sourceforge/soxr/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~mips"
-IUSE="examples"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-DOCS=( "README" "TODO" "NEWS" "AUTHORS" )
-PATCHES=(
- "${FILESDIR}/libsuffix.patch"
- "${FILESDIR}/nodoc.patch"
- "${FILESDIR}/noexamples.patch"
- )
-
-src_install() {
- cmake-multilib_src_install
- if use examples ; then
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/soxr/files/, media-libs/soxr/
@ 2018-06-10 22:31 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2018-06-10 22:31 UTC (permalink / raw
To: gentoo-commits
commit: e7f8bf820efdeec9f769eb2afe93a48ce292771d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 10 22:29:26 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 10 22:30:13 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7f8bf82
media-libs/soxr: Standard patch name
Package-Manager: Portage-2.3.40, Repoman-2.3.9
media-libs/soxr/files/{nodoc.patch => soxr-0.1.1-nodoc.patch} | 4 ++--
media-libs/soxr/soxr-0.1.2.ebuild | 6 +++---
media-libs/soxr/soxr-0.1.3-r1.ebuild | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/media-libs/soxr/files/nodoc.patch b/media-libs/soxr/files/soxr-0.1.1-nodoc.patch
similarity index 84%
rename from media-libs/soxr/files/nodoc.patch
rename to media-libs/soxr/files/soxr-0.1.1-nodoc.patch
index 0d64e1aba0f..f36a47ae2ca 100644
--- a/media-libs/soxr/files/nodoc.patch
+++ b/media-libs/soxr/files/soxr-0.1.1-nodoc.patch
@@ -1,7 +1,7 @@
Index: soxr-0.1.0-Source/CMakeLists.txt
===================================================================
---- soxr-0.1.0-Source.orig/CMakeLists.txt
-+++ soxr-0.1.0-Source/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
@@ -217,14 +217,6 @@ if (BUILD_TESTS OR BUILD_LSR_TESTS)
enable_testing ()
endif ()
diff --git a/media-libs/soxr/soxr-0.1.2.ebuild b/media-libs/soxr/soxr-0.1.2.ebuild
index 6bf88034d32..6f5f999947a 100644
--- a/media-libs/soxr/soxr-0.1.2.ebuild
+++ b/media-libs/soxr/soxr-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -21,9 +21,9 @@ RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_P}"
DOCS=( "README" "TODO" "NEWS" "AUTHORS" )
PATCHES=(
- "${FILESDIR}/nodoc.patch"
+ "${FILESDIR}/${PN}-0.1.1-nodoc.patch"
"${FILESDIR}/noexamples.patch"
- )
+)
src_install() {
cmake-multilib_src_install
diff --git a/media-libs/soxr/soxr-0.1.3-r1.ebuild b/media-libs/soxr/soxr-0.1.3-r1.ebuild
index 4c035c41674..46ac22915f2 100644
--- a/media-libs/soxr/soxr-0.1.3-r1.ebuild
+++ b/media-libs/soxr/soxr-0.1.3-r1.ebuild
@@ -26,7 +26,7 @@ S="${WORKDIR}/${MY_P}"
DOCS=( README TODO NEWS AUTHORS )
PATCHES=(
- "${FILESDIR}/nodoc.patch"
+ "${FILESDIR}/${PN}-0.1.1-nodoc.patch"
"${FILESDIR}/${P}-fix-pkgconfig.patch"
)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/soxr/files/, media-libs/soxr/
@ 2018-06-10 22:31 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2018-06-10 22:31 UTC (permalink / raw
To: gentoo-commits
commit: 0e59fbe612bb92f9c8625dc187a5420a018df934
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 10 22:21:12 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 10 22:30:13 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e59fbe6
media-libs/soxr: Fix pkgconfig w/ USE=examples
Thanks-to: PhobosK <phobosk <AT> fastmail.fm>
Closes: https://bugs.gentoo.org/657300
Closes: https://bugs.gentoo.org/650748
Closes: https://bugs.gentoo.org/651116
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../soxr/files/soxr-0.1.3-fix-pkgconfig.patch | 25 +++++++++++
media-libs/soxr/soxr-0.1.3-r1.ebuild | 51 ++++++++++++++++++++++
2 files changed, 76 insertions(+)
diff --git a/media-libs/soxr/files/soxr-0.1.3-fix-pkgconfig.patch b/media-libs/soxr/files/soxr-0.1.3-fix-pkgconfig.patch
new file mode 100644
index 00000000000..60818f5405d
--- /dev/null
+++ b/media-libs/soxr/files/soxr-0.1.3-fix-pkgconfig.patch
@@ -0,0 +1,25 @@
+Fix pkgconfig 'Version' w/ USE=examples
+https://bugs.gentoo.org/657300
+
+--- a/CMakeLists.txt 2018-02-23 23:39:25.000000000 +0200
++++ b/CMakeLists.txt 2018-06-03 22:26:38.673844365 +0300
+@@ -3,7 +3,7 @@
+
+ cmake_minimum_required (VERSION 3.1 FATAL_ERROR)
+
+-project (soxr C)
++project (soxr)
+ set (DESCRIPTION_SUMMARY
+ "High quality, one-dimensional sample-rate conversion library")
+
+@@ -100,10 +100,6 @@
+ set (LIBM_LIBRARIES m)
+ endif ()
+
+-if (${BUILD_EXAMPLES})
+- project (${PROJECT_NAME}) # Adds c++ compiler
+-endif ()
+-
+ if (WITH_OPENMP)
+ find_package (OpenMP)
+ if (OPENMP_FOUND)
diff --git a/media-libs/soxr/soxr-0.1.3-r1.ebuild b/media-libs/soxr/soxr-0.1.3-r1.ebuild
new file mode 100644
index 00000000000..4c035c41674
--- /dev/null
+++ b/media-libs/soxr/soxr-0.1.3-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+MY_P="${P}-Source"
+DESCRIPTION="SoX Resampler library"
+HOMEPAGE="https://sourceforge.net/p/soxr/wiki/Home/"
+SRC_URI="mirror://sourceforge/soxr/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="examples test"
+
+# CMakeLists.txt builds examples if either test or examples USE flag is enabled.
+REQUIRED_USE="test? ( examples )"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( README TODO NEWS AUTHORS )
+
+PATCHES=(
+ "${FILESDIR}/nodoc.patch"
+ "${FILESDIR}/${P}-fix-pkgconfig.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_EXAMPLES="$(usex examples)"
+ -DBUILD_TESTS="$(usex test)"
+ )
+ if use examples ; then
+ mycmakeargs+=(
+ -DDOC_INSTALL_DIR="/usr/share/doc/${PF}"
+ )
+ fi
+ cmake-multilib_src_configure
+}
+
+src_install() {
+ cmake-multilib_src_install
+ if use examples ; then
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-06-10 22:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-10 22:31 [gentoo-commits] repo/gentoo:master commit in: media-libs/soxr/files/, media-libs/soxr/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2018-06-10 22:31 Andreas Sturmlechner
2017-06-16 9:36 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox