diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-tv/kodi/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-tv/kodi/files')
-rwxr-xr-x | media-tv/kodi/files/generate.sh | 34 | ||||
-rw-r--r-- | media-tv/kodi/files/kodi-14.0-dvddemux-ffmpeg.patch | 16 | ||||
-rw-r--r-- | media-tv/kodi/files/kodi-14.1-no-arm-flags.patch | 16 | ||||
-rw-r--r-- | media-tv/kodi/files/kodi-9999-no-arm-flags.patch | 16 | ||||
-rw-r--r-- | media-tv/kodi/files/kodi-9999-nomythtv.patch | 67 | ||||
-rw-r--r-- | media-tv/kodi/files/kodi-9999-texturepacker.patch | 17 |
6 files changed, 166 insertions, 0 deletions
diff --git a/media-tv/kodi/files/generate.sh b/media-tv/kodi/files/generate.sh new file mode 100755 index 000000000000..2e5b67fb90e1 --- /dev/null +++ b/media-tv/kodi/files/generate.sh @@ -0,0 +1,34 @@ +#!/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}" diff --git a/media-tv/kodi/files/kodi-14.0-dvddemux-ffmpeg.patch b/media-tv/kodi/files/kodi-14.0-dvddemux-ffmpeg.patch new file mode 100644 index 000000000000..94b86666f9ed --- /dev/null +++ b/media-tv/kodi/files/kodi-14.0-dvddemux-ffmpeg.patch @@ -0,0 +1,16 @@ +sniped from: +http://cvs.rpmfusion.org/viewvc/rpms/kodi/devel/kodi-14.0-dvddemux-ffmpeg.patch?root=free&view=markup + +--- xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp ++++ xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +@@ -519,10 +519,6 @@ + + void CDVDDemuxFFmpeg::Flush() + { +- // naughty usage of an internal ffmpeg function +- if (m_pFormatContext) +- av_read_frame_flush(m_pFormatContext); +- + m_currentPts = DVD_NOPTS_VALUE; + + m_pkt.result = -1; diff --git a/media-tv/kodi/files/kodi-14.1-no-arm-flags.patch b/media-tv/kodi/files/kodi-14.1-no-arm-flags.patch new file mode 100644 index 000000000000..82a738356ff8 --- /dev/null +++ b/media-tv/kodi/files/kodi-14.1-no-arm-flags.patch @@ -0,0 +1,16 @@ +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="" diff --git a/media-tv/kodi/files/kodi-9999-no-arm-flags.patch b/media-tv/kodi/files/kodi-9999-no-arm-flags.patch new file mode 100644 index 000000000000..64c1cfbc8fe2 --- /dev/null +++ b/media-tv/kodi/files/kodi-9999-no-arm-flags.patch @@ -0,0 +1,16 @@ +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.ac ++++ b/configure.ac +@@ -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="" diff --git a/media-tv/kodi/files/kodi-9999-nomythtv.patch b/media-tv/kodi/files/kodi-9999-nomythtv.patch new file mode 100644 index 000000000000..40ab23b98d1c --- /dev/null +++ b/media-tv/kodi/files/kodi-9999-nomythtv.patch @@ -0,0 +1,67 @@ +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) + diff --git a/media-tv/kodi/files/kodi-9999-texturepacker.patch b/media-tv/kodi/files/kodi-9999-texturepacker.patch new file mode 100644 index 000000000000..fe3dcdcf7a87 --- /dev/null +++ b/media-tv/kodi/files/kodi-9999-texturepacker.patch @@ -0,0 +1,17 @@ +--- tools/depends/native/TexturePacker/Makefile.old 2015-03-17 22:29:18.880029509 +0100 ++++ tools/depends/native/TexturePacker/Makefile 2015-03-17 22:29:41.459671679 +0100 +@@ -9,14 +9,10 @@ + + ifeq ($(NATIVEPLATFORM),) + PLATFORM = native +- EXTRA_CONFIGURE = --enable-static + else + PLATFORM = $(NATIVEPLATFORM) + endif + +-ifeq ($(NATIVE_OS), linux) +- EXTRA_CONFIGURE = --enable-static +-endif + ifeq ($(NATIVE_OS), android) + EXTRA_CONFIGURE = --enable-static + endif |