diff options
| author |   Luca Barbato <lu_zero@gentoo.org> | 2003-09-26 11:46:12 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2003-09-26 11:46:12 +0000 |
| commit | fe77c14cb6f3cff5684883da4d06633498ceb1a9 (patch) | |
| tree | ae04b897e510be989e13df79e14e7ad086c74119 /media-video/cinelerra | |
| parent | fix for openhbci-plugin-ddvcard digest (diff) | |
| download | gentoo-2-fe77c14cb6f3cff5684883da4d06633498ceb1a9.tar.gz gentoo-2-fe77c14cb6f3cff5684883da4d06633498ceb1a9.tar.bz2 gentoo-2-fe77c14cb6f3cff5684883da4d06633498ceb1a9.zip | |
some minor fixes
Diffstat (limited to 'media-video/cinelerra')
| -rw-r--r-- | media-video/cinelerra/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/cinelerra/Manifest | 7 | ||||
| -rw-r--r-- | media-video/cinelerra/cinelerra-1.1.7.ebuild | 15 | ||||
| -rw-r--r-- | media-video/cinelerra/files/gcc-3.3.1-collate.patch | 12 |
4 files changed, 27 insertions, 12 deletions
diff --git a/media-video/cinelerra/ChangeLog b/media-video/cinelerra/ChangeLog index 33500d7df1e6..e0beebb11304 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.12 2003/09/01 16:28:11 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.13 2003/09/26 11:46:07 lu_zero Exp $ + + 26 Sep 2003; Luca Barbato <lu_zero@gentoo.org> cinelerra-1.1.7.ebuild: + Fixed bugs 28767, 27824 01 Sep 2003; Luca Barbato <lu_zero@gentoo.org> cinelerra-1.1.7.ebuild: Pinned nasm version, should avoid bug 27704 diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest index 9569d036a91f..bbb60446ee65 100644 --- a/media-video/cinelerra/Manifest +++ b/media-video/cinelerra/Manifest @@ -1,12 +1,13 @@ -MD5 061288ad391577c7a2b7c66449a21605 ChangeLog 2122 +MD5 343285b78a9ada222b3bedbf5372c3a1 ChangeLog 2222 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 d5da1cf0766cac9dbd4013b5fcf0603b cinelerra-1.1.7.ebuild 1507 +MD5 180a4ff26fd66921dcb47db6049dffbe cinelerra-1.1.7.ebuild 1527 MD5 bb1b390c6a20a9240f1100c3a3974b0d files/digest-cinelerra-1.0.0 73 -MD5 0251b5e587fcbf93534c1633a3d27ad1 files/digest-cinelerra-110802 74 +MD5 12c40f831322db75d68c5449efaa4ac6 files/gcc-3.3.1-collate.patch 539 MD5 d2363d0c13405512bf1341d84a12d744 files/digest-cinelerra-1.1.5 148 +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 diff --git a/media-video/cinelerra/cinelerra-1.1.7.ebuild b/media-video/cinelerra/cinelerra-1.1.7.ebuild index 5ca17fc6db19..f1e93def83c4 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.5 2003/09/07 00:08:12 msterret Exp $ +# $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 $ inherit gcc eutils flag-o-matic export WANT_GCC_3="yes" @@ -19,14 +19,13 @@ KEYWORDS="x86 -ppc" DEPEND="virtual/x11 virtual/glibc - =sys-devel/gcc-3* - <dev-lang/nasm-0.98.37" + =sys-devel/gcc-3*" # >=media-libs/a52dec-0.7.3" -#src_unpack() { -# unpack ${A} - #epatch ${FILESDIR}/compile-${PV}.diff -#} +src_unpack() { + unpack ${A} + epatch ${FILESDIR}/gcc-3.3.1-collate.patch +} src_compile() { export CFLAGS=${CFLAGS} @@ -42,7 +41,7 @@ src_compile() { src_install() { local myarch if [ -n "`use x86`" ]; then - myarch="i686" + myarch="${CHOST/-*/}" #should solve the i586/i686 problem fi if [ -n "`use ppc`" ]; then myarch="ppc" diff --git a/media-video/cinelerra/files/gcc-3.3.1-collate.patch b/media-video/cinelerra/files/gcc-3.3.1-collate.patch new file mode 100644 index 000000000000..1ad9d3336d17 --- /dev/null +++ b/media-video/cinelerra/files/gcc-3.3.1-collate.patch @@ -0,0 +1,12 @@ +diff -ruN cinelerra-1.1.7.orig/esound/esd.h cinelerra-1.1.7/esound/esd.h +--- cinelerra-1.1.7.orig/esound/esd.h 2003-09-26 13:18:40.000000000 +0200 ++++ cinelerra-1.1.7/esound/esd.h 2003-09-26 13:32:03.000000000 +0200 +@@ -8,7 +8,7 @@ + + /* path and name of the default EsounD domain socket */ + #define ESD_UNIX_SOCKET_DIR "/tmp/.esd" +-#define ESD_UNIX_SOCKET_NAME ESD_UNIX_SOCKET_DIR ## "/" ## "socket" ++#define ESD_UNIX_SOCKET_NAME ESD_UNIX_SOCKET_DIR "/" "socket" + + /* length of the audio buffer size */ + #define ESD_BUF_SIZE (4 * 1024) |