diff options
| -rw-r--r-- | media-sound/apulse/apulse-0.1.12-r2.ebuild (renamed from media-sound/apulse/apulse-0.1.12-r1.ebuild) | 9 | ||||
| -rw-r--r-- | media-sound/apulse/files/sdk.patch | 38 |
2 files changed, 31 insertions, 16 deletions
diff --git a/media-sound/apulse/apulse-0.1.12-r1.ebuild b/media-sound/apulse/apulse-0.1.12-r2.ebuild index c4fd6706ff22..4ecc9ab745bc 100644 --- a/media-sound/apulse/apulse-0.1.12-r1.ebuild +++ b/media-sound/apulse/apulse-0.1.12-r2.ebuild @@ -21,8 +21,6 @@ DEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}] RDEPEND="${DEPEND} !!media-plugins/alsa-plugins[pulseaudio]" -MULTILIB_CHOST_TOOLS=( /usr/bin/apulse ) - PATCHES=( "${FILESDIR}/sdk.patch" ) src_prepare() { @@ -52,6 +50,11 @@ multilib_src_test() { multilib_src_install_all() { cmake-utils_src_install + if ! use sdk; then + dobin "${T}"/apulse + export MULTILIB_CHOST_TOOLS=( /usr/bin/apulse ) + multilib_foreach_abi multilib_prepare_wrappers + multilib_install_wrappers + fi einstalldocs - use sdk || dobin "${T}"/apulse } diff --git a/media-sound/apulse/files/sdk.patch b/media-sound/apulse/files/sdk.patch index 145194f289ce..90d3494344f3 100644 --- a/media-sound/apulse/files/sdk.patch +++ b/media-sound/apulse/files/sdk.patch @@ -1,8 +1,15 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 072f3b1..eff028d 100644 +index 072f3b1..74fc184 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -28,6 +28,8 @@ else() +@@ -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() @@ -11,37 +18,42 @@ index 072f3b1..eff028d 100644 link_directories(${REQ_LIBRARY_DIRS}) add_library(trace-helper STATIC -@@ -72,12 +74,30 @@ target_link_libraries(pulse-simple ${SYMBOLMAP} trace-helper ${REQ_LIBRARIES}) +@@ -72,12 +75,31 @@ 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) + +-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/apulse" DESTINATION bin +- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) +if (${INSTALL_SDK}) + set(APULSEPATH "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "library installation directory") -+else() -+ set(APULSEPATH "${CMAKE_INSTALL_LIBDIR}/apulse" CACHE PATH "library installation directory") -+endif() + - 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}) + 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") ++ ++ 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) +endif() diff --git a/pkgconfig/libpulse-mainloop-glib.pc.in b/pkgconfig/libpulse-mainloop-glib.pc.in new file mode 100644 |