From f6c12f84cb5626c3c332b56ccc288fa388464d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ctibor=20Bran=C4=8D=C3=ADk?= Date: Fri, 2 Feb 2018 17:59:39 +0100 Subject: Patches were merged upstream, removing them. --- .../files/libdspau-9999_fix_cmake_libdir.patch | 10 -------- sci-libs/libdspau/libdspau-9999.ebuild | 2 -- .../files/libinova-9999_fix_cmake_symlinks.patch | 19 --------------- sci-libs/libinova/libinova-9999.ebuild | 2 -- .../files/libqhy-9999_fix_cmake_symlinks.patch | 27 ---------------------- sci-libs/libqhy/libqhy-9999.ebuild | 2 -- .../files/libsbig-9999_fix_cmake_symlinks.patch | 21 ----------------- sci-libs/libsbig/libsbig-9999.ebuild | 2 -- 8 files changed, 85 deletions(-) delete mode 100644 sci-libs/libdspau/files/libdspau-9999_fix_cmake_libdir.patch delete mode 100644 sci-libs/libinova/files/libinova-9999_fix_cmake_symlinks.patch delete mode 100644 sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch delete mode 100644 sci-libs/libsbig/files/libsbig-9999_fix_cmake_symlinks.patch diff --git a/sci-libs/libdspau/files/libdspau-9999_fix_cmake_libdir.patch b/sci-libs/libdspau/files/libdspau-9999_fix_cmake_libdir.patch deleted file mode 100644 index b821e14..0000000 --- a/sci-libs/libdspau/files/libdspau-9999_fix_cmake_libdir.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/3rdparty/libdspau/CMakeLists.txt b/3rdparty/libdspau/CMakeLists.txt -index f994466f..71507e2a 100644 ---- a/3rdparty/libdspau/CMakeLists.txt -+++ b/3rdparty/libdspau/CMakeLists.txt -@@ -35,4 +35,4 @@ TARGET_LINK_LIBRARIES(dspau ${FFTW3_LIBRARIES} ${M_LIB}) - #add an install target here - INSTALL(FILES libdspau.h DESTINATION include) - --INSTALL(TARGETS dspau LIBRARY DESTINATION lib) -+INSTALL(TARGETS dspau LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/sci-libs/libdspau/libdspau-9999.ebuild b/sci-libs/libdspau/libdspau-9999.ebuild index 1425058..259d59e 100644 --- a/sci-libs/libdspau/libdspau-9999.ebuild +++ b/sci-libs/libdspau/libdspau-9999.ebuild @@ -19,6 +19,4 @@ DEPEND="sci-libs/fftw:3.0" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/libdspau-9999_fix_cmake_libdir.patch" ) - S="${EGIT_CHECKOUT_DIR}/3rdparty/${PN}" diff --git a/sci-libs/libinova/files/libinova-9999_fix_cmake_symlinks.patch b/sci-libs/libinova/files/libinova-9999_fix_cmake_symlinks.patch deleted file mode 100644 index 56511ca..0000000 --- a/sci-libs/libinova/files/libinova-9999_fix_cmake_symlinks.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/3rdparty/libinovasdk/CMakeLists.txt -+++ b/3rdparty/libinovasdk/CMakeLists.txt -@@ -27,13 +27,9 @@ IF(UNIX AND NOT WIN32 AND NOT APPLE) - 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_inovasdk_symlink.cmake " --exec_program(${CMAKE_COMMAND} ARGS -E create_symlink libinovasdk.so.${INOVASDK_VERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libinovasdk.so.${INOVASDK_SOVERSION})\n --exec_program(${CMAKE_COMMAND} ARGS -E create_symlink libinovasdk.so.${INOVASDK_SOVERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libinovasdk.so)\n --") -- - install( FILES ${CMAKE_BINARY_DIR}/libinovasdk.so.${INOVASDK_VERSION} DESTINATION ${LIB_INSTALL_DIR}${LIB_POSTFIX}) - install( FILES inovasdk.h DESTINATION include/inovasdk) - install( FILES 99-inovaplx.rules DESTINATION ${UDEVRULES_INSTALL_DIR}) --install( SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_inovasdk_symlink.cmake) -+# Make sure symbolic links are installed -+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libinovasdk.so.${INOVASDK_VERSION}\" \"libinovasdk.so.${INOVASDK_SOVERSION}\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" ) -+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libinovasdk.so.${INOVASDK_SOVERSION}\" \"libinovasdk.so\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" ) diff --git a/sci-libs/libinova/libinova-9999.ebuild b/sci-libs/libinova/libinova-9999.ebuild index 4fcf7e3..bef0284 100644 --- a/sci-libs/libinova/libinova-9999.ebuild +++ b/sci-libs/libinova/libinova-9999.ebuild @@ -15,6 +15,4 @@ KEYWORDS="" SLOT="0" -PATCHES=( "${FILESDIR}/libinova-9999_fix_cmake_symlinks.patch" ) - S="${EGIT_CHECKOUT_DIR}/3rdparty/${PN}sdk" 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" diff --git a/sci-libs/libsbig/files/libsbig-9999_fix_cmake_symlinks.patch b/sci-libs/libsbig/files/libsbig-9999_fix_cmake_symlinks.patch deleted file mode 100644 index 669b371..0000000 --- a/sci-libs/libsbig/files/libsbig-9999_fix_cmake_symlinks.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -urN libsbig-9999/3rdparty/libsbig/CMakeLists.txt libsbig-9999.new/3rdparty/libsbig/CMakeLists.txt ---- libsbig-9999/3rdparty/libsbig/CMakeLists.txt 2017-12-27 18:34:47.394240953 +0100 -+++ libsbig-9999.new/3rdparty/libsbig/CMakeLists.txt 2017-12-27 18:36:05.916025476 +0100 -@@ -27,14 +27,10 @@ - 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_sbig_symlink.cmake " --exec_program(${CMAKE_COMMAND} ARGS -E create_symlink libsbigudrv.so.${SBIG_VERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_SOVERSION})\n --exec_program(${CMAKE_COMMAND} ARGS -E create_symlink libsbigudrv.so.${SBIG_SOVERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so)\n --") -- - install( FILES ${CMAKE_BINARY_DIR}/libsbigudrv.so.${SBIG_VERSION} DESTINATION ${LIB_INSTALL_DIR}${LIB_POSTFIX}) - install( FILES sbigudrv.h DESTINATION include/libsbig) - install( FILES sbigucam.hex sbiglcam.hex sbigfcam.hex sbigpcam.hex stfga.bin DESTINATION ${FIRMWARE_INSTALL_DIR}) - install( FILES 51-sbig-debian.rules DESTINATION ${UDEVRULES_INSTALL_DIR}) --install( SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_sbig_symlink.cmake) -+# Make sure symbolic links are installed -+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libsbigudrv.so.${SBIG_VERSION}\" \"libsbigudrv.so.${SBIG_SOVERSION}\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" ) -+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libsbigudrv.so.${SBIG_SOVERSION}\" \"libsbigudrv.so\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" ) diff --git a/sci-libs/libsbig/libsbig-9999.ebuild b/sci-libs/libsbig/libsbig-9999.ebuild index 7e89426..99bbb26 100644 --- a/sci-libs/libsbig/libsbig-9999.ebuild +++ b/sci-libs/libsbig/libsbig-9999.ebuild @@ -20,6 +20,4 @@ KEYWORDS="" SLOT="0" -PATCHES=( "${FILESDIR}/libsbig-9999_fix_cmake_symlinks.patch" ) - S="${EGIT_CHECKOUT_DIR}/3rdparty/${PN}" -- cgit v1.2.3