- disable static linking

- BC squish-devel

diff --git a/disable-static.patch b/disable-static.patch
new file mode 100644 (file)
index 0000000..485ae2d
--- /dev/null
+++ b/disable-static.patch
@@ -0,0 +1,21 @@
+--- xbmc-15.0-Isengard/tools/depends/native/TexturePacker/Makefile~    2015-07-21 20:41:29.000000000 +0200
++++ xbmc-15.0-Isengard/tools/depends/native/TexturePacker/Makefile     2015-07-30 18:37:38.691977581 +0200
+@@ -9,18 +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
+-
+ ifeq ($(XBMCROOT),)
+   XBMCROOT = $(ROOT_DIR)/../../../..
+ endif

diff --git a/kodi.spec b/kodi.spec
index 1ee3d815c3d3a6632cf8491a2a8b8dc0e74fe2ba..07ecb3c52d81e6d06b0412fcd957f8c9fc1d136b 100644 (file)
--- a/kodi.spec
+++ b/kodi.spec
@@ -68,6 +68,7 @@ Source0:      http://mirrors.kodi.tv/releases/source/%{version}-%{codename}.tar.gz
 Source1:       https://github.com/xbmc/FFmpeg/archive/2.6.3-%{codename}.tar.gz
 # Source1-md5: 31c6cd81c44cce93358b6d9357772aec
 Patch0:                jpeglib-boolean.patch
+Patch1:                disable-static.patch
 Patch2:                dvdread.patch
 URL:           http://kodi.tv/
 BuildRequires: Mesa-libGLU-devel
@@ -159,6 +160,8 @@ BuildRequires:      yajl-devel
 BuildRequires: yasm
 BuildRequires: zip
 BuildRequires: zlib-devel
+# kodi uses it's own, modified squish
+BuildConflicts:        squish-devel
 #https://github.com/sahlberg/libnfs
 #BuildRequires:        libnfs-devel
 #http://sites.google.com/site/alexthepuffin/home
@@ -195,6 +198,7 @@ all common digital media files from local and network storage media.
 %prep
 %setup -q -n xbmc-%{version}-%{codename}
 %patch0 -p1
+%patch1 -p1
 %{?with_system_dvdread:%patch2 -p1}
 
 rm -r lib/cximage-6.0/zlib