summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-video/transcode')
-rw-r--r--media-video/transcode/ChangeLog5
-rw-r--r--media-video/transcode/Manifest5
-rw-r--r--media-video/transcode/files/transcode-0.6.7-clone_close.diff28
-rw-r--r--media-video/transcode/transcode-0.6.7.ebuild6
4 files changed, 39 insertions, 5 deletions
diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index cb7abca37b55..5abd8ff850eb 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,6 @@
# ChangeLog for media-video/transcode
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.41 2003/06/29 20:35:18 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.42 2003/07/04 17:34:59 cretin Exp $
*transcode-0.6.6 (29 Jun 2003)
@@ -9,6 +9,9 @@
*transcode-0.6.7 (29 Jun 2003)
+ 04 Jul 2003; Stefan Jones <cretin@gentoo.org> transcode-0.6.7.ebuild,
+ Added clone_close patch so transcode works with nptl!
+
29 Jun 2003; Stefan Jones <cretin@gentoo.org> transcode-0.6.7.ebuild,
New version, also updated libdv dep
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index 77c338e6100a..4705243593dd 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,9 +1,10 @@
MD5 6a0b96d4f85ada728dcb0332496ecc44 transcode-0.6.6.ebuild 3293
MD5 94bd38e13fa090bcc32202151996f459 transcode-0.6.3.ebuild 3061
-MD5 d82beb56fcfd54867df19a8c1d6addf7 transcode-0.6.7.ebuild 3345
+MD5 9ae2d4cc68758b7a3638d3229162710e transcode-0.6.7.ebuild 3394
MD5 df648b9270825d3e3a34a1837dc21306 transcode-0.6.2.ebuild 3120
MD5 78bfec2109a5353a59c5cf9c01a177e4 transcode-0.6.4.ebuild 3294
-MD5 18457589f773393c676f57c6103dc283 ChangeLog 8711
+MD5 707d9cfae67851650d1e9957ae399bbd ChangeLog 8839
+MD5 14479296c3af00baa49396d77c35d01e files/transcode-0.6.7-clone_close.diff 597
MD5 03629a858586307611c7d7c2a2dc1505 files/digest-transcode-0.6.2 68
MD5 225a843999c440c3060e96b9fe6fca35 files/digest-transcode-0.6.3 68
MD5 1015c51dd24d8191b78b2465b24c1b83 files/digest-transcode-0.6.4 68
diff --git a/media-video/transcode/files/transcode-0.6.7-clone_close.diff b/media-video/transcode/files/transcode-0.6.7-clone_close.diff
new file mode 100644
index 000000000000..dc2376da8ce6
--- /dev/null
+++ b/media-video/transcode/files/transcode-0.6.7-clone_close.diff
@@ -0,0 +1,28 @@
+--- transcode-0.6.7/import/clone.c.jj 2003-07-03 20:40:53.000000000 +0100
++++ transcode-0.6.7/import/clone.c 2003-07-03 20:49:24.000000000 +0100
+@@ -51,7 +51,7 @@
+
+ static double fps;
+
+-static pthread_t thread;
++static pthread_t thread=(pthread_t)0;
+
+ static int clone_read_thread_flag=0;
+
+@@ -272,12 +272,15 @@
+ {
+ void *status;
+
++ if(thread) {
+ // cancel the thread
+ pthread_cancel(thread);
+ pthread_join(thread, &status);
+
+ //reentrance safe
+-
++ thread=(pthread_t)0;
++ }
++
+ if(video_buffer != NULL) free(video_buffer);
+ video_buffer=NULL;
+
diff --git a/media-video/transcode/transcode-0.6.7.ebuild b/media-video/transcode/transcode-0.6.7.ebuild
index bc1f4862af79..719967a9da68 100644
--- a/media-video/transcode/transcode-0.6.7.ebuild
+++ b/media-video/transcode/transcode-0.6.7.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.7.ebuild,v 1.1 2003/06/29 20:35:18 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.7.ebuild,v 1.2 2003/07/04 17:34:59 cretin Exp $
-inherit libtool flag-o-matic
+inherit libtool flag-o-matic eutils
# Don't build with -mfpmath=sse || -fPic or it will break. (Bug #14920)
filter-flags -mfpmath=sse
@@ -50,6 +50,8 @@ src_unpack() {
else
einfo "Old netbpm (<=9.12)..."
fi
+
+ epatch ${FILESDIR}/${P}-clone_close.diff
}
src_compile() {