Author: w.kier Date: Wed Dec 22 18:44:21 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 10.0
added patch to compile against python 2.7
executables moved to _libdir/xbmc
---- Files affected:
packages/xbmc:
xbmc.spec (1.14 -> 1.15)
---- Diffs:
================================================================
Index: packages/xbmc/xbmc.spec
diff -u packages/xbmc/xbmc.spec:1.14 packages/xbmc/xbmc.spec:1.15
--- packages/xbmc/xbmc.spec:1.14 Fri Apr 9 23:31:23 2010
+++ packages/xbmc/xbmc.spec Wed Dec 22 19:44:16 2010
@@ -3,20 +3,27 @@
# TODO:
# - fix build flags - some files are compiled with -O3 and without rpm*flags
# - fix linking argument order
-# - fix install - add DESTDIR support
-# - don't put binary in %{_datadir} and fix start scripts
+# - fix nvidia vs. libXrandr >= 1.2 conflict (nvidia drivers still supports
+# only libXrandr 1.1 - with no gamma support)
+# - add and/or fix users/groups permissions
+# - didvide to subpackages?
+# - check how it works with external python libraries
#
+# Conditional build:
+%bcond_with external_python
+
Summary: XBMC
Name: xbmc
-Version: 9.11
+Version: 10.0
Release: 0.1
License: GPL v3
Group: Applications/Multimedia
Source0:
http://downloads.sourceforge.net/project/xbmc/XBMC%20Source%20Code/Camelot%20-%209.11/%{name}-%{version}.tar.gz
-# Source0-md5: 9a68ac1e2f44a54cc3803fcdb1265767
+# Source0-md5: 728fb514e5f43f27bb880305061b4e72
URL: http://xbmc.org
Patch0: %{name}-nobash.patch
-Patch1: %{name}-libpng14.patch
+Patch1: %{name}-python27.patch
+Patch2: %{name}-libpng14.patch
BuildRequires: SDL_image-devel
BuildRequires: SDL_mixer-devel
BuildRequires: a52dec-libs-devel
@@ -30,7 +37,6 @@
BuildRequires: curl-devel
BuildRequires: dbus-devel
BuildRequires: enca-devel
-BuildRequires: esound-devel
BuildRequires: faac-devel
BuildRequires: faad2-devel
BuildRequires: ffmpeg-devel
@@ -39,6 +45,7 @@
BuildRequires: freetype-devel
BuildRequires: fribidi-devel
BuildRequires: gawk
+BuildRequires: gettext-autopoint
BuildRequires: gettext-devel
BuildRequires: glew-devel
BuildRequires: gperf
@@ -50,6 +57,8 @@
BuildRequires: libdts-devel
BuildRequires: libjpeg-devel
BuildRequires: libmad-devel
+BuildRequires: libmicrohttpd-devel
+BuildRequires: libmodplug-devel
BuildRequires: libmms-devel
BuildRequires: libmpeg2-devel
BuildRequires: libogg-devel
@@ -66,6 +75,7 @@
BuildRequires: nasm
%endif
BuildRequires: openssl-devel
+BuildRequires: pcre-cxx-devel
BuildRequires: pkgconfig
BuildRequires: pulseaudio-devel
BuildRequires: python-devel
@@ -83,6 +93,7 @@
BuildRequires: zlib-devel
Requires: lsb-release
Requires: xorg-app-xdpyinfo
+Requires: /usr/bin/glxinfo
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -91,20 +102,21 @@
%setup -q
%patch0 -p1
%patch1 -p1
+#%patch2 -p1
%build
./bootstrap
%configure \
--disable-debug \
--enable-external-libraries \
- --enable-external-python
+
--%{?with_external_python:en}%{!?with_external_python:dis}able-external-python
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
- prefix=$RPM_BUILD_ROOT%{_prefix}
+ DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@@ -116,10 +128,11 @@
#%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
%attr(755,root,root) %{_bindir}/*
%{_datadir}/%{name}
-%attr(755,root,root) %{_datadir}/%{name}/xbmc.bin
-%attr(755,root,root) %{_datadir}/%{name}/xbmc-xrandr
+%attr(755,root,root) %{_libdir}/%{name}
+%{_docdir}/%{name}
%{_desktopdir}/%{name}.desktop
-%{_pixmapsdir}/%{name}.png
+%{_iconsdir}/hicolor/256x256/apps/%{name}.png
+%{_iconsdir}/hicolor/48x48/apps/%{name}.png
%{_datadir}/xsessions/XBMC.desktop
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -129,6 +142,11 @@
$Log$
+Revision 1.15 2010/12/22 18:44:16 w.kier
+- updated to 10.0
+ added patch to compile against python 2.7
+ executables moved to _libdir/xbmc
+
Revision 1.14 2010/04/09 21:31:23 charles
- added -libpng14.patch
- added --disable-debug --enable-external-python options
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xbmc/xbmc.spec?r1=1.14&r2=1.15&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
