Version bump with huge build fixes patch as the release is broken upstream. Thanks...

Package-Manager: portage-2.1_rc4-r3

diff --git a/media-libs/libtheora/ChangeLog b/media-libs/libtheora/ChangeLog
index d01e39df954674e0a21ce7ddce7e5d15cdcbcaa9..863456e7334c1a412f2b05071feb139c1acc3fc6 100644 (file)
--- a/media-libs/libtheora/ChangeLog
+++ b/media-libs/libtheora/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libtheora
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.38 2006/05/25 02:58:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.39 2006/06/07 12:01:51 flameeyes Exp $
+
+*libtheora-1.0_alpha6 (07 Jun 2006)
+
+  07 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libtheora-1.0alpha6-buildfixes.patch, +libtheora-1.0_alpha6.ebuild:
+  Version bump with huge build fixes patch as the release is broken upstream.
+  Thanks to Ian Leonard in bug #135221 for the notice and part of the patches.
 
   25 May 2006; Diego Pettenò <flameeyes@gentoo.org>
   libtheora-1.0_alpha5.ebuild:

diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index 9828c747cbd1f04d762e11215d32970fbdc23502..6462b09e0223c21089b8cec8cb71896b5dee7522 100644 (file)
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -5,9 +5,14 @@ AUX libtheora-1.0_alpha4-enable-flags.patch 876 RMD160 e108485b2129f52f18b316162
 MD5 e0d4279bd99d241bd9414fcab198c847 files/libtheora-1.0_alpha4-enable-flags.patch 876
 RMD160 e108485b2129f52f18b31616276dcc9d6a1ac3be files/libtheora-1.0_alpha4-enable-flags.patch 876
 SHA256 387a6725b488717bcc0738cd4a0707193aba5e271e8cde20a63840157ef6562c files/libtheora-1.0_alpha4-enable-flags.patch 876
+AUX libtheora-1.0alpha6-buildfixes.patch 3977 RMD160 58061a155a4fbdb35ec87288d332001906ba457e SHA1 972fd0c16c2ac9fa15996cd54ad2b34034ee27ed SHA256 d2770fadcef32f8c4ea585865974ad82b8e55b4c6b874168d258b5c65e5d2701
+MD5 1eb2cfa449ce65cb36b04b1d8c93933f files/libtheora-1.0alpha6-buildfixes.patch 3977
+RMD160 58061a155a4fbdb35ec87288d332001906ba457e files/libtheora-1.0alpha6-buildfixes.patch 3977
+SHA256 d2770fadcef32f8c4ea585865974ad82b8e55b4c6b874168d258b5c65e5d2701 files/libtheora-1.0alpha6-buildfixes.patch 3977
 DIST libtheora-1.0alpha3.tar.bz2 871744
 DIST libtheora-1.0alpha4.tar.bz2 1755132
 DIST libtheora-1.0alpha5.tar.bz2 1765512 RMD160 47317a42ef6165a167dc45bb697d6528e1209469 SHA1 8e740ccd7219861de83ac17ecceb13c02ed7e24a SHA256 d219151452677ace53998f7401d106fd615aa607575740cc26442d7b8622d2f2
+DIST libtheora-1.0alpha6.tar.bz2 1559318 RMD160 b0d81dab81ec96d51e2d6a4c047beff807de6077 SHA1 0fa7314a432e60c6178a7d98b6408c7a950155ed SHA256 4e6044cb24d2cdb42e5d9402c709644886e8761f7b166781469ffda44240da92
 EBUILD libtheora-1.0_alpha3.ebuild 920 RMD160 aa6b33978c648b925b7a1329f272d9216f8e3619 SHA1 2df7e4331fe3925d0611eb066671fa6b34587946 SHA256 d980cb879ceef328c1b01fad86f44e6693da89bbf8563178528972fab14c0998
 MD5 826568d3db817852b40b6ac12d9962bd libtheora-1.0_alpha3.ebuild 920
 RMD160 aa6b33978c648b925b7a1329f272d9216f8e3619 libtheora-1.0_alpha3.ebuild 920
