Update of /cvsroot/fink/experimental/thesin/test
In directory usw-pr-cvs1:/tmp/cvs-serv11753/test
Modified Files:
libxine-0.9.13-1.patch
Removed Files:
xmms-status-0.9-1.info xmms-status-0.9-1.patch
Log Message:
putting into unstable
Index: libxine-0.9.13-1.patch
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/test/libxine-0.9.13-1.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libxine-0.9.13-1.patch 14 Aug 2002 22:10:51 -0000 1.7
+++ libxine-0.9.13-1.patch 15 Aug 2002 15:55:08 -0000 1.8
@@ -1,6 +1,6 @@
diff -ruN xine-lib-0.9.13.orig/config.h xine-lib-0.9.13/config.h
--- xine-lib-0.9.13.orig/config.h 2002-08-03 15:01:09.000000000 -0600
-+++ xine-lib-0.9.13/config.h 2002-08-05 15:16:17.000000000 -0600
++++ xine-lib-0.9.13/config.h 2002-08-14 16:19:48.000000000 -0600
@@ -63,6 +63,9 @@
/* Define this if you have the Motorola 74xx CPU */
#define ENABLE_ALTIVEC 1
@@ -13,7 +13,7 @@
diff -ruN xine-lib-0.9.13.orig/config.h.in xine-lib-0.9.13/config.h.in
--- xine-lib-0.9.13.orig/config.h.in 2002-08-01 15:52:23.000000000 -0600
-+++ xine-lib-0.9.13/config.h.in 2002-08-05 15:16:41.000000000 -0600
++++ xine-lib-0.9.13/config.h.in 2002-08-14 16:19:48.000000000 -0600
@@ -62,6 +62,9 @@
/* Define this if you have the Motorola 74xx CPU */
#undef ENABLE_ALTIVEC
@@ -26,7 +26,7 @@
diff -ruN xine-lib-0.9.13.orig/configure xine-lib-0.9.13/configure
--- xine-lib-0.9.13.orig/configure 2002-08-03 15:00:16.000000000 -0600
-+++ xine-lib-0.9.13/configure 2002-08-06 16:47:46.000000000 -0600
++++ xine-lib-0.9.13/configure 2002-08-14 16:19:49.000000000 -0600
@@ -3913,7 +3913,7 @@
# cross-compilation, but unfortunately the echo tests do not
# yet detect zsh echo's removal of \ escapes. Also zsh mangles
@@ -116,7 +116,7 @@
s%@XV_LIB@%$XV_LIB%g
diff -ruN xine-lib-0.9.13.orig/src/input/input_rtp.c
xine-lib-0.9.13/src/input/input_rtp.c
--- xine-lib-0.9.13.orig/src/input/input_rtp.c 2002-07-05 11:32:02.000000000 -0600
-+++ xine-lib-0.9.13/src/input/input_rtp.c 2002-08-05 15:17:55.000000000 -0600
++++ xine-lib-0.9.13/src/input/input_rtp.c 2002-08-14 16:19:49.000000000 -0600
@@ -67,7 +67,9 @@
#endif
@@ -130,7 +130,7 @@
#include <string.h>
diff -ruN xine-lib-0.9.13.orig/src/libmpeg2/cpu_state.c
xine-lib-0.9.13/src/libmpeg2/cpu_state.c
--- xine-lib-0.9.13.orig/src/libmpeg2/cpu_state.c 2002-04-01 06:18:21.000000000
-0700
-+++ xine-lib-0.9.13/src/libmpeg2/cpu_state.c 2002-08-06 09:53:36.000000000 -0600
++++ xine-lib-0.9.13/src/libmpeg2/cpu_state.c 2002-08-14 16:19:49.000000000 -0600
@@ -39,8 +39,9 @@
}
#endif
@@ -165,7 +165,7 @@
}
diff -ruN xine-lib-0.9.13.orig/src/libmpeg2/idct.c xine-lib-0.9.13/src/libmpeg2/idct.c
--- xine-lib-0.9.13.orig/src/libmpeg2/idct.c 2002-06-04 17:07:59.000000000 -0600
-+++ xine-lib-0.9.13/src/libmpeg2/idct.c 2002-08-08 09:48:08.000000000 -0600
++++ xine-lib-0.9.13/src/libmpeg2/idct.c 2002-08-14 16:19:49.000000000 -0600
@@ -275,6 +275,7 @@
mpeg2_idct_mmx_init ();
} else
@@ -184,7 +184,7 @@
char * env_var;
diff -ruN xine-lib-0.9.13.orig/src/libmpeg2/idct_altivec.c
xine-lib-0.9.13/src/libmpeg2/idct_altivec.c
--- xine-lib-0.9.13.orig/src/libmpeg2/idct_altivec.c 2002-06-04 17:07:59.000000000
-0600
-+++ xine-lib-0.9.13/src/libmpeg2/idct_altivec.c 2002-08-06 11:02:49.000000000
-0600
++++ xine-lib-0.9.13/src/libmpeg2/idct_altivec.c 2002-08-14 16:19:49.000000000
+-0600
@@ -25,6 +25,7 @@
#include "config.h"
@@ -203,7 +203,7 @@
diff -ruN xine-lib-0.9.13.orig/src/libmpeg2/motion_comp.c
xine-lib-0.9.13/src/libmpeg2/motion_comp.c
--- xine-lib-0.9.13.orig/src/libmpeg2/motion_comp.c 2002-04-01 07:14:56.000000000
-0700
-+++ xine-lib-0.9.13/src/libmpeg2/motion_comp.c 2002-08-08 09:48:36.000000000 -0600
++++ xine-lib-0.9.13/src/libmpeg2/motion_comp.c 2002-08-14 16:19:49.000000000 -0600
@@ -45,12 +45,14 @@
mpeg2_mc = mpeg2_mc_mmx;
} else
@@ -221,7 +221,7 @@
fprintf (stderr, "Using mlib for motion compensation\n");
diff -ruN xine-lib-0.9.13.orig/src/libmpeg2/motion_comp_altivec.c
xine-lib-0.9.13/src/libmpeg2/motion_comp_altivec.c
--- xine-lib-0.9.13.orig/src/libmpeg2/motion_comp_altivec.c 2002-04-01
06:18:21.000000000 -0700
-+++ xine-lib-0.9.13/src/libmpeg2/motion_comp_altivec.c 2002-08-06 11:03:34.000000000
-0600
++++ xine-lib-0.9.13/src/libmpeg2/motion_comp_altivec.c 2002-08-14 16:19:49.000000000
+-0600
@@ -25,6 +25,7 @@
#include "config.h"
@@ -240,7 +240,7 @@
diff -ruN xine-lib-0.9.13.orig/src/libspudec/spu.c xine-lib-0.9.13/src/libspudec/spu.c
--- xine-lib-0.9.13.orig/src/libspudec/spu.c 2002-07-20 10:28:14.000000000 -0600
-+++ xine-lib-0.9.13/src/libspudec/spu.c 2002-08-06 11:11:51.000000000 -0600
++++ xine-lib-0.9.13/src/libspudec/spu.c 2002-08-14 16:19:49.000000000 -0600
@@ -45,7 +45,9 @@
#include <unistd.h>
#include <string.h>
@@ -254,7 +254,7 @@
#include <fcntl.h>
diff -ruN xine-lib-0.9.13.orig/src/video_out/Makefile.in
xine-lib-0.9.13/src/video_out/Makefile.in
--- xine-lib-0.9.13.orig/src/video_out/Makefile.in 2002-08-03 15:01:34.000000000
-0600
-+++ xine-lib-0.9.13/src/video_out/Makefile.in 2002-08-06 10:46:20.000000000 -0600
++++ xine-lib-0.9.13/src/video_out/Makefile.in 2002-08-14 16:19:49.000000000 -0600
@@ -197,7 +197,7 @@
libdir = $(XINE_PLUGINDIR)
@@ -264,9 +264,331 @@
@HAVE_X11_TRUE@@HAVE_VIDIX_TRUE@vidix_module = xineplug_vo_out_vidix.la
@HAVE_X11_TRUE@@HAVE_XV_TRUE@xv_module = xineplug_vo_out_xv.la
@HAVE_X11_TRUE@@HAVE_OPENGL_TRUE@opengl_module = xineplug_vo_out_opengl.la
+diff -ruN xine-lib-0.9.13.orig/src/video_out/video_out_x11.h
+xine-lib-0.9.13/src/video_out/video_out_x11.h
+--- xine-lib-0.9.13.orig/src/video_out/video_out_x11.h 2002-03-21 11:29:51.000000000
+-0700
++++ xine-lib-0.9.13/src/video_out/video_out_x11.h 2002-08-14 16:20:05.000000000
+-0600
+@@ -109,6 +109,12 @@
+ /* int *data */
+ #define GUI_DATA_EX_VIDEOWIN_VISIBLE 5
+
++/* void (*data[])(Display*) */
++/* i.e. a pointer to an array of function-pointers
++ * the first is the XLockDisplay replacement
++ * the second is the XUnlockDisplay replacement */
++#define GUI_DATA_EX_CHANGE_LOCK_FUNCTIONS 6
++
+ /* *data contains chosen visual, select a new one or change it to NULL
+ * to indicate the visual to use or that no visual will work */
+ /* XVisualInfo **data */
+diff -ruN xine-lib-0.9.13.orig/src/video_out/video_out_xshm.c
+xine-lib-0.9.13/src/video_out/video_out_xshm.c
+--- xine-lib-0.9.13.orig/src/video_out/video_out_xshm.c 2002-08-01
+09:26:53.000000000 -0600
++++ xine-lib-0.9.13/src/video_out/video_out_xshm.c 2002-08-14 16:20:05.000000000
+-0600
+@@ -26,6 +26,9 @@
+ *
+ * xine-specific code by Guenter Bartsch <[EMAIL PROTECTED]>
+ *
++ * locking function change support for KDE front end by Mark Thomas
++ * <[EMAIL PROTECTED]> - August 2002
++ *
+ */
+
+ #ifdef HAVE_CONFIG_H
+@@ -173,6 +176,9 @@
+ int video_width, int video_height,
+ int *dest_width, int *dest_height);
+
++ void (*x11_LockDisplay) (Display *);
++ void (*x11_UnlockDisplay) (Display *);
++
+ } xshm_driver_t;
+
+
+@@ -404,9 +410,9 @@
+ xshm_driver_t *this = (xshm_driver_t *) vo_img->driver;
+
+ if (frame->image) {
+- XLockDisplay (this->display);
++ this->x11_LockDisplay (this->display);
+ dispose_ximage (this, &frame->shminfo, frame->image);
+- XUnlockDisplay (this->display);
++ this->x11_UnlockDisplay (this->display);
+ }
+
+ free (frame);
+@@ -627,7 +633,7 @@
+ frame->output_width, frame->output_height);
+ #endif
+
+- XLockDisplay (this->display);
++ this->x11_LockDisplay (this->display);
+
+ /*
+ * (re-) allocate XImage
+@@ -656,7 +662,7 @@
+ frame->image = create_ximage (this, &frame->shminfo,
+ frame->output_width, frame->output_height);
+
+- XUnlockDisplay (this->display);
++ this->x11_UnlockDisplay (this->display);
+
+ if (format == IMGFMT_YV12) {
+ frame->vo_frame.pitches[0] = 8*((width + 7) / 8);
+@@ -768,7 +774,7 @@
+
+ static void clean_output_area (xshm_driver_t *this) {
+
+- XLockDisplay (this->display);
++ this->x11_LockDisplay (this->display);
+
+ XSetForeground (this->display, this->gc, this->black.pixel);
+
+@@ -804,7 +810,7 @@
+
+ #endif
+
+- XUnlockDisplay (this->display);
++ this->x11_UnlockDisplay (this->display);
+ }
+
+ static int xshm_redraw_needed (vo_driver_t *this_gen) {
+@@ -913,7 +919,7 @@
+ xoffset = (this->gui_width - frame->output_width) / 2 + this->gui_x;
+ yoffset = (this->gui_height - frame->output_height) / 2 + this->gui_y;
+
+- XLockDisplay (this->display);
++ this->x11_LockDisplay (this->display);
+ #ifdef LOG
+ printf ("video_out_xshm: display locked...\n");
+ #endif
+@@ -946,7 +952,7 @@
+ XFlush(this->display);
+ }
+
+- XUnlockDisplay (this->display);
++ this->x11_UnlockDisplay (this->display);
+
+ }
+
+@@ -1103,7 +1109,7 @@
+
+ if (xev->count == 0) {
+
+- XLockDisplay (this->display);
++ this->x11_LockDisplay (this->display);
+
+ xoffset = (this->cur_frame->gui_width - this->cur_frame->output_width) / 2;
+ yoffset = (this->cur_frame->gui_height - this->cur_frame->output_height) / 2;
+@@ -1145,7 +1151,7 @@
+
+ XFlush (this->display);
+
+- XUnlockDisplay (this->display);
++ this->x11_UnlockDisplay (this->display);
+ }
+
+ }
+@@ -1181,6 +1187,14 @@
+
+ break;
+
++ case GUI_DATA_EX_CHANGE_LOCK_FUNCTIONS:
++ {
++ void (**func)(Display*) = data;
++ this -> x11_LockDisplay = func[0];
++ this -> x11_UnlockDisplay = func[1];
++ }
++ break;
++
+ default:
+ return -1;
+ }
+@@ -1305,6 +1319,9 @@
+ this->gc = XCreateGC (this->display, this->drawable,
+ 0, NULL);
+
++ this->x11_LockDisplay = XLockDisplay;
++ this->x11_UnlockDisplay = XUnlockDisplay;
++
+ this->vo_driver.get_capabilities = xshm_get_capabilities;
+ this->vo_driver.alloc_frame = xshm_alloc_frame;
+ this->vo_driver.update_frame_format = xshm_update_frame_format;
+diff -ruN xine-lib-0.9.13.orig/src/video_out/video_out_xv.c
+xine-lib-0.9.13/src/video_out/video_out_xv.c
+--- xine-lib-0.9.13.orig/src/video_out/video_out_xv.c 2002-07-20 15:46:06.000000000
+-0600
++++ xine-lib-0.9.13/src/video_out/video_out_xv.c 2002-08-14 16:20:05.000000000
+-0600
+@@ -29,6 +29,9 @@
+ * xine-specific code by Guenter Bartsch <[EMAIL PROTECTED]>
+ *
+ * overlay support by James Courtier-Dutton <[EMAIL PROTECTED]> - July 2001
++ *
++ * locking function change support for KDE front-end by Mark Thomas
++ * <[EMAIL PROTECTED]> - August 2002
+ */
+
+ #ifdef HAVE_CONFIG_H
+@@ -196,6 +199,9 @@
+
+ int use_colorkey;
+ uint32_t colorkey;
++
++ void (*x11_LockDisplay) (Display *);
++ void (*x11_UnlockDisplay) (Display *);
+ };
+
+ int gX11Fail;
+@@ -219,18 +225,18 @@
+ if (frame->image) {
+
+ if (this->use_shm) {
+- XLockDisplay (this->display);
++ this->x11_LockDisplay (this->display);
+ XShmDetach (this->display, &frame->shminfo);
+ XFree (frame->image);
+- XUnlockDisplay (this->display);
++ this->x11_UnlockDisplay (this->display);
+
+ shmdt (frame->shminfo.shmaddr);
+ shmctl (frame->shminfo.shmid, IPC_RMID, NULL);
+ }
+ else {
+- XLockDisplay (this->display);
++ this->x11_LockDisplay (this->display);
+ XFree (frame->image);
+- XUnlockDisplay (this->display);
++ this->x11_UnlockDisplay (this->display);
+ }
+ }
+
+@@ -450,7 +456,7 @@
+
+ /* printf ("video_out_xv: updating frame to %d x %d (ratio=%d,
+format=%08x)\n",width,height,ratio_code,format); */
+
+- XLockDisplay (this->display);
++ this->x11_LockDisplay (this->display);
+
+ /*
+ * (re-) allocate xvimage
+@@ -474,7 +480,7 @@
+ frame->height = height;
+ frame->format = format;
+
+- XUnlockDisplay (this->display);
++ this->x11_UnlockDisplay (this->display);
+ }
+
+ frame->ratio_code = ratio_code;
+@@ -494,7 +500,7 @@
+ || (frame->width != this->deinterlace_frame.width)
+ || (frame->height / xvscaling != this->deinterlace_frame.height )
+ || (frame->format != this->deinterlace_frame.format)) {
+- XLockDisplay (this->display);
++ this->x11_LockDisplay (this->display);
+
+ if( this->deinterlace_frame.image )
+ dispose_ximage (this, &this->deinterlace_frame.shminfo,
+@@ -507,7 +513,7 @@
+ this->deinterlace_frame.height = frame->height / xvscaling;
+ this->deinterlace_frame.format = frame->format;
+
+- XUnlockDisplay (this->display);
++ this->x11_UnlockDisplay (this->display);
+ }
+
+
+@@ -584,7 +590,7 @@
+
+ static void xv_clean_output_area (xv_driver_t *this) {
+
+- XLockDisplay (this->display);
++ this->x11_LockDisplay (this->display);
+
+ XSetForeground (this->display, this->gc, this->black.pixel);
+
+@@ -598,7 +604,7 @@
+ this->output_width, this->output_height);
+ }
+
+- XUnlockDisplay (this->display);
++ this->x11_UnlockDisplay (this->display);
+ }
+
+ /*
+@@ -865,7 +871,7 @@
+ */
+ xv_redraw_needed (this_gen);
+
+- XLockDisplay (this->display);
++ this->x11_LockDisplay (this->display);
+
+ if (this->use_shm) {
+ XvShmPutImage(this->display, this->xv_port,
+@@ -887,7 +893,7 @@
+
+ XFlush(this->display);
+
+- XUnlockDisplay (this->display);
++ this->x11_UnlockDisplay (this->display);
+
+ }
+ /*
+@@ -1034,7 +1040,7 @@
+ /* FIXME : take care of completion events */
+
+ if (this->cur_frame) {
+- XLockDisplay (this->display);
++ this->x11_LockDisplay (this->display);
+
+ if (this->use_shm) {
+ XvShmPutImage(this->display, this->xv_port,
+@@ -1075,7 +1081,7 @@
+
+ XFlush(this->display);
+
+- XUnlockDisplay (this->display);
++ this->x11_UnlockDisplay (this->display);
+ }
+ }
+ break;
+@@ -1101,6 +1107,14 @@
+ }
+ break;
+
++ case GUI_DATA_EX_CHANGE_LOCK_FUNCTIONS:
++ {
++ void (**func)(Display*) = data;
++ this->x11_LockDisplay = func[0];
++ this->x11_UnlockDisplay = func[1];
++ }
++ break;
++
+ default:
+ return -1;
+ }
+@@ -1119,11 +1133,11 @@
+ this->deinterlace_frame.image = NULL;
+ }
+
+- XLockDisplay (this->display);
++ this->x11_LockDisplay (this->display);
+ if(XvUngrabPort (this->display, this->xv_port, CurrentTime) != Success) {
+ printf ("video_out_xv: xv_exit: XvUngrabPort() failed.\n");
+ }
+- XUnlockDisplay (this->display);
++ this->x11_UnlockDisplay (this->display);
+
+ for( i=0; i < VO_NUM_RECENT_FRAMES; i++ )
+ {
+@@ -1352,6 +1366,8 @@
+ this->deinterlace_frame.image = NULL;
+ this->use_colorkey = 0;
+ this->colorkey = 0;
++ this->x11_LockDisplay = XLockDisplay;
++ this->x11_UnlockDisplay = XUnlockDisplay;
+
+ XAllocNamedColor(this->display,
+ DefaultColormap(this->display, this->screen),
diff -ruN xine-lib-0.9.13.orig/src/xine-engine/Makefile.in
xine-lib-0.9.13/src/xine-engine/Makefile.in
--- xine-lib-0.9.13.orig/src/xine-engine/Makefile.in 2002-08-03 15:01:32.000000000
-0600
-+++ xine-lib-0.9.13/src/xine-engine/Makefile.in 2002-08-06 09:40:44.000000000
-0600
++++ xine-lib-0.9.13/src/xine-engine/Makefile.in 2002-08-14 16:19:49.000000000
+-0600
@@ -196,7 +196,7 @@
libxine_la_SOURCES = $(nvtv) xine.c metronom.c configfile.c buffer.c load_plugins.c
video_decoder.c buffer_types.c audio_decoder.c video_out.c audio_out.c resample.c
events.c lrb.c video_overlay.c osd.c scratch.c locale.c demux.c
@@ -278,7 +600,7 @@
libxine_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
diff -ruN xine-lib-0.9.13.orig/src/xine-engine/load_plugins.c
xine-lib-0.9.13/src/xine-engine/load_plugins.c
--- xine-lib-0.9.13.orig/src/xine-engine/load_plugins.c 2002-07-17
15:23:57.000000000 -0600
-+++ xine-lib-0.9.13/src/xine-engine/load_plugins.c 2002-08-06 09:42:38.000000000
-0600
++++ xine-lib-0.9.13/src/xine-engine/load_plugins.c 2002-08-14 16:19:49.000000000
+-0600
@@ -132,7 +132,7 @@
plugin_name = str;
@@ -353,7 +675,7 @@
void *(*initplug) (config_values_t *);
diff -ruN xine-lib-0.9.13.orig/src/xine-utils/Makefile.in
xine-lib-0.9.13/src/xine-utils/Makefile.in
--- xine-lib-0.9.13.orig/src/xine-utils/Makefile.in 2002-08-03 15:01:30.000000000
-0600
-+++ xine-lib-0.9.13/src/xine-utils/Makefile.in 2002-08-06 09:47:20.000000000 -0600
++++ xine-lib-0.9.13/src/xine-utils/Makefile.in 2002-08-14 16:19:49.000000000 -0600
@@ -192,7 +192,7 @@
EXTRA_DIST = ppcasm_string.S ppc_asm.tmpl
@@ -384,7 +706,7 @@
CCLD = $(CC)
diff -ruN xine-lib-0.9.13.orig/src/xine-utils/memcpy.c
xine-lib-0.9.13/src/xine-utils/memcpy.c
--- xine-lib-0.9.13.orig/src/xine-utils/memcpy.c 2002-06-24 13:55:38.000000000
-0600
-+++ xine-lib-0.9.13/src/xine-utils/memcpy.c 2002-08-06 14:48:23.000000000 -0600
++++ xine-lib-0.9.13/src/xine-utils/memcpy.c 2002-08-14 16:19:49.000000000 -0600
@@ -33,9 +33,11 @@
#include "config.h"
#endif
--- xmms-status-0.9-1.info DELETED ---
--- xmms-status-0.9-1.patch DELETED ---
-------------------------------------------------------
This sf.net email is sponsored by: OSDN - Tired of that same old
cell phone? Get a new here for FREE!
https://www.inphonic.com/r.asp?r=sourceforge1&refcode1=vs3390
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
