update to 1.1.16.1

This fixes a number of security problems:
CVE-2008-5234 vector 1, CVE-2008-5236, CVE-2008-5237, CVE-2008-5239,
CVE-2008-5240 vectors 3 & 4, CVE-2008-5243
other changes:
-Support H.264 and AAC streams within FLV
-tagging improvements
-Add position-based seeking independent from seekpoints
-misc fixes

7 files changed, 18 insertions, 71 deletions

diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 2749b019063..a0207f89772 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.66 2008/11/08 21:13:28 bjs Exp $
+# $NetBSD: Makefile,v 1.67 2009/01/20 18:30:49 drochner Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
 
-PKGREVISION=	2
-
 COMMENT=		Multimedia player library
 
 BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index defcb635aa7..d40055fcec0 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.58 2008/12/18 23:25:42 jmcneill Exp $
+# $NetBSD: Makefile.common,v 1.59 2009/01/20 18:30:49 drochner Exp $
 #
 
 # used by audio/xine-arts/Makefile
 # used by audio/xine-esound/Makefile
 # used by audio/xine-pulse/Makefile
 
-DISTNAME=		xine-lib-1.1.15
-XINE_PKGNAME=		xine-lib-1.1.15
+DISTNAME=		xine-lib-1.1.16.1
+XINE_PKGNAME=		xine-lib-1.1.16.1
 PKGNAME?=		${XINE_PKGNAME}
 CATEGORIES?=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
@@ -15,8 +15,8 @@ EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://xinehq.de/
 
-XINE_LIB_VER=		1.1.15
-XINE_MOD_DIR_VER=	1.24
+XINE_LIB_VER=		1.1.16
+XINE_MOD_DIR_VER=	1.25
 PLIST_SUBST+=		XINE_LIB_VER=${XINE_LIB_VER:Q}
 PLIST_SUBST+=		XINE_MOD_DIR_VER=${XINE_MOD_DIR_VER:Q}
 
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index 4fc9b268dd6..c7e217ce675 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.60 2008/08/27 17:16:43 drochner Exp $
+$NetBSD: distinfo,v 1.61 2009/01/20 18:30:49 drochner Exp $
 
-SHA1 (xine-lib-1.1.15.tar.bz2) = bcb567ea2a11c5f26b2384d5400b8466ea9048c6
-RMD160 (xine-lib-1.1.15.tar.bz2) = 5c64dd51c05a6e17cb6dfcbb8a9009ba8571c75f
-Size (xine-lib-1.1.15.tar.bz2) = 7478750 bytes
+SHA1 (xine-lib-1.1.16.1.tar.bz2) = 82709254a0603e3971058aacf8578926b75d4a20
+RMD160 (xine-lib-1.1.16.1.tar.bz2) = 3c76b12fae8cba87e6d3bceafcbf2fb3ef94e164
+Size (xine-lib-1.1.16.1.tar.bz2) = 7382381 bytes
 SHA1 (patch-aa) = e09d34a121080b03bc67b2d8a3ca27463b771acc
 SHA1 (patch-ab) = ef13b60c2bea54f354acf1b2d70c04594dac36c9
 SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
 SHA1 (patch-ae) = 417d730034cc4dbf3103e07afb8432822084c64b
-SHA1 (patch-ag) = fa2298e1214a4dbea36526aed27a6e506a069681
+SHA1 (patch-ag) = 066cc1f94d4d0ae6a24c4b6104ba05950db11972
 SHA1 (patch-ah) = ba408237d4a717cc91b5d06ede425048914a9a1f
 SHA1 (patch-ai) = f0b33c1a36082445a86bcf71e07a6210aa21b7dc
 SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b
@@ -17,9 +17,7 @@ SHA1 (patch-ao) = 0fa0c3969e2c3fd83e36db028d84bb7b8668c133
 SHA1 (patch-ap) = e4801863b0d4625fe6db9e4c51218f55b90c6100
 SHA1 (patch-aq) = f6efa28ab1b9a24b79c18c181a5d309db53172e4
 SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834
-SHA1 (patch-av) = 4d9bb65a9626c080817904fcd360a7850dc99f60
 SHA1 (patch-aw) = 78ab44197a6b9f85e4b272d522ce254de4d557dc
