Bladeren bron

add fixes for kodi on rpi2

Waldemar Brodkorb 9 jaren geleden
bovenliggende
commit
bb56a016f3

+ 3 - 1
package/bcm28xx-vc/Makefile

@@ -4,7 +4,7 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		bcm28xx-vc
-PKG_VERSION:=		0de0b205ea94ab61c24ea515cd3935e37d41ac03
+PKG_VERSION:=		9cc14b29288f913ef0e3286f4b3232bf73ab59d2
 PKG_RELEASE:=		1
 PKG_DESCR:=		videocore tools and libraries for bcm28xx
 PKG_SECTION:=		libs/video
@@ -64,6 +64,8 @@ bcm28xx-vc-gl-libs-install:
 		$(IDIR_BCM28XX_VC_GL_LIBS)/opt/vc/lib
 	$(CP) $(WRKINST)/opt/vc/lib/libopenmaxil.so \
 		$(IDIR_BCM28XX_VC_GL_LIBS)/opt/vc/lib
+	$(CP) $(WRKINST)/opt/vc/lib/libvcsm.so \
+		$(IDIR_BCM28XX_VC_GL_LIBS)/opt/vc/lib
 	$(CP) $(WRKINST)/opt/vc/lib/libEGL.so \
 		$(IDIR_BCM28XX_VC_GL_LIBS)/opt/vc/lib
 	$(CP) $(WRKINST)/opt/vc/lib/libGLESv2.so \

+ 3 - 3
package/kodi/patches/patch-Makefile_include_in

@@ -1,5 +1,5 @@
---- xbmc-13.1.orig/Makefile.include.in	2014-06-08 08:40:24.000000000 +0200
-+++ xbmc-13.1/Makefile.include.in	2014-06-11 13:17:49.354722974 +0200
+--- kodi-ff25ea118e3580bb1ebcbb7c450ed933da1782be.orig/Makefile.include.in	2015-05-25 11:50:29.000000000 -0500
++++ kodi-ff25ea118e3580bb1ebcbb7c450ed933da1782be/Makefile.include.in	2015-05-25 11:53:49.490501827 -0500
 @@ -37,6 +37,7 @@ CFLAGS+=@CFLAGS@
  CFLAGS_FOR_BUILD+=@CFLAGS_FOR_BUILD@
  LDFLAGS+=@LDFLAGS@
@@ -7,4 +7,4 @@
 +INCLUDES+=@CPPFLAGS@
  INCLUDES+=-I@abs_top_srcdir@/lib
  INCLUDES+=-I@abs_top_srcdir@/xbmc
- INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.gui
+ INCLUDES+=-I@abs_top_srcdir@/addons/library.kodi.guilib

+ 11 - 0
package/kodi/patches/patch-configure_ac

@@ -0,0 +1,11 @@
+--- kodi-ff25ea118e3580bb1ebcbb7c450ed933da1782be.orig/configure.ac	2015-05-25 11:50:32.000000000 -0500
++++ kodi-ff25ea118e3580bb1ebcbb7c450ed933da1782be/configure.ac	2015-05-25 14:15:13.034424159 -0500
+@@ -1044,7 +1044,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.)
+-      LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm -lmmal -lmmal_core -lmmal_util"
++      LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm -lmmal -lmmal_core -lmmal_util -lvcsm -lmmal_vc_client -lmmal_components -lcontainers -lkhrn_static -lpthread -lm"
+     else
+       AC_CHECK_LIB([EGL],   [main],, AC_MSG_ERROR($missing_library))
+       AC_CHECK_LIB([GLESv2],[main],, AC_MSG_ERROR($missing_library))

+ 3 - 3
package/kodi/patches/patch-xbmc_Application_cpp

@@ -1,6 +1,6 @@
---- kodi-14.0rc2.orig/xbmc/Application.cpp	2014-12-05 19:38:44.000000000 -0600
-+++ kodi-14.0rc2/xbmc/Application.cpp	2014-12-07 10:16:27.900418001 -0600
-@@ -1076,10 +1076,7 @@ bool CApplication::InitDirectoriesLinux(
+--- kodi-ff25ea118e3580bb1ebcbb7c450ed933da1782be.orig/xbmc/Application.cpp	2015-05-25 11:50:32.000000000 -0500
++++ kodi-ff25ea118e3580bb1ebcbb7c450ed933da1782be/xbmc/Application.cpp	2015-05-25 11:53:49.534501831 -0500
+@@ -911,10 +911,7 @@ bool CApplication::InitDirectoriesLinux(
      userName = "root";
  
    std::string userHome;