[pkgsrc/trunk]: pkgsrc/multimedia/xine-lib Update xine-lib to 1.1.3

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e686be74b8c1
branches:  trunk
changeset: 522374:e686be74b8c1
user:      abs <abs%pkgsrc.org@localhost>
date:      Fri Dec 08 09:24:26 2006 +0000

description:
Update xine-lib to 1.1.3

  * Security fixes:
    - Heap overflow in libmms (related to CVE-2006-2200)
    - Buffer overrun in Real Media input plugin. [bug #1603458]
      Thanks to Roland Kay for reporting and JW for the patch.
  * Update build system to support x86 Darwin setups, and merge patches to
    support Darwin OS better.
  * Replace custom ALSA check with pkg-config check, and make sure 0.9.0 is
    the requried version.
  * When the compiler supports it, enable hidden visibility for all the
    plugins to export only the plugin info entry (and eventual needed
    special functions), to replace the min-symtab option that wasn't working.
  * Add "m4b" to the list of supported file extensions for the Qt demuxer, to
    allow playing (unprotected) audiobooks in AAC format.
  * Remove --disable-fpic hack, prefer using --without-pic instead.
  * Add new output plugin: PulseAudio (based on PolypAudio plugin), that uses
    0.9 API (PulseAudio is PolypAudio renamed).
  * Remove PolypAudio plugin, latest version supported 0.7 API that is no more
    supported by upstream, and it's replaced by PulseAudio.
  * Allow 0 for DVD title/chapter (navigation or full title).
  * New experimental JACK audio driver.
  * Fix switch from alsa/dmix 2.0 to 5.1 [bug #1226595]
  * Don't use proxy for localhost connection. [bug #1553633]
  * Use mmap() to open local files if available.
  * Use pkg-config to look for external FFmpeg.
  * Allow FFmpeg to play MP3s in case MAD is not present.
  * Reduce the dead time when trying to connect to dead hosts, by falling back
    to non-blocking sockets on the last address found for an host, and allowing
    users to provide a connection timeout. [bug #1550844]
  * Return the correct error message to frontends when a file is inaccessible or
    the network connection is broken. [bug #1550763]
  * Support libcaca 0.99, thanks to cjacker huang.
  * Fix crash on video-only WMV streams. [bug #1564598]
  * Report audio stream on Shorten files (required for Amarok to play them).
  * Optionally use fontconfig to look up fonts to use for OSD. [bug #1551042]
  * Prefer FreeType2 rendered fonts to bitmap fonts.
  * Stone age platforms update
  * Enabled TrueSpeech codec
  * New X11 visual type: xine-lib may now use frontend's mutex/lock mechanism
    instead of XLockDisplay/XUnlockDisplay.
  * Allow playing of OggFlac files. [bug #1590690]
  * Allow playing FLAC files with an ID3 tag at the start.
  * Fix some crashes caused by MP3 files (and possibly others) being
    misdetected as AAC.

diffstat:

 multimedia/xine-lib/Makefile         |    3 +-
 multimedia/xine-lib/Makefile.common  |    7 +-
 multimedia/xine-lib/distinfo         |   44 +++++-----
 multimedia/xine-lib/patches/patch-aa |    8 +-
 multimedia/xine-lib/patches/patch-ab |   10 +-
 multimedia/xine-lib/patches/patch-ac |   22 ++--
 multimedia/xine-lib/patches/patch-ae |   22 ++--
 multimedia/xine-lib/patches/patch-ag |   65 +++++++++------
 multimedia/xine-lib/patches/patch-ah |    6 +-
 multimedia/xine-lib/patches/patch-ai |    6 +-
 multimedia/xine-lib/patches/patch-ao |   12 +-
 multimedia/xine-lib/patches/patch-ap |    8 +-
 multimedia/xine-lib/patches/patch-av |    6 +-
 multimedia/xine-lib/patches/patch-az |   14 +-
 multimedia/xine-lib/patches/patch-bb |   19 ----
 multimedia/xine-lib/patches/patch-bd |   12 +-
 multimedia/xine-lib/patches/patch-be |   18 ++--
 multimedia/xine-lib/patches/patch-bg |    8 +-
 multimedia/xine-lib/patches/patch-bh |   14 ---
 multimedia/xine-lib/patches/patch-da |  140 +++++++++++++++++-----------------
 multimedia/xine-lib/patches/patch-db |   10 +-
 multimedia/xine-lib/patches/patch-dc |   20 +---
 22 files changed, 219 insertions(+), 255 deletions(-)

diffs (truncated from 1188 to 300 lines):

diff -r 56216f2300de -r e686be74b8c1 multimedia/xine-lib/Makefile
--- a/multimedia/xine-lib/Makefile      Fri Dec 08 05:44:19 2006 +0000
+++ b/multimedia/xine-lib/Makefile      Fri Dec 08 09:24:26 2006 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2006/08/14 12:15:38 joerg Exp $
+# $NetBSD: Makefile,v 1.42 2006/12/08 09:24:26 abs Exp $
 
 .include "Makefile.common"
 
 COMMENT=               Multimedia player library
-PKGREVISION=           1
 
 BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
 
diff -r 56216f2300de -r e686be74b8c1 multimedia/xine-lib/Makefile.common
--- a/multimedia/xine-lib/Makefile.common       Fri Dec 08 05:44:19 2006 +0000
+++ b/multimedia/xine-lib/Makefile.common       Fri Dec 08 09:24:26 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2006/08/06 10:36:50 wiz Exp $
+# $NetBSD: Makefile.common,v 1.36 2006/12/08 09:24:26 abs Exp $
 #
 
 DISTNAME=              xine-lib-${XINE_LIB_VER}
@@ -6,12 +6,11 @@
 PKGNAME?=              ${XINE_PKGNAME}
 CATEGORIES?=           multimedia
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=xine/}
-EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://xinehq.de/
 
-XINE_LIB_VER=          1.1.2
+XINE_LIB_VER=          1.1.3
 PLIST_SUBST+=          XINE_LIB_VER=${XINE_LIB_VER:Q}
 
 DISTINFO_FILE=         ${.CURDIR}/../../multimedia/xine-lib/distinfo
@@ -23,7 +22,7 @@
 LIBTOOL_OVERRIDE=      libtool libtool-nofpic
 PKGCONFIG_OVERRIDE=    misc/libxine.pc.in
 USE_TOOLS+=            autoconf gmake msgfmt pkg-config
-WRKSRC=                        ${WRKDIR}/xine-lib-1.1.2
+WRKSRC=                        ${WRKDIR}/xine-lib-1.1.3
 
 CONFIGURE_ARGS+=       --with-w32-path='${PREFIX}/lib/win32'
 CONFIGURE_ARGS+=       --without-external-ffmpeg --disable-ffmpegtest
diff -r 56216f2300de -r e686be74b8c1 multimedia/xine-lib/distinfo
--- a/multimedia/xine-lib/distinfo      Fri Dec 08 05:44:19 2006 +0000
+++ b/multimedia/xine-lib/distinfo      Fri Dec 08 09:24:26 2006 +0000
@@ -1,33 +1,31 @@
-$NetBSD: distinfo,v 1.37 2006/09/29 21:20:04 dmcmahill Exp $
+$NetBSD: distinfo,v 1.38 2006/12/08 09:24:26 abs Exp $
 
-SHA1 (xine-lib-1.1.2.tar.bz2) = 07e454e2287e34414b598faf78ae6d8ab8ffbb69
-RMD160 (xine-lib-1.1.2.tar.bz2) = 21322d6d7e085237926741495d70f5ce7764910b
-Size (xine-lib-1.1.2.tar.bz2) = 6457108 bytes
-SHA1 (patch-aa) = 8218d6415878fb99ebf533eb9d60c9ffebbed274
-SHA1 (patch-ab) = c83f1826eabbc53e868ea4a532efda7f7ac8a4b7
-SHA1 (patch-ac) = 7959d6d3599c9debe79b1b4a5749b6af714588a0
+SHA1 (xine-lib-1.1.3.tar.gz) = c0886910ddb1afa1a72572decf12c0251bba40bf
+RMD160 (xine-lib-1.1.3.tar.gz) = 8e28638385ea48e7d4d4d702573ca92c4eca77c8
+Size (xine-lib-1.1.3.tar.gz) = 8508884 bytes
+SHA1 (patch-aa) = e09d34a121080b03bc67b2d8a3ca27463b771acc
+SHA1 (patch-ab) = ef13b60c2bea54f354acf1b2d70c04594dac36c9
+SHA1 (patch-ac) = e3c1a5eeb7c70e3a69035ccd667fc2115eec4969
 SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
-SHA1 (patch-ae) = 401dccaa31f391746f35a574d4abc71154d001ae
-SHA1 (patch-ag) = 64cee767f92802013813d1c545e5a44d43c7a8cd
-SHA1 (patch-ah) = a6e62210766a9f9f518413940eac5e857e1aabc4
-SHA1 (patch-ai) = f51423976056637f92366d9ccee6b97837ffc934
+SHA1 (patch-ae) = faabcf1d34deee5d47ded9b210b37929f2635e2e
+SHA1 (patch-ag) = 3dcd17f807d21b19caed7b9d72b7437332b34fad
+SHA1 (patch-ah) = ba408237d4a717cc91b5d06ede425048914a9a1f
+SHA1 (patch-ai) = f0b33c1a36082445a86bcf71e07a6210aa21b7dc
 SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b
 SHA1 (patch-ak) = 744f59d1b9e40983f25bb532db1a5d4e92be6fbe
 SHA1 (patch-al) = 9e3ad86a7d7f32e58de157fa37141138af10838e
 SHA1 (patch-an) = ba1ba429c13d3695cca5df4f00dd380aa98f03fa
-SHA1 (patch-ao) = 1bc8c9f9a0a2c711381892dcc0dafef1fb16054a
-SHA1 (patch-ap) = aaf63024c1049c1f2175d9974367a6b84ac3028f
+SHA1 (patch-ao) = eabc0d33210aeb1c8469e761471e5bb8336c89b7
+SHA1 (patch-ap) = c84a3ca97a4615a1b389f49847c0eefe0ee0478f
 SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834
-SHA1 (patch-av) = 635ec9b332cacc02882822d8f78871f1d9377d27
+SHA1 (patch-av) = ff076273416fa701da325aa5060503ecb16a9ed1
 SHA1 (patch-aw) = 78ab44197a6b9f85e4b272d522ce254de4d557dc
-SHA1 (patch-az) = e2d392fb295d51d90dc5fa6b672bcac9dcd5a04f
-SHA1 (patch-bb) = 23b387a4bd1877081eeddb5a2ecdd2b697eb224f
-SHA1 (patch-bd) = 5352293022da25b08598d42655af2524ff99b28a
-SHA1 (patch-be) = d076593d15c58762e84f53964fb90c61873e7a45
-SHA1 (patch-bg) = aa1a8960d597113825993be59db45644a620e99d
-SHA1 (patch-bh) = 443e5f542c6d3f5162e5c9c34b0d4311f9138a5a
+SHA1 (patch-az) = baa10413ae31ad5309180c662da774d64f614b49
+SHA1 (patch-bd) = 2f0f39512d185377cca1ebaf4e891d518a1c14d0
+SHA1 (patch-be) = 04eb23f58cb96dab4b7c7120092364915ebaf330
+SHA1 (patch-bg) = 83f97ad77c8295fcaf78a7ea7fe9c4f87efd80d0
 SHA1 (patch-cb) = 08d9920022988d2764d941cfa8b1aa5602a0ec81
 SHA1 (patch-cd) = a080c745d08ded46db7c1173fe55350c1eb9ff33
-SHA1 (patch-da) = 7cb3cb60fd47720f081a101f80f9b53da7696c78
-SHA1 (patch-db) = 07214343b63a5e3bad774e8a18b3d8533526b97d
-SHA1 (patch-dc) = 218fbda52fffecb02993695116fcca0fbf65346e
+SHA1 (patch-da) = d488fb2a1e454a4338bf599674035f9db09d8682
+SHA1 (patch-db) = 3ad4ca6f43a379b251211477972cd6d34b1f821a
+SHA1 (patch-dc) = 11c4212029e67f22796e57706b42400a0dbcac3a
diff -r 56216f2300de -r e686be74b8c1 multimedia/xine-lib/patches/patch-aa
--- a/multimedia/xine-lib/patches/patch-aa      Fri Dec 08 05:44:19 2006 +0000
+++ b/multimedia/xine-lib/patches/patch-aa      Fri Dec 08 09:24:26 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2005/10/13 10:48:01 jmmv Exp $
+$NetBSD: patch-aa,v 1.5 2006/12/08 09:24:26 abs Exp $
 
---- src/xine-engine/video_decoder.c.orig       2005-10-08 15:57:49.000000000 +0200
+--- src/xine-engine/video_decoder.c.orig       2006-12-03 19:28:13.000000000 +0000
 +++ src/xine-engine/video_decoder.c
 @@ -43,6 +43,10 @@
  
@@ -13,7 +13,7 @@
  
  static void update_spu_decoder (xine_stream_t *stream, int type) {
  
-@@ -472,7 +476,9 @@ void _x_video_decoder_init (xine_stream_
+@@ -479,7 +483,9 @@ int _x_video_decoder_init (xine_stream_t
    } else {
       
      pthread_attr_t       pth_attrs;
@@ -23,7 +23,7 @@
      int                      err, num_buffers;
      /* The fifo size is based on dvd playback where buffers are filled
       * with 2k of data. With 500 buffers and a typical video data rate
-@@ -496,10 +502,12 @@ void _x_video_decoder_init (xine_stream_
+@@ -508,10 +514,12 @@ int _x_video_decoder_init (xine_stream_t
      stream->spu_track_map_entries = 0;
    
      pthread_attr_init(&pth_attrs);
diff -r 56216f2300de -r e686be74b8c1 multimedia/xine-lib/patches/patch-ab
--- a/multimedia/xine-lib/patches/patch-ab      Fri Dec 08 05:44:19 2006 +0000
+++ b/multimedia/xine-lib/patches/patch-ab      Fri Dec 08 09:24:26 2006 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.3 2005/10/13 10:48:01 jmmv Exp $
+$NetBSD: patch-ab,v 1.4 2006/12/08 09:24:26 abs Exp $
 
---- src/xine-engine/audio_decoder.c.orig       2005-10-08 15:57:49.000000000 +0200
+--- src/xine-engine/audio_decoder.c.orig       2006-09-08 22:11:29.000000000 +0100
 +++ src/xine-engine/audio_decoder.c
-@@ -448,7 +448,9 @@ static void *audio_decoder_loop (void *s
- void _x_audio_decoder_init (xine_stream_t *stream) {
+@@ -462,7 +462,9 @@ static void *audio_decoder_loop (void *s
+ int _x_audio_decoder_init (xine_stream_t *stream) {
  
    pthread_attr_t       pth_attrs;
 +#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
@@ -12,7 +12,7 @@
    int                  err;
  
    if (stream->audio_out == NULL) {
-@@ -486,10 +488,12 @@ void _x_audio_decoder_init (xine_stream_
+@@ -500,10 +502,12 @@ int _x_audio_decoder_init (xine_stream_t
       */
  
      pthread_attr_init(&pth_attrs);
diff -r 56216f2300de -r e686be74b8c1 multimedia/xine-lib/patches/patch-ac
--- a/multimedia/xine-lib/patches/patch-ac      Fri Dec 08 05:44:19 2006 +0000
+++ b/multimedia/xine-lib/patches/patch-ac      Fri Dec 08 09:24:26 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2004/03/11 17:26:02 jmmv Exp $
+$NetBSD: patch-ac,v 1.3 2006/12/08 09:24:26 abs Exp $
 
---- src/audio_out/audio_sun_out.c.orig 2003-12-14 23:13:22.000000000 +0100
+--- src/audio_out/audio_sun_out.c.orig 2006-07-16 17:18:09.000000000 +0100
 +++ src/audio_out/audio_sun_out.c
 @@ -41,6 +41,11 @@
  #ifdef        __svr4__
@@ -24,7 +24,7 @@
  
    enum {
        RTSC_UNKNOWN = 0,
-@@ -113,12 +120,14 @@ typedef struct sun_driver_s {
+@@ -114,12 +121,14 @@ typedef struct sun_driver_s {
    unsigned     buf_len;
  #endif
  
@@ -39,7 +39,7 @@
  } sun_driver_t;
  
  
-@@ -128,6 +137,7 @@ typedef struct sun_driver_s {
+@@ -129,6 +138,7 @@ typedef struct sun_driver_s {
   */
  static int realtime_samplecounter_available(xine_t *xine, char *dev)
  {
@@ -47,7 +47,7 @@
    int fd = -1;
    audio_info_t info;
    int rtsc_ok = RTSC_DISABLED;
-@@ -246,6 +256,9 @@ error:
+@@ -247,6 +257,9 @@ error:
    }
  
    return rtsc_ok;
@@ -57,7 +57,7 @@
  }
  
  
-@@ -429,7 +442,9 @@ static int ao_sun_open(ao_driver_t *this
+@@ -430,7 +443,9 @@ static int ao_sun_open(ao_driver_t *this
    
    this->mode                  = mode;
    this->input_sample_rate     = rate;
@@ -67,7 +67,7 @@
  
    /*
     * open audio device
-@@ -461,6 +476,9 @@ static int ao_sun_open(ao_driver_t *this
+@@ -462,6 +477,9 @@ static int ao_sun_open(ao_driver_t *this
        info.play.sample_rate = this->input_sample_rate;
        info.play.eof = 0;
        info.play.samples = 0;
@@ -77,7 +77,7 @@
  
        this->convert_u8_s8 = 0;
  
-@@ -522,7 +540,9 @@ static int ao_sun_open(ao_driver_t *this
+@@ -523,7 +541,9 @@ static int ao_sun_open(ao_driver_t *this
        return 0;
    }
  
@@ -87,7 +87,7 @@
  
    this->output_sample_rate = info.play.sample_rate;
    this->num_channels = info.play.channels;
-@@ -563,6 +583,7 @@ static int ao_sun_delay(ao_driver_t *thi
+@@ -564,6 +584,7 @@ static int ao_sun_delay(ao_driver_t *thi
    sun_driver_t *this = (sun_driver_t *) this_gen;
    audio_info_t info;
  
@@ -95,7 +95,7 @@
    if (ioctl(this->audio_fd, AUDIO_GETINFO, &info) == 0 &&
        (this->frames_in_buffer == 0 || info.play.samples > 0)) {
  
-@@ -609,6 +630,10 @@ static int ao_sun_delay(ao_driver_t *thi
+@@ -610,6 +631,10 @@ static int ao_sun_delay(ao_driver_t *thi
      }
  #endif
    }
@@ -106,7 +106,7 @@
    return NOT_REAL_TIME;
  }
  
-@@ -717,7 +742,9 @@ static int ao_sun_write(ao_driver_t *thi
+@@ -718,7 +743,9 @@ static int ao_sun_write(ao_driver_t *thi
    if (num_written > 0) {
      int buffered_samples;
  
diff -r 56216f2300de -r e686be74b8c1 multimedia/xine-lib/patches/patch-ae
--- a/multimedia/xine-lib/patches/patch-ae      Fri Dec 08 05:44:19 2006 +0000
+++ b/multimedia/xine-lib/patches/patch-ae      Fri Dec 08 09:24:26 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2006/06/26 17:13:11 wiz Exp $
+$NetBSD: patch-ae,v 1.3 2006/12/08 09:24:26 abs Exp $
 
---- src/input/input_vcd.c.orig 2005-04-20 17:21:08.000000000 +0000
+--- src/input/input_vcd.c.orig 2006-07-10 23:08:16.000000000 +0100
 +++ src/input/input_vcd.c
-@@ -32,6 +32,7 @@
+@@ -33,6 +33,7 @@
  #include <errno.h>
  #include <fcntl.h>
  #include <sys/ioctl.h>
@@ -10,7 +10,7 @@
  #include <string.h>
  #ifdef HAVE_LINUX_CDROM_H
  # include <linux/cdrom.h>
-@@ -94,7 +95,7 @@ typedef struct {
+@@ -95,7 +96,7 @@ typedef struct {
  #if defined (__linux__) || defined(__sun)
    struct cdrom_tochdr    tochdr;
    struct cdrom_tocentry  tocent[100];
@@ -19,7 +19,7 @@
    struct ioc_toc_header  tochdr;
    struct cd_toc_entry    *tocent;
    off_t                  cur_sec;
-@@ -119,7 +120,7 @@ typedef struct {
+@@ -120,7 +121,7 @@ typedef struct {
  
    int                    cur_track;
  
@@ -28,7 +28,7 @@
    uint8_t                cur_min, cur_sec, cur_frame;
  #endif
  
-@@ -179,7 +180,7 @@ static int input_vcd_read_toc (vcd_input
+@@ -180,7 +181,7 @@ static int input_vcd_read_toc (vcd_input
  
    return 0;
  }
@@ -37,7 +37,7 @@
  static int input_vcd_read_toc (vcd_input_class_t *this, int fd) {
  
    struct ioc_read_toc_entry te;
-@@ -395,7 +396,7 @@ static off_t vcd_plugin_read (input_plug