diff --git a/xine-lib.changes b/xine-lib.changes index 0451969..6002fbc 100644 --- a/xine-lib.changes +++ b/xine-lib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 15 06:43:14 UTC 2017 - olaf@aepfle.de + +- Build unconditionally with modplug and pulseaudio + ------------------------------------------------------------------- Thu Jul 6 10:15:58 UTC 2017 - olaf@aepfle.de diff --git a/xine-lib.spec b/xine-lib.spec index 322087c..7d5309d 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -26,7 +26,6 @@ Name: xine-lib # default for buildservice is no patented codecs %bcond_without distributable %bcond_with onlynondistributable -%bcond_without pulseaudio %if 0%{?suse_version} > 1320 BuildRequires: gcc %else @@ -46,7 +45,6 @@ BuildRequires: gcc5 %bcond_with jack %bcond_without gnome_vfs %bcond_with directfb -%bcond_without modplug # BuildRequires: ImageMagick-devel BuildRequires: Mesa-devel @@ -92,9 +90,7 @@ BuildRequires: pkgconfig(libva-glx) BuildRequires: pkgconfig(mad) BuildRequires: pkgconfig(vdpau) %endif -%if %{with pulseaudio} BuildRequires: libpulse-devel -%endif %if %{with sdl} BuildRequires: SDL-devel %endif @@ -114,9 +110,7 @@ BuildRequires: libjack-devel %if %{with directfb} BuildRequires: DirectFB-devel %endif -%if %{with modplug} BuildRequires: libmodplug-devel -%endif Version: 1.2.8 Release: 0 %define abiversion 2.6 @@ -267,8 +261,6 @@ Autoren: -------- Guenter Bartsch -%if %{with pulseaudio} - %package -n libxine2-pulse Summary: Pulseaudio plugin for xine License: GPL-2.0+ and SUSE-Public-Domain @@ -293,7 +285,6 @@ libxine Soundausgabeplugin für den Pulseaudio Soundserver Autoren: -------- Guenter Bartsch -%endif %if %{with sdl} @@ -609,7 +600,7 @@ AUTOPOINT=true autoreconf -fi --with-libflac \ --with-freetype \ --enable-v4l \ - %{?with_modplug:--enable-modplug} \ + --enable-modplug \ %{?with_directfb:--enable-directfb} \ %if !%{with sdl} --without-sdl \ @@ -854,11 +845,8 @@ rm -rf %{buildroot} %dir %{_libdir}/xine/plugins/%{abiversion}/vidix %endif -%if %{with pulseaudio} - %files -n libxine2-pulse -f files.pulse %defattr(-,root,root,0755) -%endif %if %{with sdl}