[gentoo-commits] gentoo-x86 commit in media-tv/kodi/files: kodi-9999-no-arm-flags.patch kodi-9999-nomythtv.patch generate.sh

[Mike Frysinger (vapier)]

vapier      15/02/16 07:35:00

  Added:                kodi-9999-no-arm-flags.patch
                        kodi-9999-nomythtv.patch generate.sh
  Log:
  Initial import #526992 by Rafal Kupiec.
  
  (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 
D2E96200)

Revision  Changes    Path
1.1                  media-tv/kodi/files/kodi-9999-no-arm-flags.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/kodi/files/kodi-9999-no-arm-flags.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/kodi/files/kodi-9999-no-arm-flags.patch?rev=1.1&content-type=text/plain

Index: kodi-9999-no-arm-flags.patch
===================================================================
http://bugs.gentoo.org/400617

do not force any particular ABI or FPU or SIMD compiler flags for arm
targets.  let the toolchain and user CFLAGS control that.

--- a/configure.in
+++ b/configure.in
@@ -571,7 +571,7 @@
 elif test "$target_platform" = "target_raspberry_pi"; then
   ARCH="arm"
   use_arch="arm"
-elif test "$use_arch" = "arm"; then
+elif false; then
   CFLAGS="$CFLAGS -mno-apcs-stack-check"
   CXXFLAGS="$CXXFLAGS -mno-apcs-stack-check"
   FFMPEG_EXTRACFLAGS=""



1.1                  media-tv/kodi/files/kodi-9999-nomythtv.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/kodi/files/kodi-9999-nomythtv.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/kodi/files/kodi-9999-nomythtv.patch?rev=1.1&content-type=text/plain

Index: kodi-9999-nomythtv.patch
===================================================================
http://trac.xbmc.org/ticket/11775

make mythtv support optional

diff --git a/Makefile.in b/Makefile.in
index 9ffae7e..17cc525 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -209,7 +209,7 @@ LIB_DIRS=\
        lib/cpluff \
        lib/xbmc-dll-symbols
 
-ifeq (@USE_MYSQL@,1)
+ifeq (@USE_MYTHTV@,1)
 LIB_DIRS += lib/cmyth
 CMYTH=cmyth
 endif
diff --git a/configure.in b/configure.in
index d44825f..629d7b4 100755
--- a/configure.in
+++ b/configure.in
@@ -479,6 +479,12 @@ AC_ARG_ENABLE([mysql],
   [AS_HELP_STRING([--disable-mysql],
   [disable mysql])],
 
+AC_ARG_ENABLE([mythtv],
+  [AS_HELP_STRING([--disable-mythtv],
+  [disable mythtv])],
+  [use_mythtv=$enableval],
+  [use_mythtv=yes])
+
 AC_ARG_ENABLE([webserver],
   [AS_HELP_STRING([--disable-webserver],
   [disable webserver])],
@@ -1080,6 +1086,9 @@ if test "$use_mysql" = "yes"; then
   else
     AC_MSG_ERROR($missing_program)
   fi
+  if test "$use_mythtv" = "yes"; then
+    AC_DEFINE([HAVE_MYTHTV],[1],["Define to 1 if you want mythtv support"])
+  fi
 fi
 AC_CHECK_HEADER([ass/ass.h],, AC_MSG_ERROR($missing_library))
 AC_CHECK_HEADER([mpeg2dec/mpeg2.h],, AC_MSG_ERROR($missing_library))
@@ -2372,6 +2381,15 @@ else
   final_message="$final_message\n  MySQL:\tNo"
   USE_MYSQL=0
 fi
+
+if test "$use_mythtv" = "yes"; then
+  final_message="$final_message\n  MythTV:\tYes"
+  USE_MYTHTV=1
+else
+  final_message="$final_message\n  MythTV:\tNo"
+  USE_MYTHTV=0
+fi
+
 if test "$use_webserver" = "yes"; then
   final_message="$final_message\n  Webserver:\tYes"
   USE_WEB_SERVER=1
@@ -2675,6 +2693,7 @@ AC_SUBST(USE_LIBUDEV)
 AC_SUBST(USE_LIBUSB)
 AC_SUBST(USE_LIBCEC)
 AC_SUBST(USE_MYSQL)
+AC_SUBST(USE_MYTHTV)
 AC_SUBST(USE_WAYLAND)




1.1                  media-tv/kodi/files/generate.sh

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/kodi/files/generate.sh?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/kodi/files/generate.sh?rev=1.1&content-type=text/plain

Index: generate.sh
===================================================================
#!/bin/bash
# Generate the various interface files that normally requires java.
# This makes building the release versions much nicer.

set -eux

PV=$1
PN=kodi
P="${PN}-${PV}"
DISTDIR="/usr/portage/distfiles"
GITDIR="/usr/local/src/kodi/git"

if [[ ${PV} != "9999" ]] ; then
        rm -rf xbmc-*/
        tar xf ${DISTDIR}/${P}.tar.gz
        d=$(echo xbmc-*/)
else
        stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u 
+%Y%m%d)
        P+="-${stamp}"
        cd ${GITDIR}
        d=.
fi
#cd ${d} && git init . && git add . && git commit -qmm && cd ..
make -C ${d} -j -f codegenerator.mk
tar="${DISTDIR}/${P}-generated-addons.tar.xz"
tar cf - \
        ${d}/xbmc/interfaces/python/generated/*.cpp \
        ${d}/xbmc/interfaces/json-rpc/ServiceDescription.h \
        | xz > "${tar}"
if [[ ${PV} != "9999" ]] ; then
        rm -rf xbmc-*/
fi

du -b "${tar}"