Author: firewing Update of /cvs/free/rpms/avidemux/F-11 In directory se02.es.rpmfusion.net:/tmp/cvs-serv23936/F-11 Modified Files: avidemux.spec Added Files: avidemux-2.5.1-tmplinktarget.patch Log Message: * Sat Oct 10 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.1-3.20091010svn - Fix AVIDEMUX_INSTALL_PREFIX define so plugins can link correctly avidemux-2.5.1-tmplinktarget.patch: --- NEW FILE avidemux-2.5.1-tmplinktarget.patch --- --- avidemux/CMakeLists.txt.tmplinktarget 2009-10-01 15:14:16.000000000 -0400 +++ avidemux/CMakeLists.txt 2009-10-10 19:13:17.500150360 -0400 @@ -503,15 +503,6 @@ ENDIF (MAC_BUNDLE_DIR) ELSE (APPLE) INSTALL(TARGETS ${ADM_EXES} RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib${LIB_SUFFIX}) -ENDIF (APPLE) - -IF (UNIX AND NOT APPLE) - ADD_CUSTOM_COMMAND(TARGET ffmpeg - POST_BUILD - COMMAND mkdir -p ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX} - COMMAND find ${CMAKE_BINARY_DIR}/avidemux -name '*.so*' | xargs ln -sft ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX} - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - COMMENT "Creating temporary lib directory for proper plugins linking") -ENDIF (UNIX AND NOT APPLE) +ENDIF (APPLE) Index: avidemux.spec =================================================================== RCS file: /cvs/free/rpms/avidemux/F-11/avidemux.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- avidemux.spec 10 Oct 2009 06:52:13 -0000 1.34 +++ avidemux.spec 11 Oct 2009 05:20:00 -0000 1.35 @@ -1,6 +1,6 @@ Name: avidemux Version: 2.5.1 -Release: 2.20091010svn%{?dist} +Release: 3.20091010svn%{?dist} Summary: Graphical video editing and transcoding tool Group: Applications/Multimedia @@ -29,6 +29,7 @@ Patch3: avidemux-2.5-i18n.patch Patch4: avidemux-2.5-libmpeg2enc-altivec.patch Patch5: avidemux-2.5-checkfunction-includes.patch +Patch6: avidemux-2.5.1-tmplinktarget.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -166,6 +167,7 @@ %patch3 -p1 -b .i18n %patch4 -p1 -b .altivec %patch5 -p1 -b .cfincludes +%patch6 -p0 -b .tmplinktarget %build @@ -175,9 +177,14 @@ -DAVIDEMUX_SOURCE_DIR="%{_builddir}/avidemux-%{version}-20091010svn-r5371" \ -DAVIDEMUX_CORECONFIG_DIR="%{_builddir}/avidemux-%{version}-20091010svn-r5371/build/config" \ .. -make %{?_smp_mflags} +make %{?_smp_mplags} +# Create the temp link directory manuall since otherwise it happens too early +mkdir -p %{_builddir}/avidemux-%{version}-20091010svn-r5371/build/%{_lib} +find %{_builddir}/avidemux-%{version}-20091010svn-r5371/build/avidemux -name '*.so*' | \ + xargs ln -sft %{_builddir}/avidemux-%{version}-20091010svn-r5371/build/%{_lib} + mkdir ../build_plugins && cd ../build_plugins -%cmake -DAVIDEMUX_INSTALL_PREFIX=%{_prefix} \ +%cmake -DAVIDEMUX_INSTALL_PREFIX="%{_builddir}/avidemux-%{version}-20091010svn-r5371/build/" \ -DAVIDEMUX_SOURCE_DIR="%{_builddir}/avidemux-%{version}-20091010svn-r5371" \ -DAVIDEMUX_CORECONFIG_DIR="%{_builddir}/avidemux-%{version}-20091010svn-r5371/build/config" \ ../plugins @@ -246,6 +253,9 @@ %{_includedir}/ADM_coreConfig.h %changelog +* Sat Oct 10 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.1-3.20091010svn +- Fix AVIDEMUX_INSTALL_PREFIX define so plugins can link correctly + * Sat Oct 10 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.1-2.20091010svn - Update to 2.5.1 subversion r5371