update to 1.1.20

changes:
-Enable FFmpeg's support for AAC LATM audio
-minor fixes and improvements, most notably for MPEG TS
-translation updates

7 files changed, 24 insertions, 39 deletions

diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 97f0ac41a81..83962771b51 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.90 2011/11/01 13:57:28 hans Exp $
+# $NetBSD: Makefile,v 1.91 2011/11/16 19:45:37 drochner Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
-PKGREVISION=		9
 
 COMMENT=		Multimedia player library
 
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index 4756ee06716..a249d86dc5c 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.68 2011/10/12 17:30:22 hans Exp $
+# $NetBSD: Makefile.common,v 1.69 2011/11/16 19:45:37 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.19
-XINE_PKGNAME=		xine-lib-1.1.19
+DISTNAME=		xine-lib-1.1.20
+XINE_PKGNAME=		xine-lib-1.1.20
 PKGNAME?=		${XINE_PKGNAME}
 CATEGORIES?=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
@@ -15,7 +15,7 @@ EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://xinehq.de/
 
-XINE_MOD_DIR_VER=	1.29
+XINE_MOD_DIR_VER=	1.30
 PLIST_SUBST+=		XINE_MOD_DIR_VER=${XINE_MOD_DIR_VER:Q}
 
 DISTINFO_FILE=		${.CURDIR}/../../multimedia/xine-lib/distinfo
@@ -29,7 +29,7 @@ PKGCONFIG_OVERRIDE=	misc/libxine.pc.in
 USE_TOOLS+=		autoconf gmake msgfmt pkg-config xmkmf perl
 
 CONFIGURE_ARGS+=	--with-w32-path='${PREFIX}/lib/win32'
-CONFIGURE_ARGS+=	--without-external-ffmpeg --disable-ffmpegtest
+#CONFIGURE_ARGS+=	--without-external-ffmpeg --disable-ffmpegtest
 CONFIGURE_ENV+=		have_libpng="yes"
 CONFIGURE_ENV+=		PNG_CFLAGS="-I${PREFIX}/include"
 CONFIGURE_ENV+=		PNG_LIBS="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lpng"
@@ -69,5 +69,6 @@ pre-configure:
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../multimedia/ffmpeg/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/multimedia/xine-lib/PLIST.common b/multimedia/xine-lib/PLIST.common
index 9108aff4b25..1d3634796cd 100644
--- a/multimedia/xine-lib/PLIST.common
+++ b/multimedia/xine-lib/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.31 2010/12/23 10:46:05 obache Exp $
+@comment $NetBSD: PLIST.common,v 1.32 2011/11/16 19:45:37 drochner Exp $
 bin/xine-config
 bin/xine-list-1.1
 include/xine.h
@@ -243,6 +243,7 @@ share/locale/es/LC_MESSAGES/libxine1.mo
 share/locale/eu/LC_MESSAGES/libxine1.mo
 share/locale/fr/LC_MESSAGES/libxine1.mo
 share/locale/it/LC_MESSAGES/libxine1.mo
+share/locale/ja/LC_MESSAGES/libxine1.mo
 share/locale/pl/LC_MESSAGES/libxine1.mo
 share/locale/pt_BR/LC_MESSAGES/libxine1.mo
 share/locale/sk/LC_MESSAGES/libxine1.mo
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index 8d756c54f21..bbf35d11560 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.74 2011/10/12 17:30:22 hans Exp $
+$NetBSD: distinfo,v 1.75 2011/11/16 19:45:37 drochner Exp $
 
-SHA1 (xine-lib-1.1.19.tar.bz2) = 5afcc28c5cf2bdaab99d951960f6587797e1e5a0
-RMD160 (xine-lib-1.1.19.tar.bz2) = 84999c43d3cc115c3bda4b2e06089dc827c646cc
-Size (xine-lib-1.1.19.tar.bz2) = 7531642 bytes
+SHA1 (xine-lib-1.1.20.tar.bz2) = 60ce1cea9bf7a6b7d8c60141593a8ed0c54f9445
+RMD160 (xine-lib-1.1.20.tar.bz2) = c531b74142ad92b7fe2956c69fd1398e7c8cb1fb
+Size (xine-lib-1.1.20.tar.bz2) = 7585795 bytes
 SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
 SHA1 (patch-ag) = 96a2bab961ca90d7e3c1d67b6aa09388f9478d35
 SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b
 SHA1 (patch-ak) = 987700e6526b5112ac66bd6a8f9ee41f338c3508
 SHA1 (patch-ao) = 2682548a181803bc2d79f79d76828b6b3ba0e4fa
-SHA1 (patch-ap) = f22810c78ac0d1bb7e958ed92fd2ad8a7f889d92
+SHA1 (patch-ap) = d82c27dd5bd21dbaeb7b981eb36b36f580a2d30c
 SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834
-SHA1 (patch-be) = 966d057b118728ff509fd4e7f8005ab5b00b5633
+SHA1 (patch-be) = 6d03de71811bd03295621d04d3166625f4f4f079
 SHA1 (patch-bg) = f072486eb8441b8bed2c825380aa04d99bc70cc1
 SHA1 (patch-cb) = db4ff27418e05e97bf30b554beecc24d6e578d15
 SHA1 (patch-cd) = a080c745d08ded46db7c1173fe55350c1eb9ff33
@@ -19,7 +19,6 @@ SHA1 (patch-db) = 3ad4ca6f43a379b251211477972cd6d34b1f821a
 SHA1 (patch-dc) = 11c4212029e67f22796e57706b42400a0dbcac3a
 SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c
 SHA1 (patch-ga) = c4770b6be12bbc4dd72f8299f3b0bbf92546cc68
