rpms/avidemux/devel avidemux-2.5.4-liba52.patch, NONE,
1.1 avidemux-2.5.4-libass.patch, NONE,
1.1 avidemux-2.5.4-libmad.patch, NONE,
1.1 avidemux-2.5.4-libtwolame.patch, NONE, 1.1 avidemux.spec,
1.46, 1.47
Richard Shaw
hobbes1069 at rpmfusion.org
Fri May 27 16:35:25 CEST 2011
- Previous message: rpms/staging-kmod-addons/F-15 sources, 1.3, 1.4 .cvsignore, 1.3,
1.4 staging-kmod-addons.spec, 1.3, 1.4
- Next message: rpms/avidemux/F-14 avidemux-2.5.4-liba52.patch, NONE,
1.1 avidemux-2.5.4-libass.patch, NONE,
1.1 avidemux-2.5.4-libmad.patch, NONE,
1.1 avidemux-2.5.4-libtwolame.patch, NONE, 1.1 avidemux.spec,
1.42, 1.43
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8902
Modified Files:
avidemux.spec
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:
* Wed May 26 2011 Richard Shaw <hobbes1069 at gmail.com> - 2.5.4-8
- Use system libass (subtitles).
- Use system liba52 (ac3 decoding).
- Use system libmad.
- Use system libtwolame.
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)
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- avidemux.spec 16 May 2011 02:38:22 -0000 1.46
+++ avidemux.spec 27 May 2011 14:35:24 -0000 1.47
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.5.4
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -43,10 +43,15 @@
Patch8: avidemux-2.5.4-gtk_menu_crash_fix.patch
# Patch needed for version of x264 in F15/rawhide.
Patch9: avidemux-2.5.4-x264_fix.patch
-# Work in progress
-#Patch10: avidemux-2.5.4-ext_lib_cmake_fix.patch
-Patch11: avidemux-2.5.4-audio_prefs.patch
-Patch12: avidemux-2.5.4-ffmpeg_perms.patch
+Patch10: avidemux-2.5.4-audio_prefs.patch
+Patch11: avidemux-2.5.4-ffmpeg_perms.patch
+# Use system libraries
+Patch12: avidemux-2.5.4-libass.patch
+Patch13: avidemux-2.5.4-liba52.patch
+Patch14: avidemux-2.5.4-libmad.patch
+Patch15: avidemux-2.5.4-libtwolame.patch
+# Uses a header file not found in the standard package
+#Patch16: avidemux-2.5.4-mpeg2enc.patch
# Upstream has been informed http://avidemux.org/admForum/viewtopic.php?id=6447
ExcludeArch: ppc ppc64
@@ -70,6 +75,7 @@
BuildRequires: libXmu-devel
BuildRequires: libsamplerate-devel
BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: libass-devel
# Sound out
BuildRequires: alsa-lib-devel >= 1.0.3
@@ -90,12 +96,13 @@
BuildRequires: opencore-amr-devel
# VP8 support, decoding only?
BuildRequires: libvpx-devel
-
+BuildRequires: twolame-devel
# Video Codecs
BuildRequires: xvidcore-devel >= 1.0.2
BuildRequires: x264-devel
BuildRequires: ffmpeg-devel
+#BuildRequires: mjpegtools-devel
# FIXME: aften not packaged, add BR when it is
@@ -172,8 +179,12 @@
%setup -q -n avidemux_%{version}
# Remove unneeded external libraries
-# Currently breaks building if it doesn't exist.
-#rm -rf avidemux/ADM_script
+rm -rf avidemux/ADM_libraries/ADM_smjs
+rm -rf plugins/ADM_videoFilters/Ass/ADM_libAss
+rm -rf plugins/ADM_audioEncoders/twolame/ADM_libtwolame
+rm -rf plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad
+rm -rf plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52
+#rm -rf plugins/ADM_videoEncoder/ADM_vidEnc_mpeg2enc/mpeg2enc
# change hardcoded libdir paths
%ifarch x86_64 ppc64
@@ -191,14 +202,18 @@
%patch7 -p1 -b .gcc46tmpfix
%patch8 -b .gtk_menu
%patch9 -p1 -b .x264fix
-# Fixes cmake configuration but build fails.
-#%patch10 -p1 -b .extlibfix
-%patch11 -p1 -b .audioprefs
-%patch12 -p1 -b .ffmpegperms
+%patch10 -p1 -b .audioprefs
+%patch11 -p1 -b .ffmpegperms
+%patch12 -p1 -b .libass
+%patch13 -p1 -b .liba52
+%patch14 -p1 -b .libmad
+%patch15 -p1 -b .libtwolame
+#%patch16 -p1 -b .mpeg2enc
+
%build
-# Out of source build
-mkdir build && cd build
+# Cmake requires out of source build
+mkdir -p build && pushd build
%cmake -DAVIDEMUX_INSTALL_PREFIX=%{_prefix} \
-DAVIDEMUX_SOURCE_DIR="%{_pkgbuilddir}" \
-DAVIDEMUX_CORECONFIG_DIR="%{_pkgbuilddir}/build/config" \
@@ -209,13 +224,15 @@
mkdir -p %{_pkgbuilddir}/build/%{_lib}
find %{_pkgbuilddir}/build/avidemux -name '*.so*' | \
xargs ln -sft %{_pkgbuilddir}/build/%{_lib}
+popd
-mkdir ../build_plugins && cd ../build_plugins
+mkdir -p build_plugins && pushd build_plugins
%cmake -DAVIDEMUX_INSTALL_PREFIX="%{_pkgbuilddir}/build/" \
-DAVIDEMUX_SOURCE_DIR="%{_pkgbuilddir}" \
-DAVIDEMUX_CORECONFIG_DIR="%{_pkgbuilddir}/build/config" \
../plugins
make %{?_smp_mflags}
+popd
%install
@@ -223,6 +240,7 @@
make -C build install DESTDIR=$RPM_BUILD_ROOT
make -C build_plugins install DESTDIR=$RPM_BUILD_ROOT
+
# Install the build configuration for devel package
install -d -m755 $RPM_BUILD_ROOT%{_includedir}
install -m644 build/config/ADM_coreConfig.h $RPM_BUILD_ROOT%{_includedir}/ADM_coreConfig.h
@@ -297,8 +315,11 @@
%{_includedir}/ADM_coreConfig.h
%changelog
-* Sun May 15 2011 Richard Shaw <hobbes1069 at gmail.com> - 2.5.4-7
-- Rebuild for updated js (spidermonkey)
+* Wed May 26 2011 Richard Shaw <hobbes1069 at gmail.com> - 2.5.4-8
+- Use system libass (subtitles).
+- Use system liba52 (ac3 decoding).
+- Use system libmad.
+- Use system libtwolame.
* Sun Apr 24 2011 Richard Shaw <hobbes1069 at gmail.com> - 2.5.4-6
- Really fix AAC this time.
- Previous message: rpms/staging-kmod-addons/F-15 sources, 1.3, 1.4 .cvsignore, 1.3,
1.4 staging-kmod-addons.spec, 1.3, 1.4
- Next message: rpms/avidemux/F-14 avidemux-2.5.4-liba52.patch, NONE,
1.1 avidemux-2.5.4-libass.patch, NONE,
1.1 avidemux-2.5.4-libmad.patch, NONE,
1.1 avidemux-2.5.4-libtwolame.patch, NONE, 1.1 avidemux.spec,
1.42, 1.43
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the rpmfusion-commits
mailing list