Revert "libxine: remove older verison and add the actual 1.1.16"

This reverts commit 01782313f289ff9cef1f2976db9b10bacfe8e2a5.

4 files changed, 66 insertions, 0 deletions

diff --git a/recipes/libxine/libxine-x11-1.0/dont-have-xv.patch b/recipes/libxine/libxine-x11-1.0/dont-have-xv.patch
new file mode 100644
index 0000000000..674e0e3852
--- /dev/null
+++ b/recipes/libxine/libxine-x11-1.0/dont-have-xv.patch
@@ -0,0 +1,16 @@
+diff -urNd ../libxine-1.0-r1/xine-lib-1.0/configure.ac xine-lib-1.0/configure.ac
+--- ../libxine-1.0-r1/xine-lib-1.0/configure.ac	2005-04-09 02:35:05 +01:00
++++ xine-lib-1.0/configure.ac	2005-04-09 02:48:17 +01:00
+@@ -693,6 +693,12 @@
+ AM_CONDITIONAL(HAVE_XVMC, test x$ac_have_xvmc = "xyes")
+ AC_SUBST(XVMC_LIB)
+ 
++dnl --------------------------------------------
++dnl Declare Xv as missing
++dnl --------------------------------------------
++
++AM_CONDITIONAL(HAVE_XV, 0)
++
+ 
+ dnl ---------------------------------------------
+ dnl Checks for Xinerama extension
diff --git a/recipes/libxine/libxine-x11-1.0/fix-syntax-xine-vorbis-decoder.patch b/recipes/libxine/libxine-x11-1.0/fix-syntax-xine-vorbis-decoder.patch
new file mode 100644
index 0000000000..a191280e2b
--- /dev/null
+++ b/recipes/libxine/libxine-x11-1.0/fix-syntax-xine-vorbis-decoder.patch
@@ -0,0 +1,11 @@
+--- xine-lib-1.0/src/libvorbis/xine_decoder.c.old	2005-04-14 11:25:18 +01:00
++++ xine-lib-1.0/src/libvorbis/xine_decoder.c	2005-04-14 11:26:14 +01:00
+@@ -219,7 +219,7 @@
+     int **pcm;
+     int samples;
+ 
+-    if(vorbis_synthesis(&this->vb,&this->op)==0) 
++    if(vorbis_synthesis(&this->vb,&this->op,1)==0) 
+       vorbis_synthesis_blockin(&this->vd,&this->vb);
+ 
+     if (buf->pts!=0)
diff --git a/recipes/libxine/libxine-x11-1.0/no-caca-no-aalib.patch b/recipes/libxine/libxine-x11-1.0/no-caca-no-aalib.patch
new file mode 100644
index 0000000000..ffdda0c2ca
--- /dev/null
+++ b/recipes/libxine/libxine-x11-1.0/no-caca-no-aalib.patch
@@ -0,0 +1,24 @@
+diff -urNd ../libxine-1.0-r1/xine-lib-1.0/configure.ac xine-lib-1.0/configure.ac
+--- ../libxine-1.0-r1/xine-lib-1.0/configure.ac	2005-04-09 02:22:48 +01:00
++++ xine-lib-1.0/configure.ac	2005-04-09 02:24:00 +01:00
+@@ -710,16 +710,16 @@
+ dnl Checks for Ascii-Art library
+ dnl ---------------------------------------------
+ 
+-AM_PATH_AALIB(1.4,, AC_MSG_RESULT([*** All of AALIB dependent parts will be disabled ***]))
+-AM_CONDITIONAL(HAVE_AA,  [test x"$enable_aalib" = "xyes" && test x$no_aalib != "xyes"])
++dnl AM_PATH_AALIB(1.4,, AC_MSG_RESULT([*** All of AALIB dependent parts will be disabled ***]))
++AM_CONDITIONAL(HAVE_AA, 0)
+ 
+ 
+ dnl ---------------------------------------------
+ dnl Checks for Color AsCii Art library
+ dnl ---------------------------------------------
+ 
+-AM_PATH_CACA(0.3,, AC_MSG_RESULT([*** All CACA-dependent parts will be disabled ***]))
+-AM_CONDITIONAL(HAVE_CACA, test x$no_caca != "xyes")
++dnl AM_PATH_CACA(0.3,, AC_MSG_RESULT([*** All CACA-dependent parts will be disabled ***]))
++AM_CONDITIONAL(HAVE_CACA, 0)
+ 
+ 
+ dnl ---------------------------------------------
diff --git a/recipes/libxine/libxine-x11-1.0/restore-esd.patch b/recipes/libxine/libxine-x11-1.0/restore-esd.patch
new file mode 100644
index 0000000000..26a74adb80
--- /dev/null
+++ b/recipes/libxine/libxine-x11-1.0/restore-esd.patch
@@ -0,0 +1,15 @@
+diff -urNd ../libxine-1.0-r1/xine-lib-1.0/configure.ac xine-lib-1.0/configure.ac
+--- ../libxine-1.0-r1/xine-lib-1.0/configure.ac	2005-04-09 04:38:41 +01:00
++++ xine-lib-1.0/configure.ac	2005-04-09 04:39:54 +01:00
+@@ -1080,8 +1080,9 @@
+ dnl ESD support
+ dnl ---------------------------------------------
+ 
+-AM_CONDITIONAL(HAVE_ESD, 0)
+-
++AM_PATH_ESD(0.2.8,
++        AC_DEFINE(HAVE_ESD,1,[Define this if you have ESD (libesd) installed]),-        AC_MSG_RESULT(*** All of ESD dependent parts will be disabled ***))
++AM_CONDITIONAL(HAVE_ESD, test x"$no_esd" != "xyes")
+ 
+ dnl ---------------------------------------------
+ dnl ARTS support