packages (DEVEL): avidemux/avidemux.spec, avidemux/link-libs.patch (NEW) - ...
glen
glen at pld-linux.org
Thu Dec 17 16:48:49 CET 2009
Author: glen Date: Thu Dec 17 15:48:49 2009 GMT
Module: packages Tag: DEVEL
---- Log message:
- build plugins, install avidemux manual
---- Files affected:
packages/avidemux:
avidemux.spec (1.71.2.8 -> 1.71.2.9) , link-libs.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/avidemux/avidemux.spec
diff -u packages/avidemux/avidemux.spec:1.71.2.8 packages/avidemux/avidemux.spec:1.71.2.9
--- packages/avidemux/avidemux.spec:1.71.2.8 Wed Dec 16 22:17:56 2009
+++ packages/avidemux/avidemux.spec Thu Dec 17 16:48:44 2009
@@ -8,7 +8,6 @@
# - uses patched ffmpeg
# - the bconds don't work with cmake, all gets enabled if BR found
# - Could not find Gettext -- libintl not required for gettext support
-# - fix plugin scan dir: Scanning directory /usr/lib/ADM_plugins/audioDecoder/
#
# Conditional build:
%bcond_without esd # disable EsounD sound support
@@ -27,7 +26,7 @@
Summary(pl.UTF-8): Mały edytor audio/wideo dla Linuksa
Name: avidemux
Version: 2.5.1
-Release: 0.7
+Release: 0.8
License: GPL v2+
Group: X11/Applications/Multimedia
Source0: http://dl.sourceforge.net/avidemux/%{name}_%{version}.tar.gz
@@ -36,6 +35,7 @@
Patch0: gcc44.patch
Patch1: types.patch
Patch2: qtlocale.patch
+Patch3: link-libs.patch
#Patch1: %{name}-dts_internal.patch
#Patch2: %{name}-sparc64.patch
URL: http://fixounet.free.fr/avidemux/
@@ -88,10 +88,11 @@
%prep
%setup -q -n %{name}_%{version}
-find '(' -name '*.js' -o -name '*.cpp' -o -name '*.h' -o -name '*.cmake' ')' -print0 | xargs -0 %{__sed} -i -e 's,\r$,,'
+find '(' -name '*.js' -o -name '*.cpp' -o -name '*.h' -o -name '*.cmake' -o -name '*.txt' ')' -print0 | xargs -0 %{__sed} -i -e 's,\r$,,'
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
echo 'pt_BR' >> po/LINGUAS
@@ -101,27 +102,47 @@
sed -i -e's,"lib","%{_lib}",' avidemux/main.cpp avidemux/ADM_core/src/ADM_fileio.cpp
%build
-install -d build
+TOP=$PWD
+# main
+install -d build plugin-build
cd build
%cmake \
-DCMAKE_BUILD_TYPE=%{?debug:Debug}%{!?debug:Release} \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+ -DAVIDEMUX_INSTALL_PREFIX=%{_prefix} \
%if "%{_lib}" == "lib64"
-DLIB_SUFFIX=64 \
%endif
..
-%{__make} -j1
+%{__make}
+cd ..
+
+# plugins
+cd plugin-build
+%cmake \
+ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+ -DAVIDEMUX_INSTALL_PREFIX=%{_prefix} \
+ -DAVIDEMUX_SOURCE_DIR=$TOP/ \
+ -DAVIDEMUX_CORECONFIG_DIR=$TOP/build/config \
+%if "%{_lib}" == "lib64"
+ -DLIB_SUFFIX=64 \
+%endif
+ ../plugins
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_bindir}}
-install -d $RPM_BUILD_ROOT%{_libdir}/ADM_plugins/{audioDecoder,videoFilter,audioDevices,audioEncoders}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_bindir},%{_mandir}/man1}
+#install -d $RPM_BUILD_ROOT%{_libdir}/ADM_plugins/{audioDecoder,videoFilter,audioDevices,audioEncoders}
%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
+%{__make} -C plugin-build install \
+ DESTDIR=$RPM_BUILD_ROOT
+
chmod +x $RPM_BUILD_ROOT%{_libdir}/lib*.so*
+cp -a man/avidemux.1 $RPM_BUILD_ROOT%{_mandir}/man1
cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
cp -a avidemux_icon.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
install -p build/avidemux/avidemux2_gtk $RPM_BUILD_ROOT%{_bindir}/avidemux2_gtk
@@ -188,6 +209,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.71.2.9 2009/12/17 15:48:44 glen
+- build plugins, install avidemux manual
+
Revision 1.71.2.8 2009/12/16 21:17:56 glen
- package plugin dirs
================================================================
Index: packages/avidemux/link-libs.patch
diff -u /dev/null packages/avidemux/link-libs.patch:1.1
--- /dev/null Thu Dec 17 16:48:50 2009
+++ packages/avidemux/link-libs.patch Thu Dec 17 16:48:44 2009
@@ -0,0 +1,586 @@
+--- avidemux_2.5.1/plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/CMakeLists.txt~ 2009-12-17 15:36:24.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/CMakeLists.txt 2009-12-17 15:36:27.450044797 +0200
+@@ -11,6 +11,10 @@
+ ADD_TARGET_CFLAGS(${ADM_LIB} -fPIC)
+ ENDIF (UNIX)
+
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(${ADM_LIB} -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ENDIF (UNIX)
++
+ IF (ADM_BIG_ENDIAN)
+ ADD_TARGET_CFLAGS(${ADM_LIB} -DWORDS_BIGENDIAN)
+ ENDIF (ADM_BIG_ENDIAN)
+--- avidemux_2.5.1/plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt~ 2009-12-17 15:38:27.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt 2009-12-17 15:38:30.803364774 +0200
+@@ -7,5 +7,11 @@
+ ADD_LIBRARY(ADM_ad_a52 SHARED ${ADM_ad_a52_SRCS})
+ TARGET_LINK_LIBRARIES(ADM_ad_a52 ADM_liba52)
+
++
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_ad_a52 -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ENDIF (UNIX)
++
++
+ INIT_AUDIO_PLUGIN(ADM_ad_a52)
+ INSTALL_AUDIODECODER(ADM_ad_a52)
+--- avidemux_2.5.1/plugins/ADM_audioDecoders/ADM_ad_faad/CMakeLists.txt~ 2008-07-19 19:12:51.000000000 +0300
++++ avidemux_2.5.1/plugins/ADM_audioDecoders/ADM_ad_faad/CMakeLists.txt 2009-12-17 15:42:30.613341120 +0200
+@@ -12,6 +12,10 @@
+ ADD_TARGET_CFLAGS(ADM_ad_faad "-I${FAAD_INCLUDE_DIR}")
+ ADD_TARGET_DEFINITIONS(ADM_ad_faad FAAD_OLD_PROTOTYPE)
+
++ IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_ad_faad -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ENDIF (UNIX)
++
+ INIT_AUDIO_PLUGIN(ADM_ad_faad)
+ INSTALL_AUDIODECODER(ADM_ad_faad)
+ ENDIF (USE_FAAD)
+--- avidemux_2.5.1/plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt~ 2009-12-17 15:46:23.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt 2009-12-17 15:46:27.003402821 +0200
+@@ -15,5 +15,9 @@
+ ADD_LIBRARY(ADM_ad_Mad SHARED ${ADM_ad_Mad_SRCS})
+ TARGET_LINK_LIBRARIES(ADM_ad_Mad ADM_libMad)
+
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_ad_Mad -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ENDIF (UNIX)
++
+ INIT_AUDIO_PLUGIN(ADM_ad_Mad)
+ INSTALL_AUDIODECODER(ADM_ad_Mad)
+--- avidemux_2.5.1/plugins/ADM_audioDevices/Alsa/CMakeLists.txt~ 2009-12-17 15:51:36.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_audioDevices/Alsa/CMakeLists.txt 2009-12-17 15:51:38.233702776 +0200
+@@ -6,5 +6,10 @@
+ ADD_LIBRARY(ADM_av_alsa SHARED ${ADM_av_alsa_SRCS})
+ TARGET_LINK_LIBRARIES(ADM_av_alsa ADM_core ADM_coreAudio ${ASOUND_LIBRARY})
+
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_av_alsa -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_av_alsa -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreAudio/src)
++ENDIF (UNIX)
++
+ INIT_AUDIO_DEVICE(ADM_av_alsa)
+ INSTALL_AUDIODEVICE(ADM_av_alsa)
+--- avidemux_2.5.1/plugins/ADM_audioDevices/Esd/CMakeLists.txt~ 2009-12-17 15:52:44.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_audioDevices/Esd/CMakeLists.txt 2009-12-17 15:52:46.610287000 +0200
+@@ -7,6 +7,10 @@
+ INCLUDE_DIRECTORIES(${ESD_INCLUDE_DIR})
+ TARGET_LINK_LIBRARIES(ADM_av_esd ADM_coreAudio ${ESD_LIBRARY_DIR})
+
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_av_esd -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_av_esd -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreAudio/src)
++ENDIF (UNIX)
+
+ INIT_AUDIO_DEVICE(ADM_av_esd)
+ INSTALL_AUDIODEVICE(ADM_av_esd)
+--- avidemux_2.5.1/plugins/ADM_audioDevices/Sdl/CMakeLists.txt~ 2009-12-17 15:54:06.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_audioDevices/Sdl/CMakeLists.txt 2009-12-17 15:54:08.130354565 +0200
+@@ -5,6 +5,12 @@
+
+ ADD_LIBRARY(ADM_av_sdl SHARED ${ADM_av_sdl_SRCS})
+ TARGET_LINK_LIBRARIES(ADM_av_sdl ADM_core ADM_coreAudio ${SDL_LIBRARY})
++
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_av_sdl -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_av_sdl -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreAudio/src)
++ENDIF (UNIX)
++
+ SDLify(ADM_deviceSDL.cpp)
+
+ INIT_AUDIO_DEVICE(ADM_av_sdl)
+--- avidemux_2.5.1/plugins/ADM_audioDevices/Oss/CMakeLists.txt~ 2009-12-17 15:55:02.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_audioDevices/Oss/CMakeLists.txt 2009-12-17 15:55:04.413265947 +0200
+@@ -6,5 +6,11 @@
+ ADD_LIBRARY(ADM_av_oss SHARED ${ADM_av_oss_SRCS})
+ TARGET_LINK_LIBRARIES(ADM_av_oss ADM_coreAudio)
+ include_directories(${OSS_INCLUDE_DIR})
++
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_av_oss -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_av_oss -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreAudio/src)
++ENDIF (UNIX)
++
+ INIT_AUDIO_DEVICE(ADM_av_oss)
+ INSTALL_AUDIODEVICE(ADM_av_oss)
+--- avidemux_2.5.1/plugins/ADM_audioDevices/Arts/CMakeLists.txt~ 2009-07-11 11:05:39.000000000 +0300
++++ avidemux_2.5.1/plugins/ADM_audioDevices/Arts/CMakeLists.txt 2009-12-17 15:55:24.563263514 +0200
+@@ -6,5 +6,11 @@
+ ADD_LIBRARY(ADM_av_arts SHARED ${ADM_av_arts_SRCS})
+ TARGET_LINK_LIBRARIES(ADM_av_arts ADM_coreAudio ${ARTS_LDFLAGS})
+ ADD_DEFINITIONS(${ARTS_CFLAGS})
++
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_av_arts -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_av_arts -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreAudio/src)
++ENDIF (UNIX)
++
+ INIT_AUDIO_DEVICE(ADM_av_arts)
+ INSTALL_AUDIODEVICE(ADM_av_arts)
+--- avidemux_2.5.1/plugins/ADM_videoEncoder/ADM_vidEnc_avcodec/CMakeLists.txt~ 2009-12-17 16:26:26.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoEncoder/ADM_vidEnc_avcodec/CMakeLists.txt 2009-12-17 16:26:42.886825636 +0200
+@@ -5,7 +5,7 @@
+ if (WIN32)
+ set(FFMPEG_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX})
+ else (WIN32)
+- set(FFMPEG_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX}/lib)
++ set(FFMPEG_INSTALL_DIR ${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_libraries/ffmpeg/libavcodec)
+ endif (WIN32)
+
+ SET(ADM_vidEnc_avcodec_SRCS interface.c encoder.cpp huffyuvEncoder.cpp
+@@ -27,6 +27,11 @@
+ ADD_LIBRARY(ADM_vidEnc_avcodec SHARED ${ADM_vidEnc_avcodec_SRCS})
+ TARGET_LINK_LIBRARIES(ADM_vidEnc_avcodec ${LIBXML2_LIBRARIES} ADM_core ADM_coreUI ADM_libavcodec)
+
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vidEnc_avcodec -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vidEnc_avcodec -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ENDIF (UNIX)
++
+ INIT_VIDEO_ENCODER_PLUGIN(ADM_vidEnc_avcodec)
+ INSTALL_VIDEO_ENCODER(ADM_vidEnc_avcodec)
+ INSTALL(FILES Mpeg1Param.xsd DESTINATION "${VIDENC_INSTALL_DIR}${PLUGIN_SCHEMA_DIR}")
+--- avidemux_2.5.1/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/CMakeLists.txt~ 2009-12-17 15:59:01.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/CMakeLists.txt 2009-12-17 16:27:38.943287786 +0200
+@@ -25,8 +25,12 @@
+ ADD_LIBRARY(ADM_vidEnc_xvid SHARED ${ADM_vidEnc_xvid_SRCS})
+ TARGET_LINK_LIBRARIES(ADM_vidEnc_xvid ADM_core ${XVID_LIBRARY_DIR} ${LIBXML2_LIBRARIES})
+
++ IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vidEnc_xvid -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ENDIF (UNIX)
++
+ INIT_VIDEO_ENCODER_PLUGIN(ADM_vidEnc_xvid)
+ INSTALL_VIDEO_ENCODER(ADM_vidEnc_xvid)
+ INSTALL(FILES XvidParam.xsd DESTINATION "${VIDENC_INSTALL_DIR}${PLUGIN_SCHEMA_DIR}")
+ ENDIF (LIBXML2_FOUND)
+-ENDIF (XVID_FOUND)
+\ No newline at end of file
++ENDIF (XVID_FOUND)
+--- avidemux_2.5.1/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/CMakeLists.txt~ 2009-12-17 15:59:01.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/CMakeLists.txt 2009-12-17 16:30:35.576440406 +0200
+@@ -15,6 +15,11 @@
+ ADD_LIBRARY(${QT_PLUGIN_NAME} SHARED ${ADM_vidEnc_xvid_Qt_SRCS})
+ TARGET_LINK_LIBRARIES(${QT_PLUGIN_NAME} ADM_vidEnc_xvid ADM_coreUI ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY})
+
++ IF (UNIX)
++ ADD_TARGET_LDFLAGS(${QT_PLUGIN_NAME} -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(${QT_PLUGIN_NAME} -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ENDIF (UNIX)
++
+ INIT_VIDEO_ENCODER_PLUGIN(${QT_PLUGIN_NAME})
+ INSTALL(TARGETS ${QT_PLUGIN_NAME} DESTINATION "${VIDENC_INSTALL_DIR}${PLUGIN_SCHEMA_DIR}")
+-ENDIF (QT4_FOUND)
+\ No newline at end of file
++ENDIF (QT4_FOUND)
+--- avidemux_2.5.1/plugins/ADM_videoFilters/AddBorders/CMakeLists.txt~ 2009-12-17 16:32:26.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/AddBorders/CMakeLists.txt 2009-12-17 16:32:28.803457882 +0200
+@@ -5,5 +5,11 @@
+
+ ADD_LIBRARY(ADM_vf_addborders SHARED ${ADM_vf_addborders_SRCS})
+
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_addborders -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_addborders -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_addborders -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
++
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_addborders)
+ INSTALL_VIDEOFILTER(ADM_vf_addborders)
+--- avidemux_2.5.1/plugins/ADM_videoFilters/BlendRemover/CMakeLists.txt~ 2009-12-17 15:59:01.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/BlendRemover/CMakeLists.txt 2009-12-17 16:32:58.936469874 +0200
+@@ -6,5 +6,11 @@
+ ADD_LIBRARY(ADM_vf_blendRemoval SHARED ${ADM_vf_blendRemoval_SRCS})
+ TARGET_LINK_LIBRARIES(ADM_vf_blendRemoval ADM_coreImage)
+
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_blendRemoval -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_blendRemoval -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_blendRemoval -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
++
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_blendRemoval)
+ INSTALL_VIDEOFILTER(ADM_vf_blendRemoval)
+--- avidemux_2.5.1/plugins/ADM_videoFilters/Chroma/CMakeLists.txt~ 2009-12-17 16:34:54.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/Chroma/CMakeLists.txt 2009-12-17 16:34:56.539901179 +0200
+@@ -3,11 +3,23 @@
+
+ SET(ADM_vidChromaU_SRCS ADM_vidChromaU.cpp)
+ ADD_LIBRARY(ADM_vidChromaU SHARED ${ADM_vidChromaU_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vidChromaU -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vidChromaU -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vidChromaU -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
++
+ INIT_VIDEOFILTER_PLUGIN(ADM_vidChromaU)
+ INSTALL_VIDEOFILTER(ADM_vidChromaU)
+
+-
+ SET(ADM_vidChromaV_SRCS ADM_vidChromaV.cpp)
+ ADD_LIBRARY(ADM_vidChromaV SHARED ${ADM_vidChromaV_SRCS})
++
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vidChromaV -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vidChromaV -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vidChromaV -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
++
+ INIT_VIDEOFILTER_PLUGIN(ADM_vidChromaV)
+ INSTALL_VIDEOFILTER(ADM_vidChromaV)
+--- avidemux_2.5.1/plugins/ADM_videoFilters/Decimate/CMakeLists.txt~ 2009-12-17 16:35:47.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/Decimate/CMakeLists.txt 2009-12-17 16:35:50.369688318 +0200
+@@ -5,6 +5,12 @@
+
+ ADD_LIBRARY(ADM_vf_decimate SHARED ${ADM_vf_decimate_SRCS})
+
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_decimate -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_decimate -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_decimate -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
++
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_decimate)
+ INSTALL_VIDEOFILTER(ADM_vf_decimate)
+
+--- avidemux_2.5.1/plugins/ADM_videoFilters/DgBob/CMakeLists.txt~ 2009-12-17 16:36:53.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/DgBob/CMakeLists.txt 2009-12-17 16:36:56.800305942 +0200
+@@ -5,5 +5,11 @@
+
+ ADD_LIBRARY(ADM_vf_blendDgBob SHARED ${ADM_vf_blendDgBob_SRCS})
+
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_blendDgBob -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_blendDgBob -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_blendDgBob -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
++
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_blendDgBob)
+ INSTALL_VIDEOFILTER(ADM_vf_blendDgBob)
+--- avidemux_2.5.1/plugins/ADM_videoFilters/Fade/CMakeLists.txt~ 2009-12-17 16:45:28.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/Fade/CMakeLists.txt 2009-12-17 16:45:30.743171303 +0200
+@@ -5,5 +5,11 @@
+
+ ADD_LIBRARY(ADM_vf_fade SHARED ${ADM_vf_fade_SRCS})
+
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_fade -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_fade -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_fade -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
++
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_fade)
+ INSTALL_VIDEOFILTER(ADM_vf_fade)
+--- avidemux_2.5.1/plugins/ADM_videoFilters/FastConvolution/CMakeLists.txt~ 2009-12-17 16:49:24.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/FastConvolution/CMakeLists.txt 2009-12-17 16:49:27.543010217 +0200
+@@ -3,21 +3,41 @@
+
+ SET(ADM_vf_fastconvolutionmean_SRCS ADM_vidFastConvolution.cpp Mean.cpp )
+ ADD_LIBRARY(ADM_vf_fastconvolutionmean SHARED ${ADM_vf_fastconvolutionmean_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_fastconvolutionmean -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_fastconvolutionmean -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_fastconvolutionmean -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_fastconvolutionmean)
+ INSTALL_VIDEOFILTER(ADM_vf_fastconvolutionmean)
+
+ SET(ADM_vf_fastconvolutiongauss_SRCS ADM_vidFastConvolution.cpp Gauss.cpp )
+ ADD_LIBRARY(ADM_vf_fastconvolutiongauss SHARED ${ADM_vf_fastconvolutiongauss_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_fastconvolutiongauss -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_fastconvolutiongauss -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_fastconvolutiongauss -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_fastconvolutiongauss)
+ INSTALL_VIDEOFILTER(ADM_vf_fastconvolutiongauss)
+
+ SET(ADM_vf_fastconvolutionmedian_SRCS ADM_vidFastConvolution.cpp Median.cpp )
+ ADD_LIBRARY(ADM_vf_fastconvolutionmedian SHARED ${ADM_vf_fastconvolutionmedian_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_fastconvolutionmedian -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_fastconvolutionmedian -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_fastconvolutionmedian -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_fastconvolutionmedian)
+ INSTALL_VIDEOFILTER(ADM_vf_fastconvolutionmedian)
+
+ SET(ADM_vf_fastconvolutionsharpen_SRCS ADM_vidFastConvolution.cpp Sharpen.cpp )
+ ADD_LIBRARY(ADM_vf_fastconvolutionsharpen SHARED ${ADM_vf_fastconvolutionsharpen_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_fastconvolutionsharpen -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_fastconvolutionsharpen -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_fastconvolutionsharpen -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_fastconvolutionsharpen)
+ INSTALL_VIDEOFILTER(ADM_vf_fastconvolutionsharpen)
+
+--- avidemux_2.5.1/plugins/ADM_videoFilters/ForcedPP/CMakeLists.txt~ 2009-12-17 16:59:26.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/ForcedPP/CMakeLists.txt 2009-12-17 16:59:30.443295685 +0200
+@@ -1,16 +1,27 @@
+ INCLUDE(vf_plugin)
+ include(admFFmpegUtil)
+
++if (WIN32)
++ set(FFMPEG_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX})
++else (WIN32)
++ set(FFMPEG_INSTALL_DIR ${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_libraries/ffmpeg/libpostproc)
++endif (WIN32)
++
+ getFfmpegLibNames("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_libraries/ffmpeg")
+ INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_libraries/ffmpeg")
+
+ SET(ADM_vf_forcedPP_SRCS ADM_vidForcedPP.cpp)
+
+ add_library(ADM_libpostproc UNKNOWN IMPORTED)
+-set_property(TARGET ADM_libpostproc PROPERTY IMPORTED_LOCATION "${FFMPEG_LIB_DIR}/${LIBPOSTPROC_LIB}")
++set_property(TARGET ADM_libpostproc PROPERTY IMPORTED_LOCATION "${FFMPEG_INSTALL_DIR}/${LIBPOSTPROC_LIB}")
+
+ ADD_LIBRARY(ADM_vf_forcedPP SHARED ${ADM_vf_forcedPP_SRCS})
+ TARGET_LINK_LIBRARIES(ADM_vf_forcedPP ADM_libpostproc)
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_forcedPP -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_forcedPP -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_forcedPP -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_forcedPP)
+ INSTALL_VIDEOFILTER(ADM_vf_forcedPP)
+--- avidemux_2.5.1/plugins/ADM_videoFilters/LargeMedian/CMakeLists.txt~ 2009-12-17 17:00:31.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/LargeMedian/CMakeLists.txt 2009-12-17 17:00:34.886414147 +0200
+@@ -4,6 +4,11 @@
+ SET(ADM_vf_largemedian_SRCS ADM_vidLargeMedian.cpp)
+
+ ADD_LIBRARY(ADM_vf_largemedian SHARED ${ADM_vf_largemedian_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_largemedian -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_largemedian -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_largemedian -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_largemedian)
+ INSTALL_VIDEOFILTER(ADM_vf_largemedian)
+--- avidemux_2.5.1/plugins/ADM_videoFilters/LumaOnly/CMakeLists.txt~ 2009-12-17 17:01:21.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/LumaOnly/CMakeLists.txt 2009-12-17 17:01:23.986409287 +0200
+@@ -4,6 +4,11 @@
+ SET(ADM_vf_lumaonly_SRCS ADM_vidLuma.cpp)
+
+ ADD_LIBRARY(ADM_vf_lumaonly SHARED ${ADM_vf_lumaonly_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_lumaonly -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_lumaonly -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_lumaonly -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_lumaonly)
+ INSTALL_VIDEOFILTER(ADM_vf_lumaonly)
+--- avidemux_2.5.1/plugins/ADM_videoFilters/McDeint/CMakeLists.txt~ 2009-12-17 17:03:45.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/McDeint/CMakeLists.txt 2009-12-17 17:03:48.106448547 +0200
+@@ -1,16 +1,27 @@
+ INCLUDE(vf_plugin)
+ include(admFFmpegUtil)
+
++if (WIN32)
++ set(FFMPEG_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX})
++else (WIN32)
++ set(FFMPEG_INSTALL_DIR ${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_libraries/ffmpeg/libavcodec)
++endif (WIN32)
++
+ getFfmpegLibNames("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_libraries/ffmpeg")
+ INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux")
+ INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_libraries/ffmpeg")
+ SET(ADM_vf_mcdeint_SRCS ADM_vidMcDeint.cpp)
+
+ add_library(ADM_libavcodec UNKNOWN IMPORTED)
+-set_property(TARGET ADM_libavcodec PROPERTY IMPORTED_LOCATION "${FFMPEG_LIB_DIR}/${LIBAVCODEC_LIB}")
++set_property(TARGET ADM_libavcodec PROPERTY IMPORTED_LOCATION "${FFMPEG_INSTALL_DIR}/${LIBAVCODEC_LIB}")
+
+ ADD_LIBRARY(ADM_vf_mcdeint SHARED ${ADM_vf_mcdeint_SRCS})
+ TARGET_LINK_LIBRARIES(ADM_vf_mcdeint ADM_libavcodec)
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_mcdeint -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_mcdeint -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_mcdeint -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_mcdeint)
+ INSTALL_VIDEOFILTER(ADM_vf_mcdeint)
+--- avidemux_2.5.1/plugins/ADM_videoFilters/MplayerDenoise3D/CMakeLists.txt~ 2009-12-17 17:06:04.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/MplayerDenoise3D/CMakeLists.txt 2009-12-17 17:06:06.739560739 +0200
+@@ -3,10 +3,20 @@
+
+ SET(ADM_vf_denoise3dhq_SRCS ADM_vidMPLD3D.cpp)
+ ADD_LIBRARY(ADM_vf_denoise3dhq SHARED ${ADM_vf_denoise3dhq_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_denoise3dhq -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_denoise3dhq -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_denoise3dhq -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_denoise3dhq)
+ INSTALL_VIDEOFILTER(ADM_vf_denoise3dhq)
+
+ SET(ADM_vf_denoise3d_SRCS ADM_vidMPLD3Dlow.cpp)
+ ADD_LIBRARY(ADM_vf_denoise3d SHARED ${ADM_vf_denoise3d_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_denoise3d -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_denoise3d -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_denoise3d -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_denoise3d)
+ INSTALL_VIDEOFILTER(ADM_vf_denoise3d)
+--- avidemux_2.5.1/plugins/ADM_videoFilters/ResampleFps/CMakeLists.txt~ 2009-12-17 17:06:57.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/ResampleFps/CMakeLists.txt 2009-12-17 17:07:00.326375723 +0200
+@@ -9,5 +9,11 @@
+ TARGET_LINK_LIBRARIES(ADM_vf_resampleFps -Wl,-read_only_relocs,suppress)
+ ENDIF (APPLE)
+
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_resampleFps -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_resampleFps -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_resampleFps -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
++
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_resampleFps)
+ INSTALL_VIDEOFILTER(ADM_vf_resampleFps)
+--- avidemux_2.5.1/plugins/ADM_videoFilters/Reverse/CMakeLists.txt~ 2009-12-17 17:25:35.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/Reverse/CMakeLists.txt 2009-12-17 17:25:37.086056172 +0200
+@@ -4,6 +4,11 @@
+ SET(ADM_vf_reverse_SRCS ADM_vidReverse.cpp)
+
+ ADD_LIBRARY(ADM_vf_reverse SHARED ${ADM_vf_reverse_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_reverse -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_reverse -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_reverse -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_reverse)
+ INSTALL_VIDEOFILTER(ADM_vf_reverse)
+--- avidemux_2.5.1/plugins/ADM_videoFilters/SwapUV/CMakeLists.txt~ 2009-12-17 17:26:46.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/SwapUV/CMakeLists.txt 2009-12-17 17:26:48.249381855 +0200
+@@ -4,6 +4,11 @@
+ SET(ADM_vf_swapuv_SRCS ADM_vidUVSwap.cpp)
+
+ ADD_LIBRARY(ADM_vf_swapuv SHARED ${ADM_vf_swapuv_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_swapuv -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_swapuv -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_swapuv -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_swapuv)
+ INSTALL_VIDEOFILTER(ADM_vf_swapuv)
+--- avidemux_2.5.1/plugins/ADM_videoFilters/TemporalCleaner/CMakeLists.txt~ 2009-12-17 17:35:01.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/TemporalCleaner/CMakeLists.txt 2009-12-17 17:35:03.452873917 +0200
+@@ -4,6 +4,11 @@
+ SET(ADM_vf_vlad_SRCS ADM_vidVlad.cpp)
+
+ ADD_LIBRARY(ADM_vf_vlad SHARED ${ADM_vf_vlad_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_vlad -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_vlad -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_vlad -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avidemux/avidemux.spec?r1=1.71.2.8&r2=1.71.2.9&f=u
More information about the pld-cvs-commit
mailing list