Mon Jul 2 16:27:11 2012 UTC ()
update to 1.2.2
changes:
-YUV conversion optimisation
-support for FLAC in Matroska
-support for BMP
-bugfixes


(drochner)
diff -r1.100 -r1.101 pkgsrc/multimedia/xine-lib/Makefile
diff -r1.77 -r1.78 pkgsrc/multimedia/xine-lib/Makefile.common
diff -r1.82 -r1.83 pkgsrc/multimedia/xine-lib/distinfo
diff -r1.8 -r0 pkgsrc/multimedia/xine-lib/patches/patch-au
diff -r0 -r1.10 pkgsrc/multimedia/xine-lib/patches/patch-av
cvs diff -r1.100 -r1.101 pkgsrc/multimedia/xine-lib/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/xine-lib/Makefile 2012/06/14 07:44:38 1.100
+++ pkgsrc/multimedia/xine-lib/Makefile 2012/07/02 16:27:10 1.101
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.100 2012/06/14 07:44:38 sbd Exp $ 1# $NetBSD: Makefile,v 1.101 2012/07/02 16:27:10 drochner Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "Makefile.common" 5.include "Makefile.common"
6 6
7PKGREVISION= 1 
8COMMENT= Multimedia player library 7COMMENT= Multimedia player library
9 8
10CONFLICTS+= xine-xcb-[0-9]* 9CONFLICTS+= xine-xcb-[0-9]*
11 10
12CONFIGURE_ARGS+= --disable-v4l 11CONFIGURE_ARGS+= --disable-v4l
13CONFIGURE_ARGS+= --disable-v4l2 12CONFIGURE_ARGS+= --disable-v4l2
14CONFIGURE_ARGS+= --disable-real-codecs 13CONFIGURE_ARGS+= --disable-real-codecs
15CONFIGURE_ARGS+= --disable-aalib 14CONFIGURE_ARGS+= --disable-aalib
16CONFIGURE_ARGS+= --disable-mlib 15CONFIGURE_ARGS+= --disable-mlib
17 16
18BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1 17BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
19 18
20SUBST_CLASSES+= oss 19SUBST_CLASSES+= oss
cvs diff -r1.77 -r1.78 pkgsrc/multimedia/xine-lib/Makefile.common (expand / switch to unified diff)

