- started update to 1.1.4

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

diff --git a/xine-lib.spec b/xine-lib.spec
index 910e92345ace4da0af2ec8c495e896516f71d26a..d303f7a7ed9cbfc23aa74e8a4df2fae5f851e508 100644 (file)
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -1,18 +1,26 @@
+# TODO
+# wavpack
+# - --with-external-ffmpeg
 #
 # Conditional build:
 %bcond_without aalib           # don't build aalib video output plugin
 %bcond_without alsa            # don't build ALSA audio output plugin
 %bcond_without arts            # don't build aRts audio output plugin
+%bcond_without caca            # don't build libcaca video output plugin
 %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_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
 %bcond_without opengl          # don't build OpenGL video output plugin
-%bcond_without samba           # don't build SMB input plugin
+%bcond_without pulseaudio      # don't build pulseaudio output plugin
+%bcond_without smb             # don't build SMB input plugin
 %bcond_without sdl             # don't build SDL video output plugin
 %bcond_without stk             # don't build stk video output plugin
 %bcond_with    xvid            # build xvid decode plugin [disabled in sources at the moment]
-%bcond_with    gcc4            # build with gcc4 fixes
+%bcond_with    vdr             # build with vdr support
 #
 %ifnarch %{ix86}
 %undefine      with_dxr3
@@ -23,23 +31,27 @@ Summary(ko):        
 Summary(pl):   Odtwarzacz filmów
 Summary(pt_BR):        Xine, um player de video
 Name:          xine-lib
-Version:       1.1.0
-Release:       3
+Version:       1.1.4
+Release:       0.1
 Epoch:         2
 License:       GPL
 Group:         Libraries
-Source0:       http://dl.sourceforge.net/xine/%{name}-%{version}.tar.gz
-# Source0-md5: 3537cfd58d253b4be20a4975e7086e38
-Patch0:                %{name}-syncfb.patch
-Patch1:                %{name}-nolibs.patch
-Patch2:                %{name}-sparc.patch
-Patch3:                %{name}-win32-path.patch
-Patch4:                %{name}-gcc4.patch
+Source0:       http://dl.sourceforge.net/xine/%{name}-%{version}.tar.bz2
+# Source0-md5: e8ecc022457d8ffc9fec91681c5fff2b
+Patch0:                %{name}-nolibs.patch
+Patch1:                %{name}-sparc.patch
+Patch2:                %{name}-win32-path.patch
+Patch3:                %{name}-am.patch
+Patch4:                %{name}-sh.patch
+Patch5:                %{name}-vdr.patch
 URL:           http://xine.sourceforge.net/
-%{?with_directfb:BuildRequires:        DirectFB-devel >= 0.9.9}
-%{?with_opengl:BuildRequires:  OpenGL-devel}
-%{?with_sdl:BuildRequires:     SDL-devel >= 1.1.5}
-%{?with_aalib:BuildRequires:   aalib-devel >= 1.3}
+%{?with_directfb:BuildRequires:        DirectFB-devel >= 0.9.22}
+%{?with_fusionsound:BuildRequires:     FusionSound-devel >= 0.9.23}
+BuildRequires: ImageMagick-devel >= 1:6.0.0
+%{?with_opengl:BuildRequires:  OpenGL-GLU-devel}
+%{?with_opengl:BuildRequires:  OpenGL-glut-devel}
+%{?with_sdl:BuildRequires:     SDL-devel >= 1.2.11}
+%{?with_aalib:BuildRequires:   aalib-devel >= 1.4}
 %{?with_alsa:BuildRequires:    alsa-lib-devel >= 0.9.0}
 %{?with_arts:BuildRequires:    artsc-devel >= 0.9.5}
 BuildRequires: autoconf >= 2.53
@@ -47,26 +59,28 @@ BuildRequires:      automake >= 1:1.8.1
 %{?with_esd:BuildRequires:     esound-devel >= 0.2.8}
 BuildRequires: flac-devel
 BuildRequires: gettext-devel
-%{?with_opengl:BuildRequires:  glut-devel}
 %{?with_gnome:BuildRequires:   gnome-vfs2-devel}
-BuildRequires: libXvMCW-devel
-BuildRequires: libcaca-devel
+%{?with_gdkpixbuf:BuildRequires:       gtk+2-devel >= 1:2.0.0}
+BuildRequires: jack-audio-connection-kit-devel >= 0.100
+%{?with_caca:BuildRequires:    libcaca-devel >= 0.99}
 BuildRequires: libcdio-devel >= 0.72
-BuildRequires: libdvdnav-devel >= 0.1.9
+%{?with_dvd:BuildRequires:     libdvdnav-devel >= 0.1.9}
 %{?with_dxr3:BuildRequires:    libfame-devel >= 0.8.10}
 BuildRequires: libmng-devel
 BuildRequires: libmodplug-devel >= 0.7
 BuildRequires: libpng-devel
-%{?with_samba:BuildRequires:   libsmbclient-devel}
+%{?with_smb:BuildRequires:     libsmbclient-devel}
 %{?with_stk:BuildRequires:     libstk-devel >= 0.2.0}
-BuildRequires: libvorbis-devel
 BuildRequires: libtheora-devel
 BuildRequires: libtool >= 0:1.4.2-9
+BuildRequires: libvorbis-devel
 BuildRequires: pkgconfig
-BuildRequires: polypaudio-devel >= 0.6
+%{?with_pulseaudio:BuildRequires:      pulseaudio-devel >= 0.9}
 #%{?with_dxr3:BuildRequires:   rte-devel} # only 0.4 supported
 BuildRequires: speex-devel >= 1:1.1.6
 BuildRequires: vcdimager-devel >= 0.7.21
+BuildRequires: xorg-lib-libXinerama-devel
+BuildRequires: xorg-lib-libXvMC-devel
 %{?with_xvid:BuildRequires:    xvid-devel}
 BuildRequires: zlib-devel
 # libtool problem (up to 1.4e)
@@ -79,6 +93,8 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pluginsdir     %{_libdir}/xine/plugins/%{version}
 
+%define                specflags       -fomit-frame-pointer
+
 %description
 xine is a free gpl-licensed video player for unix-like systems. We
 support mpeg-2 and mpeg-1 system (audio + video multiplexed) streams,
@@ -152,6 +168,18 @@ XINE - FLAC decoder/demuxer plugin.
 %description -n xine-decode-flac -l pl
 XINE - wtyczka dekodera i demuxera FLAC.
 
+%package -n xine-decode-gdkpixbuf
+Summary:       XINE - gdk-pixbuf decoder plugin
+Summary(pl):   XINE - wtyczka dekodera gdk-pixbuf
+Group:         Libraries
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%description -n xine-decode-gdkpixbuf
+XINE - gdk-pixbuf decoder plugin.
+
+%description -n xine-decode-gdkpixbuf -l pl
+XINE - wtyczka dekodera gdk-pixbuf.
+
 %package -n xine-decode-ogg
 Summary:       XINE - Ogg/Vorbis, Ogg/Speex, Ogg/Theora decoder plugins
 Summary(pl):   XINE - wtyczki dekoderów Ogg/Vorbis, Ogg/Speex, Ogg/Theora
@@ -297,8 +325,8 @@ Summary:    XINE - esd support
 Summary(pl):   XINE - obs³uga esd
 Summary(pt_BR):        XINE - suporte a esd
 Group:         Libraries
-Provides:      xine-plugin-audio = %{epoch}:%{version}-%{release}
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Provides:      xine-plugin-audio = %{epoch}:%{version}-%{release}
 Obsoletes:     xine-lib-esd
 
 %description -n xine-output-audio-esd
@@ -310,9 +338,35 @@ Wtyczka wyj
 %description -n xine-output-audio-esd -l pt_BR
 Plugin de audio para o xine, com suporte a esd.
 
+%package -n xine-output-audio-fusionsound
+Summary:       XINE - FusionSound support
+Summary(pl):   XINE - obs³uga FusionSound
+Group:         Libraries
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+Provides:      xine-plugin-audio = %{epoch}:%{version}-%{release}
+
+%description -n xine-output-audio-fusionsound
+XINE audio output plugin with FusionSound support.
+
+%description -n xine-output-audio-fusionsound -l pl
+Wtyczka wyj¶cia d¼wiêku do XINE z obs³ug± FusionSound.
+
+%package -n xine-output-audio-jack
+Summary:       XINE - JACK support
+Summary(pl):   XINE - obs³uga demona JACK
+Group:         Libraries
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+Provides:      xine-plugin-audio = %{epoch}:%{version}-%{release}
+
+%description -n xine-output-audio-jack
+XINE audio output plugin with JACK support.
+
+%description -n xine-output-audio-jack -l pl
+Wtyczka wyj¶cia d¼wiêku do XINE z obs³uga demona JACK.
+
 %package -n xine-output-audio-oss
-Summary:       XINE - OSS/ALSA support
-Summary(pl):   XINE - obs³uga OSS/ALSA
+Summary:       XINE - OSS support
+Summary(pl):   XINE - obs³uga OSS
 Summary(pt_BR):        XINE - suporte a oss
 Group:         Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
@@ -320,38 +374,39 @@ Provides: xine-plugin-audio = %{epoch}:%{version}-%{release}
 Obsoletes:     xine-lib-oss
 
 %description -n xine-output-audio-oss
-XINE audio output plugins with OSS/ALSA support.
+XINE audio output plugin with OSS support.
 
 %description -n xine-output-audio-oss -l pl
-Wtyczka wyj¶cia d¼wiêku do XINE z obs³ug± OSS/ALSA.
+Wtyczka wyj¶cia d¼wiêku do XINE z obs³ug± OSS.
 
 %description -n xine-output-audio-oss -l pt_BR
 Plugin de audio para o xine, com suporte a oss.
 
-%package -n xine-output-audio-polypaudio
-Summary:       XINE - polypaudio support
-Summary(pl):   XINE - obs³uga polypaudio
-Summary(pt_BR):        XINE - suporte a polypaudio
+%package -n xine-output-audio-pulseaudio
+Summary:       XINE - pulseaudio support
+Summary(pl):   XINE - obs³uga pulseaudio
+Summary(pt_BR):        XINE - suporte a pulseaudio
 Group:         Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Provides:      xine-plugin-audio = %{epoch}:%{version}-%{release}
+Obsoletes:     xine-output-audio-polypaudio
 
-%description -n xine-output-audio-polypaudio
-XINE audio output plugins with polypaudio support.
+%description -n xine-output-audio-pulseaudio
+XINE audio output plugins with pulseaudio support.
 
-%description -n xine-output-audio-polypaudio -l pl
-Wtyczka wyj¶cia d¼wiêku do XINE z obs³ug± polypaudio.
+%description -n xine-output-audio-pulseaudio -l pl
+Wtyczka wyj¶cia d¼wiêku do XINE z obs³ug± pulseaudio.
 
-%description -n xine-output-audio-polypaudio -l pt_BR
-Plugin de audio para o xine, com suporte a polypaudio.
+%description -n xine-output-audio-pulseaudio -l pt_BR
+Plugin de audio para o xine, com suporte a pulseaudio.
 
 %package -n xine-output-video-aa
 Summary:       XINE - Ascii Art support
 Summary(pl):   XINE - obs³uga Ascii Art
 Summary(pt_BR):        XINE - suporte a aalib
 Group:         Libraries
-Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Obsoletes:     xine-lib-aa
 
 %description -n xine-output-video-aa
@@ -367,8 +422,8 @@ Plugin de video para o xine, utilizando a aalib.
 Summary:       XINE - accelereted framebuffer support
 Summary(pl):   XINE - obs³uga akcelerowanego framebuffera
 Group:         Libraries
-Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Obsoletes:     xine-lib-directfb
 
 %description -n xine-output-video-directfb
@@ -383,8 +438,8 @@ bibliotek
 Summary:       XINE - DXR3 support
 Summary(pl):   XINE - obs³uga DXR3
 Group:         Libraries
-Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Obsoletes:     xine-lib-dxr3
 
 %description -n xine-output-video-dxr3
@@ -397,8 +452,8 @@ Wtyczka wyj
 Summary:       XINE - Color AsCii Art support
 Summary(pl):   XINE - obs³uga Color AsCii Art
 Group:         Libraries
-Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 
 %description -n xine-output-video-caca
 Color AsCii Art output plugin for xine.
@@ -410,8 +465,8 @@ Wtyczka wyj
 Summary:       XINE - framebuffer support
 Summary(pl):   XINE - obs³uga framebuffera
 Group:         Libraries
-Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Obsoletes:     xine-lib-fb
 
 %description -n xine-output-video-fb
@@ -424,9 +479,8 @@ Wtyczka wyj
 Summary:       XINE - OpenGL video output
 Summary(pl):   XINE - wy¶wietlanie przez OpenGL
 Group:         Libraries
-Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      OpenGL
+Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Obsoletes:     xine-lib-opengl
 
 %description -n xine-output-video-opengl
@@ -439,8 +493,8 @@ Wtyczka wyj
 Summary:       XINE - SDL output support
 Summary(pl):   XINE - obs³uga wyj¶cia SDL
 Group:         Libraries
-Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Obsoletes:     xine-lib-sdl
 
 %description -n xine-output-video-sdl
@@ -453,9 +507,9 @@ Wtyczka wyj
 Summary:       XINE - STK video output support
 Summary(pl):   XINE - obs³uga wyj¶cia obrazu STK
 Group:         Libraries
-Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      libstk(xine) >= 0.2.0
+Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Obsoletes:     xine-lib-sdl
 
 %description -n xine-output-video-stk
@@ -469,8 +523,8 @@ libstk.
 Summary:       XINE - SyncFB (Matrox G200/G400) support
 Summary(pl):   XINE - obs³uga SyncFB (Matrox G200/G400)
 Group:         Libraries
-Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Obsoletes:     xine-lib-syncfb
 
 %description -n xine-output-video-syncfb
@@ -484,9 +538,9 @@ Matrox G200/G400).
 %package -n xine-output-video-vidix
 Summary:       XINE - VIDIX video output plugin
 Summary(pl):   XINE - wtyczka wyj¶cia obrazu VIDIX
-Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Group:         Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 
 %description -n xine-output-video-vidix
 XINE video output plugin using VIDIX.
@@ -498,8 +552,8 @@ Wtyczka wyj
 Summary:       VIDIX driver for Cyberblade/i1 chips
 Summary(pl):   Sterownik VIDIX dla uk³adów Cyberblade/i1
 Group:         Libraries
-Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Requires:      xine-output-video-vidix = %{epoch}:%{version}-%{release}
+Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Obsoletes:     xine-lib-vidix-cyberblade
 
 %description -n xine-output-video-vidix-cyberblade
@@ -512,8 +566,8 @@ Sterownik VIDIX dla uk
 Summary:       VIDIX driver for Mach64 and 3Drage chips
 Summary(pl):   Sterownik VIDIX dla uk³adów Mach64 oraz 3DRage
 Group:         Libraries
-Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Requires:      xine-output-video-vidix = %{epoch}:%{version}-%{release}
+Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Obsoletes:     xine-lib-vidix-mach64
 
 %description -n xine-output-video-vidix-mach64
@@ -526,8 +580,8 @@ Sterownik VIDIX dla uk
 Summary:       VIDIX drivers for Matrox Mga chips
 Summary(pl):   Sterowniki VIDIX dla uk³adów Matrox Mga
 Group:         Libraries
-Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Requires:      xine-output-video-vidix = %{epoch}:%{version}-%{release}
+Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Obsoletes:     xine-lib-vidix-matrox
 
 %description -n xine-output-video-vidix-matrox
@@ -540,8 +594,8 @@ Sterowniki VIDIX dla uk
 Summary:       VIDIX driver for Riva and Riva-derived chips
 Summary(pl):   Sterownik VIDIX dla uk³adów Riva oraz pochodnych
 Group:         Libraries
-Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Requires:      xine-output-video-vidix = %{epoch}:%{version}-%{release}
+Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Obsoletes:     xine-lib-vidix-nvidia
 
 %description -n xine-output-video-vidix-nvidia
@@ -555,8 +609,8 @@ Sterownik VIDIX dla uk
 Summary:       VIDIX drivers for 3Dlabs GLINT R3 and Permedia chips
 Summary(pl):   Sterowniki VIDIX dla uk³adów 3Dlabs GLINT R3 oraz Permedia
 Group:         Libraries
-Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Requires:      xine-output-video-vidix = %{epoch}:%{version}-%{release}
+Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Obsoletes:     xine-lib-vidix-permedia
 
 %description -n xine-output-video-vidix-permedia
@@ -569,8 +623,8 @@ Sterowniki VIDIX dla uk
 Summary:       VIDIX driver for Radeon chips
 Summary(pl):   Sterownik VIDIX dla uk³adów Radeon
 Group:         Libraries
-Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Requires:      xine-output-video-vidix = %{epoch}:%{version}-%{release}
+Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Obsoletes:     xine-lib-vidix-radeon
 
 %description -n xine-output-video-vidix-radeon
@@ -583,8 +637,8 @@ Sterownik VIDIX dla uk
 Summary:       VIDIX driver for Rage128 chips
 Summary(pl):   Sterownik VIDIX dla uk³adów Rage128
 Group:         Libraries
-Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Requires:      xine-output-video-vidix = %{epoch}:%{version}-%{release}
+Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Obsoletes:     xine-lib-vidix-rage128
 
 %description -n xine-output-video-vidix-rage128
@@ -597,8 +651,8 @@ Sterownik VIDIX dla uk
 Summary:       VIDIX driver for S3 Savage chips
 Summary(pl):   Sterownik VIDIX dla uk³adów S3 Savage
 Group:         Libraries
-Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Requires:      xine-output-video-vidix = %{epoch}:%{version}-%{release}
+Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 
 %description -n xine-output-video-vidix-savage
 VIDIX driver for S3 Savage series chips.
@@ -610,8 +664,8 @@ Sterownik VIDIX dla uk
 Summary:       VIDIX driver for SiS chips
 Summary(pl):   Sterownik VIDIX dla uk³adów SiS
 Group:         Libraries
-Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Requires:      xine-output-video-vidix = %{epoch}:%{version}-%{release}
+Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 
 %description -n xine-output-video-vidix-sis
 VIDIX driver for SiS 300 and 310/325 series chips.
@@ -623,8 +677,8 @@ Sterownik VIDIX dla uk
 Summary:       VIDIX driver for VIA CLE266 Unichrome chips
 Summary(pl):   Sterownik VIDIX dla uk³adów VIA CLE266 Unichrome
 Group:         Libraries
-Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Requires:      xine-output-video-vidix = %{epoch}:%{version}-%{release}
+Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 
 %description -n xine-output-video-vidix-unichrome
 VIDIX driver for VIA CLE266 Unichrome chips.
@@ -636,8 +690,8 @@ Sterownik VIDIX dla uk
 Summary:       XINE - XFree XShm support
 Summary(pl):   XINE - obs³uga XFree XShm
 Group:         Libraries
-Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Obsoletes:     xine-lib-xshm
 
 %description -n xine-output-video-xshm
@@ -651,8 +705,8 @@ Summary:    XINE - XFree XVideo support
 Summary(pl):   XINE - obs³uga XFree XVideo
 Summary(pt_BR):        XINE - suporte a XFree XVideo
 Group:         Libraries
-Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
 Obsoletes:     xine-lib-xv
 
 %description -n xine-output-video-xv
@@ -670,13 +724,18 @@ Plugin de video para o xine, utilizando a extens
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%if %{with gcc4}
 %patch4 -p1
-%endif
+%{?with_vdr:%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
 
 %build
+# breaks DOMAIN (modified Makefile.in.in?)
+#%%{__gettextize}
 %{__libtoolize}
-%{__gettextize}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
@@ -686,11 +745,16 @@ Plugin de video para o xine, utilizando a extens
        %{?with_dxr3:--enable-dxr3} \
        %{!?with_dxr3:--disable-dxr3} \
        %{?with_directfb:--enable-directfb} \
+       %{!?with_gdkpixbuf:--disable-gdkpixbuf} \
        --enable-ipv6 \
+       %{!?with_smb:--disable-samba} \
        %{?with_aalib:--with-aalib-prefix=/usr} \
        --with-external-dvdnav \
-       --with-w32-path=%{_libdir}/codecs \
-       --with-xv-path=/usr/X11R6/%{_lib}
+       %{!?with_pulseaudio:--disable-pulseaudio} \
+       %{?with_fusionsound:--with-fusionsound} \
+       --with-libflac \
+       --with-w32-path=/usr/lib/codecs \
+       --disable-optimizations # we use own RPM_OPT_FLAGS optimalizations
 
 %{__make}
 
@@ -705,7 +769,7 @@ install -d $RPM_BUILD_ROOT%{_aclocaldir}
 # remove useless *.la files
 rm -f $RPM_BUILD_ROOT%{_pluginsdir}/{,vidix,post}/*.la
 
-%find_lang xine-lib
+%find_lang libxine1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -713,7 +777,7 @@ rm -rf $RPM_BUILD_ROOT
 %post  -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files -f xine-lib.lang
+%files -f libxine1.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog TODO
 %attr(755,root,root) %{_libdir}/libxine*.so.*.*
@@ -725,7 +789,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_pluginsdir}
 %dir %{_pluginsdir}/post
 %attr(755,root,root) %{_pluginsdir}/post/*.so
-%{_docdir}/xine
+%{_docdir}/xine-lib
 
 # input plugins
 %attr(755,root,root) %{_pluginsdir}/xineplug_inp_cdda.so
@@ -806,6 +870,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_pluginsdir}/xineplug_flac.so
 
+%if %{with gdkpixbuf}
+%files -n xine-decode-gdkpixbuf
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_pluginsdir}/xineplug_decode_gdk_pixbuf.so
+%endif
+
 %files -n xine-decode-ogg
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_pluginsdir}/xineplug_decode_speex.so
@@ -826,9 +896,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_pluginsdir}/xineplug_decode_xvid.so
 %endif
 
+%if %{with dvd}
 %files -n xine-input-dvd
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_pluginsdir}/xineplug_inp_dvd.so
+%endif
 
 %if %{with gnome}
 %files -n xine-input-gnome-vfs
@@ -836,7 +908,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_pluginsdir}/xineplug_inp_gnome_vfs.so
 %endif
 
-%if %{with samba}
+%if %{with smb}
 %files -n xine-input-smb
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_pluginsdir}/xineplug_inp_smb.so
@@ -868,13 +940,25 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_pluginsdir}/xineplug_ao_out_esd.so
 %endif
 
+%if %{with fusionsound}
+%files -n xine-output-audio-fusionsound
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_pluginsdir}/xineplug_ao_out_fusionsound.so
+%endif
+
+%files -n xine-output-audio-jack
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_pluginsdir}/xineplug_ao_out_jack.so
+
 %files -n xine-output-audio-oss
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_pluginsdir}/xineplug_ao_out_oss.so
 
-%files -n xine-output-audio-polypaudio
+%if %{with pulseaudio}
+%files -n xine-output-audio-pulseaudio
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_pluginsdir}/xineplug_ao_out_polypaudio.so
+%attr(755,root,root) %{_pluginsdir}/xineplug_ao_out_pulseaudio.so
+%endif
 
 %if %{with aalib}
 %files -n xine-output-video-aa
@@ -896,9 +980,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_pluginsdir}/xineplug_vo_out_dxr3.so
 %endif
 
+%if %{with caca}
 %files -n xine-output-video-caca
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_pluginsdir}/xineplug_vo_out_caca.so
+%endif
 
 %files -n xine-output-video-fb
 %defattr(644,root,root,755)
@@ -907,7 +993,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with opengl}
 %files -n xine-output-video-opengl
 %defattr(644,root,root,755)
-%attr(644,root,root) %{_pluginsdir}/xineplug_vo_out_opengl.so
+%attr(755,root,root) %{_pluginsdir}/xineplug_vo_out_opengl.so
 %endif
 
 %if %{with sdl}
@@ -977,7 +1063,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n xine-output-video-xshm
 %defattr(644,root,root,755)
-%attr(644,root,root) %{_pluginsdir}/xineplug_vo_out_xshm.so
+%attr(755,root,root) %{_pluginsdir}/xineplug_vo_out_xshm.so
 
 %files -n xine-output-video-xv
 %defattr(644,root,root,755)