diff -Nru p8-platform-2.0.1/CMakeLists.txt p8-platform-2.1.0.1~xenial/CMakeLists.txt --- p8-platform-2.0.1/CMakeLists.txt 2016-01-19 19:53:56.000000000 +0000 +++ p8-platform-2.1.0.1~xenial/CMakeLists.txt 2016-10-26 10:51:27.000000000 +0000 @@ -12,8 +12,8 @@ set(p8-platform_NAME p8-platform) set(p8-platform_DESCRIPTION "Pulse-Eight platform support library") set(p8-platform_VERSION_MAJOR 2) -set(p8-platform_VERSION_MINOR 0) -set(p8-platform_VERSION_PATCH 1) +set(p8-platform_VERSION_MINOR 1) +set(p8-platform_VERSION_PATCH 0) set(CMAKE_POSITION_INDEPENDENT_CODE on) @@ -30,7 +30,7 @@ if(NOT ${CORE_SYSTEM_NAME} STREQUAL "") if(${CORE_SYSTEM_NAME} STREQUAL "osx" OR ${CORE_SYSTEM_NAME} STREQUAL "ios") - list(APPEND p8-platform_LIBRARIES "-framework CoreVideo -framework IOKit") + list(APPEND p8-platform_LIBRARIES "-framework CoreVideo") endif() endif() @@ -39,7 +39,7 @@ add_library(p8-platform ${SOURCES} ${PLAT_SOURCES}) target_link_libraries(p8-platform ${p8-platform_LIBRARIES}) set_target_properties(p8-platform PROPERTIES VERSION ${p8-platform_VERSION_MAJOR}.${p8-platform_VERSION_MINOR}.${p8-platform_VERSION_PATCH} - SOVERSION ${p8-platform_VERSION_MAJOR}.0) + SOVERSION ${p8-platform_VERSION_MAJOR}) install(TARGETS p8-platform DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(FILES src/os.h DESTINATION include/p8-platform) @@ -74,12 +74,12 @@ IF(NOT WIN32) configure_file(p8-platform.pc.in p8-platform.pc @ONLY) install(FILES ${CMAKE_BINARY_DIR}/p8-platform.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR_NOARCH}/pkgconfig) + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ENDIF(NOT WIN32) # config mode configure_file (p8-platform-config.cmake.in p8-platform-config.cmake @ONLY) install(FILES ${CMAKE_BINARY_DIR}/p8-platform-config.cmake - DESTINATION ${CMAKE_INSTALL_LIBDIR_NOARCH}/p8-platform) + DESTINATION ${CMAKE_INSTALL_LIBDIR}/p8-platform) diff -Nru p8-platform-2.0.1/debian/changelog p8-platform-2.1.0.1~xenial/debian/changelog --- p8-platform-2.0.1/debian/changelog 2016-01-19 19:55:32.000000000 +0000 +++ p8-platform-2.1.0.1~xenial/debian/changelog 2016-10-27 08:59:19.000000000 +0000 @@ -1,3 +1,14 @@ +p8-platform (2.1.0.1~xenial) xenial; urgency=medium + + * [tvos] remove IOKit linkage. credits @Memphiz + * [posix] use standard SO versioning. credits @rbalint + * [posix] install pkg-config and .cmake files in arch-specific libdirs. + credits @rbalint + * [posix] fixed: wrong timeout in SocketRead(). closes #27. credits @SeppSTA + * [windows] added support files for building + + -- Pulse-Eight Packaging Mon, 24 Oct 2016 10:56:12 +0100 + p8-platform (2.0.1-1~xenial) xenial; urgency=medium * Avoid that cmake removes variables from pkg-config file diff -Nru p8-platform-2.0.1/debian/changelog.in p8-platform-2.1.0.1~xenial/debian/changelog.in --- p8-platform-2.0.1/debian/changelog.in 2016-01-19 19:53:56.000000000 +0000 +++ p8-platform-2.1.0.1~xenial/debian/changelog.in 2016-10-26 10:51:27.000000000 +0000 @@ -1,3 +1,14 @@ +p8-platform (2.1.0.1~#DIST#) #DIST#; urgency=medium + + * [tvos] remove IOKit linkage. credits @Memphiz + * [posix] use standard SO versioning. credits @rbalint + * [posix] install pkg-config and .cmake files in arch-specific libdirs. + credits @rbalint + * [posix] fixed: wrong timeout in SocketRead(). closes #27. credits @SeppSTA + * [windows] added support files for building + + -- Pulse-Eight Packaging Mon, 24 Oct 2016 10:56:12 +0100 + p8-platform (2.0.1-1~#DIST#) #DIST#; urgency=medium * Avoid that cmake removes variables from pkg-config file diff -Nru p8-platform-2.0.1/debian/libp8-platform-dev.install p8-platform-2.1.0.1~xenial/debian/libp8-platform-dev.install --- p8-platform-2.0.1/debian/libp8-platform-dev.install 2016-01-19 19:53:56.000000000 +0000 +++ p8-platform-2.1.0.1~xenial/debian/libp8-platform-dev.install 2016-10-26 10:51:27.000000000 +0000 @@ -1,4 +1,4 @@ usr/include/* usr/lib/*/*.so -usr/lib/pkgconfig/*.pc -usr/lib/p8-platform/* +usr/lib/*/pkgconfig +usr/lib/*/p8-platform/* diff -Nru p8-platform-2.0.1/src/posix/os-socket.h p8-platform-2.1.0.1~xenial/src/posix/os-socket.h --- p8-platform-2.0.1/src/posix/os-socket.h 2016-01-19 19:53:56.000000000 +0000 +++ p8-platform-2.1.0.1~xenial/src/posix/os-socket.h 2016-10-26 10:51:27.000000000 +0000 @@ -135,7 +135,7 @@ { long iTimeLeft = (long)readTimeout.TimeLeft(); timeout.tv_sec = iTimeLeft / (long int)1000.; - timeout.tv_usec = iTimeLeft % (long int)1000.; + timeout.tv_usec = (iTimeLeft % (long int)1000.) * (long int)1000.; tv = &timeout; } diff -Nru p8-platform-2.0.1/windows/build.cmd p8-platform-2.1.0.1~xenial/windows/build.cmd --- p8-platform-2.0.1/windows/build.cmd 1970-01-01 00:00:00.000000000 +0000 +++ p8-platform-2.1.0.1~xenial/windows/build.cmd 2016-10-26 10:51:27.000000000 +0000 @@ -0,0 +1,18 @@ +@ECHO OFF + +rem Build the p8 platform library for Windows + +SETLOCAL + +SET MYDIR=%~dp0 +SET BUILDTYPE=Release +SET VSVERSION=12 +SET INSTALLPATH=%MYDIR%..\build + +rmdir %MYDIR%..\build /s /q + +for %%T in (amd64 x86) do ( + call %MYDIR%\build-lib.cmd %%T %BUILDTYPE% %VSVERSION% %INSTALLPATH% +) + +rmdir %MYDIR%..\build\cmake /s /q diff -Nru p8-platform-2.0.1/windows/build-lib.cmd p8-platform-2.1.0.1~xenial/windows/build-lib.cmd --- p8-platform-2.0.1/windows/build-lib.cmd 1970-01-01 00:00:00.000000000 +0000 +++ p8-platform-2.1.0.1~xenial/windows/build-lib.cmd 2016-10-26 10:51:27.000000000 +0000 @@ -0,0 +1,24 @@ +@ECHO OFF + +rem Build the p8 platform library for Windows + +SETLOCAL + +SET MYDIR=%~dp0 +SET BUILDARCH=%1 +SET BUILDTYPE=%2 +SET VSVERSION=%3 +SET INSTALLPATH=%4 +IF [%4] == [] GOTO missingparams + +SET BUILDTARGET=%INSTALLPATH%\cmake\%BUILDARCH% +SET TARGET=%INSTALLPATH%\%BUILDARCH% + +call %MYDIR%..\support\windows\cmake\generate.cmd %BUILDARCH% nmake %MYDIR%..\ %BUILDTARGET% %TARGET% %BUILDTYPE% %VSVERSION% static +call %MYDIR%..\support\windows\cmake\build.cmd %BUILDARCH% %BUILDTARGET% %VSVERSION% +goto exit + +:missingparams +echo "build-lib.cmd requires 4 parameters" + +:exit \ No newline at end of file