diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-10 17:26:49 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-10 17:26:49 +0100 |
| commit | 6957f5c65b02bba533954eabc0b62f5de36be206 (patch) | |
| tree | 21d8ab8f61dffd9cccc82d0badb68982516a6855 /media-libs/libaom/files | |
| parent | e91a1aaa5ec8fab37f0fd082ac6024d41c6651e2 (diff) | |
gentoo resync : 10.04.2018
Diffstat (limited to 'media-libs/libaom/files')
| -rw-r--r-- | media-libs/libaom/files/libdirpc.patch | 40 | ||||
| -rw-r--r-- | media-libs/libaom/files/pthread_lib.patch | 14 |
2 files changed, 54 insertions, 0 deletions
diff --git a/media-libs/libaom/files/libdirpc.patch b/media-libs/libaom/files/libdirpc.patch new file mode 100644 index 000000000000..ac6466433683 --- /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/files/pthread_lib.patch b/media-libs/libaom/files/pthread_lib.patch new file mode 100644 index 000000000000..d8770bc687ca --- /dev/null +++ b/media-libs/libaom/files/pthread_lib.patch @@ -0,0 +1,14 @@ +Index: libaom-9999/CMakeLists.txt +=================================================================== +--- libaom-9999.orig/CMakeLists.txt ++++ libaom-9999/CMakeLists.txt +@@ -598,6 +598,9 @@ if (BUILD_SHARED_LIBS) + include("${AOM_ROOT}/build/cmake/exports.cmake") + setup_exports_target() + set_target_properties(aom PROPERTIES SOVERSION 0) ++ if (HAVE_PTHREAD_H AND CONFIG_MULTITHREAD) ++ target_link_libraries(aom ${AOM_LIB_LINK_TYPE} Threads::Threads) ++ endif () + endif () + + # Handle user supplied compile and link flags last to ensure they're obeyed. |