diff options
| author | makc <makc@FreeBSD.org> | 2009-08-23 18:36:55 +0800 |
|---|---|---|
| committer | makc <makc@FreeBSD.org> | 2009-08-23 18:36:55 +0800 |
| commit | f57f106dd0be3330ceb090ef958906ec7f018372 (patch) | |
| tree | 4dd23fe79832c7f755261ed3d0c46fa0aac499b3 /multimedia | |
| parent | a29113bb87faf755f782325779f26ad872b579d9 (diff) | |
| download | freebsd-ports-graphics-f57f106dd0be3330ceb090ef958906ec7f018372.tar.gz freebsd-ports-graphics-f57f106dd0be3330ceb090ef958906ec7f018372.tar.zst freebsd-ports-graphics-f57f106dd0be3330ceb090ef958906ec7f018372.zip | |
Unbreak [1]
Fix plist when building with QT4 support
PR: ports/137621 [1]
Submitted by: Ulrich Spoerlein <uspoerlein at gmail.com>
Approved by: Anish Mistry (maintainer)
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/avidemux2/Makefile | 5 | ||||
| -rw-r--r-- | multimedia/avidemux2/files/patch-avidemux__CMakeLists.txt | 35 | ||||
| -rw-r--r-- | multimedia/avidemux2/files/patch-cmake__Ts.cmake | 6 | ||||
| -rw-r--r-- | multimedia/avidemux2/pkg-plist | 1 |
4 files changed, 40 insertions, 7 deletions
diff --git a/multimedia/avidemux2/Makefile b/multimedia/avidemux2/Makefile index 125fee9817b..6ff9d5a7355 100644 --- a/multimedia/avidemux2/Makefile +++ b/multimedia/avidemux2/Makefile @@ -10,8 +10,7 @@ PORTVERSION= 2.4.4 PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_BERLIOS} \ - SF/avidemux/avidemux/${PORTVERSION} - + SF/avidemux/avidemux/${PORTVERSION} DISTNAME= avidemux_${PORTVERSION} MAINTAINER= amistry@am-productions.biz @@ -28,8 +27,6 @@ CONFLICTS= avidemux2-2.[0-35-9].* 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= diff --git a/multimedia/avidemux2/files/patch-avidemux__CMakeLists.txt b/multimedia/avidemux2/files/patch-avidemux__CMakeLists.txt new file mode 100644 index 00000000000..91f211cad22 --- /dev/null +++ b/multimedia/avidemux2/files/patch-avidemux__CMakeLists.txt @@ -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})
+
diff --git a/multimedia/avidemux2/files/patch-cmake__Ts.cmake b/multimedia/avidemux2/files/patch-cmake__Ts.cmake index 5fb446e759c..8e54bdfc5b0 100644 --- a/multimedia/avidemux2/files/patch-cmake__Ts.cmake +++ b/multimedia/avidemux2/files/patch-cmake__Ts.cmake @@ -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})
diff --git a/multimedia/avidemux2/pkg-plist b/multimedia/avidemux2/pkg-plist index 2b3c7c0bc23..d85f4456255 100644 --- a/multimedia/avidemux2/pkg-plist +++ b/multimedia/avidemux2/pkg-plist @@ -29,5 +29,6 @@ bin/avidemux2_cli %%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 |