YaGL: Change install directory of real driver.

Coregl package provide libGLES, liEGL wrapper. and Coregl dynamically load real driver from /usr/lib/driver
Remove GL/EGL header files from devel package. : CoreGL provide GL/EGL header file.
Remove build script of X env.

Change-Id: I3015c5ee2828b94cd1525b98db9e7acba4cf5762

6 files changed, 35 insertions, 54 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b21d693..cdf0dce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,6 +38,21 @@ if ((NOT PLATFORM_X11) AND (NOT PLATFORM_GBM) AND (NOT PLATFORM_WAYLAND))
     message(FATAL_ERROR "At least one platform must be supported")
 endif ()
 
+# BUILD ARCH SETTINGS
+set(BUILD_ARCH "$ENV{RPM_ARCH}")
+
+# set pkgconfig file
+if(${BUILD_ARCH} MATCHES "aarch64")
+set(LIBDIR "lib64")
+elseif(${BUILD_ARCH} MATCHES "x86_64")
+set(LIBDIR "lib64")
+else(${BUILD_ARCH} MATCHES "aarch64")
+set(LIBDIR "lib")
+endif(${BUILD_ARCH} MATCHES "aarch64")
+
+configure_file(pkgconfig/wayland-egl.pc.in pkgconfig/wayland-egl.pc @ONLY)
+# end pkgconfig file
+
 #out dir
 
 set(YAGL_OUT_DIR ${YAGL_BINARY_DIR}/out)
diff --git a/EGL/CMakeLists.txt b/EGL/CMakeLists.txt
index 4d40059..4f5d75e 100644
--- a/EGL/CMakeLists.txt
+++ b/EGL/CMakeLists.txt
@@ -108,5 +108,5 @@ target_link_libraries(EGL ${LIBRARIES})
 
 install(
     TARGETS EGL
-    LIBRARY DESTINATION ${INSTALL_LIB_DIR}
+    LIBRARY DESTINATION ${INSTALL_LIB_DIR}/driver
 )
