summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjinhyung.jo <jinhyung.jo@samsung.com>2014-11-24 19:28:19 +0900
committerjinhyung.jo <jinhyung.jo@samsung.com>2015-05-21 10:56:56 +0900
commit241708b6d6fe87b118596f60d5b45fe092f958c2 (patch)
treea4218e8c1fc6a5da97b091eb170a0b8a4420f42b
parentd60759f40b2307133a8d6c2f7732f0c7492060eb (diff)
downloademulator-yagl-241708b6d6fe87b118596f60d5b45fe092f958c2.tar.gz
emulator-yagl-241708b6d6fe87b118596f60d5b45fe092f958c2.tar.bz2
emulator-yagl-241708b6d6fe87b118596f60d5b45fe092f958c2.zip
YaGL: Modified the setup script while booting time
Modified the setup script while booting time to obtain permission. It will be executed when the systemd runs the xorg.service. So, removed the service files in this repo. Change-Id: Idc69d0ae9c69bd4e65f754f997cd4d786f0864f3 Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
-rw-r--r--packaging/emul-opengl-yagl.service11
-rw-r--r--packaging/emulator-yagl.spec14
-rwxr-xr-xpackaging/opengl-es-setup-yagl-env.sh32
-rwxr-xr-xpackaging/yagl.sh33
4 files changed, 35 insertions, 55 deletions
diff --git a/packaging/emul-opengl-yagl.service b/packaging/emul-opengl-yagl.service
deleted file mode 100644
index 1711f08..0000000
--- a/packaging/emul-opengl-yagl.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenGL mode check
-DefaultDependencies=no
-Before=basic.target
-
-[Service]
-Type=oneshot
-ExecStart=/bin/sh -c '/etc/emulator/yagl.sh'
-
-[Install]
-WantedBy=emulator_preinit.target
diff --git a/packaging/emulator-yagl.spec b/packaging/emulator-yagl.spec
index e4d0830..d0bd733 100644
--- a/packaging/emulator-yagl.spec
+++ b/packaging/emulator-yagl.spec
@@ -3,7 +3,7 @@
Name: emulator-yagl
Summary: YaGL - OpenGLES acceleration module for emulator
-Version: 1.2
+Version: 1.3
Release: 1
License: MIT
#URL: http://www.khronos.org
@@ -74,14 +74,8 @@ 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}/usr/lib/systemd/system
-cp packaging/emul-opengl-yagl.service %{buildroot}/usr/lib/systemd/system
-
-mkdir -p %{buildroot}/usr/lib/systemd/system/emulator_preinit.target.wants
-ln -s ../emul-opengl-yagl.service %{buildroot}/usr/lib/systemd/system/emulator_preinit.target.wants/emul-opengl-yagl.service
-
mkdir -p %{buildroot}/etc/emulator
-cp packaging/yagl.sh %{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}
@@ -112,9 +106,7 @@ cp pkgconfig/* %{buildroot}/usr/lib/pkgconfig/
/usr/lib/libGLES*
/usr/lib/yagl/*
/usr/lib/dummy-gl/*
-/usr/lib/systemd/system/emul-opengl-yagl.service
-/usr/lib/systemd/system/emulator_preinit.target.wants/emul-opengl-yagl.service
-%attr(777,root,root)/etc/emulator/yagl.sh
+%attr(777,root,root)/etc/emulator/opengl-es-setup-yagl-env.sh
/usr/share/license/%{name}
%endif
diff --git a/packaging/opengl-es-setup-yagl-env.sh b/packaging/opengl-es-setup-yagl-env.sh
new file mode 100755
index 0000000..6c2be18
--- /dev/null
+++ b/packaging/opengl-es-setup-yagl-env.sh
@@ -0,0 +1,32 @@
+ #!/bin/sh
+
+echo -e "[${_G} Opengl-es acceleration module setting. ${C_}]"
+if grep "yagl=1" /proc/cmdline ; then
+ echo -e "[${_G} Emulator support gles hw acceleration. ${C_}]"
+ echo -e "[${_G} Change permission of /dev/yagl. ${C_}]"
+ chown root:video /dev/dri/card0
+ chown root:video /dev/yagl
+ chown root:video /dev/slp_global_lock
+ chmod 660 /dev/dri/card0
+ chmod 660 /dev/yagl
+ chmod 660 /dev/slp_global_lock
+ chsmack -a "*" /dev/dri/card0
+ chsmack -a "*" /dev/yagl
+ chsmack -a "*" /dev/slp_global_lock
+ echo -e "[${_G} Apply to use hw gles library. ${C_}]"
+ ln -s -f /usr/lib/yagl/libEGL.so.1.0 /usr/lib/libEGL.so
+ ln -s -f /usr/lib/yagl/libEGL.so.1.0 /usr/lib/libEGL.so.1
+ ln -s -f /usr/lib/yagl/libGLESv1_CM.so.1.0 /usr/lib/libGLESv1_CM.so
+ ln -s -f /usr/lib/yagl/libGLESv1_CM.so.1.0 /usr/lib/libGLESv1_CM.so.1
+ ln -s -f /usr/lib/yagl/libGLESv2.so.1.0 /usr/lib/libGLESv2.so
+ ln -s -f /usr/lib/yagl/libGLESv2.so.1.0 /usr/lib/libGLESv2.so.1
+else
+ echo -e "[${_G} Emulator does not support gles hw acceleration. ${C_}]"
+ echo -e "[${_G} Apply to use gles stub library. ${C_}]"
+ ln -s -f /usr/lib/dummy-gl/libEGL_dummy.so /usr/lib/libEGL.so
+ ln -s -f /usr/lib/dummy-gl/libEGL_dummy.so /usr/lib/libEGL.so.1
+ ln -s -f /usr/lib/dummy-gl/libGLESv1_dummy.so /usr/lib/libGLESv1_CM.so
+ ln -s -f /usr/lib/dummy-gl/libGLESv1_dummy.so /usr/lib/libGLESv1_CM.so.1
+ ln -s -f /usr/lib/dummy-gl/libGLESv2_dummy.so /usr/lib/libGLESv2.so
+ ln -s -f /usr/lib/dummy-gl/libGLESv2_dummy.so /usr/lib/libGLESv2.so.1
+fi
diff --git a/packaging/yagl.sh b/packaging/yagl.sh
deleted file mode 100755
index c21083d..0000000
--- a/packaging/yagl.sh
+++ /dev/null
@@ -1,33 +0,0 @@
- #!/bin/sh
-
-echo -e "[${_G} Opengl-es acceleration module setting. ${C_}]"
-if [ -e /dev/yagl ] ; then
- echo -e "[${_G} Emulator support gles hw acceleration. ${C_}]"
- echo -e "[${_G} Change permission of /dev/yagl. ${C_}]"
- chown root:video /dev/dri/card0
- chown root:video /dev/yagl
- chown root:video /dev/slp_global_lock
- chmod 660 /dev/dri/card0
- chmod 660 /dev/yagl
- chmod 660 /dev/slp_global_lock
- chsmack -a "*" /dev/dri/card0
- chsmack -a "*" /dev/yagl
- chsmack -a "*" /dev/slp_global_lock
- echo -e "[${_G} Apply to use hw gles library. ${C_}]"
- ln -s -f /usr/lib/yagl/libEGL.so.1.0 /usr/lib/libEGL.so
- ln -s -f /usr/lib/yagl/libEGL.so.1.0 /usr/lib/libEGL.so.1
- ln -s -f /usr/lib/yagl/libGLESv1_CM.so.1.0 /usr/lib/libGLESv1_CM.so
- ln -s -f /usr/lib/yagl/libGLESv1_CM.so.1.0 /usr/lib/libGLESv1_CM.so.1
- ln -s -f /usr/lib/yagl/libGLESv2.so.1.0 /usr/lib/libGLESv2.so
- ln -s -f /usr/lib/yagl/libGLESv2.so.1.0 /usr/lib/libGLESv2.so.1
- systemctl set-environment ELM_ENGINE=gl
-else
- echo -e "[${_G} Emulator does not support gles hw acceleration. ${C_}]"
- echo -e "[${_G} Apply to use gles dummy library. ${C_}]"
- ln -s -f /usr/lib/dummy-gl/libEGL_dummy.so /usr/lib/libEGL.so
- ln -s -f /usr/lib/dummy-gl/libEGL_dummy.so /usr/lib/libEGL.so.1
- ln -s -f /usr/lib/dummy-gl/libGLESv1_dummy.so /usr/lib/libGLESv1_CM.so
- ln -s -f /usr/lib/dummy-gl/libGLESv1_dummy.so /usr/lib/libGLESv1_CM.so.1
- ln -s -f /usr/lib/dummy-gl/libGLESv2_dummy.so /usr/lib/libGLESv2.so
- ln -s -f /usr/lib/dummy-gl/libGLESv2_dummy.so /usr/lib/libGLESv2.so.1
-fi