Changes - j0ke.net Open Build Service

Changes of Revision 17

[-] [+]	Changed	xine-lib.spec
@@ -26,19 +26,20 @@ # --without distributable -> build libxine1-codecs # # default for buildservice is no patented codecs +%bcond_without distributable %bcond_with onlynondistributable %if 0%{suse_version} >= 1100 %bcond_without pulseaudio %else %bcond_with pulseaudio %endif -%bcond_without sdl -%bcond_without aalib -%bcond_without arts -%bcond_without esd -%bcond_without jack +%bcond_with sdl +%bcond_with aalib +%bcond_with arts +%bcond_with esd +%bcond_with jack %bcond_without gnome_vfs -%bcond_without directfb +%bcond_with directfb %if 0%{suse_version} > 1110 %bcond_without modplug %else @@ -52,7 +53,7 @@ BuildRequires: libcdio-devel libdrm-devel libmng-devel libsmbclient BuildRequires: Mesa-devel libsmbclient-devel libtheora-devel libvorbis-devel BuildRequires: readline-devel update-desktop-files vcdimager-devel -BuildRequires: libspeex-devel +BuildRequires: speex-devel %if 0%{suse_version} >= 1110 BuildRequires: libv4l-devel %endif @@ -100,7 +101,7 @@ BuildRequires: libmodplug-devel %endif Version: 1.1.19 -Release: 1.pm.44.5 +Release: 45 # bug437293 %ifarch ppc64 Obsoletes: xine-lib-64bit @@ -123,6 +124,7 @@ Patch26: xine-lib-doc-fix-X11R6.diff Patch28: xine-lib-%{version}-ia64-is-not-alpha.diff Patch31: xine-lib-%{version}-glitch-free-pulseaudio.patch +Patch32: http://repos.archlinux.org/wsvn/packages/xine-lib/trunk/xine-lib-1.1.19-xvmc.patch # *** Addons Patch50: vdr-xine-0.9.3.diff.bz2 Patch51: vdr-xine-SUSE.diff @@ -630,6 +632,7 @@ %patch26 %patch28 -p1 %patch31 -p1 +%patch32 -p0 %if 0%{suse_version} >= 1110 # set fuzzy=2 to get patch work with crippled and noncrippled tarball %patch50 -p1 -F2 @@ -721,7 +724,7 @@ # install documentation install -m 0644 %{SOURCE10} COPYING AUTHORS %{buildroot}%{_defaultdocdir}/xine/ %if !%{with distributable} -touch ${RPM_BUILD_ROOT}%{_datadir}/xine/mad \|\| echo "can't touch" +touch ${RPM_BUILD_ROOT}%{_datadir}/xine/mad %endif # remove usless READMEs rm %{buildroot}%{_defaultdocdir}/xine/README.{irix,solaris,WIN32} @@ -896,7 +899,7 @@ xargs -i+ strip --strip-debug %{buildroot}/+ <files.codecs %endif %endif -%if %{with distributable} +%if %{with onlynondistributable} for i in files files.; do test "$i" = 'files.codecs' \|\| xargs -i+ rm -f %{buildroot}/+ < $i done @@ -909,7 +912,7 @@ %clean rm -rf %{buildroot} -%if !%{with distributable} +%if !%{with onlynondistributable} %post -n libxine1 -p /sbin/ldconfig @@ -1002,6 +1005,8 @@ %endif %changelog + Thu Nov 18 2010 coolo@novell.com +- add patch from arch linux to fix build with newer xorg * Tue Aug 3 2010 lnussel@suse.de - remove unneeded libcdio-mini-devel buildignore again * Mon Jul 26 2010 Manfred.Tremmel@iiv.de
[-] [+]	Added	xine-lib-1.1.19-xvmc.patch ^
@@ -0,0 +1,17 @@ +Quoting ChangeLog of X11's videoproto package: +vldXvMC.h: stop uselessly including XvMClib.h + +--- src/video_out/xxmc.h ++++ src/video_out/xxmc.h +@@ -77,10 +77,10 @@ + #include <X11/extensions/XShm.h> + #include <X11/extensions/Xv.h> + #include <X11/extensions/Xvlib.h> ++#include <X11/extensions/XvMClib.h> + #ifdef HAVE_VLDXVMC + #include <X11/extensions/vldXvMC.h> + #else +- #include <X11/extensions/XvMClib.h> + #include <X11/extensions/XvMC.h> + #endif +