From e50f745009afaf6bf2dc3d4074f45789b1f0dcb7 Mon Sep 17 00:00:00 2001 From: layman Date: Wed, 30 Mar 2016 08:53:17 +0100 Subject: [PATCH] Fixed sway and wlc ebuilds. Add ring --- dev-libs/msgpack/Manifest | 1 + dev-libs/msgpack/msgpack-1.2.0.ebuild | 39 ++++++ .../libringclient/libringclient-9999.ebuild | 21 +++ net-libs/opendht/opendht-9999.ebuild | 24 ++++ net-libs/pjsip/.pjsip-2.4.ebuild.swp | Bin 0 -> 12288 bytes net-libs/pjsip/Manifest | 1 + .../pjsip/files/pjsip-ring-intptr_t.patch | 11 ++ net-libs/pjsip/files/user.mak | 3 + net-libs/pjsip/pjsip-2.4.ebuild | 123 ++++++++++++++++++ net-voip/gnome-ring/gnome-ring-9999.ebuild | 28 ++++ net-voip/ring-daemon/ring-daemon-9999.ebuild | 45 +++++++ x11-libs/wlc/wlc-9999.ebuild | 15 ++- x11-wm/sway/sway-9999.ebuild | 32 +++-- 13 files changed, 328 insertions(+), 15 deletions(-) create mode 100644 dev-libs/msgpack/Manifest create mode 100644 dev-libs/msgpack/msgpack-1.2.0.ebuild create mode 100644 net-libs/libringclient/libringclient-9999.ebuild create mode 100644 net-libs/opendht/opendht-9999.ebuild create mode 100644 net-libs/pjsip/.pjsip-2.4.ebuild.swp create mode 100644 net-libs/pjsip/Manifest create mode 100644 net-libs/pjsip/files/pjsip-ring-intptr_t.patch create mode 100644 net-libs/pjsip/files/user.mak create mode 100644 net-libs/pjsip/pjsip-2.4.ebuild create mode 100644 net-voip/gnome-ring/gnome-ring-9999.ebuild create mode 100644 net-voip/ring-daemon/ring-daemon-9999.ebuild diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest new file mode 100644 index 0000000..d01dbef --- /dev/null +++ b/dev-libs/msgpack/Manifest @@ -0,0 +1 @@ +DIST msgpack-1.2.0.tar.gz 722483 SHA256 a7963b22665cecd1f72d8404b70be95a9c376084e9790833a7942c6633b33ca0 SHA512 2a4922fd745ae2d76c913c7200db667fa457f757c4e2696c215165a0ea48da6e35f7e8baae38855598eddd2f7414cdf022c3515b6cde0975686135cacfb4e978 WHIRLPOOL 48d61e7e330c3cd2a6a60c6ecf2b90289adb42c500521b4d8df50983d4db82434560a1129f6f957d09117532b52bc14a7167d1166fcd0c7a2d0e157da3267d75 diff --git a/dev-libs/msgpack/msgpack-1.2.0.ebuild b/dev-libs/msgpack/msgpack-1.2.0.ebuild new file mode 100644 index 0000000..a10e761 --- /dev/null +++ b/dev-libs/msgpack/msgpack-1.2.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit cmake-multilib + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git" +else + SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +fi + +DESCRIPTION="MessagePack is a binary-based efficient data interchange format" +HOMEPAGE="http://msgpack.org/ https://github.com/msgpack/msgpack-c/" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="+cxx static-libs test" + +DEPEND=" + test? ( + >=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + ) +" + +DOCS=( README.md ) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use cxx MSGPACK_ENABLE_CXX) + $(cmake-utils_use static-libs MSGPACK_STATIC) + $(cmake-utils_use test MSGPACK_BUILD_TESTS) + ) + cmake-multilib_src_configure +} diff --git a/net-libs/libringclient/libringclient-9999.ebuild b/net-libs/libringclient/libringclient-9999.ebuild new file mode 100644 index 0000000..9b2de86 --- /dev/null +++ b/net-libs/libringclient/libringclient-9999.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit git-r3 cmake-utils + +DESCRIPTION="Ring is a Voice-over-IP software phone." +HOMEPAGE="https://ring.cx/" +EGIT_REPO_URI="https://gerrit-ring.savoirfairelinux.com/ring-lrc" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + dev-qt/qtcore:5 + net-voip/ring-daemon" +RDEPEND="${DEPEND}" diff --git a/net-libs/opendht/opendht-9999.ebuild b/net-libs/opendht/opendht-9999.ebuild new file mode 100644 index 0000000..80448d9 --- /dev/null +++ b/net-libs/opendht/opendht-9999.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit git-r3 cmake-utils + +DESCRIPTION="A lightweight C++11 Distributed Hash Table implementation originally based on https://github.com/jech/dht by Juliusz Chroboczek." +HOMEPAGE="https://github.com/savoirfairelinux/opendht/" +EGIT_REPO_URI="https://github.com/savoirfairelinux/opendht/" + +LICENSE="GPL-3 MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + >=dev-libs/msgpack-1.2.0[cxx]" +RDEPEND="${DEPEND}" + +src_prepare() { + cmake-utils_src_prepare +} diff --git a/net-libs/pjsip/.pjsip-2.4.ebuild.swp b/net-libs/pjsip/.pjsip-2.4.ebuild.swp new file mode 100644 index 0000000000000000000000000000000000000000..3cec6cdadcd092a75b8250f275096acf2f5574cd GIT binary patch literal 12288 zcmeI2Uu+{s9ml7%P+Tabg}zZ~&Iy;x>2^2vrFWN97I$)-#Jc=3b`n6nVy$<_>&>lq zS2MGY!!_3;p*|oaBv66AA;ANc`oI&S0t7;+6okYhzhedVVc!ldr^k55hz5)!!3vo)kSVNqU-)tQZj{YMlXVh5a8Io@ z&&UCz9wiscr3Ga>Q#?aI_QdXei{%En0=WXY0=WXY0=WXY0=WXY0=WYJ zKMKhB0rCQd^S;rLZjGJ~oOq7D=8s%~T!CDHT!CDHT!CDHT!CDHT!CDHT!CDHT!HtX z0yh3w{~>N3fB(Pr7$Gl%IdB#{1wH}Z{sCB55oq$0lp1h0t~E!S@7Qv5%Mm02mA`W30?;;f)_vlJ_#NK ze}9CKzkqkaJK!zw1MnIcfGW5Io&b-7e-|(ga0k2sz61<#0XzkM@j*hq1zrYU2VVm( zf*r5{mcYjW0sncJkl%q{gEzpd;HzK&J`Z+51yJw^_}d4d4|olH8GIU)z~kUw?m;78yU@J;Xy@Diwlb#M_p3I6;LA%6sKgFE0&@ICNd@E!0K;DBeqWpD{R1pa{e z{y9+d{!=yg`RhHYz!51FinF&?j;utCF4y1=4VSTL7fFHlsln-8`TC{~?(9S`qBlrk zhBjFr_i$*}5162`XGZOo%O%xvsdTCZ8%je&N$92no2oq$;vT7XAZ&VC5f(>5Fe)TOpv5!{ z*B44@3I)H|e73rTh2>{<1wOpOf* z^Kh_0Fc|7mre&+A?h&fr84On^W;*B^@*tFpm=jc$=+2m0g89G&Vfi*4!j=WiGksU zB4=rETc$lJW3g;mj>G%5iO?8!Bkr2aO|0Adk+8;=)+%SL-Av1&x^^q-$^%3}vnTt3 zsx}SOvgdQR9ot+Us>Ge`mF;E9)6k4XjmR7!8vAh!X;S^D9lEMd;)0Hx;!sG|r%}iR zdh5h=_SSfqYJ*_hL{vgz3j)tj1h(Li8r?>{O1&WJU?Cr(SV7;nRFKv>O1Y~daZhWdv~X;g7}mtjV+qB#&&zRS+5kw6Ynw3RehLKQ`m#Z=a7iAzz>t5 ziKwd`(Qs`{VK~{}l=*nuc=lOLM`P~@vYlVT>pXq#IlX3+4(`PYKMId^RZj-%+DRbw z!bt~^u9}wGct-xOcH`0RZRpyIgfv%bjoQ|V-k$WQBXsDD>dL3+ITa$*!)1f?4sH~) z5NULt&cp14Rd!Q14F$@G6m+ywb@Z9*+i5L2O=YSWH&wq5dc5mgTza~s3=qsFWp#YD zkc6CZuT|ikSm=AgDoM2iD>8F@8=}YetjX?15Yp-B9H2&&=BS|;Nqx6fs}yx~SEmde z$+L3^K8*GWy`AV?NxxxxK_}H%)J8;F8{0dT;zE&Z)T^~ERpDA=!ze?1<$2d@pTqR5 zV4iNe7&m^vhx5%&;60%i-Qj!JuXO{*zwZg#$a7SdQg zX#(}uT6=dg)i9&^l*)2?rC)*9E=Fg~>o?&@-p zAPQ0)M3l;VQN5u(l`Wr!Q(zQhXJtG3#;>c+KJ>xiZ+oRG;7rkB>lwo(+?GApXZ zbvz5xR=d`~VpkJ5Luc2S?J~Yh^(}U1Ak^)6%VRj#Mh0f`-uKr_<`uKFFuKBiVL(e} ziIx{iC2OHADW^1>2j!N3loT5X7!jn=S#s=X_bh;2BZFs_cm6i2YWpix(U zS=-vBYb<2k4rn9k1inKzd + #include + #include ++#include + #include "util.hpp" + + using namespace pj; + diff --git a/net-libs/pjsip/files/user.mak b/net-libs/pjsip/files/user.mak new file mode 100644 index 0000000..b6414ec --- /dev/null +++ b/net-libs/pjsip/files/user.mak @@ -0,0 +1,3 @@ +export CFLAGS += -fPIC +export LDFLAGS += + diff --git a/net-libs/pjsip/pjsip-2.4.ebuild b/net-libs/pjsip/pjsip-2.4.ebuild new file mode 100644 index 0000000..b742dc5 --- /dev/null +++ b/net-libs/pjsip/pjsip-2.4.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/pjsip/pjsip-1.8.10.ebuild,v 1.1 2011/02/22 10:59:09 elvanor Exp $ + +EAPI="2" + +[[ ${PV} = *9999* ]] && VCS_ECLASS="subversion" || VCS_ECLASS="" + +inherit ${VCS_ECLASS} git-r3 + +DESCRIPTION="Multimedia communication libraries written in C language +for building VoIP applications." +HOMEPAGE="http://www.pjsip.org/" +if [[ ${PV} == *9999* ]]; then + ESVN_REPO_URI="http://svn.pjsip.org/repos/pjproject/trunk" + KEYWORDS="" +else + SRC_URI="http://www.pjsip.org/release/${PV}/pjproject-${PV}.tar.bz2" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="alsa doc epoll examples ext-sound g711 g722 g7221 gsm ilbc l16 +oss python ring speex ssl" +#small-filter large-filter speex-aec + +DEPEND="alsa? ( media-libs/alsa-lib ) + gsm? ( media-sound/gsm ) + ilbc? ( dev-libs/ilbc-rfc3951 ) + speex? ( media-libs/speex ) + ring? ( ssl? ( net-libs/gnutls ) ) + !ring? ( ssl? ( dev-libs/openssl ) )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/pjproject-${PV}" + +src_unpack() { +[[ ${PV} = *9999* ]] && subversion_src_unpack || default + + if use ring; then + EGIT_REPO_URI="https://gerrit-ring.savoirfairelinux.com/ring-daemon" + EGIT_CHECKOUT_DIR=$WORKDIR/ring + git-r3_src_unpack + fi +} + +src_prepare() { + # Fix hardcoded prefix and flags + sed -i \ + -e 's/poll@/poll@\nexport PREFIX := @prefix@\n/g' \ + -e 's!prefix = /usr/local!prefix = $(PREFIX)!' \ + Makefile \ + build.mak.in || die "sed failed." + + # apply -fPIC globally + cp ${FILESDIR}/user.mak ${S} + + # TODO: remove deps to shipped codecs and libs, use system ones + # rm -r third_party + # libresample: https://ccrma.stanford.edu/~jos/resample/Free_Resampling_Software.html + + use ring && { + epatch $WORKDIR/ring/contrib/src/pjproject/*.patch $FILESDIR/pjsip-ring-intptr_t.patch + sed -i -e 's#/usr/local#/usr#' aconfigure + } +} + +src_configure() { + # Disable through portage available codecs + ssl='' + if use ring; then + use ssl && ssl=--enable-ssl=gnutls + conf=./aconfigure + else + use ssl && ssl=$(use_enable ssl) + conf=econf + fi + $conf --disable-gsm-codec \ + --disable-speex-codec \ + --disable-ilbc-codec \ + --disable-speex-aec \ + $ssl \ + $(use_enable epoll) \ + $(use_enable alsa sound) \ + $(use_enable oss) \ + $(use_enable ext-sound) \ + $(use_enable g711 g711-codec) \ + $(use_enable l16 l16-codec) \ + $(use_enable g722 g722-codec) \ + $(use_enable g7221 g7221-codec) || die "econf failed." + #$(use_enable small-filter) \ + #$(use_enable large-filter) \ + #$(use_enable speex-aec) \ +} + +src_compile() { + emake dep || die "emake dep failed." + emake -j1 || die "emake failed." +} + +src_install() { + DESTDIR="${D}" emake install || die "emake install failed." + + if use python; then + pushd pjsip-apps/src/python + python setup.py install --prefix="${D}/usr/" + popd + fi + + if use doc; then + dodoc README.txt README-RTEMS + fi + + if use examples; then + insinto "/usr/share/doc/${P}/examples" + doins "${S}/pjsip-apps/src/samples/"* + fi + + # Remove files that pjproject should not install + rm -r "${D}/usr/lib/libportaudio.a" \ + "${D}/usr/lib/libsrtp.a" +} diff --git a/net-voip/gnome-ring/gnome-ring-9999.ebuild b/net-voip/gnome-ring/gnome-ring-9999.ebuild new file mode 100644 index 0000000..a560718 --- /dev/null +++ b/net-voip/gnome-ring/gnome-ring-9999.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit git-r3 cmake-utils + +DESCRIPTION="Ring is a Voice-over-IP software phone." +HOMEPAGE="https://ring.cx/" +EGIT_REPO_URI="https://gerrit-ring.savoirfairelinux.com/ring-client-gnome" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="libnotify" + +DEPEND=" + dev-qt/qtcore:5 + net-libs/libringclient + media-libs/clutter + media-libs/clutter-gtk + libnotify? ( x11-libs/libnotify ) + x11-themes/gnome-icon-theme-symbolic + >=x11-libs/gtk+-3.10 + app-text/libebook + " +RDEPEND="${DEPEND}" diff --git a/net-voip/ring-daemon/ring-daemon-9999.ebuild b/net-voip/ring-daemon/ring-daemon-9999.ebuild new file mode 100644 index 0000000..2e6a401 --- /dev/null +++ b/net-voip/ring-daemon/ring-daemon-9999.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit git-r3 autotools + +DESCRIPTION="Ring is a Voice-over-IP software phone." +HOMEPAGE="https://ring.cx/" +EGIT_REPO_URI="https://gerrit-ring.savoirfairelinux.com/ring-daemon" + +LICENSE="GPL" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + net-libs/opendht + >=net-libs/pjsip-2.4 + dev-cpp/yaml-cpp" +RDEPEND="${DEPEND}" + +src_configure() { + mkdir contrib/native + cd contrib/native + ../bootstrap + cd ../.. + conf=econf + $conf --without-pulse \ + --without-jack \ + --without-dbus \ +i --without-gsm +} + +src_prepare() { + eautoreconf +} + +src_compile() { + cd contrib/native + make -j + cd ../.. + emake +} diff --git a/x11-libs/wlc/wlc-9999.ebuild b/x11-libs/wlc/wlc-9999.ebuild index fb123f9..3e61505 100644 --- a/x11-libs/wlc/wlc-9999.ebuild +++ b/x11-libs/wlc/wlc-9999.ebuild @@ -13,22 +13,23 @@ EGIT_BRANCH="master" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd" +KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" IUSE="" RDEPEND=" - dev-libs/wayland + >=dev-libs/wayland-1.7 x11-libs/pixman x11-libs/libxkbcommon - sys-fs/udev + virtual/udev dev-libs/libinput + x11-libs/libxkbcommon " DEPEND=" - dev-util/cmake - x11-libs/libX11 - x11-libs/libxcb - media-libs/mesa ${RDEPEND} + x11-libs/libX11 + x11-libs/libxcb[xkb] + x11-libs/xcb-util-image + media-libs/mesa[egl,gles2,wayland] " src_prepare() { diff --git a/x11-wm/sway/sway-9999.ebuild b/x11-wm/sway/sway-9999.ebuild index ba252a2..f38686a 100644 --- a/x11-wm/sway/sway-9999.ebuild +++ b/x11-wm/sway/sway-9999.ebuild @@ -3,7 +3,7 @@ # $Header: /var/cvsroot/gentoo-x86/dev-libs/wlc/wlc-9999.ebuild,v 1.13 2014/11/20 11:47:14 jer Exp $ EAPI=5 -inherit cmake-utils eutils toolchain-funcs git-r3 +inherit cmake-utils eutils git-r3 DESCRIPTION="I3 compatible wayland WM" HOMEPAGE="http://github.com/SirCmpwn/sway" @@ -13,16 +13,31 @@ EGIT_BRANCH="master" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd" -IUSE="" +KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +IUSE="swaybar -swaybg -swaygrabvideo -swaygrabpicture -swaylock -systemd" RDEPEND=" - x11-base/xorg-server[wayland] - x11-libs/wlc + app-text/asciidoc " DEPEND=" - dev-util/cmake - app-text/asciidoc + x11-libs/wlc + dev-libs/libpcre + dev-libs/json-c + x11-base/xorg-server[wayland] + x11-libs/libxkbcommon + swaygrabpicture? ( media-gfx/imagemagick[png,raw] ) + swaygrabvideo? ( media-video/ffmpeg ) + swaylock? ( x11-libs/cairo ) + swaylock? ( x11-libs/pango ) + swaylock? ( x11-libs/gdk-pixbuf[jpeg] ) + swaylock? ( sys-libs/pam ) + swaybar? ( x11-libs/cairo ) + swaybar? ( x11-libs/pango ) + swaybar? ( x11-libs/gdk-pixbuf[jpeg] ) + swaybg? ( x11-libs/cairo ) + swaybg? ( x11-libs/pango ) + swaybg? ( x11-libs/gdk-pixbuf[jpeg] ) + systemd? ( sys-apps/systemd ) ${RDEPEND} " @@ -35,6 +50,7 @@ src_configure() { } src_install() { - sed -i "s/sway-9999\/bin\/\//sway-9999_build\/bin\//g" ${BUILD_DIR}/cmake_install.cmake + #sed -i "s/sway-9999\/bin\/\//sway-9999_build\/bin\//g" ${BUILD_DIR}/cmake_install.cmake cmake-utils_src_install + use !systemd && fperms u+s '/usr/bin/sway' }