increase audio/video out plugin interface version numbers to avoid accidents caused by old plugins lying around... remove all video output plugins except xv from build process for now

CVS patchset: 2836
CVS date: 2002/10/16 14:19:38

4 files changed, 24 insertions, 26 deletions

diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index 8e7a246de..d4916d70a 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -16,7 +16,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 libdir = $(XINE_PLUGINDIR)
 
 #if HAVE_X11
-xshm_module = xineplug_vo_out_xshm.la
+#xshm_module = xineplug_vo_out_xshm.la
 #syncfb_module = xineplug_vo_out_syncfb.la
 #if HAVE_VIDIX
 #vidix_module = xineplug_vo_out_vidix.la
@@ -27,14 +27,14 @@ xv_module = xineplug_vo_out_xv.la
 #if HAVE_OPENGL
 #opengl_module = xineplug_vo_out_opengl.la
 #endif
-if HAVE_SUNFB
-pgx64_module = xineplug_vo_out_pgx64.la
-endif
+#if HAVE_SUNFB
+#pgx64_module = xineplug_vo_out_pgx64.la
+#endif
 #endif
 
-if HAVE_AA
-aa_module = xineplug_vo_out_aa.la
-endif
+#if HAVE_AA
+#aa_module = xineplug_vo_out_aa.la
+#endif
 
 #if HAVE_FB
 #fb_module = xineplug_vo_out_fb.la
@@ -57,7 +57,7 @@ endif
 
 #lib_LTLIBRARIES = $(xshm_module) $(xv_module) $(directfb_module)  \
 #                  $(syncfb_module) $(fb_module) $(opengl_module) $(sdl_module) $(vidix_module)
-lib_LTLIBRARIES = $(xshm_module) $(xv_module) $(aa_module) $(pgx64_module)
+lib_LTLIBRARIES = $(xv_module) 
 
 xineplug_vo_out_xv_la_SOURCES = deinterlace.c alphablend.c video_out_xv.c
 xineplug_vo_out_xv_la_LIBADD = \
@@ -68,11 +68,11 @@ xineplug_vo_out_xv_la_LIBADD = \
 
 xineplug_vo_out_xv_la_LDFLAGS = -avoid-version -module
 
-xineplug_vo_out_xshm_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
-	alphablend.c video_out_xshm.c
-xineplug_vo_out_xshm_la_LIBADD =  $(X_LIBS) -lXext \
-	$(top_builddir)/src/xine-engine/libxine.la
-xineplug_vo_out_xshm_la_LDFLAGS = -avoid-version -module
+#xineplug_vo_out_xshm_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
+#	alphablend.c video_out_xshm.c
+#xineplug_vo_out_xshm_la_LIBADD =  $(X_LIBS) -lXext \
+#	$(top_builddir)/src/xine-engine/libxine.la
+#xineplug_vo_out_xshm_la_LDFLAGS = -avoid-version -module
 
 #xineplug_vo_out_opengl_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
 #	alphablend.c video_out_opengl.c
@@ -84,9 +84,9 @@ xineplug_vo_out_xshm_la_LDFLAGS = -avoid-version -module
 #xineplug_vo_out_syncfb_la_LIBADD = $(X_LIBS) $(top_builddir)/src/xine-engine/libxine.la
 #xineplug_vo_out_syncfb_la_LDFLAGS = -avoid-version -module
 
-xineplug_vo_out_aa_la_SOURCES =  video_out_aa.c
-xineplug_vo_out_aa_la_LIBADD = $(AALIB_LIBS)
-xineplug_vo_out_aa_la_LDFLAGS = -avoid-version -module
+#xineplug_vo_out_aa_la_SOURCES =  video_out_aa.c
+#xineplug_vo_out_aa_la_LIBADD = $(AALIB_LIBS)
+#xineplug_vo_out_aa_la_LDFLAGS = -avoid-version -module
 
 #xineplug_vo_out_fb_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
 #	alphablend.c video_out_fb.c
@@ -105,9 +105,9 @@ xineplug_vo_out_aa_la_LDFLAGS = -avoid-version -module
 #xineplug_vo_out_vidix_la_LIBADD =  $(X_LIBS) $(top_builddir)/src/video_out/vidix/libvidix.la
 #xineplug_vo_out_vidix_la_LDFLAGS = -avoid-version -module
 
-xineplug_vo_out_pgx64_la_SOURCES = alphablend.c video_out_pgx64.c
-xineplug_vo_out_pgx64_la_LIBADD = $(X_LIBS)
-xineplug_vo_out_pgx64_la_LDFLAGS = -avoid-version -module
+#xineplug_vo_out_pgx64_la_SOURCES = alphablend.c video_out_pgx64.c
+#xineplug_vo_out_pgx64_la_LIBADD = $(X_LIBS)
+#xineplug_vo_out_pgx64_la_LDFLAGS = -avoid-version -module
 
 noinst_HEADERS = alphablend.h deinterlace.h video_out_syncfb.h yuv2rgb.h 
 
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index cea0fa043..c64fc3325 100644
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_xv.c,v 1.136 2002/09/18 11:13:51 miguelfreitas Exp $
+ * $Id: video_out_xv.c,v 1.137 2002/10/16 14:19:40 guenter Exp $
  * 
  * video_out_xv.c, X11 video extension interface for xine
  *
@@ -1334,5 +1334,3 @@ plugin_info_t xine_plugin_info[] = {
 
 
 #endif
-
-
diff --git a/src/xine-engine/audio_out.h b/src/xine-engine/audio_out.h
index 68e0ca750..30a8e4133 100644
--- a/src/xine-engine/audio_out.h
+++ b/src/xine-engine/audio_out.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_out.h,v 1.35 2002/10/14 15:47:27 guenter Exp $
+ * $Id: audio_out.h,v 1.36 2002/10/16 14:19:43 guenter Exp $
  */
 #ifndef HAVE_AUDIO_OUT_H
 #define HAVE_AUDIO_OUT_H
@@ -37,7 +37,7 @@ extern "C" {
 #endif
 
 
-#define AUDIO_OUT_IFACE_VERSION  4
+#define AUDIO_OUT_IFACE_VERSION  5
 
 /*
  * ao_driver_s contains the driver every audio output
diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h
index 2e7585af7..90bb61565 100644
--- a/src/xine-engine/video_out.h
+++ b/src/xine-engine/video_out.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out.h,v 1.64 2002/10/14 15:47:42 guenter Exp $
+ * $Id: video_out.h,v 1.65 2002/10/16 14:19:44 guenter Exp $
  *
  *
  * xine version of video_out.h 
@@ -235,7 +235,7 @@ struct vo_instance_s {
  * from generic vo functions.
  */
 
-#define VIDEO_OUT_DRIVER_IFACE_VERSION  9
+#define VIDEO_OUT_DRIVER_IFACE_VERSION  10
 
 struct xine_vo_driver_s {