Forcing config.h checks to pass, checked that without avidemux present it compiles for me (and others). This is an attempt to fix bug #461962 reported by Peter Norman.

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 32 insertions, 4 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index f176a7beff7c..45f95210dbaa 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/avidemux
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.210 2013/03/17 08:33:00 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.211 2013/03/17 14:22:55 tomwij Exp $
+
+  17 Mar 2013; Tom Wijsman <TomWij@gentoo.org>
+  +files/avidemux-2.6.2-config-h.patch, avidemux-2.6.2.ebuild:
+  Forcing config.h checks to pass, checked that without avidemux present it
+  compiles for me (and others). This is an attempt to fix bug #461962 reported
+  by Peter Norman.
 
   17 Mar 2013; Tom Wijsman <TomWij@gentoo.org> avidemux-2.6.2.ebuild:
   Check for presence of file before changing its permissions. Bug #461962,
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index da6192bd0b50..e4af876426ef 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,8 +1,9 @@
 AUX avidemux-2.5.4-build-plugins-fix.patch 497 SHA256 a470bfa50d86082f4e9ad31c5be630efe9a237f8dd504058278968770635ecef SHA512 f6023e1252463abeee7495c4fb034077ccd21f731c32b0cbb57cadb4880fd68d46a81220fb6553d1bf5af3eae4874adfb13ac17b06c5344144c04bffcf6791ee WHIRLPOOL 86d36e2e9f80623f314352639868d25d19899625424c7a09192a6639877a9acf666c5e9a04b690f5e7b784ba70a580a76988d5a2fd605df375b7bbf096310489
 AUX avidemux-2.5.6-ffmpeg-symbol-visibility.patch 869 SHA256 0ed5a1296fbe20f001657ed63dcbf758cf88aafb75a451c37513b825864956c0 SHA512 57db2ffaad2b4ffc46fac8f46810b1cf028013045392d1633f6e25fc65be6401fd0b5fc0991d09403d6dac39b8aacdf06f966aae70d97a53653ddc1aaa95a9bf WHIRLPOOL 093eec35dd59cb4165527bde0d2335e1ec8a88d1f8ef5cb4e51e88f6ba25204cdf645123b55204f1a8c15a3d066c5eb95f4c4ee24a6af22693a9f8e4b9378c2f
+AUX avidemux-2.6.2-config-h.patch 820 SHA256 a61ca79a2b835371f171d5411d6e4e87ff913761a4f89b495ae0494d1a840fa2 SHA512 4f70050f321f99435475db19f0c81b9bb284585a0c551efde688c030449c592070517b52d8aed5162c454a2199ea19101a5264e0f1fca770a53b459f0c4f7e58 WHIRLPOOL d08844e80cd1b5a8e134c9a32003f4a9a19c2cf2aecd439cb7ce2e849e0203dcb04e91961173a96e52f479ced3011553c4e106656d1d1c3e258b6ae15c4d88b9
 DIST avidemux_2.5.6.tar.gz 14914123 SHA256 d6da7f2c4304368bd9c367a74a464b47d42fee9cada2960e70053d61c1ef9b8b SHA512 8a9dcfc61a396fc4f9f0a213269bcb574de0baa442d3165cfab0fe8e86309e7b0dd2ffe3e2d7ff8a8e6e3fd15da28699e8000367d92da0782fec6d5a38c1d77c WHIRLPOOL fecca87889b19a321a9fe13e734ca11a883c88152e5d59926ecd423b178bb26ef611ee00d8b2897f8a4a36a5c159d6c9f32733bc98fccced08532b8f060bd6ac
 DIST avidemux_2.6.2.tar.gz 17009420 SHA256 67c5676692152094033fbab490fbea24af27d8744496578d1c77957ab103fdb6 SHA512 1ba6f1c751732eec9fdceb2b0728122005ceab4c74ac09d213ebeff4c2af2a0b6ce8737d88e7c43970d1b9ca80cb36ad925efc9e4a487c4f463f1435aee328b3 WHIRLPOOL 0c95e87293251fffb773c8a1996ac015ba0d6f9d36d4f5ae01313c0532d2cf020a3ba0704d0f607347bbf0444e10857d7508fcbd968d62e889d7b62b36b85df7
 EBUILD avidemux-2.5.6-r2.ebuild 4393 SHA256 95fd317399d57acf75cf0baf73fb487c5143b3dd3af4b0aa1537a9b4c4994776 SHA512 bfc5e96966c46bb52d0f9da586b3c5ccb693561c5008c0d06d7921f649fee0a8fe13eca61947793d272e4e661d42c029e57779e4f7630c7db539fd39610b1c11 WHIRLPOOL 591f6ac35e8e83e0454e3545d9a70d76d27d9de3fee4ecdd6adf3cb4488637eaed8091771c193f3fc893e7094c6c659c5fef25985473171a95e54ac3064b7e16
