summaryrefslogtreecommitdiff
path: root/sci-libs/libsbig
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/libsbig
parentf945944251340c673cd8f54e30114540abb7bc37 (diff)
downloadbrancik-overlay-f6c12f84cb5626c3c332b56ccc288fa388464d45.tar.gz
brancik-overlay-f6c12f84cb5626c3c332b56ccc288fa388464d45.tar.bz2
Patches were merged upstream, removing them.
Diffstat (limited to 'sci-libs/libsbig')
-rw-r--r--sci-libs/libsbig/files/libsbig-9999_fix_cmake_symlinks.patch21
-rw-r--r--sci-libs/libsbig/libsbig-9999.ebuild2
2 files changed, 0 insertions, 23 deletions
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}"