-SHA1 (patch-ax) = 71f2619aa750a51a641922d482b29ea998e8ab48
 SHA1 (patch-be) = e1a0856361c26d924ce12794e9f7eb0174857100
 SHA1 (patch-bg) = 10eb076d087a40ac5f7920794ff7b34f2aa0495b
 SHA1 (patch-cb) = 08d9920022988d2764d941cfa8b1aa5602a0ec81
@@ -30,4 +28,3 @@ SHA1 (patch-dc) = 11c4212029e67f22796e57706b42400a0dbcac3a
 SHA1 (patch-eb) = b65e2c7c30fc04115d55da1ce1f6f65216ac1d23
 SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c
 SHA1 (patch-fb) = 9d9fd6fee4f4dbb8f509117e07ab9248ea1625e2
-SHA1 (patch-fc) = 5960e8326f667191fd7eb64758e08d20f2893458
diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag
index 8388ae4b104..edc9d3757c4 100644
--- a/multimedia/xine-lib/patches/patch-ag
+++ b/multimedia/xine-lib/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.18 2008/01/11 16:05:27 drochner Exp $
+$NetBSD: patch-ag,v 1.19 2009/01/20 18:30:49 drochner Exp $
 
---- configure.ac.orig	2008-01-04 19:02:22.000000000 +0100
+--- configure.ac.orig	2009-01-12 00:58:58.000000000 +0100
 +++ configure.ac
-@@ -98,7 +98,7 @@ dnl ------------------------------------
+@@ -109,7 +109,7 @@ dnl ------------------------------------
  AC_CANONICAL_HOST
  AC_CANONICAL_BUILD
  
@@ -56,7 +56,7 @@ $NetBSD: patch-ag,v 1.18 2008/01/11 16:05:27 drochner Exp $
     fi
  else
    ac_have_xinerama=no
-@@ -1422,8 +1424,21 @@ AC_ARG_ENABLE([oss],
+@@ -1427,8 +1429,21 @@ AC_ARG_ENABLE([oss],
  	AS_HELP_STRING([--disable-oss], [Do not build OSS audio output support]))
  
  if test "x$enable_oss" != "xno"; then
@@ -78,7 +78,7 @@ $NetBSD: patch-ag,v 1.18 2008/01/11 16:05:27 drochner Exp $
       #ifdef HAVE_SYS_SOUNDCARD_H
       # include <sys/soundcard.h>
       #endif
-@@ -1439,6 +1454,7 @@ if test "x$enable_oss" != "xno"; then
+@@ -1446,6 +1461,7 @@ if test "x$enable_oss" != "xno"; then
  fi
  
  AM_CONDITIONAL(HAVE_OSS, test "x$have_ossaudio" = "xyes")
@@ -86,7 +86,7 @@ $NetBSD: patch-ag,v 1.18 2008/01/11 16:05:27 drochner Exp $
  
  
  dnl ---------------------------------------------
-@@ -1548,9 +1564,10 @@ AC_ARG_ENABLE([gnomevfs],
+@@ -1555,9 +1571,10 @@ AC_ARG_ENABLE([gnomevfs],
    [with_gnome_vfs=$enableval], [with_gnome_vfs=yes])
  
  if test "x$with_gnome_vfs" = "xyes"; then
@@ -100,7 +100,7 @@ $NetBSD: patch-ag,v 1.18 2008/01/11 16:05:27 drochner Exp $
    AC_SUBST(GNOME_VFS_CFLAGS)
    AC_SUBST(GNOME_VFS_LIBS)
    if test "x$no_gnome_vfs" != "xyes"; then
-@@ -1885,7 +1902,7 @@ int has_timeout=sizeof(test.timeout);]])
+@@ -1892,7 +1909,7 @@ int has_timeout=sizeof(test.timeout);]])
       	    AC_DEFINE([HAVE_WIN32_CDROM], [1], 
                        [Define 1 if you have MinGW CD-ROM support])
  	 ;;
