Add Camera_Common preset to seperate camera preset for headlesssubmit/tizen/20180702.014800accepted/tizen/unified/20180702.062942

Change-Id: Icf7758fb8f254f56394957b8b21af4d443ee14b7
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

2 files changed, 75 insertions, 16 deletions

diff --git a/packaging/platform-preset-boards-artik530.inc b/packaging/platform-preset-boards-artik530.inc
index ace838a..469a65c 100755
--- a/packaging/platform-preset-boards-artik530.inc
+++ b/packaging/platform-preset-boards-artik530.inc
@@ -12,7 +12,9 @@ Suggests:	%{name}-sub2-Preset_boards-ARTIK530-Audio
 Suggests:	%{name}-sub2-Preset_boards-ARTIK530-Audio_Recording
 Suggests:	%{name}-sub2-Preset_boards-ARTIK530-GPS
 Suggests:	%{name}-sub2-Preset_boards-ARTIK530-Codec
+Suggests:	%{name}-sub2-Preset_boards-ARTIK530-Camera_Common
 Suggests:	%{name}-sub2-Preset_boards-ARTIK530-Camera
+Suggests:	%{name}-sub2-Preset_boards-ARTIK530-Camera_Headless
 Suggests:	%{name}-sub2-Preset_boards-ARTIK530-Display
 Suggests:	%{name}-sub2-Preset_boards-ARTIK530-Display_Headless
 Suggests:	%{name}-sub2-Preset_boards-ARTIK530-Wifi
@@ -162,19 +164,19 @@ Packages of Codec HAL and Feature for ARTIK530.
 If you want to use hardware acceleration, select the required feature.
 %files sub2-Preset_boards-ARTIK530-Codec
 
-### ARTIK530-Camera ###
-%package sub2-Preset_boards-ARTIK530-Camera
-Summary:	ARTIK530_Camera
+
+### ARTIK530-Camera_Common ###
+%package sub2-Preset_boards-ARTIK530-Camera_Common
+Summary:	ARTIK530_Camera_Common
 Requires:	%{name}-sub2-domain_API-Multimedia-Camera
-Requires:	%{name}-sub2-Preset_boards-ARTIK530-Display
 Requires:	mmfw-sysconf-target-artik10
 Requires:	gst-plugins-tizen
 Requires:	camera-hal-v4l2
 
-%description sub2-Preset_boards-ARTIK530-Camera
-Packages of Camera HAL and Feature for ARTIK530.
-%files sub2-Preset_boards-ARTIK530-Camera
-%posttrans sub2-Preset_boards-ARTIK530-Camera
+%description sub2-Preset_boards-ARTIK530-Camera_Common
+Packages of Camera HAL and Feature for ARTIK530(Common).
+%files sub2-Preset_boards-ARTIK530-Camera_Common
+%posttrans sub2-Preset_boards-ARTIK530-Camera_Common
 %tizen_feature tizen.org/feature/camera true
 %tizen_feature tizen.org/feature/camera.back true
 %tizen_feature tizen.org/feature/camera.back.flash false
@@ -183,6 +185,32 @@ Packages of Camera HAL and Feature for ARTIK530.
 %tizen_feature tizen.org/feature/media.video_recording true
 
 
+### ARTIK530-Camera ###
+%package sub2-Preset_boards-ARTIK530-Camera
+Summary:	ARTIK530_Camera
+Requires:	%{name}-sub2-Preset_boards-ARTIK530-Camera_Common
+Requires:	%{name}-sub2-Preset_boards-ARTIK530-Display
+
+Conflicts:	%{name}-sub2-Preset_boards-ARTIK530-Camera_Headless
+
+%description sub2-Preset_boards-ARTIK530-Camera
+Packages of Camera HAL and Feature for ARTIK530.
+%files sub2-Preset_boards-ARTIK530-Camera
+
+
+### ARTIK530-Camera_Headless ###
+%package sub2-Preset_boards-ARTIK530-Camera_Headless
+Summary:	ARTIK530_Camera(Headless)
+Requires:	%{name}-sub2-Preset_boards-ARTIK530-Camera_Common
+Requires:	%{name}-sub2-Preset_boards-ARTIK530-Display_Headless
+
+Conflicts:	%{name}-sub2-Preset_boards-ARTIK530-Camera
+
+%description sub2-Preset_boards-ARTIK530-Camera_Headless
+Packages of Camera HAL and Feature for ARTIK530(Headless).
+%files sub2-Preset_boards-ARTIK530-Camera_Headless
+
+
 ### ARTIK530-Display ###
 %package sub2-Preset_boards-ARTIK530-Display
 Summary:	ARTIK530_Display
