diff options
| author | pr.jung <pr.jung@samsung.com> | 2016-11-02 13:40:24 +0900 |
|---|---|---|
| committer | pr.jung <pr.jung@samsung.com> | 2016-11-02 13:40:40 +0900 |
| commit | eadd4beab68f04dc229be9d4bfc1c3b551116197 (patch) | |
| tree | b405813257c2c0eb856b263043e7b0c5f1b21a3b | |
| parent | 8994a1cad12684c4058a08e8d8ea09df5f5c2ec1 (diff) | |
| parent | 2df6010e7e76a14aab752ec486731833acca7232 (diff) | |
| download | libdevice-node-eadd4beab68f04dc229be9d4bfc1c3b551116197.tar.gz libdevice-node-eadd4beab68f04dc229be9d4bfc1c3b551116197.tar.bz2 libdevice-node-eadd4beab68f04dc229be9d4bfc1c3b551116197.zip | |
Merge branch 'tizen' into tizen_3.0submit/tizen_3.0_common/20161110.084657submit/tizen_3.0/20161102.073456accepted/tizen/3.0/wearable/20161103.001929accepted/tizen/3.0/tv/20161103.001915accepted/tizen/3.0/mobile/20161103.001859accepted/tizen/3.0/ivi/20161103.001947accepted/tizen/3.0/common/20161114.081245
Change-Id: Id510e5e68c6a8fa930948a0abf3be77be86c3e47
Signed-off-by: pr.jung <pr.jung@samsung.com>
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | device-node.pc.in | 1 | ||||
| -rw-r--r-- | hw/display.h | 9 | ||||
| -rw-r--r-- | packaging/libdevice-node.spec | 3 |
4 files changed, 15 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f7e3fca..1aafe71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${INC_DIR}) INCLUDE(FindPkgConfig) -pkg_check_modules(rpkgs REQUIRED dlog vconf) +pkg_check_modules(rpkgs REQUIRED dlog vconf glib-2.0) FOREACH(flag ${rpkgs_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") @@ -30,7 +30,7 @@ INCLUDE(devices/CMakeLists.txt) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden") SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -g") -SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -Werror") +SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -Werror -Wl,-zdefs") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") ADD_DEFINITIONS("-DLIBPATH=\"${LIB_INSTALL_DIR}\"") @@ -41,7 +41,7 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION}) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) ADD_LIBRARY(hwcommon SHARED hw/common.c) -TARGET_LINK_LIBRARIES(hwcommon ${rpkgs_LDFLAGS}) +TARGET_LINK_LIBRARIES(hwcommon ${rpkgs_LDFLAGS} "-ldl") SET_TARGET_PROPERTIES(hwcommon PROPERTIES SOVERSION ${VERSION}) INSTALL(TARGETS hwcommon DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) diff --git a/device-node.pc.in b/device-node.pc.in index cab9007..714e266 100644 --- a/device-node.pc.in +++ b/device-node.pc.in @@ -7,5 +7,6 @@ includedir=@INCLUDEDIR@ Name: device node library Description: Library to control OAL apis for system f/w Version: @VERSION@ +Requires.private: glib-2.0 Libs: -L${libdir} -ldevice-node Cflags: -I${includedir} diff --git a/hw/display.h b/hw/display.h index 2dbdf46..34b3d74 100644 --- a/hw/display.h +++ b/hw/display.h @@ -67,6 +67,9 @@ struct display_device { int (*get_brightness)(int *brightness); int (*set_brightness)(int brightness); + /* Control display brightness by sensor */ + int (*get_auto_brightness)(float lmax, float lmin, float light, int *brightness); + /* Control display state */ int (*get_state)(enum display_state *state); int (*set_state)(enum display_state state); @@ -78,6 +81,12 @@ struct display_device { /* Control panel mode mode */ int (*get_panel_mode)(enum display_panel_mode *mode); int (*set_panel_mode)(enum display_panel_mode mode); + + /* Control display frame rate */ + int (*get_max_frame_rate)(int *rate); + int (*get_min_frame_rate)(int *rate); + int (*get_frame_rate)(int *rate); + int (*set_frame_rate)(int rate); }; #endif diff --git a/packaging/libdevice-node.spec b/packaging/libdevice-node.spec index 8834ba8..c4b9273 100644 --- a/packaging/libdevice-node.spec +++ b/packaging/libdevice-node.spec @@ -1,6 +1,6 @@ Name: libdevice-node Summary: Library to control OAL APIs -Version: 0.1.0 +Version: 0.1.1 Release: 1 Group: Application Framework/Libraries License: Apache-2.0 @@ -9,6 +9,7 @@ Source1: %{name}.manifest BuildRequires: cmake BuildRequires: pkgconfig(vconf) BuildRequires: pkgconfig(dlog) +BuildRequires: pkgconfig(glib-2.0) %description development package of library to control OAL APIs |