[master] modify DDK path and library numbering

[Issue] For uploading CoreGL Packagne
[there] Makefile, specfile, coregl.c
[add] nothing

Change-Id: I0010b2e5cf5b7fa60a7c4b68ca83ba852e75c919

diff --git a/Makefile b/Makefile
index a168876..51bb79a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,15 +30,21 @@ SOURCES = \
 
 BIN = libCOREGL.so
 
-MAJOR = 3
-MINOR = 0
+COREGL_MAJOR = 3
+COREGL_MINOR = 0
+
+EGL_MAJOR = 1
+EGL_MINOR = 4
+
+GLESv2_MAJOR = 2
+GLESv2_MINOR = 0
 
 WRAP_EGL = libEGL.so
 WRAP_GLES2 = libGLESv2.so
 
-OUTPUT_BIN = $(BIN).$(MAJOR).$(MINOR)
-OUTPUT_WRAP_EGL = $(WRAP_EGL).$(MAJOR).$(MINOR)
-OUTPUT_WRAP_GLES2 = $(WRAP_GLES2).$(MAJOR).$(MINOR)
+OUTPUT_BIN = $(BIN).$(COREGL_MAJOR).$(COREGL_MINOR)
+OUTPUT_WRAP_EGL = $(WRAP_EGL).$(EGL_MAJOR).$(EGL_MINOR)
+OUTPUT_WRAP_GLES2 = $(WRAP_GLES2).$(GLESv2_MAJOR).$(GLESv2_MINOR)
 
 OBJECTS = $(SOURCES:.c=.o)
 
@@ -51,20 +57,20 @@ all : $(OUTPUT_BIN) $(OUTPUT_WRAP_EGL) $(OUTPUT_WRAP_GLES2)
 $(OUTPUT_BIN) : $(OBJECTS)
        @mkdir -p lib
        $(CC) -shared -o lib/$(OUTPUT_BIN) $(OBJECTS) $(LDFLAGS)
-       ln -sf $(OUTPUT_BIN) lib/$(BIN).$(MAJOR)
-       ln -sf $(BIN).$(MAJOR) lib/$(BIN)
+       ln -sf $(OUTPUT_BIN) lib/$(BIN).$(COREGL_MAJOR)
+       ln -sf $(BIN).$(COREGL_MAJOR) lib/$(BIN)
 
 $(OUTPUT_WRAP_EGL) :
        @mkdir -p lib
        $(CC) -shared -o lib/$(OUTPUT_WRAP_EGL) src/wraps/coregl_egl.c $(CFLAGS) $(LDFLAGS)
-       ln -sf $(OUTPUT_WRAP_EGL) lib/$(WRAP_EGL).$(MAJOR)
-       ln -sf $(WRAP_EGL).$(MAJOR) lib/$(WRAP_EGL)
+       ln -sf $(OUTPUT_WRAP_EGL) lib/$(WRAP_EGL).$(EGL_MAJOR)
+       ln -sf $(WRAP_EGL).$(EGL_MAJOR) lib/$(WRAP_EGL)
 
 $(OUTPUT_WRAP_GLES2) :
        @mkdir -p lib
        $(CC) -shared -o lib/$(OUTPUT_WRAP_GLES2) src/wraps/coregl_gl.c $(CFLAGS) $(LDFLAGS)
-       ln -sf $(OUTPUT_WRAP_GLES2) lib/$(WRAP_GLES2).$(MAJOR)
-       ln -sf $(WRAP_GLES2).$(MAJOR) lib/$(WRAP_GLES2)
+       ln -sf $(OUTPUT_WRAP_GLES2) lib/$(WRAP_GLES2).$(GLESv2_MAJOR)
+       ln -sf $(WRAP_GLES2).$(GLESv2_MAJOR) lib/$(WRAP_GLES2)
 
 %.o : %.c
        $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@

diff --git a/packaging/coregl.spec b/packaging/coregl.spec
index 994f579..52b79bf 100755 (executable)
--- a/packaging/coregl.spec
+++ b/packaging/coregl.spec
@@ -3,10 +3,10 @@ Version: 0.1.1
 Release: 1
 ExclusiveArch:  %arm
 Summary: coregl
-Group: TO_BE/FILLED_IN
+Group: Graphics
 License: TO_BE/FILLED_IN
-URL: http://www.enlightenment.org
-Source0: %{name}-%{version}.tar.bz2
+URL: http://www.tizen.org
+Source0: %{name}-%{version}.tar.gz
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 #Patch1: patchfile.patch
@@ -22,7 +22,7 @@ BuildRequires:  pkgconfig(x11)
 BuildRequires:  cmake
 
 %description
-This package contains the ….
+This package contains the GLESv2.0/EGL 
 
 %prep
 %setup -q -n %{name}-%{version}
@@ -37,7 +37,9 @@ make %{?jobs:-j%jobs}
 mkdir -p %{buildroot}/usr/lib
 mkdir -p %{buildroot}/usr/include/EGL
 mkdir -p %{buildroot}/usr/include/GLES2
