tizen-unified_20200106.1

diff --git a/unified/emulator_build.conf b/unified/emulator_build.conf
index 4292f6a1a81ba72bdd288648ce846f30139c10df..232810395145359e52328f95c1efe8556e32c4c5 100644 (file)
--- a/unified/emulator_build.conf
+++ b/unified/emulator_build.conf
@@ -44,16 +44,17 @@ Prefer: mono-data-sqlite
 #     But when building 64bit target, they could make 'have choice' error with original libs in 64bit repository.
 #     e.g., libstdc++ and libstdc++-64bit provides same libs. It's ambiguous to choose appropriate one.
 #     Owner : Jiyoung Yun (jy910.yun@samsung.com)
-Prefer: libgcc libstdc++ libunwind libuuid zlib libopenssl
+#     libopenssl11 : Dongsun Lee (ds73.lee@samsung.com)
+Prefer: libgcc libstdc++ libunwind libuuid zlib libopenssl libopenssl11
 
 ############################# base definition ###############################
 
 # %release_name and %tizen_full_version are used in platform/upstream/tizen-release
 
 Macros:
-%release_name Tizen5/Unified
+%release_name Tizen6/Unified
 
-%tizen_version_major 5
+%tizen_version_major 6
 %tizen_version_minor 0
 %tizen_version_patch 0
 
@@ -220,7 +221,7 @@ Substitute: glibc-devel-32bit
 
 Optflags: armv7l %{__global_cflags} --param=ssp-buffer-size=4 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -mthumb -Wp,-D__SOFTFP__ -Wl,-O1 -Wl,--hash-style=gnu -Wa,-mimplicit-it=thumb
 Optflags: aarch64 %{__global_cflags} -feliminate-unused-debug-types -Wformat -march=armv8-a+fp+simd+crc+crypto -mtune=cortex-a57.cortex-a53
-Optflags: i686 %{__global_cflags} -feliminate-unused-debug-types --param=ssp-buffer-size=4 -fdiagnostics-color=never -m32 -march=i686 -mtune=i686 -msse4.2 -mfpmath=sse -fasynchronous-unwind-tables -fno-omit-frame-pointer
+Optflags: i686 %{__global_cflags} -feliminate-unused-debug-types --param=ssp-buffer-size=4 -fdiagnostics-color=never -m32 -march=i686 -mtune=i686 -msse4.2 -mfpmath=sse -fasynchronous-unwind-tables -fno-omit-frame-pointer -mstackrealign
 Optflags: x86_64 %{__global_cflags} -feliminate-unused-debug-types --param=ssp-buffer-size=4 -fdiagnostics-color=never -m64 -march=nehalem -msse4.2 -mfpmath=sse -fasynchronous-unwind-tables -fno-omit-frame-pointer
 ### from Tizen:Unified
 %define _repository emulator
@@ -258,9 +259,9 @@ Macros:
 # %release_name and %tizen_full_version are used in platform/upstream/tizen-release
 
 Macros:
-%release_name Tizen5/Unified
+%release_name Tizen6/Unified
 
-%tizen_version_major 5
+%tizen_version_major 6
 %tizen_version_minor 0
 %tizen_version_patch 0
 
@@ -290,6 +291,7 @@ Substitute: pkgconfig(gles11)  pkgconfig(egl) pkgconfig(glesv1) pkgconfig(gl)
 
 Prefer: coregl coregl-devel
 Prefer: libwayland-egl libwayland-egl-devel
+Prefer: vulkan-loader vulkan-loader-devel
 #libelementary.so (upstream, tizen-only ) so add below Prefer. Requested by EFL team. 
 Prefer: elementary
 

diff --git a/unified/standard_build.conf b/unified/standard_build.conf
index 85ebf8cf8dae7b0df6fa31df0eb5fb5ceae43b04..1d0febaa207697910d5aa0cb96cff50a92a445bb 100644 (file)
--- a/unified/standard_build.conf
+++ b/unified/standard_build.conf
@@ -44,16 +44,17 @@ Prefer: mono-data-sqlite
 #     But when building 64bit target, they could make 'have choice' error with original libs in 64bit repository.
 #     e.g., libstdc++ and libstdc++-64bit provides same libs. It's ambiguous to choose appropriate one.
 #     Owner : Jiyoung Yun (jy910.yun@samsung.com)
-Prefer: libgcc libstdc++ libunwind libuuid zlib libopenssl
+#     libopenssl11 : Dongsun Lee (ds73.lee@samsung.com)
+Prefer: libgcc libstdc++ libunwind libuuid zlib libopenssl libopenssl11
 
 ############################# base definition ###############################
 
 # %release_name and %tizen_full_version are used in platform/upstream/tizen-release
 
 Macros:
-%release_name Tizen5/Unified
+%release_name Tizen6/Unified
 
-%tizen_version_major 5
+%tizen_version_major 6
 %tizen_version_minor 0
 %tizen_version_patch 0
 
@@ -220,7 +221,7 @@ Substitute: glibc-devel-32bit
 
 Optflags: armv7l %{__global_cflags} --param=ssp-buffer-size=4 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -mthumb -Wp,-D__SOFTFP__ -Wl,-O1 -Wl,--hash-style=gnu -Wa,-mimplicit-it=thumb
 Optflags: aarch64 %{__global_cflags} -feliminate-unused-debug-types -Wformat -march=armv8-a+fp+simd+crc+crypto -mtune=cortex-a57.cortex-a53
-Optflags: i686 %{__global_cflags} -feliminate-unused-debug-types --param=ssp-buffer-size=4 -fdiagnostics-color=never -m32 -march=i686 -mtune=i686 -msse4.2 -mfpmath=sse -fasynchronous-unwind-tables -fno-omit-frame-pointer
+Optflags: i686 %{__global_cflags} -feliminate-unused-debug-types --param=ssp-buffer-size=4 -fdiagnostics-color=never -m32 -march=i686 -mtune=i686 -msse4.2 -mfpmath=sse -fasynchronous-unwind-tables -fno-omit-frame-pointer -mstackrealign
 Optflags: x86_64 %{__global_cflags} -feliminate-unused-debug-types --param=ssp-buffer-size=4 -fdiagnostics-color=never -m64 -march=nehalem -msse4.2 -mfpmath=sse -fasynchronous-unwind-tables -fno-omit-frame-pointer
 ### from Tizen:Unified
 %define _repository standard
@@ -258,9 +259,9 @@ Macros:
 # %release_name and %tizen_full_version are used in platform/upstream/tizen-release
 
 Macros:
-%release_name Tizen5/Unified
+%release_name Tizen6/Unified
 
-%tizen_version_major 5
+%tizen_version_major 6
 %tizen_version_minor 0
 %tizen_version_patch 0
 
@@ -290,6 +291,7 @@ Substitute: pkgconfig(gles11)  pkgconfig(egl) pkgconfig(glesv1) pkgconfig(gl)
 
 Prefer: coregl coregl-devel
 Prefer: libwayland-egl libwayland-egl-devel
+Prefer: vulkan-loader vulkan-loader-devel
 #libelementary.so (upstream, tizen-only ) so add below Prefer. Requested by EFL team. 
 Prefer: elementary