-SHA1 (patch-gb) = 569539c868711a004740f40d1c48d30eb9e0399f
 SHA1 (patch-input_dvb.c) = 37aa191dca0df058dc09477624ff76dbc3a2f9b9
 SHA1 (patch-src-demuxers-demux_qt.c) = 2942911c09c0580c6017474af2a14f5b1f193c1d
 SHA1 (patch-src-post-audio-stretch.c) = bc083541c410e8b8c2b5c23bc7b2b0ae312272a5
diff --git a/multimedia/xine-lib/patches/patch-ap b/multimedia/xine-lib/patches/patch-ap
index 52e13f6d572..423e1c2f1f3 100644
--- a/multimedia/xine-lib/patches/patch-ap
+++ b/multimedia/xine-lib/patches/patch-ap
@@ -1,6 +1,6 @@
-$NetBSD: patch-ap,v 1.9 2010/04/13 15:09:40 drochner Exp $
+$NetBSD: patch-ap,v 1.10 2011/11/16 19:45:37 drochner Exp $
 
---- src/dxr3/Makefile.am.orig	2010-02-24 01:18:20.000000000 +0000
+--- src/dxr3/Makefile.am.orig	2011-10-04 21:42:53.000000000 +0000
 +++ src/dxr3/Makefile.am
 @@ -17,6 +17,9 @@ endif
  if HAVE_LIBRTE
@@ -19,5 +19,5 @@ $NetBSD: patch-ap,v 1.9 2010/04/13 15:09:40 drochner Exp $
 -xineplug_vo_out_dxr3_la_LIBADD = $(XINE_LIB) $(link_fame) $(link_rte) $(link_x_libs) $(LTLIBINTL) $(DYNAMIC_LD_LIBS) -lm
 +xineplug_vo_out_dxr3_la_LIBADD = $(XINE_LIB) $(link_fame) $(link_rte) $(link_xinerama) $(link_x_libs) $(LTLIBINTL) $(DYNAMIC_LD_LIBS) -lm
  xineplug_vo_out_dxr3_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS)
- xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module
+ xineplug_vo_out_dxr3_la_LDFLAGS = $(xineplug_ldflags)
  
diff --git a/multimedia/xine-lib/patches/patch-be b/multimedia/xine-lib/patches/patch-be
index e56807b0bc8..4de10248e0b 100644
--- a/multimedia/xine-lib/patches/patch-be
+++ b/multimedia/xine-lib/patches/patch-be
@@ -1,8 +1,8 @@
-$NetBSD: patch-be,v 1.9 2009/02/19 12:58:03 drochner Exp $
+$NetBSD: patch-be,v 1.10 2011/11/16 19:45:37 drochner Exp $
 
---- src/audio_out/Makefile.in.orig	2009-02-10 19:34:49.000000000 +0100
+--- src/audio_out/Makefile.in.orig	2011-11-13 01:37:24.000000000 +0000
 +++ src/audio_out/Makefile.in
-@@ -419,6 +419,7 @@ OBJDUMP = @OBJDUMP@
+@@ -458,6 +458,7 @@ OBJDUMP = @OBJDUMP@
  OBJEXT = @OBJEXT@
  OPENGL_CFLAGS = @OPENGL_CFLAGS@
  OPENGL_LIBS = @OPENGL_LIBS@
@@ -10,12 +10,12 @@ $NetBSD: patch-be,v 1.9 2009/02/19 12:58:03 drochner Exp $
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
-@@ -615,7 +616,7 @@ xineplug_ao_out_file_la_LIBADD = $(XINE_
+@@ -662,7 +663,7 @@ xineplug_ao_out_file_la_SOURCES = audio_
+ xineplug_ao_out_file_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
  xineplug_ao_out_file_la_CFLAGS = $(VISIBILITY_FLAG)
- xineplug_ao_out_file_la_LDFLAGS = -avoid-version -module
  xineplug_ao_out_oss_la_SOURCES = audio_oss_out.c
 -xineplug_ao_out_oss_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
 +xineplug_ao_out_oss_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(OSS_LIBS)
  xineplug_ao_out_oss_la_CFLAGS = $(VISIBILITY_FLAG)
- xineplug_ao_out_oss_la_LDFLAGS = -avoid-version -module
  xineplug_ao_out_alsa_la_SOURCES = audio_alsa_out.c
+ xineplug_ao_out_alsa_la_LIBADD = $(XINE_LIB) $(ALSA_LIBS) $(PTHREAD_LIBS) $(LTLIBINTL)
diff --git a/multimedia/xine-lib/patches/patch-gb b/multimedia/xine-lib/patches/patch-gb
deleted file mode 100644
index 586259e4ff9..00000000000
--- a/multimedia/xine-lib/patches/patch-gb
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-gb,v 1.10 2011/08/15 07:35:18 wiz Exp $
-
-With videoproto-2.3.1 and newer XvMClib.h is nolonger included by
-vldXvMC.h.
-
---- src/video_out/xxmc.h.orig	2010-03-09 22:17:05.000000000 +0000
-+++ src/video_out/xxmc.h
-@@ -79,6 +79,7 @@
- #include <X11/extensions/Xvlib.h>
- #ifdef HAVE_VLDXVMC
-   #include <X11/extensions/vldXvMC.h>
-+  #include <X11/extensions/XvMClib.h>
- #else
-   #include <X11/extensions/XvMClib.h>
-   #include <X11/extensions/XvMC.h>