diff --git a/dev-embedded/libftdi/libftdi-1.0.recipe b/dev-embedded/libftdi/libftdi-1.4.recipe similarity index 73% rename from dev-embedded/libftdi/libftdi-1.0.recipe rename to dev-embedded/libftdi/libftdi-1.4.recipe index c2a433201..76de1ed6b 100644 --- a/dev-embedded/libftdi/libftdi-1.0.recipe +++ b/dev-embedded/libftdi/libftdi-1.4.recipe @@ -5,22 +5,22 @@ library is linked with your program in userspace, no kernel driver required.\ libFTDI works perfectly with Linux, Windows, MacOS X and BSD variants thanks to \ libusb." HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/index.php" -COPYRIGHT="2003-2013 Intra2net AG and the libftdi developers" +COPYRIGHT="2003-2017 Intra2net AG and the libftdi developers" LICENSE="GNU LGPL v2.1 GNU GPL v2" REVISION="6" -SOURCE_URI="http://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.0.tar.bz2" -CHECKSUM_SHA256="7290fd38208d8c00d25ed13ce172aaa0403b37148080e4a33a99837022d2b321" +SOURCE_URI="https://www.intra2net.com/en/developer/libftdi/download/libftdi1-$portVersion.tar.bz2" +CHECKSUM_SHA256="ec36fb49080f834690c24008328a5ef42d3cf584ef4060f3a35aa4681cb31b74" SOURCE_DIR="libftdi1-$portVersion" -PATCHES="libftdi-1.0.patchset" +PATCHES="libftdi-$portVersion.patchset" -ARCHITECTURES="x86 x86_gcc2 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="!x86_gcc2 x86_64" +SECONDARY_ARCHITECTURES="x86" PROVIDES=" libftdi$secondaryArchSuffix = $portVersion - cmd:ftdi_eeprom$secondaryArchSuffix - cmd:libftdi1_config$secondaryArchSuffix + cmd:ftdi_eeprom + cmd:libftdi1_config lib:libftdi1$secondaryArchSuffix = $portVersion lib:libftdipp1$secondaryArchSuffix = $portVersion " @@ -60,14 +60,9 @@ BUILD() cd build cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix \ -DLIBUSB_INCLUDE_DIR=/system/$relativeIncludeDir/libusb-1.0 \ - -DConfuse_INCLUDE_DIRS=/system/$relativeIncludeDir \ - -DConfuse_LIBRARY_DIRS=/system/$relativeDevelopLibDir \ - -DConfuse_LIBRARIES="libconfuse.so" \ - -DConfuse_FOUND=TRUE \ - -DLIBUSB="libusb-1.0.so" \ -DLIB_SUFFIX=$secondaryArchSubDir \ - -DBIN_SUFFIX=$secondaryArchSubDir \ -DINC_SUFFIX=$secondaryArchSubDir \ + -DCMAKE_INSTALL_DOCDIR=$docDir \ .. make } diff --git a/dev-embedded/libftdi/patches/libftdi-1.0.patchset b/dev-embedded/libftdi/patches/libftdi-1.0.patchset deleted file mode 100644 index 746f62bb2..000000000 --- a/dev-embedded/libftdi/patches/libftdi-1.0.patchset +++ /dev/null @@ -1,87 +0,0 @@ -From 4a5216f4de8210d35c9fa236efb8bf851e8b6d44 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com.org> -Date: Mon, 18 Jun 2018 00:44:49 +1000 -Subject: Fix build for Haiku - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0bad0d7..3195310 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -166,7 +166,7 @@ install(FILES ${CMAKE_BINARY_DIR}/libftdi1.pc ${CMAKE_BINARY_DIR}/libftdipp1.pc - if ( UNIX ) - configure_file ( libftdi1-config.in ${CMAKE_CURRENT_BINARY_DIR}/libftdi1-config @ONLY ) - install ( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libftdi1-config -- DESTINATION bin ) -+ DESTINATION bin${BIN_SUFFIX} ) - - # config script install path - if ( NOT DEFINED LIBFTDI_CMAKE_CONFIG_DIR ) -diff --git a/ftdi_eeprom/CMakeLists.txt b/ftdi_eeprom/CMakeLists.txt -index a843b8e..ca438e5 100644 ---- a/ftdi_eeprom/CMakeLists.txt -+++ b/ftdi_eeprom/CMakeLists.txt -@@ -28,9 +28,9 @@ if (FTDI_EEPROM) - - add_executable(ftdi_eeprom main.c) - target_link_libraries(ftdi_eeprom ftdi1) -- target_link_libraries(ftdi_eeprom ${Confuse_LIBRARIES}) -+ target_link_libraries(ftdi_eeprom ${Confuse_LIBRARIES} ${LIBUSB}) - -- install(TARGETS ftdi_eeprom DESTINATION bin) -+ install(TARGETS ftdi_eeprom DESTINATION bin${BIN_SUFFIX}) - - else(Confuse_FOUND) - message(STATUS "libConfuse not found, won't build ftdi_eeprom") -diff --git a/ftdipp/CMakeLists.txt b/ftdipp/CMakeLists.txt -index 16184ee..2563cd8 100644 ---- a/ftdipp/CMakeLists.txt -+++ b/ftdipp/CMakeLists.txt -@@ -51,7 +51,7 @@ if (FTDIPP) - COMPONENT staticlibs - ) - install( FILES ${cpp_headers} -- DESTINATION include/${PROJECT_NAME} -+ DESTINATION develop/headers${INC_SUFFIX}/${PROJECT_NAME} - COMPONENT headers - ) - endif(${UNIX}) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 1f39ee7..f074b30 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -51,7 +51,7 @@ if(${UNIX}) - ) - - install( FILES ${c_headers} -- DESTINATION include/${PROJECT_NAME} -+ DESTINATION develop/headers${INC_SUFFIX}/${PROJECT_NAME} - COMPONENT headers - ) - --- -2.16.4 - - -From 26f5ce99b2eea24a772307de16f1fd221e992271 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Mon, 18 Jun 2018 00:51:51 +1000 -Subject: Fix build for x86_64 arch - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3195310..0c45883 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -47,7 +47,7 @@ set(CPACK_COMPONENT_STATICLIBS_GROUP "Development") - set(CPACK_COMPONENT_HEADERS_GROUP "Development") - - # automatically set lib suffix --if ( UNIX AND NOT APPLE AND NOT CMAKE_CROSSCOMPILING AND NOT EXISTS "/etc/debian_version" ) -+if ( UNIX AND NOT APPLE AND NOT HAIKU AND NOT CMAKE_CROSSCOMPILING AND NOT EXISTS "/etc/debian_version" ) - if ( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT LIB_SUFFIX ) - set ( LIB_SUFFIX 64 ) - endif () --- -2.16.4 - diff --git a/dev-embedded/libftdi/patches/libftdi-1.4.patchset b/dev-embedded/libftdi/patches/libftdi-1.4.patchset new file mode 100644 index 000000000..d993b6716 --- /dev/null +++ b/dev-embedded/libftdi/patches/libftdi-1.4.patchset @@ -0,0 +1,34 @@ +From eb3927541890e13aaf094913b4ecbe4153248fb4 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Mon, 7 Jan 2019 22:57:12 +0100 +Subject: Fix include dirs for Haiku. + + +diff --git a/ftdipp/CMakeLists.txt b/ftdipp/CMakeLists.txt +index 27fbe8d..af82ae7 100644 +--- a/ftdipp/CMakeLists.txt ++++ b/ftdipp/CMakeLists.txt +@@ -55,7 +55,7 @@ if (FTDIPP) + endif () + + install ( FILES ${cpp_headers} +- DESTINATION include/${PROJECT_NAME} ++ DESTINATION develop/headers${INC_SUFFIX} + COMPONENT headers + ) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9fd86a6..f592a2d 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -50,6 +50,6 @@ if ( STATICLIBS ) + endif () + + install ( FILES ${c_headers} +- DESTINATION include/${PROJECT_NAME} ++ DESTINATION develop/headers${INC_SUFFIX} + COMPONENT headers + ) +-- +2.19.1 +