X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=xbmc.spec;h=e0c6911785f1efb542da784c6749918abdbf2b31;hb=6f41c837c974d53700d943f99de114c098447354;hp=2b45490e12ed530af21c3aff3b14cf3b3443422d;hpb=c462fd5742aa10b7f0565e61ec9a5d36315de3de;p=packages%2Fkodi.git

diff --git a/xbmc.spec b/xbmc.spec
index 2b45490..e0c6911 100644
--- a/xbmc.spec
+++ b/xbmc.spec
@@ -1,20 +1,30 @@
 #
 # TODO:
-# fix endless loop on ./configure
-# add missing BRs
-# make it build and add %files
-# configure requires bash
+#  - fix build flags - some files are compiled with -O3 and without rpm*flags
+#  - fix linking argument order
+#  - fix nvidia vs. libXrandr >= 1.2 conflict (nvidia drivers still supports
+#    only libXrandr 1.1 - with no gamma support; it causes application crash
+#    on XRRSetCrtcGamma function called by SDL_SetVideoMode)
+#  - add and/or fix users/groups permissions
+#  - split to subpackages?
+#  - check how it works with external python libraries
 #
-%define     _subver b1
+# Conditional build:
+%bcond_with     external_python
+%bcond_without	goom
+
 Summary:	XBMC
 Name:		xbmc
-Version:	9.11
-Release:	0.%{_subver}.0.1
-License:	GPL v3)
+Version:	10.0
+Release:	0.2
+License:	GPL v3
 Group:		Applications/Multimedia
-Source0:	http://downloads.sourceforge.net/project/xbmc/XBMC%20Source%20Code/pre-release/%{name}-%{version}-%{_subver}.tar.gz
-# Source0-md5:	a5fa3c4e3ad5a17b91e444ff9a72986d
+Source0:	http://www.softliste.de/xbmc/releases/source/%{name}-%{version}.tar.gz
+# Source0-md5:	728fb514e5f43f27bb880305061b4e72
 URL:		http://xbmc.org
+Patch0:		%{name}-nobash.patch
+Patch1:		%{name}-python27.patch
+Patch2:		%{name}-subtitle_tags.patch
 BuildRequires:	SDL_image-devel
 BuildRequires:	SDL_mixer-devel
 BuildRequires:	a52dec-libs-devel
@@ -28,7 +38,6 @@ BuildRequires:	cmake
 BuildRequires:	curl-devel
 BuildRequires:	dbus-devel
 BuildRequires:	enca-devel
-BuildRequires:	esound-devel
 BuildRequires:	faac-devel
 BuildRequires:	faad2-devel
 BuildRequires:	ffmpeg-devel
@@ -37,6 +46,7 @@ BuildRequires:	fontconfig-devel
 BuildRequires:	freetype-devel
 BuildRequires:	fribidi-devel
 BuildRequires:	gawk
+BuildRequires:	gettext-autopoint
 BuildRequires:	gettext-devel
 BuildRequires:	glew-devel
 BuildRequires:	gperf
@@ -48,7 +58,9 @@ BuildRequires:	libcdio-devel
 BuildRequires:	libdts-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libmad-devel
+BuildRequires:	libmicrohttpd-devel
 BuildRequires:	libmms-devel
+BuildRequires:	libmodplug-devel
 BuildRequires:	libmpeg2-devel
 BuildRequires:	libogg-devel
 BuildRequires:	libpng-devel
@@ -60,10 +72,16 @@ BuildRequires:	libvdpau-devel
 BuildRequires:	libvorbis-devel
 BuildRequires:	lzo-devel
 BuildRequires:	mysql-devel
+%ifarch %{ix86}
+BuildRequires:	nasm
+%endif
 BuildRequires:	openssl-devel
+BuildRequires:	pcre-cxx-devel
 BuildRequires:	pkgconfig
 BuildRequires:	pulseaudio-devel
 BuildRequires:	python-devel
+BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.566
 # used internally
 BuildRequires:	sed >= 4.0
 BuildRequires:	sqlite3-devel
@@ -75,17 +93,27 @@ BuildRequires:	xorg-lib-libXrandr-devel
 BuildRequires:	xorg-lib-libXtst-devel
 BuildRequires:	zip
 BuildRequires:	zlib-devel
+Requires:	/usr/bin/glxinfo
+Requires:	lsb-release
+Requires:	xorg-app-xdpyinfo
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 
 %prep
-%setup -q -n %{name}-%{version}-%{_subver}
+%setup -q
+%patch0 -p1
+%undos xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp
+%patch1 -p1
+%patch2 -p1
 
 %build
 ./bootstrap
-/bin/bash %configure \
-	--enable-external-libraries
+%configure \
+	--disable-debug \
+	--enable-external-libraries \
+	--%{?with_external_python:en}%{!?with_external_python:dis}able-external-python \
+	--%{?with_goom:en}%{!?with_goom:dis}able-goom
 %{__make}
 
 %install
@@ -97,10 +125,25 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%posttrans
+%banner -e xbmc <<EOF
+WARNING!
+If you use nvidia binary drivers be sure that SDL is compiled without
+XRandR and VidMode gamma ramps support.
+This means that you need to rebuild it with command:
+builder -bb --without new_gamma_ramp SDL
+EOF
+
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS CREDITS ChangeLog NEWS README THANKS TODO
+#doc AUTHORS CREDITS ChangeLog NEWS README THANKS TODO
 
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
+#%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}
+%{_docdir}/%{name}
+%{_desktopdir}/%{name}.desktop
+%{_iconsdir}/hicolor/256x256/apps/%{name}.png
+%{_iconsdir}/hicolor/48x48/apps/%{name}.png
+%{_datadir}/xsessions/XBMC.desktop