diff options
| author |   Tom Wijsman <tomwij@gentoo.org> | 2013-03-17 14:22:55 +0000 |
|---|---|---|
| committer | Tom Wijsman <tomwij@gentoo.org> | 2013-03-17 14:22:55 +0000 |
| commit | 67d8147717d076313a59c680ba09257bcd3ac1e3 (patch) | |
| tree | dd5f086a6f968ffbcd9a2bfe320e1f257522028c /media-video/avidemux | |
| parent | Stable for amd64, wrt bug #445538 (diff) | |
| download | gentoo-2-67d8147717d076313a59c680ba09257bcd3ac1e3.tar.gz gentoo-2-67d8147717d076313a59c680ba09257bcd3ac1e3.tar.bz2 gentoo-2-67d8147717d076313a59c680ba09257bcd3ac1e3.zip | |
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.
(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Diffstat (limited to 'media-video/avidemux')
| -rw-r--r-- | media-video/avidemux/ChangeLog | 8 | ||||
| -rw-r--r-- | media-video/avidemux/avidemux-2.6.2.ebuild | 5 | ||||
| -rw-r--r-- | media-video/avidemux/files/avidemux-2.6.2-config-h.patch | 18 |
3 files changed, 29 insertions, 2 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/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}") |