summaryrefslogtreecommitdiff
path: root/multimedia/xine-lib
diff options
context:
space:
mode:
authordrochner <drochner>2007-01-07 17:36:26 +0000
committerdrochner <drochner>2007-01-07 17:36:26 +0000
commit6deaabc31a95a791b6034ee3bc34bcea414289b1 (patch)
treedd6f29fe919f27a47dc30aadfc00382444ca61e4 /multimedia/xine-lib
parenteee1eb2dc68288cffd3839a18974fa4336a89a4c (diff)
downloadpkgsrc-6deaabc31a95a791b6034ee3bc34bcea414289b1.tar.gz
don't free() memory which resides in sysv shm (xine bug #1620339,
fixed in xine CVS) ride on PKGREVISION bump some hours ago
Diffstat (limited to 'multimedia/xine-lib')
-rw-r--r--multimedia/xine-lib/distinfo3
-rw-r--r--multimedia/xine-lib/patches/patch-ea30
2 files changed, 32 insertions, 1 deletions
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index cbe4b6616bf..78f2be22b18 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -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-cd) = a080c745d08ded46db7c1173fe55350c1eb9ff33
SHA1 (patch-da) = d488fb2a1e454a4338bf599674035f9db09d8682
SHA1 (patch-db) = 3ad4ca6f43a379b251211477972cd6d34b1f821a
SHA1 (patch-dc) = 11c4212029e67f22796e57706b42400a0dbcac3a
+SHA1 (patch-ea) = c691eed110cfbd60e0b6349d612d765ae6560e92
diff --git a/multimedia/xine-lib/patches/patch-ea b/multimedia/xine-lib/patches/patch-ea
new file mode 100644
index 00000000000..f93e5c19870
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-ea
@@ -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);