Don't run encoder tests without use encode, bug #212315

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.3 x86_64

4 files changed, 42 insertions, 11 deletions

diff --git a/media-libs/libtheora/ChangeLog b/media-libs/libtheora/ChangeLog
index 4eb9c4c8074b..3bb328b0d1ff 100644
--- a/media-libs/libtheora/ChangeLog
+++ b/media-libs/libtheora/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libtheora
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.76 2008/06/16 11:47:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.77 2008/09/07 22:02:08 aballier Exp $
+
+  07 Sep 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/libtheora-1.0_beta3-tests.patch, libtheora-1.0_beta3-r1.ebuild:
+  Don't run encoder tests without use encode, bug #212315
 
   16 Jun 2008; Diego Pettenò <flameeyes@gentoo.org>
   libtheora-1.0_beta3-r1.ebuild:
diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index d4e18a8d3290..05cb7bc67697 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -5,19 +5,20 @@ AUX libtheora-1.0_alpha6-pic-fix.patch 10712 RMD160 bb24bd1268ea4bbce8bdfc4ae21c
 AUX libtheora-1.0_beta2-flags.patch 763 RMD160 eb1d55ab98e5eae570845baf17eb93301271596c SHA1 b79a4338454e832d2b46df55bae1de967919eb24 SHA256 7efb7aec3e472914ffc0facbdc9769e088e5d69e285254d19f353555ca90c7d6
 AUX libtheora-1.0_beta2-pic-fix.patch 4578 RMD160 0d44682d6c7897ade44d67996b5e1a95c2aba17c SHA1 b235d4f11d81bac49a89819643d5d3a4b29ceccf SHA256 c613bece1d08b51e95031b0de4a8a0d1e3271382480bbe7e77b6bc973f2f6c4c
 AUX libtheora-1.0_beta3-pic-fix.patch 3410 RMD160 01de450df2b8094d565c743efaf8fc95dd83f068 SHA1 55a3f8c007dcd6a23cd24e0d36c4e22329812cb5 SHA256 2d791cabf4c5a130fed38261d52ef626a212e002cb40c52a38c1e353f5f462bd
+AUX libtheora-1.0_beta3-tests.patch 812 RMD160 08c4e8ba16743c0f83e49a1930b319365de74bf9 SHA1 2cc262d6e05b1153dcc2cfc16b8e10b4768809b8 SHA256 364fbc5cb84e85c4644d542da412b4c7d362069782d6da9a9ba7876f1da9a1d1
 AUX libtheora-1.0alpha6-buildfixes.patch 3977 RMD160 58061a155a4fbdb35ec87288d332001906ba457e SHA1 972fd0c16c2ac9fa15996cd54ad2b34034ee27ed SHA256 d2770fadcef32f8c4ea585865974ad82b8e55b4c6b874168d258b5c65e5d2701
 DIST libtheora-1.0alpha6.tar.bz2 1559318 RMD160 b0d81dab81ec96d51e2d6a4c047beff807de6077 SHA1 0fa7314a432e60c6178a7d98b6408c7a950155ed SHA256 4e6044cb24d2cdb42e5d9402c709644886e8761f7b166781469ffda44240da92
 DIST libtheora-1.0beta2.tar.bz2 1774632 RMD160 544bdb94e09fdfcfb76b603dd32c40ed5d6103a2 SHA1 d58490cc507e1840fbdb432a1dd12433644cc04b SHA256 8bd514ddf5836d82a97f9ff2a4b606c9ccf6ed749055a9fb79f7a335c0ef4b20
 DIST libtheora-1.0beta3.tar.bz2 1531449 RMD160 5308039be56064c7a54d464b0dc32f31542a34d8 SHA1 01f0a5adcdde5bdc5b7e700b5975067af60b456c SHA256 9d69299b06c1ec840b36bdf3951d86dc40d23c50f1d898ea633afa594ec43da7
 EBUILD libtheora-1.0_alpha6-r1.ebuild 1656 RMD160 8b65cb3a7b0de1681d690b50505e5f3cc150dbcd SHA1 14236c5ee2980da1d3007dd9634a6c1ef7ea71bd SHA256 bc83edd34bb1892403fafa39f60f5855c4e82ad9d91effdb7351cb9208f94d97
 EBUILD libtheora-1.0_beta2-r1.ebuild 1412 RMD160 2e3b2d5359a8008ad1e0c260d26a24f8e1478555 SHA1 ea21c17e27ebc73fff68f62b83307494bc23766b SHA256 4e4dfd7ef8a186ddd0551953c990e5738f095474cc2cf42644caa6c6fc8a7980
