summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2003-10-03 14:01:17 +0000
committerLuca Barbato <lu_zero@gentoo.org>2003-10-03 14:01:17 +0000
commited295e9d3b76b75baf0c67927a922bbd803a5cc2 (patch)
tree50b1ab483f6c4e72a946c9f352484fecd0012b23 /media-video
parentadd metadata and mark x86 stable (diff)
downloadhistorical-ed295e9d3b76b75baf0c67927a922bbd803a5cc2.tar.gz
historical-ed295e9d3b76b75baf0c67927a922bbd803a5cc2.tar.bz2
historical-ed295e9d3b76b75baf0c67927a922bbd803a5cc2.zip
some fixes
Diffstat (limited to 'media-video')
-rw-r--r--media-video/cinelerra/ChangeLog5
-rw-r--r--media-video/cinelerra/Manifest5
-rw-r--r--media-video/cinelerra/cinelerra-1.1.7.ebuild5
-rw-r--r--media-video/cinelerra/files/pthread_t_not_int.patch24
4 files changed, 34 insertions, 5 deletions
diff --git a/media-video/cinelerra/ChangeLog b/media-video/cinelerra/ChangeLog
index e0beebb11304..8c0304e7e76c 100644
--- a/media-video/cinelerra/ChangeLog
+++ b/media-video/cinelerra/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/cinelerra
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.13 2003/09/26 11:46:07 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.14 2003/10/03 14:01:10 lu_zero Exp $
+
+ 03 Oct 2003; Luca Barbato <lu_zero@gentoo.org> cinelerra-1.1.7.ebuild:
+ Fixed bugs 28859, 26795
26 Sep 2003; Luca Barbato <lu_zero@gentoo.org> cinelerra-1.1.7.ebuild:
Fixed bugs 28767, 27824
diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest
index bbb60446ee65..58baea5bf956 100644
--- a/media-video/cinelerra/Manifest
+++ b/media-video/cinelerra/Manifest
@@ -1,9 +1,9 @@
-MD5 343285b78a9ada222b3bedbf5372c3a1 ChangeLog 2222
+MD5 a53a400f0773195c77d8631c7b09e493 ChangeLog 2322
MD5 5d92470f4d5854d44061e84c5e7ee383 cinelerra-1.0.0.ebuild 1057
MD5 8e9c6f0bf54f4bb0f03a466d1620a2f1 cinelerra-110802.ebuild 1129
MD5 6e57a0a0c53b081e68becdd72bb67576 cinelerra-1.1.5.ebuild 1262
MD5 682c293e182cc874028d6264826377d0 cinelerra-1.1.6.ebuild 1453
-MD5 180a4ff26fd66921dcb47db6049dffbe cinelerra-1.1.7.ebuild 1527
+MD5 d2572853afcfd98998cb69edcfe72e6d cinelerra-1.1.7.ebuild 1600
MD5 bb1b390c6a20a9240f1100c3a3974b0d files/digest-cinelerra-1.0.0 73
MD5 12c40f831322db75d68c5449efaa4ac6 files/gcc-3.3.1-collate.patch 539
MD5 d2363d0c13405512bf1341d84a12d744 files/digest-cinelerra-1.1.5 148
@@ -11,3 +11,4 @@ MD5 0251b5e587fcbf93534c1633a3d27ad1 files/digest-cinelerra-110802 74
MD5 82ff059ba49d16e7d44ad7ce42976a93 files/digest-cinelerra-1.1.6 74
MD5 6a0e5d7afc5e123e9c6a059b38351548 files/compile-1.1.6.diff 7517
MD5 5a786a19ac60d4ef490c82ccec2975b2 files/digest-cinelerra-1.1.7 74
+MD5 3d915d40f23c642ed22fa5a627519aec files/pthread_t_not_int.patch 880
diff --git a/media-video/cinelerra/cinelerra-1.1.7.ebuild b/media-video/cinelerra/cinelerra-1.1.7.ebuild
index f1e93def83c4..3fee2f2cc4f8 100644
--- a/media-video/cinelerra/cinelerra-1.1.7.ebuild
+++ b/media-video/cinelerra/cinelerra-1.1.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-1.1.7.ebuild,v 1.6 2003/09/26 11:46:07 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-1.1.7.ebuild,v 1.7 2003/10/03 14:01:10 lu_zero Exp $
inherit gcc eutils flag-o-matic
export WANT_GCC_3="yes"
@@ -25,6 +25,7 @@ DEPEND="virtual/x11
src_unpack() {
unpack ${A}
epatch ${FILESDIR}/gcc-3.3.1-collate.patch
+ epatch ${FILESDIR}/pthread_t_not_int.patch
}
src_compile() {
@@ -47,7 +48,7 @@ src_install() {
myarch="ppc"
fi
cd ${S}/${PN}/${myarch}
- dobin ${PN}
+ dobin ${PN} || die "cinelerra not built"
cd ${S}/plugins
insinto /usr/lib/${PN}
diff --git a/media-video/cinelerra/files/pthread_t_not_int.patch b/media-video/cinelerra/files/pthread_t_not_int.patch
new file mode 100644
index 000000000000..31cd33dd832d
--- /dev/null
+++ b/media-video/cinelerra/files/pthread_t_not_int.patch
@@ -0,0 +1,24 @@
+diff -ruN cinelerra-1.1.7.orig/guicast/thread.C cinelerra-1.1.7/guicast/thread.C
+--- cinelerra-1.1.7.orig/guicast/thread.C 2003-10-03 14:42:22.071290360 +0200
++++ cinelerra-1.1.7/guicast/thread.C 2003-10-03 14:45:53.318175952 +0200
+@@ -165,7 +165,7 @@
+ return realtime;
+ }
+
+-int Thread::get_tid()
++pthread_t Thread::get_tid()
+ {
+ return tid;
+ }
+diff -ruN cinelerra-1.1.7.orig/guicast/thread.h cinelerra-1.1.7/guicast/thread.h
+--- cinelerra-1.1.7.orig/guicast/thread.h 2003-10-03 14:42:22.072290208 +0200
++++ cinelerra-1.1.7/guicast/thread.h 2003-10-03 14:46:18.521344488 +0200
+@@ -35,7 +35,7 @@
+ int get_realtime(); // Return realtime variable
+ static int calculate_realtime(); // Determine status by querying kernel
+ int get_synchronous();
+- int get_tid();
++ pthread_t get_tid();
+
+ private:
+ int synchronous; // set to 1 to force join() to end