From 9a868c6bf7dcaae03d09fd02e6c8b44a07e7b99a Mon Sep 17 00:00:00 2001 From: Jan Brinkmann Date: Wed, 30 Mar 2005 21:05:16 +0000 Subject: added a patch for version 0.9.0 to enable successful gcc3.4.x compilation. fixes #67675 (Portage version: 2.0.51.19) --- media-video/drip/ChangeLog | 7 +++- media-video/drip/Manifest | 13 +----- media-video/drip/drip-0.9.0.ebuild | 11 +++-- media-video/drip/files/drip-0.9.0-gcc34.patch | 58 +++++++++++++++++++++++++++ 4 files changed, 73 insertions(+), 16 deletions(-) create mode 100644 media-video/drip/files/drip-0.9.0-gcc34.patch (limited to 'media-video/drip') diff --git a/media-video/drip/ChangeLog b/media-video/drip/ChangeLog index bbfc5a8eef24..3b845282fa88 100644 --- a/media-video/drip/ChangeLog +++ b/media-video/drip/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/drip # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/drip/ChangeLog,v 1.18 2005/03/13 01:51:22 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/drip/ChangeLog,v 1.19 2005/03/30 21:05:16 luckyduck Exp $ + + 30 Mar 2005; Jan Brinkmann + +files/drip-0.9.0-gcc34.patch, drip-0.9.0.ebuild: + added a patch for version 0.9.0 to enable successful gcc3.4.x compilation. + fixes #67675 13 Mar 2005; Jan Brinkmann drip-0.8.1-r5.ebuild: added libtoolize call, fixes #80904 diff --git a/media-video/drip/Manifest b/media-video/drip/Manifest index 5c261bbdcaf3..285bee92430a 100644 --- a/media-video/drip/Manifest +++ b/media-video/drip/Manifest @@ -1,10 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 82306868b6a6fb63db8c971fc0b52a9d drip-0.8.1-r5.ebuild 3091 -MD5 3e152d922c3f8e9bd7fc271c27dfd730 drip-0.9.0.ebuild 2645 +MD5 1a1b93360dd01bbabf4e2a8b304bad2f drip-0.9.0.ebuild 2737 MD5 11944ebf56ca80d2e0675cf54ddbb3df ChangeLog 3461 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158 +MD5 6a8907bd9031fcf440cba36e784faff6 files/drip-0.9.0-gcc34.patch 2795 MD5 7f9daf1e0ac3dae373c1c892c46d1476 files/digest-drip-0.9.0 137 MD5 636fd81a0bb66385faca9b7c72cb1cbc files/drip-0.8.1-fix-dvd-symlink.patch 1305 MD5 030a52bd54594455f9d77f959575036d files/drip-0.8.1-missing-stdio.patch 567 @@ -14,10 +12,3 @@ MD5 39f83fd93ac2e8bb8b9b89afcbcaedcd files/digest-drip-0.8.1-r5 62 MD5 a7d5edb693cf81b8e5fbc833cf221516 files/dripgetdvd.sh 1330 MD5 062194efdad2b8a1e02ded8b66d86fc3 files/drip.desktop 154 MD5 5a5df6046a26634c3fc453c01d52db4b files/drip-0.9.0-cflags.patch 712 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (GNU/Linux) - -iD8DBQFCM5yg06ebR+OMO78RArmTAJ0ebIQatPyyCF83QbtPGk3c3yJ9qwCfXKZW -ZHxVKBf1OwgzE1TNfc4hYMI= -=bjYf ------END PGP SIGNATURE----- diff --git a/media-video/drip/drip-0.9.0.ebuild b/media-video/drip/drip-0.9.0.ebuild index b8826f8ddf66..dc5e44c5d027 100644 --- a/media-video/drip/drip-0.9.0.ebuild +++ b/media-video/drip/drip-0.9.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/drip/drip-0.9.0.ebuild,v 1.3 2005/03/13 01:51:22 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/drip/drip-0.9.0.ebuild,v 1.4 2005/03/30 21:05:16 luckyduck Exp $ inherit eutils libtool flag-o-matic @@ -11,13 +11,13 @@ SRC_URI="http://drip.sourceforge.net/files/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86" +KEYWORDS="~x86 ~amd64" IUSE="nls" + #>=media-libs/divx4linux-20020418 RDEPEND="gnome-base/gnome-libs >=media-video/avifile-0.7.34 >=media-libs/a52dec-0.7.3 - >=media-libs/divx4linux-20020418 >=media-libs/libdvdcss-1.2.2 >=media-libs/libdvdread-0.9.3 >=media-libs/libmpeg2-0.4.0 @@ -52,6 +52,9 @@ src_unpack() { # Honor user CFLAGS epatch ${FILESDIR}/${P}-cflags.patch + # enable gcc3.4.x compilation + epatch ${FILESDIR}/${P}-gcc34.patch + # Remove stale script ... "automake --add-missing" will add it again einfo "Rerunnig autoconf/automake..." cd ${S} ; rm -f ${S}/missing @@ -59,7 +62,7 @@ src_unpack() { aclocal -I macros automake --add-missing autoconf - elibtoolize + libtoolize --copy --force } src_compile() { diff --git a/media-video/drip/files/drip-0.9.0-gcc34.patch b/media-video/drip/files/drip-0.9.0-gcc34.patch new file mode 100644 index 000000000000..d99bccab6f40 --- /dev/null +++ b/media-video/drip/files/drip-0.9.0-gcc34.patch @@ -0,0 +1,58 @@ +diff -uprN encoder.orig/encoder.cpp encoder/encoder.cpp +--- encoder.orig/encoder.cpp 2005-03-30 22:51:40.909946272 +0200 ++++ encoder/encoder.cpp 2005-03-30 23:00:48.853646168 +0200 +@@ -762,7 +762,7 @@ void allocate_buffers(void) { + framebuffer = (guchar*)malloc(Config.in_width*Config.in_height*3); + /* Allocate video buffers */ + extrabuffer = (guchar*)malloc(Config.in_width*BYTES_PER_COLOUR_OUTPOUT+4); +- rowptr = new (guchar*)[Config.in_height]; ++ rowptr = new guchar*[Config.in_height]; + for (gint i=0; icdescription = g_string_new(list[codec_nr]->ctype->str); + list[codec_nr]->cdescription = g_string_append(list[codec_nr]->cdescription,": "); + list[codec_nr]->cdescription = g_string_append(list[codec_nr]->cdescription,it->GetName()); +- list[codec_nr]->cav = (enum codecT)0; ++ list[codec_nr]->cav = (codecT)0; + list[codec_nr]->ci = (gpointer)it; + codec_nr++; + #ifndef STANDALONE +@@ -248,7 +248,7 @@ extern "C" { + list[codec_nr]->ccodec = *ia; + list[codec_nr]->cmodule = g_string_new(it->privatename.c_str()); + list[codec_nr]->cdescription = g_string_new(it->GetName()); +- list[codec_nr]->cav = (enum codecT)1; ++ list[codec_nr]->cav = (codecT)1; + list[codec_nr]->ci = (gpointer)it; + codec_nr++; + #ifndef STANDALONE +diff -uprN encoder.orig/fast_memcpy.cpp encoder/fast_memcpy.cpp +--- encoder.orig/fast_memcpy.cpp 2005-03-30 22:51:40.910946120 +0200 ++++ encoder/fast_memcpy.cpp 2005-03-30 22:58:27.649112520 +0200 +@@ -188,8 +188,8 @@ inline void *_fast_memcpy(void *to, cons + MOVNTQ" %%mm6, 48(%1)\n" + MOVNTQ" %%mm7, 56(%1)\n" + : : "r" (from), "r" (to) : "memory"); +- ((const unsigned char *)from)+=64; +- ((unsigned char *)to)+=64; ++ from = ((const unsigned char *)from) + 64; ++ to = ((unsigned char *)to) + 64; + } + + // printf(" %d %d\n", (int)from&1023, (int)to&1023); +@@ -277,8 +277,8 @@ inline void *_fast_memcpy(void *to, cons + MOVNTQ" %%mm6, 48(%1)\n" + MOVNTQ" %%mm7, 56(%1)\n" + : : "r" (from), "r" (to) : "memory"); +- ((const unsigned char *)from)+=64; +- ((unsigned char *)to)+=64; ++ from = ((const unsigned char *)from) + 64; ++ to = ((unsigned char *)to) + 64; + } + + #endif /* Have SSE */ -- cgit v1.2.3-65-gdbad