summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Savchenko <bircoph@gentoo.org>2018-09-24 13:28:22 +0300
committerAndrew Savchenko <bircoph@gentoo.org>2018-09-24 13:28:22 +0300
commitc8e88da1b0ab4577de6ac18abc9e173ed6071e0e (patch)
tree8392b62b91d02db2a0d82e28043f29378f0fcfc7 /media-sound
parentnet-misc/nextcloud-client: remove unused patch(es) (diff)
downloadgentoo-c8e88da1b0ab4577de6ac18abc9e173ed6071e0e.tar.gz
gentoo-c8e88da1b0ab4577de6ac18abc9e173ed6071e0e.tar.bz2
gentoo-c8e88da1b0ab4577de6ac18abc9e173ed6071e0e.zip
media-sound/apulse: fix the wrapper generation.
- Fix the apulse wrapper generation. - Fix library paths inside apulse wrapper. - Fix typo in libpulse-simple.pc libdir. Closes: https://bugs.gentoo.org/666884 Signed-off-by: Andrew Savchenko <bircoph@gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.10
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/apulse/apulse-0.1.12-r3.ebuild (renamed from media-sound/apulse/apulse-0.1.12-r2.ebuild)10
-rw-r--r--media-sound/apulse/files/sdk.patch21
2 files changed, 17 insertions, 14 deletions
diff --git a/media-sound/apulse/apulse-0.1.12-r2.ebuild b/media-sound/apulse/apulse-0.1.12-r3.ebuild
index 4ecc9ab745bc..f934c4816be8 100644
--- a/media-sound/apulse/apulse-0.1.12-r2.ebuild
+++ b/media-sound/apulse/apulse-0.1.12-r3.ebuild
@@ -48,13 +48,15 @@ multilib_src_test() {
emake check
}
-multilib_src_install_all() {
+multilib_src_install() {
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
+ multilib_prepare_wrappers
fi
+}
+
+multilib_src_install_all() {
+ use sdk || dobin "${T}/apulse"
einstalldocs
}
diff --git a/media-sound/apulse/files/sdk.patch b/media-sound/apulse/files/sdk.patch
index 90d3494344f3..bc12090b72e5 100644
--- a/media-sound/apulse/files/sdk.patch
+++ b/media-sound/apulse/files/sdk.patch
@@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 072f3b1..74fc184 100644
+index 072f3b1..5fe6bcd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,6 @@
@@ -18,17 +18,14 @@ index 072f3b1..74fc184 100644
link_directories(${REQ_LIBRARY_DIRS})
add_library(trace-helper STATIC
-@@ -72,12 +75,31 @@ target_link_libraries(pulse-simple ${SYMBOLMAP} trace-helper ${REQ_LIBRARIES})
+@@ -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")
+-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")
+
@@ -40,13 +37,16 @@ index 072f3b1..74fc184 100644
+ "${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)
+-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)
@@ -54,6 +54,7 @@ index 072f3b1..74fc184 100644
+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
@@ -72,11 +73,11 @@ index 0000000..957e3b2
+Requires: glib-2.0
diff --git a/pkgconfig/libpulse-simple.pc.in b/pkgconfig/libpulse-simple.pc.in
new file mode 100644
-index 0000000..3809d50
+index 0000000..57d917f
--- /dev/null
+++ b/pkgconfig/libpulse-simple.pc.in
@@ -0,0 +1,9 @@
-+libdir=@CMAKE_INSTALL_FULL__LIBDIR@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+
+Name: libpulse-simple