From 0f7f803b5b50b86adea6fa1c40f43a4e15dc2465 Mon Sep 17 00:00:00 2001 From: Juergen Lock Date: Sun, 18 Mar 2012 20:30:59 +0000 Subject: - Update to 2.5.6 . [1] - Add patch to fix build when multimedia/ffmpeg is also installed. PR: ports/166104 [1] Submitted by: 4721@hushmail.com [1] Feature safe: yes --- multimedia/avidemux2/Makefile.common | 6 +++--- multimedia/avidemux2/distinfo | 4 ++-- .../avidemux2/files/ffmpeg-libavcodec-Makefile.patch | 10 +++++----- .../avidemux2/files/patch-cmake-admFFmpegBuild.cmake | 15 +++++++++++++++ multimedia/avidemux2/files/patch-x264_encoder.cpp | 14 -------------- multimedia/avidemux2/pkg-plist | 8 ++++---- 6 files changed, 29 insertions(+), 28 deletions(-) create mode 100644 multimedia/avidemux2/files/patch-cmake-admFFmpegBuild.cmake delete mode 100644 multimedia/avidemux2/files/patch-x264_encoder.cpp (limited to 'multimedia/avidemux2') diff --git a/multimedia/avidemux2/Makefile.common b/multimedia/avidemux2/Makefile.common index 850633223ab2..f456965b57c5 100644 --- a/multimedia/avidemux2/Makefile.common +++ b/multimedia/avidemux2/Makefile.common @@ -1,8 +1,8 @@ # $FreeBSD$ # -AVIDEMUX2_VERSION= 2.5.5 -PORTREVISION= 4 +AVIDEMUX2_VERSION= 2.5.6 +PORTREVISION= 0 MASTER_SITES= BERLIOS \ SF/avidemux/avidemux/${PORTVERSION} DISTNAME= avidemux_${PORTVERSION} @@ -31,7 +31,7 @@ USE_CMAKE= yes CMAKE_USE_PTHREAD=yes CMAKE_ARGS+= -DTHREADS_HAVE_PTHREAD_ARG:STRING="${PTHREAD_LIBS}" CMAKE_OUTSOURCE= yes -MAKE_JOBS_SAFE= yes +MAKE_JOBS_UNSAFE= yes BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin diff --git a/multimedia/avidemux2/distinfo b/multimedia/avidemux2/distinfo index d8431a224986..4be49e40de60 100644 --- a/multimedia/avidemux2/distinfo +++ b/multimedia/avidemux2/distinfo @@ -1,2 +1,2 @@ -SHA256 (avidemux_2.5.5.tar.gz) = c5bf45298911e00b06cf48ae4a936525d28cc2dddd4f41ee22e689b023b4923a -SIZE (avidemux_2.5.5.tar.gz) = 15738941 +SHA256 (avidemux_2.5.6.tar.gz) = d6da7f2c4304368bd9c367a74a464b47d42fee9cada2960e70053d61c1ef9b8b +SIZE (avidemux_2.5.6.tar.gz) = 14914123 diff --git a/multimedia/avidemux2/files/ffmpeg-libavcodec-Makefile.patch b/multimedia/avidemux2/files/ffmpeg-libavcodec-Makefile.patch index c1aa0a4a22b8..31f77fc1398b 100644 --- a/multimedia/avidemux2/files/ffmpeg-libavcodec-Makefile.patch +++ b/multimedia/avidemux2/files/ffmpeg-libavcodec-Makefile.patch @@ -1,11 +1,11 @@ --- libavcodec/Makefile.orig +++ libavcodec/Makefile -@@ -619,7 +619,7 @@ OBJS-$(CONFIG_MLIB) + +@@ -703,7 +703,7 @@ # well. OBJS-$(!CONFIG_SMALL) += inverse.o ---include $(SUBDIR)$(ARCH)/Makefile -+-include $(SUBDIR)$(FFMPEG_ARCH)/Makefile +--include $(SRC_PATH)/$(SUBDIR)$(ARCH)/Makefile ++-include $(SRC_PATH)/$(SUBDIR)$(FFMPEG_ARCH)/Makefile - SKIPHEADERS = %_tablegen.h - SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h + SKIPHEADERS += %_tablegen.h \ + %_tables.h \ diff --git a/multimedia/avidemux2/files/patch-cmake-admFFmpegBuild.cmake b/multimedia/avidemux2/files/patch-cmake-admFFmpegBuild.cmake new file mode 100644 index 000000000000..9926b96fa334 --- /dev/null +++ b/multimedia/avidemux2/files/patch-cmake-admFFmpegBuild.cmake @@ -0,0 +1,15 @@ +--- cmake/admFFmpegBuild.cmake.orig ++++ cmake/admFFmpegBuild.cmake +@@ -209,9 +209,9 @@ add_library(ADM_libavformat UNKNOWN IMPO + set_property(TARGET ADM_libavformat PROPERTY IMPORTED_LOCATION "${FFMPEG_BINARY_DIR}/libavformat/${LIBAVFORMAT_LIB}") + install(${FFMPEG_SHLIB_INSTALL_TYPE} "${FFMPEG_BINARY_DIR}/libavformat/${LIBAVFORMAT_LIB}" DESTINATION "${FFMPEG_INSTALL_DIR}") + +-include_directories("${FFMPEG_SOURCE_DIR}") +-include_directories("${FFMPEG_SOURCE_DIR}/libavutil") +-include_directories("${FFMPEG_SOURCE_DIR}/libpostproc") ++include_directories(BEFORE "${FFMPEG_SOURCE_DIR}/libpostproc") ++include_directories(BEFORE "${FFMPEG_SOURCE_DIR}/libavutil") ++include_directories(BEFORE "${FFMPEG_SOURCE_DIR}") + + # Clean FFmpeg + add_custom_target(cleanffmpeg diff --git a/multimedia/avidemux2/files/patch-x264_encoder.cpp b/multimedia/avidemux2/files/patch-x264_encoder.cpp deleted file mode 100644 index fb3116571a08..000000000000 --- a/multimedia/avidemux2/files/patch-x264_encoder.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp.orig 2011-06-24 13:04:17.000000000 +0200 -+++ plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-06-24 13:05:22.000000000 +0200 -@@ -488,8 +488,10 @@ void x264Encoder::printParam(x264_param_ - printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8); - printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter); - printf("[x264] b_cabac = %d\n", x264Param->b_cabac); --#if X264_BUILD > 101 -+#if X264_BUILD > 101 && X264_BUILD < 115 - printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop); -+#else X264_BUILD > 114 -+ printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop); - #endif - printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced); - #if X264_BUILD > 88 diff --git a/multimedia/avidemux2/pkg-plist b/multimedia/avidemux2/pkg-plist index 427d33749c71..492ebd4c469e 100644 --- a/multimedia/avidemux2/pkg-plist +++ b/multimedia/avidemux2/pkg-plist @@ -1,9 +1,9 @@ bin/avidemux2_cli -lib/libADM5avcodec.so.52 -lib/libADM5avformat.so.52 -lib/libADM5avutil.so.50 +lib/libADM5avcodec.so.53 +lib/libADM5avformat.so.53 +lib/libADM5avutil.so.51 lib/libADM5postproc.so.51 -lib/libADM5swscale.so.0 +lib/libADM5swscale.so.2 lib/libADM_UICli.so lib/libADM_core.so lib/libADM_coreAudio.so -- cgit v1.2.3