[rpms/xine-lib] epel9-next: * Tue Aug 14 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.7-2

            A new commit has been pushed.

            Repo   : rpms/xine-lib
            Branch : epel9-next
            Commit : 25721fadffb5e10516e76763f259826ead7d2d1f
            Author : Ville Skyttä <scop@fedoraproject.org>
            Date   : 2007-08-14T11:59:58+00:00
            Stats  : +143/-28 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/xine-lib/c/25721fadffb5e10516e76763f259826ead7d2d1f?branch=epel9-next

            Log:
            * Tue Aug 14 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.7-2
- Include XCB output plugins (in -extras at least for now).
- Protect "open" with glibc 2.6.90 and -D_FORTIFY_SOURCE=2.
- Clean up %configure options.
- License: GPLv2+

---
diff --git a/xine-lib-1.1.7-open.patch b/xine-lib-1.1.7-open.patch
new file mode 100644
index 0000000..e3d7a6a
--- /dev/null
+++ b/xine-lib-1.1.7-open.patch
@@ -0,0 +1,101 @@
+--- xine-lib-1.1.7/src/libxinevdec/image.c~	2007-04-15 20:42:16.000000000 +0300
++++ xine-lib-1.1.7/src/libxinevdec/image.c	2007-08-14 00:40:05.000000000 +0300
+@@ -81,7 +81,7 @@ static void image_decode_data (video_dec
+ 
+   if (!this->video_open) {
+     lprintf("opening video\n");
+-    this->stream->video_out->open(this->stream->video_out, this->stream);
++    (this->stream->video_out->open)(this->stream->video_out, this->stream);
+     this->video_open = 1;
+   }
+ 
+--- xine-lib-1.1.7/src/libxinevdec/gdkpixbuf.c~	2007-04-15 20:42:16.000000000 +0300
++++ xine-lib-1.1.7/src/libxinevdec/gdkpixbuf.c	2007-08-14 00:45:36.000000000 +0300
+@@ -74,7 +74,7 @@ static void image_decode_data (video_dec
+ 
+   if (!this->video_open) {
+     lprintf("opening video\n");
+-    this->stream->video_out->open(this->stream->video_out, this->stream);
++    (this->stream->video_out->open)(this->stream->video_out, this->stream);
+     this->video_open = 1;
+   }
+ 
+--- xine-lib-1.1.7/src/libxineadec/xine_lpcm_decoder.c~	2007-04-17 04:00:50.000000000 +0300
++++ xine-lib-1.1.7/src/libxineadec/xine_lpcm_decoder.c	2007-08-14 00:50:49.000000000 +0300
+@@ -134,12 +134,12 @@ static void lpcm_decode_data (audio_deco
+ 
+     /* force 24-bit samples into 16 bits for now */
+     if (this->bits_per_sample == 24)
+-      this->output_open = this->stream->audio_out->open (this->stream->audio_out, this->stream,
++      this->output_open = (this->stream->audio_out->open) (this->stream->audio_out, this->stream,
+                                                16,
+                                                this->rate,
+                                                this->ao_cap_mode) ;
+     else
+-      this->output_open = this->stream->audio_out->open (this->stream->audio_out, this->stream,
++      this->output_open = (this->stream->audio_out->open) (this->stream->audio_out, this->stream,
+                                                this->bits_per_sample,
+                                                this->rate,
+                                                this->ao_cap_mode) ;
+--- xine-lib-1.1.7/src/xine-engine/audio_out.c~	2007-06-05 00:37:38.000000000 +0300
++++ xine-lib-1.1.7/src/xine-engine/audio_out.c	2007-08-14 00:34:30.000000000 +0300
+@@ -1401,7 +1401,7 @@ static int ao_change_settings(aos_t *thi
+                _("stereo not supported by driver, converting to mono.\n"));
+     }
+  
+-    output_sample_rate=this->driver->open(this->driver,bits,(this->force_rate ? this->force_rate : rate),mode);
++    output_sample_rate=(this->driver->open)(this->driver,bits,(this->force_rate ? this->force_rate : rate),mode);
+   } else
+     output_sample_rate = this->input.rate;
+ 
+--- xine-lib-1.1.7/src/xine-engine/xine.c~	2007-05-06 17:20:54.000000000 +0300
++++ xine-lib-1.1.7/src/xine-engine/xine.c	2007-08-14 00:26:30.000000000 +0300
+@@ -462,7 +462,7 @@ static int stream_rewire_audio(xine_post
+   
+   if (stream->audio_out->status(stream->audio_out, stream, &bits, &rate, &mode)) {
+     /* register our stream at the new output port */
+-    new_port->open(new_port, stream, bits, rate, mode);
++    (new_port->open)(new_port, stream, bits, rate, mode);
+     stream->audio_out->close(stream->audio_out, stream);
+   }
+   stream->audio_out = new_port;
+@@ -486,7 +486,7 @@ static int stream_rewire_video(xine_post
+   
+   if (stream->video_out->status(stream->video_out, stream, &width, &height, &img_duration)) {
+     /* register our stream at the new output port */
+-    new_port->open(new_port, stream);
++    (new_port->open)(new_port, stream);
+     stream->video_out->close(stream->video_out, stream);
+   }
+   stream->video_out = new_port;
+@@ -773,7 +773,7 @@ static int open_internal (xine_stream_t 
+       _x_meta_info_set_utf8(stream, XINE_META_INFO_INPUT_PLUGIN, 
+ 			    (stream->input_plugin->input_class->get_identifier (stream->input_plugin->input_class)));
+ 
+-      res = stream->input_plugin->open(stream->input_plugin);
++      res = (stream->input_plugin->open)(stream->input_plugin);
+       switch(res) {
+       case 1: /* Open successfull */
+ 	free(input_source);
+--- xine-lib-1.1.7/src/libreal/xine_real_audio_decoder.c~	2007-04-17 04:00:50.000000000 +0300
++++ xine-lib-1.1.7/src/libreal/xine_real_audio_decoder.c	2007-08-14 01:00:32.000000000 +0300
+@@ -339,7 +339,7 @@ static int init_codec (realdec_decoder_t
+     return 0;
+   }
+ 
+-  this->stream->audio_out->open(this->stream->audio_out, 
++  (this->stream->audio_out->open)(this->stream->audio_out, 
+ 				this->stream,
+ 				bits_per_sample,
+ 				samples_per_sec,
+--- xine-lib-1.1.7/src/libreal/xine_real_video_decoder.c~	2007-04-17 04:00:50.000000000 +0300
++++ xine-lib-1.1.7/src/libreal/xine_real_video_decoder.c	2007-08-14 00:54:52.000000000 +0300
+@@ -268,7 +268,7 @@ static int init_codec (realdec_decoder_t
+     this->rvyuv_custom_message (&cmsg_data, this->context);
+   }
+   
+-  this->stream->video_out->open(this->stream->video_out, this->stream);
++  (this->stream->video_out->open)(this->stream->video_out, this->stream);
+     
+   this->frame_size   = this->width * this->height;
+   this->frame_buffer = xine_xmalloc (this->width * this->height * 3 / 2);

diff --git a/xine-lib.spec b/xine-lib.spec
index 8aa1cae..0474184 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -1,6 +1,8 @@
 # TODO, sometime, maybe:
 # - libstk:  http://www.libstk.net/ - probably not, see 1.1.5 ChangeLog
-# - xcb stuff when it's available
+
+# TODO: drop the opengl video out plugin?
+# http://www.redhat.com/archives/fedora-legal-list/2007-August/msg00011.html
 
 %define         codecdir %{_libdir}/codecs
 %ifarch %{ix86}
@@ -12,8 +14,8 @@
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.7
-Release:        1%{?dist}
-License:        GPL
+Release:        2%{?dist}
+License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
 # The tarball is generated from the upstream tarball using
@@ -25,11 +27,13 @@ Source2:        %{name}-mk-autotools-patch.sh
 # autotools patch created with source2
 Patch0:         %{name}-%{version}-autotools.patch.bz2
 Patch1:         %{name}-1.1.4-optflags.patch
+Patch2:         %{name}-1.1.7-open.patch
 Patch6:         %{name}-1.1.1-deepbind-939.patch
 Patch7:         %{name}-1.1.5-multilib-devel.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # X11
-BuildRequires:  libX11-devel libXv-devel libXinerama-devel libXvMC-devel libGLU-devel
+BuildRequires:  libX11-devel libXv-devel libXinerama-devel libXvMC-devel
+BuildRequires:  libGLU-devel libxcb-devel
 # Video
 BuildRequires:  SDL-devel libtheora-devel libmng-devel
 BuildRequires:  aalib-devel >= 1.4
@@ -109,6 +113,7 @@ touch -r configure.ac aclocal.m4
 touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
 %patch1 -p1 -b .optflags
 touch -r m4/optimizations.m4.stamp m4/optimizations.m4
+%patch2 -p1 -b .open
 # Patch6 needed at least when compiling with external ffmpeg, #939.
 %patch6 -p1 -b .deepbind
 %patch7 -p0 -b .multilib-devel
@@ -121,36 +126,37 @@ sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
 export FFMPEG_CFLAGS=" " FFMPEG_LIBS=" "
 export FFMPEG_POSTPROC_CFLAGS=" " FFMPEG_POSTPROC_LIBS=" "
 export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)"
-%configure --disable-dependency-tracking \
-    --with-xv-path=%{_libdir} \
-    --with-w32-path=%{codecdir} \
-    --with-real-codecs-path=%{codecdir} \
-    --with-external-ffmpeg \
-    --with-external-libmpcdec \
-    --with-libflac \
-    --with-wavpack \
-    --with-arts \
+# Keep list of options in mostly the same order as ./configure --help.
+%configure \
+    --disable-dependency-tracking \
     --enable-ipv6 \
 %if 0%{!?_without_directfb:1}
     --enable-directfb \
-%endif
-%if 0%{?_without_imagemagick:1}
-    --without-imagemagick \
-%endif
+%endif # directfb
+    --disable-a52dec \
+    --disable-mad \
+    --disable-dvdnavtest --with-external-dvdnav \
+    --disable-vcd \
+    --disable-asf \
+    --disable-faad \
 %if 0%{?_with_freetype:1}
-    --with-freetype \
-    --with-fontconfig \
 %if 0%{?_with_antialiasing:1}
     --enable-antialiasing \
-%endif
-%endif
-    --disable-libfame \
-    --disable-faad \
-    --disable-mad \
-    --disable-asf \
-    --disable-vcd \
-    --disable-a52dec \
-    --with-external-dvdnav --disable-dvdnavtest
+%endif # antialiasing
+    --with-freetype \
+    --with-fontconfig \
+%endif # freetype
+    --with-external-ffmpeg \
+    --with-xv-path=%{_libdir} \
+    --with-libflac \
+    --with-external-libmpcdec \
+%if 0%{?_without_imagemagick:1}
+    --without-imagemagick \
+%endif # imagemagick
+    --with-arts \
+    --with-wavpack \
+    --with-real-codecs-path=%{codecdir} \
+    --with-w32-path=%{codecdir}
 
 make %{?_smp_mflags}
 
@@ -301,6 +307,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xdirectfb.so
 %endif
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so
+%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbshm.so
+%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbxv.so
 
 
 %files devel
@@ -316,6 +324,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 14 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.7-2
+- Include XCB output plugins (in -extras at least for now).
+- Protect "open" with glibc 2.6.90 and -D_FORTIFY_SOURCE=2.
+- Clean up %%configure options.
+- License: GPLv2+
+
 * Thu Jun  7 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.7-1
 - 1.1.7.