From: HyungGi Lee Date: Mon, 28 Dec 2015 23:29:01 +0000 (+0900) Subject: Tizen:Mobile/TV/Wearable remove x11 configurations X-Git-Tag: submit/trunk/20170904.073139~107 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f603843705f2ac22db9c7d26c2fd857649ff805c;p=scm%2Fmeta%2Fobs.git Tizen:Mobile/TV/Wearable remove x11 configurations Change-Id: If3dc2a13af423b24e5187c1750a2b35f978b7a7a --- diff --git a/Tizen:Mobile/_config b/Tizen:Mobile/_config index 6fca35a..c7e3f2e 100644 --- a/Tizen:Mobile/_config +++ b/Tizen:Mobile/_config @@ -129,20 +129,6 @@ Macros: %endif -############################# X11 repositories ################################# - -%if "%_repository" == "atom-x11" || "%_repository" == "x86_64-x11" || "%_repository" == "arm-x11" || "%_repository" == "arm64-x11" -Substitute: pkgconfig(gles20) pkgconfig(egl) pkgconfig(glesv2) pkgconfig(gl) -Substitute: pkgconfig(gles11) pkgconfig(egl) pkgconfig(glesv1_cm) pkgconfig(gl) - -%define _with_x 1 - -Macros: -%_with_x 1 -:Macros - -%endif - ############################# emulator repositories ############################ %if "%_repository" == "emulator32-wayland" || "%_repository" == "emulator64-wayland" diff --git a/Tizen:Mobile/_meta b/Tizen:Mobile/_meta index 2175b19..bf3c07a 100644 --- a/Tizen:Mobile/_meta +++ b/Tizen:Mobile/_meta @@ -12,8 +12,6 @@ http://download.tizen.org/snapshots/tizen/mobile/ - - diff --git a/Tizen:Mobile/emulator-kernel/_meta b/Tizen:Mobile/emulator-kernel/_meta index 143962b..fc834c5 100644 --- a/Tizen:Mobile/emulator-kernel/_meta +++ b/Tizen:Mobile/emulator-kernel/_meta @@ -1 +1,7 @@ - <description/> <build> <disable arch="x86_64" repository="emulator64-wayland"/> </build> </package> +<package name="emulator-kernel" project="Tizen:Mobile"> + <title/> + <description/> + <build> + <disable arch="x86_64" repository="emulator64-wayland"/> + </build> +</package> diff --git a/Tizen:Mobile/mic-bootstrap_aggregate/_aggregate b/Tizen:Mobile/mic-bootstrap_aggregate/_aggregate index 1272192..6582e6e 100644 --- a/Tizen:Mobile/mic-bootstrap_aggregate/_aggregate +++ b/Tizen:Mobile/mic-bootstrap_aggregate/_aggregate @@ -2,10 +2,8 @@ <aggregate project="Tizen:Mobile"> <package>mic-bootstrap</package> <binary>mic-bootstrap-x86-arm</binary> - <repository source="atom-x11" target="arm-x11"/> <repository source="emulator32-wayland" target="arm-wayland"/> <repository source="emulator32-wayland" target="target-TM1"/> - <repository source="x86_64-x11" target="arm64-x11"/> <repository source="emulator64-wayland" target="arm64-wayland"/> </aggregate> </aggregatelist> diff --git a/Tizen:TV/_config b/Tizen:TV/_config index 3c7da31..f3d3584 100644 --- a/Tizen:TV/_config +++ b/Tizen:TV/_config @@ -130,59 +130,8 @@ Macros: %endif -############################# X11 repositories ################################# - -%if "%_repository" == "ia32-x11" || "%_repository" == "x86_64-x11" || "%_repository" == "arm-x11" || "%_repository" == "arm64-x11" || "%_repository" == "x11" - -Substitute: pkgconfig(gles20) pkgconfig(egl) pkgconfig(glesv2) pkgconfig(gl) -Substitute: pkgconfig(gles11) pkgconfig(egl) pkgconfig(glesv1_cm) pkgconfig(gl) - -%define _with_x 1 - -Macros: -%_with_x 1 -:Macros - -%endif - -############################# X+Wayland repositories ########################### - -%if "%_repository" == "ia32-xwayland" || "%_repository" == "x86_64-xwayland" || "%_repository" == "arm-xwayland" || "%_repository" == "arm64-xwayland" || "%_repository" == "xwayland" - -Substitute: pkgconfig(gles20) pkgconfig(egl) pkgconfig(glesv2) pkgconfig(gl) -Substitute: pkgconfig(gles11) pkgconfig(egl) pkgconfig(glesv1_cm) pkgconfig(gl) - -%define _with_wayland 1 -%define _with_x 1 - -Macros: -%_with_wayland 1 -%_with_x 1 -:Macros - -%endif - ############################# emulator repositories ############################ -%if "%_repository" == "emulator32-x11" - -Prefer: mesa-libGLESv2 -Prefer: mesa-libGL -Prefer: mesa-libEGL - -Substitute: pkgconfig(gles20) pkgconfig(egl) pkgconfig(glesv2) -Substitute: pkgconfig(gles11) pkgconfig(egl) pkgconfig(glesv1) pkgconfig(gl) - -%define _with_x 1 -%define _with_emulator 1 - -Macros: -%_with_x 1 -%_with_emulator 1 -:Macros - -%endif - %if "%_repository" == "emulator32-wayland" Substitute: mesa-libGLESv2 coregl diff --git a/Tizen:TV/_meta b/Tizen:TV/_meta index b3a7ff1..3078bb2 100644 --- a/Tizen:TV/_meta +++ b/Tizen:TV/_meta @@ -11,7 +11,6 @@ http://download.tizen.org/snapshots/tizen/tv/ </description> <person userid="marquiz" role="maintainer"/> <person userid="bartosh" role="maintainer"/> - <person userid="jang798" role="maintainer"/> <person userid="joonsub1" role="maintainer"/> <person userid="alone" role="maintainer"/> <person userid="hglee" role="maintainer"/> diff --git a/Tizen:TV/mic-bootstrap_aggregate/_aggregate b/Tizen:TV/mic-bootstrap_aggregate/_aggregate index cdb1ca6..aca3b69 100644 --- a/Tizen:TV/mic-bootstrap_aggregate/_aggregate +++ b/Tizen:TV/mic-bootstrap_aggregate/_aggregate @@ -2,7 +2,6 @@ <aggregate project="Tizen:TV"> <package>mic-bootstrap</package> <binary>mic-bootstrap-x86-arm</binary> - <repository source="emulator32-x11" target="arm-x11"/> <repository source="emulator32-wayland" target="arm-wayland"/> </aggregate> </aggregatelist> diff --git a/Tizen:Wearable/_config b/Tizen:Wearable/_config index 32c0059..075058d 100644 --- a/Tizen:Wearable/_config +++ b/Tizen:Wearable/_config @@ -108,60 +108,8 @@ Macros: %endif -############################# X11 repositories ################################# - -%if "%_repository" == "ia32-x11" || "%_repository" == "x86_64-x11" || "%_repository" == "arm-x11" || "%_repository" == "arm64-x11" || "%_repository" == "x11" - -Substitute: pkgconfig(gles20) pkgconfig(egl) pkgconfig(glesv2) pkgconfig(gl) -Substitute: pkgconfig(gles11) pkgconfig(egl) pkgconfig(glesv1_cm) pkgconfig(gl) - -%define _with_x 1 - -Macros: -%_with_x 1 -:Macros - -%endif - -############################# X+Wayland repositories ########################### - -%if "%_repository" == "ia32-xwayland" || "%_repository" == "x86_64-xwayland" || "%_repository" == "arm-xwayland" || "%_repository" == "arm64-xwayland" || "%_repository" == "xwayland" - -Substitute: pkgconfig(gles20) pkgconfig(egl) pkgconfig(glesv2) pkgconfig(gl) -Substitute: pkgconfig(gles11) pkgconfig(egl) pkgconfig(glesv1_cm) pkgconfig(gl) - -%define _with_wayland 1 -%define _with_x 1 - -Macros: -%_with_wayland 1 -%_with_x 1 -:Macros - -%endif - ############################# emulator repositories ############################ -%if "%_repository" == "emulator32-x11" - -Prefer: mesa-libGLESv2 -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_x 1 -%define _with_emulator 1 - -Macros: -%_with_x 1 -%_with_emulator 1 -:Macros - -%endif - %if "%_repository" == "emulator32-wayland" Prefer: mesa-libGLESv2 diff --git a/Tizen:Wearable/_meta b/Tizen:Wearable/_meta index 5716c34..4d1d7af 100644 --- a/Tizen:Wearable/_meta +++ b/Tizen:Wearable/_meta @@ -11,7 +11,6 @@ http://download.tizen.org/snapshots/tizen/wearable/ </description> <person userid="marquiz" role="maintainer"/> <person userid="bartosh" role="maintainer"/> - <person userid="jang798" role="maintainer"/> <person userid="joonsub1" role="maintainer"/> <person userid="alone" role="maintainer"/> <person userid="hglee" role="maintainer"/> diff --git a/Tizen:Wearable/mic-bootstrap_aggregate/_aggregate b/Tizen:Wearable/mic-bootstrap_aggregate/_aggregate index 9571eb6..46220d5 100644 --- a/Tizen:Wearable/mic-bootstrap_aggregate/_aggregate +++ b/Tizen:Wearable/mic-bootstrap_aggregate/_aggregate @@ -2,7 +2,6 @@ <aggregate project="Tizen:Wearable"> <package>mic-bootstrap</package> <binary>mic-bootstrap-x86-arm</binary> - <repository source="emulator32-x11" target="arm-x11"/> <repository source="emulator32-wayland" target="arm-wayland"/> </aggregate> </aggregatelist> diff --git a/Tizen:Wearable/mic-bootstrap_aggregate/_meta b/Tizen:Wearable/mic-bootstrap_aggregate/_meta index c1cc1ad..0e49ad5 100644 --- a/Tizen:Wearable/mic-bootstrap_aggregate/_meta +++ b/Tizen:Wearable/mic-bootstrap_aggregate/_meta @@ -2,7 +2,6 @@ <title/> <description/> <build> - <enable arch="i586" repository="arm-x11"/> <enable arch="i586" repository="arm-wayland"/> <disable/> </build>