packages: xbmc/xbmc.spec, xbmc/xbmc-fpsrate.patch (REMOVED), xbmc/xbmc-noba...
wiget
wiget at pld-linux.org
Tue Mar 27 18:58:37 CEST 2012
Author: wiget Date: Tue Mar 27 16:58:37 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- merged from DEVEL
---- Files affected:
packages/xbmc:
xbmc.spec (1.29 -> 1.30) , xbmc-fpsrate.patch (1.1 -> NONE) (REMOVED), xbmc-nobash.patch (1.2 -> NONE) (REMOVED), xbmc-python27.patch (1.4 -> NONE) (REMOVED), xbmc-subtitle_tags.patch (1.3 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/xbmc/xbmc.spec
diff -u packages/xbmc/xbmc.spec:1.29 packages/xbmc/xbmc.spec:1.30
--- packages/xbmc/xbmc.spec:1.29 Sun Apr 3 01:01:31 2011
+++ packages/xbmc/xbmc.spec Tue Mar 27 18:58:32 2012
@@ -8,43 +8,35 @@
# 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
#
# Conditional build:
-%bcond_with external_python
%bcond_without goom
+%bcond_with hal
Summary: XBMC
Name: xbmc
-Version: 10.1
-Release: 0.2
+Version: 11.0
+Release: 1
License: GPL v3
Group: Applications/Multimedia
-Source0: http://www.softliste.de/xbmc/releases/source/%{name}-%{version}.tar.gz
-# Source0-md5: 391398126cb86a4f6fbd0b7037997d84
-Source1: goom_icon.png
-# Source1-md5: 8c0ffe2055f2cfde1189687d12a68aa8
+Source0: http://mirrors.xbmc.org/releases/source/xbmc-%{version}.tar.gz
+# Source0-md5: 9e8a26ee25173c7268abea7f1d82d428
URL: http://xbmc.org
-Patch0: %{name}-nobash.patch
-Patch1: %{name}-python27.patch
-Patch2: %{name}-subtitle_tags.patch
-Patch3: %{name}-goom_enable.patch
-Patch4: %{name}-fpsrate.patch
+BuildRequires: Mesa-libGLU-devel
+BuildRequires: OpenGL-devel
+BuildRequires: SDL-devel
BuildRequires: SDL_image-devel
BuildRequires: SDL_mixer-devel
-BuildRequires: a52dec-libs-devel
BuildRequires: alsa-lib-devel
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: avahi-devel
+BuildRequires: bluez-libs-devel >= 4.99
BuildRequires: boost-devel
BuildRequires: bzip2-devel
BuildRequires: cmake
BuildRequires: curl-devel
BuildRequires: dbus-devel
-BuildRequires: enca-devel
-BuildRequires: faac-devel
-BuildRequires: faad2-devel
BuildRequires: ffmpeg-devel
BuildRequires: flac-devel
BuildRequires: fontconfig-devel
@@ -55,24 +47,29 @@
BuildRequires: gettext-devel
BuildRequires: glew-devel
BuildRequires: gperf
-BuildRequires: gtk+-devel
+%if %{with hal}
BuildRequires: hal-devel
+%endif
BuildRequires: jasper-devel
-BuildRequires: libao-devel
+BuildRequires: libass-devel
+BuildRequires: libbluray-devel
BuildRequires: libcdio-devel
-BuildRequires: libdts-devel
+BuildRequires: libgcrypt-devel
BuildRequires: libjpeg-devel
BuildRequires: libmad-devel
BuildRequires: libmicrohttpd-devel
-BuildRequires: libmms-devel
BuildRequires: libmodplug-devel
BuildRequires: libmpeg2-devel
BuildRequires: libogg-devel
+BuildRequires: libplist-devel
BuildRequires: libpng-devel
+BuildRequires: librtmp-devel
BuildRequires: libsamplerate-devel
BuildRequires: libsmbclient-devel
+BuildRequires: libssh-devel
BuildRequires: libtiff-devel
BuildRequires: libtool
+BuildRequires: libva-devel
BuildRequires: libvdpau-devel
BuildRequires: libvorbis-devel
BuildRequires: lzo-devel
@@ -82,22 +79,38 @@
%endif
BuildRequires: openssl-devel
BuildRequires: pcre-cxx-devel
+BuildRequires: pcre-devel
BuildRequires: pkgconfig
BuildRequires: pulseaudio-devel
-BuildRequires: python-devel
+BuildRequires: python-devel >= 2.4
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.566
# used internally
BuildRequires: sed >= 4.0
BuildRequires: sqlite3-devel
+BuildRequires: udev-devel
BuildRequires: unzip
-BuildRequires: wavpack-devel
-BuildRequires: xmms-devel
+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXext-devel
BuildRequires: xorg-lib-libXinerama-devel
+BuildRequires: xorg-lib-libXmu-devel
BuildRequires: xorg-lib-libXrandr-devel
+BuildRequires: xorg-lib-libXt-devel
BuildRequires: xorg-lib-libXtst-devel
+BuildRequires: yajl-devel
BuildRequires: zip
BuildRequires: zlib-devel
+#https://github.com/sahlberg/libnfs
+#BuildRequires: libnfs-devel
+#http://sites.google.com/site/alexthepuffin/home
+#BuildRequires: afpfs-ng-devel
+#http://mirrors.xbmc.org/build-deps/darwin-libs/libshairport-1.2.0.20310_lib.tar.gz
+#https://github.com/albertz/shairport
+#BuildRequires: libshairport
+#http://www.broadcom.com/support/crystal_hd/
+#BuildRequires: crystalhd-devel
+#http://libcec.pulse-eight.com/
+#BuildRequires: libcec-devel >= 1.1.0
Requires: /usr/bin/glxinfo
Requires: SDL >= 1.2.14-5
Requires: lsb-release
@@ -108,37 +121,35 @@
%prep
%setup -q
-%patch0 -p1
-%undos xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
%build
./bootstrap
%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}
+ --enable-udev \
+ --disable-libcec \
+ --disable-libusb \
+ --disable-nfs \
+ --disable-afpclient \
+ --disable-airtunes \
+ --disable-crystalhd \
+ %{__enable_disable goom} \
+ %{__enable_disable hal}
+
+%{__make} V=1
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
- install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/xbmc/addons/visualization.goom/icon.png
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-#doc AUTHORS CREDITS ChangeLog NEWS README THANKS TODO
-
-#%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
%attr(755,root,root) %{_bindir}/*
%{_datadir}/%{name}
%attr(755,root,root) %{_libdir}/%{name}
@@ -154,6 +165,18 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.30 2012/03/27 16:58:32 wiget
+- merged from DEVEL
+
+Revision 1.29.2.3 2012/03/27 16:56:46 wiget
+- up to 11.0
+
+Revision 1.29.2.2 2012/03/12 14:31:07 lmasko
+- Hal is obsolete in TH, better make it a bcond, off by default.
+
+Revision 1.29.2.1 2012/03/08 23:58:35 wiget
+- up to 11.0-rc2
+
Revision 1.29 2011/04/02 23:01:31 charles
- rel up
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/xbmc/xbmc.spec?r1=1.29&r2=1.30
More information about the pld-cvs-commit
mailing list