|
[-]
[+]
|
Changed |
_service:tar_git:libhybris.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -1,9 +1,9 @@
<services>
<service name="tar_git">
- <param name="url">https://github.com/sledges/libhybris.git</param>
- <param name="branch">update20160329</param>
+ <param name="url">https://github.com/mer-hybris/libhybris.git</param>
+ <param name="branch">master</param>
<param name="revision"></param>
<param name="token"/>
- <param name="debian"/>
- <param name="dumb"/>
+ <param name="debian">N</param>
+ <param name="dumb">N</param>
</service></services>
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/libhybris/hybris/common/dlfcn.c
^
|
| @@ -15,8 +15,8 @@
*
*/
-#include <../include/hybris/dlfcn/dlfcn.h>
-#include <../include/hybris/common/binding.h>
+#include <hybris/dlfcn/dlfcn.h>
+#include <hybris/common/binding.h>
void *hybris_dlopen(const char *filename, int flag)
{
@@ -36,7 +36,7 @@
}
-char *hybris_dlerror(void)
+const char *hybris_dlerror(void)
{
return android_dlerror();
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/libhybris/hybris/common/gingerbread/debugger.c
^
|
| @@ -28,6 +28,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
#include <ctype.h>
#include <signal.h>
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/libhybris/hybris/common/hooks.c
^
|
| @@ -1391,7 +1391,7 @@
* implementation of our internal property handling
*/
-int my_system_property_get(const char *name, const char *value)
+int my_system_property_get(const char *name, char *value)
{
return property_get(name, value, NULL);
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/libhybris/hybris/common/hooks_shm.c
^
|
| @@ -23,6 +23,7 @@
#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
+#include <string.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <pthread.h>
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/libhybris/hybris/common/jb/debugger.c
^
|
| @@ -28,6 +28,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
#include <ctype.h>
#include <signal.h>
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/libhybris/hybris/common/jb/dlfcn.c
^
|
| @@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#define _GNU_SOURCE
#include <dlfcn.h>
#include <pthread.h>
#include <stdio.h>
+#include <string.h>
#include "linker.h"
#include "linker_format.h"
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/libhybris/hybris/egl/egl.c
^
|
| @@ -310,7 +310,7 @@
{
HYBRIS_DLSYSM(egl, &_eglCreateContext, "eglCreateContext");
- EGLint *p = attrib_list;
+ const EGLint *p = attrib_list;
while (p != NULL && *p != EGL_NONE) {
if (*p == EGL_CONTEXT_CLIENT_VERSION) {
_egl_context_client_version = p[1];
@@ -398,19 +398,19 @@
HYBRIS_DLSYSM(egl, &_eglGetProcAddress, "eglGetProcAddress");
if (strcmp(procname, "eglCreateImageKHR") == 0)
{
- return _my_eglCreateImageKHR;
+ return (__eglMustCastToProperFunctionPointerType) _my_eglCreateImageKHR;
}
else if (strcmp(procname, "eglDestroyImageKHR") == 0)
{
- return eglDestroyImageKHR;
+ return (__eglMustCastToProperFunctionPointerType) eglDestroyImageKHR;
}
else if (strcmp(procname, "eglSwapBuffersWithDamageEXT") == 0)
{
- return _my_eglSwapBuffersWithDamageEXT;
+ return (__eglMustCastToProperFunctionPointerType) _my_eglSwapBuffersWithDamageEXT;
}
else if (strcmp(procname, "glEGLImageTargetTexture2DOES") == 0)
{
- return _my_glEGLImageTargetTexture2DOES;
+ return (__eglMustCastToProperFunctionPointerType) _my_glEGLImageTargetTexture2DOES;
}
__eglMustCastToProperFunctionPointerType ret = NULL;
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/libhybris/hybris/egl/platforms/fbdev/eglplatform_fbdev.cpp
^
|
| @@ -5,6 +5,7 @@
#include <assert.h>
#include <fcntl.h>
#include <stdio.h>
+#include <string.h>
#include <sys/stat.h>
#include <unistd.h>
#include <assert.h>
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/libhybris/hybris/egl/platforms/fbdev/fbdev_window.cpp
^
|
| @@ -22,6 +22,7 @@
#include <assert.h>
#include <pthread.h>
#include <stdio.h>
+#include <string.h>
#define FRAMEBUFFER_PARTITIONS 2
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/libhybris/hybris/egl/platforms/hwcomposer/eglplatform_hwcomposer.cpp
^
|
| @@ -5,6 +5,7 @@
#include <assert.h>
#include <fcntl.h>
#include <stdio.h>
+#include <string.h>
#include <sys/stat.h>
#include <unistd.h>
#include <assert.h>
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/libhybris/hybris/egl/platforms/hwcomposer/hwcomposer_window.cpp
^
|
| @@ -24,6 +24,7 @@
#include <pthread.h>
#include <stdio.h>
#include <unistd.h>
+#include <string.h>
extern "C" {
#include <sync/sync.h>
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/libhybris/hybris/egl/platforms/null/eglplatform_null.c
^
|
| @@ -2,6 +2,7 @@
#include <ws.h>
#include <dlfcn.h>
#include <stdlib.h>
+#include <string.h>
#include <hybris/common/binding.h>
#include <eglplatformcommon.h>
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/libhybris/hybris/egl/platforms/wayland/eglplatform_wayland.cpp
^
|
| @@ -31,6 +31,7 @@
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <sys/stat.h>
#include <unistd.h>
#include <assert.h>
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/libhybris/hybris/egl/platforms/wayland/wayland_window.cpp
^
|
| @@ -30,6 +30,7 @@
#include "wayland-egl-priv.h"
#include <assert.h>
#include <stdlib.h>
+#include <string.h>
#include <errno.h>
#include "logging.h"
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/libhybris/hybris/glesv2/glesv2.c
^
|
| @@ -21,6 +21,7 @@
#include <dlfcn.h>
#include <stddef.h>
#include <stdlib.h>
+#include <stdio.h>
#include <egl/ws.h>
#include <hybris/common/binding.h>
@@ -676,11 +677,6 @@
return (*_glGetShaderSource)(shader, bufsize, length, source);
}
-static const GLubyte* glGetString_wrapper(GLenum name)
-{
- return (*_glGetString)(name);
-}
-
static void glGetTexParameterfv_wrapper(GLenum target, GLenum pname, GLfloat* params)
{
return (*_glGetTexParameterfv)(target, pname, params);
@@ -1107,8 +1103,6 @@
GLES2_IDLOAD(glGetShaderSource);
-GLES2_IDLOAD(glGetString);
-
GLES2_IDLOAD(glGetTexParameterfv);
GLES2_IDLOAD(glGetTexParameteriv);
@@ -1310,4 +1304,14 @@
return (*_glLineWidth)(width);
}
-
+const GLubyte *glGetString(GLenum name)
+{
+ // Return 2.0 even though drivers might actually support 3.0 or higher,
+ // because libhybris does not provide any 3.0+ symbols.
+ if (name == GL_VERSION) {
+ static GLubyte glGetString_versionString[64];
+ snprintf(glGetString_versionString, sizeof(glGetString_versionString), "OpenGL ES 2.0 (%s)", (*_glGetString)(name));
+ return glGetString_versionString;
+ }
+ return (*_glGetString)(name);
+}
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/libhybris/hybris/include/hybris/common/dlfcn.h
^
|
| @@ -25,7 +25,7 @@
void *hybris_dlopen(const char *filename, int flag);
void *hybris_dlsym(void *handle, const char *symbol);
int hybris_dlclose(void *handle);
-char *hybris_dlerror(void);
+const char *hybris_dlerror(void);
#ifdef __cplusplus
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/libhybris/hybris/properties/cache.c
^
|
| @@ -102,7 +102,7 @@
char *ret = NULL;
if (!f)
- return NULL;
+ return;
/* before searching, we must first determine whether our cache is valid. if
* it isn't, we must discard our results and re-create the cache.
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/libhybris/hybris/tests/test_sensors.c
^
|
| @@ -19,6 +19,7 @@
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <hardware/sensors.h>
static void process_event(sensors_event_t *data)
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/upstream/hybris/common/dlfcn.c
^
|
| @@ -15,8 +15,8 @@
*
*/
-#include <../include/hybris/dlfcn/dlfcn.h>
-#include <../include/hybris/common/binding.h>
+#include <hybris/dlfcn/dlfcn.h>
+#include <hybris/common/binding.h>
void *hybris_dlopen(const char *filename, int flag)
{
@@ -36,7 +36,7 @@
}
-char *hybris_dlerror(void)
+const char *hybris_dlerror(void)
{
return android_dlerror();
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/upstream/hybris/common/gingerbread/debugger.c
^
|
| @@ -28,6 +28,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
#include <ctype.h>
#include <signal.h>
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/upstream/hybris/common/hooks.c
^
|
| @@ -1391,7 +1391,7 @@
* implementation of our internal property handling
*/
-int my_system_property_get(const char *name, const char *value)
+int my_system_property_get(const char *name, char *value)
{
return property_get(name, value, NULL);
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/upstream/hybris/common/hooks_shm.c
^
|
| @@ -23,6 +23,7 @@
#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
+#include <string.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <pthread.h>
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/upstream/hybris/common/jb/debugger.c
^
|
| @@ -28,6 +28,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
#include <ctype.h>
#include <signal.h>
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/upstream/hybris/common/jb/dlfcn.c
^
|
| @@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#define _GNU_SOURCE
#include <dlfcn.h>
#include <pthread.h>
#include <stdio.h>
+#include <string.h>
#include "linker.h"
#include "linker_format.h"
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/upstream/hybris/egl/egl.c
^
|
| @@ -310,7 +310,7 @@
{
HYBRIS_DLSYSM(egl, &_eglCreateContext, "eglCreateContext");
- EGLint *p = attrib_list;
+ const EGLint *p = attrib_list;
while (p != NULL && *p != EGL_NONE) {
if (*p == EGL_CONTEXT_CLIENT_VERSION) {
_egl_context_client_version = p[1];
@@ -398,19 +398,19 @@
HYBRIS_DLSYSM(egl, &_eglGetProcAddress, "eglGetProcAddress");
if (strcmp(procname, "eglCreateImageKHR") == 0)
{
- return _my_eglCreateImageKHR;
+ return (__eglMustCastToProperFunctionPointerType) _my_eglCreateImageKHR;
}
else if (strcmp(procname, "eglDestroyImageKHR") == 0)
{
- return eglDestroyImageKHR;
+ return (__eglMustCastToProperFunctionPointerType) eglDestroyImageKHR;
}
else if (strcmp(procname, "eglSwapBuffersWithDamageEXT") == 0)
{
- return _my_eglSwapBuffersWithDamageEXT;
+ return (__eglMustCastToProperFunctionPointerType) _my_eglSwapBuffersWithDamageEXT;
}
else if (strcmp(procname, "glEGLImageTargetTexture2DOES") == 0)
{
- return _my_glEGLImageTargetTexture2DOES;
+ return (__eglMustCastToProperFunctionPointerType) _my_glEGLImageTargetTexture2DOES;
}
__eglMustCastToProperFunctionPointerType ret = NULL;
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/upstream/hybris/egl/platforms/fbdev/eglplatform_fbdev.cpp
^
|
| @@ -5,6 +5,7 @@
#include <assert.h>
#include <fcntl.h>
#include <stdio.h>
+#include <string.h>
#include <sys/stat.h>
#include <unistd.h>
#include <assert.h>
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/upstream/hybris/egl/platforms/fbdev/fbdev_window.cpp
^
|
| @@ -22,6 +22,7 @@
#include <assert.h>
#include <pthread.h>
#include <stdio.h>
+#include <string.h>
#define FRAMEBUFFER_PARTITIONS 2
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/upstream/hybris/egl/platforms/hwcomposer/eglplatform_hwcomposer.cpp
^
|
| @@ -5,6 +5,7 @@
#include <assert.h>
#include <fcntl.h>
#include <stdio.h>
+#include <string.h>
#include <sys/stat.h>
#include <unistd.h>
#include <assert.h>
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/upstream/hybris/egl/platforms/hwcomposer/hwcomposer_window.cpp
^
|
| @@ -24,6 +24,7 @@
#include <pthread.h>
#include <stdio.h>
#include <unistd.h>
+#include <string.h>
extern "C" {
#include <sync/sync.h>
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/upstream/hybris/egl/platforms/null/eglplatform_null.c
^
|
| @@ -2,6 +2,7 @@
#include <ws.h>
#include <dlfcn.h>
#include <stdlib.h>
+#include <string.h>
#include <hybris/common/binding.h>
#include <eglplatformcommon.h>
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/upstream/hybris/egl/platforms/wayland/eglplatform_wayland.cpp
^
|
| @@ -31,6 +31,7 @@
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <sys/stat.h>
#include <unistd.h>
#include <assert.h>
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/upstream/hybris/egl/platforms/wayland/wayland_window.cpp
^
|
| @@ -30,6 +30,7 @@
#include "wayland-egl-priv.h"
#include <assert.h>
#include <stdlib.h>
+#include <string.h>
#include <errno.h>
#include "logging.h"
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/upstream/hybris/glesv2/glesv2.c
^
|
| @@ -21,6 +21,7 @@
#include <dlfcn.h>
#include <stddef.h>
#include <stdlib.h>
+#include <stdio.h>
#include <egl/ws.h>
#include <hybris/common/binding.h>
@@ -676,11 +677,6 @@
return (*_glGetShaderSource)(shader, bufsize, length, source);
}
-static const GLubyte* glGetString_wrapper(GLenum name)
-{
- return (*_glGetString)(name);
-}
-
static void glGetTexParameterfv_wrapper(GLenum target, GLenum pname, GLfloat* params)
{
return (*_glGetTexParameterfv)(target, pname, params);
@@ -1107,8 +1103,6 @@
GLES2_IDLOAD(glGetShaderSource);
-GLES2_IDLOAD(glGetString);
-
GLES2_IDLOAD(glGetTexParameterfv);
GLES2_IDLOAD(glGetTexParameteriv);
@@ -1310,4 +1304,14 @@
return (*_glLineWidth)(width);
}
-
+const GLubyte *glGetString(GLenum name)
+{
+ // Return 2.0 even though drivers might actually support 3.0 or higher,
+ // because libhybris does not provide any 3.0+ symbols.
+ if (name == GL_VERSION) {
+ static GLubyte glGetString_versionString[64];
+ snprintf(glGetString_versionString, sizeof(glGetString_versionString), "OpenGL ES 2.0 (%s)", (*_glGetString)(name));
+ return glGetString_versionString;
+ }
+ return (*_glGetString)(name);
+}
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/upstream/hybris/include/hybris/common/dlfcn.h
^
|
| @@ -25,7 +25,7 @@
void *hybris_dlopen(const char *filename, int flag);
void *hybris_dlsym(void *handle, const char *symbol);
int hybris_dlclose(void *handle);
-char *hybris_dlerror(void);
+const char *hybris_dlerror(void);
#ifdef __cplusplus
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/upstream/hybris/properties/cache.c
^
|
| @@ -102,7 +102,7 @@
char *ret = NULL;
if (!f)
- return NULL;
+ return;
/* before searching, we must first determine whether our cache is valid. if
* it isn't, we must discard our results and re-create the cache.
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.18.tar.bz2/upstream/hybris/tests/test_sensors.c
^
|
| @@ -19,6 +19,7 @@
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <hardware/sensors.h>
static void process_event(sensors_event_t *data)
|
