From 7262971efaca6770011fb72fb1097c0c941ae157 Mon Sep 17 00:00:00 2001 From: Ctibor Date: Sat, 14 Feb 2015 18:43:12 +0100 Subject: sci-libs/libqhy now needs patch for CMakeLists.txt and src_isntall hack to install library symlinks properly. Package-Manager: portage-2.2.14 --- .../files/libqhy-9999_fix_cmake_symlink.patch | 38 ++++++++++++++++++++++ sci-libs/libqhy/libqhy-9999.ebuild | 12 +++++++ 2 files changed, 50 insertions(+) create mode 100644 sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlink.patch (limited to 'sci-libs/libqhy') diff --git a/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlink.patch b/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlink.patch new file mode 100644 index 0000000..40a23b1 --- /dev/null +++ b/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlink.patch @@ -0,0 +1,38 @@ +--- libqhy/CMakeLists.txt 2015-02-14 16:50:49.000000000 +0100 ++++ libqhy.new/CMakeLists.txt 2015-02-14 18:21:50.404729017 +0100 +@@ -1,13 +1,14 @@ + cmake_minimum_required(VERSION 2.8) + PROJECT(libqhy C CXX) + +-set(LIBQHY_VERSION "0.1.0") ++set(LIBQHY_VERSION "0.1.1") + set(LIBQHY_SOVERSION "0") + + set(FIRMWARE_INSTALL_DIR "/lib/firmware/qhy") + set(UDEVRULES_INSTALL_DIR "/lib/udev/rules.d" CACHE STRING "Base directory for udev rules") + set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib") + ++ + IF(UNIX AND NOT WIN32 AND NOT APPLE) + IF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv6l") + exec_program(cp ARGS ${CMAKE_CURRENT_SOURCE_DIR}/libqhy_arm_v6.bin ${CMAKE_BINARY_DIR}/libqhy.so.${LIBQHY_VERSION}) +@@ -20,12 +21,6 @@ + ENDIF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv6l") + ENDIF(UNIX AND NOT WIN32 AND NOT APPLE) + +-# Make sure symbolic links are installed +-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_libqhy_symlink.cmake " +-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_VERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_SOVERSION})\n +-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_SOVERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so)\n +-") +- + install(FILES qhyccd.h qhyccdcamdef.h qhyccderr.h qhyccdstruct.h DESTINATION include/libqhy) + install(FILES ${CMAKE_BINARY_DIR}/libqhy.so.${LIBQHY_VERSION} DESTINATION ${LIB_INSTALL_DIR}${LIB_POSTFIX}) + install(FILES 85-qhy.rules DESTINATION ${UDEVRULES_INSTALL_DIR}) +@@ -35,6 +30,3 @@ + file(INSTALL DESTINATION ${FIRMWARE_INSTALL_DIR} TYPE FILE FILES \${QHY_FIRMWARE})" + ) + +-install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_libqhy_symlink.cmake) +- +- diff --git a/sci-libs/libqhy/libqhy-9999.ebuild b/sci-libs/libqhy/libqhy-9999.ebuild index 977e8eb..9914e4c 100644 --- a/sci-libs/libqhy/libqhy-9999.ebuild +++ b/sci-libs/libqhy/libqhy-9999.ebuild @@ -4,6 +4,9 @@ EAPI=5 +LIBQHY_VERSION="0.1.1" +LIBQHY_SOVERSION="0" + inherit cmake-utils subversion eutils DESCRIPTION="SDK and firmware for the QHY CCD cameras" @@ -16,6 +19,8 @@ KEYWORDS="" SLOT="0" +ESVN_PATCHES=( "${FILESDIR}/libqhy-9999_fix_cmake_symlink.patch" ) + DEPEND="virtual/libusb:1 media-libs/opencv" @@ -23,4 +28,11 @@ RDEPEND="${DEPEND}" src_unpack() { subversion_src_unpack +} + +src_install() { + cmake-utils_src_install + cd "${D}"/usr/lib || die + ln -snf libqhy.so."${LIBQHY_VERSION}" libqhy.so."${LIBQHY_SOVERSION}" || die + ln -snf libqhy.so."${LIBQHY_SOVERSION}" libqhy.so || die } \ No newline at end of file -- cgit v1.2.3