%define name xbmc %define branch pvr-testing2 # this version is not backported to stable as xbmc.org warns against it %define version 9.11 # the svn revision of the end-result: %define svnsnap 29467 # the svn revision of the tarball: %define basesnap 29467 %define rel 1 Summary: XBMC Media Center - media player and home entertainment system Name: %{name} Version: %{version} %define branchr %(echo %branch | tr - _) Release: %mkrel 1.svn%svnsnap.%branchr.%rel URL: http://xbmc.org/ # URL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2 # REV=$(svn info $URL| sed -ne 's/^Last Changed Rev: //p') # svn export -r $REV $URL xbmc-pvr-testing2-$REV # tar -cJf xbmc-pvr-testing2-$REV.tar.xz xbmc-pvr-testing2-$REV # or # git archive --prefix=xbmc-pvr-testing2-$REV/ origin/pvr-testing2 | # xz > xbmc-pvr-testing2-$REV.tar.xz Source: %{name}-%{branch}-%basesnap.tar.xz # Patches from upstream and related patches resolving merge conflicts # ================================= # bring snapshot up-to-date with pvr-testing2 branch: #already up-to-date #Patch0: xbmc-pvr-testing2-%basesnap-to-27596.patch # bring snapshot up-to-date with trunk: # git diff -a c1a3427fea..628eb326755f2a #up-to-date enough #Patch1: xbmc-pvr-testing2-merge-trunk-29464-%svnsnap.patch # Upstreamable patches fixing upstream bugs # =============================== # fix build with older ffmpeg Patch20: xbmc-old-avcodec-without-h264profile-export.patch # fix missing -fPIC Patch21: xbmc-projectm-fpic.patch # add versioning to avcodec ac3 workaround Patch22: xbmc-versionize-avcodec-ac3-workaround.patch # Non-upstreamable patches for upstream bugs # ============================= # code assumes 4 byte unicode on linux, while our python has 2 byte unicode # hack, reported as http://xbmc.org/trac/ticket/8430 Patch41: xbmc-python-unicode-2byte.patch # Patches for policy compatibility, not necessarily "real" upstream bugs # ================================ # fix various undefined symbols in submodules # quick hacks, not proper fixes (also, normally upstream links many unneeded # libs into the main executable so that the dependencies of submodules are # satisfied; this doesn't happen with our --as-needed) Patch61: xbmc-fix-undefined-symbols.patch # same as above but for PVR symbols: Patch62: xbmc-pvr-testing2-underlinking.patch # hacks to load modules from @XBMCLIBS@ (set in %%prep) Patch63: xbmc-fhs-hack.patch Patch64: xbmc-addons-fhs-hack.patch # build faad,dca support with internal headers, but do not build the # libraries themselves; use system copies with dlopen instead; # this allows keeping them as optional external libraries Patch65: xbmc-hack-ext-libs-with-int-headers.patch License: GPLv3+ Group: Video BuildRoot: %{_tmppath}/%{name}-root BuildRequires: boost-devel BuildRequires: ffmpeg-devel BuildRequires: libmpeg2dec-devel BuildRequires: libogg-devel BuildRequires: libwavpack-devel BuildRequires: python-devel BuildRequires: glew-devel BuildRequires: mesagl-devel BuildRequires: mesaglu-devel BuildRequires: libmad-devel BuildRequires: libjpeg-devel BuildRequires: libsamplerate-devel BuildRequires: libvorbis-devel BuildRequires: bzip2-devel BuildRequires: mysql-devel BuildRequires: liblzo2-devel BuildRequires: zlib-devel BuildRequires: openssl-devel BuildRequires: fontconfig-devel BuildRequires: fribidi-devel BuildRequires: sqlite3-devel BuildRequires: libpng-devel BuildRequires: libpcre-devel BuildRequires: libcdio-devel BuildRequires: libmms-devel BuildRequires: freetype2-devel BuildRequires: libflac-devel BuildRequires: libsmbclient-devel BuildRequires: SDL_mixer-devel BuildRequires: libjasper-devel BuildRequires: libtiff-devel BuildRequires: SDL_image-devel BuildRequires: libalsa-devel BuildRequires: enca-devel BuildRequires: libxt-devel BuildRequires: libxtst-devel BuildRequires: libxmu-devel BuildRequires: libxinerama-devel BuildRequires: libcurl-devel BuildRequires: dbus-devel BuildRequires: hal-devel BuildRequires: SDL-devel BuildRequires: pulseaudio-devel BuildRequires: avahi-common-devel BuildRequires: avahi-client-devel BuildRequires: libxrandr-devel BuildRequires: vdpau-devel BuildRequires: cwiid-devel BuildRequires: libice-devel BuildRequires: libx11-devel BuildRequires: crystalhd-devel BuildRequires: libmicrohttpd-devel BuildRequires: libmodplug-devel BuildRequires: a52dec-devel BuildRequires: ssh-devel BuildRequires: libva-devel BuildRequires: gettext-devel BuildRequires: expat-devel BuildRequires: cmake BuildRequires: gperf BuildRequires: zip %ifarch %ix86 BuildRequires: nasm %endif BuildRequires: imagemagick # presently unpackaged, internal version used: # BuildRequires: libass-devel # dts and faad support use internal headers as per above patch Requires: %{name}-core = %{version}-%{release} Requires: %{name}-skin-confluence Requires: %{name}-skin-pm3-hd Requires: %{name}-screensavers-default = %{version}-%{release} Suggests: %{name}-nosefart = %{version}-%{release} %description XBMC is an award-winning free and open source software media player and entertainment hub for digital media. While XBMC functions very well as a standard media player application for your computer, it has been designed to be the perfect companion for your HTPC. Supporting an almost endless range of remote controls, and combined with its beautiful interface and powerful skinning engine, XBMC feels very natural to use from the couch and is the ideal solution for your home theater. This is the development version of XBMC from pvr-testing2 branch, with VDR streamdev support. Support for RAR files and XBMS protocol is not included due to license issues. This package provides the standard XBMC suite. %package core Summary: XBMC Media Center - core files Group: Video Requires: lsb-release # dlopened: (see prep stage for changing sonames in xbmc/DllPaths_generated.h.in) Requires: %{_lib}curl4 Requires: %{_lib}flac8 Requires: %{_lib}vorbisfile3 Requires: %{_lib}mad0 Requires: %{_lib}ogg0 Requires: %{_lib}vorbisenc2 Requires: %{_lib}vorbis0 Requires: %{_lib}modplug0 # not nearly as common as the above, so suggest instead for now: Suggests: %{_lib}crystalhd1 Requires: xbmc-skin # for FEH.py, to check current configuration is ok for xbmc: Requires: xdpyinfo %if %{mdkversion} >= 201010 Requires: glxinfo %else Requires: mesa-demos %endif # for FEH.py to allow it to give an error message (should be available already # on most systems): Requires: pygtk2 # Packages not shipped by Mandriva: Suggests: %{_lib}faad2_2 Suggests: %{_lib}lame0 Suggests: %{_lib}dca0 Suggests: %{_lib}dvdcss2 Obsoletes: xbmc-script-examples < 9.11-1.svn27796 Obsoletes: xbmc-web-pm3 < 9.11-1.svn27796 %description core XBMC is an award-winning free and open source software media player and entertainment hub for digital media. This package contains the core files of XBMC from pvr-testing2 branch, with VDR streamdev support. See package 'xbmc' for the full suite. Support for RAR files and XBMS protocol is not included due to license issues. %package devel Summary: XBMC addon development files Group: Development/C++ Requires: %{name}-core = %{version}-%{release} %description devel Development headers and library symlinks needed for building XBMC addons. This package is not needed for normal XBMC usage. %package skin-confluence Summary: Confluence skin for XBMC Group: Video Requires: %{name}-core = %{version}-%{release} Provides: xbmc-skin %description skin-confluence XBMC is an award-winning free and open source software media player and entertainment hub for digital media. This is the version from pvr-testing2 branch, with VDR support. This package contains the Confluence skin for XBMC. %package skin-pm3-hd Summary: Project Mayhem III HD skin for XBMC Group: Video Requires: %{name}-core = %{version}-%{release} Provides: xbmc-skin %description skin-pm3-hd XBMC is an award-winning free and open source software media player and entertainment hub for digital media. This is the version from pvr-testing2 branch, with VDR support. This package contains the PM3.HD (Project Mayhem III High Definition) skin for XBMC. %package nosefart Summary: NSF audio support for XBMC Group: Video License: GPLv2 Requires: %{name}-core = %{version}-%{release} %description nosefart NSF audio support for XBMC PVR testing version, via nosefart library. %package screensavers-default Summary: Default screensavers for XBMC Group: Video License: GPLv2 Requires: %{name}-core = %{version}-%{release} %description screensavers-default Default screensavers for XBMC PVR testing version, based on RSXS. %package eventclients-common Summary: Common files for XBMC eventclients Group: Video %py_requires # required by zeroconf.py, only used by PS3 sixaxis client, # not installed by default: # Requires: python-gobject avahi-python python-dbus %description eventclients-common XBMC is an award-winning free and open source software media player and entertainment hub for digital media. This is the version from pvr-testing2 branch, with VDR support. This package contains common files for eventclients. %package eventclients-devel Summary: Development files for XBMC eventclients Group: Development/C %description eventclients-devel XBMC is an award-winning free and open source software media player and entertainment hub for digital media. This is the version from pvr-testing2 branch, with VDR support. This package contains files needed to build eventclients. %package eventclient-wiiremote Summary: Wii Remote eventclient for XBMC Group: Video Requires: %{name}-eventclients-common = %{version}-%{release} %description eventclient-wiiremote XBMC is an award-winning free and open source software media player and entertainment hub for digital media. This is the version from pvr-testing2 branch, with VDR support. This package contains the Wii Remote eventclient. %package eventclient-j2me Summary: J2ME eventclient for XBMC Group: Video Requires: python-pybluez Requires: %{name}-eventclients-common = %{version}-%{release} %description eventclient-j2me XBMC is an award-winning free and open source software media player and entertainment hub for digital media. This is the version from pvr-testing2 branch, with VDR support. This package contains the J2ME eventclient, providing a bluetooth server that can communicate with a mobile tool supporting J2ME. %package eventclient-ps3remote Summary: PS3 Remote eventclient for XBMC Group: Video Requires: python-pybluez Requires: %{name}-eventclients-common = %{version}-%{release} %description eventclient-ps3remote XBMC is an award-winning free and open source software media player and entertainment hub for digital media. This is the version from pvr-testing2 branch, with VDR support. This package contains the PS3 Remote eventclient. %package eventclient-xbmc-send Summary: PS3 eventclient for XBMC Group: Video Requires: %{name}-eventclients-common = %{version}-%{release} %description eventclient-xbmc-send XBMC is an award-winning free and open source software media player and entertainment hub for digital media. This is the version from pvr-testing2 branch, with VDR support. This package contains the xbmc-send eventclient. %prep %setup -q -n %name-%{branch}-%basesnap # make the patches affecting strings.xml from git apply to sources from svn: sed -i 's,^<!--\$Revision: [0-9]* \$-->$,<!--\$Revision\$-->,' language/*/strings.xml %apply_patches # otherwise backups end up in binary rpms find -type f -name '*.00??' -print -delete # remove prebuilt libraries find -type f \( -iname '*.so' -o -iname '*.dll' -o -iname '*.exe' \) -delete sed -i 's,special://xbmc/system,%{_libdir}/xbmc/system,g' xbmc/DllPaths_generated.h.in sed -i 's,getenv("XBMC_HOME"),"%{_libdir}/xbmc",g' xbmc/linux/XRandR.cpp sed -i 's,@XBMCLIBS@,%{_libdir}/xbmc,g' tools/Linux/xbmc.sh.in sed -i 's,@XBMCLIBS@,"%{_libdir}/xbmc",g' \ xbmc/cores/DllLoader/DllLoaderContainer.cpp \ xbmc/lib/libPython/XBPython.cpp \ xbmc/addons/AddonDll.h \ xbmc/addons/AddonManager.cpp # adapt sonames for dlopen: grep -q libcrystalhd.so\" xbmc/DllPaths_generated.h.in sed -i 's,"libcrystalhd.so","libcrystalhd.so.1",' xbmc/DllPaths_generated.h.in # GPLv2 only rm -r xbmc/lib/cmyth/Win32/include/mysql # BSD 4-clause rm -r xbmc/cores/DllLoader/exports/emu_socket # fix python directory sed -i 's,python.\../site,python%py_ver/site,' tools/EventClients/Makefile mkdir -p fake_libs # fake libfaad.so.. this is dlopened, here just for configure script gcc -xc /dev/null -o fake_libs/libfaad.so -shared -Wl,-soname,libfaad.so.2 sed -i "s,file-name=libfaad.so,file-name=$PWD/fake_libs/libfaad.so," configure.in %build export SVN_REV=%svnsnap ./bootstrap # fixes build autoreconf -vif lib/libmodplug # due to xbmc modules that use symbols from xbmc binary %define _disable_ld_no_undefined 1 # some parts are compiled/linked without $C(XX)FLAGS and linked without $LDFLAGS, # workaround it by adding those into $CC and $CXX (as of 2010-04): export CC="gcc %optflags %{?ldflags}" export CXX="g++ %optflags %{?ldflags}" %configure2_5x \ --disable-ccache \ --enable-external-libraries \ --disable-non-free \ --disable-dvdcss \ --disable-faac \ --enable-goom # non-free = unrar + xbms # dvdcss is handled via dlopen when disabled # faac is always handled via libavcodec %make %make -C tools/EventClients wiimote WII_EXTRA_OPTS="%{optflags} %{?ldflags}" prefix=%{_prefix} # prevent recompilation in install stage: touch tools/EventClients/wiimote %install rm -rf %{buildroot} %makeinstall %makeinstall -C tools/EventClients # in %%doc already: rm %{buildroot}%{_datadir}/xbmc/{*.txt,LICENSE.GPL,README.linux} # unused rm %{buildroot}%{_datadir}/xsessions/XBMC.desktop # our version of the above: install -d -m755 %{buildroot}%{_sysconfdir}/X11/wmsession.d cat > %{buildroot}%{_sysconfdir}/X11/wmsession.d/15XBMC <<EOF NAME=XBMC ICON=xbmc.png DESC=XBMC Media Center EXEC=%{_bindir}/xbmc-standalone SCRIPT: exec %{_bindir}/xbmc-standalone EOF # when adding files here remember to make sure they are handled in fhs-hack.patch! for file in \ %{buildroot}%{_datadir}/xbmc/xbmc.bin \ %{buildroot}%{_datadir}/xbmc/xbmc-xrandr \ %{buildroot}%{_datadir}/xbmc/system/*.so \ %{buildroot}%{_datadir}/xbmc/system/players/dvdplayer/*.so \ %{buildroot}%{_datadir}/xbmc/system/players/paplayer/*.so \ %{buildroot}%{_datadir}/xbmc/system/python/*.so \ %{buildroot}%{_datadir}/xbmc/addons/*/*.pvr \ %{buildroot}%{_datadir}/xbmc/addons/*/*.xbs \ %{buildroot}%{_datadir}/xbmc/addons/*/*.vis \ %{buildroot}%{_datadir}/xbmc/addons/*/*.so \ ; do dirname="$(dirname "$file")" dirname="${dirname#%{buildroot}%{_datadir}/xbmc}" install -d -m755 "%{buildroot}%{_libdir}/xbmc$dirname" mv "$file" "%{buildroot}%{_libdir}/xbmc/$dirname/" done # icons file %{buildroot}%{_datadir}/pixmaps/xbmc.png | grep -q 256 || exit 1 install -m644 -D %{buildroot}%{_datadir}/pixmaps/xbmc.png %{buildroot}%{_iconsdir}/hicolor/256x256/apps/xbmc.png for size in 64 48 32 16; do install -d -m755 %{buildroot}%{_iconsdir}/hicolor/${size}x${size}/apps convert %{buildroot}%{_datadir}/pixmaps/xbmc.png -resize $size %{buildroot}%{_iconsdir}/hicolor/${size}x${size}/apps/xbmc.png done # implement the above disabled --no-undefined ourselves, taking symbols in # xbmc.bin into account undefined= fhserr= echo Silencing output of ELF verification set +x for file in $(find %{buildroot} -type f -not -name '* *'); do type="$(file "$file")" echo "$type" | grep -q "ELF" || continue echo "$file" | grep -q "%{_datadir}" && fhserr="${fhserr}$file\n" echo "$type" | grep -q "shared object" || continue for symbol in $(LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}%{_libdir} ldd -r "$file" 2>&1 | grep undefined | awk '{ print $3 }'); do nm -f posix -D --defined-only --no-demangle %{buildroot}%{_libdir}/xbmc/xbmc.bin | grep -q "^$symbol " && continue undefined="${undefined}$file: $symbol\n" done done set -x ok=1 # fix-undefined-symbols.patch [ -n "$undefined" ] && echo -e "$undefined" && echo "Undefined symbols, update fix-undefined-symbols.patch!" && ok= # fhs-hack.patch [ -n "$fhserr" ] && echo -e "$fhserr" && echo "Binaries in datadir!" && ok= [ -n "$ok" ] %clean rm -rf %{buildroot} %files %defattr(-,root,root) %files core %defattr(-,root,root) %doc README.linux LICENSE.GPL copying.txt keymapping.txt %{_sysconfdir}/X11/wmsession.d/15XBMC %{_bindir}/xbmc %{_bindir}/xbmc-standalone %dir %{_libdir}/xbmc %dir %{_libdir}/xbmc/addons %dir %{_libdir}/xbmc/system %dir %{_libdir}/xbmc/system/players %dir %{_libdir}/xbmc/system/players/dvdplayer %dir %{_libdir}/xbmc/system/players/paplayer %dir %{_libdir}/xbmc/system/python %{_libdir}/xbmc/xbmc.bin %{_libdir}/xbmc/xbmc-xrandr %dir %{_libdir}/xbmc/addons/* %{_libdir}/xbmc/addons/*/*.so %{_libdir}/xbmc/addons/*/*.pvr %{_libdir}/xbmc/addons/*/*.vis %exclude %{_libdir}/xbmc/addons/net.sf.rsxs.* %{_libdir}/xbmc/system/ImageLib-*-linux.so %{_libdir}/xbmc/system/hdhomerun-*-linux.so %{_libdir}/xbmc/system/libcpluff-*-linux.so %{_libdir}/xbmc/system/libexif-*-linux.so %{_libdir}/xbmc/system/libid3tag-*-linux.so %{_libdir}/xbmc/system/players/dvdplayer/libass-*-linux.so %{_libdir}/xbmc/system/players/dvdplayer/libdvdnav-*-linux.so %{_libdir}/xbmc/system/players/paplayer/ac3codec-*-linux.so %{_libdir}/xbmc/system/players/paplayer/adpcm-*-linux.so %{_libdir}/xbmc/system/players/paplayer/gensapu-*-linux.so %{_libdir}/xbmc/system/players/paplayer/libsidplay2-*-linux.so %{_libdir}/xbmc/system/players/paplayer/stsoundlibrary-*-linux.so %{_libdir}/xbmc/system/players/paplayer/timidity-*-linux.so %{_libdir}/xbmc/system/players/paplayer/vgmstream-*-linux.so %ifarch %ix86 %{_libdir}/xbmc/system/players/paplayer/SNESAPU-*-linux.so %endif %{_libdir}/xbmc/system/python/python*-*-linux.so %dir %{_datadir}/xbmc %{_datadir}/xbmc/addons %exclude %{_datadir}/xbmc/addons/net.sf.rsxs.* %{_datadir}/xbmc/FEH.py %{_datadir}/xbmc/language %{_datadir}/xbmc/media %dir %{_datadir}/xbmc/scripts %{_datadir}/xbmc/scripts/autoexec.py %dir %{_datadir}/xbmc/skin %{_datadir}/xbmc/sounds # FIXME: there are bundled fontconfig config files in xbmc/system/players/dvdplayer. # they are probably unused already, but this has to be confirmed %{_datadir}/xbmc/system %{_datadir}/xbmc/userdata %{_datadir}/xbmc/web %{_datadir}/applications/xbmc.desktop %{_datadir}/pixmaps/xbmc.png %{_iconsdir}/hicolor/*/apps/xbmc.png %files devel %defattr(-,root,root) %dir %{_includedir}/xbmc %{_includedir}/xbmc/xbmcclient.h %files skin-confluence %defattr(-,root,root) %{_datadir}/xbmc/skin/Confluence %files skin-pm3-hd %defattr(-,root,root) %{_datadir}/xbmc/skin/PM3.HD %files screensavers-default %defattr(-,root,root) %{_libdir}/xbmc/addons/net.sf.rsxs.* %{_datadir}/xbmc/addons/net.sf.rsxs.* %files nosefart %defattr(-,root,root) %{_libdir}/xbmc/system/players/paplayer/nosefart-*-linux.so %files eventclients-common %defattr(-,root,root) %python_sitelib/xbmc %dir %{_datadir}/pixmaps/xbmc %{_datadir}/pixmaps/xbmc/*.png %files eventclients-devel %defattr(-,root,root) %dir %{_includedir}/xbmc %{_includedir}/xbmc/xbmcclient.h %files eventclient-j2me %defattr(-,root,root) %{_bindir}/xbmc-j2meremote %files eventclient-ps3remote %defattr(-,root,root) %{_bindir}/xbmc-ps3remote %files eventclient-xbmc-send %defattr(-,root,root) %{_bindir}/xbmc-send %files eventclient-wiiremote %defattr(-,root,root) %{_bindir}/xbmc-wiiremote %changelog * Sun Apr 25 2010 Anssi Hannula <anssi@mandriva.org> 9.11-1.svn29467.pvr_testing2.1mdv2010.1 + Revision: 538787 - fix soname discovery workaround - versionize upstream avcodec ac3 workaround, now fixed in libavcodec (versionize-avcodec-ac3-workaround.patch) - new snapshot - add buildrequires on ssh-devel, libva-devel, gettext-devel, expat-devel - re-enable parallel make - re-enable now-existing mediaportal linux client - adapt filelists for addon changes - fix projectm build (projectm-fpic.patch) - fix build with old avcodec (old-avcodec-without-h264profile-export.patch) - update addons-fhs-hack.patch, underlinking.patch, undefined-symbols.patch - remove patches applied upstream: xbmc-glxvisuals.patch, python-module-no-as-needed.patch, fix-glib2.23.4.patch, goom-strfmt.patch, fix-save-settings.patch - remove patches for issues fixed upstream: default-addons.patch, stsound-fix-missing-files.patch, xbmc-addon-httpapi.patch, merge-actions.patch - remove now unneeded patches: addon-sonames.patch * Fri Mar 12 2010 Anssi Hannula <anssi@mandriva.org> 9.11-1.svn28014.pvr_testing2.3mdv2010.1 + Revision: 518586 - fix build with glib2 2.23.4+ (workaround use of 'byte' as a parameter name in gvariant.h) - remove trailing whitespace from .spec - new snapshot (pvr-testing2 r2800 + trunk r28014) - drop xbmc-weather.zip, added upstream - move addon binaries to libdir as well (addons-fhs-hack.patch) - fix sonames of newly introduced addon helper shared libs (addon-sonames.patch) - fix underlinking of VDR client (pvr-testing2-underlinking.patch) - fix build by disabling unused code in addon api (addon-httpapi.patch) - rediff hack-ext-libs-with-int-headers.patch and xbmc-fhs-hack.patch - remove xbmc-timidity-format-strings.patch, applied upstream - load bundled addons (except for PVR clients) by default as before (default-addons.patch) - enable goom visualization addon - fix format strings in goom (goom-strfmt.patch) - update xbmc-fix-undefined-symbols.patch for goom - fix saving of addon settings (fix-save-settings.patch) - improve OpenGL visual selection algorithm (glxvisuals.patch) - migrate pvr-testing2 to use CAction as in trunk (merge-actions.patch) - renumber patches and categorize them - update buildrequires for upstream changes (added libmicrohttpd-devel, libmodplug-devel, zip) - remove xbmc-web-pm3 subpackage as it has been removed upstream (simple json interface is not included in main package) - remove xbmc-script-examples as it has been removed upstream - add devel subpackage for building addons - update .spec comments - remove now unneeded steps from .spec - re-enable parallel build - remove mediaportal client completely as the binary is not built on linux yet - show both undefined symbols and FHS errors in case both kind of errors are detected in install stage - add a comment regarding probably unused fontconfig files in datadir * Sun Jan 31 2010 Anssi Hannula <anssi@mandriva.org> 9.11-1.svn27303.pvr_testing2.1mdv2010.1 + Revision: 498857 - new snapshot (r27303 of pvr-testing2) - remove patches applied upstream (gpl-compat.patch, fix-crash.patch, format-strings.patch, fix-trunk-merge.patch) - build with crystalhd support - fix python2.6 syntax errors in spyce (spyce.diff from rpmfusion) - re-enable FEH.py and therefore add requires on glxinfo, xdpyinfo, pygtk2 - fix coding style in timidity-format-strings.patch - rediff hack-ext-libs-with-int-headers.patch - add information about disabled features into descriptions * Sun Jan 17 2010 Anssi Hannula <anssi@mandriva.org> 9.11-1.svn26907.pvr_testing2.1mdv2010.1 + Revision: 492845 - initial Mandriva release