update to 1.2.4

changes:
-faster JPEG decoding
-support for EAC3 audio
-test input plugin added
-misc fixes and improvements

7 files changed, 15 insertions, 106 deletions

diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index fd832286185..e5a6c50f3af 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.118 2013/10/09 17:39:14 wiz Exp $
-
-PKGREVISION=	13
+# $NetBSD: Makefile,v 1.119 2013/12/04 12:38:35 drochner Exp $
 
 .include "Makefile.common"
 
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index 25615ff767a..cad522a0db5 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.79 2012/09/29 20:10:35 dholland Exp $
+# $NetBSD: Makefile.common,v 1.80 2013/12/04 12:38:35 drochner 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.2
-XINE_PKGNAME=		xine-lib-1.2.2
+DISTNAME=		xine-lib-1.2.4
+XINE_PKGNAME=		xine-lib-1.2.4
 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.2
+XINE_MOD_DIR_VER=	2.3
 PLIST_SUBST+=		XINE_MOD_DIR_VER=${XINE_MOD_DIR_VER:Q}
 
 DISTINFO_FILE=		${.CURDIR}/../../multimedia/xine-lib/distinfo
@@ -29,7 +29,7 @@ USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	libtool libtool-nofpic
 PKGCONFIG_OVERRIDE=	misc/libxine.pc.in
-USE_TOOLS+=		autoconf automake gmake msgfmt pkg-config xmkmf perl
+USE_TOOLS+=		autoconf automake gmake msgfmt pkg-config xmkmf perl gsed
 
 CONFIGURE_ARGS+=	--with-w32-path='${PREFIX}/lib/win32'
 #CONFIGURE_ARGS+=	--without-external-ffmpeg --disable-ffmpegtest
diff --git a/multimedia/xine-lib/PLIST.common b/multimedia/xine-lib/PLIST.common
index d7810307bdb..15c869145db 100644
--- a/multimedia/xine-lib/PLIST.common
+++ b/multimedia/xine-lib/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.35 2012/03/24 13:21:43 drochner Exp $
+@comment $NetBSD: PLIST.common,v 1.36 2013/12/04 12:38:35 drochner Exp $
 bin/xine-config
 bin/xine-list-1.2
 include/xine.h
@@ -78,6 +78,8 @@ lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_ff.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_ff.so
 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_lpcm.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_lpcm.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_mad.a
@@ -168,6 +170,8 @@ lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_rtsp.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_rtsp.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_stdin_fifo.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_stdin_fifo.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_test.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_test.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_vcd.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_vcd.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_nsf.a
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index 0a89c7cb75c..d76245b9c08 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.89 2012/10/23 19:57:33 apb Exp $
+$NetBSD: distinfo,v 1.90 2013/12/04 12:38:35 drochner Exp $
 
-SHA1 (xine-lib-1.2.2.tar.xz) = a349cbb0b72256bb262377796a022dcf63829b4c
-RMD160 (xine-lib-1.2.2.tar.xz) = 3f11df3fa8a8946bdcc9cdecd6952dc76b834d14
-Size (xine-lib-1.2.2.tar.xz) = 4857248 bytes
+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 (patch-Makefile.am) = ab2bdb97834ea3ebf161e2c716f0dcb6eb147c1e
 SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
 SHA1 (patch-ag) = 00009002714ed26fa646eed326e2b0a5e2265572
@@ -11,7 +11,6 @@ SHA1 (patch-ak) = 987700e6526b5112ac66bd6a8f9ee41f338c3508
 SHA1 (patch-ap) = d48fa83879895d4b1f56bfbcbe31087dd57d8a82
 SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834
 SHA1 (patch-at) = 15a810379ccb345aeeb374b0148096684f5f179b
-SHA1 (patch-av) = 12b8957279b977db3bba2c1adae40217a1661072
 SHA1 (patch-cb) = db4ff27418e05e97bf30b554beecc24d6e578d15
 SHA1 (patch-cd) = 192530e79568ea165b1fc675c7e794133a06c734
 SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c
