aballier 14/03/12 20:45:18 Added: x265-libdir.patch x265-libdir_pkgconfig.patch Log: Initial import, bug #485352. Ebuild by Samuli Suominen, Yixun Lan and myself. (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path 1.1 media-libs/x265/files/x265-libdir.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x265/files/x265-libdir.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x265/files/x265-libdir.patch?rev=1.1&content-type=text/plain Index: x265-libdir.patch =================================================================== Index: x265-9999/source/CMakeLists.txt =================================================================== --- x265-9999.orig/source/CMakeLists.txt +++ x265-9999/source/CMakeLists.txt @@ -246,8 +246,8 @@ if(NOT MSVC) endif() install(TARGETS x265-static RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX}) install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include) if(CMAKE_RC_COMPILER) @@ -284,8 +284,8 @@ if(ENABLE_SHARED) set_target_properties(x265-shared PROPERTIES VERSION ${X265_LATEST_TAG} SOVERSION ${X265_BUILD}) install(TARGETS x265-shared RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX}) endif() endif() @@ -305,7 +305,7 @@ if(X265_LATEST_TAG) # Produce a pkg-config file configure_file("x265.pc.in" "x265.pc" @ONLY) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/x265.pc" - DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") + DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig") endif() if(NOT WIN32) 1.1 media-libs/x265/files/x265-libdir_pkgconfig.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x265/files/x265-libdir_pkgconfig.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x265/files/x265-libdir_pkgconfig.patch?rev=1.1&content-type=text/plain Index: x265-libdir_pkgconfig.patch =================================================================== Index: x265-9999/source/x265.pc.in =================================================================== --- x265-9999.orig/source/x265.pc.in +++ x265-9999/source/x265.pc.in @@ -1,6 +1,6 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=${exec_prefix}/lib +libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ includedir=${prefix}/include Name: @CMAKE_PROJECT_NAME@
