commit: 17ed34d641046efcfedff475eb6dc7af409e33cb Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jan 23 10:40:34 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Jan 23 10:41:05 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17ed34d6
media-libs/libffado: Drop old Closes: https://bugs.gentoo.org/642530 Package-Manager: Portage-2.3.19, Repoman-2.3.6 media-libs/libffado/Manifest | 1 - .../libffado/files/libffado-2.3.0-gcc6.patch | 26 ----- .../files/libffado-2.3.0-include-signal.patch | 29 ------ .../files/libffado-2.3.0-modelname-strip.patch | 45 --------- media-libs/libffado/libffado-2.3.0.ebuild | 107 --------------------- media-libs/libffado/metadata.xml | 1 - 6 files changed, 209 deletions(-) diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest index 16c3238487b..d61f0431273 100644 --- a/media-libs/libffado/Manifest +++ b/media-libs/libffado/Manifest @@ -1,2 +1 @@ -DIST libffado-2.3.0.tgz 1239253 BLAKE2B cb470a590df8018975f40f56cde50468a2b51c9504b719b70ce5941406829f25452a96b8ac897aba1ed6c8d4cafa712e7872430e7bb2ebec0822f7b4720084c5 SHA512 24a8853281a17b04623e41dc590f7a9b8f4aebe4dfaece2e3b8fe28457a6ff011586e817712b4913d1fca660b701dddc70576c12d8c56470cf991eb17b4297c4 DIST libffado-2.4.0.tgz 1228916 BLAKE2B 21a3a2a96377f698e7c1a43912c761624aabe5401f0e147fee4fa203c4534166494de8867320b4b6bc3ff200b65c77bb62ab2c4e98948ed0ee74e6171d162deb SHA512 7df37584925cc908cc284dba344609928d39e006f71ae4ede62e4531b2628271ebd0db00407418e943fb569b5b8b919a76c90aaeed03005cefbd3c1c16ee1627 diff --git a/media-libs/libffado/files/libffado-2.3.0-gcc6.patch b/media-libs/libffado/files/libffado-2.3.0-gcc6.patch deleted file mode 100644 index 2a73ee1cf8c..00000000000 --- a/media-libs/libffado/files/libffado-2.3.0-gcc6.patch +++ /dev/null @@ -1,26 +0,0 @@ ------------------------------------------------------------------------- -r2629 | jwoithe | 2016-10-09 13:00:28 +0900 (Sun, 09 Oct 2016) | 1 line - -TimestampedBuffer.cpp: move the include of math.h to the top of the file which is where most people would expect it to be. The patch comes from a Fedora RPM source package via Simon Lewis, who suggested that without it gcc6 had trouble with the file (the nature of the problem is not known by the FFADO project at this time). Earlier versions of gcc (for example, 4.8.2) had no trouble compiling this file without any math.h include, so the issue that some have seen with gcc6 must be due to math.h being removed from some other system-level include file at some point. ------------------------------------------------------------------------- -Index: src/libutil/TimestampedBuffer.cpp -=================================================================== ---- a/src/libutil/TimestampedBuffer.cpp (revision 2628) -+++ b/src/libutil/TimestampedBuffer.cpp (revision 2629) -@@ -32,6 +32,7 @@ - - #include <cstdlib> - #include <cstring> -+#include <math.h> - - #define DLL_PI (3.141592653589793238) - #define DLL_SQRT2 (1.414213562373095049) -@@ -179,8 +180,6 @@ - m_wrap_at=w; - return true; - } --#include <math.h> -- - /** - * \brief return the effective rate - * diff --git a/media-libs/libffado/files/libffado-2.3.0-include-signal.patch b/media-libs/libffado/files/libffado-2.3.0-include-signal.patch deleted file mode 100644 index 4eabf12eef0..00000000000 --- a/media-libs/libffado/files/libffado-2.3.0-include-signal.patch +++ /dev/null @@ -1,29 +0,0 @@ ------------------------------------------------------------------------- -r2706 | jwoithe | 2017-08-08 08:39:56 +0900 (Tue, 08 Aug 2017) | 11 lines - -PosixMessageQueue: ensure visibility of SIGEV_THREAD declaration. - -Orcan Ogetbil reported on the ffado-devel list that during the recent Fedora -rebuild effort FFADO 2.3.0 failed to compile because SIGEV_THREAD was -undeclared. Jano Svitok made the plausible suggestion that signal.h needs -to be included explicitly under newer glibc versions. This trivial patch -implements this. As of this commit it has not been verified that the -problem is fixed with this addition. However, there's no harm done by the -change in general and conceptionally the change is consistent with the -source file's content given the use of signal-related functionality. - - -Index: src/libutil/PosixMessageQueue.cpp -=================================================================== ---- a/src/libutil/PosixMessageQueue.cpp (revision 2705) -+++ b/src/libutil/PosixMessageQueue.cpp (revision 2706) -@@ -30,6 +30,7 @@ - #include <errno.h> - #include <string.h> - #include <poll.h> -+#include <signal.h> - - #define MQ_INVALID_ID ((mqd_t) -1) - // one second - ------------------------------------------------------------------------- diff --git a/media-libs/libffado/files/libffado-2.3.0-modelname-strip.patch b/media-libs/libffado/files/libffado-2.3.0-modelname-strip.patch deleted file mode 100644 index 8f28b6ac0f7..00000000000 --- a/media-libs/libffado/files/libffado-2.3.0-modelname-strip.patch +++ /dev/null @@ -1,45 +0,0 @@ ------------------------------------------------------------------------- -r2677 | jwoithe | 2017-03-22 07:43:24 +0900 (Wed, 22 Mar 2017) | 1 line - -configrom: there is no obvious reason why a space should be added to the end of the vendor and model strings returned from the interface. Retain the explicit null termination of these strings to cover for the case where an interface may not return any null bytes. Also fix indentation associated with the null termination code. The issue with the trailing space was noticed and reported by Nils Philippsen: its presence broke a test in the saffire_dice mixer python code. ------------------------------------------------------------------------- -Index: src/libieee1394/configrom.cpp -=================================================================== ---- a/src/libieee1394/configrom.cpp (revision 2676) -+++ b/src/libieee1394/configrom.cpp (revision 2677) -@@ -176,13 +176,11 @@ - ( void* )CSR1212_TEXTUAL_DESCRIPTOR_LEAF_DATA( m_vendorNameKv ), - len ); - -- while ((buf + len - 1) == '\0') { -- len--; -+ while (*(buf + len - 1) == '\0') { -+ len--; - } -- // \todo XXX seems a bit strage to do this but the nodemgr.c code does -- // it. try to figure out why this is needed (or not) -- buf[len++] = ' '; -- buf[len] = '\0'; -+ // Ensure vendor string is null terminated -+ buf[len] = '\0'; - - - debugOutput( DEBUG_LEVEL_VERBOSE, "Vendor name: '%s'\n", buf ); -@@ -195,13 +193,11 @@ - memcpy( buf, - ( void* )CSR1212_TEXTUAL_DESCRIPTOR_LEAF_DATA( m_modelNameKv ), - len ); -- while ((buf + len - 1) == '\0') { -- len--; -+ while (*(buf + len - 1) == '\0') { -+ len--; - } -- // \todo XXX for edirol fa-66 it seems somehow broken. see above -- // todo as well. -- buf[len++] = ' '; -- buf[len] = '\0'; -+ // Ensure model name string is null terminated -+ buf[len] = '\0'; - - debugOutput( DEBUG_LEVEL_VERBOSE, "Model name: '%s'\n", buf); - m_modelName = buf; diff --git a/media-libs/libffado/libffado-2.3.0.ebuild b/media-libs/libffado/libffado-2.3.0.ebuild deleted file mode 100644 index b5d17e93263..00000000000 --- a/media-libs/libffado/libffado-2.3.0.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils python-single-r1 scons-utils toolchain-funcs udev multilib-minimal - -DESCRIPTION="Driver for IEEE1394 (Firewire) audio interfaces" -HOMEPAGE="http://www.ffado.org"; - -if [ "${PV}" = "9999" ]; then - inherit subversion - ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}"; - KEYWORDS="~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -else - SRC_URI="http://www.ffado.org/files/${P}.tgz"; - KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -fi - -LICENSE="GPL-2 GPL-3" -SLOT="0" -IUSE="debug qt4 test-programs" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="dev-cpp/libxmlpp:2.6[${MULTILIB_USEDEP}] - dev-libs/dbus-c++ - dev-libs/libconfig[cxx,${MULTILIB_USEDEP}] - media-libs/alsa-lib - media-libs/libiec61883[${MULTILIB_USEDEP}] - !<media-sound/jack-audio-connection-kit-0.122.0:0 - !<media-sound/jack-audio-connection-kit-1.9.9:2 - sys-apps/dbus - sys-libs/libraw1394[${MULTILIB_USEDEP}] - sys-libs/libavc1394[${MULTILIB_USEDEP}] - ${PYTHON_DEPS} - qt4? ( - dev-python/PyQt4[dbus,${PYTHON_USEDEP}] - dev-python/dbus-python[${PYTHON_USEDEP}] - x11-misc/xdg-utils - )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/libffado-2.3.0-modelname-strip.patch" - "${FILESDIR}/libffado-2.3.0-gcc6.patch" - "${FILESDIR}/libffado-2.3.0-include-signal.patch" -) - -myescons() { - local myesconsargs=( - PREFIX="${EPREFIX}/usr" - LIBDIR="${EPREFIX}/usr/$(get_libdir)" - MANDIR="${EPREFIX}/usr/share/man" - UDEVDIR="$(get_udevdir)/rules.d" - CUSTOM_ENV=true - DETECT_USERSPACE_ENV=false - DEBUG=$(usex debug) - # ENABLE_OPTIMIZATIONS detects cpu type and sets flags accordingly - # -fomit-frame-pointer is added also which can cripple debugging. - # we set flags from portage instead - ENABLE_OPTIMIZATIONS=false - # This only works for JACK1>=0.122.0 or JACK2>=1.9.9, so we block - # lower versions. - ENABLE_SETBUFFERSIZE_API_VER=force - ) - if multilib_is_native_abi; then - myesconsargs+=( - BUILD_MIXER=$(usex qt4 true false) - BUILD_TESTS=$(usex test-programs) - ) - else - myesconsargs+=( - BUILD_MIXER=false - BUILD_TESTS=false - ) - fi - escons "${myesconsargs[@]}" "${@}" -} - -src_prepare() { - default - multilib_copy_sources -} - -multilib_src_compile() { - tc-export CC CXX - myescons -} - -multilib_src_install() { - myescons DESTDIR="${D}" WILL_DEAL_WITH_XDG_MYSELF="True" install -} - -multilib_src_install_all() { - einstalldocs - - python_fix_shebang "${D}" - python_optimize "${D}" - - if use qt4; then - newicon "support/xdg/hi64-apps-ffado.png" "ffado.png" - newmenu "support/xdg/ffado.org-ffadomixer.desktop" "ffado-mixer.desktop" - fi -} diff --git a/media-libs/libffado/metadata.xml b/media-libs/libffado/metadata.xml index 52a13df73d6..eda35ae2cc6 100644 --- a/media-libs/libffado/metadata.xml +++ b/media-libs/libffado/metadata.xml @@ -14,7 +14,6 @@ <name>Gentoo ProAudio Project</name> </maintainer> <use> - <flag name="qt4">Install qt4-based mixer frontend</flag> <flag name="test-programs">Install standalone test programs</flag> </use> </pkgmetadata>
