From 0b26c57c660ba45f1020657fd670f56063c89130 Mon Sep 17 00:00:00 2001 From: Martin Schlemmer Date: Tue, 28 Jun 2005 22:00:13 +0000 Subject: Fix building on amd64 with gcc4. (Portage version: 2.0.51.22-r1) --- media-libs/xvid/ChangeLog | 6 ++- .../xvid/files/xvid-1.1.0_beta2-amd64-gcc4.patch | 53 ++++++++++++++++++++++ media-libs/xvid/xvid-1.1.0_beta2-r1.ebuild | 3 +- 3 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 media-libs/xvid/files/xvid-1.1.0_beta2-amd64-gcc4.patch diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog index e6b162b2f7ed..eb36bf924769 100644 --- a/media-libs/xvid/ChangeLog +++ b/media-libs/xvid/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/xvid # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.44 2005/05/18 12:50:40 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.45 2005/06/28 22:00:13 azarah Exp $ + + 28 Jun 2005; Martin Schlemmer + +files/xvid-1.1.0_beta2-amd64-gcc4.patch, xvid-1.1.0_beta2-r1.ebuild: + Fix building on amd64 with gcc4. 18 May 2005; Markus Rothe xvid-1.0.3.ebuild: Stable on ppc64 diff --git a/media-libs/xvid/files/xvid-1.1.0_beta2-amd64-gcc4.patch b/media-libs/xvid/files/xvid-1.1.0_beta2-amd64-gcc4.patch new file mode 100644 index 000000000000..f0fa9b0c5ded --- /dev/null +++ b/media-libs/xvid/files/xvid-1.1.0_beta2-amd64-gcc4.patch @@ -0,0 +1,53 @@ +diff -urN xvidcore-1.1.0-beta2/src/image/qpel.c xvidcore-1.1.0-beta2.az/src/image/qpel.c +--- xvidcore-1.1.0-beta2/src/image/qpel.c 2005-04-03 22:39:44.000000000 +0200 ++++ xvidcore-1.1.0-beta2.az/src/image/qpel.c 2005-06-16 22:23:21.000000000 +0200 +@@ -397,7 +397,7 @@ + #endif + + #ifdef ARCH_IS_X86_64 +-extern uint16_t xvid_Expand_mmx[][]; /* 8b -> 64b expansion table */ ++extern uint16_t xvid_Expand_mmx[256][4]; /* 8b -> 64b expansion table */ + #endif + + /* Alternate way of filtering (cf. USE_TABLES flag in qpel_mmx.asm) +@@ -408,23 +408,23 @@ + * Using Symmetries (and bswap) could reduce further + * the memory to 7 tables (->14K). */ + #ifdef ARCH_IS_X86_64 +-extern int16_t xvid_FIR_1_0_0_0[][]; +-extern int16_t xvid_FIR_3_1_0_0[][]; +-extern int16_t xvid_FIR_6_3_1_0[][]; +-extern int16_t xvid_FIR_14_3_2_1[][]; +-extern int16_t xvid_FIR_20_6_3_1[][]; +-extern int16_t xvid_FIR_20_20_6_3[][]; +-extern int16_t xvid_FIR_23_19_6_3[][]; +-extern int16_t xvid_FIR_7_20_20_6[][]; +-extern int16_t xvid_FIR_6_20_20_6[][]; +-extern int16_t xvid_FIR_6_20_20_7[][]; +-extern int16_t xvid_FIR_3_6_20_20[][]; +-extern int16_t xvid_FIR_3_6_19_23[][]; +-extern int16_t xvid_FIR_1_3_6_20[][]; +-extern int16_t xvid_FIR_1_2_3_14[][]; +-extern int16_t xvid_FIR_0_1_3_6[][]; +-extern int16_t xvid_FIR_0_0_1_3[][]; +-extern int16_t xvid_FIR_0_0_0_1[][]; ++extern int16_t xvid_FIR_1_0_0_0[256][4]; ++extern int16_t xvid_FIR_3_1_0_0[256][4]; ++extern int16_t xvid_FIR_6_3_1_0[256][4]; ++extern int16_t xvid_FIR_14_3_2_1[256][4]; ++extern int16_t xvid_FIR_20_6_3_1[256][4]; ++extern int16_t xvid_FIR_20_20_6_3[256][4]; ++extern int16_t xvid_FIR_23_19_6_3[256][4]; ++extern int16_t xvid_FIR_7_20_20_6[256][4]; ++extern int16_t xvid_FIR_6_20_20_6[256][4]; ++extern int16_t xvid_FIR_6_20_20_7[256][4]; ++extern int16_t xvid_FIR_3_6_20_20[256][4]; ++extern int16_t xvid_FIR_3_6_19_23[256][4]; ++extern int16_t xvid_FIR_1_3_6_20[256][4]; ++extern int16_t xvid_FIR_1_2_3_14[256][4]; ++extern int16_t xvid_FIR_0_1_3_6[256][4]; ++extern int16_t xvid_FIR_0_0_1_3[256][4]; ++extern int16_t xvid_FIR_0_0_0_1[256][4]; + #else + int16_t xvid_FIR_1_0_0_0[256][4]; + int16_t xvid_FIR_3_1_0_0[256][4]; diff --git a/media-libs/xvid/xvid-1.1.0_beta2-r1.ebuild b/media-libs/xvid/xvid-1.1.0_beta2-r1.ebuild index 7b4fe08fdc0a..7d65b30ff974 100644 --- a/media-libs/xvid/xvid-1.1.0_beta2-r1.ebuild +++ b/media-libs/xvid/xvid-1.1.0_beta2-r1.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-libs/xvid/xvid-1.1.0_beta2-r1.ebuild,v 1.3 2005/05/08 12:56:35 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.1.0_beta2-r1.ebuild,v 1.4 2005/06/28 22:00:13 azarah Exp $ inherit eutils @@ -29,6 +29,7 @@ src_unpack() { cd "${WORKDIR}/${MY_P}" epatch "${FILESDIR}/${P}-altivec.patch" + epatch "${FILESDIR}/${P}-amd64-gcc4.patch" cd ${S} WANT_AUTOCONF="2.5" -- cgit v1.2.3-65-gdbad