@@ -20,10 +25,14 @@ EBUILD libtheora-1.0_alpha5.ebuild 1240 RMD160 32bb1624140b5b3719bee6fde37f7ccc7
 MD5 ec899c4e644f4fad96d375d369d6d05e libtheora-1.0_alpha5.ebuild 1240
 RMD160 32bb1624140b5b3719bee6fde37f7ccc7a38d556 libtheora-1.0_alpha5.ebuild 1240
 SHA256 81ed04561ac6d5132610964694ea187a65cf58b17bc9df3d779f53c981935630 libtheora-1.0_alpha5.ebuild 1240
-MISC ChangeLog 4915 RMD160 7a516b8c5138a689454d288f8e9f7aa687da40f5 SHA1 923a5722fdf881961156f452f2a5eb7c021c8499 SHA256 34defe6dbb7d303e07c32fa31eb9855f6b985557fb0fc759b59efff5c41eb374
-MD5 ab08cb2635bc2af0c24b7b5e893163da ChangeLog 4915
-RMD160 7a516b8c5138a689454d288f8e9f7aa687da40f5 ChangeLog 4915
-SHA256 34defe6dbb7d303e07c32fa31eb9855f6b985557fb0fc759b59efff5c41eb374 ChangeLog 4915
+EBUILD libtheora-1.0_alpha6.ebuild 1325 RMD160 f5ce6414bc5e1c6e78e7ec5030d7b8cc81f85f13 SHA1 880ab8add880c2e0b51db1b94ded5ce5608c2d03 SHA256 cb7d5510962258f80b198f7bc9dcf5f96523dad74538b3ace1adbc574f3a1c2c
+MD5 ee4b565a79bb2d9425a209c7f55c4335 libtheora-1.0_alpha6.ebuild 1325
+RMD160 f5ce6414bc5e1c6e78e7ec5030d7b8cc81f85f13 libtheora-1.0_alpha6.ebuild 1325
+SHA256 cb7d5510962258f80b198f7bc9dcf5f96523dad74538b3ace1adbc574f3a1c2c libtheora-1.0_alpha6.ebuild 1325
+MISC ChangeLog 5240 RMD160 c7aec3b5732caaee0e8f9809d72612551d276ed2 SHA1 ac3a7d59f6baaa88c4e4c04e7fafce4b37cd4771 SHA256 4167805543bba1a5cc41240c672c4f472e442608c78677497994dc6004cecb31
+MD5 b37aa7e030014f993f78da66da70b3eb ChangeLog 5240
+RMD160 c7aec3b5732caaee0e8f9809d72612551d276ed2 ChangeLog 5240
+SHA256 4167805543bba1a5cc41240c672c4f472e442608c78677497994dc6004cecb31 ChangeLog 5240
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
@@ -37,10 +46,13 @@ SHA256 89537af80b260bd31e330de057b218d1fb5f5897d737a133372296d1b52ce38b files/di
 MD5 b42fdf6a85925cb2b4b8b6700733e220 files/digest-libtheora-1.0_alpha5 265
 RMD160 ea6d8a913595accf46482a6e25c843dcae939b56 files/digest-libtheora-1.0_alpha5 265
 SHA256 5ac9fa8a611d5eacdc5313b206a352e754b075de1b10d2322479ebbea3f4a35d files/digest-libtheora-1.0_alpha5 265
