summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen de Groot <yngwin@gentoo.org>2009-05-08 12:41:49 +0000
committerBen de Groot <yngwin@gentoo.org>2009-05-08 12:41:49 +0000
commit8d4b3ea994ab2066a46d6a8ff1896809ef52d538 (patch)
tree8c5ba1e05b74b73bc831ef4ea710cba0d4c06fb0 /media-video/avidemux/files
parentAdd xmlto to depends wrt some bug I just closed (diff)
downloadgentoo-2-8d4b3ea994ab2066a46d6a8ff1896809ef52d538.tar.gz
gentoo-2-8d4b3ea994ab2066a46d6a8ff1896809ef52d538.tar.bz2
gentoo-2-8d4b3ea994ab2066a46d6a8ff1896809ef52d538.zip
Re-enable qt4 useflag, which works again with qt 4.5.1 (bug 259414). Add patch for cmake-2.6.4 change in behavior (bug 268618). Add test restriction (bug 265218).
(Portage version: 2.2_rc28/cvs/Linux x86_64)
Diffstat (limited to 'media-video/avidemux/files')
-rw-r--r--media-video/avidemux/files/avidemux-2.4-cmake264.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/media-video/avidemux/files/avidemux-2.4-cmake264.patch b/media-video/avidemux/files/avidemux-2.4-cmake264.patch
new file mode 100644
index 000000000000..80338a8061a5
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.4-cmake264.patch
@@ -0,0 +1,36 @@
+diff -uNr avidemux_2.4.4.orig/avidemux/CMakeLists.txt avidemux_2.4.4/avidemux/CMakeLists.txt
+--- avidemux_2.4.4.orig/avidemux/CMakeLists.txt 2009-05-06 13:00:10.000000000 +0200
++++ avidemux_2.4.4/avidemux/CMakeLists.txt 2009-05-06 13:00:49.000000000 +0200
+@@ -84,7 +84,6 @@
+ ADM_audio
+ ADM_script
+ ADM_videoFilter
+-ADM_filter
+ ADM_video
+ ADM_audiodevice
+ ADM_ocr
+@@ -93,6 +92,24 @@
+
+ FOREACH(_current ${ADM_SUBDIR})
+ ADD_SUBDIRECTORY(${_current})
++ENDFOREACH(_current ${ADM_SUBDIR})
++
++SET(ADM_SUBDIR
++ADM_filter
++ADM_audiofilter
++ADM_editor
++ADM_audiocodec
++ADM_audio
++ADM_script
++ADM_videoFilter
++ADM_filter
++ADM_video
++ADM_audiodevice
++ADM_ocr
++ADM_colorspace
++)
++
++FOREACH(_current ${ADM_SUBDIR})
+ add_libs_all_targets(${_current})
+ ENDFOREACH(_current ${ADM_SUBDIR})
+