From e369f8281863325279b525a45caabb0e37578b94 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Fri, 16 Jan 2009 16:51:30 +0000 Subject: Back out MagickGetAuthenticPixels fix; causes FTBFS. --- src/libxinevdec/image.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/libxinevdec/image.c b/src/libxinevdec/image.c index a4d09a63c..51e5d0309 100644 --- a/src/libxinevdec/image.c +++ b/src/libxinevdec/image.c @@ -50,15 +50,6 @@ #include "xineutils.h" #include "bswap.h" -/* In 6.4.5.4 MagickGetImagePixels changed to MagickGetAuthenticPixels - * But upstream did not update their deprecated compat stuff. - * So do a fun hack to make it work. - * - 2008/11/26 Robin H. Johnson - */ -#if MagickLibVersion >= 0x645 -#define MagickGetImagePixels MagickGetAuthenticPixels -#endif - typedef struct { video_decoder_class_t decoder_class; -- cgit v1.2.3 From cc96350ed25b072190267641a6af7974524b6d4e Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Fri, 16 Jan 2009 18:16:17 +0000 Subject: Fix a broken size check in the pvr input plugin (ref. CVE-2008-5239). --- ChangeLog | 1 + src/input/input_pvr.c | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f5ec9da94..3ed085f08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ xine-lib (1.1.17) 2009-??-?? * Build fixes related to ImageMagick 6.4 & later. * Enable libmpeg2new. This is not yet production code; the old mpeg2 decoder remains the default. + * Fix a broken size check in the pvr input plugin (ref. CVE-2008-5239). xine-lib (1.1.16.1) 2009-01-11 * Fix build with older ffmpeg, both internal and in Debian 5.0. diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c index 18d29f6be..5238fccbc 100644 --- a/src/input/input_pvr.c +++ b/src/input/input_pvr.c @@ -1202,14 +1202,17 @@ static buf_element_t *pvr_plugin_read_block (input_plugin_t *this_gen, fifo_buff buf_element_t *buf; int speed = _x_get_speed(this->stream); - if (todo < 0 || todo > buf->size) - return NULL; - if( !this->pvr_running ) { xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "input_pvr: thread died, aborting\n"); return NULL; } + buf = fifo->buffer_pool_alloc (fifo); + if (todo < 0 || todo > buf->size) { + buf->free_buffer(buf); + return NULL; + } + if( this->scr_tunning == -2 ) speed = this->speed_before_pause; @@ -1233,7 +1236,6 @@ static buf_element_t *pvr_plugin_read_block (input_plugin_t *this_gen, fifo_buff pvr_event_handler(this); - buf = fifo->buffer_pool_alloc (fifo); buf->content = buf->mem; pthread_mutex_lock(&this->lock); -- cgit v1.2.3 From 6f90955bba9d996b0fe9080cc4c13d657562af3c Mon Sep 17 00:00:00 2001 From: Dirk Leber Date: Mon, 14 Jan 2008 18:53:35 +0100 Subject: Signedness bug in Matroska PTS calculation With some mkv files I had many discontinuity events. I found out that if changing the timecode_diff in demux_matroska.c from int to int16_t fixes this problem. Using int will never produce negative values if int is not 16-bit... --- ChangeLog | 1 + src/demuxers/demux_matroska.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ed085f08..c988d78f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ xine-lib (1.1.17) 2009-??-?? * Build fixes related to ImageMagick 6.4 & later. + * Fix an error in Matroska PTS calculation. * Enable libmpeg2new. This is not yet production code; the old mpeg2 decoder remains the default. * Fix a broken size check in the pvr input plugin (ref. CVE-2008-5239). diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index 086e0cc98..37f4bd95b 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.c @@ -1867,7 +1867,7 @@ static int parse_block (demux_matroska_t *this, size_t block_size, uint8_t *data; uint8_t flags; int gap, lacing, num_len; - int timecode_diff; + int16_t timecode_diff; int64_t pts, xduration; int decoder_flags = 0; @@ -1877,7 +1877,7 @@ static int parse_block (demux_matroska_t *this, size_t block_size, data += num_len; /* timecode_diff is signed */ - timecode_diff = parse_int16(data); + timecode_diff = (int16_t)parse_int16(data); data += 2; flags = *data; -- cgit v1.2.3 From d462ef0ce04d5ca91cd008efecc37c2c1fa39bbb Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 17 Jan 2009 14:30:50 +0000 Subject: Avoid libtool running ldconfig (where not needed) at install time. --- configure.ac | 7 +++++++ misc/Makefile.am | 1 + misc/Makefile.plugins.in | 1 + src/audio_out/Makefile.am | 1 + src/combined/Makefile.am | 1 + src/combined/ffmpeg/Makefile.am | 1 + src/demuxers/Makefile.am | 1 + src/dxr3/Makefile.am | 1 + src/input/Makefile.am | 1 + src/input/vcd/Makefile.am | 1 + src/liba52/Makefile.am | 1 + src/libdts/Makefile.am | 1 + src/libfaad/Makefile.am | 1 + src/libmad/Makefile.am | 1 + src/libmpeg2/Makefile.am | 1 + src/libmpeg2new/Makefile.am | 1 + src/libmusepack/Makefile.am | 1 + src/libreal/Makefile.am | 1 + src/libspucc/Makefile.am | 1 + src/libspucmml/Makefile.am | 1 + src/libspudec/Makefile.am | 1 + src/libspudvb/Makefile.am | 1 + src/libsputext/Makefile.am | 1 + src/libw32dll/Makefile.am | 1 + src/libxineadec/Makefile.am | 1 + src/libxinevdec/Makefile.am | 1 + src/post/audio/Makefile.am | 1 + src/post/deinterlace/Makefile.am | 1 + src/post/goom/Makefile.am | 1 + src/post/mosaico/Makefile.am | 1 + src/post/planar/Makefile.am | 1 + src/post/visualizations/Makefile.am | 1 + src/video_out/Makefile.am | 1 + 33 files changed, 39 insertions(+) create mode 100644 misc/Makefile.plugins.in diff --git a/configure.ac b/configure.ac index b05afc277..55450c780 100644 --- a/configure.ac +++ b/configure.ac @@ -2478,6 +2478,12 @@ AC_SUBST(XINE_FONTDIR) AC_SUBST(XINE_LOCALEDIR) AC_SUBST(XINE_PKGCONFIG_DIR) +LIBTOOL_DESTDIR_DEFAULT= +if test "x$SYS" != "xmingw32" -a "x$SYS" != "xcygwin"; then + LIBTOOL_DESTDIR_DEFAULT=/ +fi +AC_SUBST([LIBTOOL_DESTDIR_DEFAULT]) + dnl Where aclocal m4 files should be installed XINE_ACFLAGS="-I ${datarootdir}/aclocal" AC_DEFINE_UNQUOTED(XINE_ACFLAGS, "$XINE_ACFLAGS", [Path where aclocal m4 files will be.]) @@ -2681,6 +2687,7 @@ include/xine.h lib/Makefile m4/Makefile misc/Makefile +misc/Makefile.plugins misc/SlackBuild misc/build_rpms.sh misc/fonts/Makefile diff --git a/misc/Makefile.am b/misc/Makefile.am index 1ab4097c5..7f7e8db7c 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -13,6 +13,7 @@ EXTRA_DIST = build_rpms.sh \ xine-lib.spec \ libxine.pc.in \ libdvdcss-1.2.6-network.patch \ + Makefile.plugins.in \ Makefile.common bin_SCRIPTS = xine-config diff --git a/misc/Makefile.plugins.in b/misc/Makefile.plugins.in new file mode 100644 index 000000000..adee79479 --- /dev/null +++ b/misc/Makefile.plugins.in @@ -0,0 +1 @@ +DESTDIR:=$(if $(DESTDIR),$(DESTDIR),@LIBTOOL_DESTDIR_DEFAULT@) diff --git a/src/audio_out/Makefile.am b/src/audio_out/Makefile.am index 8bd32e98a..40d3c6cca 100644 --- a/src/audio_out/Makefile.am +++ b/src/audio_out/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common AM_CPPFLAGS = -DXINE_COMPILE diff --git a/src/combined/Makefile.am b/src/combined/Makefile.am index 03250ef67..6a43fed47 100644 --- a/src/combined/Makefile.am +++ b/src/combined/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common SUBDIRS = ffmpeg diff --git a/src/combined/ffmpeg/Makefile.am b/src/combined/ffmpeg/Makefile.am index a210d8f05..daae18509 100644 --- a/src/combined/ffmpeg/Makefile.am +++ b/src/combined/ffmpeg/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common DEFAULT_INCLUDES = -I. diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am index f5b0befbe..3bc1103ec 100644 --- a/src/demuxers/Makefile.am +++ b/src/demuxers/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(VISIBILITY_FLAG) diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am index f1a61ce12..3c2cbafbc 100644 --- a/src/dxr3/Makefile.am +++ b/src/dxr3/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(X_CFLAGS) $(LIBFAME_CFLAGS) diff --git a/src/input/Makefile.am b/src/input/Makefile.am index 81dd62eca..8e9c9385d 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common EXTRA_DIST = input_dvd.c input_vcd.c input_gnome_vfs.c input_rtp.c diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am index 31ec6a44c..61eac753b 100644 --- a/src/input/vcd/Makefile.am +++ b/src/input/vcd/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common SUBDIRS = libcdio libvcd diff --git a/src/liba52/Makefile.am b/src/liba52/Makefile.am index 508ea9c1b..b13170076 100644 --- a/src/liba52/Makefile.am +++ b/src/liba52/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common if A52 diff --git a/src/libdts/Makefile.am b/src/libdts/Makefile.am index 1329dd49c..b7ec60016 100644 --- a/src/libdts/Makefile.am +++ b/src/libdts/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common if DTS diff --git a/src/libfaad/Makefile.am b/src/libfaad/Makefile.am index f36fb608a..92bab83fb 100644 --- a/src/libfaad/Makefile.am +++ b/src/libfaad/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common SUBDIRS = codebook diff --git a/src/libmad/Makefile.am b/src/libmad/Makefile.am index c879645c5..56339cc72 100644 --- a/src/libmad/Makefile.am +++ b/src/libmad/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = -DOPT_SPEED diff --git a/src/libmpeg2/Makefile.am b/src/libmpeg2/Makefile.am index 5a9f1302c..849e56363 100644 --- a/src/libmpeg2/Makefile.am +++ b/src/libmpeg2/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common xineplug_LTLIBRARIES = xineplug_decode_mpeg2.la diff --git a/src/libmpeg2new/Makefile.am b/src/libmpeg2new/Makefile.am index f83a38c4d..a91e5bea6 100644 --- a/src/libmpeg2new/Makefile.am +++ b/src/libmpeg2new/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common SUBDIRS = include libmpeg2 diff --git a/src/libmusepack/Makefile.am b/src/libmusepack/Makefile.am index 01875bdad..11344c3c2 100644 --- a/src/libmusepack/Makefile.am +++ b/src/libmusepack/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common SUBDIRS = musepack diff --git a/src/libreal/Makefile.am b/src/libreal/Makefile.am index 6e76d6279..90e47a63c 100644 --- a/src/libreal/Makefile.am +++ b/src/libreal/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common if ENABLE_REAL diff --git a/src/libspucc/Makefile.am b/src/libspucc/Makefile.am index a8af8632e..1e170cdd5 100644 --- a/src/libspucc/Makefile.am +++ b/src/libspucc/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common xineplug_LTLIBRARIES = xineplug_decode_spucc.la diff --git a/src/libspucmml/Makefile.am b/src/libspucmml/Makefile.am index 81e8d3623..53a980b57 100644 --- a/src/libspucmml/Makefile.am +++ b/src/libspucmml/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common xineplug_LTLIBRARIES = xineplug_decode_spucmml.la diff --git a/src/libspudec/Makefile.am b/src/libspudec/Makefile.am index 7c0dcd78d..061bd7731 100644 --- a/src/libspudec/Makefile.am +++ b/src/libspudec/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common xineplug_LTLIBRARIES = xineplug_decode_spu.la diff --git a/src/libspudvb/Makefile.am b/src/libspudvb/Makefile.am index 310c02f0b..8187346aa 100644 --- a/src/libspudvb/Makefile.am +++ b/src/libspudvb/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common xineplug_LTLIBRARIES = xineplug_decode_spudvb.la diff --git a/src/libsputext/Makefile.am b/src/libsputext/Makefile.am index 4f03d7fa9..62258933d 100644 --- a/src/libsputext/Makefile.am +++ b/src/libsputext/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common AM_LDFLAGS = $(xineplug_ldflags) diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am index e7f655888..5036851a3 100644 --- a/src/libw32dll/Makefile.am +++ b/src/libw32dll/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = -I$(srcdir)/wine -DWIN32_PATH=\"@w32_path@\" $(VISIBILITY_FLAG) diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am index a97cd1934..ae261e60c 100644 --- a/src/libxineadec/Makefile.am +++ b/src/libxineadec/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common EXTRA_DIST = fooaudio.c diff --git a/src/libxinevdec/Makefile.am b/src/libxinevdec/Makefile.am index 81219d67e..b7dbe1db1 100644 --- a/src/libxinevdec/Makefile.am +++ b/src/libxinevdec/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(VISIBILITY_FLAG) diff --git a/src/post/audio/Makefile.am b/src/post/audio/Makefile.am index 41a364d0d..5e587ef2f 100644 --- a/src/post/audio/Makefile.am +++ b/src/post/audio/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common noinst_HEADERS = dsp.h filter.h window.h audio_filters.h diff --git a/src/post/deinterlace/Makefile.am b/src/post/deinterlace/Makefile.am index c9e09ee23..bac6bac33 100644 --- a/src/post/deinterlace/Makefile.am +++ b/src/post/deinterlace/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common SUBDIRS = plugins diff --git a/src/post/goom/Makefile.am b/src/post/goom/Makefile.am index c01482917..cd022c9b0 100644 --- a/src/post/goom/Makefile.am +++ b/src/post/goom/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common EXTRA_DIST = mmx.c xmmx.c ppc_drawings.s ppc_zoom_ultimate.s diff_against_release.patch \ diff --git a/src/post/mosaico/Makefile.am b/src/post/mosaico/Makefile.am index af027b6e6..56426c711 100644 --- a/src/post/mosaico/Makefile.am +++ b/src/post/mosaico/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common xinepost_LTLIBRARIES = xineplug_post_mosaico.la xineplug_post_switch.la diff --git a/src/post/planar/Makefile.am b/src/post/planar/Makefile.am index c49243252..751ea390a 100644 --- a/src/post/planar/Makefile.am +++ b/src/post/planar/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common POSTPROC_INT_LIB = $(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostprocess.la diff --git a/src/post/visualizations/Makefile.am b/src/post/visualizations/Makefile.am index f42598d9c..a766bc10a 100644 --- a/src/post/visualizations/Makefile.am +++ b/src/post/visualizations/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common EXTRA_DIST = fooviz.c diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am index f8ce7fc1f..3e182fc14 100644 --- a/src/video_out/Makefile.am +++ b/src/video_out/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common AM_CPPFLAGS = -DXINE_COMPILE -- cgit v1.2.3 From e886af1e544dc7db4abad76bdb14fe53a5467ced Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 17 Jan 2009 14:41:58 +0000 Subject: Add an empty en_US translation, ready for mis-spellings of "colour" etc. --- po/LINGUAS | 2 ++ po/en_US.po | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 po/en_US.po diff --git a/po/LINGUAS b/po/LINGUAS index 87a156243..d6f194aea 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,5 +1,7 @@ cs de +# en_GB not needed +en_US eo es eu diff --git a/po/en_US.po b/po/en_US.po new file mode 100644 index 000000000..31878a1c3 --- /dev/null +++ b/po/en_US.po @@ -0,0 +1,16 @@ +# Translation of xine-lib.po into American English. +# Copyright (C) 2008 the xine project +# Copyright (C) 2002, 2006, 2007, 2008 Free Software Foundation, Inc. +# +msgid "" +msgstr "" +"Project-Id-Version: xine-lib.hg\n" +"Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2009-01-15 19:04+0000\n" +"PO-Revision-Date: 2009-01-15 19:04+0000\n" +"Last-Translator: Not translated \n" +"Language-Team: en_US \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -- cgit v1.2.3