+MD5 06ec218ca2c06cddc319fb505528640c files/digest-libtheora-1.0_alpha6 265
+RMD160 dd56d04d82b9c5e471a4908d09e50f9af736acf8 files/digest-libtheora-1.0_alpha6 265
+SHA256 749c39f8feedca85f21af8969bc98c8c33c3d786faf52a5ed656dd7c063f1c00 files/digest-libtheora-1.0_alpha6 265
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEdR1jAiZjviIA2XgRAsRKAKDTow3GMUtZYvMQAj1JcqdSSLpNyQCfZ/J+
-hVAUvHBC34kKF2eqyJ4cKh0=
-=Q9Uv
+iD8DBQFEhsA2AiZjviIA2XgRAmJOAKCLce8/W4oBVWYCBskbhpaV3ZI5wgCggjz8
+7IhK2TgaM7JTijZMGtdcUXk=
+=5pMt
 -----END PGP SIGNATURE-----

diff --git a/media-libs/libtheora/files/digest-libtheora-1.0_alpha6 b/media-libs/libtheora/files/digest-libtheora-1.0_alpha6
new file mode 100644 (file)
index 0000000..5beb407
--- /dev/null
+++ b/media-libs/libtheora/files/digest-libtheora-1.0_alpha6
@@ -0,0 +1,3 @@
+MD5 ff8d0c112fdab66930acf42c423d2536 libtheora-1.0alpha6.tar.bz2 1559318
+RMD160 b0d81dab81ec96d51e2d6a4c047beff807de6077 libtheora-1.0alpha6.tar.bz2 1559318
+SHA256 4e6044cb24d2cdb42e5d9402c709644886e8761f7b166781469ffda44240da92 libtheora-1.0alpha6.tar.bz2 1559318

diff --git a/media-libs/libtheora/files/libtheora-1.0alpha6-buildfixes.patch b/media-libs/libtheora/files/libtheora-1.0alpha6-buildfixes.patch
new file mode 100644 (file)
index 0000000..15e90a9
--- /dev/null
+++ b/media-libs/libtheora/files/libtheora-1.0alpha6-buildfixes.patch
@@ -0,0 +1,113 @@
+Complete build fixes so that 1.0_alpha6 of libtheora actually _builds_.
+
+Thanks to Ian Leonard for some of the patches here merged.
+Index: libtheora-1.0alpha6/configure.ac
+===================================================================
+--- libtheora-1.0alpha6.orig/configure.ac
++++ libtheora-1.0alpha6/configure.ac
+@@ -115,12 +115,14 @@ if test "x${ac_enable_asm}" = xyes; then
+               if test ! "x$target_vendor" = "xapple"; then
+                 cpu_x86_32=yes 
+                 cpu_optimization="32 bit x86"
++              AC_DEFINE([USE_ASM], [],  [make use of asm optimization])
+               fi
+       ;;
+       x86_64)
+               cpu_x86_64=yes
+               cpu_optimization="64 bit x86"
+-      ;;
++      AC_DEFINE([USE_ASM], [],  [make use of asm optimization])       
++    ;;
+   esac
+ else
+   cpu_optimization="disabled"
+Index: libtheora-1.0alpha6/lib/encoder_disabled.c
+===================================================================
+--- /dev/null
++++ libtheora-1.0alpha6/lib/encoder_disabled.c
+@@ -0,0 +1,51 @@
++/********************************************************************
++ *                                                                  *
++ * THIS FILE IS PART OF THE OggTheora SOFTWARE CODEC SOURCE CODE.   *
++ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
++ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
++ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
++ *                                                                  *
++ * THE Theora SOURCE CODE IS COPYRIGHT (C) 2002-2003                *
++ * by the Xiph.Org Foundation http://www.xiph.org/                  *
++ *                                                                  *
++ ********************************************************************
++
++  function:
++  last mod: $Id: libtheora-1.0alpha6-buildfixes.patch,v 1.1 2006/06/07 12:01:51 flameeyes Exp $
++
++ ********************************************************************/
++
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
++#include "toplevel_lookup.h"
++#include "toplevel.h"
++
++int theora_encode_init(theora_state *th, theora_info *c){
++  return OC_DISABLED;
++}
++
++int theora_encode_YUVin(theora_state *t, yuv_buffer *yuv){
++  return OC_DISABLED;
++}
++
++int theora_encode_packetout( theora_state *t, int last_p, ogg_packet *op){
++  return OC_DISABLED;
++}
++
++int theora_encode_header(theora_state *t, ogg_packet *op){
++  return OC_DISABLED;
++}
++
++int theora_encode_comment(theora_comment *tc, ogg_packet *op){
++  return OC_DISABLED;
++}
++
++int theora_encode_tables(theora_state *t, ogg_packet *op){
++  return OC_DISABLED;
++}
++
++void theora_encoder_clear (CP_INSTANCE * cpi)
++{
++}
+Index: libtheora-1.0alpha6/lib/cpu.c
+===================================================================
+--- libtheora-1.0alpha6.orig/lib/cpu.c
++++ libtheora-1.0alpha6/lib/cpu.c
+@@ -26,10 +26,10 @@ cpuid(ogg_int32_t op, ogg_uint32_t *out_
+                 "cpuid         \n\t"
+                 "movl %%ebx,%1 \n\t"
+                 "popq %%rbx"        
+-              : "=a" (*eax),         
+-                "=r" (*ebx),         
+-                "=c" (*ecx),         
+-                "=d" (*edx)          
++              : "=a" (*out_eax),         
++                "=r" (*out_ebx),         
++                "=c" (*out_ecx),         
++                "=d" (*out_edx)          
+               : "a" (op)            
+               : "cc");
+ # elif defined(__i386__)
+@@ -37,10 +37,10 @@ cpuid(ogg_int32_t op, ogg_uint32_t *out_
+                 "cpuid         \n\t"
+                 "movl %%ebx,%1 \n\t"
+                 "popl %%ebx"        
+-              : "=a" (*eax),         
+-                "=r" (*ebx),         
+-                "=c" (*ecx),         
+-                "=d" (*edx)          
++              : "=a" (*out_eax),         
++                "=r" (*out_ebx),         
++                "=c" (*out_ecx),         
++                "=d" (*out_edx)          
+               : "a" (op)            
+               : "cc");
+ # elif defined(WIN32)

