summaryrefslogtreecommitdiff
path: root/package/kodi/patches
diff options
context:
space:
mode:
Diffstat (limited to 'package/kodi/patches')
-rw-r--r--package/kodi/patches/patch-tools_TexturePacker_Makefile_in13
-rw-r--r--package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp6
2 files changed, 16 insertions, 3 deletions
diff --git a/package/kodi/patches/patch-tools_TexturePacker_Makefile_in b/package/kodi/patches/patch-tools_TexturePacker_Makefile_in
new file mode 100644
index 000000000..bdd6f679f
--- /dev/null
+++ b/package/kodi/patches/patch-tools_TexturePacker_Makefile_in
@@ -0,0 +1,13 @@
+--- kodi-14.0rc3.orig/tools/TexturePacker/Makefile.in 2014-12-09 14:19:32.000000000 +0100
++++ kodi-14.0rc3/tools/TexturePacker/Makefile.in 2014-12-20 19:50:10.000000000 +0100
+@@ -33,5 +33,10 @@ $(TARGET): $(SRCS) @abs_top_srcdir@/xbmc
+ # TexturePacker run native on build system, build it with native tools
+ make -C @abs_top_srcdir@/lib/libsquish/ libsquish-native.so
+ $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $(DEFINES) $(NATIVE_ARCH) $(SRCS) $(LDFLAGS_FOR_BUILD) -o $(TARGET)
++ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
++ install_name_tool -change /usr/lib/libSDL_image-1.2.0.dylib \
++ @@STAGING_HOST_DIR@@/usr/lib/libSDL_image-1.2.0.dylib \
++ $(TARGET)
++endif
+
+ include @abs_top_srcdir@/Makefile.include
diff --git a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp
index 1660c5a36..8780e81db 100644
--- a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp
+++ b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp
@@ -1,6 +1,6 @@
---- kodi-14.0rc2.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-12-05 19:38:44.000000000 -0600
-+++ kodi-14.0rc2/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-12-07 03:43:25.308418001 -0600
-@@ -520,8 +520,8 @@ void CDVDDemuxFFmpeg::Reset()
+--- kodi-14.0rc3.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-12-09 14:19:32.000000000 +0100
++++ kodi-14.0rc3/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-12-20 04:27:04.000000000 +0100
+@@ -534,8 +534,8 @@ void CDVDDemuxFFmpeg::Reset()
void CDVDDemuxFFmpeg::Flush()
{
// naughty usage of an internal ffmpeg function