From: Patrick Kursawe Date: Wed, 6 Oct 2004 09:53:12 +0000 (+0000) Subject: Giving a shot at bug #64893 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=45baf5bd4811a790681da26fcc062ca84d1350b1;p=gentoo.git Giving a shot at bug #64893 --- diff --git a/media-video/avifile/ChangeLog b/media-video/avifile/ChangeLog index 4768585bf4a9..6ae0af659779 100644 --- a/media-video/avifile/ChangeLog +++ b/media-video/avifile/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/avifile # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.73 2004/10/06 07:16:50 phosphan Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.74 2004/10/06 09:53:12 phosphan Exp $ + + 06 Oct 2004; Patrick Kursawe +files/throw.patch, + avifile-0.7.41.20041001.ebuild: + Fixing wrong attribute locations in source, see bug #64893 06 Oct 2004; Patrick Kursawe avifile-0.7.41.20041001.ebuild: diff --git a/media-video/avifile/Manifest b/media-video/avifile/Manifest index b571d1cedb6b..76872754fb22 100644 --- a/media-video/avifile/Manifest +++ b/media-video/avifile/Manifest @@ -1,8 +1,8 @@ MD5 6d85afc659f23bb2adcebd144400833d avifile-0.7.38.20030710.ebuild 4488 MD5 b80546f1e5f52f38abec15e91478e999 avifile-0.7.38.20030710-r1.ebuild 4008 MD5 ab24ec7446ec73e983a093e98b7f99df avifile-0.7.32.20030219.ebuild 4062 -MD5 b6a086c7dc5d3ab072e46338b275b471 avifile-0.7.41.20041001.ebuild 3700 -MD5 874e973ac2985e2db9de8d01714ebb3d ChangeLog 12817 +MD5 fec7c1e27e580aa686cb628011d0dc67 avifile-0.7.41.20041001.ebuild 3732 +MD5 146206440dfe82dd5ec2dabeca73bfd8 ChangeLog 12986 MD5 76b95bd390c69f39e5e7b028b3ff69a5 metadata.xml 272 MD5 f003a1fc700f9a79cf12c06d2ac3bedd avifile-0.7.37.20030522-r2.ebuild 4432 MD5 8390bf9de24635d667a5724c2cc0cbe9 files/avifile-0.7.37.20030522-divx.patch 11943 @@ -11,6 +11,7 @@ MD5 88eda2a3289907201d524c557bd8a753 files/digest-avifile-0.7.32.20030219 73 MD5 7a55e6cb72df715c9b822505d5b4b8b0 files/avifile-0.7.38.20030710-2.6.patch 2038 MD5 624ac61f6a4fb9ed9700a7496f2827cb files/avifile-0.7.38.20030710-amd64.patch 466 MD5 21e60c1838b04fa1990fe5538569ac4b files/digest-avifile-0.7.38.20030710-r1 71 +MD5 5eacec0b726584417cbf32d6c88bf0e9 files/throw.patch 7093 MD5 5c7a3ea4957036aa1da3db9880a3ed34 files/flvenc-patch 558 MD5 f2e5938361909893d37d1ce0b80fdbfc files/avifile-x86-gcc34.patch 5247 MD5 769b5c63369a3c1bc5b74abe591731fd files/avifile-0.7.38.20030710-sparc.patch 998 diff --git a/media-video/avifile/avifile-0.7.41.20041001.ebuild b/media-video/avifile/avifile-0.7.41.20041001.ebuild index 93291bfcd7ba..edfdc6af64a6 100644 --- a/media-video/avifile/avifile-0.7.41.20041001.ebuild +++ b/media-video/avifile/avifile-0.7.41.20041001.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.41.20041001.ebuild,v 1.2 2004/10/06 07:16:50 phosphan Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.41.20041001.ebuild,v 1.3 2004/10/06 09:53:12 phosphan Exp $ inherit eutils flag-o-matic @@ -45,6 +45,7 @@ src_unpack() { # make sure pkgconfig file is correct #53183 cd ${S} + epatch ${FILESDIR}/throw.patch rm -f avifile.pc sed -i "/^includedir=/s:avifile$:avifile-${PV:0:3}:" avifile.pc.in } diff --git a/media-video/avifile/files/throw.patch b/media-video/avifile/files/throw.patch new file mode 100644 index 000000000000..696aaaa16cec --- /dev/null +++ b/media-video/avifile/files/throw.patch @@ -0,0 +1,222 @@ +diff -ru avifile-0.7-0.7.41/include/avm_cpuinfo.h avifile-0.7-0.7.41.new/include/avm_cpuinfo.h +--- avifile-0.7-0.7.41/include/avm_cpuinfo.h 2003-05-25 00:44:03.000000000 +0200 ++++ avifile-0.7-0.7.41.new/include/avm_cpuinfo.h 2004-10-06 11:43:22.935747117 +0200 +@@ -47,7 +47,7 @@ + extern "C" { + #endif /* __cplusplus */ + +-static inline int avm_is_mmx_state() __THROW ++__THROW static inline int avm_is_mmx_state() + { + #ifdef ARCH_X86 + if (freq.HaveMMX()) +@@ -66,7 +66,7 @@ + * Returns duration of time interval between two timestamps, received + * with longcount(). + */ +-static inline float to_float(int64_t tend, int64_t tbegin) __THROW ++__THROW static inline float to_float(int64_t tend, int64_t tbegin) + { + return float((tend - tbegin) / (double)freq / 1000.); + } +diff -ru avifile-0.7-0.7.41/include/utils.h avifile-0.7-0.7.41.new/include/utils.h +--- avifile-0.7-0.7.41/include/utils.h 2002-09-24 09:19:22.000000000 +0200 ++++ avifile-0.7-0.7.41.new/include/utils.h 2004-10-06 11:43:22.936746979 +0200 +@@ -38,7 +38,7 @@ + * function to retrieve/store data in machine independent format + * - right now dump implementation - as we could check functionality + */ +-static inline uint16_t avm_get_le16(const void* p) __THROW { ++__THROW static inline uint16_t avm_get_le16(const void* p) { + #ifdef WORDS_BIGENDIAN + const uint8_t* c = (const uint8_t*) p; + return c[0] | c[1] << 8; +@@ -47,7 +47,7 @@ + #endif + } + +-static inline uint8_t* avm_set_le16(void* p, uint16_t v) __THROW { ++__THROW static inline uint8_t* avm_set_le16(void* p, uint16_t v) { + uint8_t* b = (uint8_t*) p; + #ifdef WORDS_BIGENDIAN + b[0] = v & 0xff; +@@ -58,7 +58,7 @@ + return b; + } + +-static inline uint32_t avm_get_le32(const void* p) __THROW { ++__THROW static inline uint32_t avm_get_le32(const void* p) { + #ifdef WORDS_BIGENDIAN + const uint8_t* c = (const uint8_t*) p; + return c[0] | c[1] << 8 | c[2] << 16 | c[3] << 24; +@@ -67,7 +67,7 @@ + #endif + } + +-static inline uint8_t* avm_set_le32(void* p, uint32_t v) __THROW { ++__THROW static inline uint8_t* avm_set_le32(void* p, uint32_t v) { + uint8_t* b = (uint8_t*) p; + #ifdef WORDS_BIGENDIAN + b[0] = v & 0xff; +@@ -80,7 +80,7 @@ + return b; + } + +-static inline uint64_t avm_get_le64(const void* p) __THROW { ++__THROW static inline uint64_t avm_get_le64(const void* p) { + #ifdef WORDS_BIGENDIAN + const uint8_t* c = (const uint8_t*) p; + return avm_get_le32(c) | (((uint64_t)avm_get_le32(c + 4)) << 32); +@@ -89,7 +89,7 @@ + #endif + } + +-static inline uint16_t avm_get_be16(const void* p) __THROW { ++__THROW static inline uint16_t avm_get_be16(const void* p) { + #ifdef WORDS_BIGENDIAN + return *(const uint16_t*)p; + #else +@@ -98,14 +98,14 @@ + #endif + } + +-static inline uint8_t* avm_set_be16(void* p, uint16_t v) __THROW { ++__THROW static inline uint8_t* avm_set_be16(void* p, uint16_t v) { + uint8_t* b = (uint8_t*) p; + b[0] = (v >> 8) & 0xff; + b[1] = v & 0xff; + return b; + } + +-static inline uint32_t avm_get_be32(const void* p) __THROW { ++__THROW static inline uint32_t avm_get_be32(const void* p) { + #ifdef WORDS_BIGENDIAN + return *(const uint32_t*)p; + #else +@@ -114,7 +114,7 @@ + #endif + } + +-static inline uint8_t* avm_set_be32(void* p, uint32_t v) __THROW { ++__THROW static inline uint8_t* avm_set_be32(void* p, uint32_t v) { + uint8_t* b = (uint8_t*) p; + b[0] = (v >> 24) & 0xff; + b[1] = (v >> 16) & 0xff; +@@ -123,7 +123,7 @@ + return b; + } + +-static inline uint64_t avm_get_be64(const void* p) __THROW { ++__THROW static inline uint64_t avm_get_be64(const void* p) { + #ifdef WORDS_BIGENDIAN + return *(const uint64_t*)p; + #else +@@ -132,15 +132,15 @@ + #endif + } + +-static inline int avm_img_is_rgb(fourcc_t fmt) __THROW ++__THROW static inline int avm_img_is_rgb(fourcc_t fmt) + { + return ((fmt & 0xffffff00) == IMG_FMT_RGB); + } +-static inline int avm_img_is_bgr(fourcc_t fmt) __THROW ++__THROW static inline int avm_img_is_bgr(fourcc_t fmt) + { + return ((fmt & 0xffffff00) == IMG_FMT_BGR); + } +-static inline int avm_img_get_depth(fourcc_t fmt) __THROW ++__THROW static inline int avm_img_get_depth(fourcc_t fmt) + { + return fmt & 0xff; + } +diff -ru avifile-0.7-0.7.41/lib/common/fcc_type.c avifile-0.7-0.7.41.new/lib/common/fcc_type.c +--- avifile-0.7-0.7.41/lib/common/fcc_type.c 2002-11-01 12:46:58.000000000 +0100 ++++ avifile-0.7-0.7.41.new/lib/common/fcc_type.c 2004-10-06 11:44:05.740822469 +0200 +@@ -4,7 +4,7 @@ + + //#include + +-const char* avm_fcc_name(fourcc_t fcc) __THROW ++__THROW const char* avm_fcc_name(fourcc_t fcc) + { + switch (fcc) + { +@@ -106,7 +106,7 @@ + { 0, "Unknown" } + }; + +-const char *avm_img_format_name(fourcc_t fmt) __THROW ++__THROW const char *avm_img_format_name(fourcc_t fmt) + { + const struct dts* t = data; + +diff -ru avifile-0.7-0.7.41/lib/common/utils.c avifile-0.7-0.7.41.new/lib/common/utils.c +--- avifile-0.7-0.7.41/lib/common/utils.c 2002-07-04 20:59:31.000000000 +0200 ++++ avifile-0.7-0.7.41.new/lib/common/utils.c 2004-10-06 11:45:10.652837913 +0200 +@@ -10,7 +10,7 @@ + uint_t (*localcount)(void); + int64_t (*longcount)(void); + +-WAVEFORMATEX* avm_get_leWAVEFORMATEX(WAVEFORMATEX* wf) __THROW ++__THROW WAVEFORMATEX* avm_get_leWAVEFORMATEX(WAVEFORMATEX* wf) + { + wf->wFormatTag = avm_get_le16(&wf->wFormatTag); + wf->nChannels = avm_get_le16(&wf->nChannels); +@@ -22,7 +22,7 @@ + return wf; + } + +-BITMAPINFOHEADER* avm_get_leBITMAPINFOHEADER(BITMAPINFOHEADER* bi) __THROW ++__THROW BITMAPINFOHEADER* avm_get_leBITMAPINFOHEADER(BITMAPINFOHEADER* bi) + { + bi->biSize = avm_get_le32(&bi->biSize); + bi->biWidth = avm_get_le32(&bi->biWidth); +@@ -44,7 +44,7 @@ + * (Note: on solaris, usleep is not thread-safe) + */ + #ifndef WIN32 +-int avm_usleep(unsigned long delay) __THROW ++__THROW int avm_usleep(unsigned long delay) + { + #if HAVE_NANOSLEEP + struct timespec tsp; +@@ -62,7 +62,7 @@ + * Solaris (maybe other operating systems, too) does not have avm_setenv(), + * and avm_unsetenv() in libc, provide our own implementation. + */ +-int avm_setenv(const char *name, const char *value, int overwrite) __THROW ++__THROW int avm_setenv(const char *name, const char *value, int overwrite) + { + #if HAVE_SETENV + return setenv(name, value, overwrite); +@@ -80,7 +80,7 @@ + #endif + } + +-void avm_unsetenv(const char *name) __THROW ++__THROW void avm_unsetenv(const char *name) + { + #if HAVE_UNSETENV + unsetenv(name); +diff -ru avifile-0.7-0.7.41/lib/common/wave_type.c avifile-0.7-0.7.41.new/lib/common/wave_type.c +--- avifile-0.7-0.7.41/lib/common/wave_type.c 2002-11-29 14:09:46.000000000 +0100 ++++ avifile-0.7-0.7.41.new/lib/common/wave_type.c 2004-10-06 11:45:44.497153438 +0200 +@@ -3,7 +3,7 @@ + #include + #include + +-const char* avm_wave_format_name(short fmt) __THROW ++__THROW const char* avm_wave_format_name(short fmt) + { + switch ((unsigned short)fmt) + { +@@ -46,7 +46,7 @@ + } + } + +-char* avm_wave_format(char* buf, uint_t s, const WAVEFORMATEX* wf) __THROW ++__THROW char* avm_wave_format(char* buf, uint_t s, const WAVEFORMATEX* wf) + { + if (buf) + {