--- pkgsrc/multimedia/xine-lib/Makefile.common 2012/04/16 03:41:58 1.77
+++ pkgsrc/multimedia/xine-lib/Makefile.common 2012/07/02 16:27:11 1.78
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: Makefile.common,v 1.77 2012/04/16 03:41:58 dholland Exp $ 1# $NetBSD: Makefile.common,v 1.78 2012/07/02 16:27:11 drochner Exp $
2# 2#
3# used by audio/xine-alsa/Makefile 3# used by audio/xine-alsa/Makefile
4# used by audio/xine-esound/Makefile 4# used by audio/xine-esound/Makefile
5# used by audio/xine-pulse/Makefile 5# used by audio/xine-pulse/Makefile
6# used by multimedia/xine-v4l/Makefile 6# used by multimedia/xine-v4l/Makefile
7# used by multimedia/xine-v4l2/Makefile 7# used by multimedia/xine-v4l2/Makefile
8 8
9DISTNAME= xine-lib-1.2.1 9DISTNAME= xine-lib-1.2.2
10XINE_PKGNAME= xine-lib-1.2.1 10XINE_PKGNAME= xine-lib-1.2.2
11PKGNAME?= ${XINE_PKGNAME} 11PKGNAME?= ${XINE_PKGNAME}
12CATEGORIES?= multimedia 12CATEGORIES?= multimedia
13MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/} 13MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
14EXTRACT_SUFX= .tar.bz2 14EXTRACT_SUFX= .tar.xz
15 15
16MAINTAINER= pkgsrc-users@NetBSD.org 16MAINTAINER= pkgsrc-users@NetBSD.org
17HOMEPAGE= http://xinehq.de/ 17HOMEPAGE= http://xinehq.de/
18 18
19XINE_MOD_DIR_VER= 2.1 19XINE_MOD_DIR_VER= 2.2
20PLIST_SUBST+= XINE_MOD_DIR_VER=${XINE_MOD_DIR_VER:Q} 20PLIST_SUBST+= XINE_MOD_DIR_VER=${XINE_MOD_DIR_VER:Q}
21 21
22DISTINFO_FILE= ${.CURDIR}/../../multimedia/xine-lib/distinfo 22DISTINFO_FILE= ${.CURDIR}/../../multimedia/xine-lib/distinfo
23PATCHDIR= ${.CURDIR}/../../multimedia/xine-lib/patches 23PATCHDIR= ${.CURDIR}/../../multimedia/xine-lib/patches
24 24
25GNU_CONFIGURE= YES 25GNU_CONFIGURE= YES
26USE_PKGLOCALEDIR= YES 26USE_PKGLOCALEDIR= YES
27USE_LIBTOOL= YES 27USE_LIBTOOL= YES
28LIBTOOL_OVERRIDE= libtool libtool-nofpic 28LIBTOOL_OVERRIDE= libtool libtool-nofpic
29PKGCONFIG_OVERRIDE= misc/libxine.pc.in 29PKGCONFIG_OVERRIDE= misc/libxine.pc.in
30USE_TOOLS+= autoconf automake gmake msgfmt pkg-config xmkmf perl 30USE_TOOLS+= autoconf automake gmake msgfmt pkg-config xmkmf perl
31 31
32CONFIGURE_ARGS+= --with-w32-path='${PREFIX}/lib/win32' 32CONFIGURE_ARGS+= --with-w32-path='${PREFIX}/lib/win32'
cvs diff -r1.82 -r1.83 pkgsrc/multimedia/xine-lib/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/xine-lib/distinfo 2012/05/18 18:53:31 1.82
+++ pkgsrc/multimedia/xine-lib/distinfo 2012/07/02 16:27:11 1.83
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1$NetBSD: distinfo,v 1.82 2012/05/18 18:53:31 marino Exp $ 1$NetBSD: distinfo,v 1.83 2012/07/02 16:27:11 drochner Exp $
2 2
3SHA1 (xine-lib-1.2.1.tar.bz2) = c86591ff9fb6b073b8d115fa31b5a74a305e8628 3SHA1 (xine-lib-1.2.2.tar.xz) = a349cbb0b72256bb262377796a022dcf63829b4c
4RMD160 (xine-lib-1.2.1.tar.bz2) = eb6dab8418eebf0ee5f210efd085ae09367f624e 4RMD160 (xine-lib-1.2.2.tar.xz) = 3f11df3fa8a8946bdcc9cdecd6952dc76b834d14
5Size (xine-lib-1.2.1.tar.bz2) = 6197175 bytes 5Size (xine-lib-1.2.2.tar.xz) = 4857248 bytes
6SHA1 (patch-Makefile.am) = 3cfff7a6941015921c166f9a67159a5bb3ca0204 6SHA1 (patch-Makefile.am) = 3cfff7a6941015921c166f9a67159a5bb3ca0204
7SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846 7SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
8SHA1 (patch-ag) = 0bdd5910ad7c446bdec5abac3292bcab7a4147ee 8SHA1 (patch-ag) = 0bdd5910ad7c446bdec5abac3292bcab7a4147ee
9SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b 9SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b
10SHA1 (patch-ak) = 987700e6526b5112ac66bd6a8f9ee41f338c3508 10SHA1 (patch-ak) = 987700e6526b5112ac66bd6a8f9ee41f338c3508
11SHA1 (patch-ap) = d48fa83879895d4b1f56bfbcbe31087dd57d8a82 11SHA1 (patch-ap) = d48fa83879895d4b1f56bfbcbe31087dd57d8a82
12SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834 12SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834
13SHA1 (patch-at) = 15a810379ccb345aeeb374b0148096684f5f179b 13SHA1 (patch-at) = 15a810379ccb345aeeb374b0148096684f5f179b
14SHA1 (patch-au) = 7f78d400ac606e2f73eb4caf347013f2b55f9430 14SHA1 (patch-av) = 1b391773fb45340605987a32be4aaa8b053b082d
15SHA1 (patch-cb) = db4ff27418e05e97bf30b554beecc24d6e578d15 15SHA1 (patch-cb) = db4ff27418e05e97bf30b554beecc24d6e578d15
16SHA1 (patch-cd) = 192530e79568ea165b1fc675c7e794133a06c734 16SHA1 (patch-cd) = 192530e79568ea165b1fc675c7e794133a06c734
17SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c 17SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c
18SHA1 (patch-input_dvb.c) = 712291f38e5eec79daecb524e990e67af0d2c427 18SHA1 (patch-input_dvb.c) = 712291f38e5eec79daecb524e990e67af0d2c427
19SHA1 (patch-na) = b1158183f6caa772c1f3e08cb9abedc28326523f 19SHA1 (patch-na) = b1158183f6caa772c1f3e08cb9abedc28326523f
20SHA1 (patch-src-demuxers-demux_qt.c) = 2942911c09c0580c6017474af2a14f5b1f193c1d 20SHA1 (patch-src-demuxers-demux_qt.c) = 2942911c09c0580c6017474af2a14f5b1f193c1d
21SHA1 (patch-src-post-audio-stretch.c) = bc083541c410e8b8c2b5c23bc7b2b0ae312272a5 21SHA1 (patch-src-post-audio-stretch.c) = bc083541c410e8b8c2b5c23bc7b2b0ae312272a5
22SHA1 (patch-src-post-audio-upmix.c) = ab01e157b42b8dd99622a17b5a8ecdb464ee694e 22SHA1 (patch-src-post-audio-upmix.c) = ab01e157b42b8dd99622a17b5a8ecdb464ee694e
23SHA1 (patch-src-post-audio-upmix_mono.c) = 182a73985d6158c5ab2409bc372b302d3385320e 23SHA1 (patch-src-post-audio-upmix_mono.c) = 182a73985d6158c5ab2409bc372b302d3385320e
24SHA1 (patch-src-post-audio-volnorm.c) = 49d9bd437d240ddf2a14275d518469313cb29a0c 24SHA1 (patch-src-post-audio-volnorm.c) = 49d9bd437d240ddf2a14275d518469313cb29a0c
25SHA1 (patch-src-post-deinterlace-xine_plugin.c) = 132554aa9bdc43fbe9e7dc42fee5916cb60be806 25SHA1 (patch-src-post-deinterlace-xine_plugin.c) = 132554aa9bdc43fbe9e7dc42fee5916cb60be806
26SHA1 (patch-src-post-goom-mmx.h) = 09b82b9e1fae57afb385daa1cd3bb265fd680a1d 26SHA1 (patch-src-post-goom-mmx.h) = 09b82b9e1fae57afb385daa1cd3bb265fd680a1d
27SHA1 (patch-src-post-mosaico-mosaico.c) = f26e6ccc60c78a499d2bd0fd8f3d4c2f4efffde8 27SHA1 (patch-src-post-mosaico-mosaico.c) = f26e6ccc60c78a499d2bd0fd8f3d4c2f4efffde8
File Deleted: pkgsrc/multimedia/xine-lib/patches/Attic/patch-au
File Added: pkgsrc/multimedia/xine-lib/patches/Attic/patch-av
$NetBSD: patch-av,v 1.10 2012/07/02 16:27:11 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,%3)		\n\t"
+            "prefetcht0  64(%q4,%4)		\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 */