Update to 1.2.5:

xine-lib (1.2.5) 2014-04-08
  * Update german translation.
  * Add bass downmix support to AC3 decoder.
  * Add experimental YCgCo colorspace support.
  * Add avformat demux plugin.
    - Support for new formats and protocols.
    - Proper rtsp support (with avformat+rtsp://, rtsp+tcp:// and rtsp+http:// mrls).
    - by default native xine demux plugins are probed first.
      This can be overridden in config, by selecting demuxer in mrl (#demux:avformat),
      or by using "avformat+" mrl prefix.
  * Add avio (libavformat) input plugin:
    - Support for new protocols (https://, ftp://, sftp://, ...).
    - Support for seekable http streams (with "avio+http://" mrl).
    - By default native xine input plugins are used. This can be overridden in config or by using "avio+" mrl prefix.
  * Recognise & use HEVC/H.265. (ffmpeg)
  * Add support for HEVC/H.265 to the mpeg-ts demuxer.
  * Add support for HEVC/H.265 and VP9 to the matroska demuxer.
  * Add VP8/VP9 decoder using libvpx.
  * Modernise Quicktime demuxer:
    - Multiple user selectable audio traks.
    - Support AC3, EAC3, vorbis, Purevoice audio.
    - Support ISO fragment media files.
    - More safety on broken files.
    - Slightly faster.
  * Recognise & use ADPCM G.726 and ATRAC3. (ffmpeg/libva)
  * Build fixes.
  * Fix HDMV subtitle channel.
  * FFmpeg compatibility fixes.
  * Some colour format conversion fixes.
  * Fix RealVideo re-ordered PTS: pass through, let the decoder re-order it.
  * Fix some problems with COOK audio.

8 files changed, 43 insertions, 49 deletions

diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 8ba93acaeba..bf1281317c4 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.123 2014/04/10 06:21:34 obache Exp $
+# $NetBSD: Makefile,v 1.124 2014/04/17 13:53:47 wiz Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=		4
-
 COMMENT=		Multimedia player library
 
 CONFLICTS+=		xine-xcb-[0-9]*
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index cad522a0db5..4e10d03466b 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.80 2013/12/04 12:38:35 drochner Exp $
+# $NetBSD: Makefile.common,v 1.81 2014/04/17 13:53:47 wiz Exp $
 #
 # used by audio/xine-alsa/Makefile
 # used by audio/xine-esound/Makefile
@@ -6,8 +6,8 @@
 # used by multimedia/xine-v4l/Makefile
 # used by multimedia/xine-v4l2/Makefile
 
-DISTNAME=		xine-lib-1.2.4
-XINE_PKGNAME=		xine-lib-1.2.4
+DISTNAME=		xine-lib-1.2.5
+XINE_PKGNAME=		xine-lib-1.2.5
 PKGNAME?=		${XINE_PKGNAME}
 CATEGORIES?=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
@@ -18,7 +18,7 @@ HOMEPAGE=		http://xinehq.de/
 
 MAKE_JOBS_SAFE=		no
 
-XINE_MOD_DIR_VER=	2.3
+XINE_MOD_DIR_VER=	2.4
 PLIST_SUBST+=		XINE_MOD_DIR_VER=${XINE_MOD_DIR_VER:Q}
 
 DISTINFO_FILE=		${.CURDIR}/../../multimedia/xine-lib/distinfo
diff --git a/multimedia/xine-lib/PLIST.common b/multimedia/xine-lib/PLIST.common
index 1400543df44..4b5123f544d 100644
--- a/multimedia/xine-lib/PLIST.common
+++ b/multimedia/xine-lib/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.37 2014/02/24 05:31:54 richard Exp $
+@comment $NetBSD: PLIST.common,v 1.38 2014/04/17 13:53:47 wiz Exp $
 bin/xine-config
 bin/xine-list-1.2
 include/xine.h
@@ -80,6 +80,8 @@ lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_gsm610.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_gsm610.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_libjpeg.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_libjpeg.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_libvpx.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_libvpx.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_lpcm.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_lpcm.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_mad.a
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index d76245b9c08..c0004715ec9 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.90 2013/12/04 12:38:35 drochner Exp $
+$NetBSD: distinfo,v 1.91 2014/04/17 13:53:47 wiz Exp $
 
-SHA1 (xine-lib-1.2.4.tar.xz) = 32267c5fcaa1439a5fbf7606d27dc4fafba9e504
-RMD160 (xine-lib-1.2.4.tar.xz) = 9c4b151730a4ede46013fb127545fbb59d56f8b6
-Size (xine-lib-1.2.4.tar.xz) = 4954992 bytes
+SHA1 (xine-lib-1.2.5.tar.xz) = c7ef38fa8ee301e44ba28d6549220546d02d053d
+RMD160 (xine-lib-1.2.5.tar.xz) = bb9c3a06666f454e8dfda85471eb6605e2dcb685
+Size (xine-lib-1.2.5.tar.xz) = 5007012 bytes
 SHA1 (patch-Makefile.am) = ab2bdb97834ea3ebf161e2c716f0dcb6eb147c1e
 SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
 SHA1 (patch-ag) = 00009002714ed26fa646eed326e2b0a5e2265572
@@ -11,12 +11,13 @@ SHA1 (patch-ak) = 987700e6526b5112ac66bd6a8f9ee41f338c3508
 SHA1 (patch-ap) = d48fa83879895d4b1f56bfbcbe31087dd57d8a82
 SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834
 SHA1 (patch-at) = 15a810379ccb345aeeb374b0148096684f5f179b
-SHA1 (patch-cb) = db4ff27418e05e97bf30b554beecc24d6e578d15
+SHA1 (patch-cb) = e7390a12ebb015894fd4582051ba7b4e5db01f90
 SHA1 (patch-cd) = 192530e79568ea165b1fc675c7e794133a06c734
 SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c
+SHA1 (patch-include_xine_post.h) = 771981e551f05351554692bb2b601f21032081a4
 SHA1 (patch-input_dvb.c) = 712291f38e5eec79daecb524e990e67af0d2c427
 SHA1 (patch-na) = b1158183f6caa772c1f3e08cb9abedc28326523f
-SHA1 (patch-src-demuxers-demux_qt.c) = 2942911c09c0580c6017474af2a14f5b1f193c1d
+SHA1 (patch-src-demuxers-demux_qt.c) = d3b7a57381cd5b00569a61ec4d867b293972a17f
 SHA1 (patch-src-post-audio-stretch.c) = bc083541c410e8b8c2b5c23bc7b2b0ae312272a5
 SHA1 (patch-src-post-audio-upmix.c) = ab01e157b42b8dd99622a17b5a8ecdb464ee694e
 SHA1 (patch-src-post-audio-upmix_mono.c) = 182a73985d6158c5ab2409bc372b302d3385320e
@@ -34,7 +35,6 @@ SHA1 (patch-src-post-planar-expand.c) = 7c532feeae4078f40d6f9a28dfa207e5cbee60a1
 SHA1 (patch-src-post-planar-noise.c) = b3baf82e150ca9a27e73753398c18839066748f1
 SHA1 (patch-src-post-planar-pp.c) = 147dc05a09ff851af99c488112c6a77926ae5afb
 SHA1 (patch-src-post-planar-unsharp.c) = 964ec33c8c3cfcc8783b5fae1093c8fba76ff2a9
-SHA1 (patch-src-xine-engine-post.h) = 3b96d1279bbec48b2f3df50a576bfa8ec25f796f
 SHA1 (patch-src_audio__out_Makefile.am) = 5f8ba2ce81a63cb195407c3ce6649007ce15408f
 SHA1 (patch-src_libw32dll_wine_Makefile.am) = 17c717c84531780dc06c3cd5db8f879a560aeb3a
 SHA1 (patch-src_libw32dll_wine_registry.c) = f34685be27dc9ec098f80e78cd24f3e92f12367a
diff --git a/multimedia/xine-lib/patches/patch-cb b/multimedia/xine-lib/patches/patch-cb
index aff8000357c..9d30bbd3280 100644
--- a/multimedia/xine-lib/patches/patch-cb
+++ b/multimedia/xine-lib/patches/patch-cb
@@ -1,11 +1,11 @@
-$NetBSD: patch-cb,v 1.3 2009/12/09 10:13:03 drochner Exp $
+$NetBSD: patch-cb,v 1.4 2014/04/17 13:53:47 wiz Exp $
 
---- src/libw32dll/common.c.orig	2009-11-30 21:55:55.000000000 +0100
+--- src/libw32dll/common.c.orig	2014-03-11 13:28:30.000000000 +0000
 +++ src/libw32dll/common.c
-@@ -6,10 +6,7 @@ static char *get_win32_codecs_path(confi
+@@ -6,10 +6,7 @@ static const char *get_win32_codecs_path
    DIR                *dir;
-   char               *path, *cfgpath;
-   char               *listpath[] = { "",
+   const char         *path, *cfgpath;
+   const char * const listpath[] = { "",
 -                                     "/usr/lib/codecs",
 -                                     "/usr/local/lib/codecs",
 -                                     "/usr/lib/win32",
diff --git a/multimedia/xine-lib/patches/patch-include_xine_post.h b/multimedia/xine-lib/patches/patch-include_xine_post.h
new file mode 100644
index 00000000000..4beb78c2818
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-include_xine_post.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-include_xine_post.h,v 1.1 2014/04/17 13:53:47 wiz Exp $
+
+--- include/xine/post.h.orig	2014-02-26 15:49:10.000000000 +0000
++++ include/xine/post.h
+@@ -400,9 +400,9 @@ static xine_post_api_parameter_t temp_p[
+ #include <stddef.h>
+ #endif
+ 
+-#define PARAM_ITEM( param_type, var, enumv, min, max, readonly, descr ) \
+-{ param_type, #var, sizeof(temp_s.var), \
+-  offsetof(temp_t, var), enumv, min, max, readonly, descr },
++#define PARAM_ITEM( param_t, param_type, var, enumv, min, max, readonly, descr ) \
++{ param_type, #var, sizeof(temp_s.var), offsetof(param_t, var), \
++  enumv, min, max, readonly, descr },
+ 
+ #define END_PARAM_DESCR( name ) \
+   { POST_PARAM_TYPE_LAST, NULL, 0, 0, NULL, 0, 0, 1, NULL } \
diff --git a/multimedia/xine-lib/patches/patch-src-demuxers-demux_qt.c b/multimedia/xine-lib/patches/patch-src-demuxers-demux_qt.c
index b2d6cc9f894..f247f7adf5b 100644
--- a/multimedia/xine-lib/patches/patch-src-demuxers-demux_qt.c
+++ b/multimedia/xine-lib/patches/patch-src-demuxers-demux_qt.c
@@ -1,13 +1,13 @@
-$NetBSD: patch-src-demuxers-demux_qt.c,v 1.1 2011/09/04 14:34:52 joerg Exp $
+$NetBSD: patch-src-demuxers-demux_qt.c,v 1.2 2014/04/17 13:53:47 wiz Exp $
 
---- src/demuxers/demux_qt.c.orig	2011-08-30 10:17:53.000000000 +0000
+--- src/demuxers/demux_qt.c.orig	2014-02-26 15:49:10.000000000 +0000
 +++ src/demuxers/demux_qt.c
-@@ -126,7 +126,7 @@ typedef unsigned int qt_atom;
- #define QTIM_ATOM QT_ATOM('q', 't', 'i', 'm')
+@@ -151,7 +151,7 @@ typedef unsigned int qt_atom;
+ #define TRUN_ATOM QT_ATOM('t', 'r', 'u', 'n')
  
- /* placeholder for cutting and pasting */
+ /* placeholder for cutting and pasting
 -#define _ATOM QT_ATOM('', '', '', '')
 +//#define _ATOM QT_ATOM('', '', '', '')
+ */
  
  #define ATOM_PREAMBLE_SIZE 8
- #define PALETTE_COUNT 256
diff --git a/multimedia/xine-lib/patches/patch-src-xine-engine-post.h b/multimedia/xine-lib/patches/patch-src-xine-engine-post.h
deleted file mode 100644
index 77a42c3b38b..00000000000
--- a/multimedia/xine-lib/patches/patch-src-xine-engine-post.h
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-src-xine-engine-post.h,v 1.2 2012/03/21 16:37:15 drochner Exp $
-
---- include/xine/post.h.orig	2010-03-09 22:17:05.000000000 +0000
-+++ include/xine/post.h
-@@ -370,14 +370,15 @@ do {                                    
- 
- 
- /* macros to create parameter descriptors */
-+#include <stddef.h>
- 
- #define START_PARAM_DESCR( param_t ) \
- static param_t temp_s; \
- static xine_post_api_parameter_t temp_p[] = {
- 
--#define PARAM_ITEM( param_type, var, enumv, min, max, readonly, descr ) \
--{ param_type, #var, sizeof(temp_s.var), \
--  (char*)&temp_s.var-(char*)&temp_s, enumv, min, max, readonly, descr },
-+#define PARAM_ITEM( param_t, param_type, var, enumv, min, max, readonly, descr ) \
-+{ param_type, #var, sizeof(temp_s.var), offsetof(param_t, var), \
-+  enumv, min, max, readonly, descr },
- 
- #define END_PARAM_DESCR( name ) \
-   { POST_PARAM_TYPE_LAST, NULL, 0, 0, NULL, 0, 0, 1, NULL } \