-EBUILD avidemux-2.6.2.ebuild 4923 SHA256 d86e2cd3455f5e471d8664e3d0edc8968fa1db7034d600b0c81e0a1a11f191ae SHA512 131260e5b6236890adc79a121814d373c37475ae32e339eeda7b51a898cb067556a32d82a3788eef4d439275ba8fadccdd73be0e0d2daecf3bb656af2ee51f5e WHIRLPOOL 0bcfde0631996bd3c1cfce32ecc34066adb9fdc4dc3dd164008070c501a9e1842b3d0c5889712cb2916b38b39c5958de1addc3b466d242558c6763d652ea38ce
-MISC ChangeLog 38971 SHA256 1627de4e269aac51610a2838d8081c930736ec1b28d51bc4fedb3216d4314024 SHA512 132ec411d2aa33d20422072acd577e862247b9f2afc7199e4e2ada54acdc3dcb1c90c1e7a484b65ac3caaa389ef0079f7be9bca439a47beeb0f4fdeade6f6637 WHIRLPOOL 36204995e74da05f165dd4282cb69604c94a27ef673889591a842f86ca6c5d701cd3fc0930131ae3b32088b16f8988970c04577ab2e59102f291f8eef9c5b494
+EBUILD avidemux-2.6.2.ebuild 5012 SHA256 b22a98cb41072d134df661dc7e3e63756120467e5afefa1d6b32d717e863ae07 SHA512 c3961e0536e3657c3e152c3107c2854ae475eab71bf474e24d759dca7aa254c5bd4d3316082fa81e90952caa8fd061a082f23f448132b3fa4f8b617fa39307df WHIRLPOOL 1e7665dbddd5a9230e021391fdde8b5f85b188f133a92521ed28c748fa303522328516861709fa7e4cc7356d6525cf068c448e9a702a0071e62b50a68e29cf74
+MISC ChangeLog 39256 SHA256 aa9a83a68910899fdc653a5b394d435ec2797b8d0ef2909256627aa85e275c96 SHA512 0fe8db4bd006edc6617431273454669e7d8f782b038d3bc2bf83f6410ad3778452e92c41bec2e09a7559c88bd29af9d906ff7b4d20e91c87a8a311b9abe7a504 WHIRLPOOL 866bcbe5d79ede6ccd9800194c2d79322a3df5677bdfed886892193e2bc17c69a8da56d3635d8d44c0958ca7515ecd568a7125849216871b420a16182b76bad9
 MISC metadata.xml 540 SHA256 f1410337c0d9a5ac6defbaa4a30c00711a2698bbd7f741db3153e9d055f3166b SHA512 964848c238bf50ce85bf58d794bb6c7b44b7607f7ecac873622f1cad830f30a7f727f7a103a8e05b2547a2961ca6e1a4db0471d151c3502b124fc583758ca49f WHIRLPOOL a3b194c507357fdf4fc7380d020f1f0306f37e19c5de35b9398a3d468208aab52fa7f41e484bce0728a4592cd3c11ce069a75cacfaf1f760215298b424322e53
diff --git a/media-video/avidemux/avidemux-2.6.2.ebuild b/media-video/avidemux/avidemux-2.6.2.ebuild
index a1856128bfe9..bbfe99b473bb 100644
--- a/media-video/avidemux/avidemux-2.6.2.ebuild
+++ b/media-video/avidemux/avidemux-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.2.ebuild,v 1.2 2013/03/17 08:33:00 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.2.ebuild,v 1.3 2013/03/17 14:22:55 tomwij Exp $
 
 EAPI="5"
 
@@ -61,6 +61,9 @@ src_prepare() {
 	# Fix QA warnings that complain a trailing ; is missing and Application is deprecated.
 	sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}-2.6.desktop
 	sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}-2.6-gtk.desktop
+
+	# Force the config checks to pass.
+	epatch "${FILESDIR}"/avidemux-2.6.2-config-h.patch
 }
 
 src_configure() {
diff --git a/media-video/avidemux/files/avidemux-2.6.2-config-h.patch b/media-video/avidemux/files/avidemux-2.6.2-config-h.patch
new file mode 100644
index 000000000000..63d6bcc38604
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.6.2-config-h.patch
@@ -0,0 +1,18 @@
+--- avidemux_plugins/CMakeLists.txt	2012-07-13 09:50:08.000000000 +0200
++++ avidemux_plugins/CMakeLists.txt.2	2013-03-17 15:16:36.804417808 +0100
+@@ -98,13 +98,8 @@
+     set(ADM_INC "NOTFOUND")
+     FIND_PATH(ADM_INC config.h "${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/2.6/${flavor}")
+     #MESSAGE(STATUS "result : ${ADM_INC_NOT_FOUND},${ADM_INC}")
+-    IF(${ADM_INC} MATCHES "NOTFOUND")
+-        SET(${result} 0)
+-        MESSAGE(STATUS "Include for ${flavor} not found")
+-    ELSE(${ADM_INC} MATCHES "NOTFOUND")
+-        SET(${result} 1)
+-        MESSAGE(STATUS "Include for ${flavor} found")
+-    ENDIF(${ADM_INC} MATCHES "NOTFOUND")
++    SET(${result} 1)
++    MESSAGE(STATUS "Include for ${flavor} forced.")
+ ENDMACRO(CHECK_ADM_CONFIG_H flavor result)
+ 
+ APPEND_SUMMARY_LIST("User Interface" "Common" "${DO_COMMON}")