From 0607cdab7c762334840ff7c3ddbe96f1e7b82910f7b6704dc29cf82b0110180e Mon Sep 17 00:00:00 2001 From: Manfred Tremmel Date: Wed, 24 Feb 2010 22:22:08 +0000 Subject: [PATCH] xine-lib: libv4l only available for SUSE >= 11.1 OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=28 --- xine-lib.changes | 2 +- xine-lib.spec | 24 +++++++++++++++++------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/xine-lib.changes b/xine-lib.changes index 74eff7f..62eed31 100644 --- a/xine-lib.changes +++ b/xine-lib.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Wed Feb 24 20:20:00 CEST 2009 - Manfred.Tremmel@iiv.de +Wed Feb 24 23:14:00 CEST 2010 - Manfred.Tremmel@iiv.de - update to 1.1.18 * Bump the FLAC decoder's priority above ffmpegaudio. This should fix various problems with FLAC playback. diff --git a/xine-lib.spec b/xine-lib.spec index 79969e8..3822c82 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -28,7 +28,7 @@ Name: xine-lib # default for buildservice is no patented codecs %bcond_without distributable %bcond_with onlynondistributable -%if %suse_version >= 1100 +%if 0%{suse_version} >= 1100 %bcond_without pulseaudio %else %bcond_with pulseaudio @@ -40,7 +40,7 @@ Name: xine-lib %bcond_with jack %bcond_without gnome_vfs %bcond_with directfb -%if %suse_version > 1110 +%if 0%{suse_version} > 1110 %bcond_without modplug %else %bcond_with modplug @@ -53,8 +53,11 @@ BuildRequires: glib2-devel gnutls-devel gtk2-devel imlib2-devel krb5-devel 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: speex-devel libv4l-devel -%if %suse_version >= 1030 +BuildRequires: speex-devel +%if 0%{suse_version} >= 1110 +BuildRequires: libv4l-devel +%endif +%if 0%{suse_version} >= 1030 BuildRequires: lirc-devel %else BuildRequires: lirc @@ -88,7 +91,7 @@ BuildRequires: gnome-vfs2-devel BuildRequires: libjack-devel %endif %if %{with directfb} -%if %suse_version >= 1020 +%if 0%{suse_version} >= 1020 BuildRequires: DirectFB-devel %else BuildRequires: DirectFB @@ -595,7 +598,7 @@ EOF %patch26 %patch28 -p1 %patch31 -p1 -%if %suse_version >= 1110 +%if 0%{suse_version} >= 1110 # set fuzzy=2 to get patch work with crippled and noncrippled tarball %patch50 -p1 -F2 %else @@ -603,7 +606,7 @@ EOF %endif %patch51 -p1 sed -i 's|^noinst_HEADERS = input_vdr.h|xineinclude_HEADERS = input_vdr.h|' src/vdr/Makefile.am -%if %suse_version >= 1110 +%if 0%{suse_version} >= 1110 # set fuzzy=2 to get patch work with crippled and noncrippled tarball %patch61 -p1 -F2 %else @@ -663,6 +666,11 @@ AUTOPOINT=true autoreconf -fi %endif %ifarch %{ix86} --with-w32-path=/usr/lib/win32 \ +%endif +%if 0%{suse_version} >= 1110 + --enable-libv4l \ +%else + --disable-libv4l \ %endif --with-install-plugins-helper=${_prefix}/lib/opensuse-codecs-installer %if 0%{?suse_version} < 1110 @@ -711,7 +719,9 @@ xineplug_vo_out_raw xineplug_inp_dvb xineplug_inp_dvd xineplug_inp_v4l +%if 0%{suse_version} >= 1110 xineplug_inp_v4l2 +%endif xineplug_inp_file xineplug_inp_http xineplug_inp_net