Attachment #98674 for bug #137621

Lines 28-35 Link Here

(-)Makefile (-2 lines)
28	CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib	28	CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
29	CXXFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib	29	CXXFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
30		30
31	BROKEN= need a update for Qt 4.5
32
33	USE_GNOME= libxml2	31	USE_GNOME= libxml2
34	USE_QT_VER= 4	32	USE_QT_VER= 4
35	QT_COMPONENTS=	33	QT_COMPONENTS=

Lines 29-33 Link Here

(-)pkg-plist (+1 lines)
29	%%QT_NLS%%share/avidemux2/avidemux_sr.qm	29	%%QT_NLS%%share/avidemux2/avidemux_sr.qm
30	%%QT_NLS%%share/avidemux2/avidemux_sr@latin.qm	30	%%QT_NLS%%share/avidemux2/avidemux_sr@latin.qm
31	%%QT_NLS%%share/avidemux2/avidemux_tr.qm	31	%%QT_NLS%%share/avidemux2/avidemux_tr.qm
		32	%%QT_NLS%%share/avidemux2/qt_cs.qm
32	%%QT_NLS%%share/avidemux2/qt_fr.qm	33	%%QT_NLS%%share/avidemux2/qt_fr.qm
33	%%QT_NLS%%share/avidemux2/qt_it.qm	34	%%QT_NLS%%share/avidemux2/qt_it.qm




--- ./avidemux/CMakeLists.txt.orig	2008-10-03 15:05:09.000000000 +0400
+++ ./avidemux/CMakeLists.txt	2009-08-10 23:07:18.000000000 +0400
@@ -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})
 




 MACRO(FIND_LRELEASE)
     IF(NOT LRELEASE_EXECUTABLE AND NOT LRELEASE_NOT_FOUND)
-		FIND_PROGRAM(LRELEASE_EXECUTABLE lrelease PATHS
+		FIND_PROGRAM(LRELEASE_EXECUTABLE lrelease-qt4 PATHS
 			"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
 			"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
 			$ENV{QTDIR}/bin)

             SET(qm_files ${qm_files} ${_outXml} ${_out})
 
-			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n")
+			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux2")
         ENDFOREACH(ts_input ${ts_files})
 
         SET(${_sources} ${${_sources}} ${qm_files})

             SET(qm_files ${qm_files} ${_out})
 
-			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n")
+			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux2")
         ENDFOREACH(ts_input ${ts_files})
 
         SET(${_sources} ${${_sources}} ${qm_files})

Return to bug 137621

Added Link Here

(-)files/patch-avidemux__CMakeLists.txt (+35 lines)
1	--- ./avidemux/CMakeLists.txt.orig 2008-10-03 15:05:09.000000000 +0400
2	+++ ./avidemux/CMakeLists.txt 2009-08-10 23:07:18.000000000 +0400
3	@@ -84,7 +84,6 @@
4	ADM_audio
5	ADM_script
6	ADM_videoFilter
7	-ADM_filter
8	ADM_video
9	ADM_audiodevice
10	ADM_ocr
11	@@ -93,6 +92,24 @@
12
13	FOREACH(_current ${ADM_SUBDIR})
14	ADD_SUBDIRECTORY(${_current})
15	+ENDFOREACH(_current ${ADM_SUBDIR})
16	+
17	+SET(ADM_SUBDIR
18	+ADM_filter
19	+ADM_audiofilter
20	+ADM_editor
21	+ADM_audiocodec
22	+ADM_audio
23	+ADM_script
24	+ADM_videoFilter
25	+ADM_filter
26	+ADM_video
27	+ADM_audiodevice
28	+ADM_ocr
29	+ADM_colorspace
30	+)
31	+
32	+FOREACH(_current ${ADM_SUBDIR})
33	add_libs_all_targets(${_current})
34	ENDFOREACH(_current ${ADM_SUBDIR})
35

Lines 5-11 Link Here

(-)files/patch-cmake__Ts.cmake (-3 / +3 lines)
5	MACRO(FIND_LRELEASE)	5	MACRO(FIND_LRELEASE)
6	IF(NOT LRELEASE_EXECUTABLE AND NOT LRELEASE_NOT_FOUND)	6	IF(NOT LRELEASE_EXECUTABLE AND NOT LRELEASE_NOT_FOUND)
7	- FIND_PROGRAM(LRELEASE_EXECUTABLE lrelease PATHS	7	- FIND_PROGRAM(LRELEASE_EXECUTABLE lrelease PATHS
8	+ FIND_PROGRAM(LRELEASE_EXECUTABLE lrelease lrelease-qt4 PATHS	8	+ FIND_PROGRAM(LRELEASE_EXECUTABLE lrelease-qt4 PATHS
9	"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"	9	"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
10	"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"	10	"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
11	$ENV{QTDIR}/bin)	11	$ENV{QTDIR}/bin)
Lines 14-20 Link Here
14	SET(qm_files ${qm_files} ${_outXml} ${_out})	14	SET(qm_files ${qm_files} ${_outXml} ${_out})
15		15
16	- INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n")	16	- INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n")
17	+ INSTALL(FILES ${_out} DESTINATION "/var/tmp/avidemux2/share/avidemux2")	17	+ INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux2")
18	ENDFOREACH(ts_input ${ts_files})	18	ENDFOREACH(ts_input ${ts_files})
19		19
20	SET(${_sources} ${${_sources}} ${qm_files})	20	SET(${_sources} ${${_sources}} ${qm_files})
Lines 23-29 Link Here
23	SET(qm_files ${qm_files} ${_out})	23	SET(qm_files ${qm_files} ${_out})
24		24
25	- INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n")	25	- INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n")
26	+ INSTALL(FILES ${_out} DESTINATION "/var/tmp/avidemux2/share/avidemux2")	26	+ INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux2")
27	ENDFOREACH(ts_input ${ts_files})	27	ENDFOREACH(ts_input ${ts_files})
28		28
29	SET(${_sources} ${${_sources}} ${qm_files})	29	SET(${_sources} ${${_sources}} ${qm_files})