@@ -109,12 +109,3 @@ $NetBSD: patch-ag,v 1.18 2008/01/11 16:05:27 drochner Exp $
       	    AC_DEFINE([HAVE_FREEBSD_CDROM], [1], 
                        [Define 1 if you have FreeBSD CD-ROM support])
  	 ;;
-@@ -2591,7 +2608,7 @@ case $host in
-      dnl FreeBSD (et al.) does not complete linking for shared objects when pthreads
-      dnl are requested, as different implementations are present; to avoid problems
-      dnl use -Wl,-z,defs only for those platform not behaving this way.
--     *-freebsd*) ;;
-+     *-freebsd* | *-netbsd*) ;;
-      *)
- 	AC_TRY_LDFLAGS([-Wl,-z,defs], [NOUNDEF="-Wl,-z,defs"])
- 	;;
diff --git a/multimedia/xine-lib/patches/patch-av b/multimedia/xine-lib/patches/patch-av
deleted file mode 100644
index 874f01da1bf..00000000000
--- a/multimedia/xine-lib/patches/patch-av
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-av,v 1.8 2008/06/21 15:45:16 drochner Exp $
-
---- src/libspudvb/Makefile.in.orig	2008-06-15 01:15:55.000000000 +0200
-+++ src/libspudvb/Makefile.in
-@@ -242,7 +242,7 @@ MSGFMT = @MSGFMT@
- MSGMERGE = @MSGMERGE@
- NET_LIBS = @NET_LIBS@
- NMEDIT = @NMEDIT@
--NOUNDEF = @NOUNDEF@
-+#NOUNDEF = @NOUNDEF@
- OBJC = @OBJC@
- OBJCDEPMODE = @OBJCDEPMODE@
- OBJCFLAGS = @OBJCFLAGS@
diff --git a/multimedia/xine-lib/patches/patch-ax b/multimedia/xine-lib/patches/patch-ax
deleted file mode 100644
index 84cbd865a59..00000000000
--- a/multimedia/xine-lib/patches/patch-ax
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ax,v 1.7 2008/04/15 19:25:28 drochner Exp $
-
---- src/libxineadec/Makefile.in.orig	2008-04-15 19:30:36.000000000 +0200
-+++ src/libxineadec/Makefile.in
-@@ -482,7 +482,7 @@ xineplug_decode_lpcm_la_SOURCES = xine_l
- xineplug_decode_lpcm_la_CFLAGS = $(VISIBILITY_FLAG)
- xineplug_decode_lpcm_la_LIBADD = $(XINE_LIB)
- xineplug_decode_vorbis_la_SOURCES = xine_vorbis_decoder.c
--xineplug_decode_vorbis_la_LIBADD = $(XINE_LIB) $(VORBIS_LIBS) $(OGG_LIBS)
-+xineplug_decode_vorbis_la_LIBADD = $(XINE_LIB) $(VORBIS_LIBS) $(OGG_LIBS) $(LTLIBINTL)
- xineplug_decode_vorbis_la_CFLAGS = $(VISIBILITY_FLAG) $(VORBIS_CFLAGS)
- xineplug_decode_speex_la_SOURCES = xine_speex_decoder.c
- xineplug_decode_speex_la_LIBADD = $(XINE_LIB) $(SPEEX_LIBS)
diff --git a/multimedia/xine-lib/patches/patch-fc b/multimedia/xine-lib/patches/patch-fc
deleted file mode 100644
index 2890893e565..00000000000
--- a/multimedia/xine-lib/patches/patch-fc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-fc,v 1.1 2008/08/27 17:16:44 drochner Exp $
-
---- src/xine-engine/buffer.h.orig	2008-07-16 23:01:56.000000000 +0200
-+++ src/xine-engine/buffer.h
-@@ -676,7 +676,7 @@ void _x_bmiheader_le2me( xine_bmiheader 
- /* convert xine_waveformatex struct from little endian */
- void _x_waveformatex_le2me( xine_waveformatex *wavex ) XINE_PROTECTED;
- 
--static inline _x_is_fourcc(void *ptr, void *tag) {
-+static __inline int _x_is_fourcc(void *ptr, void *tag) {
-   return memcmp(ptr, tag, 4) == 0;
- }
-