From 62f67115b5c46134c34f88f4b1cbdacc19384c0a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 30 Sep 2018 11:19:18 +0100 Subject: gentoo resync : 30.09.2018 --- media-sound/apulse/Manifest | 5 +- media-sound/apulse/apulse-0.1.12-r4.ebuild | 63 ++++++++++++++++++ media-sound/apulse/apulse-0.1.12.ebuild | 50 -------------- media-sound/apulse/files/sdk.patch | 103 +++++++++++++++++++++++++++++ media-sound/apulse/metadata.xml | 3 +- 5 files changed, 171 insertions(+), 53 deletions(-) create mode 100644 media-sound/apulse/apulse-0.1.12-r4.ebuild delete mode 100644 media-sound/apulse/apulse-0.1.12.ebuild create mode 100644 media-sound/apulse/files/sdk.patch (limited to 'media-sound/apulse') diff --git a/media-sound/apulse/Manifest b/media-sound/apulse/Manifest index 7f7e8d8d0f33..b22c3e6639b5 100644 --- a/media-sound/apulse/Manifest +++ b/media-sound/apulse/Manifest @@ -1,6 +1,7 @@ AUX apulse 488 BLAKE2B 20231c1041e1658e993ecc5f0dbd37f1d7e718aa5095b0bcb18b6c78639da5da29d5aa72fe77c774598d199e8284cceaab9fdb9aa07cf734957fb1c2d8d617c0 SHA512 2b1ebb3d574af2469f50a42e324b3367b5e08d3de00076620ce2133226d544ab2507e6d752ff3ed427319978ab5e1a0e73189368666a5c7f5ed61f1294417228 +AUX sdk.patch 4357 BLAKE2B ad43209ebf78f1f8937bfde54c88034a9c0f426caf62da5aa70b6171e29546af97c374765bed081cdf13827add3d02e5cdb6b30adccaae03318c102dba4cff65 SHA512 f1f743d049c120f3c8d6d1387577b53e9637881d9d5e007c55b4e42feca21b170ee24146c5fb0cc050c3eb1c26659dc6363e673710ae08c76f2844306a1ca01d DIST apulse-0.1.10.tar.gz 110272 BLAKE2B 3e05c93de225125ed0de75f5576282da89acd88398d3a5159d09a6f50a7747a3a341e192f35520d3fa79a6739bf287bbcf39fb350116aa5b5a86ca5034a13034 SHA512 e922448095b7e3c8ae5766fadd5912ad39c1d0d68c73954305d17909b6bafe3a95c7e1ad4d63a4824293e0ba1495c253204343f31330c0ddb4fb419fe1f9eb12 DIST apulse-0.1.12.tar.gz 117220 BLAKE2B 04d88a298ff5e21e19fda1979ebbc96a6441f83212d6903a004a54ee360276985e66b637571a76e3fe6821d42762ac515b02a8a2cb0149a66f3150e34bd0d9b7 SHA512 9fe39ab93e90d7ec589c7632bf439bfc7fe8bbd0792ce1197ec8547fbe1901fec50facdf33c55cfbadbc1af4414fdf48f1f241406903a8f15f445b97dca7076a EBUILD apulse-0.1.10.ebuild 1081 BLAKE2B 372e93e508f668fff85c7d9117ee305bfa47d4685122503e3c6789b4b7423fcdd403c3305f0a719105060703a8640980ede90ba9c4939bc7691352d1810ec85f SHA512 3ba6f8eddad6065760b3d31ad52d306e63992be35595903f57edb4c93bf7b5712ad0d61b21cbb7dc7009b8a80c626b33302d3462661f28ed2944b13a5b573ece -EBUILD apulse-0.1.12.ebuild 1253 BLAKE2B e04b196ab2e79156dfdf789ed1eea0524a1c9c1823e8e94ef3f73b816d41fda9854507446bb6ae9d7eed819e177601de19a406ea8bddba451a9f40f960f9952b SHA512 bc3d28644aeeceb410d4ace9ad89a8d3c5079c047c08b993764af777e3b444c31f41aa68791728f3243541e4b7240d7bec8162d088226147c90802249e215af4 -MISC metadata.xml 418 BLAKE2B 70574aa80c834d0bd9d21764cc96fcae3ca59ecb4dcd371e467606ae91d169186fb4f1fbfa0313752de01d5d6d65b6a22bb804afe5fbabc7126367720d750557 SHA512 01fa9cdf72ab998dc91603a95c95c2d6cd707a732a0756a386a640ad1cf0b84f5a2dfc931425c4a6106467950212ba32fa1fa6f879741eb78d48b4188836b06a +EBUILD apulse-0.1.12-r4.ebuild 1596 BLAKE2B c120689c687e645fe1d3bc93924521b21dcee1c4b63e131c89fea710338838b68573b4d8d3cbc5537988d1a057a65c1f1a0d91711c601d817b30c2953569160c SHA512 770654a65ea7dca987b6e367018e256f1cb52bab940a9935b4aa45933c926062cc211277e918ff697c3efa9b786ba1a0895e59fd7381c924a2c29e774875031e +MISC metadata.xml 539 BLAKE2B 958678641d39164ac7da9bb779329185aafe5d551dfbabaaa0872b47cbfeba6fa5d545e715ebb1fb4eb730bc192696a1517c4f474a0a51f81136b213ec4fe9ea SHA512 49cce06f24b1c9a5ec42f549fc018517650339347f97e02864ea0e2a4216c092d38c75c46a588bad3896843962b477c2ad94b34cb1f39f8255116fc4b2c92fde diff --git a/media-sound/apulse/apulse-0.1.12-r4.ebuild b/media-sound/apulse/apulse-0.1.12-r4.ebuild new file mode 100644 index 000000000000..46b1d98a51ad --- /dev/null +++ b/media-sound/apulse/apulse-0.1.12-r4.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 + +DESCRIPTION="PulseAudio emulation for ALSA" +HOMEPAGE="https://github.com/i-rinat/apulse" +SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +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} + !!media-plugins/alsa-plugins[pulseaudio]" + +PATCHES=( "${FILESDIR}/sdk.patch" ) + +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() { + cmake-utils_src_install + # The easiest way would be setting MULTILIB_CHOST_TOOLS at global scope, depending + # on USE=sdk, but this is no longer permitted, so workaround is required. + # See bug 666884 for details. + 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-0.1.12.ebuild b/media-sound/apulse/apulse-0.1.12.ebuild deleted file mode 100644 index 1f223fb6cfc4..000000000000 --- a/media-sound/apulse/apulse-0.1.12.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib cmake-multilib - -DESCRIPTION="PulseAudio emulation for ALSA" -HOMEPAGE="https://github.com/i-rinat/apulse" -SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="+pa-headers test" - -DEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}] - media-libs/alsa-lib[${MULTILIB_USEDEP}] - pa-headers? ( !media-sound/pulseaudio ) " -RDEPEND="${DEPEND} - !!media-plugins/alsa-plugins[pulseaudio]" - -MULTILIB_CHOST_TOOLS=( /usr/bin/apulse ) - -src_prepare() { - cmake-utils_src_prepare - - # 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 -} - -multilib_src_configure() { - local mycmakeargs=("-DAPULSEPATH=${EPREFIX}/usr/$(get_libdir)/apulse") - cmake-utils_src_configure -} - -multilib_src_test() { - emake check -} - -multilib_src_install_all() { - cmake-utils_src_install - einstalldocs - dobin "${T}"/apulse - use pa-headers && doheader -r 3rdparty/pulseaudio-headers/pulse -} diff --git a/media-sound/apulse/files/sdk.patch b/media-sound/apulse/files/sdk.patch new file mode 100644 index 000000000000..bc12090b72e5 --- /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/media-sound/apulse/metadata.xml b/media-sound/apulse/metadata.xml index 738e74332466..273b2be58659 100644 --- a/media-sound/apulse/metadata.xml +++ b/media-sound/apulse/metadata.xml @@ -6,7 +6,8 @@ Andrew Savchenko - Install PulseAudio headers + Install PulseAudio headers and pkg-config files. Be aware apulse is not + a full PulseAudio replacement by design and some functionality may be missing. i-rinat/apulse -- cgit v1.2.3