-cp %{_builddir}/%{name}-%{version}/libCOREGL.so %{buildroot}%{_libdir}/libCOREGL.so
+cp %{_builddir}/%{name}-%{version}/libCOREGL.so.3.0 %{buildroot}%{_libdir}/libCOREGL.so.3.0
+cp %{_builddir}/%{name}-%{version}/libEGL.so.3.0 %{buildroot}%{_libdir}/libEGL.so.1.4
+cp %{_builddir}/%{name}-%{version}/libGLESv2.so.3.0 %{buildroot}%{_libdir}/libGLESv2.so.2.0
 
 %clean
 rm -rf %{buildroot}
@@ -50,16 +52,18 @@ init_coregl()
 
 #    file="./libEGL.so"
 #    if [ -e $file ]; then
-            rm -f ./libEGL.*
-            rm -f ./libGLESv2.*
-
-            ln -s libCOREGL.so libGLESv2.so.2.0
-            ln -s libCOREGL.so libGLESv2.so.2
-            ln -s libCOREGL.so libGLESv2.so
-
-            ln -s libCOREGL.so libEGL.so.1.4
-            ln -s libCOREGL.so libEGL.so.1
-            ln -s libCOREGL.so libEGL.so
+            rm -f ./libEGL.so
+            rm -f ./libEGL.so.1
+            rm -f ./libGLESv2.so
+            rm -f ./libGLESv2.so.2
+            rm -f ./libCOREGL.so
+            rm -f ./libCOREGL.so.3
+            ln -s libCOREGL.so.3.0 libCOREGL.so.3
+            ln -s libCOREGL.so.3 libCOREGL.so
+            ln -s libEGL.so.1.4 libEGL.so.1
+            ln -s libEGL.so.1 libEGL.so
+            ln -s libGLESv2.so.2.0 libGLESv2.so.2
+            ln -s libGLESv2.so.2 libGLESv2.so
 #    fi
 
     cd -
@@ -70,9 +74,6 @@ init_coregl
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/libCOREGL.so
-
-%doc
-%changelog
-Wed Feb 01 2012 MB lee <mb1.lee@ppk.com> 0.0.1-10
-- Resolves #438610
+%{_libdir}/libCOREGL.so*
+%{_libdir}/libEGL.so*
+%{_libdir}/libGLESv2.so*

diff --git a/src/coregl.c b/src/coregl.c
index de7161c..9fec7c4 100644 (file)
--- a/src/coregl.c
+++ b/src/coregl.c
@@ -141,34 +141,34 @@ _gl_lib_init(void)
 
        //------------------------------------------------//
        // Open EGL Library as EGL is separate
-       egl_lib_handle = dlopen("libEGL_drv.so", RTLD_NOW);
+       egl_lib_handle = dlopen("/usr/lib/driver/libEGL.so.1.4", RTLD_NOW);
        if (!egl_lib_handle)
        {
                ERR("\E[0;31;1mERROR : %s\E[0m\n\n", dlerror());
-               ERR("\E[0;31;1mERROR : Invalid library link! (Check linkage of libCOREGL -> libEGL_drv)\E[0m\n");
+               ERR("\E[0;31;1mERROR : Invalid library link! (Check linkage of libCOREGL -> /usr/lib/driver/libEGL.so.1.4)\E[0m\n");
                return 0;
        }
 
        // test for invalid linking egl
        if (dlsym(egl_lib_handle, "coregl_symbol_exported"))
        {
-               ERR("\E[0;31;1mERROR : Invalid library link! (Check linkage of libCOREGL -> libEGL_drv)\E[0m\n");
+               ERR("\E[0;31;1mERROR : Invalid library link! (Check linkage of libCOREGL -> /usr/lib/driver/libEGL.so.1.4)\E[0m\n");
                return 0;
        }
 
        // use gl_lib handle for GL symbols
-       gl_lib_handle = dlopen("libGLESv2_drv.so", RTLD_NOW);
+       gl_lib_handle = dlopen("/usr/lib/driver/libGLESv2.so.2.0", RTLD_NOW);
        if (!gl_lib_handle)
        {
                ERR("\E[0;31;1mERROR : %s\E[0m\n\n", dlerror());
-               ERR("\E[0;31;1mERROR : Invalid library link! (Check linkage of libCOREGL -> libGLESv2_drv)\E[0m\n");
+               ERR("\E[0;31;1mERROR : Invalid library link! (Check linkage of libCOREGL -> /usr/lib/driver/libGLESv2.so.2.0)\E[0m\n");
                return 0;
        }
 
        // test for invalid linking gl
        if (dlsym(gl_lib_handle, "coregl_symbol_exported"))
        {
-               ERR("\E[0;31;1mERROR : Invalid library link! (Check linkage of libCOREGL -> libGLESv2_drv)\E[0m\n");
+               ERR("\E[0;31;1mERROR : Invalid library link! (Check linkage of libCOREGL -> /usr/lib/driver/libGLESv2.so.2.0)\E[0m\n");
                return 0;
        }
        //------------------------------------------------//