diff options
| author |   Patrick McLean <chutzpah@gentoo.org> | 2006-02-07 18:06:11 +0000 |
|---|---|---|
| committer | Patrick McLean <chutzpah@gentoo.org> | 2006-02-07 18:06:11 +0000 |
| commit | b237ce629cdf4959f80e7041e9741257dcc65c09 (patch) | |
| tree | d75ac9f209b5c84d7ba83d55c4738bcafcea91ff /media-libs/libdv | |
| parent | Added ~ppc keyword. bug 121863 (diff) | |
| download | gentoo-2-b237ce629cdf4959f80e7041e9741257dcc65c09.tar.gz gentoo-2-b237ce629cdf4959f80e7041e9741257dcc65c09.tar.bz2 gentoo-2-b237ce629cdf4959f80e7041e9741257dcc65c09.zip | |
Trivial gcc4 fix
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'media-libs/libdv')
| -rw-r--r-- | media-libs/libdv/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libdv/files/libdv-0.104-gcc4.patch | 22 | ||||
| -rw-r--r-- | media-libs/libdv/libdv-0.104-r1.ebuild | 5 |
3 files changed, 31 insertions, 2 deletions
diff --git a/media-libs/libdv/ChangeLog b/media-libs/libdv/ChangeLog index bd302b8718fd..ee6aa55372b9 100644 --- a/media-libs/libdv/ChangeLog +++ b/media-libs/libdv/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libdv # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/ChangeLog,v 1.46 2006/01/14 05:58:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/ChangeLog,v 1.47 2006/02/07 18:06:11 chutzpah Exp $ + + 07 Feb 2006; Patrick McLean <chutzpah@gentoo.org> + +files/libdv-0.104-gcc4.patch, libdv-0.104-r1.ebuild: + Trivial patch to fix compilation with gcc4. 24 Dec 2005; Rene Nussbaumer <killerfox@gentoo.org> libdv-0.102.ebuild: Stable on hppa. diff --git a/media-libs/libdv/files/libdv-0.104-gcc4.patch b/media-libs/libdv/files/libdv-0.104-gcc4.patch new file mode 100644 index 000000000000..bfcd44097e0a --- /dev/null +++ b/media-libs/libdv/files/libdv-0.104-gcc4.patch @@ -0,0 +1,22 @@ +--- libdv/quant.h.orig 2006-02-07 17:39:08.000000000 +0000 ++++ libdv/quant.h 2006-02-07 17:42:37.000000000 +0000 +@@ -27,7 +27,7 @@ + extern void _dv_quant_88_inverse(dv_coeff_t *block,int qno,int klass); + extern void (*_dv_quant_248_inverse) (dv_coeff_t *block,int qno,int klass, + dv_248_coeff_t *co); +-extern void _dv_quant_88_inverse_x86(dv_coeff_t *block,int qno,int klass, uint8_t offset[], uint8_t shifts[][]); ++extern void _dv_quant_88_inverse_x86(dv_coeff_t *block,int qno,int klass, uint8_t *offset, uint8_t **shifts); + extern void _dv_quant_88_inverse_x86_64(dv_coeff_t *block,int qno,int klass); + extern void dv_quant_init (void); + #ifdef __cplusplus +--- libdv/quant.c.orig 2006-02-07 17:42:57.000000000 +0000 ++++ libdv/quant.c 2006-02-07 17:43:17.000000000 +0000 +@@ -144,7 +144,7 @@ + uint32_t dv_quant_248_mul_tab [2] [22] [64]; + uint32_t dv_quant_88_mul_tab [2] [22] [64]; + +-extern void _dv_quant_x86(dv_coeff_t *block,int qno,int klass,uint8_t dv_quant_offset[],uint8_t dv_quant_shifts[][]); ++extern void _dv_quant_x86(dv_coeff_t *block,int qno,int klass,uint8_t *dv_quant_offset,uint8_t **dv_quant_shifts); + extern void _dv_quant_x86_64(dv_coeff_t *block,int qno,int klass); + static void quant_248_inverse_std(dv_coeff_t *block,int qno,int klass,dv_248_coeff_t *co); + static void quant_248_inverse_mmx(dv_coeff_t *block,int qno,int klass,dv_248_coeff_t *co); diff --git a/media-libs/libdv/libdv-0.104-r1.ebuild b/media-libs/libdv/libdv-0.104-r1.ebuild index 968690c3e246..d6c3867eb8e3 100644 --- a/media-libs/libdv/libdv-0.104-r1.ebuild +++ b/media-libs/libdv/libdv-0.104-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.104-r1.ebuild,v 1.4 2006/01/14 05:58:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.104-r1.ebuild,v 1.5 2006/02/07 18:06:11 chutzpah Exp $ inherit eutils flag-o-matic @@ -35,6 +35,9 @@ src_unpack() { # big patch.. test here hard and fast then push upstream epatch "${WORKDIR}"/libdv-0.104-pic-fix.patch + # tiny gcc4 fixes + epatch "${FILESDIR}"/${PN}-0.104-gcc4.patch + epunt_cxx #74497 } |