Avidemux: depend on newer libcdio

* add haiku icons

media-video/avidemux/avidemux-2.7.1.recipe

@@ -6,12 +6,15 @@ can be automated using projects, job queue and powerful scripting capabilities."
 HOMEPAGE="http://fixounet.free.fr/avidemux/"
 COPYRIGHT="2001–2018 Mean"
 LICENSE="GNU GPL v3"
-REVISION="5"
+REVISION="6"
 SOURCE_URI="https://sourceforge.net/projects/avidemux/files/avidemux/$portVersion/avidemux_$portVersion.tar.gz"
 CHECKSUM_SHA256="3ccd784a329c8957c6741923549fdfb70f3b96d087aeb514f3d52e1cd281e995"
 SOURCE_DIR="avidemux_$portVersion"
 PATCHES="avidemux-$portVersion.patchset"
-ADDITIONAL_FILES="avidemux.rdef.in"
+ADDITIONAL_FILES="
+	avidemux.rdef.in
+	haikuicons.zip
+	"
 
 ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -25,7 +28,7 @@ REQUIRES="
 	lib:liba52$secondaryArchSuffix
 	lib:libass$secondaryArchSuffix
 	lib:libcddb$secondaryArchSuffix
-	lib:libcdio$secondaryArchSuffix
+	lib:libcdio$secondaryArchSuffix >= 18
 	lib:libexecinfo$secondaryArchSuffix
 	lib:libfaac$secondaryArchSuffix
 #	lib:libfaad$secondaryArchSuffix
@@ -55,7 +58,7 @@ BUILD_REQUIRES="
 	devel:liba52$secondaryArchSuffix
 	devel:libass$secondaryArchSuffix
 	devel:libcddb$secondaryArchSuffix
-	devel:libcdio$secondaryArchSuffix
+	devel:libcdio$secondaryArchSuffix >= 18
 	devel:libexecinfo$secondaryArchSuffix
 	devel:libfaac$secondaryArchSuffix
 #	devel:libfaad$secondaryArchSuffix
@@ -86,9 +89,15 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:patch
 	cmd:pkg_config$secondaryArchSuffix
+	cmd:unzip
 	cmd:yasm
 	"
 
+PATCH()
+{
+	unzip -o $sourceDir/../../additional-files/haikuicons.zip -d $sourceDir/avidemux/qt4/ADM_userInterfaces/ADM_gui/pics
+}
+
 BUILD()
 {
 	bash bootStrap.bash \