- rel 12

[packages/xine-lib.git] / xine-lib.spec

diff --git a/xine-lib.spec b/xine-lib.spec
index a691f108d139f727eb6d95fe53b094ae13f6200c..46eb04d570ec7da24e8d3f542a513680dddfd023 100644 (file)
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -1,6 +1,12 @@
 # TODO
 # - fix build --with-external-dvdnav
 #
+# Workaround for xine-lib.spec - libstk.spec updating:
+#      1. make-request -r --without stk xine-lib
+#      2. make-request -r libstk
+#      3. bump release of xine-lib
+#      4. make-request -r xine-lib
+#
 # Conditional build:
 %bcond_without aalib           # don't build aalib video output plugin
 %bcond_without alsa            # don't build ALSA audio output plugin
@@ -8,7 +14,7 @@
 %bcond_without directfb        # don't build DirectFB video output plugin
 %bcond_without dxr3            # don't build dxr3 video output and decode plugins
 %bcond_without dvd             # don't build dvdnav stuff
-%bcond_without esd             # don't build EsounD audio output plugin
+%bcond_with    esd             # build EsounD audio output plugin
 %bcond_without fusionsound     # don't build FusionSound audio output plugin
 %bcond_without gdkpixbuf       # don't build gdk-pixbuf decode plugin
 %bcond_without gnome           # don't build gnome_vfs input plugin
@@ -18,6 +24,7 @@
 %bcond_without sdl             # don't build SDL video output plugin
 %bcond_without stk             # don't build stk video output plugin
 %bcond_without wavpack         # don't build wavpack decode plugin
+%bcond_with    v4l1            # Video4Linux 1 input plugin (obsolete in current Linux)
 %bcond_with    xvid            # build xvid decode plugin [disabled in sources at the moment]
 %bcond_with    vdr             # build with vdr support
 %bcond_without vis             # build without vis sparc extensions - with vis breaks compatibility
@@ -33,19 +40,22 @@ Summary(ko.UTF-8):  공개 동영상 플레이어
 Summary(pl.UTF-8):     Odtwarzacz filmów
 Summary(pt_BR.UTF-8):  Xine, um player de video
 Name:          xine-lib
-Version:       1.1.18
-Release:       1
+Version:       1.1.19
+Release:       12
 Epoch:         2
-License:       GPL
+License:       GPL v2+
 Group:         Libraries
-Source0:       http://dl.sourceforge.net/xine/%{name}-%{version}.tar.bz2
-# Source0-md5: 2313c279bc99303cd12d4ee0ac826e20
+Source0:       http://downloads.sourceforge.net/xine/%{name}-%{version}.tar.bz2
+# Source0-md5: a410a0f0617e1d6309f0cbe907f73f8a
 Patch0:                %{name}-nolibs.patch
 Patch1:                %{name}-win32-path.patch
 Patch2:                %{name}-am.patch
 Patch3:                %{name}-sh.patch
 Patch4:                %{name}-vdr.patch
 Patch5:                %{name}-ac.patch
+Patch6:                %{name}-xxmc.patch
+Patch7:                %{name}-ffmpeg-0.8.patch
+Patch8:                %{name}-pvr.patch
 URL:           http://xine.sourceforge.net/
 %{?with_directfb:BuildRequires:        DirectFB-devel >= 0.9.22}
 %{?with_fusionsound:BuildRequires:     FusionSound-devel >= 0.9.23}
@@ -59,7 +69,7 @@ BuildRequires:        autoconf >= 2.53
 BuildRequires: automake >= 1:1.8.1
 %{?with_esd:BuildRequires:     esound-devel >= 0.2.8}
 BuildRequires: faad2-devel
-BuildRequires: ffmpeg-devel
+BuildRequires: ffmpeg-devel >= 0.8
 BuildRequires: flac-devel
 BuildRequires: gettext-devel
 %{?with_gnome:BuildRequires:   gnome-vfs2-devel}
@@ -99,7 +109,7 @@ BuildRoot:   %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define        _noautoreqdep   libGL.so.1 libGLU.so.1
 
 # based on libtool numbers
-%define                _pluginsdir     %{_libdir}/xine/plugins/1.28
+%define                _pluginsdir     %{_libdir}/xine/plugins/1.29
 
 %define                specflags       -fomit-frame-pointer
 
@@ -533,7 +543,7 @@ Obsoletes:  xine-lib-sdl
 %description -n xine-output-video-stk
 XINE video output plugin using libstk library.
 
-%description -n xine-output-video-sdl -l pl.UTF-8
+%description -n xine-output-video-stk -l pl.UTF-8
 Wtyczka wyjścia obrazu do XINE wyświetlająca poprzez bibliotekę
 libstk.
 
@@ -772,15 +782,12 @@ Plugin de video para o xine, utilizando a extensão XVideo do XFree.
 %patch3 -p1
 %{?with_vdr:%patch4 -p1}
 %patch5 -p1
-
-# kill hack, it fails with recent automake
-echo 'AC_DEFUN([AM_PROG_AS_MOD],[AM_PROG_AS])' > m4/as.m4
-# use system libtool.m4
-rm -f m4/libtool15.m4
+%patch6 -p0
+%patch7 -p1
+%patch8 -p1
 
 %build
-# breaks DOMAIN (modified Makefile.in.in?)
-#%%{__gettextize}
+%{__gettextize}
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
@@ -823,9 +830,6 @@ install -d $RPM_BUILD_ROOT%{_aclocaldir}
        DESTDIR=$RPM_BUILD_ROOT \
        m4datadir=%{_aclocaldir}
 
-# remove useless *.la files
-rm -f $RPM_BUILD_ROOT%{_pluginsdir}/{,vidix,post}/*.la
-
 %find_lang libxine1
 
 %clean
@@ -861,7 +865,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_pluginsdir}/xineplug_inp_mms.so
 %attr(755,root,root) %{_pluginsdir}/xineplug_inp_net.so
 %attr(755,root,root) %{_pluginsdir}/xineplug_inp_pnm.so
-%attr(755,root,root) %{_pluginsdir}/xineplug_inp_pvr.so
 %attr(755,root,root) %{_pluginsdir}/xineplug_inp_rtp.so
 %attr(755,root,root) %{_pluginsdir}/xineplug_inp_rtsp.so
 %attr(755,root,root) %{_pluginsdir}/xineplug_inp_stdin_fifo.so
@@ -989,7 +992,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n xine-input-v4l
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_pluginsdir}/xineplug_inp_pvr.so
+%if %{with v4l1}
 %attr(755,root,root) %{_pluginsdir}/xineplug_inp_v4l.so
+%endif
 %attr(755,root,root) %{_pluginsdir}/xineplug_inp_v4l2.so
 
 %files -n xine-input-vcd