diff --git a/media-libs/libtheora/libtheora-1.0_alpha6.ebuild b/media-libs/libtheora/libtheora-1.0_alpha6.ebuild
new file mode 100644 (file)
index 0000000..ba648c7
--- /dev/null
+++ b/media-libs/libtheora/libtheora-1.0_alpha6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.0_alpha6.ebuild,v 1.1 2006/06/07 12:01:51 flameeyes Exp $
+
+inherit flag-o-matic libtool autotools
+
+DESCRIPTION="The Theora Video Compression Codec"
+HOMEPAGE="http://www.theora.org/"
+SRC_URI="http://downloads.xiph.org/releases/theora/${P/_}.tar.bz2"
+
+LICENSE="xiph"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="encode doc"
+
+RDEPEND=">=media-libs/libogg-1.1.0
+       encode? ( >=media-libs/libvorbis-1.0.1 )"
+DEPEND="${RDEPEND}
+       doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/${P/_}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       sed -i -e 's:SUBDIRS = .*:SUBDIRS = lib include doc:' Makefile.am
+
+       epatch "${FILESDIR}/${P/_/}-buildfixes.patch"
+       AT_M4DIR="m4" eautoreconf
+
+       elibtoolize
+}
+
+src_compile() {
+       # bug #75403, -O3 needs to be filtered to -O2
+       replace-flags -O3 -O2
+
+       use doc || export ac_cv_prog_HAVE_DOXYGEN="false"
+
+       econf \
+               $(use_enable encode) \
+               --enable-shared \
+               --disable-dependency-tracking \
+               || die "configure failed"
+       emake || die "make failed"
+}
+
+src_install() {
+       make \
+               DESTDIR="${D}" \
+               docdir=usr/share/doc/${PF} \
+               install || die "make install failed"
+
+       dodoc README
+}