Attachment 98674 Details for Bug 137621 – avidemux2.diff

[patch] avidemux2.diff

avidemux2.diff (text/x-patch; charset="UTF-8"), 3.61 KB, created by Max Brazhnikov on 2009-08-11 07:34:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Max Brazhnikov

Created: 2009-08-11 07:34:12 UTC

Size: 3.61 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/multimedia/avidemux2/Makefile,v
>retrieving revision 1.60
>diff -u -r1.60 Makefile
>--- Makefile	7 Aug 2009 14:40:47 -0000	1.60
>+++ Makefile	10 Aug 2009 18:27:23 -0000
>@@ -28,8 +28,6 @@
> CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
> CXXFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
> 
>-BROKEN=		need a update for Qt 4.5
>-
> USE_GNOME=	libxml2
> USE_QT_VER=	4
> QT_COMPONENTS=
>Index: pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/multimedia/avidemux2/pkg-plist,v
>retrieving revision 1.9
>diff -u -r1.9 pkg-plist
>--- pkg-plist	22 Jul 2008 19:42:34 -0000	1.9
>+++ pkg-plist	10 Aug 2009 19:47:05 -0000
>@@ -29,5 +29,6 @@
> %%QT_NLS%%share/avidemux2/avidemux_sr.qm
> %%QT_NLS%%share/avidemux2/avidemux_sr@latin.qm
> %%QT_NLS%%share/avidemux2/avidemux_tr.qm
>+%%QT_NLS%%share/avidemux2/qt_cs.qm
> %%QT_NLS%%share/avidemux2/qt_fr.qm
> %%QT_NLS%%share/avidemux2/qt_it.qm
>Index: files/patch-avidemux__CMakeLists.txt
>===================================================================
>RCS file: files/patch-avidemux__CMakeLists.txt
>diff -N files/patch-avidemux__CMakeLists.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-avidemux__CMakeLists.txt	10 Aug 2009 19:07:25 -0000
>@@ -0,0 +1,35 @@
>+--- ./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})
>+ 
>Index: files/patch-cmake__Ts.cmake
>===================================================================
>RCS file: /home/pcvs/ports/multimedia/avidemux2/files/patch-cmake__Ts.cmake,v
>retrieving revision 1.1
>diff -u -r1.1 patch-cmake__Ts.cmake
>--- files/patch-cmake__Ts.cmake	15 Jul 2008 02:53:29 -0000	1.1
>+++ files/patch-cmake__Ts.cmake	10 Aug 2009 18:41:35 -0000
>@@ -5,7 +5,7 @@
>  MACRO(FIND_LRELEASE)
>      IF(NOT LRELEASE_EXECUTABLE AND NOT LRELEASE_NOT_FOUND)
> -		FIND_PROGRAM(LRELEASE_EXECUTABLE lrelease PATHS
>-+		FIND_PROGRAM(LRELEASE_EXECUTABLE lrelease lrelease-qt4 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)
>@@ -14,7 +14,7 @@
>              SET(qm_files ${qm_files} ${_outXml} ${_out})
>  
> -			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n")
>-+			INSTALL(FILES ${_out} DESTINATION "/var/tmp/avidemux2/share/avidemux2")
>++			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux2")
>          ENDFOREACH(ts_input ${ts_files})
>  
>          SET(${_sources} ${${_sources}} ${qm_files})
>@@ -23,7 +23,7 @@
>              SET(qm_files ${qm_files} ${_out})
>  
> -			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n")
>-+			INSTALL(FILES ${_out} DESTINATION "/var/tmp/avidemux2/share/avidemux2")
>++			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux2")
>          ENDFOREACH(ts_input ${ts_files})
>  
>          SET(${_sources} ${${_sources}} ${qm_files})

Actions: View | Diff

Attachments on bug 137621: 98673 | 98674 | 98675