[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-multimedia
Subject:    [PATCH] Re: Artsd: relocation error (libarts_xine.so) in CVS. Fatal
From:       Ewald Snel <ewald () rambo ! its ! tudelft ! nl>
Date:       2003-11-29 15:16:30
[Download RAW message or body]

Hi,

Here are two patches for HEAD and KDE_3_1_BRANCH that fixes this xine 
incompatibility problem. It has been tested successfully with xine CVS from 
11/9/2003 and 11/29/2003.

Is it okay to apply these (small) bugfixes to KDE CVS?

Thanks.
bye,

ewald

["kdemultimedia-HEAD-xine.patch" (text/x-diff)]

Index: xine_artsplugin/audio_fifo_out.c
===================================================================
RCS file: /home/kde/kdemultimedia/xine_artsplugin/audio_fifo_out.c,v
retrieving revision 1.6
diff -u -u -r1.6 audio_fifo_out.c
--- xine_artsplugin/audio_fifo_out.c	3 Feb 2003 22:04:39 -0000	1.6
+++ xine_artsplugin/audio_fifo_out.c	29 Nov 2003 11:42:11 -0000
@@ -312,7 +312,7 @@
 
     *ao_driver		= (void *)ao;
 
-    return ao_new_port( xine, (ao_driver_t *)ao, 0 );
+    return _x_ao_new_port( xine, (ao_driver_t *)ao, 0 );
 }
 
 unsigned long ao_fifo_read( void *ao_driver, unsigned char **buffer,
Index: xine_artsplugin/configure.in.in
===================================================================
RCS file: /home/kde/kdemultimedia/xine_artsplugin/configure.in.in,v
retrieving revision 1.10
diff -u -u -r1.10 configure.in.in
--- xine_artsplugin/configure.in.in	30 Apr 2003 20:41:14 -0000	1.10
+++ xine_artsplugin/configure.in.in	29 Nov 2003 11:42:11 -0000
@@ -227,6 +227,13 @@
 )
 AC_LANG_RESTORE()
 
+dnl Check for new internal xine symbol names
+AC_CHECK_LIB(xine, _x_ao_new_port, , 
+[
+  AC_DEFINE(_x_ao_new_port, ao_new_port, [Compatibility with older version of xine])
+])
+AC_CHECK_FUNC([ao_new_port])
+
 dnl Check for xine libs (1.0.0 or higher)
 AC_PATH_XINE(1.0.0,,
 [

["kdemultimedia-KDE_3_1_BRANCH-xine.patch" (text/x-diff)]

Index: xine_artsplugin/audio_fifo_out.c
===================================================================
RCS file: /home/kde/kdemultimedia/xine_artsplugin/audio_fifo_out.c,v
retrieving revision 1.5.2.1
diff -u -r1.5.2.1 audio_fifo_out.c
--- xine_artsplugin/audio_fifo_out.c	13 Feb 2003 21:03:51 -0000	1.5.2.1
+++ xine_artsplugin/audio_fifo_out.c	29 Nov 2003 11:46:55 -0000
@@ -321,7 +321,7 @@
     *ao_driver		= (void *)ao;
 
 #ifdef HAVE_XINE_1
-    return ao_new_port( xine, (ao_driver_t *)ao, 0 );
+    return _x_ao_new_port( xine, (ao_driver_t *)ao, 0 );
 #else
     return (ao_driver_t *)ao;
 #endif
Index: xine_artsplugin/configure.in.in
===================================================================
RCS file: /home/kde/kdemultimedia/xine_artsplugin/configure.in.in,v
retrieving revision 1.5.2.1
diff -u -r1.5.2.1 configure.in.in
--- xine_artsplugin/configure.in.in	13 Feb 2003 21:03:51 -0000	1.5.2.1
+++ xine_artsplugin/configure.in.in	29 Nov 2003 11:46:55 -0000
@@ -227,6 +227,13 @@
 )
 AC_LANG_RESTORE()
 
+dnl Check for new internal xine symbol names
+AC_CHECK_LIB(xine, _x_ao_new_port, , 
+[
+  AC_DEFINE(_x_ao_new_port, ao_new_port, [Compatibility with older version of xine])
+])
+AC_CHECK_FUNC([ao_new_port])
+
 dnl Check for xine libs (1.0.0 or higher)
 AC_PATH_XINE(1.0.0,
 [


_______________________________________________
kde-multimedia mailing list
kde-multimedia@kde.org
https://mail.kde.org/mailman/listinfo/kde-multimedia


[prev in list] [next in list] [prev in thread] [next in thread]