From c853f9d8259c1a810b0a407da043aa8e264370ae Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Tue, 10 Apr 2007 00:38:30 +0100 Subject: More generated files to be ignored. --- .hgignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.hgignore b/.hgignore index dee65bc77..32b62ae30 100644 --- a/.hgignore +++ b/.hgignore @@ -57,6 +57,8 @@ misc/xine-lib.spec po/POTFILES po/*.gmo po/stamp-po +po/insert-header.sed +po/remove-potcdate.sed src/libffmpeg/ffmpeg_config.h src/video_out/libdha/pci_dev_ids.c -- cgit v1.2.3 From 93ec8d7e0912e4e9c5392560e3e1ace60da4cd48 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Tue, 10 Apr 2007 00:38:58 +0100 Subject: xine-lib 1.1.5. --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 263386e09..11213d565 100644 --- a/.hgtags +++ b/.hgtags @@ -58,3 +58,4 @@ eb7068fcbc340c1074f9ff916d3843ac19ea94fa xine-lib-1_1_0-release f1a2861399059cba07e916afee432bbb31df4249 xine-1-beta4-release fd12068ebd3fab2438f77b06e312c4244e97950a DXR3_095 4a4f4e8bb768b6598c02a59929019866a40b4edc nopadding_no_abi_change +e9a330f2bf04a9d84b2e6791ed9a209ba50db353 xine-lib-1_1_5-release -- cgit v1.2.3 From 2d6a50b8a264a182db6b494dbe982f68e2398596 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Tue, 10 Apr 2007 00:47:32 +0100 Subject: Oops. Remove the "(unreleased)" marker. --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 37c1d2ecc..087c2dd27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -xine-lib (1.1.5) (Unreleased) +xine-lib (1.1.5) * Security fixes: - Fix heap overflow in DMO loader. (CVE-2007-1246) [bug #1676925] Thanks to Kees Cook for reporting. -- cgit v1.2.3 From 141b69b352fa561ac506f81d39c9d19c4da28536 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Tue, 10 Apr 2007 00:49:19 +0100 Subject: Retag xine-lib 1.1.5. --- .hgtags | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.hgtags b/.hgtags index 11213d565..37af4fbf3 100644 --- a/.hgtags +++ b/.hgtags @@ -58,4 +58,4 @@ eb7068fcbc340c1074f9ff916d3843ac19ea94fa xine-lib-1_1_0-release f1a2861399059cba07e916afee432bbb31df4249 xine-1-beta4-release fd12068ebd3fab2438f77b06e312c4244e97950a DXR3_095 4a4f4e8bb768b6598c02a59929019866a40b4edc nopadding_no_abi_change -e9a330f2bf04a9d84b2e6791ed9a209ba50db353 xine-lib-1_1_5-release +204b8e92463b592e5c220b56f186a6d4d1007cf9 xine-lib-1_1_5-release -- cgit v1.2.3 From ad4b05c5e85b8e758969d7777154bfa03cbe9eaf Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Tue, 10 Apr 2007 17:07:18 +0100 Subject: Start 1.1.6 release cycle. --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 087c2dd27..9ab3111a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +xine-lib (1.1.6) [UNRELEASED] + xine-lib (1.1.5) * Security fixes: - Fix heap overflow in DMO loader. (CVE-2007-1246) [bug #1676925] -- cgit v1.2.3 From 2cf4445f446410a072d90a2aca84d3b61bb9d5cf Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Tue, 10 Apr 2007 17:08:22 +0100 Subject: Split the DirectFB plugin into X11 and non-X versions. This fixes linkage problems for people who want this but don't want X. --- ChangeLog | 1 + src/video_out/Makefile.am | 13 ++++++++++--- src/video_out/video_out_directfb.c | 30 ++++++++++++++++-------------- src/video_out/video_out_directfb_fb.c | 25 +++++++++++++++++++++++++ src/video_out/video_out_directfb_x.c | 25 +++++++++++++++++++++++++ 5 files changed, 77 insertions(+), 17 deletions(-) create mode 100644 src/video_out/video_out_directfb_fb.c create mode 100644 src/video_out/video_out_directfb_x.c diff --git a/ChangeLog b/ChangeLog index 9ab3111a5..93a8b52ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ xine-lib (1.1.6) [UNRELEASED] + * Split the DirectFB plugin into X11 and non-X versions. xine-lib (1.1.5) * Security fixes: diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am index 34971377c..148eda84c 100644 --- a/src/video_out/Makefile.am +++ b/src/video_out/Makefile.am @@ -5,7 +5,7 @@ AM_LDFLAGS = $(xineplug_ldflags) SUBDIRS = libdha vidix macosx -EXTRA_DIST = video_out_directfb.c video_out_directx.c video_out_macosx.m +EXTRA_DIST = video_out_directfb.c video_out_directfb_fb.c video_out_directfb_x.c video_out_directx.c video_out_macosx.m VIDIX_CFLAGS = -I$(top_builddir)/src/video_out/vidix \ -I$(top_srcdir)/src/video_out/vidix @@ -64,6 +64,9 @@ endif if HAVE_DIRECTFB directfb_module = xineplug_vo_out_directfb.la +if HAVE_X11 +directfb_module += xineplug_vo_out_xdirectfb.la +endif endif if HAVE_SDL @@ -162,10 +165,14 @@ xineplug_vo_out_fb_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \ xineplug_vo_out_fb_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) xineplug_vo_out_fb_la_CFLAGS = $(VISIBILITY_FLAG) $(MLIB_CFLAGS) -xineplug_vo_out_directfb_la_SOURCES = video_out_directfb.c $(X11OSD) -xineplug_vo_out_directfb_la_LIBADD = $(XINE_LIB) $(DIRECTFB_LIBS) $(X_LIBS) $(PTHREAD_LIBS) +xineplug_vo_out_directfb_la_SOURCES = video_out_directfb_fb.c +xineplug_vo_out_directfb_la_LIBADD = $(XINE_LIB) $(DIRECTFB_LIBS) $(PTHREAD_LIBS) xineplug_vo_out_directfb_la_CFLAGS = $(VISIBILITY_FLAG) $(DIRECTFB_CFLAGS) -fno-strict-aliasing +xineplug_vo_out_xdirectfb_la_SOURCES = video_out_directfb_x.c $(X11OSD) +xineplug_vo_out_xdirectfb_la_LIBADD = $(XINE_LIB) $(DIRECTFB_LIBS) $(X_LIBS) $(PTHREAD_LIBS) +xineplug_vo_out_xdirectfb_la_CFLAGS = $(VISIBILITY_FLAG) $(DIRECTFB_CFLAGS) -fno-strict-aliasing + xineplug_vo_out_sdl_la_SOURCES = video_out_sdl.c xineplug_vo_out_sdl_la_LIBADD = $(SDL_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) xineplug_vo_out_sdl_la_CFLAGS = $(VISIBILITY_FLAG) $(X_CFLAGS) $(SDL_CFLAGS) diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c index a51940952..efbb30f2d 100644 --- a/src/video_out/video_out_directfb.c +++ b/src/video_out/video_out_directfb.c @@ -31,7 +31,7 @@ #include #include -#ifdef HAVE_X11 +#ifdef DIRECTFB_X11 # include #endif @@ -44,7 +44,7 @@ #include "xineutils.h" #include "vo_scale.h" -#ifdef HAVE_X11 +#ifdef DIRECTFB_X11 # include "x11osd.h" #endif @@ -118,7 +118,7 @@ typedef struct directfb_driver_s { int flicker_filtering; int field_parity; -#ifdef HAVE_X11 +#ifdef DIRECTFB_X11 /* X11 related stuff */ Display *display; int screen; @@ -317,7 +317,7 @@ static void directfb_update_frame_format (vo_driver_t *this_gen, frame->ratio = ratio; } -#ifdef HAVE_X11 +#ifdef DIRECTFB_X11 static uint32_t directfb_colorkey_to_pixel (directfb_driver_t *this) { switch (this->depth) { case 8: @@ -343,7 +343,7 @@ static uint32_t directfb_colorkey_to_pixel (directfb_driver_t *this) { static void directfb_clean_output_area (directfb_driver_t *this) { if (this->visual_type == XINE_VISUAL_TYPE_X11 || this->visual_type == XINE_VISUAL_TYPE_X11_2) { -#ifdef HAVE_X11 +#ifdef DIRECTFB_X11 if (this->config.options & DLOP_DST_COLORKEY) { int i; @@ -410,7 +410,7 @@ static void directfb_overlay_begin (vo_driver_t *this_gen, this->ovl_changed += changed; if (this->ovl_changed) { -#ifdef HAVE_X11 +#ifdef DIRECTFB_X11 if (this->xoverlay) { LOCK_DISPLAY(); x11osd_clear (this->xoverlay); @@ -554,7 +554,7 @@ static void directfb_overlay_blend (vo_driver_t *this_gen, if (overlay->unscaled) { if (!this->ovl_changed) return; -#ifdef HAVE_X11 +#ifdef DIRECTFB_X11 if (this->xoverlay) { LOCK_DISPLAY(); x11osd_blend (this->xoverlay, overlay); @@ -586,7 +586,7 @@ static void directfb_overlay_end (vo_driver_t *this_gen, vo_frame_t *frame_gen) directfb_driver_t *this = (directfb_driver_t *) this_gen; if (this->ovl_changed) { -#ifdef HAVE_X11 +#ifdef DIRECTFB_X11 if (this->xoverlay) { LOCK_DISPLAY(); x11osd_expose (this->xoverlay); @@ -1120,7 +1120,7 @@ static int directfb_gui_data_exchange (vo_driver_t *this_gen, switch (data_type) { case XINE_GUI_SEND_DRAWABLE_CHANGED: lprintf ("drawable changed.\n"); -#ifdef HAVE_X11 +#ifdef DIRECTFB_X11 if (this->visual_type == XINE_VISUAL_TYPE_X11 || this->visual_type == XINE_VISUAL_TYPE_X11_2) { this->drawable = (Drawable) data; @@ -1140,7 +1140,7 @@ static int directfb_gui_data_exchange (vo_driver_t *this_gen, case XINE_GUI_SEND_EXPOSE_EVENT: lprintf ("expose event.\n"); -#ifdef HAVE_X11 +#ifdef DIRECTFB_X11 if (this->visual_type == XINE_VISUAL_TYPE_X11 || this->visual_type == XINE_VISUAL_TYPE_X11_2) { if (this->xoverlay) { @@ -1182,7 +1182,7 @@ static void directfb_dispose (vo_driver_t *this_gen) { if (this->cur_frame) this->cur_frame->vo_frame.dispose (&this->cur_frame->vo_frame); -#ifdef HAVE_X11 +#ifdef DIRECTFB_X11 if (this->visual_type == XINE_VISUAL_TYPE_X11 || this->visual_type == XINE_VISUAL_TYPE_X11_2) { LOCK_DISPLAY(); @@ -1280,7 +1280,7 @@ static void update_config_cb (void *data, xine_cfg_entry_t *entry) { this->layer->SetDstColorKey (this->layer, (this->colorkey & 0xff0000) >> 16, (this->colorkey & 0x00ff00) >> 8, (this->colorkey & 0x0000ff) >> 0); -#ifdef HAVE_X11 +#ifdef DIRECTFB_X11 if (this->xoverlay) { x11osd_colorkey (this->xoverlay, directfb_colorkey_to_pixel(this), &this->sc); @@ -1893,6 +1893,7 @@ static void dispose_class_fb (video_driver_class_t *this_gen) { free (this); } +#ifndef DIRECTFB_X11 static void *init_class_fb (xine_t *xine, void *visual_gen) { directfb_class_t *this; const char *error; @@ -1925,7 +1926,7 @@ static const vo_info_t vo_info_directfb_fb = { /*** XDirectFB plugin functions ****/ -#ifdef HAVE_X11 +#else static vo_driver_t *open_plugin_x11 (video_driver_class_t *class_gen, const void *visual_gen) { directfb_class_t *class = (directfb_class_t *) class_gen; directfb_driver_t *this; @@ -2163,9 +2164,10 @@ static const vo_info_t vo_info_directfb_x11_2 = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ +#ifndef DIRECTFB_X11 { PLUGIN_VIDEO_OUT, VIDEO_OUT_DRIVER_IFACE_VERSION, "DirectFB", XINE_VERSION_CODE, &vo_info_directfb_fb, init_class_fb }, -#ifdef HAVE_X11 +#else { PLUGIN_VIDEO_OUT, VIDEO_OUT_DRIVER_IFACE_VERSION, "XDirectFB", XINE_VERSION_CODE, &vo_info_directfb_x11, init_class_x11 }, { PLUGIN_VIDEO_OUT, VIDEO_OUT_DRIVER_IFACE_VERSION, "XDirectFB", diff --git a/src/video_out/video_out_directfb_fb.c b/src/video_out/video_out_directfb_fb.c new file mode 100644 index 000000000..182a56941 --- /dev/null +++ b/src/video_out/video_out_directfb_fb.c @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2007 the xine project + * + * This file is part of xine, a free video player. + * + * xine is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * xine is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * + * DirectFB output plugin (console version wrapper) + */ + +#undef DIRECTFB_X11 +#include "video_out_directfb.c" diff --git a/src/video_out/video_out_directfb_x.c b/src/video_out/video_out_directfb_x.c new file mode 100644 index 000000000..b3a1f53b7 --- /dev/null +++ b/src/video_out/video_out_directfb_x.c @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2007 the xine project + * + * This file is part of xine, a free video player. + * + * xine is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * xine is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * + * DirectFB output plugin (X version wrapper) + */ + +#define DIRECTFB_X11 +#include "video_out_directfb.c" -- cgit v1.2.3