@@ -23,8 +22,6 @@ SHA1 (patch-src-post-audio-upmix.c) = ab01e157b42b8dd99622a17b5a8ecdb464ee694e
 SHA1 (patch-src-post-audio-upmix_mono.c) = 182a73985d6158c5ab2409bc372b302d3385320e
 SHA1 (patch-src-post-audio-volnorm.c) = 49d9bd437d240ddf2a14275d518469313cb29a0c
 SHA1 (patch-src-post-deinterlace-plugins-greedy2frame.c) = 85acf40662602c41e1f475b010534aefbb466a4b
-SHA1 (patch-src-post-deinterlace-plugins-greedy2frame_template.c) = 8cb62659326648cb54fa0219cd12fd02c53d047d
-SHA1 (patch-src-post-deinterlace-plugins-greedy2frame_template_sse2.c) = af9a57b0c5e496836c145d6888ea3149bf501c2f
 SHA1 (patch-src-post-deinterlace-xine_plugin.c) = 132554aa9bdc43fbe9e7dc42fee5916cb60be806
 SHA1 (patch-src-post-goom-mmx.h) = 09b82b9e1fae57afb385daa1cd3bb265fd680a1d
 SHA1 (patch-src-post-mosaico-mosaico.c) = f26e6ccc60c78a499d2bd0fd8f3d4c2f4efffde8
