From e7d89740ebc17f382a1d285011cce79d53ba829c Mon Sep 17 00:00:00 2001 From: Ctibor Date: Sat, 1 Dec 2012 19:59:15 +0100 Subject: Add zlib link patch for =sci/libs/indilib-0.9.6 --- sci-libs/indilib/files/0.6-fix_symlink.patch | 39 --------------- sci-libs/indilib/files/0.6-multilib.patch | 21 -------- .../indilib/files/0.6.2-fix_fits_harddep.patch | 18 ------- sci-libs/indilib/files/0.6.2-fix_symlinks.patch | 23 --------- .../indilib/files/0.7.2-fix_linking_pthread.patch | 12 ----- sci-libs/indilib/files/0.7.2-fix_pkgconfig.patch | 10 ---- sci-libs/indilib/files/0.9.6-fix-zlib-link.patch | 57 ++++++++++++++++++++++ 7 files changed, 57 insertions(+), 123 deletions(-) delete mode 100644 sci-libs/indilib/files/0.6-fix_symlink.patch delete mode 100644 sci-libs/indilib/files/0.6-multilib.patch delete mode 100644 sci-libs/indilib/files/0.6.2-fix_fits_harddep.patch delete mode 100644 sci-libs/indilib/files/0.6.2-fix_symlinks.patch delete mode 100644 sci-libs/indilib/files/0.7.2-fix_linking_pthread.patch delete mode 100644 sci-libs/indilib/files/0.7.2-fix_pkgconfig.patch create mode 100644 sci-libs/indilib/files/0.9.6-fix-zlib-link.patch (limited to 'sci-libs/indilib/files') diff --git a/sci-libs/indilib/files/0.6-fix_symlink.patch b/sci-libs/indilib/files/0.6-fix_symlink.patch deleted file mode 100644 index cf447c0..0000000 --- a/sci-libs/indilib/files/0.6-fix_symlink.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -urN libindi0-0.6.old/CMakeLists.txt libindi0-0.6/CMakeLists.txt ---- libindi0-0.6.old/CMakeLists.txt 2008-11-18 10:45:06.000000000 +0100 -+++ libindi0-0.6/CMakeLists.txt 2009-09-07 12:49:21.000000000 +0200 -@@ -146,7 +146,7 @@ - ${CMAKE_SOURCE_DIR}/drivers/telescope/lx200gps.cpp - ${CMAKE_SOURCE_DIR}/drivers/telescope/lx200generic.cpp - ${CMAKE_SOURCE_DIR}/drivers/telescope/lx200classic.cpp -- ${CMAKE_SOURCE_DIR}/drivers/telescope/lx200apdriver.c -+ ${CMAKE_SOURCE_DIR}/drivers/telescope/lx200apdriver.c - ${CMAKE_SOURCE_DIR}/drivers/telescope/lx200ap.cpp ) - - add_executable(indi_lx200generic ${lx200generic_SRCS} ${liblilxml_SRCS} ${libindicom_SRCS}) -@@ -159,14 +159,11 @@ - - install(TARGETS indi_lx200generic RUNTIME DESTINATION bin ) - --file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_lx200generic_symlink.cmake --"exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200classic)\n --exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200autostar)\n --exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200_16)\n --exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200gps)\n --exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200ap)\n --") --set_target_properties(indi_lx200generic PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_lx200generic_symlink.cmake) -+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200classic\" )" ) -+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}//${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200autostar\" )" ) -+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}//${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200_16\" )" ) -+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}//${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200gps\" )" ) -+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}//${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200ap\" )" ) - ################################################################################# - - ########### Celestron GPS ############ -@@ -521,4 +518,4 @@ - - install( FILES indiapi.h indidevapi.h base64.h eventloop.h ${CMAKE_SOURCE_DIR}/libs/lilxml.h - ${CMAKE_SOURCE_DIR}/libs/indicom.h DESTINATION ${INCLUDE_INSTALL_DIR}/libindi COMPONENT Devel) -- -\ Chybí znak konce řádku na konci souboru -+ diff --git a/sci-libs/indilib/files/0.6-multilib.patch b/sci-libs/indilib/files/0.6-multilib.patch deleted file mode 100644 index 3f7ab72..0000000 --- a/sci-libs/indilib/files/0.6-multilib.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -urN libindi0-0.6.old/CMakeLists.txt libindi0-0.6/CMakeLists.txt ---- libindi0-0.6.old/CMakeLists.txt 2008-11-18 10:45:06.000000000 +0100 -+++ libindi0-0.6/CMakeLists.txt 2009-09-15 10:35:17.000000000 +0200 -@@ -96,7 +96,7 @@ - ######## INDI Static Library ######### - ###################################### - add_library(indidriver STATIC ${indimain_SRCS}) --install(TARGETS indidriver ARCHIVE DESTINATION lib${LIB_POSTFIX}) -+install(TARGETS indidriver ARCHIVE DESTINATION lib${LIB_SUFFIX}) - - ###################################### - ######## INDI Shared Library ######### -@@ -114,7 +114,7 @@ - target_link_libraries(indi ${FLI_LIBRARIES}) - endif(FLI_FOUND) - --install(TARGETS indi LIBRARY DESTINATION lib${LIB_POSTFIX}) -+install(TARGETS indi LIBRARY DESTINATION lib${LIB_SUFFIX}) - set_target_properties(indi PROPERTIES VERSION ${INDI_VERSION} SOVERSION ${INDI_SOVERSION}) - - ##################################### diff --git a/sci-libs/indilib/files/0.6.2-fix_fits_harddep.patch b/sci-libs/indilib/files/0.6.2-fix_fits_harddep.patch deleted file mode 100644 index ac033bf..0000000 --- a/sci-libs/indilib/files/0.6.2-fix_fits_harddep.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -urN libindi-0.6.2/CMakeLists.txt libindi-0.6.2.new//CMakeLists.txt ---- libindi-0.6.2/CMakeLists.txt 2010-07-20 06:40:26.000000000 +0200 -+++ libindi-0.6.2.new//CMakeLists.txt 2010-08-20 11:04:46.803858551 +0200 -@@ -37,9 +37,11 @@ - - macro_optional_find_package(CFITSIO) - --if (NOT CFITSIO_FOUND OR CFITSIO_VERSION_MAJOR LESS 3) -- message(FATAL_ERROR "CFITSIO version too old, Please install cfitsio 3.x and try again. http://indi.sf.net") --endif (NOT CFITSIO_FOUND OR CFITSIO_VERSION_MAJOR LESS 3) -+if (WITH_CFITSIO) -+ if (NOT CFITSIO_FOUND OR CFITSIO_VERSION_MAJOR LESS 3) -+ message(FATAL_ERROR "CFITSIO version too old, Please install cfitsio 3.x and try again. http://indi.sf.net") -+ endif (NOT CFITSIO_FOUND OR CFITSIO_VERSION_MAJOR LESS 3) -+endif (WITH_CFITSIO) - - macro_bool_to_01(CFITSIO_FOUND HAVE_CFITSIO_H) - macro_log_feature(CFITSIO_FOUND "libcfitsio" "A library for reading and writing data files in FITS (Flexible Image Transport System) data format" "http://indi.sf.net" FALSE "3.03" "Provides INDI with FITS I/O support.") diff --git a/sci-libs/indilib/files/0.6.2-fix_symlinks.patch b/sci-libs/indilib/files/0.6.2-fix_symlinks.patch deleted file mode 100644 index 9b0255e..0000000 --- a/sci-libs/indilib/files/0.6.2-fix_symlinks.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -urN libindi-0.6.2/CMakeLists.txt libindi-0.6.2.new//CMakeLists.txt ---- libindi-0.6.2/CMakeLists.txt 2010-07-20 06:40:26.000000000 +0200 -+++ libindi-0.6.2.new//CMakeLists.txt 2010-08-20 11:12:31.668952699 +0200 -@@ -178,14 +178,11 @@ - - install(TARGETS indi_lx200generic RUNTIME DESTINATION bin ) - --file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_lx200generic_symlink.cmake --"exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200classic)\n --exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200autostar)\n --exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200_16)\n --exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200gps)\n --exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200ap)\n --") --set_target_properties(indi_lx200generic PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_lx200generic_symlink.cmake) -+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200classic\" )" ) -+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200autostar\" )" ) -+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200_16\" )" ) -+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200gps\" )" ) -+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200ap\" )" ) - ################################################################################# - - ########### Celestron GPS ############ diff --git a/sci-libs/indilib/files/0.7.2-fix_linking_pthread.patch b/sci-libs/indilib/files/0.7.2-fix_linking_pthread.patch deleted file mode 100644 index 7ea0330..0000000 --- a/sci-libs/indilib/files/0.7.2-fix_linking_pthread.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN libindi-0.7.2.old/CMakeLists.txt libindi-0.7.2/CMakeLists.txt ---- libindi-0.7.2.old/CMakeLists.txt 2011-01-13 13:56:50.773108903 +0100 -+++ libindi-0.7.2/CMakeLists.txt 2011-01-13 14:12:52.486108902 +0100 -@@ -164,7 +164,7 @@ - ############# INDI Client Library ################ - ################################################## - add_library(indiclient STATIC ${indibase_SRCS}) --target_link_libraries(indiclient indi) -+target_link_libraries(indiclient indi pthread) - install(TARGETS indiclient ARCHIVE DESTINATION lib${LIB_POSTFIX}) - - ##################################### diff --git a/sci-libs/indilib/files/0.7.2-fix_pkgconfig.patch b/sci-libs/indilib/files/0.7.2-fix_pkgconfig.patch deleted file mode 100644 index 0617531..0000000 --- a/sci-libs/indilib/files/0.7.2-fix_pkgconfig.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -urN libindi-0.7.2.old/libindi.pc.cmake libindi-0.7.2/libindi.pc.cmake ---- libindi-0.7.2.old/libindi.pc.cmake 2011-01-13 13:56:50.769108903 +0100 -+++ libindi-0.7.2/libindi.pc.cmake 2011-01-13 13:57:13.421108903 +0100 -@@ -8,5 +8,5 @@ - URL=http://www.indilib.org/ - Version: @CMAKE_INDI_VERSION_STRING@ - Libs: -L@LIB_DESTINATION@ -lindi --Cflags: -I@INCLUDE_INSTALL_DIR@ -@INCLUDE_INSTALL_DIR@/libindi -+Cflags: -I@INCLUDE_INSTALL_DIR@ -I@INCLUDE_INSTALL_DIR@/libindi - diff --git a/sci-libs/indilib/files/0.9.6-fix-zlib-link.patch b/sci-libs/indilib/files/0.9.6-fix-zlib-link.patch new file mode 100644 index 0000000..d833bc4 --- /dev/null +++ b/sci-libs/indilib/files/0.9.6-fix-zlib-link.patch @@ -0,0 +1,57 @@ + +--- libindi-0.9.6/CMakeLists.txt 2012-11-19 21:39:14.000000000 +0100 ++++ libindi-0.9.6_new/CMakeLists.txt 2012-12-01 19:54:47.199396572 +0100 +@@ -633,7 +633,7 @@ + + add_executable(tutorial_one ${tutorialone_SRCS}) + +-target_link_libraries(tutorial_one indidriver m) ++target_link_libraries(tutorial_one indidriver m ${ZLIB_LIBRARIES}) + + ########### Tutorial two ############## + set(tutorialtwo_SRCS +@@ -643,7 +643,7 @@ + + add_executable(tutorial_two ${tutorialtwo_SRCS}) + +-target_link_libraries(tutorial_two indidriver m) ++target_link_libraries(tutorial_two indidriver m ${ZLIB_LIBRARIES}) + + ########### Tutorial three ############## + if (CFITSIO_FOUND) +@@ -654,7 +654,7 @@ + + add_executable(tutorial_three ${tutorialthree_SRCS}) + +-target_link_libraries(tutorial_three indidriver m) ++target_link_libraries(tutorial_three indidriver m ${ZLIB_LIBRARIES}) + endif (CFITSIO_FOUND) + ########### Tutorial four ############## + set(tutorialfour_SRCS +@@ -664,7 +664,7 @@ + + add_executable(tutorial_four ${tutorialfour_SRCS}) + +-target_link_libraries(tutorial_four indidriver m) ++target_link_libraries(tutorial_four indidriver m ${ZLIB_LIBRARIES}) + + ########### Tutorial five - dome driver ############## + set(tutorialdome_SRCS +@@ -674,7 +674,7 @@ + + add_executable(tutorial_dome ${tutorialdome_SRCS}) + +-target_link_libraries(tutorial_dome indidriver) ++target_link_libraries(tutorial_dome indidriver ${ZLIB_LIBRARIES}) + + ########### Tutorial five - rain driver ############## + set(tutorialrain_SRCS +@@ -684,7 +684,7 @@ + + add_executable(tutorial_rain ${tutorialrain_SRCS}) + +-target_link_libraries(tutorial_rain indidriver) ++target_link_libraries(tutorial_rain indidriver ${ZLIB_LIBRARIES}) + + ########### Client Tutorial ############## + set(tutorialclient_SRCS \ No newline at end of file -- cgit v1.2.3