summaryrefslogtreecommitdiff
path: root/sci-libs/libqhy
diff options
context:
space:
mode:
authorCtibor Brančík <ctibor@brancik.cz>2018-02-02 17:59:39 +0100
committerCtibor Brančík <ctibor@brancik.cz>2018-02-02 17:59:39 +0100
commitf6c12f84cb5626c3c332b56ccc288fa388464d45 (patch)
tree669d24be6c28f9980e635419842a3d98539c1015 /sci-libs/libqhy
parentf945944251340c673cd8f54e30114540abb7bc37 (diff)
downloadbrancik-overlay-f6c12f84cb5626c3c332b56ccc288fa388464d45.tar.gz
brancik-overlay-f6c12f84cb5626c3c332b56ccc288fa388464d45.tar.bz2
Patches were merged upstream, removing them.
Diffstat (limited to 'sci-libs/libqhy')
-rw-r--r--sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch27
-rw-r--r--sci-libs/libqhy/libqhy-9999.ebuild2
2 files changed, 0 insertions, 29 deletions
diff --git a/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch b/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch
deleted file mode 100644
index 3e479d7..0000000
--- a/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -urN libqhy-9999/3rdparty/libqhy/CMakeLists.txt libqhy-9999.new/3rdparty/libqhy/CMakeLists.txt
---- libqhy-9999/3rdparty/libqhy/CMakeLists.txt 2017-12-27 18:31:01.871867597 +0100
-+++ libqhy-9999.new/3rdparty/libqhy/CMakeLists.txt 2017-12-27 18:32:35.406606201 +0100
-@@ -43,21 +43,16 @@
-
- install(FILES 85-qhy.rules DESTINATION ${UDEVRULES_INSTALL_DIR})
- install(FILES ${CMAKE_BINARY_DIR}/libqhy.so.${LIBQHY_VERSION} DESTINATION ${LIB_INSTALL_DIR}${LIB_POSTFIX})
--
- # Make sure symbolic links are installed
--file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_libqhy_symlink.cmake "
--exec_program(${CMAKE_COMMAND} ARGS -E create_symlink libqhy.so.${LIBQHY_VERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_SOVERSION})\n
--exec_program(${CMAKE_COMMAND} ARGS -E create_symlink libqhy.so.${LIBQHY_SOVERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so)\n
--")
-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libqhy.so.${LIBQHY_VERSION}\" \"libqhy.so.${LIBQHY_SOVERSION}\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" )
-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libqhy.so.${LIBQHY_SOVERSION}\" \"libqhy.so\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" )
-
- ENDIF (APPLE)
-
- install(FILES qhyccd.h qhyccdcamdef.h qhyccderr.h qhyccdstruct.h log4z.h qhycam.h DESTINATION include/libqhy)
-
--install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_libqhy_symlink.cmake)
- install(
- CODE "
- file(GLOB QHY_FIRMWARE ${CMAKE_CURRENT_SOURCE_DIR}/firmware/*) \n
- file(INSTALL DESTINATION ${FIRMWARE_INSTALL_DIR} TYPE FILE FILES \${QHY_FIRMWARE})"
- )
--
diff --git a/sci-libs/libqhy/libqhy-9999.ebuild b/sci-libs/libqhy/libqhy-9999.ebuild
index fba661f..29799d8 100644
--- a/sci-libs/libqhy/libqhy-9999.ebuild
+++ b/sci-libs/libqhy/libqhy-9999.ebuild
@@ -18,8 +18,6 @@ KEYWORDS=""
SLOT="0"
-PATCHES=( "${FILESDIR}/libqhy-9999_fix_cmake_symlinks.patch" )
-
DEPEND="virtual/libusb:1
media-libs/opencv"