diff --git a/multimedia/xine-lib/patches/patch-av b/multimedia/xine-lib/patches/patch-av
deleted file mode 100644
index f2d51edebc2..00000000000
--- a/multimedia/xine-lib/patches/patch-av
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-av,v 1.11 2012/07/04 11:05:30 drochner Exp $
-
---- src/post/deinterlace/plugins/greedy2frame_template_sse2.c.orig	2012-06-26 15:57:44.000000000 +0000
-+++ src/post/deinterlace/plugins/greedy2frame_template_sse2.c
-@@ -170,10 +170,10 @@ static void DeinterlaceGreedy2Frame_SSE2
-         * See above for a description of the algorithm.
-         * weave if (weave(M) AND (weave(T) OR weave(B)))
-         */
--            "movdqa  (%3), %%xmm1		\n\t" /* xmm1 = T1 */
--            "movdqa  (%4), %%xmm0		\n\t" /* xmm0 = T0 */
--            "movdqa  (%q5,%3), %%xmm3		\n\t" /* xmm3 = B1 */
--            "movdqa  (%q5,%4), %%xmm2		\n\t" /* xmm2 = B0 */
-+            "movdqa  (%2), %%xmm1		\n\t" /* xmm1 = T1 */
-+            "movdqa  (%3), %%xmm0		\n\t" /* xmm0 = T0 */
-+            "movdqa  (%q4,%2), %%xmm3		\n\t" /* xmm3 = B1 */
-+            "movdqa  (%q4,%3), %%xmm2		\n\t" /* xmm2 = B0 */
- 
-             /* calculate |T1-T0| keep T1 put result in xmm5 */
-             "movdqa  %%xmm1, %%xmm5		\n\t"
-@@ -181,20 +181,19 @@ static void DeinterlaceGreedy2Frame_SSE2
-             "psubusb %%xmm1, %%xmm0		\n\t"
-             "por     %%xmm0, %%xmm5		\n\t"
- 
--            "movdqa  (%0), %%xmm0		\n\t" /* xmm0 = M1 */
-             /* T1 is data for line to copy */
--            "movntdq  %%xmm1, %2		\n\t"
-+            "movntdq  %%xmm1, %1		\n\t"
- 
-             /* if |T1-T0| > Threshold we want 0 else dword minus one */
-             "psrlw   $1, %%xmm5			\n\t"
-             "pand    %%xmm6, %%xmm5		\n\t"
--            "pcmpgtb %1, %%xmm5			\n\t"
-+            "pcmpgtb %0, %%xmm5			\n\t"
-             "pcmpeqd %%xmm7, %%xmm5		\n\t"
- 
--            "prefetcht0  64(%q5,%3)		\n\t"
--            "prefetcht0  64(%q5,%4)		\n\t"
-+            "prefetcht0  64(%q4,%2)		\n\t"
-+            "prefetcht0  64(%q4,%3)		\n\t"
-           :
--          : "r" (M1), "m" (GreedyTwoFrameThreshold128),
-+          : "m" (GreedyTwoFrameThreshold128),
-             "m" (*Destc), "r" (T1), "r" (T0), "r" (Pitch) );
- 
-           asm volatile (
-@@ -204,6 +203,7 @@ static void DeinterlaceGreedy2Frame_SSE2
-             "psubusb %%xmm3, %%xmm2		\n\t"
-             "por     %%xmm2, %%xmm4		\n\t"
- 
-+	    "movdqa  (%0), %%xmm0		\n\t" /* xmm0 = M1 */
-             "movdqa  (%1), %%xmm2		\n\t" /* xmm2 = M0 */
- 
-             /* if |B1-B0| > Threshold we want 0 else dword minus one */
diff --git a/multimedia/xine-lib/patches/patch-src-post-deinterlace-plugins-greedy2frame_template.c b/multimedia/xine-lib/patches/patch-src-post-deinterlace-plugins-greedy2frame_template.c
deleted file mode 100644
index 0ad080b6e68..00000000000
--- a/multimedia/xine-lib/patches/patch-src-post-deinterlace-plugins-greedy2frame_template.c
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-src-post-deinterlace-plugins-greedy2frame_template.c,v 1.1 2012/08/15 18:34:36 jdc Exp $
-
---- src/post/deinterlace/plugins/greedy2frame_template.c.orig	2012-05-26 21:49:59.000000000 +0100
-+++ src/post/deinterlace/plugins/greedy2frame_template.c	2012-08-15 09:46:37.000000000 +0100
-@@ -85,6 +85,7 @@
- */
- 
- 
-+#if defined(ARCH_X86) || defined(ARCH_X86_64)
- #if !defined(MASKS_DEFINED)
- #define MASKS_DEFINED
- static const mmx_t Mask = { uq: 0x7f7f7f7f7f7f7f7fll };
-@@ -92,6 +93,7 @@
- static const mmx_t GreedyTwoFrameThreshold = { ub: {TP, TP, TP, TP} };
- #undef TP
- #endif
-+#endif /*ARCH_X86 */
- 
- #if defined(IS_MMXEXT)
- static void DeinterlaceGreedy2Frame_MMXEXT(uint8_t *output, int outstride,
diff --git a/multimedia/xine-lib/patches/patch-src-post-deinterlace-plugins-greedy2frame_template_sse2.c b/multimedia/xine-lib/patches/patch-src-post-deinterlace-plugins-greedy2frame_template_sse2.c
deleted file mode 100644
index ba053893891..00000000000
--- a/multimedia/xine-lib/patches/patch-src-post-deinterlace-plugins-greedy2frame_template_sse2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src-post-deinterlace-plugins-greedy2frame_template_sse2.c,v 1.1 2012/08/15 18:34:36 jdc Exp $
-
---- src/post/deinterlace/plugins/greedy2frame_template_sse2.c.orig	2012-08-14 12:47:20.000000000 +0100
-+++ src/post/deinterlace/plugins/greedy2frame_template_sse2.c	2012-08-15 09:47:02.000000000 +0100
-@@ -85,10 +85,12 @@
- */
- 
- 
-+#if defined(ARCH_X86) || defined(ARCH_X86_64)
- static const sse_t Mask128 = { uq: { 0x7f7f7f7f7f7f7f7fll, 0x7f7f7f7f7f7f7f7fll} };
- #define TP GREEDYTWOFRAMETHRESHOLD, GREEDYTWOFRAMETHRESHOLD2
- static const sse_t GreedyTwoFrameThreshold128 = { ub: {TP, TP, TP, TP, TP, TP, TP, TP} };
- #undef TP
-+#endif /*ARCH_X86 */
- 
- static void DeinterlaceGreedy2Frame_SSE2(uint8_t *output, int outstride,
-                                          deinterlace_frame_data_t *data,