From 4af28562d50e11cfbd4076009213a199c8315f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Tue, 9 Oct 2018 16:52:09 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D1=91?= =?UTF-8?q?=D0=BD=20ebuild=20=D0=B4=D0=BB=D1=8F=20viber=20=D0=B8=20apulse?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- media-sound/apulse/Manifest | 2 +- .../apulse/apulse-0.1.12_p20180803.ebuild | 63 +++++++++++ media-sound/apulse/apulse-9999.ebuild | 3 +- media-sound/apulse/files/sdk.patch | 103 ++++++++++++++++++ net-im/viber/Manifest | 3 +- net-im/viber/files/00-desktop.patch | 11 -- net-im/viber/files/viber | 2 +- net-im/viber/viber-7.0.0.1035-r1.ebuild | 38 +++++++ net-im/viber/viber-7.0.0.1035.ebuild | 48 -------- net-im/viber/viber-9999.ebuild | 29 ----- 10 files changed, 208 insertions(+), 94 deletions(-) create mode 100644 media-sound/apulse/apulse-0.1.12_p20180803.ebuild create mode 100644 media-sound/apulse/files/sdk.patch delete mode 100644 net-im/viber/files/00-desktop.patch create mode 100644 net-im/viber/viber-7.0.0.1035-r1.ebuild delete mode 100644 net-im/viber/viber-7.0.0.1035.ebuild delete mode 100644 net-im/viber/viber-9999.ebuild diff --git a/media-sound/apulse/Manifest b/media-sound/apulse/Manifest index 6050c32a8..8b15eda47 100644 --- a/media-sound/apulse/Manifest +++ b/media-sound/apulse/Manifest @@ -1 +1 @@ -DIST apulse-0.1.10.tar.gz 110272 SHA256 4f8aa9059d07bac1006e920a4a6b875ad63fdde973b83c138507812c00dd5cd6 SHA512 e922448095b7e3c8ae5766fadd5912ad39c1d0d68c73954305d17909b6bafe3a95c7e1ad4d63a4824293e0ba1495c253204343f31330c0ddb4fb419fe1f9eb12 WHIRLPOOL 56db7a62d75babe269f124f296c6000d322c50c1de583e6b274dc97ec456b6786315cc054ab7e09b1bd436ad47b86b58fc291d8e6f8192b6e2deeca14bef349b +DIST apulse-0.1.12_p20180803.zip 176549 BLAKE2B 98303ea951f15e78090c6e3c7c7174a2770f3c9a59d4f226d6d2ad5e222b7d6056b4b90a9e4f8b5b6569f7387c699c8107aadc25190babc4013083e182fa70fd SHA512 a292140e9d254d8987b468741c9c46c358708b0ed1391a00ed7248b837d31c403ffb063d8ac0243e65c0bfdf9fdbae9ff2cf6684e24c94aaf10e080d6cd1e4fc diff --git a/media-sound/apulse/apulse-0.1.12_p20180803.ebuild b/media-sound/apulse/apulse-0.1.12_p20180803.ebuild new file mode 100644 index 000000000..0b79f5428 --- /dev/null +++ b/media-sound/apulse/apulse-0.1.12_p20180803.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit multilib cmake-multilib + +COMMIT="bcd55c85365aff30668f17e2ed6ba86d5d235ce3" + +DESCRIPTION="PulseAudio emulation for ALSA" +HOMEPAGE="https://github.com/i-rinat/apulse" +SRC_URI="https://codeload.github.com/i-rinat/${PN}/zip/${COMMIT} -> ${P}.zip" + +LICENSE="MIT LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 x86" + +IUSE="debug sdk test" + +DEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}] + media-libs/alsa-lib[${MULTILIB_USEDEP}] + sdk? ( !media-sound/pulseaudio ) " +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/sdk.patch" ) + +S="${WORKDIR}/${PN}-${COMMIT}" + +src_prepare() { + cmake-utils_src_prepare + + if ! use sdk; then + # Ensure all relevant libdirs are added, to support all ABIs + DIRS= + _add_dir() { DIRS="${EPREFIX}/usr/$(get_libdir)/apulse${DIRS:+:${DIRS}}"; } + multilib_foreach_abi _add_dir + sed -e "s#@@DIRS@@#${DIRS}#g" "${FILESDIR}"/apulse > "${T}"/apulse || die + fi +} + +multilib_src_configure() { + local mycmakeargs=( + "-DINSTALL_SDK=$(usex sdk)" + "-DLOG_TO_STDERR=$(usex debug)" + "-DWITH_TRACE=$(usex debug)" + ) + cmake-utils_src_configure +} + +multilib_src_test() { + emake check +} + +multilib_src_install_all() { + # Do not use deprecated MULTILIB_CHOST_TOOLS + if ! use sdk; then + unset BUILD_DIR + _install_wrapper() { newbin "${BUILD_DIR}/apulse" "${CHOST}-apulse"; } + multilib_foreach_abi _install_wrapper + dobin "${T}/apulse" + fi + einstalldocs +} diff --git a/media-sound/apulse/apulse-9999.ebuild b/media-sound/apulse/apulse-9999.ebuild index 300862550..c21e4ee3d 100644 --- a/media-sound/apulse/apulse-9999.ebuild +++ b/media-sound/apulse/apulse-9999.ebuild @@ -16,8 +16,7 @@ KEYWORDS="" DEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}] media-libs/alsa-lib[${MULTILIB_USEDEP}]" -RDEPEND="${DEPEND} - !!media-plugins/alsa-plugins[pulseaudio]" +RDEPEND="${DEPEND}" MULTILIB_CHOST_TOOLS=( /usr/bin/apulse ) diff --git a/media-sound/apulse/files/sdk.patch b/media-sound/apulse/files/sdk.patch new file mode 100644 index 000000000..bc12090b7 --- /dev/null +++ b/media-sound/apulse/files/sdk.patch @@ -0,0 +1,103 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 072f3b1..5fe6bcd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,6 @@ + project(apulse) + cmake_minimum_required (VERSION 2.8) ++include(GNUInstallDirs) + + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -fPIC -fvisibility=hidden") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=implicit-function-declaration") +@@ -28,6 +29,8 @@ else() + include_directories(${PA_INCLUDE_DIRECTORIES}) + endif() + ++set(INSTALL_SDK 0 CACHE BOOLEAN "Install SDK files to build applications with apulse (Pulse Audio headers and pkg-config files) instead of system ones") ++ + link_directories(${REQ_LIBRARY_DIRS}) + + add_library(trace-helper STATIC +@@ -72,12 +75,30 @@ target_link_libraries(pulse-simple ${SYMBOLMAP} trace-helper ${REQ_LIBRARIES}) + + add_subdirectory(tests) + +-set(APULSEPATH "${CMAKE_INSTALL_PREFIX}/lib/apulse" CACHE PATH "library installation directory") +-set(APULSE_SEARCH_PATHS "${APULSEPATH}" CACHE PATH "directory list for LD_LIBRARY_PATH") +-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/apulse.template" +- "${CMAKE_CURRENT_BINARY_DIR}/apulse" @ONLY) ++if (${INSTALL_SDK}) ++ set(APULSEPATH "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "library installation directory") ++ ++ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig/libpulse.pc.in" ++ "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/libpulse.pc" @ONLY) ++ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig/libpulse-simple.pc.in" ++ "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/libpulse-simple.pc" @ONLY) ++ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig/libpulse-mainloop-glib.pc.in" ++ "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/libpulse-mainloop-glib.pc" @ONLY) ++else() ++ set(APULSEPATH "${CMAKE_INSTALL_LIBDIR}/apulse" CACHE PATH "library installation directory") ++ set(APULSE_SEARCH_PATHS "${CMAKE_INSTALL_PREFIX}/${APULSEPATH}" CACHE PATH "directory list for LD_LIBRARY_PATH") ++ ++ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/apulse.template" ++ "${CMAKE_CURRENT_BINARY_DIR}/apulse" @ONLY) ++endif() + +-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/apulse" DESTINATION bin +- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + install(TARGETS pulse-simple pulse pulse-mainloop-glib DESTINATION "${APULSEPATH}") +-install(FILES "${CMAKE_SOURCE_DIR}/man/apulse.1" DESTINATION share/man/man1) ++ ++if (${INSTALL_SDK}) ++ install(DIRECTORY "${CMAKE_SOURCE_DIR}/3rdparty/pulseaudio-headers/pulse" DESTINATION include) ++ install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig" DESTINATION "${CMAKE_INSTALL_LIBDIR}") ++else() ++ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/apulse" DESTINATION bin ++ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) ++ install(FILES "${CMAKE_SOURCE_DIR}/man/apulse.1" DESTINATION share/man/man1) ++endif() +diff --git a/pkgconfig/libpulse-mainloop-glib.pc.in b/pkgconfig/libpulse-mainloop-glib.pc.in +new file mode 100644 +index 0000000..957e3b2 +--- /dev/null ++++ b/pkgconfig/libpulse-mainloop-glib.pc.in +@@ -0,0 +1,9 @@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ ++ ++Name: libpulse-mainloop-glib ++Description: PulseAudio GLib 2.0 Main Loop Wrapper (apulse) ++Version: 5.0 ++Libs: -L${libdir} -lpulse-mainloop-glib -pthread ++Cflags: -I${includedir} ++Requires: glib-2.0 +diff --git a/pkgconfig/libpulse-simple.pc.in b/pkgconfig/libpulse-simple.pc.in +new file mode 100644 +index 0000000..57d917f +--- /dev/null ++++ b/pkgconfig/libpulse-simple.pc.in +@@ -0,0 +1,9 @@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ ++ ++Name: libpulse-simple ++Description: PulseAudio Simplified Synchronous Client Interface (apulse) ++Version: 5.0 ++Libs: -L${libdir} -lpulse-simple -pthread ++Cflags: -I${includedir} ++Requires: glib-2.0 +diff --git a/pkgconfig/libpulse.pc.in b/pkgconfig/libpulse.pc.in +new file mode 100644 +index 0000000..edcbbd8 +--- /dev/null ++++ b/pkgconfig/libpulse.pc.in +@@ -0,0 +1,9 @@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ ++ ++Name: libpulse ++Description: PulseAudio Client Interface (apulse) ++Version: 5.0 ++Libs: -L${libdir} -lpulse -pthread ++Cflags: -I${includedir} ++Requires: glib-2.0 alsa diff --git a/net-im/viber/Manifest b/net-im/viber/Manifest index 181cbc625..7e5d68a44 100644 --- a/net-im/viber/Manifest +++ b/net-im/viber/Manifest @@ -1,2 +1 @@ -DIST viber-7.0.0.1035.deb 97799142 SHA256 92822b621843654541bf144ecb77ce727a860521b00afd4acbc6938e3717b71a SHA512 f891ac97beee0810aec51beec3fa2205aa1bf3ccf5200562d57e20f1e3b15cb2dfcdc7e673121f09e76b403593cd9f146091a4c5561a03f1ea9f3f9282d65dfd WHIRLPOOL 927f29de36d66fb65d59ef400cd1a92565b38a21506ee7b8b7f5a3907ddd2b65df9205815a7595c2b812abebcb28850c722fbd307009a73fe1dea744c5f5d2d6 -DIST viber.deb 84861076 SHA256 bacc38034fa6d926e25122c152c867a4f576b59e920af58ce904c4e9f255773f SHA512 63feee92fb696132680c2c9b3ca29adcba1c250c0eae94c142dd6a3a7e39cdff7a2b7ff46a1629f434dc8a544693fe959ba58bb43c833bb3e22b271ea6cd5c44 WHIRLPOOL fc0eccde9b9329d8469c3d49e2691a56c69a98623b8fcb768efb7ea31e3aaf276c3fb67478605609f019a79c73156d3bf8a2c6d61439a430d83ecd9542018688 +DIST viber-7.0.0.1035.deb 97799142 BLAKE2B 78e469dc7fc78f222231932b2c61568a2063a4578f187836900744897aa10f9f244f9993420694ecb73778ec0a7aeddd233049786c789cfdd710b8d082af8b1d SHA512 f891ac97beee0810aec51beec3fa2205aa1bf3ccf5200562d57e20f1e3b15cb2dfcdc7e673121f09e76b403593cd9f146091a4c5561a03f1ea9f3f9282d65dfd diff --git a/net-im/viber/files/00-desktop.patch b/net-im/viber/files/00-desktop.patch deleted file mode 100644 index fa159de4f..000000000 --- a/net-im/viber/files/00-desktop.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- usr/share/applications/viber.desktop.old 2014-04-03 12:24:38.000000000 +0400 -+++ usr/share/applications/viber.desktop 2014-04-03 12:25:03.000000000 +0400 -@@ -6,5 +6,5 @@ - Terminal=false - Type=Application - Encoding=UTF-8 --Categories=Network;Application; --Path= -+Categories=Network; -+Path=/opt/viber - diff --git a/net-im/viber/files/viber b/net-im/viber/files/viber index 80d9325c1..bbdfb5785 100644 --- a/net-im/viber/files/viber +++ b/net-im/viber/files/viber @@ -1,2 +1,2 @@ #!/bin/sh -exec apulse /opt/viber/viber-bin "$@" +exec /opt/viber/viber-bin "$@" diff --git a/net-im/viber/viber-7.0.0.1035-r1.ebuild b/net-im/viber/viber-7.0.0.1035-r1.ebuild new file mode 100644 index 000000000..dd6c952de --- /dev/null +++ b/net-im/viber/viber-7.0.0.1035-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 2010-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="5" +inherit eutils unpacker + +DESCRIPTION="Free calls, text and picture sharing with anyone, anywhere!" +HOMEPAGE="http://www.viber.com" +SRC_URI=" + amd64? ( http://download.cdn.viber.com/cdn/desktop/Linux/viber.deb -> ${P}.deb ) +" + + +SLOT="0" +KEYWORDS="amd64" + +QA_PREBUILT="*" + +RESTRICT="mirror bindist strip" +RDEPEND=">=media-sound/apulse-0.1.12_p20180803" + +S="${WORKDIR}" + +src_unpack() { + unpack_deb ${A} +} + +src_install(){ + doins -r opt usr + mv ${ED}/opt/${PN}/Viber ${ED}/opt/${PN}/${PN}-bin + insinto opt/${PN} + doins "${FILESDIR}/${PN}" + fowners root:audio /opt/${PN}/${PN} /opt/${PN}/${PN}-bin + fperms 755 /opt/${PN}/${PN} /opt/${PN}/${PN}-bin + sed -i -e '/^Exec/s/Viber/viber/' ${ED}/usr/share/applications/viber.desktop + fperms 755 /opt/${PN}/QtWebEngineProcess +} diff --git a/net-im/viber/viber-7.0.0.1035.ebuild b/net-im/viber/viber-7.0.0.1035.ebuild deleted file mode 100644 index cc5ceb7a0..000000000 --- a/net-im/viber/viber-7.0.0.1035.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2010-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" -inherit eutils unpacker - -DESCRIPTION="Free calls, text and picture sharing with anyone, anywhere!" -HOMEPAGE="http://www.viber.com" -SRC_URI=" - amd64? ( http://download.cdn.viber.com/cdn/desktop/Linux/viber.deb -> ${P}.deb ) -" - - -SLOT="0" -KEYWORDS="~amd64" -IUSE="pulseaudio apulse" -REQUIRED_USE="apulse? ( !pulseaudio )" - -QA_PREBUILT="*" - -RESTRICT="mirror bindist strip" -RDEPEND=" - apulse? ( =media-sound/apulse-9999 ) - pulseaudio? ( media-sound/pulseaudio ) -" - -S="${WORKDIR}" - -src_unpack() { - unpack_deb ${A} -} - -src_install(){ - doins -r opt usr - - if use apulse; then - mv ${ED}/opt/${PN}/Viber ${ED}/opt/${PN}/${PN}-bin - insinto opt/${PN} - doins "${FILESDIR}/${PN}" - fowners root:audio /opt/${PN}/${PN} /opt/${PN}/${PN}-bin - fperms 755 /opt/${PN}/${PN} /opt/${PN}/${PN}-bin - sed -i -e '/^Exec/s/Viber/viber/' ${ED}/usr/share/applications/viber.desktop - else - fperms 755 /opt/${PN}/Viber - fi - fperms 755 /opt/${PN}/QtWebEngineProcess -} diff --git a/net-im/viber/viber-9999.ebuild b/net-im/viber/viber-9999.ebuild deleted file mode 100644 index 992bfac85..000000000 --- a/net-im/viber/viber-9999.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils unpacker -DESCRIPTION="Free calls, text and picture sharing with anyone, anywhere!" -HOMEPAGE="http://www.viber.com" -SRC_URI="http://download.cdn.viber.com/cdn/desktop/Linux/viber.deb" - -SLOT="0" -KEYWORDS="" -IUSE="" -RESTRICT="strip" -S="${WORKDIR}" - -#TODO: ??? -LICENSE="EULA" - -src_prepare() { - unpack_deb ${A} -} - -src_install(){ - doins -r opt usr - fperms 755 /opt/viber/Viber - fperms 755 /opt/viber/QtWebEngineProcess -}