* Wed Apr 18 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.6-1

- 1.1.6.

.cvsignore

@@ -1,2 +1,2 @@
-xine-lib-1.1.5-pruned.tar.bz2
+xine-lib-1.1.6-pruned.tar.bz2
-xine-lib-1.1.5-autotools.patch.bz2
+xine-lib-1.1.6-autotools.patch.bz2

sources

@@ -1,2 +1,2 @@
-f903a0426a812ea70200b7a528f67b00  xine-lib-1.1.5-pruned.tar.bz2
+3869f0045311b3638c5724cd1ac122e9  xine-lib-1.1.6-pruned.tar.bz2
-f955ece2fba4dfbbf22fbb2a8376ae60  xine-lib-1.1.5-autotools.patch.bz2
+25742f2347a1d9c4c08476c82f3ec5fc  xine-lib-1.1.6-autotools.patch.bz2

xine-lib-1.1.5-pthread-check.patch

@@ -1,24 +0,0 @@
-Upstream changeset 8743:defc4f072bde + additional fix in fakethread().
-
-diff -r d1512848e87b -r defc4f072bde m4/pthreads.m4
---- a/m4/pthreads.m4	Tue Apr 10 17:08:22 2007 +0100
-+++ b/m4/pthreads.m4	Wed Apr 11 17:32:13 2007 +0200
-@@ -36,11 +36,15 @@ AC_DEFUN([CC_PTHREAD_FLAGS], [
-     [ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $cc_cv_werror $PTHREAD_CFLAGS"
-+     
-      LIBS="$LIBS $PTHREAD_LIBS"
--     AC_COMPILE_IFELSE(
-+     AC_LINK_IFELSE(
-        [AC_LANG_PROGRAM(
--          [[#include <pthread.h>]],
--          [[pthread_create(NULL, NULL, NULL, NULL);]]
-+          [[#include <pthread.h>
-+	    void *fakethread(void *arg) { return NULL; }
-+	    pthread_t fakevariable;
-+	  ]],
-+          [[pthread_create(&fakevariable, NULL, &fakethread, NULL);]]
-         )],
-        [cc_cv_pthreads=yes],
-        [cc_cv_pthreads=no])

xine-lib-mk-autotools-patch.sh

@@ -23,7 +23,6 @@ tar jxf xine-lib-$version-pruned.tar.bz2
 cp -a xine-lib-$version xine-lib-$version-pruned
 
 cd xine-lib-$version
-patch -p1 < ../xine-lib-$version-pthread-check.patch # XXX hopefully temporary
 ./autogen.sh noconfig
 rm -rf autom4te.cache *~
 cd ..

xine-lib.spec

@@ -11,7 +11,7 @@
 
 Summary:        Xine library
 Name:           xine-lib
-Version:        1.1.5
+Version:        1.1.6
 Release:        1%{?dist}
 License:        GPL
 Group:          System Environment/Libraries
@@ -23,10 +23,8 @@ Source0:        %{name}-%{version}-pruned.tar.bz2
 Source1:        %{name}-cleanup-sources.sh
 Source2:        %{name}-mk-autotools-patch.sh
 # autotools patch created with source2
-Patch0:         %{name}-1.1.5-autotools.patch.bz2
+Patch0:         %{name}-%{version}-autotools.patch.bz2
 Patch1:         %{name}-1.1.4-optflags.patch
-# Patch2 applied while creating full autotools patch
-Patch2:         %{name}-1.1.5-pthread-check.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)
@@ -298,6 +296,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_caca.so
 %if 0%{!?_without_directfb:1}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_directfb.so
+%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xdirectfb.so
 %endif
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so
 
@@ -315,6 +314,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 18 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.6-1
+- 1.1.6.
+
 * Wed Apr 11 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.5-1
 - 1.1.5.
 - Include GSM 06.10 decoder (#228186).