diff options
| author | Pawel Wieczorek <p.wieczorek2@samsung.com> | 2016-06-01 16:50:23 +0200 |
|---|---|---|
| committer | Pawel Wieczorek <p.wieczorek2@samsung.com> | 2016-06-09 11:11:18 +0200 |
| commit | 0bf0b65007e885dda26be16edc821ee8d8ccd9bb (patch) | |
| tree | 748b761a49891a5d0ee08470476270112f411a80 /Tizen:Common | |
| parent | 08b152d32d845c69922203bdea5040dd4a65713b (diff) | |
| download | obs-0bf0b65007e885dda26be16edc821ee8d8ccd9bb.tar.gz obs-0bf0b65007e885dda26be16edc821ee8d8ccd9bb.tar.bz2 obs-0bf0b65007e885dda26be16edc821ee8d8ccd9bb.zip | |
Tizen:Common: Group GL substitutions
According to change history provided by VCS, division was necessary due
to different requirements for X11 and Wayland (related patch:
47a95aa2e091d3969a01136f14175e8877662587 and
42f383f0edc5c8e2a6876f99a5c29811118dede8).
Support for X11 was dropped from Tizen in December 2015.
Change-Id: I489cbea3f25655706180daac2203edd7b41a2d29
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
Diffstat (limited to 'Tizen:Common')
| -rw-r--r-- | Tizen:Common/_config | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Tizen:Common/_config b/Tizen:Common/_config index 2e6c7a7..2527aeb 100644 --- a/Tizen:Common/_config +++ b/Tizen:Common/_config @@ -73,7 +73,8 @@ Macros: :Macros Substitute: mesa-devel pkgconfig(glesv2) -#FIXME Substitute: pkgconfig(egl) +Substitute: pkgconfig(gles20) pkgconfig(egl) pkgconfig(glesv2) +Substitute: pkgconfig(gles11) pkgconfig(egl) pkgconfig(glesv1) pkgconfig(gl) ############################# wayland repositories ############################# @@ -85,9 +86,6 @@ Prefer: mesa libgbm Substitute: mesa-libGLESv2 coregl Substitute: mesa-libEGL coregl -Substitute: pkgconfig(gles20) pkgconfig(egl) pkgconfig(glesv2) -Substitute: pkgconfig(gles11) pkgconfig(egl) pkgconfig(glesv1) pkgconfig(gl) - %define _with_wayland 1 %define _with_rdp 1 @@ -102,16 +100,11 @@ Macros: %if "%_repository" == "emulator32-wayland" -Substitute: mesa-devel pkgconfig(glesv2) - Prefer: libgbm Prefer: coregl coregl-devel Prefer: emulator-yagl emulator-yagl-devel Prefer: libwayland-egl libwayland-egl-devel -Substitute: pkgconfig(gles20) pkgconfig(egl) pkgconfig(glesv2) -Substitute: pkgconfig(gles11) pkgconfig(egl) pkgconfig(glesv1) pkgconfig(gl) - %define _with_wayland 1 %define _with_emulator 1 |