From b24bd25253fe093f722ab576d29fdc41d04cb1ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 2 Aug 2019 19:14:55 +0100 Subject: gentoo resync : 02.08.2019 --- media-sound/vimpc/Manifest | 5 +- media-sound/vimpc/files/vimpc-0.09.1-tinfo.patch | 11 -- media-sound/vimpc/files/vimpc-0.09.2-boost.patch | 217 +++++++++++++++++++++++ media-sound/vimpc/vimpc-0.09.1.ebuild | 44 ----- media-sound/vimpc/vimpc-0.09.2-r1.ebuild | 44 +++++ 5 files changed, 263 insertions(+), 58 deletions(-) delete mode 100644 media-sound/vimpc/files/vimpc-0.09.1-tinfo.patch create mode 100644 media-sound/vimpc/files/vimpc-0.09.2-boost.patch delete mode 100644 media-sound/vimpc/vimpc-0.09.1.ebuild create mode 100644 media-sound/vimpc/vimpc-0.09.2-r1.ebuild (limited to 'media-sound/vimpc') diff --git a/media-sound/vimpc/Manifest b/media-sound/vimpc/Manifest index bf18a681def4..c902fa19d2ea 100644 --- a/media-sound/vimpc/Manifest +++ b/media-sound/vimpc/Manifest @@ -1,7 +1,6 @@ -AUX vimpc-0.09.1-tinfo.patch 186 BLAKE2B 83d6bf9df4b6eee4dcc0d114813d49250fe062ae65931092086e1aa4c40f88dc1598f1f761ef34f078ea5ea7216ee8de9b25dc93b00c517b82a8af60f3c9dcf0 SHA512 05581e2cec907ec8b194d7d097498ebdc6d84774e74ebc5dc521d99b55e880f1b130ab919ac7fc6257537e37599f0797fe2fedded35f94517ddf4e58e8ce9556 -DIST vimpc-0.09.1.tar.gz 583073 BLAKE2B e2ab728a202cc7e5b9a1ffbca979274ae3f6b0f43acdacad51fdbbcd2c45f28dd9cf2f4372d085abc28633aec318f92a7632e54732516c51f20392c2d059e04f SHA512 cf40ae43ac21af80e1b5897f1fa83b4d730fb7dfa4c21b80c296a8e6f2c40e643325fd2aa96bd4dda1abca0ccd2d12545cf91ffcdb8017e5b9cd88917ca96222 +AUX vimpc-0.09.2-boost.patch 8262 BLAKE2B 4f35c6bf2a5b2d9072a2cba699fe8175af60f5c18d61fd57fdc497e06dd9260eacb41a29af5db6003f40b0b1e7f28a2fed4abe532b64aabd9f7265eab035bf6e SHA512 f1680f0f63277fdc0b57af24558e3715de656f39fdad00ed218c32542bbbe0a63f891b75802709275d4b0e7bac086ed5ea74cded4c37cbfc5c34586c067abac1 DIST vimpc-0.09.2.tar.gz 452593 BLAKE2B b6cbeab32318e723d7be114255fba7360fa2608d03bde6b2186d47b1cb8e74b4369d0d2b1d683cf5668232bf4581e9acb79d726308b18ff0d82122aa979f81a1 SHA512 456e2d2c0510273c071b24c2dd8f90b73d40a0b02565c00ea986a78f1231cb26fb053ce5b0d1476647c813b84684e400c21948086299e445ffd651c2af46d4c9 -EBUILD vimpc-0.09.1.ebuild 908 BLAKE2B 7b6b6cb81ab882feeab72dfa94a4e498a5d7d3ee135e3fded6fa7c767b1c8ffa48ef80b2a7672f91011609a66202d28cd88c7c83eff5c1c6a31d5431557521d9 SHA512 fc13626f2ea70f2f2c7bc82d239e4646bd2b076569bc5481e41e3187100454cde82815bd97e9ae2d3ba3baa09d211214125394d78a3ea676abba720b1df556ea +EBUILD vimpc-0.09.2-r1.ebuild 931 BLAKE2B eeb8e9c338a42a1f247133d95a362570344c9b79936e285e8841ca99bb61f961a283697865c671cc248d4c15c8aef0cf959d0b43b882635b143f93478e71153e SHA512 bce0cd6ebba0787917c000f1109f7dbb9573c84cd8da1806559d10ebe001fefbb87af4e5788d4fbb6127771bb12a7069aaa0ce59dcdf36a850c543fb0855faaf EBUILD vimpc-0.09.2.ebuild 878 BLAKE2B d4ccf06603dbf9756365d0eb891ede9cc8cd016e0301aa91c8fc8dfaeb278dfd9f364ff8360977e3ebe1145817b6c15c1fb4d978057fce48e113e2ab8457bbbd SHA512 6141c686b413ad5ac72b24ae8565da33d5a0836434d0df660495b3f5729bf4b1f700b98afb992efa0f6a2f2d443f44a2927ef998b0c002d0e8db06ff110d15e2 EBUILD vimpc-9999.ebuild 837 BLAKE2B ce8588b8b69918c68d359d5fbc87fca0aee34652c92637dd01e7c753660e718126a10c228886c02f36863aff4a7bcb675107201bb3ff72972261041706f4cf42 SHA512 b3fe1c3768151d09a0a42257c507662da01387dfdb7fcb0d251fc845e0cfc3a085edeaf592c323825cfa0637d4f2e1a40c8ee03b7fe90ca50c9a7657d9165766 MISC metadata.xml 523 BLAKE2B 110214d23c67c2e0b6255e8472feb6678d3ade52e55232d50067d228fadaddb90f0662db7eb1d036b59d963356b321a9b4ed829cc1860ad7208ac4c5e74f50ea SHA512 88dc39c9a62b9234604d95256ab3c94fa33a98c4df3d3e8583d9692d45ac416995faa2249431ddbf9c8edb31cce77474d2c4572215dec4c3551f02d315d732df diff --git a/media-sound/vimpc/files/vimpc-0.09.1-tinfo.patch b/media-sound/vimpc/files/vimpc-0.09.1-tinfo.patch deleted file mode 100644 index 55729b1a7f4a..000000000000 --- a/media-sound/vimpc/files/vimpc-0.09.1-tinfo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -97,6 +97,8 @@ - - LIBS="$LIBS $CURSES_LIB" - -+AC_SEARCH_LIBS([keypad],[tinfow tinfo]) -+ - PKG_CHECK_MODULES(pcre, libpcre) - - AC_SUBST(pcre_LIBS) diff --git a/media-sound/vimpc/files/vimpc-0.09.2-boost.patch b/media-sound/vimpc/files/vimpc-0.09.2-boost.patch new file mode 100644 index 000000000000..8df2eddd54c7 --- /dev/null +++ b/media-sound/vimpc/files/vimpc-0.09.2-boost.patch @@ -0,0 +1,217 @@ +From 300fe8890c8f93e01c445e4df6c3b1414a6115ba Mon Sep 17 00:00:00 2001 +From: Stefan Strogin +Date: Fri, 26 Jul 2019 03:26:22 +0300 +Subject: [PATCH] Fix building with boost (#87) + +Upstream-Status: Submitted +[https://github.com/boysetsfrog/vimpc/pull/88] +Signed-off-by: Stefan Strogin +--- + configure.ac | 3 +- + m4/m4_ax_boost_chrono.m4 | 118 +++++++++++++++++++++++++++++++++++++++ + src/clientstate.cpp | 4 +- + src/clientstate.hpp | 2 +- + src/compiler.hpp | 4 ++ + 5 files changed, 127 insertions(+), 4 deletions(-) + create mode 100644 m4/m4_ax_boost_chrono.m4 + +diff --git a/configure.ac b/configure.ac +index c53c555..5e0b618 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -57,6 +57,7 @@ if test "x$enable_boost" = "xyes"; then + AC_DEFINE_UNQUOTED(BOOST_SUPPORT, "1", "Define to 1 if boost support enabled") + + AX_BOOST_BASE([], [], [AC_MSG_ERROR(vimpc requires boost library)]) ++AX_BOOST_CHRONO([], [], [AC_MSG_ERROR(vimpc requires boost chrono library)]) + AX_BOOST_SYSTEM([], [], [AC_MSG_ERROR(vimpc requires boost system library)]) + AX_BOOST_THREAD([], [], [AC_MSG_ERROR(vimpc requires boost thread library)]) + +@@ -73,7 +74,7 @@ AC_CHECK_HEADER(boost/function.hpp, + [AC_MSG_ERROR(boost-dev library is required)]) + + CPPFLAGS="$CPPFLAGS -DUSE_BOOST_THREAD -DUSE_BOOST_FUNCTIONAL -DUSE_BOOST_FOREACH" +-LIBS="$LIBS $BOOST_SYSTEM_LIB $BOOST_THREAD_LIB" ++LIBS="$LIBS $BOOST_CHRONO_LIB $BOOST_SYSTEM_LIB $BOOST_THREAD_LIB" + + AC_MSG_CHECKING([whether compiler supports lambda functions]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[int a = 5; boost::function f = [&a](int b) { return a + b; }; f(8);]])], +diff --git a/m4/m4_ax_boost_chrono.m4 b/m4/m4_ax_boost_chrono.m4 +new file mode 100644 +index 0000000..6ea77b9 +--- /dev/null ++++ b/m4/m4_ax_boost_chrono.m4 +@@ -0,0 +1,118 @@ ++# =========================================================================== ++# https://www.gnu.org/software/autoconf-archive/ax_boost_chrono.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_BOOST_CHRONO ++# ++# DESCRIPTION ++# ++# Test for Chrono library from the Boost C++ libraries. The macro requires ++# a preceding call to AX_BOOST_BASE. Further documentation is available at ++# . ++# ++# This macro calls: ++# ++# AC_SUBST(BOOST_CHRONO_LIB) ++# ++# And sets: ++# ++# HAVE_BOOST_CHRONO ++# ++# LICENSE ++# ++# Copyright (c) 2012 Xiyue Deng ++# ++# Copying and distribution of this file, with or without modification, are ++# permitted in any medium without royalty provided the copyright notice ++# and this notice are preserved. This file is offered as-is, without any ++# warranty. ++ ++#serial 4 ++ ++AC_DEFUN([AX_BOOST_CHRONO], ++[ ++ AC_ARG_WITH([boost-chrono], ++ AS_HELP_STRING([--with-boost-chrono@<:@=special-lib@:>@], ++ [use the Chrono library from boost - it is possible to specify a certain library for the linker ++ e.g. --with-boost-chrono=boost_chrono-gcc-mt ]), ++ [ ++ if test "$withval" = "no"; then ++ want_boost="no" ++ elif test "$withval" = "yes"; then ++ want_boost="yes" ++ ax_boost_user_chrono_lib="" ++ else ++ want_boost="yes" ++ ax_boost_user_chrono_lib="$withval" ++ fi ++ ], ++ [want_boost="yes"] ++ ) ++ ++ if test "x$want_boost" = "xyes"; then ++ AC_REQUIRE([AC_PROG_CC]) ++ AC_REQUIRE([AC_CANONICAL_BUILD]) ++ CPPFLAGS_SAVED="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" ++ export CPPFLAGS ++ ++ LDFLAGS_SAVED="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" ++ export LDFLAGS ++ ++ AC_CACHE_CHECK(whether the Boost::Chrono library is available, ++ ax_cv_boost_chrono, ++ [AC_LANG_PUSH([C++]) ++ CXXFLAGS_SAVE=$CXXFLAGS ++ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include ]], ++ [[boost::chrono::system_clock::time_point* time = new boost::chrono::system_clock::time_point; delete time;]])], ++ ax_cv_boost_chrono=yes, ax_cv_boost_chrono=no) ++ CXXFLAGS=$CXXFLAGS_SAVE ++ AC_LANG_POP([C++]) ++ ]) ++ if test "x$ax_cv_boost_chrono" = "xyes"; then ++ AC_SUBST(BOOST_CPPFLAGS) ++ ++ AC_DEFINE(HAVE_BOOST_CHRONO,,[define if the Boost::Chrono library is available]) ++ BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` ++ ++ LDFLAGS_SAVE=$LDFLAGS ++ if test "x$ax_boost_user_chrono_lib" = "x"; then ++ for libextension in `ls $BOOSTLIBDIR/libboost_chrono*.so* $BOOSTLIBDIR/libboost_chrono*.dylib* $BOOSTLIBDIR/libboost_chrono*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_chrono.*\)\.so.*$;\1;' -e 's;^lib\(boost_chrono.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_chrono.*\)\.a.*$;\1;'` ; do ++ ax_lib=${libextension} ++ AC_CHECK_LIB($ax_lib, exit, ++ [BOOST_CHRONO_LIB="-l$ax_lib"; AC_SUBST(BOOST_CHRONO_LIB) link_chrono="yes"; break], ++ [link_chrono="no"]) ++ done ++ if test "x$link_chrono" != "xyes"; then ++ for libextension in `ls $BOOSTLIBDIR/boost_chrono*.dll* $BOOSTLIBDIR/boost_chrono*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_chrono.*\)\.dll.*$;\1;' -e 's;^\(boost_chrono.*\)\.a.*$;\1;'` ; do ++ ax_lib=${libextension} ++ AC_CHECK_LIB($ax_lib, exit, ++ [BOOST_CHRONO_LIB="-l$ax_lib"; AC_SUBST(BOOST_CHRONO_LIB) link_chrono="yes"; break], ++ [link_chrono="no"]) ++ done ++ fi ++ ++ else ++ for ax_lib in $ax_boost_user_chrono_lib boost_chrono-$ax_boost_user_chrono_lib; do ++ AC_CHECK_LIB($ax_lib, exit, ++ [BOOST_CHRONO_LIB="-l$ax_lib"; AC_SUBST(BOOST_CHRONO_LIB) link_chrono="yes"; break], ++ [link_chrono="no"]) ++ done ++ ++ fi ++ if test "x$ax_lib" = "x"; then ++ AC_MSG_ERROR(Could not find a version of the library!) ++ fi ++ if test "x$link_chrono" = "xno"; then ++ AC_MSG_ERROR(Could not link against $ax_lib !) ++ fi ++ fi ++ ++ CPPFLAGS="$CPPFLAGS_SAVED" ++ LDFLAGS="$LDFLAGS_SAVED" ++ fi ++]) +diff --git a/src/clientstate.cpp b/src/clientstate.cpp +index 357dd6b..d00c981 100644 +--- a/src/clientstate.cpp ++++ b/src/clientstate.cpp +@@ -223,10 +223,10 @@ ClientState::ClientState(Main::Vimpc * vimpc, Main::Settings & settings, Ui::Scr + Main::Vimpc::CreateEvent(Event::StatusUpdate, EData); + }); + +- updateThread_ = std::thread([this]() { ++ updateThread_ = Thread([this]() { + while (this->running_) + { +- std::this_thread::sleep_for(std::chrono::milliseconds(this->waitTime_)); ++ ThisThread::sleep_for(Chrono::milliseconds(this->waitTime_)); + + if (this->newSong_) + { +diff --git a/src/clientstate.hpp b/src/clientstate.hpp +index 0bcbd5b..1983372 100644 +--- a/src/clientstate.hpp ++++ b/src/clientstate.hpp +@@ -122,7 +122,7 @@ namespace Mpc + std::string currentSongURI_; + std::string currentState_; + std::string lastTitleStr_; +- std::thread updateThread_; ++ Thread updateThread_; + }; + } + +diff --git a/src/compiler.hpp b/src/compiler.hpp +index 8a38c20..09472f8 100644 +--- a/src/compiler.hpp ++++ b/src/compiler.hpp +@@ -47,6 +47,8 @@ typedef boost::mutex Mutex; + typedef boost::recursive_mutex RecursiveMutex; + typedef boost::condition_variable ConditionVariable; + #define Atomic(X) X ++#define Chrono boost::chrono ++#define ThisThread boost::this_thread + #define UniqueLock boost::unique_lock + + template +@@ -60,6 +62,8 @@ typedef std::mutex Mutex; + typedef std::recursive_mutex RecursiveMutex; + typedef std::condition_variable ConditionVariable; + #define Atomic(X) std::atomic ++#define Chrono std::chrono ++#define ThisThread std::this_thread + #define UniqueLock std::unique_lock + + template +-- +2.22.0 + diff --git a/media-sound/vimpc/vimpc-0.09.1.ebuild b/media-sound/vimpc/vimpc-0.09.1.ebuild deleted file mode 100644 index 832b0849f58a..000000000000 --- a/media-sound/vimpc/vimpc-0.09.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils autotools - -DESCRIPTION="An ncurses based mpd client with vi like key bindings" -HOMEPAGE="http://vimpc.sourceforge.net/" -SRC_URI="mirror://sourceforge/project/${PN}/Release%20${PV}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="boost taglib" - -RDEPEND="dev-libs/libpcre - media-libs/libmpdclient - boost? ( dev-libs/boost ) - taglib? ( media-libs/taglib )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/${PN} - -DOCS=( AUTHORS README.md doc/vimpcrc.example ) - -src_prepare() { - epatch "${FILESDIR}"/${P}-tinfo.patch - eautoreconf -} - -src_configure() { - econf \ - $(use_enable boost) \ - $(use_enable taglib) \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} -} - -src_install() { - default - - # vimpc will look for help.txt - docompress -x /usr/share/doc/${PF}/help.txt -} diff --git a/media-sound/vimpc/vimpc-0.09.2-r1.ebuild b/media-sound/vimpc/vimpc-0.09.2-r1.ebuild new file mode 100644 index 000000000000..0250e3c5969d --- /dev/null +++ b/media-sound/vimpc/vimpc-0.09.2-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="An ncurses based mpd client with vi-like key bindings" +HOMEPAGE="https://github.com/boysetsfrog/vimpc" +SRC_URI="https://github.com/boysetsfrog/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="boost taglib" + +RDEPEND="dev-libs/libpcre + media-libs/libmpdclient + boost? ( dev-libs/boost:= ) + taglib? ( media-libs/taglib )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${P}-boost.patch ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable boost) \ + $(use_enable taglib) \ + --docdir="${EPREFIX}"/usr/share/doc/${PF} +} + +src_install() { + local DOCS=( AUTHORS README.md doc/vimpcrc.example ) + default + + # vimpc will look for help.txt + docompress -x /usr/share/doc/${PF}/help.txt +} -- cgit v1.2.3