From f62404193dac0ca58b20da6498589355f9f8caf3 Mon Sep 17 00:00:00 2001 From: Dongyeon Kim Date: Tue, 16 Jul 2013 13:30:45 +0900 Subject: [PATCH] Change actual driver library path - Driver library path is changed from /usr/lib/driver to /usr/lib/egl --- packaging/coregl.spec | 15 +++++++-------- src/coregl.c | 26 ++++++-------------------- src/wraps/coregl_egl.c | 2 +- src/wraps/coregl_gl.c | 2 +- 4 files changed, 15 insertions(+), 30 deletions(-) mode change 100644 => 100755 packaging/coregl.spec diff --git a/packaging/coregl.spec b/packaging/coregl.spec old mode 100644 new mode 100755 index 6b7b2b5..79bdfc0 --- a/packaging/coregl.spec +++ b/packaging/coregl.spec @@ -36,12 +36,11 @@ make %{?jobs:-j%jobs} %install mkdir -p %{buildroot}/usr/lib -mkdir -p %{buildroot}/usr/lib/driver mkdir -p %{buildroot}/usr/include/EGL mkdir -p %{buildroot}/usr/include/GLES2 -cp %{_builddir}/%{name}-%{version}/libCOREGL.so.3.0 %{buildroot}%{_libdir}/driver/libCOREGL.so.3.0 -cp %{_builddir}/%{name}-%{version}/libEGL.so.1.4 %{buildroot}%{_libdir}/driver/libEGL.so.1.4 -cp %{_builddir}/%{name}-%{version}/libGLESv2.so.2.0 %{buildroot}%{_libdir}/driver/libGLESv2.so.2.0 +cp %{_builddir}/%{name}-%{version}/libCOREGL.so.3.0 %{buildroot}%{_libdir}/libCOREGL.so.3.0 +cp %{_builddir}/%{name}-%{version}/libEGL.so.1.4 %{buildroot}%{_libdir}/libEGL.so.1.4 +cp %{_builddir}/%{name}-%{version}/libGLESv2.so.2.0 %{buildroot}%{_libdir}/libGLESv2.so.2.0 %clean rm -rf %{buildroot} @@ -50,7 +49,7 @@ rm -rf %{buildroot} init_coregl() { - cd /usr/lib/driver + cd /usr/lib rm -f ./libEGL.so rm -f ./libEGL.so.1 @@ -73,6 +72,6 @@ init_coregl %files %defattr(-,root,root,-) -%{_libdir}/driver/libCOREGL.so* -%{_libdir}/driver/libEGL.so* -%{_libdir}/driver/libGLESv2.so* +%{_libdir}/libCOREGL.so* +%{_libdir}/libEGL.so* +%{_libdir}/libGLESv2.so* diff --git a/src/coregl.c b/src/coregl.c index 08ecb9c..9c55031 100755 --- a/src/coregl.c +++ b/src/coregl.c @@ -138,50 +138,36 @@ COREGL_API void coregl_symbol_exported() static int _gl_lib_init(void) { - void *gsl_lib_handle = dlopen("/usr/lib/libgsl.so", RTLD_NOW|RTLD_GLOBAL); - if (!gsl_lib_handle) - { - COREGL_ERR("\E[40;31;1m%s\E[0m\n\n", dlerror()); - COREGL_ERR("\E[40;31;1mInvalid library link! (Check linkage of libCOREGL -> /usr/lib/libgsl.so)\E[0m\n"); - } - - void *gl_adreno_lib_handle = dlopen("/usr/lib/libadreno_utils.so", RTLD_NOW|RTLD_GLOBAL); - if (!gl_adreno_lib_handle) - { - COREGL_ERR("\E[40;31;1m%s\E[0m\n\n", dlerror()); - COREGL_ERR("\E[40;31;1mInvalid library link! (Check linkage of libCOREGL -> /usr/lib/libadreno_utils.so)\E[0m\n"); - } - //------------------------------------------------// // Open EGL Library as EGL is separate - egl_lib_handle = dlopen("/usr/lib/libEGL.so.1.4", RTLD_NOW|RTLD_GLOBAL); + egl_lib_handle = dlopen("/usr/lib/egl/libEGL.so", RTLD_NOW|RTLD_GLOBAL); if (!egl_lib_handle) { COREGL_ERR("\E[40;31;1m%s\E[0m\n\n", dlerror()); - COREGL_ERR("\E[40;31;1mInvalid library link! (Check linkage of libCOREGL -> /usr/lib/libEGL.so.1.4)\E[0m\n"); + COREGL_ERR("\E[40;31;1mInvalid library link! (Check linkage of libCOREGL -> /usr/lib/egl/libEGL.so)\E[0m\n"); return 0; } // test for invalid linking egl if (dlsym(egl_lib_handle, "coregl_symbol_exported")) { - COREGL_ERR("\E[40;31;1mInvalid library link! (Check linkage of libCOREGL -> /usr/lib/libEGL.so.1.4)\E[0m\n"); + COREGL_ERR("\E[40;31;1mInvalid library link! (Check linkage of libCOREGL -> /usr/lib/egl/libEGL.so)\E[0m\n"); return 0; } // use gl_lib handle for GL symbols - gl_lib_handle = dlopen("/usr/lib/libGLESv2.so.2.0", RTLD_NOW|RTLD_GLOBAL); + gl_lib_handle = dlopen("/usr/lib/egl/libGLESv2.so", RTLD_NOW|RTLD_GLOBAL); if (!gl_lib_handle) { COREGL_ERR("\E[40;31;1m%s\E[0m\n\n", dlerror()); - COREGL_ERR("\E[40;31;1mInvalid library link! (Check linkage of libCOREGL -> /usr/lib/libGLESv2.so.2.0)\E[0m\n"); + COREGL_ERR("\E[40;31;1mInvalid library link! (Check linkage of libCOREGL -> /usr/lib/egl/libGLESv2.so)\E[0m\n"); return 0; } // test for invalid linking gl if (dlsym(gl_lib_handle, "coregl_symbol_exported")) { - COREGL_ERR("\E[40;31;1mInvalid library link! (Check linkage of libCOREGL -> /usr/lib/libGLESv2.so.2.0)\E[0m\n"); + COREGL_ERR("\E[40;31;1mInvalid library link! (Check linkage of libCOREGL -> /usr/lib/egl/libGLESv2.so)\E[0m\n"); return 0; } //------------------------------------------------// diff --git a/src/wraps/coregl_egl.c b/src/wraps/coregl_egl.c index 7920da7..cfc8778 100755 --- a/src/wraps/coregl_egl.c +++ b/src/wraps/coregl_egl.c @@ -30,7 +30,7 @@ __attribute__((constructor)) int coregl_glwrap_init() { - lib_handle = dlopen("/usr/lib/driver/libCOREGL.so", RTLD_NOW); + lib_handle = dlopen("libCOREGL.so", RTLD_NOW); if (!lib_handle) { LOGE(" \E[40;31;1m%s\E[0m\n\n", dlerror()); diff --git a/src/wraps/coregl_gl.c b/src/wraps/coregl_gl.c index 461e48c..95a8dee 100755 --- a/src/wraps/coregl_gl.c +++ b/src/wraps/coregl_gl.c @@ -27,7 +27,7 @@ __attribute__((constructor)) int coregl_glwrap_init() { - lib_handle = dlopen("/usr/lib/driver/libCOREGL.so", RTLD_NOW); + lib_handle = dlopen("libCOREGL.so", RTLD_NOW); if (!lib_handle) { LOGE(" \E[40;31;1m%s\E[0m\n\n", dlerror()); -- 2.7.4