diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-12-28 03:28:53 -0600 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-12-28 03:29:00 -0600 |
| commit | d1548fc47a6b2f61ea5ac9eb9a5d9cb9fd407b1f (patch) | |
| tree | 74f28c4330a83568a8f78904977b19073cebc452 /package/kodi | |
| parent | 66a03129a2b12780561cfc5b3387303d05c17b71 (diff) | |
fix check for java, remove debug information from kodi configure. reported via solidrun forums
Diffstat (limited to 'package/kodi')
| -rw-r--r-- | package/kodi/Makefile | 2 | ||||
| -rw-r--r-- | package/kodi/patches/patch-configure_in | 9 | ||||
| -rw-r--r-- | package/kodi/patches/patch-tools_TexturePacker_Makefile_in | 6 |
3 files changed, 8 insertions, 9 deletions
diff --git a/package/kodi/Makefile b/package/kodi/Makefile index 688100184..a8a6836f5 100644 --- a/package/kodi/Makefile +++ b/package/kodi/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kodi PKG_VERSION:= 14.0 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_HASH:= 11746d95cc59361f36ce6ea9d0d36bbd9ec3376e991f5ec1720f8ff740b91192 PKG_DESCR:= software media player PKG_SECTION:= mm/video diff --git a/package/kodi/patches/patch-configure_in b/package/kodi/patches/patch-configure_in index c82fc1830..dfd4a32ae 100644 --- a/package/kodi/patches/patch-configure_in +++ b/package/kodi/patches/patch-configure_in @@ -1,6 +1,6 @@ --- xbmc-14.0-Helix.orig/configure.in 2014-12-22 17:11:35.000000000 -0600 -+++ xbmc-14.0-Helix/configure.in 2014-12-25 14:08:39.073043750 -0600 -@@ -55,13 +55,7 @@ AC_DEFUN([XB_ADD_CODEC], ++++ xbmc-14.0-Helix/configure.in 2014-12-28 02:47:04.799045092 -0600 +@@ -55,13 +55,6 @@ AC_DEFUN([XB_ADD_CODEC], # check for library basenames AC_DEFUN([XB_FIND_SONAME], [ @@ -11,11 +11,10 @@ - $1_SONAME=[`basename $$1_SONAME`] - fi - elif [[ "$host_vendor" != "apple" ]]; then -+ set -x AC_MSG_CHECKING([for lib$2 soname]) $1_FILENAME=$($CC -nostdlib -o /dev/null $LDFLAGS $4 -l$2 -Wl,-M 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}') if [[ -z $$1_FILENAME ]]; then -@@ -71,24 +65,6 @@ AC_DEFUN([XB_FIND_SONAME], +@@ -71,24 +64,6 @@ AC_DEFUN([XB_FIND_SONAME], if [[ ! -z $$1_FILENAME ]]; then $1_SONAME=$($OBJDUMP -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}') fi @@ -40,7 +39,7 @@ if [[ -z "$$1_SONAME" ]]; then AC_MSG_RESULT([no]) if test -z "$3" || test "x${$3}" = "xyes"; then -@@ -1015,7 +991,7 @@ if test "$use_gles" = "yes"; then +@@ -1015,7 +990,7 @@ if test "$use_gles" = "yes"; then AC_DEFINE([HAVE_LIBEGL],[1],["Define to 1 if you have the `EGL' library (-lEGL)."]) AC_DEFINE([HAVE_LIBGLESV2],[1],["Define to 1 if you have the `GLESv2' library (-lGLESv2)."]) AC_MSG_RESULT(== WARNING: OpenGLES support is assumed.) diff --git a/package/kodi/patches/patch-tools_TexturePacker_Makefile_in b/package/kodi/patches/patch-tools_TexturePacker_Makefile_in index bdd6f679f..0fe1e0875 100644 --- a/package/kodi/patches/patch-tools_TexturePacker_Makefile_in +++ b/package/kodi/patches/patch-tools_TexturePacker_Makefile_in @@ -1,12 +1,12 @@ ---- kodi-14.0rc3.orig/tools/TexturePacker/Makefile.in 2014-12-09 14:19:32.000000000 +0100 -+++ kodi-14.0rc3/tools/TexturePacker/Makefile.in 2014-12-20 19:50:10.000000000 +0100 +--- xbmc-14.0-Helix.orig/tools/TexturePacker/Makefile.in 2014-12-22 17:11:35.000000000 -0600 ++++ xbmc-14.0-Helix/tools/TexturePacker/Makefile.in 2014-12-27 13:48:57.427472564 -0600 @@ -33,5 +33,10 @@ $(TARGET): $(SRCS) @abs_top_srcdir@/xbmc # TexturePacker run native on build system, build it with native tools make -C @abs_top_srcdir@/lib/libsquish/ libsquish-native.so $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $(DEFINES) $(NATIVE_ARCH) $(SRCS) $(LDFLAGS_FOR_BUILD) -o $(TARGET) +ifeq ($(findstring Darwin,$(shell uname -s)),Darwin) + install_name_tool -change /usr/lib/libSDL_image-1.2.0.dylib \ -+ @@STAGING_HOST_DIR@@/usr/lib/libSDL_image-1.2.0.dylib \ ++ /home/wbx/myapp/host_x86_64-linux-gnu/usr/lib/libSDL_image-1.2.0.dylib \ + $(TARGET) +endif |