From 918a92e61a9778bbd1a151e1c4efe45eaaa0ef29 Mon Sep 17 00:00:00 2001 From: Joonsub Lee Date: Fri, 6 Mar 2015 09:53:20 +0900 Subject: [PATCH] Tizen:Mobile and Tizen:TV: Enable wayland repositories Reference Tizen:Common's config, meta, aggregate settings Change-Id: I46dc092afb65cdbd9b19ae0aa7235e0199f855a7 --- Tizen:Mobile/_config | 40 +++++++++++++++++++++++++ Tizen:Mobile/_meta | 25 ++++++++++++++-- Tizen:Mobile/glibc_aggregate/_aggregate | 1 + Tizen:Mobile/glibc_aggregate/_meta | 1 + Tizen:Mobile/mic-bootstrap_aggregate/_aggregate | 2 ++ Tizen:Mobile/mic-bootstrap_aggregate/_meta | 2 ++ Tizen:Mobile/qemu_aggregate/_aggregate | 4 +++ Tizen:Mobile/qemu_aggregate/_meta | 2 ++ Tizen:TV/_config | 23 ++++++++++++++ Tizen:TV/_meta | 32 ++++++++++++++++++-- Tizen:TV/glibc_aggregate/_aggregate | 1 + Tizen:TV/glibc_aggregate/_meta | 1 + Tizen:TV/mic-bootstrap_aggregate/_aggregate | 6 ++-- Tizen:TV/mic-bootstrap_aggregate/_meta | 4 ++- Tizen:TV/qemu_aggregate/_aggregate | 4 +++ Tizen:TV/qemu_aggregate/_meta | 2 ++ 16 files changed, 139 insertions(+), 11 deletions(-) diff --git a/Tizen:Mobile/_config b/Tizen:Mobile/_config index f47e26a..cba24ef 100644 --- a/Tizen:Mobile/_config +++ b/Tizen:Mobile/_config @@ -86,6 +86,23 @@ Macros: #FIXME Substitute: pkgconfig(egl) %endif +############################# wayland repositories ############################# + +%if "%_repository" == "atom-wayland" || "%_repository" == "x86_64-wayland" || "%_repository" == "arm-wayland" || "%_repository" == "arm64-wayland" + +Substitute: pkgconfig(gles20) pkgconfig(egl) pkgconfig(glesv2) +Substitute: pkgconfig(gles11) pkgconfig(egl) pkgconfig(glesv1) pkgconfig(gl) + +%define _with_wayland 1 +%define _with_rdp 1 + +Macros: +%_with_wayland 1 +%_with_rdp 1 +:Macros + +%endif + ############################# X11 repositories ################################# %if "%_repository" == "atom-x11" || "%_repository" == "x86_64-x11" || "%_repository" == "arm-x11" || "%_repository" == "arm64-x11" @@ -100,6 +117,29 @@ Macros: %endif +############################# emulator repositories ############################ + +%if "%_repository" == "emulator32-wayland" + +Prefer: mesa-libGLESv2 +Prefer: libwayland-egl +Prefer: libgbm +Prefer: mesa-libGL +Prefer: mesa-libEGL +Prefer: emulator-yagl + +Substitute: pkgconfig(gles20) pkgconfig(egl) pkgconfig(glesv2) +Substitute: pkgconfig(gles11) pkgconfig(egl) pkgconfig(glesv1) pkgconfig(gl) + +%define _with_wayland 1 +%define _with_emulator 1 + +Macros: +%_with_wayland 1 +%_with_emulator 1 +:Macros + +%endif ############################# misc config flags ################################ diff --git a/Tizen:Mobile/_meta b/Tizen:Mobile/_meta index 5523027..c61b49a 100644 --- a/Tizen:Mobile/_meta +++ b/Tizen:Mobile/_meta @@ -5,10 +5,7 @@ - - - @@ -17,6 +14,11 @@ + + + + + @@ -38,4 +40,21 @@ i586 x86_64 + + armv7l + i586 + x86_64 + + + aarch64 + i586 + x86_64 + + + i586 + + + i586 + x86_64 + diff --git a/Tizen:Mobile/glibc_aggregate/_aggregate b/Tizen:Mobile/glibc_aggregate/_aggregate index d027c03..9c04333 100644 --- a/Tizen:Mobile/glibc_aggregate/_aggregate +++ b/Tizen:Mobile/glibc_aggregate/_aggregate @@ -4,5 +4,6 @@ glibc-32bit glibc-devel-32bit + diff --git a/Tizen:Mobile/glibc_aggregate/_meta b/Tizen:Mobile/glibc_aggregate/_meta index 2b8e438..997876f 100644 --- a/Tizen:Mobile/glibc_aggregate/_meta +++ b/Tizen:Mobile/glibc_aggregate/_meta @@ -4,5 +4,6 @@ + diff --git a/Tizen:Mobile/mic-bootstrap_aggregate/_aggregate b/Tizen:Mobile/mic-bootstrap_aggregate/_aggregate index 0c6fad4..14007f1 100644 --- a/Tizen:Mobile/mic-bootstrap_aggregate/_aggregate +++ b/Tizen:Mobile/mic-bootstrap_aggregate/_aggregate @@ -3,6 +3,8 @@ mic-bootstrap mic-bootstrap-x86-arm + + diff --git a/Tizen:Mobile/mic-bootstrap_aggregate/_meta b/Tizen:Mobile/mic-bootstrap_aggregate/_meta index 4a932b0..5713021 100644 --- a/Tizen:Mobile/mic-bootstrap_aggregate/_meta +++ b/Tizen:Mobile/mic-bootstrap_aggregate/_meta @@ -4,6 +4,8 @@ + + diff --git a/Tizen:Mobile/qemu_aggregate/_aggregate b/Tizen:Mobile/qemu_aggregate/_aggregate index 51b5cdc..b2d489a 100644 --- a/Tizen:Mobile/qemu_aggregate/_aggregate +++ b/Tizen:Mobile/qemu_aggregate/_aggregate @@ -3,18 +3,22 @@ qemu qemu-linux-user-cross-arm + + qemu-accel-armv7l qemu-accel-armv7l qemu-accel-armv7l-cross-arm + qemu-accel-aarch64 qemu-accel-aarch64 qemu-accel-aarch64-cross-aarch64 + diff --git a/Tizen:Mobile/qemu_aggregate/_meta b/Tizen:Mobile/qemu_aggregate/_meta index 86217e2..73f8464 100644 --- a/Tizen:Mobile/qemu_aggregate/_meta +++ b/Tizen:Mobile/qemu_aggregate/_meta @@ -4,6 +4,8 @@ + + diff --git a/Tizen:TV/_config b/Tizen:TV/_config index 2434cbe..e6d912c 100644 --- a/Tizen:TV/_config +++ b/Tizen:TV/_config @@ -157,6 +157,28 @@ Macros: %endif +%if "%_repository" == "emulator32-wayland" + +Prefer: mesa-libGLESv2 +Prefer: libwayland-egl +Prefer: libgbm +Prefer: mesa-libGL +Prefer: mesa-libEGL +Prefer: emulator-yagl + +Substitute: pkgconfig(gles20) pkgconfig(egl) pkgconfig(glesv2) +Substitute: pkgconfig(gles11) pkgconfig(egl) pkgconfig(glesv1) pkgconfig(gl) + +%define _with_wayland 1 +%define _with_emulator 1 + +Macros: +%_with_wayland 1 +%_with_emulator 1 +:Macros + +%endif + ############################# misc config flags ################################ # This build macro controls the libdlog output. If enabled, @@ -334,6 +356,7 @@ Substitute: glibc-devel-32bit #%__global_cflags -O2 -g2 -feliminate-unused-debug-types -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=32 -Wformat -Wformat-security 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 +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 #generic arm platform #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=vfpv3 -mfloat-abi=softfp -Wp,-D__SOFTFP__ diff --git a/Tizen:TV/_meta b/Tizen:TV/_meta index fd06c04..9a9f394 100644 --- a/Tizen:TV/_meta +++ b/Tizen:TV/_meta @@ -7,11 +7,16 @@ - - + + + + + + + @@ -20,20 +25,41 @@ x86_64 i586 + + + x86_64 + i586 + i586 + + + i586 + + + i586 + aarch64 i586 x86_64 + + + aarch64 + i586 + x86_64 + armv7l i586 x86_64 - + + + armv7l i586 + x86_64 diff --git a/Tizen:TV/glibc_aggregate/_aggregate b/Tizen:TV/glibc_aggregate/_aggregate index 22da034..fe7475a 100644 --- a/Tizen:TV/glibc_aggregate/_aggregate +++ b/Tizen:TV/glibc_aggregate/_aggregate @@ -4,5 +4,6 @@ glibc-32bit glibc-devel-32bit + diff --git a/Tizen:TV/glibc_aggregate/_meta b/Tizen:TV/glibc_aggregate/_meta index 92be98e..2efa79c 100644 --- a/Tizen:TV/glibc_aggregate/_meta +++ b/Tizen:TV/glibc_aggregate/_meta @@ -4,5 +4,6 @@ + diff --git a/Tizen:TV/mic-bootstrap_aggregate/_aggregate b/Tizen:TV/mic-bootstrap_aggregate/_aggregate index 9d97baf..687176e 100644 --- a/Tizen:TV/mic-bootstrap_aggregate/_aggregate +++ b/Tizen:TV/mic-bootstrap_aggregate/_aggregate @@ -3,10 +3,8 @@ mic-bootstrap mic-bootstrap-x86-arm - - - mic-bootstrap - mic-bootstrap-x86-arm + + diff --git a/Tizen:TV/mic-bootstrap_aggregate/_meta b/Tizen:TV/mic-bootstrap_aggregate/_meta index ec4dd49..29dcd1b 100644 --- a/Tizen:TV/mic-bootstrap_aggregate/_meta +++ b/Tizen:TV/mic-bootstrap_aggregate/_meta @@ -2,8 +2,10 @@ <description/> <build> + <disable/> <enable arch="i586" repository="arm-x11"/> + <enable arch="i586" repository="arm-wayland"/> <enable arch="x86_64" repository="arm64-x11"/> - <disable/> + <enable arch="x86_64" repository="arm64-wayland"/> </build> </package> diff --git a/Tizen:TV/qemu_aggregate/_aggregate b/Tizen:TV/qemu_aggregate/_aggregate index 49d45cb..dbd31a3 100644 --- a/Tizen:TV/qemu_aggregate/_aggregate +++ b/Tizen:TV/qemu_aggregate/_aggregate @@ -3,18 +3,22 @@ <package>qemu</package> <binary>qemu-linux-user-cross-arm</binary> <repository source="ia32-x11" target="arm-x11"/> + <repository source="ia32-wayland" target="arm-wayland"/> <repository source="x86_64-x11" target="arm64-x11"/> + <repository source="x86_64-wayland" target="arm64-wayland"/> </aggregate> <aggregate project="Tizen:TV" > <package>qemu-accel-armv7l</package> <binary>qemu-accel-armv7l</binary> <binary>qemu-accel-armv7l-cross-arm</binary> <repository source="ia32-x11" target="arm-x11"/> + <repository source="ia32-wayland" target="arm-wayland"/> </aggregate> <aggregate project="Tizen:TV" > <package>qemu-accel-aarch64</package> <binary>qemu-accel-aarch64</binary> <binary>qemu-accel-aarch64-cross-aarch64</binary> <repository source="x86_64-x11" target="arm64-x11"/> + <repository source="x86_64-wayland" target="arm64-wayland"/> </aggregate> </aggregatelist> diff --git a/Tizen:TV/qemu_aggregate/_meta b/Tizen:TV/qemu_aggregate/_meta index d9a6b85..daee14c 100644 --- a/Tizen:TV/qemu_aggregate/_meta +++ b/Tizen:TV/qemu_aggregate/_meta @@ -4,6 +4,8 @@ <build> <disable/> <enable arch="x86_64" repository="arm64-x11"/> + <enable arch="x86_64" repository="arm64-wayland"/> <enable arch="i586" repository="arm-x11"/> + <enable arch="i586" repository="arm-wayland"/> </build> </package> -- 2.7.4