summaryrefslogtreecommitdiff
path: root/Tizen:IVI
diff options
context:
space:
mode:
authorJoonsub Lee <joon-sub.lee@samsung.com>2016-05-24 11:28:41 +0900
committerJoonsub Lee <joon-sub.lee@samsung.com>2016-05-24 11:56:40 +0900
commit0022c1e7313123643c06dc8636251b3cdd3646e1 (patch)
tree63a8e94cbcbf79b0e47d50e5dca097c8d0c7c162 /Tizen:IVI
parent86729fcafaca84aaf81e9973cd3b142f9707873a (diff)
downloadobs-0022c1e7313123643c06dc8636251b3cdd3646e1.tar.gz
obs-0022c1e7313123643c06dc8636251b3cdd3646e1.tar.bz2
obs-0022c1e7313123643c06dc8636251b3cdd3646e1.zip
Tizen:IVI: Enable x86_64 building
Change-Id: I850177ab4e0c9b07272f26b8c301e0d6c12acbe8 Signed-off-by: Joonsub Lee <joon-sub.lee@samsung.com>
Diffstat (limited to 'Tizen:IVI')
-rw-r--r--Tizen:IVI/_config30
-rw-r--r--Tizen:IVI/_meta7
2 files changed, 16 insertions, 21 deletions
diff --git a/Tizen:IVI/_config b/Tizen:IVI/_config
index 376a7d8..b2bde91 100644
--- a/Tizen:IVI/_config
+++ b/Tizen:IVI/_config
@@ -86,18 +86,13 @@ Macros:
%_with_mesa 1
:Macros
-%ifarch %arm armv7l aarch64
Substitute: mesa-devel pkgconfig(glesv2)
-#FIXME Substitute: pkgconfig(egl)
-%endif
+Substitute: pkgconfig(gles20) pkgconfig(egl) pkgconfig(glesv2)
+Substitute: pkgconfig(gles11) pkgconfig(egl) pkgconfig(glesv1) pkgconfig(gl)
########## coregl ##########
-%ifarch %arm aarch64
+
Prefer: coregl coregl-devel
-Prefer: libwayland-egl libwayland-egl-devel
-Substitute: mesa-libGLESv2 coregl
-Substitute: mesa-libEGL coregl
-%endif
###################### Activate KDBUS ######################
# This configuration flag enables the support of KDBUS
@@ -114,10 +109,11 @@ Substitute: mesa-libEGL coregl
############################# wayland repositories #############################
-%if "%_repository" == "arm"
+%if "%_repository" == "arm" || "%_repository" == "x86_64"
-Substitute: pkgconfig(gles20) pkgconfig(egl) pkgconfig(glesv2)
-Substitute: pkgconfig(gles11) pkgconfig(egl) pkgconfig(glesv1) pkgconfig(gl)
+Prefer: libwayland-egl libwayland-egl-devel
+Substitute: mesa-libGLESv2 coregl
+Substitute: mesa-libEGL coregl
%define _with_wayland 1
%define _with_rdp 1
@@ -133,13 +129,7 @@ Macros:
%if "%_repository" == "emulator"
-Substitute: mesa-devel pkgconfig(glesv2)
-
-Substitute: pkgconfig(gles20) pkgconfig(egl) pkgconfig(glesv2)
-Substitute: pkgconfig(gles11) pkgconfig(egl) pkgconfig(glesv1) pkgconfig(gl)
-
Prefer: libgbm
-Prefer: coregl coregl-devel
Prefer: emulator-yagl emulator-yagl-devel
Prefer: libwayland-egl libwayland-egl-devel
@@ -316,7 +306,5 @@ Substitute: glibc-devel-32bit
%endif
########## compilation flags ##########
-Optflags: armv7l -O2 -g2 -feliminate-unused-debug-types -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=32 -Wformat -Wformat-security -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__
-Optflags: aarch64 -O2 -g2 -feliminate-unused-debug-types -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector -Wformat -Wformat-security -fmessage-length=0 -march=armv8-a+fp+simd+crc+crypto -mtune=cortex-a57.cortex-a53
-Optflags: i686 -O2 -g2 -feliminate-unused-debug-types -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=32 -Wformat -Wformat-security -fmessage-length=0 -m32 -march=i686 -mtune=i686 -msse4.2 -mfpmath=sse -fasynchronous-unwind-tables -fno-omit-frame-pointer
-Optflags: x86_64 -O2 -g2 -feliminate-unused-debug-types -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=32 -Wformat -Wformat-security -fmessage-length=0 -m64 -march=corei7 -msse4.2 -mtune=corei7-avx -mfpmath=sse -fasynchronous-unwind-tables -fno-omit-frame-pointer -fipa-cp-clone
+# derived from Tizen:Base
+#######################################
diff --git a/Tizen:IVI/_meta b/Tizen:IVI/_meta
index ba58ac3..64f4c07 100644
--- a/Tizen:IVI/_meta
+++ b/Tizen:IVI/_meta
@@ -10,9 +10,16 @@
<build>
<disable arch="i586" repository="arm"/>
</build>
+ <publish>
+ <disable arch="x86_64" repository="x86_64"/>
+ </publish>
<debuginfo>
<enable/>
</debuginfo>
+ <repository name="x86_64">
+ <path project="Tizen:Base" repository="x86_64"/>
+ <arch>x86_64</arch>
+ </repository>
<repository name="emulator">
<path project="Tizen:Base" repository="emulator32"/>
<arch>i586</arch>