-EBUILD libtheora-1.0_beta3-r1.ebuild 1698 RMD160 8e82bac538e02a2624ad2bf7fa32ae630a19163d SHA1 4536725b9976dec24a3822080bf340824667c7d3 SHA256 d1207908eeafcfc5fba76ce9b26ef347747f62526b23a7f093140582f4435d52
-MISC ChangeLog 11181 RMD160 ee1a2aac2fd4bc06431ec844f3ba1650f84c2e6a SHA1 3c9766df6ca41f56bed3016c7568757bdfdf7018 SHA256 0eb577ca43fe2f09626536b2d30936fd3fbef8dce479dd40ba65071d4f01a639
+EBUILD libtheora-1.0_beta3-r1.ebuild 1613 RMD160 8b3285f04ac03a8a3f2d6060bb3c1ce970f52c1c SHA1 f5795cf5336ce8cb27755fdb40ef452558a2a1a9 SHA256 cfa5afaf35866be5d352a940f6cef7c421f9276e39077db42643581fc0cfadb1
+MISC ChangeLog 11364 RMD160 4fb12e32bd6fe84ec3682ffd72718006f9b11414 SHA1 dabc9086dda5506882580c88a45e7ddae691273f SHA256 c6905fddc5b014e8a67c4f0faae66886c8ec44cd99b494e8405163839c28d999
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhWUr4ACgkQAiZjviIA2Xj2CwCeP2Jp2xmiZ4lygl1ATOOyYozC
-c60AoORoTeWz1nEZ8/GuN2z47fLM7ePO
-=iXBI
+iEYEARECAAYFAkjET2YACgkQvFcC4BYPU0qmlACeIrBYuuo6U4aMnb2aS+MOjA7l
+YoYAnR0CxCLMY7l8h4PXJ6GSBBeQgmA9
+=1DWL
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libtheora/files/libtheora-1.0_beta3-tests.patch b/media-libs/libtheora/files/libtheora-1.0_beta3-tests.patch
new file mode 100644
index 000000000000..2dcef60d61d1
--- /dev/null
+++ b/media-libs/libtheora/files/libtheora-1.0_beta3-tests.patch
@@ -0,0 +1,29 @@
+https://trac.xiph.org/ticket/1423
+
+Index: libtheora-1.0beta3/tests/Makefile.am
+===================================================================
+--- libtheora-1.0beta3.orig/tests/Makefile.am
++++ libtheora-1.0beta3/tests/Makefile.am
+@@ -13,12 +13,19 @@ test: check
+ 
+ TESTS_ENVIRONMENT = $(VALGRIND_ENVIRONMENT)
+ 
+-TESTS = noop noop_theoraenc noop_theora \
+-	comment comment_theoradec comment_theora \
++TESTS_DEC = noop_theora \
++	comment comment_theoradec comment_theora
++
++TESTS_ENC = noop noop_theoraenc \
+ 	granulepos granulepos_theoraenc granulepos_theora
+ 
+-noinst_PROGRAMS = $(TESTS)
++if THEORA_DISABLE_ENCODE
++TESTS = $(TESTS_DEC)
++else
++TESTS = $(TESTS_DEC) $(TESTS_ENC)
++endif
+ 
++check_PROGRAMS = $(TESTS)
+ # dummy call tests for the current api
+ noop_SOURCES = noop.c
+ noop_LDADD = $(THEORAENC_LIBS)
diff --git a/media-libs/libtheora/libtheora-1.0_beta3-r1.ebuild b/media-libs/libtheora/libtheora-1.0_beta3-r1.ebuild
index 0afea6f9bb69..8b17a4a27114 100644
--- a/media-libs/libtheora/libtheora-1.0_beta3-r1.ebuild
+++ b/media-libs/libtheora/libtheora-1.0_beta3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.0_beta3-r1.ebuild,v 1.2 2008/06/16 11:47:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.0_beta3-r1.ebuild,v 1.3 2008/09/07 22:02:08 aballier Exp $
 
 inherit autotools eutils toolchain-funcs flag-o-matic
 
@@ -26,10 +26,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-1.0_beta2-flags.patch
 	epatch "${FILESDIR}"/${P}-pic-fix.patch
-
-	sed -i -e 's:noinst_PROGRAMS:check_PROGRAMS:' \
-		"${S}"/tests/Makefile.am \
-		|| die "unable to disable tests building"
+	epatch "${FILESDIR}"/${P}-tests.patch
 
 	AT_M4DIR="m4" eautoreconf
 }