* [gentoo-commits] repo/gentoo:master commit in: media-sound/apulse/files/, media-sound/apulse/
@ 2018-09-23 6:36 Andrew Savchenko
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Savchenko @ 2018-09-23 6:36 UTC (permalink / raw
To: gentoo-commits
commit: 5e4346eb44e31850d835ab9e10e68fcc8a002bbb
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 23 06:34:18 2018 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sun Sep 23 06:36:15 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e4346eb
media-sound/apulse: fix apulse wrapper installation
1. In SDK mode do not install the wrapper, since all libraries are
in standard paths.
2. In standard mode fix the wrapper generation to create proper
symlink instead of copying file on top.
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.10
...se-0.1.12-r1.ebuild => apulse-0.1.12-r2.ebuild} | 9 +++--
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
similarity index 87%
rename from media-sound/apulse/apulse-0.1.12-r1.ebuild
rename to media-sound/apulse/apulse-0.1.12-r2.ebuild
index c4fd6706ff2..4ecc9ab745b 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 145194f289c..90d3494344f 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/apulse/files/, media-sound/apulse/
@ 2018-09-24 10:29 Andrew Savchenko
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Savchenko @ 2018-09-24 10:29 UTC (permalink / raw
To: gentoo-commits
commit: c8e88da1b0ab4577de6ac18abc9e173ed6071e0e
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 24 10:28:22 2018 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Mon Sep 24 10:28:22 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8e88da1
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 <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.10
...lse-0.1.12-r2.ebuild => apulse-0.1.12-r3.ebuild} | 10 ++++++----
media-sound/apulse/files/sdk.patch | 21 +++++++++++----------
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
similarity index 92%
rename from media-sound/apulse/apulse-0.1.12-r2.ebuild
rename to media-sound/apulse/apulse-0.1.12-r3.ebuild
index 4ecc9ab745b..f934c4816be 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 90d3494344f..bc12090b72e 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-09-24 10:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-24 10:29 [gentoo-commits] repo/gentoo:master commit in: media-sound/apulse/files/, media-sound/apulse/ Andrew Savchenko
-- strict thread matches above, loose matches on Subject: below --
2018-09-23 6:36 Andrew Savchenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox