- up to 1.2.1

Changed files:
    xine-lib-a52.patch -> 1.2
    xine-lib-ac.patch -> 1.2
    xine-lib-am.patch -> 1.2
    xine-lib-ffmpeg-0.8.patch -> 1.2
    xine-lib-nolibs.patch -> 1.2
    xine-lib-pvr.patch -> 1.2
    xine-lib-sh.patch -> 1.3
    xine-lib-xxmc.patch -> 1.2
    xine-lib.spec -> 1.301

diff --git a/xine-lib-a52.patch b/xine-lib-a52.patch
deleted file mode 100644 (file)
index 3231488..0000000
--- a/xine-lib-a52.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Nothing from a52_internal.h is needed by xine plugin
---- xine-lib-1.1.20/configure.ac.orig  2011-11-25 18:43:46.799774547 +0100
-+++ xine-lib-1.1.20/configure.ac       2011-11-25 18:59:53.849806927 +0100
-@@ -1310,7 +1310,7 @@
-   AC_MSG_RESULT([a52dec support disabled])
- elif test "x$external_a52dec" = "xyes"; then
-   have_a52="yes"
--  AC_CHECK_HEADERS([a52dec/a52.h a52dec/a52_internal.h],, have_a52="no",
-+  AC_CHECK_HEADERS([a52dec/a52.h],, have_a52="no",
- [
-   #ifdef HAVE_SYS_TYPES_H
-   # include <sys/types.h>
---- xine-lib-1.1.20/src/liba52/xine_a52_decoder.c.orig 2010-03-09 23:17:05.000000000 +0100
-+++ xine-lib-1.1.20/src/liba52/xine_a52_decoder.c      2011-11-25 18:59:23.256472569 +0100
-@@ -53,12 +53,6 @@
- # include "a52.h"
- #endif
- 
--#ifdef HAVE_A52DEC_A52_INTERNAL_H
--# include <a52dec/a52_internal.h>
--#else
--# include "a52_internal.h"
--#endif
--
- #include "buffer.h"
- #include "xineutils.h"
- 

diff --git a/xine-lib-ac.patch b/xine-lib-ac.patch
index dca4d00d4abb9513bde9b8e48647b03e69667746..3d813e2a5829ab8d4d5c146ac27e258e9cba044b 100644 (file)
--- a/xine-lib-ac.patch
+++ b/xine-lib-ac.patch
@@ -1,10 +1,10 @@
---- xine-lib-1.1.12/configure.ac.orig  2008-05-27 21:04:31.000000000 +0200
-+++ xine-lib-1.1.12/configure.ac       2008-05-27 21:05:02.000000000 +0200
-@@ -119,6 +119,7 @@
+--- xine-lib-1.2.1/configure.ac~       2012-02-15 09:07:21.000000000 +0100
++++ xine-lib-1.2.1/configure.ac        2012-02-15 09:11:13.049069705 +0100
+@@ -164,6 +164,7 @@
  
  AC_PROG_CC
- AM_PROG_AS
+ AM_PROG_CC_C_O
 +AC_PROG_CXX
+ AC_GNU_SOURCE
+ AC_ISC_POSIX
  
- case "$host_os" in
-   *darwin*)

diff --git a/xine-lib-am.patch b/xine-lib-am.patch
deleted file mode 100644 (file)
index 69904d5..0000000
--- a/xine-lib-am.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- xine-lib-1.1.3/src/xine-utils/Makefile.am.orig     2006-09-26 07:48:16.000000000 +0200
-+++ xine-lib-1.1.3/src/xine-utils/Makefile.am  2006-12-04 23:59:23.247443181 +0100
-@@ -1,6 +1,5 @@
- include $(top_srcdir)/misc/Makefile.common
- 
--LIBTOOL = $(SHELL) $(top_builddir)/libtool
- noinst_LTLIBRARIES = libxineutils.la
- 
- EXTRA_DIST = ppcasm_string.S ppc_asm.tmpl
---- xine-lib-1.1.3/src/xine-engine/Makefile.am.orig    2006-11-08 23:47:44.000000000 +0100
-+++ xine-lib-1.1.3/src/xine-engine/Makefile.am 2006-12-04 23:59:10.822735139 +0100
-@@ -4,7 +4,6 @@
- AM_CFLAGS = $(X_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(VISIBILITY_FLAG)
- AM_CPPFLAGS = $(ZLIB_CPPFLAGS) -DXINE_LIBRARY_COMPILE
- 
--LIBTOOL = $(SHELL) $(top_builddir)/libtool
- lib_LTLIBRARIES = libxine.la
- 
- XINEUTILS_LIB  = $(top_builddir)/src/xine-utils/libxineutils.la
---- xine-lib-1.1.3/src/libw32dll/wine/Makefile.am.orig 2003-10-02 21:30:30.000000000 +0200
-+++ xine-lib-1.1.3/src/libw32dll/wine/Makefile.am      2006-12-04 23:58:05.258998874 +0100
-@@ -1,7 +1,5 @@
- include $(top_srcdir)/misc/Makefile.common
- 
--LIBTOOL = $(SHELL) $(top_builddir)/libtool
--
- EXTRA_DIST = stubs.s wrapper.S
- 
- noinst_LTLIBRARIES = $(wine_lib)

diff --git a/xine-lib-ffmpeg-0.8.patch b/xine-lib-ffmpeg-0.8.patch
deleted file mode 100644 (file)
index 245a0fc..0000000
--- a/xine-lib-ffmpeg-0.8.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- xine-lib-1.1.19/src/combined/ffmpeg/ff_video_decoder.c.orig        2010-03-10 20:07:15.000000000 +0100
-+++ xine-lib-1.1.19/src/combined/ffmpeg/ff_video_decoder.c     2011-06-27 21:46:28.835606968 +0200
-@@ -1055,12 +1055,16 @@ static void ff_handle_mpeg12_buffer (ff_
-     }
- 
-     /* skip decoding b frames if too late */
--    this->context->hurry_up = (this->skipframes > 0);
-+    this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT;
- 
-     lprintf("avcodec_decode_video: size=%d\n", this->mpeg_parser->buffer_size);
--    len = avcodec_decode_video (this->context, this->av_frame,
--                                &got_picture, this->mpeg_parser->chunk_buffer,
--                                this->mpeg_parser->buffer_size);
-+    AVPacket avpkt;
-+    av_init_packet(&avpkt);
-+    avpkt.data = (uint8_t *)this->mpeg_parser->chunk_buffer;
-+    avpkt.size = this->mpeg_parser->buffer_size;
-+    avpkt.flags = AV_PKT_FLAG_KEY;
-+    len = avcodec_decode_video2 (this->context, this->av_frame,
-+                                &got_picture, &avpkt);
-     lprintf("avcodec_decode_video: decoded_size=%d, got_picture=%d\n",
-             len, got_picture);
-     len = current - buf->content - offset;
-@@ -1112,7 +1116,7 @@ static void ff_handle_mpeg12_buffer (ff_
- 
-     } else {
- 
--      if (this->context->hurry_up) {
-+      if (this->context->skip_frame != AVDISCARD_DEFAULT) {
-         /* skipped frame, output a bad frame */
-         img = this->stream->video_out->get_frame (this->stream->video_out,
-                                                   this->bih.biWidth,
-@@ -1304,12 +1308,16 @@ static void ff_handle_buffer (ff_video_d
-         got_picture = 0;
-       } else {
-         /* skip decoding b frames if too late */
--        this->context->hurry_up = (this->skipframes > 0);
-+        this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT;
- 
-         lprintf("buffer size: %d\n", this->size);
--        len = avcodec_decode_video (this->context, this->av_frame,
--                                    &got_picture, &chunk_buf[offset],
--                                    this->size);
-+      AVPacket avpkt;
-+      av_init_packet(&avpkt);
-+      avpkt.data = (uint8_t *)&chunk_buf[offset];
-+      avpkt.size = this->size;
-+      avpkt.flags = AV_PKT_FLAG_KEY;
-+      len = avcodec_decode_video2 (this->context, this->av_frame,
-+                                   &got_picture, &avpkt);
- 
- #ifdef AVCODEC_HAS_REORDERED_OPAQUE
-         /* reset consumed pts value */
---- xine-lib-1.1.19/src/combined/ffmpeg/ff_audio_decoder.c.orig        2010-03-23 16:41:49.000000000 +0100
-+++ xine-lib-1.1.19/src/combined/ffmpeg/ff_audio_decoder.c     2011-06-27 21:29:30.168906191 +0200
-@@ -255,6 +255,7 @@ static void ff_audio_decode_data (audio_
-       buf->decoder_info[2]);
- 
-   } else if (!(buf->decoder_flags & BUF_FLAG_SPECIAL)) {
-+    AVPacket avpkt;
- 
-     if( !this->decoder_ok ) {
-       if ( ! this->context || ! this->codec ) {
-@@ -286,11 +287,13 @@ static void ff_audio_decode_data (audio_
-     if (!this->output_open) {
-       if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) {
-         decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
--        avcodec_decode_audio2 (this->context,
--                              (int16_t *)this->decode_buffer,
--                              &decode_buffer_size,
--                              &this->buf[0],
--                              this->size);
-+      av_init_packet(&avpkt);
-+      avpkt.data = (uint8_t *)&this->buf[0];
-+      avpkt.size = this->size;
-+      avpkt.flags = AV_PKT_FLAG_KEY;
-+      avcodec_decode_audio3 (this->context,
-+                            (int16_t *)this->decode_buffer,
-+                            &decode_buffer_size, &avpkt);
-       this->audio_bits = this->context->bits_per_sample;
-       this->audio_sample_rate = this->context->sample_rate;
-       this->audio_channels = this->context->channels;
-@@ -311,11 +314,13 @@ static void ff_audio_decode_data (audio_
-       offset = 0;
-       while (this->size>0) {
-         decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
--        bytes_consumed = avcodec_decode_audio2 (this->context,
--                                               (int16_t *)this->decode_buffer,
--                                               &decode_buffer_size,
--                                               &this->buf[offset],
--                                               this->size);
-+      av_init_packet(&avpkt);
-+      avpkt.data = (uint8_t *)&this->buf[offset];
-+      avpkt.size = this->size;
-+      avpkt.flags = AV_PKT_FLAG_KEY;
-+      bytes_consumed = avcodec_decode_audio3 (this->context,
-+                                             (int16_t *)this->decode_buffer,
-+                                             &decode_buffer_size, &avpkt);
- 
-         if (bytes_consumed<0) {
-           xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,

diff --git a/xine-lib-nolibs.patch b/xine-lib-nolibs.patch
index 68875b9ba4bb92e7644c6a764e515ad9b0a46e57..38621058470fcdb609b526e5de8fd17bfcfad2dd 100644 (file)
--- a/xine-lib-nolibs.patch
+++ b/xine-lib-nolibs.patch
@@ -1,13 +1,13 @@
---- xine-lib-1-rc3c/configure.ac.orig  2004-04-12 22:17:29.000000000 +0200
-+++ xine-lib-1-rc3c/configure.ac       2004-04-12 22:19:00.638295880 +0200
-@@ -343,8 +343,8 @@
+--- xine-lib-1.2.1/configure.ac~       2012-02-04 01:41:43.000000000 +0100
++++ xine-lib-1.2.1/configure.ac        2012-02-15 09:05:03.683929323 +0100
+@@ -267,8 +267,8 @@
+ AM_CONDITIONAL([EXTERNAL_LIBXDG_BASEDIR], [test x"$have_xdg_basedir" = xyes])
  
  dnl Test for socket and network support library
- NET_LIBS=""
--AC_CHECK_LIB(socket, socket, NET_LIBS="-lsocket $NET_LIBS",)
--AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)
-+AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket, socket, NET_LIBS="-lsocket $NET_LIBS",)])
-+AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)])
+-AC_CHECK_LIB([socket], [socket],        [NET_LIBS="-lsocket $NET_LIBS"])
+-AC_CHECK_LIB([nsl],    [gethostbyname], [NET_LIBS="-lnsl $NET_LIBS"])
++#AC_CHECK_LIB([socket], [socket],        [NET_LIBS="-lsocket $NET_LIBS"])
++#AC_CHECK_LIB([nsl],    [gethostbyname], [NET_LIBS="-lnsl $NET_LIBS"])
+ AC_CHECK_LIB([resolv], [hstrerror],     [NET_LIBS="-lresolv $NET_LIBS"])
  AC_SUBST(NET_LIBS)
  
- 

diff --git a/xine-lib-pvr.patch b/xine-lib-pvr.patch
deleted file mode 100644 (file)
index 05becc9..0000000
--- a/xine-lib-pvr.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- xine-lib-1.1.19/src/input/Makefile.am.orig 2010-03-09 23:17:05.000000000 +0100
-+++ xine-lib-1.1.19/src/input/Makefile.am      2011-06-28 17:18:15.174627748 +0200
-@@ -21,11 +21,11 @@
- 
- if HAVE_V4L
- in_v4l = xineplug_inp_v4l.la
--in_pvr = xineplug_inp_pvr.la
- endif
- 
- if HAVE_V4L2
- in_v4l2 = xineplug_inp_v4l2.la
-+in_pvr = xineplug_inp_pvr.la
- endif
- 
- if HAVE_GNOME_VFS

diff --git a/xine-lib-sh.patch b/xine-lib-sh.patch
index ff03fa0d452fa2a3beeb07ff098342517ceac501..aced979eed1257946bce9a5896a7bb3f63a39d2b 100644 (file)
--- a/xine-lib-sh.patch
+++ b/xine-lib-sh.patch
@@ -1,17 +1,17 @@
 --- xine-lib-1.1.16.3/configure.ac.orig        2009-05-02 00:04:29.569438975 +0000
 +++ xine-lib-1.1.16.3/configure.ac     2009-05-02 00:06:52.962751969 +0000
-@@ -553,9 +553,9 @@
+@@ -982,9 +982,9 @@
  b
  :q
  q"
--x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libX11.so"* "${x_libraries:-/usr/lib}/libX11.so"* 2>/dev/null | sed -e \"${soname_script}\"`"
-+x_lib_location="$(ls -1 "${x_libraries:-/usr/local/lib}/libX11.so"* "${x_libraries:-/usr/lib}/libX11.so"* 2>/dev/null | sed -e "${soname_script}")"
- AC_DEFINE_UNQUOTED([LIBX11_SO], "${x_lib_location:-libX11.so}", [The soname of libX11, needed for dlopen()])
--x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libXv.so"*  "${x_libraries:-/usr/lib}/libXv.so"*  2>/dev/null | sed -e \"${soname_script}\"`"
-+x_lib_location="$(ls -1 "${x_libraries:-/usr/local/lib}/libXv.so"*  "${x_libraries:-/usr/lib}/libXv.so"*  2>/dev/null | sed -e "${soname_script}")"
- AC_DEFINE_UNQUOTED([LIBXV_SO],  "${x_lib_location:-libXv.so}",  [The soname of libXv, needed for dlopen()])
- 
+-x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libX11.$acl_cv_shlibext"* "${x_libraries:-/usr/lib}/libX11.$acl_cv_shlibext"* 2>/dev/null | sed -e \"${soname_script}\"`"
++x_lib_location=$(ls -1 "${x_libraries:-/usr/local/lib}/libX11.$acl_cv_shlibext"* "${x_libraries:-/usr/lib}/libX11.$acl_cv_shlibext"* 2>/dev/null | sed -e \"${soname_script}\")
+ AC_DEFINE_UNQUOTED([LIBX11_SO], "${x_lib_location:-libX11.$acl_cv_shlibext}", [The soname of libX11, needed for dlopen()])
+-x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libXv.$acl_cv_shlibext"*  "${x_libraries:-/usr/lib}/libXv.$acl_cv_shlibext"*  2>/dev/null | sed -e \"${soname_script}\"`"
++x_lib_location=$(ls -1 "${x_libraries:-/usr/local/lib}/libXv.$acl_cv_shlibext"*  "${x_libraries:-/usr/lib}/libXv.$acl_cv_shlibext"*  2>/dev/null | sed -e \"${soname_script}\")
+ AC_DEFINE_UNQUOTED([LIBXV_SO],  "${x_lib_location:-libXv.$acl_cv_shlibext}",  [The soname of libXv, needed for dlopen()])
  
+ dnl _FILE_OFFSET_BITS   (AC_SYS_LARGEFILE; ac_cv_sys_file_offset_bits)
 @@ -2512,7 +2512,7 @@
  
  XINE_BUILD_CC="`$CC -v 2>&1 | tail -1 2>/dev/null`"

diff --git a/xine-lib-xxmc.patch b/xine-lib-xxmc.patch
deleted file mode 100644 (file)
index 7bc1427..0000000
--- a/xine-lib-xxmc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/video_out/xxmc.h.orig  2010-03-09 23:17:05.000000000 +0100
-+++ src/video_out/xxmc.h       2010-11-28 19:17:29.946567005 +0100
-@@ -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
- 

diff --git a/xine-lib.spec b/xine-lib.spec
index 1605dce3558e9e69898d78623f65d0bd794332e0..79b93a690c78c317928c4a42e7eb93867dd05eb3 100644 (file)
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -40,22 +40,20 @@ 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.20
-Release:       6
+Version:       1.2.1
+Release:       1
 Epoch:         2
 License:       GPL v2+
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/xine/%{name}-%{version}.tar.bz2
-# Source0-md5: 1213457c42e2370155eb26e1c862dab2
+# Source0-md5: fdd1cf233bfd8b7fe65bf7ef9abfed34
 Source1:       http://home.vrweb.de/~rnissl/vdr-xine-%{_vdr_plugin_ver}.tgz
 # Source1-md5: 0374123d6991f55d91122b020361d8f6
 Patch0:                %{name}-nolibs.patch
 Patch1:                %{name}-win32-path.patch
-Patch2:                %{name}-am.patch
+
 Patch3:                %{name}-sh.patch
 Patch5:                %{name}-ac.patch
-Patch6:                %{name}-a52.patch
-Patch7:                %{name}-pvr.patch
 URL:           http://xine.sourceforge.net/
 %{?with_directfb:BuildRequires:        DirectFB-devel >= 0.9.22}
 %{?with_fusionsound:BuildRequires:     FusionSound-devel >= 0.9.23}
@@ -112,12 +110,13 @@ Requires: libmodplug >= 0.7
 Obsoletes:     xine
 Obsoletes:     xine-libs
 Obsoletes:     xine-output-audio-arts
+Obsoletes:     xine-output-video-syncfb
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _noautoreqdep   libGL.so.1 libGLU.so.1
 
 # based on libtool numbers
-%define                xine_pluginsdir %{_libdir}/xine/plugins/1.30
+%define                xine_pluginsdir %{_libdir}/xine/plugins/2.1
 
 %define                specflags       -fomit-frame-pointer
 
@@ -652,22 +651,6 @@ XINE video output plugin using libstk library.
 Wtyczka wyjścia obrazu do XINE wyświetlająca poprzez bibliotekę
 libstk.
 
-%package -n xine-output-video-syncfb
-Summary:       XINE - SyncFB (Matrox G200/G400) support
-Summary(pl.UTF-8):     XINE - obsługa SyncFB (Matrox G200/G400)
-Group:         Libraries
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-Provides:      xine-plugin-video = %{epoch}:%{version}-%{release}
-Obsoletes:     xine-lib-syncfb
-
-%description -n xine-output-video-syncfb
-XINE video output plugin using SyncFB interface (for Matrox G200/G400
-cards).
-
-%description -n xine-output-video-syncfb -l pl.UTF-8
-Wtyczka wyjścia obrazu do XINE obsługująca interfejs SyncFB (dla kart
-Matrox G200/G400).
-
 %package -n xine-output-video-vidix
 Summary:       XINE - VIDIX video output plugin
 Summary(pl.UTF-8):     XINE - wtyczka wyjścia obrazu VIDIX
@@ -896,12 +879,10 @@ XINE - wtyczka postprocessingu oparta na libpostproc z pakietu FFmpeg.
 %setup -q -a 1
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+
 %patch3 -p1
 %{?with_vdr:%{__patch} -p1 < xine-%{_vdr_plugin_ver}/patches/xine-lib.patch}
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 %build
 %{__gettextize}
@@ -920,12 +901,15 @@ XINE - wtyczka postprocessingu oparta na libpostproc z pakietu FFmpeg.
        %{!?with_pulseaudio:--without-pulseaudio} \
        %{!?with_smb:--disable-samba} \
        %{?with_aalib:--with-aalib-prefix=/usr} \
-       --with-external-a52dec \
+       --enable-a52dec \
        --with-external-dvdnav \
-       --with-external-ffmpeg \
-       --with-external-libdts \
-       --with-external-libmad \
-       --with-external-libmpcdec \
+       --enable-dts \
+       --enable-mad \
+       --with-speex \
+       --with-xcb \ \
+       --with-libflac \
+       --with-theora \
+       --with-vorbis \
        %{?with_fusionsound:--with-fusionsound} \
        --with-libflac \
        %{?with_stk:--with-libstk} \
@@ -950,7 +934,7 @@ install -d $RPM_BUILD_ROOT%{_aclocaldir}
        DESTDIR=$RPM_BUILD_ROOT \
        m4datadir=%{_aclocaldir}
 
-%find_lang libxine1
+%find_lang libxine2
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -958,15 +942,14 @@ rm -rf $RPM_BUILD_ROOT
 %post  -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files -f libxine1.lang
+%files -f libxine2.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog TODO
-%attr(755,root,root) %{_bindir}/xine-list-1.1
+%attr(755,root,root) %{_bindir}/xine-list-1.2
 %attr(755,root,root) %{_libdir}/libxine.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libxine.so.1
-%dir %{_datadir}/xine
-%dir %{_datadir}/xine/libxine1
-%{_datadir}/xine/libxine1/fonts
+%attr(755,root,root) %ghost %{_libdir}/libxine.so.2
+%dir %{_datadir}/xine-lib
+%{_datadir}/xine-lib/fonts
 %dir %{_libdir}/xine
 %dir %{_libdir}/xine/plugins
 %dir %{xine_pluginsdir}
@@ -979,7 +962,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{xine_pluginsdir}/post/xineplug_post_tvtime.so
 %attr(755,root,root) %{xine_pluginsdir}/post/xineplug_post_visualizations.so
 %{_docdir}/xine-lib
-%{_mandir}/man1/xine-list-1.1.1*
+%{_mandir}/man1/xine-list-1.2.1*
 %{_mandir}/man5/xine.5*
 
 # input plugins
@@ -1005,6 +988,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_iff.so
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_image.so
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_matroska.so
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_modplug.so
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_playlist.so
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_vc1_es.so
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_mpeg*.so
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_nsv.so
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_pva.so
@@ -1012,7 +998,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_rawdv.so
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_real.so
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_slave.so
-%attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_sputext.so
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_yuv4mpeg2.so
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_yuv_frames.so
 
@@ -1022,14 +1007,17 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_gsm610.so
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_lpcm.so
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_mpeg2.so
-%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_nsf.so
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_real.so
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_rgb.so
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_spucc.so
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_spucmml.so
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_spuhdmv.so
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_spudvb.so
-%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_sputext.so
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_vdpau_h264.so
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_vdpau_h264_alter.so
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_vdpau_mpeg12.so
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_vdpau_mpeg4.so
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_vdpau_vc1.so
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_yuv.so
 
 # Others
@@ -1037,6 +1025,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_ao_out_none.so
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_vo_out_none.so
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_vo_out_raw.so
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_vo_out_vdpau.so
+
+# ?
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_nsf.so
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_sputext.so
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_vdr.so
 
 %files devel
 %defattr(644,root,root,755)
@@ -1093,10 +1087,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n xine-decode-ogg
 %defattr(644,root,root,755)
-%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_speex.so
-%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_theora.so
-%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_vorbis.so
-%attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_ogg.so
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_xiph.so
 
 %ifarch %{ix86}
 %files -n xine-decode-w32dll
@@ -1228,10 +1219,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_vo_out_stk.so
 %endif
 
-%files -n xine-output-video-syncfb
-%defattr(644,root,root,755)
-%attr(755,root,root) %{xine_pluginsdir}/xineplug_vo_out_syncfb.so
-
 %ifarch %{ix86}
 %files -n xine-output-video-vidix
 %defattr(644,root,root,755)