From 4cdb9ea17da61bff5ecf5f85f503b7126e8fc5a3 Mon Sep 17 00:00:00 2001 From: drochner Date: Wed, 12 May 2004 16:37:06 +0000 Subject: update to xine-lib-1-rc4 changes: This release improves playback of some streams, reduces flickering of OSD and brings a whole bunch of updated libraries. It does also fix a vulnerability in xine's RTSP streaming code. See XSA-2004-3 for more information! XXX powerpc asm stuff needs to be checked XXX didn't test the "arts" stuff --- audio/xine-arts/Makefile | 3 +-- audio/xine-esound/Makefile | 3 +-- multimedia/xine-lib/Makefile | 4 +--- multimedia/xine-lib/Makefile.common | 6 +++--- multimedia/xine-lib/distinfo | 11 +++++------ multimedia/xine-lib/patches/patch-af | 26 -------------------------- multimedia/xine-lib/patches/patch-am | 12 ++++++------ multimedia/xine-lib/patches/patch-au | 20 ++++++++++---------- 8 files changed, 27 insertions(+), 58 deletions(-) delete mode 100644 multimedia/xine-lib/patches/patch-af diff --git a/audio/xine-arts/Makefile b/audio/xine-arts/Makefile index f5088625ea8..d5335d10c90 100644 --- a/audio/xine-arts/Makefile +++ b/audio/xine-arts/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.8 2004/04/05 18:41:14 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2004/05/12 16:37:06 drochner Exp $ # .include "../../multimedia/xine-lib/Makefile.common" PKGNAME:= ${PKGNAME:S/lib/arts/} -PKGREVISION= 1 CATEGORIES= audio DEPENDS+= xine-lib>=1rc3a:../../multimedia/xine-lib diff --git a/audio/xine-esound/Makefile b/audio/xine-esound/Makefile index 3a3ddfaaa56..38ee9120e30 100644 --- a/audio/xine-esound/Makefile +++ b/audio/xine-esound/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2004/04/05 18:41:14 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2004/05/12 16:37:06 drochner Exp $ # .include "../../multimedia/xine-lib/Makefile.common" PKGNAME:= ${PKGNAME:S/lib/esound/} -PKGREVISION= 1 CATEGORIES= audio DEPENDS+= xine-lib>=1rc3a:../../multimedia/xine-lib diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile index 31d6bfeeaca..259bba39846 100644 --- a/multimedia/xine-lib/Makefile +++ b/multimedia/xine-lib/Makefile @@ -1,10 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2004/04/19 18:17:04 drochner Exp $ +# $NetBSD: Makefile,v 1.8 2004/05/12 16:37:07 drochner Exp $ # .include "Makefile.common" -PKGREVISION= 1 - .if ${MACHINE_ARCH} == "i386" DEPENDS+= win32-codecs>=011227:../../multimedia/win32-codecs PLIST_SRC= ${PKGDIR}/PLIST.i386 diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common index d53fe9fd138..cda05993aa0 100644 --- a/multimedia/xine-lib/Makefile.common +++ b/multimedia/xine-lib/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.8 2004/04/16 14:44:32 mycroft Exp $ +# $NetBSD: Makefile.common,v 1.9 2004/05/12 16:37:07 drochner Exp $ # -DISTNAME= xine-lib-1-rc3c -PKGNAME= xine-lib-1rc3c +DISTNAME= xine-lib-1-rc4 +PKGNAME= xine-lib-1rc4 CATEGORIES?= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/} diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo index 1f50594559c..4f3c3873d85 100644 --- a/multimedia/xine-lib/distinfo +++ b/multimedia/xine-lib/distinfo @@ -1,23 +1,22 @@ -$NetBSD: distinfo,v 1.4 2004/04/16 14:55:30 mycroft Exp $ +$NetBSD: distinfo,v 1.5 2004/05/12 16:37:07 drochner Exp $ -SHA1 (xine-lib-1-rc3c.tar.gz) = 48a0812e8bb478e809dc01347710301fb17fac12 -Size (xine-lib-1-rc3c.tar.gz) = 6463319 bytes +SHA1 (xine-lib-1-rc4.tar.gz) = 1cf447ce447a5572e40aea9fa25e19f73ba2decf +Size (xine-lib-1-rc4.tar.gz) = 6788315 bytes SHA1 (patch-aa) = beb7617b8361c06cf5224f0027731f025f7dc519 SHA1 (patch-ab) = a5205d23d02dff84b0e8a9f850f3833cacc28c5a SHA1 (patch-ac) = 7959d6d3599c9debe79b1b4a5749b6af714588a0 SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846 SHA1 (patch-ae) = cf7486ed50a782fcfb17ad0985e76a7ae09a2938 -SHA1 (patch-af) = 0d2860c863c4121288289b88d46433a94dde120b SHA1 (patch-ag) = 23fca3bd89be1f852456d31e46f6449b577c0dad SHA1 (patch-ah) = 3f9b23c4a7994259056b73209a9e194db759f06d SHA1 (patch-ai) = f71e3cb57bf30cbf9653a469c040b6e3f717ba97 SHA1 (patch-al) = af557ce4fd64e11f84947e067f445e59628c6f99 -SHA1 (patch-am) = 0441dcd9faf0c0e7f07c8d0fc7a61fcce435af76 +SHA1 (patch-am) = 98d95c618ee15df9ff592b3a677387507841c2d7 SHA1 (patch-ao) = d4cbdf5da7c912b4306681032d6d964b84760909 SHA1 (patch-ap) = aaf63024c1049c1f2175d9974367a6b84ac3028f SHA1 (patch-aq) = ec5707d3b7b69912342afc7bef3e8cd182c75ded SHA1 (patch-ar) = c0053ebca44544c42e39aab775e8441b6e9faa30 SHA1 (patch-as) = ad09d98ba79cdaa0367589658d7fa05a78d075ba SHA1 (patch-at) = b43d07b20f209a31df454620673a21f174550cf9 -SHA1 (patch-au) = 666ecb544f904178465bdd7854642a40f4ce4970 +SHA1 (patch-au) = 569ac1d00402eb3679bf99f0afe5832f425b3b0e SHA1 (patch-av) = 56f462e6091a72e87544ece689557d60fbb749aa diff --git a/multimedia/xine-lib/patches/patch-af b/multimedia/xine-lib/patches/patch-af deleted file mode 100644 index 94d9780ea5d..00000000000 --- a/multimedia/xine-lib/patches/patch-af +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ - ---- src/xine-utils/ppcasm_string.S.orig 2003-10-24 09:52:09.000000000 +1000 -+++ src/xine-utils/ppcasm_string.S 2003-10-24 09:52:39.000000000 +1000 -@@ -18,6 +18,7 @@ - - #warning Be forewarned - using PowerPC assembly - -+#ifdef __linux__ - #define __KERNEL__ - #define __ASSEMBLY__ - -@@ -26,6 +27,13 @@ - #include - #include - #include -+#endif -+ -+#ifdef __NetBSD__ -+#define _STANDALONE -+ -+#include -+#endif - - #define COPY_16_BYTES \ - lwz r7,4(r4); \ diff --git a/multimedia/xine-lib/patches/patch-am b/multimedia/xine-lib/patches/patch-am index 48ec5af72ae..047e45d22e0 100644 --- a/multimedia/xine-lib/patches/patch-am +++ b/multimedia/xine-lib/patches/patch-am @@ -1,8 +1,8 @@ -$NetBSD: patch-am,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ +$NetBSD: patch-am,v 1.2 2004/05/12 16:37:07 drochner Exp $ ---- src/libw32dll/wine/ldt_keeper.c.orig 2003-07-13 19:29:04.000000000 +0000 -+++ src/libw32dll/wine/ldt_keeper.c 2003-10-02 12:28:23.000000000 +0000 -@@ -147,18 +147,9 @@ +--- src/libw32dll/wine/ldt_keeper.c.orig 2004-05-12 18:33:31.000000000 +0200 ++++ src/libw32dll/wine/ldt_keeper.c 2004-05-12 18:41:51.000000000 +0200 +@@ -152,18 +152,9 @@ void Check_FS_Segment(void) { @@ -10,11 +10,11 @@ $NetBSD: patch-am,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ - __asm__ __volatile__( - "movw %%fs,%%ax; mov %%eax,%0" : "=r" (fs) :: "%eax" + __asm__ __volatile__( -+ "movl %0,%%eax; movw %%ax, %%fs" : : "i" (TEB_SEL) : "%eax" ++ "movl %0,%%eax; movw %%ax, %%fs" : : "r" (teb_sel) : "%eax" ); - fs = fs & 0xffff; - -- if( fs != TEB_SEL ) { +- if( fs != teb_sel ) { - printf("ldt_keeper: FS segment is not set or has being lost!\n"); - printf(" Please report this error to xine-devel@sourceforge.net\n"); - printf(" Aborting....\n"); diff --git a/multimedia/xine-lib/patches/patch-au b/multimedia/xine-lib/patches/patch-au index d2d6fce2a11..2f5889c901c 100644 --- a/multimedia/xine-lib/patches/patch-au +++ b/multimedia/xine-lib/patches/patch-au @@ -1,12 +1,12 @@ -$NetBSD: patch-au,v 1.1 2004/03/28 20:14:22 mycroft Exp $ +$NetBSD: patch-au,v 1.2 2004/05/12 16:37:07 drochner Exp $ ---- src/xine-engine/xine.c.orig 2004-03-16 21:40:16.000000000 +0000 -+++ src/xine-engine/xine.c 2004-03-28 03:36:37.000000000 +0000 -@@ -1321,6 +1321,7 @@ - pthread_mutex_init(&this->port_ticket->lock, NULL); - pthread_mutex_init(&this->port_ticket->revoke_lock, NULL); - pthread_cond_init(&this->port_ticket->issued, NULL); -+ pthread_cond_init(&this->port_ticket->revoked, NULL); - - return this; +--- src/xine-engine/xine.c.orig 2004-04-27 18:56:39.000000000 +0200 ++++ src/xine-engine/xine.c 2004-05-11 22:20:16.000000000 +0200 +@@ -238,6 +238,7 @@ + pthread_mutex_init(&port_ticket->lock, NULL); + pthread_mutex_init(&port_ticket->revoke_lock, NULL); + pthread_cond_init(&port_ticket->issued, NULL); ++ pthread_cond_init(&port_ticket->revoked, NULL); + + return port_ticket; } -- cgit v1.2.3