diff --git a/GLESv1_CM/CMakeLists.txt b/GLESv1_CM/CMakeLists.txt
index 4c3bc70..7357630 100644
--- a/GLESv1_CM/CMakeLists.txt
+++ b/GLESv1_CM/CMakeLists.txt
@@ -16,5 +16,5 @@ target_link_libraries(GLESv1_CM "-Wl,-whole-archive" GLES_common "-Wl,-no-whole-
 
 install(
     TARGETS GLESv1_CM
-    LIBRARY DESTINATION ${INSTALL_LIB_DIR}
+    LIBRARY DESTINATION ${INSTALL_LIB_DIR}/driver
 )
diff --git a/GLESv2/CMakeLists.txt b/GLESv2/CMakeLists.txt
index 835b1bd..e8d3496 100644
--- a/GLESv2/CMakeLists.txt
+++ b/GLESv2/CMakeLists.txt
@@ -37,5 +37,5 @@ target_link_libraries(GLESv2 "-Wl,-whole-archive" GLES_common "-Wl,-no-whole-arc
 
 install(
     TARGETS GLESv2
-    LIBRARY DESTINATION ${INSTALL_LIB_DIR}
+    LIBRARY DESTINATION ${INSTALL_LIB_DIR}/driver
 )
diff --git a/packaging/emulator-yagl.spec b/packaging/emulator-yagl.spec
index 20d0ab8..6d71f3e 100644
--- a/packaging/emulator-yagl.spec
+++ b/packaging/emulator-yagl.spec
@@ -7,7 +7,6 @@ Version:    1.6
 Release:    1
 License:    MIT and LGPL-3.0
 Group:      SDK/Libraries
-#URL:        http://www.khronos.org
 Source0:    %{name}-%{version}.tar.gz
 Source1001:     emulator-yagl.manifest
 BuildRequires:  cmake
@@ -15,20 +14,10 @@ BuildRequires:  flex
 BuildRequires:  bison
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(libtbm)
-%if %{with wayland}
 BuildRequires:  pkgconfig(gbm)
 BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-server)
-%else
-BuildRequires:  pkgconfig(xfixes)
-BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(x11-xcb)
-BuildRequires:  pkgconfig(xshmfence)
-BuildRequires:  pkgconfig(xcb)
-BuildRequires:  pkgconfig(xext)
-BuildRequires:  pkgconfig(dri2proto)
-%endif
 Provides:   opengl-es-drv
 
 %if %{with emulator}
@@ -45,7 +34,6 @@ This package contains shared libraries libEGL, libGLES_CM, libGLESv2.
 Summary:    YaGL - OpenGLES acceleration module for emulator (devel)
 Provides:   opengl-es-drv-devel
 Requires:   %{name} = %{version}-%{release}
-Requires:   pkgconfig(x11)
 
 %description devel
 YaGL - OpenGLES acceleration module for emulator (devel)
@@ -56,47 +44,17 @@ This package contains header files for EGL, GLESv1_CM, GLESv2, GLESv3, KHR.
 
 %build
 cp %{SOURCE1001} .
-%if %{with wayland}
 cmake -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr -DPLATFORM_X11=0 -DPLATFORM_GBM=1 -DPLATFORM_WAYLAND=1
-%else
-cmake -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr -DINSTALL_LIB_DIR=lib/yagl -DDUMMY_LIBS=1
-%endif
 make
 
 %install
 make install
-%if %{with wayland}
-ln -s libEGL.so.1.0 %{buildroot}/usr/lib/libEGL.so.1.0.0
-ln -s libGLESv2.so.2.0 %{buildroot}/usr/lib/libGLESv2.so.2.0.0
-ln -s libGLESv2.so.2.0.0 %{buildroot}/usr/lib/libGL.so.1.2.0
-%else
-ln -s libGLESv2.so.2.0 %{buildroot}/usr/lib/yagl/libGLESv2.so.1.0
-ln -s libGLESv2.so.1.0 %{buildroot}/usr/lib/yagl/libGLESv2.so.1
-
-ln -s yagl/libEGL.so.1.0 %{buildroot}%{_libdir}/libEGL.so.1
-ln -s libEGL.so.1 %{buildroot}%{_libdir}/libEGL.so
-ln -s yagl/libGLESv1_CM.so.1.0 %{buildroot}%{_libdir}/libGLESv1_CM.so.1
-ln -s libGLESv1_CM.so.1 %{buildroot}%{_libdir}/libGLESv1_CM.so
-ln -s yagl/libGLESv2.so.1.0 %{buildroot}%{_libdir}/libGLESv2.so.1
-ln -s libGLESv2.so.1 %{buildroot}%{_libdir}/libGLESv2.so
-
-mkdir -p %{buildroot}/etc/emulator
-cp packaging/opengl-es-setup-yagl-env.sh %{buildroot}/etc/emulator
 
 mkdir -p %{buildroot}/usr/share/license
 cp COPYING %{buildroot}/usr/share/license/%{name}
-%endif
-
-mkdir -p %{buildroot}/usr/include
-cp -r include/EGL %{buildroot}/usr/include/
-cp -r include/GL %{buildroot}/usr/include/
-cp -r include/GLES %{buildroot}/usr/include/
-cp -r include/GLES2 %{buildroot}/usr/include/
-cp -r include/GLES3 %{buildroot}/usr/include/
-cp -r include/KHR %{buildroot}/usr/include/
 
 mkdir -p %{buildroot}/usr/lib/pkgconfig
-cp pkgconfig/* %{buildroot}/usr/lib/pkgconfig/
+cp pkgconfig/wayland-egl.pc %{buildroot}/usr/lib/pkgconfig/
 
 %post -p /sbin/ldconfig
 
@@ -106,23 +64,20 @@ cp pkgconfig/* %{buildroot}/usr/lib/pkgconfig/
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
 %if %{with wayland}
-/usr/lib/*.so*
+/usr/lib/libgbm*
+/usr/lib/libwayland-egl*
+/usr/lib/driver/libEGL*
+/usr/lib/driver/libGL*
 %else
 /usr/lib/libEGL*
 /usr/lib/libGLES*
 /usr/lib/yagl/*
 /usr/lib/dummy-gl/*
 %attr(777,root,root)/etc/emulator/opengl-es-setup-yagl-env.sh
-/usr/share/license/%{name}
 %endif
+/usr/share/license/%{name}
 
 %files devel
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-/usr/include/EGL
-/usr/include/GL
-/usr/include/GLES
-/usr/include/GLES2
-/usr/include/GLES3
-/usr/include/KHR
 /usr/lib/pkgconfig
diff --git a/pkgconfig/wayland-egl.pc.in b/pkgconfig/wayland-egl.pc.in
new file mode 100644
index 0000000..2bb4f87
--- /dev/null
+++ b/pkgconfig/wayland-egl.pc.in
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/@LIBDIR@
+includedir=${prefix}/include
+
+Name: wayland-egl
+Description: Wayland EGL Protocol for TIZEN (from Mesa)
+Version: 10.2.0
+Requires: wayland-client
+Libs: -L${libdir} -lwayland-egl
+Cflags: -I${includedir}