[gentoo-commits] repo/gentoo:master commit in: media-libs/libaom/, media-libs/libaom/files/

[Alexis Ballier]

commit:     fdbc37db6ce44a4c029eeb2ff10aa5f2276fb3c1
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 10 07:36:57 2018 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Apr 10 08:04:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdbc37db

media-libs/libaom: fix libdir in pkgconfig files

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 media-libs/libaom/files/libdirpc.patch | 40 ++++++++++++++++++++++++++++++++++
 media-libs/libaom/libaom-9999.ebuild   |  3 +++
 2 files changed, 43 insertions(+)

diff --git a/media-libs/libaom/files/libdirpc.patch 
b/media-libs/libaom/files/libdirpc.patch
new file mode 100644
index 00000000000..ac646643368
--- /dev/null
+++ b/media-libs/libaom/files/libdirpc.patch
@@ -0,0 +1,40 @@
+Index: libaom-9999/CMakeLists.txt
+===================================================================
+--- libaom-9999.orig/CMakeLists.txt
++++ libaom-9999/CMakeLists.txt
+@@ -248,6 +248,7 @@ if (NOT MSVC)
+       -DCMAKE_PROJECT_NAME=${CMAKE_PROJECT_NAME}
+       -DCONFIG_MULTITHREAD=${CONFIG_MULTITHREAD}
+       -DHAVE_PTHREAD_H=${HAVE_PTHREAD_H}
++      -DLIB_SUFFIX=${LIB_SUFFIX}
+       -P "${AOM_ROOT}/build/cmake/pkg_config.cmake"
+       COMMENT "Writing aom.pc"
+       VERBATIM)
+Index: libaom-9999/build/cmake/pkg_config.cmake
+===================================================================
+--- libaom-9999.orig/build/cmake/pkg_config.cmake
++++ libaom-9999/build/cmake/pkg_config.cmake
+@@ -35,12 +35,13 @@ endif ()
+ 
+ # Write pkg-config info.
+ set(prefix "${CMAKE_INSTALL_PREFIX}")
++set(libdir "lib${LIB_SUFFIX}")
+ set(pkgconfig_file "${AOM_CONFIG_DIR}/aom.pc")
+ string(TOLOWER ${CMAKE_PROJECT_NAME} pkg_name)
+ file(WRITE "${pkgconfig_file}" "# libaom pkg-config.\n")
+ file(APPEND "${pkgconfig_file}" "prefix=${prefix}\n")
+ file(APPEND "${pkgconfig_file}" "exec_prefix=\${prefix}/bin\n")
+-file(APPEND "${pkgconfig_file}" "libdir=\${prefix}/lib\n")
++file(APPEND "${pkgconfig_file}" "libdir=\${prefix}/${libdir}\n")
+ file(APPEND "${pkgconfig_file}" "includedir=\${prefix}/include\n\n")
+ file(APPEND "${pkgconfig_file}" "Name: ${pkg_name}\n")
+ file(APPEND "${pkgconfig_file}"
+@@ -48,7 +49,7 @@ file(APPEND "${pkgconfig_file}"
+ file(APPEND "${pkgconfig_file}" "Version: ${package_version}\n")
+ file(APPEND "${pkgconfig_file}" "Requires:\n")
+ file(APPEND "${pkgconfig_file}" "Conflicts:\n")
+-file(APPEND "${pkgconfig_file}" "Libs: -L\${prefix}/lib -l${pkg_name} -lm\n")
++file(APPEND "${pkgconfig_file}" "Libs: -L\${prefix}/${libdir} -l${pkg_name} 
-lm\n")
+ if (CONFIG_MULTITHREAD AND HAVE_PTHREAD_H)
+   file(APPEND "${pkgconfig_file}" "Libs.private: -lm -lpthread\n")
+ else ()

diff --git a/media-libs/libaom/libaom-9999.ebuild 
b/media-libs/libaom/libaom-9999.ebuild
index f940504046e..512d1b35470 100644
--- a/media-libs/libaom/libaom-9999.ebuild
+++ b/media-libs/libaom/libaom-9999.ebuild
@@ -35,6 +35,8 @@ REQUIRED_USE="
        cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
 "
 
+PATCHES=( "${FILESDIR}/libdirpc.patch" )
+
 src_prepare() {
        sed -e 's/lib"/lib${LIB_SUFFIX}"/' -i CMakeLists.txt || die
        cmake-utils_src_prepare
@@ -63,6 +65,7 @@ multilib_src_configure() {
                -DBUILD_SHARED_LIBS=ON
        )
        cmake-utils_src_configure
+       rm aom.pc # ensure it is rebuilt with proper libdir
 }
 
 multilib_src_install() {