Author: hobbes1069 Update of /cvs/free/rpms/avidemux/F-16 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30110 Added Files: avidemux-2.6-bundled_libs.patch avidemux-2.6-use_external_libass.patch avidemux3-bundled_libs.patch avidemux3-glu_fix.patch avidemux3-libass.patch Log Message: Add patches to cvs. avidemux-2.6-bundled_libs.patch: CMakeLists.txt | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) --- NEW FILE avidemux-2.6-bundled_libs.patch --- diff -Naur avidemux_2.6.0.orig/avidemux_plugins/CMakeLists.txt avidemux_2.6.0/avidemux_plugins/CMakeLists.txt --- avidemux_2.6.0.orig/avidemux_plugins/CMakeLists.txt 2012-07-13 02:50:08.000000000 -0500 +++ avidemux_2.6.0/avidemux_plugins/CMakeLists.txt 2012-09-14 14:57:05.767002527 -0500 @@ -37,6 +37,40 @@ LINK_DIRECTORIES("${AVIDEMUX_SEARCH_LIB_DIR}") INCLUDE_DIRECTORIES("${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/2.6") +######################################### +# Unbundle some libraries here +######################################### +OPTION(USE_EXTERNAL_LIBASS "Use system installed libass library." OFF) +OPTION(USE_EXTERNAL_LIBMAD "Use system installed libmad library." OFF) +OPTION(USE_EXTERNAL_LIBA52 "Use system installed liba52 library." OFF) +OPTION(USE_EXTERNAL_LIBTWOLAME "Use system installed libtwolame library." OFF) + +INCLUDE(FindPkgConfig) + +# libass +IF(USE_EXTERNAL_LIBASS) + PKG_CHECK_MODULES(LIBASS REQUIRED libass) + INCLUDE_DIRECTORIES(SYSTEM ${LIBASS_INCLUDE_DIRS}) +ENDIF() + +# libmad +IF(USE_EXTERNAL_LIBMAD) + PKG_CHECK_MODULES(LIBMAD REQUIRED mad) + INCLUDE_DIRECTORIES(SYSTEM ${LIBMAD_INCLUDE_DIRS}) +ENDIF() + +# liba52 +IF(USE_EXTERNAL_LIBA52) + FIND_PATH(LIBA52_INCLUDE_DIR a52dec/a52.h) + FIND_LIBRARY(LIBA52_LIBRARIES a52) + INCLUDE_DIRECTORIES(SYSTEM ${LIBA52_INCLUDE_DIR}) +ENDIF() + +# twolame +IF(USE_EXTERNAL_TWOLAME) + PKG_CHECK_MODULES(LIBTWOLAME REQUIRED twolame) + INCLUDE_DIRECTORIES(SYSTEM ${LIBTWOLAME_INCLUDE_DIRS}) +ENDIF() IF (FRESH_BUILD) MESSAGE("") avidemux-2.6-use_external_libass.patch: ADM_videoFilters6/ass/CMakeLists.txt | 8 +++++++- CMakeLists.txt | 16 +++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) --- NEW FILE avidemux-2.6-use_external_libass.patch --- diff -Naur snapshot_7732.orig/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt snapshot_7732/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt --- snapshot_7732.orig/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt 2012-01-28 20:02:45.000000000 -0600 +++ snapshot_7732/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt 2012-01-31 12:52:29.573651021 -0600 @@ -10,7 +10,13 @@ ADD_VIDEO_FILTER(ADM_vf_ssa ${ADM_vf_ssa_SRCS}) IF(DO_COMMON) - TARGET_LINK_LIBRARIES(ADM_vf_ssa ADM_libass ${FREETYPE2_LDFLAGS}) + IF(USE_EXTERNAL_LIBASS) + TARGET_LINK_LIBRARIES(ADM_vf_ssa ${LIBASS_LIBRARIES} + ${FREETYPE2_LDFLAGS}) + ELSE(USE_EXTERNAL_LIBASS) + TARGET_LINK_LIBRARIES(ADM_vf_ssa ADM_libass + ${FREETYPE2_LDFLAGS}) + ENDIF(USE_EXTERNAL_LIBASS) IF (FONTCONFIG_FOUND) ADD_DEFINITIONS("-DUSE_FONTCONFIG") diff -Naur snapshot_7732.orig/avidemux_plugins/CMakeLists.txt snapshot_7732/avidemux_plugins/CMakeLists.txt --- snapshot_7732.orig/avidemux_plugins/CMakeLists.txt 2012-01-28 20:02:45.000000000 -0600 +++ snapshot_7732/avidemux_plugins/CMakeLists.txt 2012-01-31 12:54:22.867861790 -0600 @@ -37,6 +37,20 @@ LINK_DIRECTORIES("${AVIDEMUX_SEARCH_LIB_DIR}") INCLUDE_DIRECTORIES("${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/2.6") +######################################### +# Unbundle some libraries here +######################################### +OPTION(USE_EXTERNAL_LIBASS "Use system install libass library." OFF) + +# libass +IF(USE_EXTERNAL_LIBASS) + INCLUDE(FindPkgConfig) + PKG_CHECK_MODULES(LIBASS REQUIRED libass) + INCLUDE_DIRECTORIES(LIBASS_INCLUDE_DIRS) +ENDIF() + + + IF (FRESH_BUILD) MESSAGE("") @@ -203,4 +217,4 @@ include(admPackager) admPackager(pluginsPackage) -MESSAGE("") \ No newline at end of file +MESSAGE("") avidemux3-bundled_libs.patch: ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp | 4 ++-- ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt | 11 +++++++++-- ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp | 2 +- ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt | 11 +++++++++-- ADM_videoFilters6/ass/ADM_vidASS.cpp | 2 +- 5 files changed, 22 insertions(+), 8 deletions(-) --- NEW FILE avidemux3-bundled_libs.patch --- diff -Naur avidemux_2.6.0.orig/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt --- avidemux_2.6.0.orig/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt 2011-02-17 13:04:55.000000000 -0600 +++ avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt 2012-09-15 15:03:06.009414605 -0500 @@ -1,11 +1,18 @@ INCLUDE(ad_plugin) -ADD_SUBDIRECTORY(ADM_liba52) +IF(NOT USE_EXTERNAL_LIBA52) + ADD_SUBDIRECTORY(ADM_liba52) +ENDIF() SET(ADM_ad_a52_SRCS ADM_ad_a52.cpp) ADD_AUDIO_DECODER( ADM_ad_a52 ${ADM_ad_a52_SRCS}) -TARGET_LINK_LIBRARIES(ADM_ad_a52 ADM_liba52) + +IF(USE_EXTERNAL_LIBA52) + TARGET_LINK_LIBRARIES(ADM_ad_a52 ${LIBA52_LIBRARIES}) +ELSE() + TARGET_LINK_LIBRARIES(ADM_ad_a52 ADM_liba52) +ENDIF() INIT_AUDIO_PLUGIN(ADM_ad_a52) INSTALL_AUDIODECODER(ADM_ad_a52) diff -Naur avidemux_2.6.0.orig/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt --- avidemux_2.6.0.orig/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt 2011-02-17 13:04:55.000000000 -0600 +++ avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt 2012-09-15 15:04:31.914550564 -0500 @@ -8,13 +8,20 @@ ADD_DEFINITIONS("-DFPM_PPC") ENDIF (ADM_CPU_X86_32) -ADD_SUBDIRECTORY(ADM_libMad) +IF(NOT USE_EXTERNAL_LIBMAD) + ADD_SUBDIRECTORY(ADM_libMad) +ENDIF() ADD_DEFINITIONS("-DHAVE_ASSERT_H") SET(ADM_ad_Mad_SRCS ADM_ad_mad.cpp) ADD_AUDIO_DECODER( ADM_ad_Mad ${ADM_ad_Mad_SRCS}) -TARGET_LINK_LIBRARIES(ADM_ad_Mad ADM_libMad) + +IF(USE_EXTERNAL_LIBMAD) + TARGET_LINK_LIBRARIES(ADM_ad_Mad ${LIBMAD_LIBRARIES}) +ELSE() + TARGET_LINK_LIBRARIES(ADM_ad_Mad ADM_libMad) +ENDIF() INIT_AUDIO_PLUGIN(ADM_ad_Mad) INSTALL_AUDIODECODER(ADM_ad_Mad) diff -Naur avidemux_2.6.0.orig/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp --- avidemux_2.6.0.orig/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp 2012-08-05 00:50:48.000000000 -0500 +++ avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp 2012-09-15 15:15:44.275205965 -0500 @@ -18,8 +18,8 @@ #include "ADM_ad_plugin.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.6.0.orig/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp --- avidemux_2.6.0.orig/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp 2012-06-06 00:51:28.000000000 -0500 +++ avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp 2012-09-15 15:16:02.560599956 -0500 @@ -16,7 +16,7 @@ ***************************************************************************/ #include "ADM_default.h" #include "ADM_ad_plugin.h" -#include "ADM_libMad/mad.h" +#include "mad.h" #define Stream ((mad_stream *)_stream) #define Frame ((mad_frame *)_frame) diff -Naur avidemux_2.6.0.orig/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp avidemux_2.6.0/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp --- avidemux_2.6.0.orig/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp 2012-08-24 06:52:00.000000000 -0500 +++ avidemux_2.6.0/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp 2012-09-15 16:16:33.076596468 -0500 @@ -23,7 +23,7 @@ extern "C" { -#include "ADM_libass/ass.h" +#include "ass/ass.h" } /** avidemux3-glu_fix.patch: avidemux/common/ADM_render/GUI_qtGlRender.cpp | 3 ++- avidemux/qt4/ADM_UIs/src/T_openGL.cpp | 1 + avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeintGl.cpp | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) --- NEW FILE avidemux3-glu_fix.patch --- diff -Naur snapshot_7669.orig/avidemux/common/ADM_render/GUI_qtGlRender.cpp snapshot_7669/avidemux/common/ADM_render/GUI_qtGlRender.cpp --- snapshot_7669.orig/avidemux/common/ADM_render/GUI_qtGlRender.cpp 2011-11-27 20:02:33.000000000 -0600 +++ snapshot_7669/avidemux/common/ADM_render/GUI_qtGlRender.cpp 2011-11-29 08:40:03.430504962 -0600 @@ -20,6 +20,7 @@ # define GL_TEXTURE_RECTANGLE_NV GL_TEXTURE_RECTANGLE_EXT #else # include <GL/gl.h> +# include <GL/glu.h> # include <GL/glext.h> #endif #define ADM_LEGACY_PROGGY // Dont clash with free/malloc etc.. @@ -401,4 +402,4 @@ { return new QtGlRender(); } -// EOF \ No newline at end of file +// EOF diff -Naur snapshot_7669.orig/avidemux/qt4/ADM_UIs/src/T_openGL.cpp snapshot_7669/avidemux/qt4/ADM_UIs/src/T_openGL.cpp --- snapshot_7669.orig/avidemux/qt4/ADM_UIs/src/T_openGL.cpp 2011-11-27 20:02:33.000000000 -0600 +++ snapshot_7669/avidemux/qt4/ADM_UIs/src/T_openGL.cpp 2011-11-29 08:36:33.920379672 -0600 @@ -7,6 +7,7 @@ #include "T_openGLFilter.h" #include "ADM_default.h" #include "DIA_coreToolkit.h" +#include <GL/glu.h> static QGLWidget *thisWidget=NULL; /** diff -Naur snapshot_7669.orig/avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeintGl.cpp snapshot_7669/avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeintGl.cpp --- snapshot_7669.orig/avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeintGl.cpp 2011-11-27 20:02:37.000000000 -0600 +++ snapshot_7669/avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeintGl.cpp 2011-11-29 08:38:52.901819308 -0600 @@ -12,6 +12,7 @@ #define GL_GLEXT_PROTOTYPES # include <GL/gl.h> +# include <GL/glu.h> # include <GL/glext.h> #include <QtGui/QImage> avidemux3-libass.patch: CMakeLists.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) --- NEW FILE avidemux3-libass.patch --- --- avidemux3/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt.bund_libs 2012-06-17 21:01:09.000000000 -0500 +++ avidemux3/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt 2012-06-18 14:52:06.836495759 -0500 @@ -4,15 +4,20 @@ checkFridibi("0.19") IF (USE_FREETYPE AND USE_FRIDIBI) - ADD_SUBDIRECTORY(ADM_libass) - INCLUDE(vf_plugin) SET(ADM_vf_ssa_SRCS ADM_vidASS.cpp) ADD_VIDEO_FILTER(ADM_vf_ssa ${ADM_vf_ssa_SRCS}) IF(DO_COMMON) - TARGET_LINK_LIBRARIES(ADM_vf_ssa ADM_libass ${FREETYPE2_LDFLAGS} ${FRIDIBI_LDFLAGS}) + IF(USE_EXTERNAL_LIBASS) + TARGET_LINK_LIBRARIES(ADM_vf_ssa ${LIBASS_LIBRARIES} + ${FREETYPE2_LDFLAGS}) + ELSE(USE_EXTERNAL_LIBASS) + ADD_SUBDIRECTORY(ADM_libass) + TARGET_LINK_LIBRARIES(ADM_vf_ssa ADM_libass + ${FREETYPE2_LDFLAGS}) + ENDIF(USE_EXTERNAL_LIBASS) IF (FONTCONFIG_FOUND) ADD_DEFINITIONS("-DUSE_FONTCONFIG")