Fix hardcoded lib path, and typedef definition for 64b compatibility

  - Fix harcoded lib path in cmake files
  - Changing lib path var for in pc.in file
  - Use %cmake macro to set default path
  - Fix typedef definition used in uui_types.h. Remove it and include
 #include <sys/types.h>

4 files changed, 10 insertions, 20 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f81ef49..3039c0c 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,7 +47,6 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(BINDIR "${PREFIX}/bin")
 SET(DATADIR "${PREFIX}/share")
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
 SET(INCLUDEDIR "\${prefix}/include")
 
 IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
@@ -87,11 +86,11 @@ ADD_DEFINITIONS("-D_FILE_OFFSET_BITS=64")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--hash-style=both")
 CONFIGURE_FILE(libmedia-service.pc.in libmedia-service.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmedia-service.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmedia-service.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 #ADD_SUBDIRECTORY(test)
 
-LINK_DIRECTORIES(lib)
+LINK_DIRECTORIES(${LIB_INSTALL_DIR})
 
 ADD_LIBRARY(${MEDIASERVICE-HASH-LIB} SHARED ${HASH_SRCS})
 SET_TARGET_PROPERTIES(${MEDIASERVICE-HASH-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
@@ -105,9 +104,9 @@ TARGET_LINK_LIBRARIES(${MEDIACONTENT-PLUGIN-LIB} ${MEDIASERVICE-LIB})
 SET_TARGET_PROPERTIES(${MEDIACONTENT-PLUGIN-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES(${MEDIACONTENT-PLUGIN-LIB} PROPERTIES VERSION ${VERSION})
 
-INSTALL(TARGETS ${MEDIASERVICE-LIB} LIBRARY DESTINATION lib)
-INSTALL(TARGETS ${MEDIASERVICE-HASH-LIB} LIBRARY DESTINATION lib)
-INSTALL(TARGETS ${MEDIACONTENT-PLUGIN-LIB} LIBRARY DESTINATION lib)
+INSTALL(TARGETS ${MEDIASERVICE-LIB} LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(TARGETS ${MEDIASERVICE-HASH-LIB} LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(TARGETS ${MEDIACONTENT-PLUGIN-LIB} LIBRARY DESTINATION ${LIB_INSTALL_DIR})
 
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/media-svc.h DESTINATION include/media-service/)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/media-svc-error.h DESTINATION include/media-service/)
diff --git a/libmedia-service.pc.in b/libmedia-service.pc.in
index 978a9c9..145cc47 100755
--- a/libmedia-service.pc.in
+++ b/libmedia-service.pc.in
@@ -2,7 +2,7 @@
 
 prefix=@PREFIX@
 exec_prefix=@EXEC_PREFIX@
-libdir=@LIBDIR@
+libdir=@LIB_INSTALL_DIR@
 includedir=@INCLUDEDIR@
 
 Name: @PROJECT_NAME@
diff --git a/packaging/libmedia-service.spec b/packaging/libmedia-service.spec
index 8403384..07d682b 100755
--- a/packaging/libmedia-service.spec
+++ b/packaging/libmedia-service.spec
@@ -1,5 +1,5 @@
 Name:       libmedia-service
-Summary:    Media information service library for multimedia applications.
+Summary:    Media information service library for multimedia applications
 Version: 0.2.43
 Release:    3
 Group:      System/Libraries
@@ -23,7 +23,7 @@ BuildRequires:  pkgconfig(drm-client)
 BuildRequires:  pkgconfig(libmedia-utils)
 
 %description
-Media information service library for multimedia applications.
+Media information service library for multimedia applications
 
 %package devel
 Summary:    Media information service library for multimedia applications. (development)
@@ -39,7 +39,7 @@ Media information service library for multimedia applications. (development file
 
 
 %build
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+%cmake . 
 make %{?jobs:-j%jobs}
 
 %install
diff --git a/uuid/uuid_types.h b/uuid/uuid_types.h
index 169a88a..934c72a 100644
--- a/uuid/uuid_types.h
+++ b/uuid/uuid_types.h
@@ -5,22 +5,16 @@
  */
 #if (!defined(_STDINT_H) && !defined(_UUID_STDINT_H))
 #define _UUID_STDINT_H
+#include <sys/types.h>
 
 typedef unsigned char uint8_t;
 typedef signed char int8_t;
 
 #if (4 == 8)
-typedef int		int64_t;
 typedef unsigned int	uint64_t;
 #elif (4 == 8)
-typedef long		int64_t;
 typedef unsigned long	uint64_t;
 #elif (8 == 8)
-#if defined(__GNUC__)
-typedef __signed__ long long 	int64_t;
-#else
-typedef signed long long 	int64_t;
-#endif
 typedef unsigned long long	uint64_t;
 #endif
 
@@ -35,13 +29,10 @@ typedef	unsigned short	uint16_t;
 #endif
 
 #if (4 == 4)
-typedef	int		int32_t;
 typedef	unsigned int	uint32_t;
 #elif (4 == 4)
-typedef	long		int32_t;
 typedef	unsigned long	uint32_t;
 #elif (2 == 4)
-typedef	short		int32_t;
 typedef	unsigned short	uint32_t;
 #else
  ?== error: undefined 32 bit type