Continuing with #64893

3 files changed, 30 insertions, 27 deletions

diff --git a/media-video/avifile/ChangeLog b/media-video/avifile/ChangeLog
index 6ae0af659779..1fa52a6bd787 100644
--- a/media-video/avifile/ChangeLog
+++ b/media-video/avifile/ChangeLog
@@ -1,6 +1,9 @@
 # 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.74 2004/10/06 09:53:12 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.75 2004/10/06 19:57:31 phosphan Exp $
+
+  06 Oct 2004; Patrick Kursawe <phosphan@gentoo.org> files/throw.patch:
+  Patch was broken (bug #64893)
 
   06 Oct 2004; Patrick Kursawe <phosphan@gentoo.org> +files/throw.patch,
   avifile-0.7.41.20041001.ebuild:
diff --git a/media-video/avifile/Manifest b/media-video/avifile/Manifest
index 76872754fb22..f0642917eaf0 100644
--- a/media-video/avifile/Manifest
+++ b/media-video/avifile/Manifest
@@ -2,7 +2,7 @@ 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 fec7c1e27e580aa686cb628011d0dc67 avifile-0.7.41.20041001.ebuild 3732
-MD5 146206440dfe82dd5ec2dabeca73bfd8 ChangeLog 12986
+MD5 12a9c52bb1140a0292fa29449350b66a ChangeLog 13091
 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,7 +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 cfc5acc6aea0cf9e0572338125204b1f files/throw.patch 6925
 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/files/throw.patch b/media-video/avifile/files/throw.patch
index 696aaaa16cec..6b80bcaa5e1e 100644
--- a/media-video/avifile/files/throw.patch
+++ b/media-video/avifile/files/throw.patch
@@ -6,7 +6,7 @@ diff -ru avifile-0.7-0.7.41/include/avm_cpuinfo.h avifile-0.7-0.7.41.new/include
  #endif /* __cplusplus */
  
 -static inline int avm_is_mmx_state() __THROW
-+__THROW static inline int avm_is_mmx_state()
++ static inline int avm_is_mmx_state()
  {
  #ifdef ARCH_X86
      if (freq.HaveMMX())
@@ -15,7 +15,7 @@ diff -ru avifile-0.7-0.7.41/include/avm_cpuinfo.h avifile-0.7-0.7.41.new/include
   *  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)
++ static inline float to_float(int64_t tend, int64_t tbegin)
  {
      return float((tend - tbegin) / (double)freq / 1000.);
  }
@@ -27,7 +27,7 @@ diff -ru avifile-0.7-0.7.41/include/utils.h avifile-0.7-0.7.41.new/include/utils
   * - 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) {
++ 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;
@@ -36,7 +36,7 @@ diff -ru avifile-0.7-0.7.41/include/utils.h avifile-0.7-0.7.41.new/include/utils
  }
  
 -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) {
++ 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;
@@ -45,7 +45,7 @@ diff -ru avifile-0.7-0.7.41/include/utils.h avifile-0.7-0.7.41.new/include/utils
  }
  
 -static inline uint32_t avm_get_le32(const void* p) __THROW {
-+__THROW static inline uint32_t avm_get_le32(const void* p) {
++ 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;
@@ -54,7 +54,7 @@ diff -ru avifile-0.7-0.7.41/include/utils.h avifile-0.7-0.7.41.new/include/utils
  }
  
 -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) {
++ 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;
@@ -63,7 +63,7 @@ diff -ru avifile-0.7-0.7.41/include/utils.h avifile-0.7-0.7.41.new/include/utils
  }
  
 -static inline uint64_t avm_get_le64(const void* p) __THROW {
-+__THROW static inline uint64_t avm_get_le64(const void* p) {
++ 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);
@@ -72,7 +72,7 @@ diff -ru avifile-0.7-0.7.41/include/utils.h avifile-0.7-0.7.41.new/include/utils
  }
  
 -static inline uint16_t avm_get_be16(const void* p) __THROW {
-+__THROW static inline uint16_t avm_get_be16(const void* p) {
++ static inline uint16_t avm_get_be16(const void* p) {
  #ifdef WORDS_BIGENDIAN
      return *(const uint16_t*)p;
  #else
@@ -81,7 +81,7 @@ diff -ru avifile-0.7-0.7.41/include/utils.h avifile-0.7-0.7.41.new/include/utils
  }
  
 -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) {
++ 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;
@@ -89,7 +89,7 @@ diff -ru avifile-0.7-0.7.41/include/utils.h avifile-0.7-0.7.41.new/include/utils
  }
  
 -static inline uint32_t avm_get_be32(const void* p) __THROW  {
-+__THROW static inline uint32_t avm_get_be32(const void* p) {
++ static inline uint32_t avm_get_be32(const void* p) {
  #ifdef WORDS_BIGENDIAN
      return *(const uint32_t*)p;
  #else
@@ -98,7 +98,7 @@ diff -ru avifile-0.7-0.7.41/include/utils.h avifile-0.7-0.7.41.new/include/utils
  }
  
 -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) {
++ 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;
@@ -107,7 +107,7 @@ diff -ru avifile-0.7-0.7.41/include/utils.h avifile-0.7-0.7.41.new/include/utils
  }
  
 -static inline uint64_t avm_get_be64(const void* p) __THROW  {
-+__THROW static inline uint64_t avm_get_be64(const void* p)  {
++ static inline uint64_t avm_get_be64(const void* p)  {
  #ifdef WORDS_BIGENDIAN
      return *(const uint64_t*)p;
  #else
@@ -116,17 +116,17 @@ diff -ru avifile-0.7-0.7.41/include/utils.h avifile-0.7-0.7.41.new/include/utils
  }
  
 -static inline int avm_img_is_rgb(fourcc_t fmt) __THROW
-+__THROW static inline int avm_img_is_rgb(fourcc_t fmt)
++ 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)
++ 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)
++ static inline int avm_img_get_depth(fourcc_t fmt)
  {
      return fmt & 0xff;
  }
@@ -138,7 +138,7 @@ diff -ru avifile-0.7-0.7.41/lib/common/fcc_type.c avifile-0.7-0.7.41.new/lib/com
  //#include <stdio.h>
  
 -const char* avm_fcc_name(fourcc_t fcc) __THROW
-+__THROW const char* avm_fcc_name(fourcc_t fcc)
++ const char* avm_fcc_name(fourcc_t fcc)
  {
      switch (fcc)
      {
@@ -147,7 +147,7 @@ diff -ru avifile-0.7-0.7.41/lib/common/fcc_type.c avifile-0.7-0.7.41.new/lib/com
  };
  
 -const char *avm_img_format_name(fourcc_t fmt) __THROW
-+__THROW const char *avm_img_format_name(fourcc_t fmt)
++ const char *avm_img_format_name(fourcc_t fmt)
  {
      const struct dts* t = data;
  
@@ -159,7 +159,7 @@ diff -ru avifile-0.7-0.7.41/lib/common/utils.c avifile-0.7-0.7.41.new/lib/common
  int64_t (*longcount)(void);
  
 -WAVEFORMATEX* avm_get_leWAVEFORMATEX(WAVEFORMATEX* wf) __THROW
-+__THROW WAVEFORMATEX* avm_get_leWAVEFORMATEX(WAVEFORMATEX* wf)
++ WAVEFORMATEX* avm_get_leWAVEFORMATEX(WAVEFORMATEX* wf)
  {
      wf->wFormatTag	= avm_get_le16(&wf->wFormatTag);
      wf->nChannels	= avm_get_le16(&wf->nChannels);
@@ -168,7 +168,7 @@ diff -ru avifile-0.7-0.7.41/lib/common/utils.c avifile-0.7-0.7.41.new/lib/common
  }
  
 -BITMAPINFOHEADER* avm_get_leBITMAPINFOHEADER(BITMAPINFOHEADER* bi) __THROW
-+__THROW BITMAPINFOHEADER* avm_get_leBITMAPINFOHEADER(BITMAPINFOHEADER* bi)
++ BITMAPINFOHEADER* avm_get_leBITMAPINFOHEADER(BITMAPINFOHEADER* bi)
  {
      bi->biSize		= avm_get_le32(&bi->biSize);
      bi->biWidth		= avm_get_le32(&bi->biWidth);
@@ -177,7 +177,7 @@ diff -ru avifile-0.7-0.7.41/lib/common/utils.c avifile-0.7-0.7.41.new/lib/common
   */
  #ifndef WIN32
 -int avm_usleep(unsigned long delay) __THROW
-+__THROW int avm_usleep(unsigned long delay)
++ int avm_usleep(unsigned long delay)
  {
  #if   HAVE_NANOSLEEP
      struct timespec tsp;
@@ -186,7 +186,7 @@ diff -ru avifile-0.7-0.7.41/lib/common/utils.c avifile-0.7-0.7.41.new/lib/common
   * 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)
++ int avm_setenv(const char *name, const char *value, int overwrite)
  {
  #if HAVE_SETENV
      return setenv(name, value, overwrite);
@@ -195,7 +195,7 @@ diff -ru avifile-0.7-0.7.41/lib/common/utils.c avifile-0.7-0.7.41.new/lib/common
  }
  
 -void avm_unsetenv(const char *name) __THROW
-+__THROW void avm_unsetenv(const char *name) 
++ void avm_unsetenv(const char *name) 
  {
  #if HAVE_UNSETENV
      unsetenv(name);
@@ -207,7 +207,7 @@ diff -ru avifile-0.7-0.7.41/lib/common/wave_type.c avifile-0.7-0.7.41.new/lib/co
  #include <stdio.h>
  
 -const char* avm_wave_format_name(short fmt) __THROW
-+__THROW const char* avm_wave_format_name(short fmt) 
++ const char* avm_wave_format_name(short fmt) 
  {
      switch ((unsigned short)fmt)
      {
@@ -216,7 +216,7 @@ diff -ru avifile-0.7-0.7.41/lib/common/wave_type.c avifile-0.7-0.7.41.new/lib/co
  }
  
 -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)
++ char* avm_wave_format(char* buf, uint_t s, const WAVEFORMATEX* wf)
  {
      if (buf)
      {