diff --git a/player-3.1.0-tirpc.patch b/player-3.1.0-tirpc.patch new file mode 100644 index 0000000..0967387 --- /dev/null +++ b/player-3.1.0-tirpc.patch @@ -0,0 +1,63 @@ +diff -up ./cmake/internal/SearchForStuff.cmake.tirpc ./cmake/internal/SearchForStuff.cmake +--- ./cmake/internal/SearchForStuff.cmake.tirpc 2018-02-24 15:17:04.429808277 -0500 ++++ ./cmake/internal/SearchForStuff.cmake 2018-02-24 15:24:27.775383956 -0500 +@@ -4,6 +4,7 @@ INCLUDE (CheckFunctionExists) + INCLUDE (CheckIncludeFiles) + INCLUDE (CheckLibraryExists) + INCLUDE (CheckSymbolExists) ++INCLUDE (FindPkgConfig) + + SET (PLAYER_EXTRA_LIB_DIRS "" CACHE STRING "List of extra library directories.") + MARK_AS_ADVANCED (PLAYER_EXTRA_LIB_DIRS) +@@ -19,10 +20,19 @@ ENDIF (PLAYER_OS_QNX) + CHECK_FUNCTION_EXISTS (getaddrinfo HAVE_GETADDRINFO) + SET (CMAKE_REQUIRED_LIBRARIES) + ++IF (PLAYER_OS_LINUX AND PKG_CONFIG_FOUND) ++ PKG_CHECK_MODULES(TIRPC libtirpc) ++ IF (TIRPC_FOUND) ++ ENDIF(TIRPC_FOUND) ++ENDIF(PLAYER_OS_LINUX AND PKG_CONFIG_FOUND) ++ ++ + IF (PLAYER_OS_QNX) + SET (CMAKE_REQUIRED_LIBRARIES rpc) + ELSEIF (PLAYER_OS_SOLARIS) + SET (CMAKE_REQUIRED_LIBRARIES nsl) ++ ELSEIF (PLAYER_OS_LINUX AND TIRPC_FOUND) ++ SET (CMAKE_REQUIRED_LIBRARIES tirpc) + ENDIF (PLAYER_OS_QNX) + CHECK_FUNCTION_EXISTS (xdr_free HAVE_XDR) + IF (HAVE_XDR) +@@ -141,7 +151,6 @@ INCLUDE (TestBigEndian) + TEST_BIG_ENDIAN (WORDS_BIGENDIAN) + + # GTK checks +-INCLUDE (FindPkgConfig) + IF (NOT PKG_CONFIG_FOUND) + MESSAGE (STATUS "WARNING: Could not find pkg-config. This will prevent searching for GTK and building many drivers.") + ELSE (NOT PKG_CONFIG_FOUND) +diff -up ./libplayerinterface/CMakeLists.txt.tirpc ./libplayerinterface/CMakeLists.txt +--- ./libplayerinterface/CMakeLists.txt.tirpc 2018-02-24 15:25:40.324641800 -0500 ++++ ./libplayerinterface/CMakeLists.txt 2018-02-24 15:46:49.665618088 -0500 +@@ -95,6 +95,9 @@ SET (playerinterfaceSrcs ${playerxdr_h} + + IF (PLAYER_OS_QNX) + SET (interfaceLibFlag -lrpc) ++ELSEIF (PLAYER_OS_LINUX AND TIRPC_FOUND) ++ SET (interfaceLibFlag -ltirpc) ++ INCLUDE_DIRECTORIES(${TIRPC_INCLUDE_DIRS}) + ELSE (PLAYER_OS_QNX) + SET (interfaceLibFlag) + ENDIF (PLAYER_OS_QNX) +@@ -110,6 +113,10 @@ SET_SOURCE_FILES_PROPERTIES (${playerxdr + IF (PLAYER_OS_QNX) + TARGET_LINK_LIBRARIES (playerinterface rpc) + PLAYERCORE_ADD_INT_LINK_LIB (rpc) ++ELSEIF (PLAYER_OS_LINUX) ++ TARGET_LINK_LIBRARIES (playerinterface ${TIRPC_LIBRARIES}) ++ PLAYERCORE_ADD_INT_LINK_LIB (tirpc) ++ TARGET_INCLUDE_DIRECTORIES (playerinterface PUBLIC ${TIRPC_INCLUDE_DIRS}) + ENDIF (PLAYER_OS_QNX) + IF (NOT HAVE_XDR) + TARGET_LINK_LIBRARIES (playerinterface playerreplace) diff --git a/player.spec b/player.spec index 2877498..d93ccd0 100644 --- a/player.spec +++ b/player.spec @@ -16,6 +16,7 @@ Source3: playerv.desktop Patch0: %{name}-3.1.0-cmake3.patch Patch1: %{name}-3.1.0-cpp11.patch +Patch2: %{name}-3.1.0-tirpc.patch # Sort order: build tools, feature libs, within alphabetically, group related # entries on single line (most dominant lib first or alphabetically) @@ -47,6 +48,7 @@ BuildRequires: libjpeg-devel BuildRequires: libphidget-devel BuildRequires: libpqxx-devel BuildRequires: libstatgrab-devel +BuildRequires: libtirpc-devel BuildRequires: libusb-devel BuildRequires: libXext-devel BuildRequires: libXmu-devel @@ -137,6 +139,7 @@ are experimental. %setup -q -n %{name}-%{releasetag} %patch0 -p1 -b .cmake3 %patch1 -p1 -b .cpp11 +%patch2 -p1 -b .tirpc %build mkdir build; pushd build @@ -224,6 +227,9 @@ desktop-file-install \ %{ruby_vendorarchdir}/*.so %changelog +* Sat Feb 24 2018 Rich Mattes - 3.1.0-6 +- Add patch to build against tirpc + * Fri Feb 09 2018 Fedora Release Engineering - 3.1.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild