mirror of
https://github.com/archr-linux/Arch-R.git
synced 2026-03-31 14:41:55 -07:00
xbmc-frodo: update to xbmc-frodo-303712, add optional PVR support (untested)
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue
@@ -19,7 +19,11 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc-frodo-theme-Confluence"
|
||||
PKG_VERSION="eafb2f7"
|
||||
if [ "$PVR" = yes ]; then
|
||||
PKG_VERSION="pvr-3486b24"
|
||||
else
|
||||
PKG_VERSION="303712d"
|
||||
fi
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@@ -19,7 +19,11 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc-frodo"
|
||||
PKG_VERSION="eafb2f7"
|
||||
if [ "$PVR" = yes ]; then
|
||||
PKG_VERSION="pvr-3486b24"
|
||||
else
|
||||
PKG_VERSION="303712d"
|
||||
fi
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
@@ -159,7 +163,14 @@ if [ "$CRYSTALHD" = yes ]; then
|
||||
PKG_DEPENDS="$PKG_DEPENDS crystalhd"
|
||||
fi
|
||||
|
||||
# some python stuff needed for various addons
|
||||
PKG_DEPENDS="$PKG_DEPENDS Imaging"
|
||||
PKG_DEPENDS="$PKG_DEPENDS simplejson"
|
||||
if [ "$XVBA" = yes ]; then
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS xf86-video-fglrx"
|
||||
fi
|
||||
|
||||
# some python stuff needed for various addons
|
||||
PKG_DEPENDS="$PKG_DEPENDS Imaging"
|
||||
PKG_DEPENDS="$PKG_DEPENDS simplejson"
|
||||
|
||||
if [ "$PVR" = yes ]; then
|
||||
PKG_DEPENDS="$PKG_DEPENDS xbmc-addon-xvdr xbmc-addon-vuplus"
|
||||
fi
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
diff -Naur xbmc-9389dc8/configure.in xbmc-9389dc8.patch/configure.in
|
||||
--- xbmc-9389dc8/configure.in 2011-09-01 17:21:47.000000000 +0200
|
||||
+++ xbmc-9389dc8.patch/configure.in 2011-09-01 23:30:40.419399392 +0200
|
||||
@@ -428,6 +428,14 @@
|
||||
esac
|
||||
AC_SUBST([ARCH])
|
||||
|
||||
+AC_CHECK_PROG(HAVE_GIT,git,"yes","no",)
|
||||
+if test "$HAVE_GIT" = "yes" -a "$GIT_REV" = ""; then
|
||||
+ GIT_REV=$(git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h %ci" HEAD | awk '{gsub("-", "");print $2"-"$1}')
|
||||
+elif test "$GIT_REV" = ""; then
|
||||
+ GIT_REV="Unknown"
|
||||
+fi
|
||||
+final_message="$final_message\n git Rev.:\t${GIT_REV}"
|
||||
+
|
||||
# platform debug flags
|
||||
if test "$use_debug" = "yes"; then
|
||||
final_message="$final_message\n Debugging:\tYes"
|
||||
@@ -1177,7 +1185,6 @@
|
||||
fi
|
||||
fi
|
||||
|
||||
-AC_CHECK_PROG(HAVE_GIT,git,"yes","no",)
|
||||
|
||||
# Checks for header files.
|
||||
AC_HEADER_DIRENT
|
||||
@@ -1408,12 +1415,6 @@
|
||||
final_message="$final_message\n Avahi:\tNo"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GIT" = "yes"; then
|
||||
- GIT_REV=$(git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h %ci" HEAD | awk '{gsub("-", "");print $2"-"$1}')
|
||||
-fi
|
||||
-if test "$GIT_REV" = ""; then
|
||||
- GIT_REV="Unknown"
|
||||
-fi
|
||||
if test "$host_vendor" = "apple"; then
|
||||
echo "#define GIT_REV \"$GIT_REV\"" > git_revision.h
|
||||
else
|
||||
@@ -0,0 +1,119 @@
|
||||
diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdcss/src/libdvdcss.pc.in xbmc-pvr-3513480.patch/lib/libdvd/libdvdcss/src/libdvdcss.pc.in
|
||||
--- xbmc-pvr-3513480/lib/libdvd/libdvdcss/src/libdvdcss.pc.in 2011-04-25 02:36:42.000000000 +0200
|
||||
+++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdcss/src/libdvdcss.pc.in 2011-04-25 05:01:20.091837122 +0200
|
||||
@@ -6,5 +6,5 @@
|
||||
Name: libdvdcss
|
||||
Description: DVD access and decryption library.
|
||||
Version: @VERSION@
|
||||
-Libs: -L${libdir} -ldvdcss
|
||||
-Cflags: -I{includedir} -I${includedir}/@PACKAGE@
|
||||
+Libs: -ldvdcss
|
||||
+Cflags: -I.
|
||||
diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnav-config2.sh xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnav-config2.sh
|
||||
--- xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnav-config2.sh 2011-04-25 02:36:42.000000000 +0200
|
||||
+++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnav-config2.sh 2011-04-25 05:01:20.549828701 +0200
|
||||
@@ -56,17 +56,17 @@
|
||||
fi
|
||||
|
||||
if test "$echo_cflags" = "yes"; then
|
||||
- echo -I$prefix/include $dvdread_cflags $extracflags $threadcflags
|
||||
+ echo $dvdread_cflags $extracflags $threadcflags
|
||||
fi
|
||||
|
||||
if test "$echo_minicflags" = "yes"; then
|
||||
- echo -I$prefix/include -I$prefix/include/dvdnav $extracflags $threadcflags
|
||||
+ echo $extracflags $threadcflags
|
||||
fi
|
||||
|
||||
if test "$echo_libs" = "yes"; then
|
||||
- echo -L$libdir -ldvdnav $dvdread_libs $threadlib
|
||||
+ echo -ldvdnav $dvdread_libs $threadlib
|
||||
fi
|
||||
|
||||
if test "$echo_minilibs" = "yes"; then
|
||||
- echo -L$libdir -ldvdnavmini $threadlib
|
||||
+ echo -ldvdnavmini $threadlib
|
||||
fi
|
||||
diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnav-config.in xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnav-config.in
|
||||
--- xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnav-config.in 2011-04-25 02:36:42.000000000 +0200
|
||||
+++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnav-config.in 2011-04-25 05:01:20.624827321 +0200
|
||||
@@ -76,13 +76,13 @@
|
||||
fi
|
||||
|
||||
if test "$echo_cflags" = "yes"; then
|
||||
- echo -I@includedir@ -I@includedir@/libdvdread @THREAD_CFLAGS@
|
||||
+ echo @THREAD_CFLAGS@
|
||||
fi
|
||||
|
||||
if test "$echo_libs" = "yes"; then
|
||||
- echo -L@libdir@ -ldvdnav -ldvdread @THREAD_LIBS@
|
||||
+ echo -ldvdnav -ldvdread @THREAD_LIBS@
|
||||
fi
|
||||
|
||||
if test "$echo_minilibs" = "yes"; then
|
||||
- echo -L@libdir@ -ldvdnavmini @THREAD_LIBS@
|
||||
+ echo -ldvdnavmini @THREAD_LIBS@
|
||||
fi
|
||||
diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnavmini.pc.in xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnavmini.pc.in
|
||||
--- xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnavmini.pc.in 2011-04-25 02:36:42.000000000 +0200
|
||||
+++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnavmini.pc.in 2011-04-25 05:01:21.042819641 +0200
|
||||
@@ -7,5 +7,5 @@
|
||||
Description: DVD Navigation mini library
|
||||
Version: @VERSION@
|
||||
|
||||
-Cflags: -I${includedir} @DVDREAD_CFLAGS@ @THREAD_CFLAGS@
|
||||
-Libs: -L${libdir} -ldvdnav @THREAD_LIBS@
|
||||
+Cflags: @DVDREAD_CFLAGS@ @THREAD_CFLAGS@
|
||||
+Libs: -ldvdnav @THREAD_LIBS@
|
||||
diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnav.pc.in xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnav.pc.in
|
||||
--- xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnav.pc.in 2011-04-25 02:36:42.000000000 +0200
|
||||
+++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnav.pc.in 2011-04-25 05:01:21.262815601 +0200
|
||||
@@ -8,5 +8,5 @@
|
||||
Version: @VERSION@
|
||||
|
||||
Requires.private: dvdread >= 4.1.2
|
||||
-Cflags: -I${includedir} @THREAD_CFLAGS@
|
||||
-Libs: -L${libdir} -ldvdnav @THREAD_LIBS@
|
||||
+Cflags: @THREAD_CFLAGS@
|
||||
+Libs: -ldvdnav @THREAD_LIBS@
|
||||
diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdread/misc/dvdread-config.in xbmc-pvr-3513480.patch/lib/libdvd/libdvdread/misc/dvdread-config.in
|
||||
--- xbmc-pvr-3513480/lib/libdvd/libdvdread/misc/dvdread-config.in 2011-04-25 02:36:42.000000000 +0200
|
||||
+++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdread/misc/dvdread-config.in 2011-04-25 05:01:21.278815307 +0200
|
||||
@@ -72,9 +72,9 @@
|
||||
fi
|
||||
|
||||
if test "$echo_cflags" = "yes"; then
|
||||
- echo -I@includedir@
|
||||
+ echo ""
|
||||
fi
|
||||
|
||||
if test "$echo_libs" = "yes"; then
|
||||
- echo -L@libdir@ -ldvdread
|
||||
+ echo -ldvdread
|
||||
fi
|
||||
diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdread/misc/dvdread-config.sh xbmc-pvr-3513480.patch/lib/libdvd/libdvdread/misc/dvdread-config.sh
|
||||
--- xbmc-pvr-3513480/lib/libdvd/libdvdread/misc/dvdread-config.sh 2011-04-25 02:36:42.000000000 +0200
|
||||
+++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdread/misc/dvdread-config.sh 2011-04-25 05:01:21.278815307 +0200
|
||||
@@ -48,9 +48,9 @@
|
||||
fi
|
||||
|
||||
if test "$echo_cflags" = "yes"; then
|
||||
- echo -I$prefix/include $extracflags
|
||||
+ echo $extracflags
|
||||
fi
|
||||
|
||||
if test "$echo_libs" = "yes"; then
|
||||
- echo -L$libdir $dvdreadlib
|
||||
+ echo $dvdreadlib
|
||||
fi
|
||||
diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdread/misc/dvdread.pc.in xbmc-pvr-3513480.patch/lib/libdvd/libdvdread/misc/dvdread.pc.in
|
||||
--- xbmc-pvr-3513480/lib/libdvd/libdvdread/misc/dvdread.pc.in 2011-04-25 02:36:42.000000000 +0200
|
||||
+++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdread/misc/dvdread.pc.in 2011-04-25 05:01:21.279815289 +0200
|
||||
@@ -7,5 +7,5 @@
|
||||
Description: Low level DVD access library
|
||||
Version: @VERSION@
|
||||
|
||||
-Cflags: -I${includedir}
|
||||
-Libs: -L${libdir} -ldvdread
|
||||
+Cflags: -I.
|
||||
+Libs: -ldvdread
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -Naur xbmc-dab646e/xbmc/screensavers/rsxs-0.9/lib/argp-namefrob.h xbmc-dab646e.patch/xbmc/screensavers/rsxs-0.9/lib/argp-namefrob.h
|
||||
--- xbmc-dab646e/xbmc/screensavers/rsxs-0.9/lib/argp-namefrob.h 2011-09-27 15:56:19.000000000 +0200
|
||||
+++ xbmc-dab646e.patch/xbmc/screensavers/rsxs-0.9/lib/argp-namefrob.h 2011-10-16 02:13:13.805433847 +0200
|
||||
@@ -17,7 +17,7 @@
|
||||
with this program; if not, write to the Free Software Foundation,
|
||||
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
|
||||
|
||||
-#if !_LIBC
|
||||
+#if 0
|
||||
/* This code is written for inclusion in gnu-libc, and uses names in the
|
||||
namespace reserved for libc. If we're not compiling in libc, define those
|
||||
names to be the normal ones instead. */
|
||||
@@ -0,0 +1,21 @@
|
||||
diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
|
||||
--- xbmc-pvr-3513480/configure.in 2011-04-25 02:36:33.000000000 +0200
|
||||
+++ xbmc-pvr-3513480.patch/configure.in 2011-04-25 05:14:49.220848143 +0200
|
||||
@@ -885,6 +885,9 @@
|
||||
AC_MSG_NOTICE($external_ffmpeg_disabled)
|
||||
USE_EXTERNAL_FFMPEG=0
|
||||
AC_DEFINE([PIX_FMT_VDPAU_MPEG4_IN_AVUTIL], [1], [Whether AVUtil defines PIX_FMT_VDPAU_MPEG4.])
|
||||
+
|
||||
+ # check for yasm
|
||||
+ AC_CHECK_PROG(HAVE_YASM,yasm,"yes","no",)
|
||||
fi
|
||||
|
||||
# Python
|
||||
@@ -1547,6 +1550,7 @@
|
||||
`if test "$use_arch" != "no"; then echo --arch=$use_arch; fi`\
|
||||
`if test "$use_cpu" != "no"; then echo --cpu=$use_cpu; fi`\
|
||||
--target-os=$(tolower $(uname -s)) \
|
||||
+ `if test "$HAVE_YASM" = "yes"; then echo --enable-yasm; fi` \
|
||||
--disable-muxers \
|
||||
--enable-muxer=spdif \
|
||||
--enable-muxer=adts \
|
||||
@@ -0,0 +1,18 @@
|
||||
diff -Naur xbmc-a3c804b/xbmc/interfaces/python/XBPython.cpp xbmc-a3c804b.patch/xbmc/interfaces/python/XBPython.cpp
|
||||
--- xbmc-a3c804b/xbmc/interfaces/python/XBPython.cpp 2011-08-17 23:40:00.000000000 +0200
|
||||
+++ xbmc-a3c804b.patch/xbmc/interfaces/python/XBPython.cpp 2011-08-18 03:50:49.652475572 +0200
|
||||
@@ -335,11 +335,9 @@
|
||||
// at http://docs.python.org/using/cmdline.html#environment-variables
|
||||
|
||||
#if !defined(_WIN32)
|
||||
- /* PYTHONOPTIMIZE is set off intentionally when using external Python.
|
||||
- Reason for this is because we cannot be sure what version of Python
|
||||
- was used to compile the various Python object files (i.e. .pyo,
|
||||
- .pyc, etc.). */
|
||||
- // check if we are running as real xbmc.app or just binary
|
||||
+ // Required for python to find optimized code (pyo) files
|
||||
+ setenv("PYTHONOPTIMIZE", "1", 1);
|
||||
+ // check if we are running as real xbmc.app or just binary
|
||||
if (!CUtil::GetFrameworksPath(true).IsEmpty())
|
||||
{
|
||||
// using external python, it's build looking for xxx/lib/python2.6
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user