diff --git a/packaging/platform-preset-boards-rpi3.inc b/packaging/platform-preset-boards-rpi3.inc
index 5c708d7..fe03771 100755
--- a/packaging/platform-preset-boards-rpi3.inc
+++ b/packaging/platform-preset-boards-rpi3.inc
@@ -12,7 +12,9 @@ Suggests:	%{name}-sub2-Preset_boards-RPI3-Audio
 Suggests:	%{name}-sub2-Preset_boards-RPI3-Audio_Recording
 Suggests:	%{name}-sub2-Preset_boards-RPI3-GPS
 Suggests:	%{name}-sub2-Preset_boards-RPI3-Codec
+Suggests:	%{name}-sub2-Preset_boards-RPI3-Camera_Common
 Suggests:	%{name}-sub2-Preset_boards-RPI3-Camera
+Suggests:	%{name}-sub2-Preset_boards-RPI3-Camera_Headless
 Suggests:	%{name}-sub2-Preset_boards-RPI3-Display
 Suggests:	%{name}-sub2-Preset_boards-RPI3-Display_Headless
 Suggests:	%{name}-sub2-Preset_boards-RPI3-Wifi
@@ -161,19 +163,20 @@ Packages of Codec HAL and Feature for RPI3.
 If you want to use hardware acceleration, select the required feature.
 %files sub2-Preset_boards-RPI3-Codec
 
-### RPI3-Camera ###
-%package sub2-Preset_boards-RPI3-Camera
-Summary:	RPI3_Camera
+
+### RPI3-Camera_Common ###
+%package sub2-Preset_boards-RPI3-Camera_Common
+Summary:	RPI3_Camera(Common)
 Requires:	%{name}-sub2-domain_API-Multimedia-Camera
 Requires:	gst-plugins-good
 Requires:	mmfw-sysconf-target-rpi3
 Requires:	camera-hal-v4l2
 
-%description sub2-Preset_boards-RPI3-Camera
-Packages of Camera HAL and Feature for RPI3.
-Not Implemented.
-%files sub2-Preset_boards-RPI3-Camera
-%posttrans sub2-Preset_boards-RPI3-Camera
+%description sub2-Preset_boards-RPI3-Camera_Common
+Packages of Camera HAL and Feature for RPI3(Common).
+(known issue: The preview and capture could be failed with some web cameras.)
+%files sub2-Preset_boards-RPI3-Camera_Common
+%posttrans sub2-Preset_boards-RPI3-Camera_Common
 %tizen_feature tizen.org/feature/camera true
 %tizen_feature tizen.org/feature/camera.back true
 %tizen_feature tizen.org/feature/camera.back.flash false
@@ -182,6 +185,34 @@ Not Implemented.
 %tizen_feature tizen.org/feature/media.video_recording true
 
 
+### RPI3-Camera ###
+%package sub2-Preset_boards-RPI3-Camera
+Summary:	RPI3_Camera
+Requires:	%{name}-sub2-Preset_boards-RPI3-Camera_Common
+Requires:	%{name}-sub2-Preset_boards-RPI3-Display
+
+Conflicts:	%{name}-sub2-Preset_boards-RPI3-Camera_Headless
+
+%description sub2-Preset_boards-RPI3-Camera
+Packages of Camera HAL and Feature for RPI3.
+(known issue: The preview and capture could be failed with some web cameras.)
+%files sub2-Preset_boards-RPI3-Camera
+
+
+### RPI3-Camera_Headless ###
+%package sub2-Preset_boards-RPI3-Camera_Headless
+Summary:	RPI3_Camera(Headless)
+Requires:	%{name}-sub2-Preset_boards-RPI3-Camera_Common
+Requires:	%{name}-sub2-Preset_boards-RPI3-Display_Headless
+
+Conflicts:	%{name}-sub2-Preset_boards-RPI3-Camera
+
+%description sub2-Preset_boards-RPI3-Camera_Headless
+Packages of Camera HAL and Feature for RPI3(Headless).
+(known issue: camera preview and capture could be failed.)
+%files sub2-Preset_boards-RPI3-Camera_Headless
+
+
 ### RPI3-Display ###
 %package sub2-Preset_boards-RPI3-Display
 Summary:	RPI3_Display