Author: hobbes1069 Update of /cvs/free/rpms/avidemux/F-15 In directory se02.es.rpmfusion.net:/tmp/cvs-serv4540 Added Files: avidemux-2.5.4-liba52.patch avidemux-2.5.4-libass.patch avidemux-2.5.4-libmad.patch avidemux-2.5.4-libtwolame.patch Log Message: * Sat Jun 04 2011 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.5.4-10 - New version of js in Fedora 15 breaks build. - Re-enable built-in javascript for Fedora 15. avidemux-2.5.4-liba52.patch: ADM_ad_a52.cpp | 4 ++-- CMakeLists.txt | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) --- NEW FILE avidemux-2.5.4-liba52.patch --- diff -Naur avidemux_2.5.4.orig/plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp avidemux_2.5.4/plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp --- avidemux_2.5.4.orig/plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp 2010-03-15 13:30:11.000000000 -0500 +++ avidemux_2.5.4/plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp 2011-05-26 13:26:08.620994308 -0500 @@ -18,8 +18,8 @@ #include "ADM_ad_plugin.h" #include "ADM_audioCodecEnum.h" extern "C" { -#include "ADM_liba52/a52.h" -#include "ADM_liba52/mm_accel.h" +#include <a52dec/a52.h> +#include <a52dec/mm_accel.h> }; #define AC3_HANDLE ((a52_state_t *)ac3_handle) diff -Naur avidemux_2.5.4.orig/plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt avidemux_2.5.4/plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt --- avidemux_2.5.4.orig/plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt 2008-07-16 12:40:07.000000000 -0500 +++ avidemux_2.5.4/plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt 2011-05-26 13:24:40.789865387 -0500 @@ -1,11 +1,12 @@ INCLUDE(ad_plugin) -ADD_SUBDIRECTORY(ADM_liba52) +#ADD_SUBDIRECTORY(ADM_liba52) SET(ADM_ad_a52_SRCS ADM_ad_a52.cpp) ADD_LIBRARY(ADM_ad_a52 SHARED ${ADM_ad_a52_SRCS}) -TARGET_LINK_LIBRARIES(ADM_ad_a52 ADM_liba52) +FIND_LIBRARY(LIBA52 a52) +TARGET_LINK_LIBRARIES(ADM_ad_a52 ${LIBA52}) INIT_AUDIO_PLUGIN(ADM_ad_a52) INSTALL_AUDIODECODER(ADM_ad_a52) avidemux-2.5.4-libass.patch: ADM_vidASS.h | 2 +- CMakeLists.txt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) --- NEW FILE avidemux-2.5.4-libass.patch --- diff -Naur avidemux_2.5.4.orig/plugins/ADM_videoFilters/Ass/ADM_vidASS.h avidemux_2.5.4/plugins/ADM_videoFilters/Ass/ADM_vidASS.h --- avidemux_2.5.4.orig/plugins/ADM_videoFilters/Ass/ADM_vidASS.h 2010-01-09 05:03:17.000000000 -0600 +++ avidemux_2.5.4/plugins/ADM_videoFilters/Ass/ADM_vidASS.h 2011-05-25 14:27:23.828297237 -0500 @@ -14,7 +14,7 @@ extern "C" { -#include "ADM_libAss/ass.h" +#include <ass/ass.h> } #include "ADM_vidAss_Params.h" class ADMVideoSubASS : public AVDMGenericVideoStream diff -Naur avidemux_2.5.4.orig/plugins/ADM_videoFilters/Ass/CMakeLists.txt avidemux_2.5.4/plugins/ADM_videoFilters/Ass/CMakeLists.txt --- avidemux_2.5.4.orig/plugins/ADM_videoFilters/Ass/CMakeLists.txt 2010-01-09 05:03:17.000000000 -0600 +++ avidemux_2.5.4/plugins/ADM_videoFilters/Ass/CMakeLists.txt 2011-05-25 15:45:05.219501216 -0500 @@ -2,13 +2,14 @@ checkFreeType() IF (USE_FREETYPE) - ADD_SUBDIRECTORY(ADM_libAss) + #ADD_SUBDIRECTORY(ADM_libAss) INCLUDE(vf_plugin) SET(ADM_vf_ssa_SRCS ADM_vidASS.cpp) ADD_LIBRARY(ADM_vf_ssa SHARED ${ADM_vf_ssa_SRCS}) - TARGET_LINK_LIBRARIES(ADM_vf_ssa ADM_libass) + FIND_LIBRARY(LIBASS ass) + TARGET_LINK_LIBRARIES(ADM_vf_ssa ${LIBASS}) ADD_TARGET_CFLAGS(ADM_vf_ssa "-DCONFIG_FREETYPE=1") ADD_TARGET_LDFLAGS(ADM_vf_ssa "${FREETYPE2_LDFLAGS}") avidemux-2.5.4-libmad.patch: ADM_ad_mad.cpp | 2 +- CMakeLists.txt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) --- NEW FILE avidemux-2.5.4-libmad.patch --- diff -Naur avidemux_2.5.4.orig/plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp avidemux_2.5.4/plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp --- avidemux_2.5.4.orig/plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp 2009-08-12 13:12:50.000000000 -0500 +++ avidemux_2.5.4/plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp 2011-05-26 13:34:21.972858642 -0500 @@ -17,7 +17,7 @@ #include "ADM_default.h" #include "ADM_ad_plugin.h" #include "ADM_audioCodecEnum.h" -#include "ADM_libMad/mad.h" +#include <mad.h> #define Stream ((mad_stream *)_stream) #define Frame ((mad_frame *)_frame) diff -Naur avidemux_2.5.4.orig/plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt avidemux_2.5.4/plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt --- avidemux_2.5.4.orig/plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt 2008-07-16 12:40:07.000000000 -0500 +++ avidemux_2.5.4/plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt 2011-05-26 13:32:24.292708724 -0500 @@ -8,12 +8,13 @@ ADD_DEFINITIONS("-DFPM_PPC") ENDIF (ADM_CPU_X86_32) -ADD_SUBDIRECTORY(ADM_libMad) +#ADD_SUBDIRECTORY(ADM_libMad) SET(ADM_ad_Mad_SRCS ADM_ad_mad.cpp) ADD_LIBRARY(ADM_ad_Mad SHARED ${ADM_ad_Mad_SRCS}) -TARGET_LINK_LIBRARIES(ADM_ad_Mad ADM_libMad) +FIND_LIBRARY(LIBMAD mad) +TARGET_LINK_LIBRARIES(ADM_ad_Mad ${LIBMAD}) INIT_AUDIO_PLUGIN(ADM_ad_Mad) INSTALL_AUDIODECODER(ADM_ad_Mad) avidemux-2.5.4-libtwolame.patch: CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- NEW FILE avidemux-2.5.4-libtwolame.patch --- diff -Naur avidemux_2.5.4.orig/plugins/ADM_audioEncoders/twolame/CMakeLists.txt avidemux_2.5.4/plugins/ADM_audioEncoders/twolame/CMakeLists.txt --- avidemux_2.5.4.orig/plugins/ADM_audioEncoders/twolame/CMakeLists.txt 2010-05-25 15:48:57.000000000 -0500 +++ avidemux_2.5.4/plugins/ADM_audioEncoders/twolame/CMakeLists.txt 2011-05-26 12:39:31.025294147 -0500 @@ -1,12 +1,13 @@ INCLUDE(ae_plugin) - subdirs(PREORDER ADM_libtwolame) + #subdirs(PREORDER ADM_libtwolame) SET(ADM_ae_twolame_SRCS audioencoder_twolame.cpp) ADD_LIBRARY(ADM_ae_twolame SHARED ${ADM_ae_twolame_SRCS}) - TARGET_LINK_LIBRARIES(ADM_ae_twolame ADM_libtwolame ADM_coreAudio ADM_coreUI) - include_directories(ADM_libtwolame) + FIND_LIBRARY(LIBTWOLAME twolame) + TARGET_LINK_LIBRARIES(ADM_ae_twolame ${LIBTWOLAME} ADM_coreAudio ADM_coreUI) + #include_directories(ADM_libtwolame) INIT_AUDIO_ENCODER(ADM_ae_twolame)