mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-22 19:44:21 +01:00
multimedia/xbmc: Various patch addition/removal to fix build
Added 3 patches, 2 for ffmpeg 2.0 and 1 for Samba 4.0 Removed cwiid patch, removed taglib 1.8 static library Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
This commit is contained in:
larryhaja
Robby Workman
parent
ab9d8abf41
commit
1a801c6103
6 changed files with 2149 additions and 46 deletions
|
|
@ -1,16 +0,0 @@
|
|||
diff -Naur xbmc-12.0.orig/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.cpp xbmc-12.0/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.cpp
|
||||
--- xbmc-12.0.orig/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.cpp 2013-01-29 14:20:27.000000000 +0000
|
||||
+++ xbmc-12.0/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.cpp 2013-02-02 23:13:08.422456751 +0000
|
||||
@@ -100,9 +100,11 @@
|
||||
g_WiiRemote.ProcessNunchuck(mesg[i].nunchuk_mesg);
|
||||
break;
|
||||
case CWIID_MESG_ACC:
|
||||
- case CWIID_MESG_BALANCE:
|
||||
case CWIID_MESG_CLASSIC:
|
||||
+#ifndef CWIID_OLD
|
||||
+ case CWIID_MESG_BALANCE:
|
||||
case CWIID_MESG_MOTIONPLUS:
|
||||
+#endif
|
||||
//Not implemented
|
||||
break;
|
||||
case CWIID_MESG_UNKNOWN:
|
||||
24
multimedia/xbmc/patches/samba-4.0.patch
Normal file
24
multimedia/xbmc/patches/samba-4.0.patch
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
diff -Naur xbmc-12.2.orig/xbmc/filesystem/SMBDirectory.cpp xbmc-12.2/xbmc/filesystem/SMBDirectory.cpp
|
||||
--- xbmc-12.2.orig/xbmc/filesystem/SMBDirectory.cpp 2013-05-03 05:57:41.000000000 +0000
|
||||
+++ xbmc-12.2/xbmc/filesystem/SMBDirectory.cpp 2013-11-12 00:30:28.143499083 +0000
|
||||
@@ -44,7 +44,7 @@
|
||||
#include "threads/SingleLock.h"
|
||||
#include "PasswordManager.h"
|
||||
|
||||
-#include <libsmbclient.h>
|
||||
+#include <samba-4.0/libsmbclient.h>
|
||||
|
||||
#if defined(TARGET_DARWIN)
|
||||
#define XBMC_SMB_MOUNT_PATH "Library/Application Support/XBMC/Mounts/"
|
||||
diff -Naur xbmc-12.2.orig/xbmc/filesystem/SmbFile.cpp xbmc-12.2/xbmc/filesystem/SmbFile.cpp
|
||||
--- xbmc-12.2.orig/xbmc/filesystem/SmbFile.cpp 2013-05-03 05:57:41.000000000 +0000
|
||||
+++ xbmc-12.2/xbmc/filesystem/SmbFile.cpp 2013-11-12 00:30:59.577499442 +0000
|
||||
@@ -27,7 +27,7 @@
|
||||
#include "PasswordManager.h"
|
||||
#include "SMBDirectory.h"
|
||||
#include "Util.h"
|
||||
-#include <libsmbclient.h>
|
||||
+#include <samba-4.0/libsmbclient.h>
|
||||
#include "settings/AdvancedSettings.h"
|
||||
#include "settings/GUISettings.h"
|
||||
#include "threads/SingleLock.h"
|
||||
2102
multimedia/xbmc/patches/xbmc-12.2-ffmpeg-2.0.patch
Normal file
2102
multimedia/xbmc/patches/xbmc-12.2-ffmpeg-2.0.patch
Normal file
File diff suppressed because it is too large
Load diff
14
multimedia/xbmc/patches/xbmc-pvr-addons-ffmpeg-2.0.patch
Normal file
14
multimedia/xbmc/patches/xbmc-pvr-addons-ffmpeg-2.0.patch
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
diff -Naur xbmc-pvr-addons-12.0-Frodo.orig/addons/pvr.hts/src/client.h xbmc-pvr-addons-12.0-Frodo/addons/pvr.hts/src/client.h
|
||||
--- xbmc-pvr-addons-12.0-Frodo.orig/addons/pvr.hts/src/client.h 2013-01-19 01:40:32.000000000 +0000
|
||||
+++ xbmc-pvr-addons-12.0-Frodo/addons/pvr.hts/src/client.h 2013-11-12 01:35:15.818543473 +0000
|
||||
@@ -26,6 +26,10 @@
|
||||
#include "libXBMC_gui.h"
|
||||
#include "avcodec.h"
|
||||
|
||||
+#if !defined (CodecID)
|
||||
+#define CodecID AVCodecID
|
||||
+#endif
|
||||
+
|
||||
#define DEFAULT_HOST "127.0.0.1"
|
||||
#define DEFAULT_HTTP_PORT 9981
|
||||
#define DEFAULT_HTSP_PORT 9982
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
PRGNAM=xbmc
|
||||
VERSION=${VERSION:-12.2}
|
||||
BUILD=${BUILD:-1}
|
||||
BUILD=${BUILD:-2}
|
||||
TAG=${TAG:-_SBo}
|
||||
|
||||
if [ -z "$ARCH" ]; then
|
||||
|
|
@ -62,7 +62,6 @@ cd $TMP
|
|||
rm -rf $PRGNAM-$VERSION
|
||||
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
|
||||
cd $PRGNAM-$VERSION
|
||||
tar xvf $CWD/taglib-1.8.tar.gz
|
||||
tar xvf $CWD/$PRGNAM-pvr-addons-12.0-Frodo.tar.gz || tar xvf $CWD/12.0-Frodo.tar.gz
|
||||
chown -R root:root .
|
||||
find . \
|
||||
|
|
@ -84,6 +83,9 @@ sed -i 's|^#ifdef GIT_REV|#ifndef GIT_REV|' $PRGNAM/GUIInfoManager.cpp
|
|||
# http://slaxbmc.blogspot.com/2011/03/23-install-xbmc-from-source.html
|
||||
patch -p1 < $CWD/patches/xbmc-rtmpdump-build.patch
|
||||
|
||||
# Patch for Samba 4.0.
|
||||
patch -p1 < $CWD/patches/samba-4.0.patch
|
||||
|
||||
# Hack for using afpfs-ng.
|
||||
cat lib/afpfs-ng/fix_afpfs-ng_includes.patch | head -1336 | tail -1172 | patch -p1
|
||||
AFPFS_NGFLAGS="-I$PWD/include"
|
||||
|
|
@ -92,6 +94,9 @@ AFPFS_NGFLAGS="-I$PWD/include"
|
|||
if [ "${FFMPEG:-no}" == "yes" ]; then
|
||||
OPT_DEPS="--enable-external-ffmpeg"
|
||||
OPT_DEPS_ADDONS="--enable-external-ffmpeg"
|
||||
# Patches for newer ffmpeg > 2.0.
|
||||
patch -p1 < $CWD/patches/xbmc-12.2-ffmpeg-2.0.patch
|
||||
patch -p0 < $CWD/patches/xbmc-pvr-addons-ffmpeg-2.0.patch
|
||||
else
|
||||
OPT_DEPS="--disable-external-ffmpeg"
|
||||
OPT_DEPS_ADDONS="--disable-external-ffmpeg"
|
||||
|
|
@ -109,23 +114,6 @@ if [ "${PULSE:-no}" == "yes" ]; then
|
|||
OPT_DEPS="$OPT_DEPS --enable-pulse"
|
||||
fi
|
||||
|
||||
# XBMC requires taglib >= 1.8. Slackware 14.0 comes with taglib 1.7.2.
|
||||
# We are going to build a static version of taglib for XBMC.
|
||||
cd taglib-1.8
|
||||
cmake -G "Unix Makefiles" \
|
||||
-DCMAKE_INSTALL_PREFIX:PATH=/usr \
|
||||
-DENABLE_STATIC=ON \
|
||||
-DLIB_SUFFIX="${LIBDIRSUFFIX}" \
|
||||
-DWITH_MP4=ON \
|
||||
-DWITH_ASF=ON \
|
||||
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
|
||||
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
|
||||
-DCMAKE_BUILD_TYPE=Release .
|
||||
|
||||
make VERBOSE=1
|
||||
make install DESTDIR=$PWD
|
||||
cd ..
|
||||
|
||||
# Build the pvr addons.
|
||||
cd $PRGNAM-pvr-addons-12.0-Frodo
|
||||
./bootstrap
|
||||
|
|
@ -143,9 +131,6 @@ cd $PRGNAM-pvr-addons-12.0-Frodo
|
|||
make
|
||||
cd ..
|
||||
|
||||
TAGLIB_CFLAGS="-I$PWD/taglib-1.8/usr/include" \
|
||||
TAGLIB_LIBS="-L$PWD/taglib-1.8/usr/lib${LIBDIRSUFFIX} -ltag" \
|
||||
LDFLAGS="-L$PWD/taglib-1.8/usr/lib${LIBDIRSUFFIX} -ltag" \
|
||||
CFLAGS="$SLKCFLAGS $AFPFS_NGFLAGS" \
|
||||
CXXFLAGS="$SLKCFLAGS $AFPFS_NGFLAGS" \
|
||||
./configure \
|
||||
|
|
@ -169,10 +154,6 @@ make
|
|||
|
||||
# Wii controller usage. Default is no.
|
||||
if ! [ "${WII:-no}" = "no" ]; then
|
||||
# SBO comes with latest release version of CWIID, which is 5 years old.
|
||||
# Two options have been deactivated because they are not available in
|
||||
# release version of cwiid.
|
||||
patch -p1 < $CWD/patches/cwiid-old-api.patch
|
||||
make eventclients DESTDIR=$PKG WII_EXTRA_OPTS="-DCWIID_OLD"
|
||||
find $PKG/usr/lib${LIBDIRSUFFIX}/python* -iname "*\.py" -exec chmod 0644 '{}' \;
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -2,11 +2,9 @@ PRGNAM="xbmc"
|
|||
VERSION="12.2"
|
||||
HOMEPAGE="http://xbmc.org/"
|
||||
DOWNLOAD="http://mirrors.xbmc.org/releases/source/xbmc-12.2.tar.gz \
|
||||
https://github.com/opdenkamp/xbmc-pvr-addons/archive/12.0-Frodo.tar.gz \
|
||||
http://github.com/downloads/taglib/taglib/taglib-1.8.tar.gz"
|
||||
https://github.com/opdenkamp/xbmc-pvr-addons/archive/12.0-Frodo.tar.gz"
|
||||
MD5SUM="489f3877decae4e265ece54f9eaef0ba \
|
||||
4a1020b1a890e26505da7cc9afef1cea \
|
||||
dcb8bd1b756f2843e18b1fdf3aaeee15"
|
||||
4a1020b1a890e26505da7cc9afef1cea"
|
||||
DOWNLOAD_x86_64=""
|
||||
MD5SUM_x86_64=""
|
||||
REQUIRES="%README% jdk libass libmpeg2 libmodplug yajl tinyxml"
|
||||
|
|
|
|||
Loading…
Reference in a new issue