[pkgsrc/trunk]: pkgsrc/multimedia/xine-lib don't free() memory which resides ...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/64f7e45f0aa9
branches:  trunk
changeset: 523429:64f7e45f0aa9
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Sun Jan 07 17:36:26 2007 +0000

description:
don't free() memory which resides in sysv shm (xine bug #1620339,
fixed in xine CVS)
ride on PKGREVISION bump some hours ago

diffstat:

 multimedia/xine-lib/distinfo         |   3 ++-
 multimedia/xine-lib/patches/patch-ea |  30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletions(-)

diffs (48 lines):

diff -r bfb45076eb2a -r 64f7e45f0aa9 multimedia/xine-lib/distinfo
--- a/multimedia/xine-lib/distinfo      Sun Jan 07 15:02:16 2007 +0000
+++ b/multimedia/xine-lib/distinfo      Sun Jan 07 17:36:26 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.39 2006/12/08 18:47:41 drochner Exp $
+$NetBSD: distinfo,v 1.40 2007/01/07 17:36:26 drochner Exp $
 
 SHA1 (xine-lib-1.1.3.tar.gz) = c0886910ddb1afa1a72572decf12c0251bba40bf
 RMD160 (xine-lib-1.1.3.tar.gz) = 8e28638385ea48e7d4d4d702573ca92c4eca77c8
@@ -28,3 +28,4 @@
 SHA1 (patch-da) = d488fb2a1e454a4338bf599674035f9db09d8682
 SHA1 (patch-db) = 3ad4ca6f43a379b251211477972cd6d34b1f821a
 SHA1 (patch-dc) = 11c4212029e67f22796e57706b42400a0dbcac3a
+SHA1 (patch-ea) = c691eed110cfbd60e0b6349d612d765ae6560e92
diff -r bfb45076eb2a -r 64f7e45f0aa9 multimedia/xine-lib/patches/patch-ea
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/xine-lib/patches/patch-ea      Sun Jan 07 17:36:26 2007 +0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-ea,v 1.1 2007/01/07 17:36:26 drochner Exp $
+
+--- src/video_out/video_out_xv.c.orig  2006-10-28 20:51:08.000000000 +0200
++++ src/video_out/video_out_xv.c
+@@ -187,7 +187,7 @@ static void xv_frame_dispose (vo_frame_t
+ 
+   if (frame->image) {
+ 
+-    if (this->use_shm) {
++    if (frame->shminfo.shmaddr) {
+       LOCK_DISPLAY(this);
+       XShmDetach (this->display, &frame->shminfo);
+       XFree (frame->image);
+@@ -382,6 +382,7 @@ static XvImage *create_ximage (xv_driver
+ 
+     image = XvCreateImage (this->display, this->xv_port,
+                          xv_format, data, width, height);
++    shminfo->shmaddr = 0;
+   }
+   return image;
+ }
+@@ -391,7 +392,7 @@ static void dispose_ximage (xv_driver_t 
+                           XShmSegmentInfo *shminfo,
+                           XvImage *myimage) {
+ 
+-  if (this->use_shm) {
++  if (shminfo->shmaddr) {
+ 
+     XShmDetach (this->display, shminfo);
+     XFree (myimage);