There is a new version of avidemux: Avidemux 2.5.4 (Release Date: 2010-10-24) in ports: Version 2.4.4 maybe the update solves ports/151983 (avidemux crashes here when saving) thank you!
State Changed From-To: open->feedback Can you provide a patch? This port is currently pretty much unmaintained (current maintainer does not have time anymore and is willing to give up maintainership)
Responsible Changed From-To: freebsd-ports-bugs->pav Track
I finally got around finishing the avidemux2 update I started last week and putting it in tb with an up-to-date portstree. I still have to update the installed ports on this box so I could only build-test the port with the latest x264 (files/patch-x264_110) so testing of that function is very welcome, but also of other features as I obviously couldn't test everything. :) A note about the ports themselves: the new avidemux version now builds plugins seperately and during that build expects the main parts already installed so I had to move the plugins to a slave port using a Makefile.common (because the plugin port has to depend on the main port) - but this makes portlint unhappy. If that is a problem I guess I'd have to use two seperate Makefiles with lots of code duplication which I'd rather not to... Patch and shar of the updated port also at: http://people.freebsd.org/~nox/tmp/avidemux2-2.5.4.patch http://people.freebsd.org/~nox/tmp/avidemux2-2.5.4.shar (the patch needs to be applied in /usr/ports/multimedia with -p0 since it creates a new dir for the plugin port.) Oh and it just occured to me: Should we add a pkg-message to tell people about the seperate plugin port since it is new? And the plists could probably be sorted... Index: avidemux2/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/avidemux2/Makefile,v retrieving revision 1.71 diff -u -p -r1.71 Makefile --- avidemux2/Makefile 30 Nov 2010 09:50:45 -0000 1.71 +++ avidemux2/Makefile 4 Dec 2010 16:38:41 -0000 @@ -2,222 +2,19 @@ # Date created: 16 April 2003 # Whom: Anish Mistry # with help from mean # $FreeBSD: ports/multimedia/avidemux2/Makefile,v 1.71 2010/11/30 09:50:45 mm Exp $ # PORTNAME= avidemux2 -PORTVERSION= 2.4.4 -PORTREVISION= 10 +PORTVERSION= ${AVIDEMUX2_VERSION} CATEGORIES= multimedia -MASTER_SITES= ${MASTER_SITE_BERLIOS} \ - SF/avidemux/avidemux/${PORTVERSION} -DISTNAME= avidemux_${PORTVERSION} -MAINTAINER= amistry@am-productions.biz +MAINTAINER= multimedia@FreeBSD.org COMMENT= Simple GUI based video editor -LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \ - mad.2:${PORTSDIR}/audio/libmad \ - a52.0:${PORTSDIR}/audio/liba52 \ - png.6:${PORTSDIR}/graphics/png \ - execinfo.1:${PORTSDIR}/devel/libexecinfo - -CONFLICTS= avidemux2-2.[0-35-9].* -# Necessary for CMake to find libs -CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -CXXFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib - -USE_GNOME= libxml2 -USE_QT_VER= 4 -QT_COMPONENTS= - -USE_ICONV= yes -WANT_SDL= yes -USE_CMAKE= yes -CMAKE_USE_PTHREAD=yes -CMAKE_ARGS+= -DTHREADS_HAVE_PTHREAD_ARG:STRING="${PTHREAD_LIBS}" - -OPTIONS= GTK "GTK+ GUI" on \ - QT4 "QT4 GUI (Experimental)" off \ - FREETYPE "TrueType font rendering engine" on \ - FONTCONFIG "Font configuration API for X" on \ - OSS "OSS audio device" on \ - ESD "ESOUND audio device" off \ - JACK "JACK audio device" off \ - PULSE "PULSE audio device" off \ - XVIDEO "X Video Extension library" on \ - FAAC "FAAC (mpeg4/aac encoder)" on \ - FAAD "FAAD (mpeg4/aac decoder)" on \ - X264 "H.264 encoding" on \ - XVID "Xvid video" on \ - SDL "SDL audio/video framework" on \ - DCA "DTS Coherent Acoustics decoder" on \ - AMRNB "3GPP AMR Speech Codec" on \ - VORBIS "OGG/Vorbis audio support" on \ - SAMPLERATE "Sample Rate Converter for audio" on \ - NLS "Native languages support" on \ - OPTIMIZED_CFLAGS "build with -O3 for lavcodec" off - -.include <bsd.port.pre.mk> - -# Package server cannot distribute these -.if defined(PACKAGE_BUILDING) -WITHOUT_LAME= yes -WITHOUT_FAAC= yes -WITHOUT_AMRNB= yes -.endif - -# We haven't ALSA(Never) & Aften(Yet) on FreeBSD -CMAKE_ARGS+= -DNO_ARTS=1 -DNO_ALSA=1 -DNO_Aften=1 - -.if !defined(WITH_GTK) && !defined(WITH_QT4) -CMAKE_ARGS+= -DNO_X11=1 -DNO_GTK=1 -DNO_QT4=1 -.endif - -.if defined(WITHOUT_GTK) -CMAKE_ARGS+= -DNO_GTK=1 -PLIST_SUB+= GTK="@comment " -.else -USE_GNOME+= gnomeprefix gnomehack gtk20 -PLIST_SUB+= GTK="" -.endif - -.if defined(WITHOUT_QT4) -CMAKE_ARGS+= -DNO_QT4=1 -PLIST_SUB+= QT4="@comment " -.else -QT_COMPONENTS= qmake_build moc_build rcc_build uic_build linguist_build gui -PLIST_SUB+= QT4="" -.endif - -.if defined(WITH_GTK) || defined(WITH_QT4) -USE_GNOME+= libxslt desktopfileutils -.endif - -.if defined(WITHOUT_OSS) -CMAKE_ARGS+= -DNO_OSS=1 -.endif - -.if defined(WITHOUT_ESD) -CMAKE_ARGS+= -DNO_Esd=1 -.else -USE_GNOME+= esound -.endif - -.if defined(WITHOUT_JACK) -CMAKE_ARGS+= -DNO_Jack=1 -.else -LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack -.endif - -.if defined(WITHOUT_PULSE) -CMAKE_ARGS+= -DNO_PULSE_SIMPLE=1 -.else -LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio -.endif - -.if defined(WITHOUT_FREETYPE) -CMAKE_ARGS+= -DNO_FREETYPE=1 -.else -LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 -.endif - -.if defined(WITHOUT_FONTCONFIG) -CMAKE_ARGS+= -DNO_FontConfig=1 -.else -LIB_DEPENDS+= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig -.endif - -.if defined(WITHOUT_SAMPLERATE) -CMAKE_ARGS+= -DNO_libsamplerate=1 -.else -LIB_DEPENDS+= samplerate.1:${PORTSDIR}/audio/libsamplerate -.endif - -.if defined(WITHOUT_XVIDEO) -CMAKE_ARGS+= -DNO_XV=1 -.else -LIB_DEPENDS+= Xv.1:${PORTSDIR}/x11/libXv -.endif - -.if defined(WITHOUT_FAAC) -CMAKE_ARGS+= -DNO_FAAC=1 -.else -LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac -.endif - -.if defined(WITHOUT_FAAD) -CMAKE_ARGS+= -DNO_FAAD=1 -DNO_NeAAC=1 -.else -LIB_DEPENDS+= faad.2:${PORTSDIR}/audio/faad -.endif - -.if defined(WITHOUT_X264) -CMAKE_ARGS+= -DNO_x264=1 -.else -LIB_DEPENDS+= x264.110:${PORTSDIR}/multimedia/x264 -.endif - -.if defined(WITHOUT_XVID) -CMAKE_ARGS+= -DNO_Xvid=1 -.else -LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid -.endif - -.if defined(WITHOUT_SDL) -CMAKE_ARGS+= -DNO_SDL=1 -.else -USE_SDL= sdl -.endif - -.if defined(WITHOUT_VORBIS) -CMAKE_ARGS+= -DNO_Vorbis=1 -.else -LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis -.endif - -.if defined(WITHOUT_DCA) -CMAKE_ARGS+= -DNO_libdca=1 -.else -LIB_DEPENDS+= dca.0:${PORTSDIR}/multimedia/libdca -.endif - -.if defined(WITHOUT_AMRNB) -CMAKE_ARGS+= -DNO_AMRNB=1 -.else -LIB_DEPENDS+= amrnb.3:${PORTSDIR}/audio/libamrnb -.endif - -.if defined(WITHOUT_NLS) -CMAKE_ARGS+= -DNO_NLS=1 -PLIST_SUB+= NLS="@comment " QT_NLS="@comment " -.else -USE_GETTEXT= yes -PLIST_SUB+= NLS="" -. if !defined(WITH_QT4) -PLIST_SUB+= QT_NLS="@comment " -. else -PLIST_SUB+= QT_NLS="" -. endif -.endif +.include "${.CURDIR}/Makefile.common" -.if ${ARCH} == "sparc64" -BROKEN= Does not compile on sparc64 -.endif - -post-extract: - @${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//' \ - ${WRKSRC}/avidemux/ADM_libraries/ADM_mplex/ADM_mplexout.cpp - -post-patch: - @${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/*/*/Makefile - @${CP} ${FILESDIR}/execinfo.cpp ${WRKSRC}/cmake_compile_check/ - @${REINPLACE_CMD} "s|%%DATADIR%%|${DATADIR}|g" \ - ${WRKSRC}/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp \ - ${WRKSRC}/cmake/Ts.cmake -.if !defined(WITH_OPTIMIZED_CFLAGS) - @${REINPLACE_CMD} "s|-O3|${CFLAGS}|g" ${WRKSRC}/avidemux/ADM_libraries/ADM_lavcodec/Makefile.am -.endif +post-configure: post-configure-common post-install: .if defined(WITH_GTK) || defined(WITH_QT4) Index: avidemux2/distinfo =================================================================== RCS file: /home/pcvs/ports/multimedia/avidemux2/distinfo,v retrieving revision 1.19 diff -u -p -r1.19 distinfo --- avidemux2/distinfo 17 Apr 2009 23:35:33 -0000 1.19 +++ avidemux2/distinfo 4 Dec 2010 16:38:41 -0000 @@ -1,3 +1,2 @@ -MD5 (avidemux_2.4.4.tar.gz) = 503dfd25842ef81be7c769811e7bc54e -SHA256 (avidemux_2.4.4.tar.gz) = 45aafd6e54047edcfe9c985f4c9523c0efd71f7d21dad5e584aceb92c63e2956 -SIZE (avidemux_2.4.4.tar.gz) = 6894690 +SHA256 (avidemux_2.5.4.tar.gz) = 355bd3d235f6b3d0af65cbed535f51a1a7213c8abf8794af8b8d2cf88c1d720d +SIZE (avidemux_2.5.4.tar.gz) = 18154965 Index: avidemux2/pkg-plist =================================================================== RCS file: /home/pcvs/ports/multimedia/avidemux2/pkg-plist,v retrieving revision 1.10 diff -u -p -r1.10 pkg-plist --- avidemux2/pkg-plist 23 Aug 2009 10:36:55 -0000 1.10 +++ avidemux2/pkg-plist 4 Dec 2010 16:38:41 -0000 @@ -1,34 +1,78 @@ bin/avidemux2_cli +lib/libADM5avcodec.so.52 +lib/libADM5avcore.so.0 +lib/libADM5avformat.so.52 +lib/libADM5avutil.so.50 +lib/libADM5postproc.so.51 +lib/libADM5swscale.so.0 +lib/libADM_UICli.so +lib/libADM_core.so +lib/libADM_coreAudio.so +lib/libADM_coreImage.so +lib/libADM_coreUI.so +lib/libADM_render_cli.so +lib/libADM_smjs.so +share/ADM_addons/avsfilter/avsload.exe +share/ADM_addons/avsfilter/pipe_source.dll +share/ADM_scripts/video/filter.js +share/ADM_scripts/video/functions.js +share/ADM_scripts/video/autoWizard.js +share/ADM_scripts/auto/Sony PlayStation Portable.js +share/ADM_scripts/auto/Optical Disc/Video CD.js +share/ADM_scripts/auto/Optical Disc/Super Video CD.js +share/ADM_scripts/auto/Optical Disc/DVD.js +share/ADM_scripts/auto/Apple iPod.js +@dirrm share/ADM_addons/avsfilter +@dirrm share/ADM_addons +@dirrm share/ADM_scripts/auto/Optical Disc +@dirrm share/ADM_scripts/auto +@dirrm share/ADM_scripts/video +@dirrm share/ADM_scripts %%GTK%%bin/avidemux2_gtk %%QT4%%bin/avidemux2_qt4 +%%GTK%%lib/libADM_UIGtk.so +%%GTK%%lib/libADM_render_gtk.so +%%QT4%%lib/libADM_UIQT4.so +%%QT4%%lib/libADM_render_qt4.so +%%NLS%%share/locale/bg/LC_MESSAGES/avidemux.mo %%NLS%%share/locale/ca/LC_MESSAGES/avidemux.mo %%NLS%%share/locale/cs/LC_MESSAGES/avidemux.mo %%NLS%%share/locale/de/LC_MESSAGES/avidemux.mo %%NLS%%share/locale/el/LC_MESSAGES/avidemux.mo %%NLS%%share/locale/es/LC_MESSAGES/avidemux.mo %%NLS%%share/locale/fr/LC_MESSAGES/avidemux.mo +%%NLS%%share/locale/hu/LC_MESSAGES/avidemux.mo %%NLS%%share/locale/it/LC_MESSAGES/avidemux.mo %%NLS%%share/locale/ja/LC_MESSAGES/avidemux.mo +%%NLS%%share/locale/pl/LC_MESSAGES/avidemux.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/avidemux.mo %%NLS%%share/locale/ru/LC_MESSAGES/avidemux.mo %%NLS%%share/locale/sr/LC_MESSAGES/avidemux.mo %%NLS%%share/locale/sr@latin/LC_MESSAGES/avidemux.mo %%NLS%%share/locale/tr/LC_MESSAGES/avidemux.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/avidemux.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/avidemux.mo %%NLS%%@dirrmtry share/locale/sr@latin/LC_MESSAGES %%NLS%%@dirrmtry share/locale/sr@latin -%%QT_NLS%%share/avidemux2/avidemux_ca.qm -%%QT_NLS%%share/avidemux2/avidemux_cs.qm -%%QT_NLS%%share/avidemux2/avidemux_de.qm -%%QT_NLS%%share/avidemux2/avidemux_el.qm -%%QT_NLS%%share/avidemux2/avidemux_es.qm -%%QT_NLS%%share/avidemux2/avidemux_fr.qm -%%QT_NLS%%share/avidemux2/avidemux_it.qm -%%QT_NLS%%share/avidemux2/avidemux_ja.qm -%%QT_NLS%%share/avidemux2/avidemux_pt_BR.qm -%%QT_NLS%%share/avidemux2/avidemux_ru.qm -%%QT_NLS%%share/avidemux2/avidemux_sr.qm -%%QT_NLS%%share/avidemux2/avidemux_sr@latin.qm -%%QT_NLS%%share/avidemux2/avidemux_tr.qm -%%QT_NLS%%share/avidemux2/qt_cs.qm -%%QT_NLS%%share/avidemux2/qt_fr.qm -%%QT_NLS%%share/avidemux2/qt_it.qm +%%QT_NLS%%share/avidemux/i18n/avidemux_ca.qm +%%QT_NLS%%share/avidemux/i18n/avidemux_cs.qm +%%QT_NLS%%share/avidemux/i18n/avidemux_de.qm +%%QT_NLS%%share/avidemux/i18n/avidemux_el.qm +%%QT_NLS%%share/avidemux/i18n/avidemux_es.qm +%%QT_NLS%%share/avidemux/i18n/avidemux_fr.qm +%%QT_NLS%%share/avidemux/i18n/avidemux_it.qm +%%QT_NLS%%share/avidemux/i18n/avidemux_ja.qm +%%QT_NLS%%share/avidemux/i18n/avidemux_pl.qm +%%QT_NLS%%share/avidemux/i18n/avidemux_pt_BR.qm +%%QT_NLS%%share/avidemux/i18n/avidemux_ru.qm +%%QT_NLS%%share/avidemux/i18n/avidemux_sr.qm +%%QT_NLS%%share/avidemux/i18n/avidemux_sr@latin.qm +%%QT_NLS%%share/avidemux/i18n/avidemux_tr.qm +%%QT_NLS%%share/avidemux/i18n/avidemux_zh_TW.qm +%%QT_NLS%%share/avidemux/i18n/qt_cs.qm +%%QT_NLS%%share/avidemux/i18n/qt_de.qm +%%QT_NLS%%share/avidemux/i18n/qt_fr.qm +%%QT_NLS%%share/avidemux/i18n/qt_it.qm +%%QT_NLS%%share/avidemux/i18n/qt_zh_TW.qm +%%QT_NLS%%@dirrm share/avidemux/i18n +%%QT_NLS%%@dirrm share/avidemux Index: avidemux2/files/patch-CMakeLists.txt =================================================================== RCS file: /home/pcvs/ports/multimedia/avidemux2/files/patch-CMakeLists.txt,v retrieving revision 1.1 diff -u -p -r1.1 patch-CMakeLists.txt --- avidemux2/files/patch-CMakeLists.txt 15 Jul 2008 02:53:29 -0000 1.1 +++ avidemux2/files/patch-CMakeLists.txt 4 Dec 2010 16:38:41 -0000 @@ -1,27 +1,26 @@ ---- ./CMakeLists.txt.orig 2007-10-14 13:27:59.000000000 +0200 -+++ ./CMakeLists.txt 2008-07-10 17:16:26.000000000 +0200 -@@ -101,11 +101,15 @@ - if(NOT WIN32) - MESSAGE(STATUS "<Checking for X11>") - MESSAGE(STATUS "<******************************>") -+ if(NO_X11) -+ message(status "<disabled per request>") -+ else(NO_X11) - include(FindX11) - if(NOT X11_FOUND) - MESSAGE(FATAL_ERROR "Could not find X11") - endif(NOT X11_FOUND) - MESSAGE(STATUS OK) -+ endif(NO_X11) - endif(NOT WIN32) - #************************************************** - # Search for GLIB through PKG-Config -@@ -135,7 +139,7 @@ - IF(NOT GTK_CFLAGS) - MESSAGE(STATUS "Could not find GTK - cannot compile avidemux2_gtk here") - ELSE(NOT GTK_CFLAGS) -- SET(GTK_FOUND TRUE) -+ SET(GTK_FOUND "YES") - MESSAGE(STATUS OK) - ENDIF(NOT GTK_CFLAGS) - endif(NO_GTK) +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -58,10 +58,10 @@ IF (ADM_CPU_ALTIVEC) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ADM_ALTIVEC_FLAGS}") + ENDIF (ADM_CPU_ALTIVEC) + +-IF (UNIX AND NOT APPLE) +- # jog shuttle is only available on Linux due to its interface +- SET(USE_JOG 1) +-ENDIF (UNIX AND NOT APPLE) ++#IF (UNIX AND NOT APPLE) ++# # jog shuttle is only available on Linux due to its interface ++# SET(USE_JOG 1) ++#ENDIF (UNIX AND NOT APPLE) + + IF (WIN32) + SET(BIN_DIR .) +@@ -104,7 +104,7 @@ SET(VERSION 2.5.4) + # since it uses the minimum set of required libraries and CMake will + # fail if these aren't met. + SET(ADM_UI_GTK 1) +-SET(ADM_UI_QT4 1) ++# SET(ADM_UI_QT4 1) + + SET(ADM_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}") + Index: avidemux2/files/patch-ConfigureChecks.cmake =================================================================== RCS file: /home/pcvs/ports/multimedia/avidemux2/files/patch-ConfigureChecks.cmake,v retrieving revision 1.2 diff -u -p -r1.2 patch-ConfigureChecks.cmake --- avidemux2/files/patch-ConfigureChecks.cmake 17 Apr 2009 23:35:38 -0000 1.2 +++ avidemux2/files/patch-ConfigureChecks.cmake 4 Dec 2010 16:38:41 -0000 @@ -1,79 +0,0 @@ ---- ConfigureChecks.cmake.orig 2009-02-06 20:07:37.000000000 +0100 -+++ ConfigureChecks.cmake 2009-04-09 15:16:26.000000000 +0200 -@@ -223,6 +223,43 @@ - ENDIF (NO_NLS) - - ######################################## -+# Execinfo -+######################################## -+MESSAGE(STATUS "<Checking execinfo>") -+MESSAGE(STATUS "<******************************>") -+ -+FIND_PATH(LIBEXECINFO_H_DIR execinfo.h $ENV{CXXFLAGS}) -+MESSAGE(STATUS "libexecinfo Header Path: ${LIBEXECINFO_H_DIR}") -+ -+IF (NOT LIBEXECINFO_H_DIR STREQUAL "LIBEXECINFO_H-NOTFOUND") -+ FIND_LIBRARY(LIBEXECINFO_LIB_DIR execinfo $ENV{CXXFLAGS}) -+ MESSAGE(STATUS "libexecinfo Library Path: ${LIBEXECINFO_LIB_DIR}") -+ -+ # Try linking without -lexecinfo -+ ADM_COMPILE(execinfo.cpp -I${LIBEXECINFO_H_DIR} "" WITHOUT_LIBEXECINFO outputWithoutLibexecinfo) -+ -+ IF (WITHOUT_LIBEXECINFO) -+ SET(HAVE_EXECINFO 1) -+ MESSAGE(STATUS "OK, No lib needed (${ADM_EXECINFO_LIB})") -+ ELSE (WITHOUT_LIBEXECINFO) -+ ADM_COMPILE(execinfo.cpp -I${LIBEXECINFO_H_DIR} ${LIBEXECINFO_LIB_DIR} WITH_LIBEXECINFO outputWithLibexecinfo) -+ -+ IF (WITH_LIBEXECINFO) -+ SET(HAVE_EXECINFO 1) -+ MESSAGE(STATUS "OK, libexecinfo needed") -+ ELSE (WITH_LIBEXECINFO) -+ MESSAGE(STATUS "Does not work, without ${outputWithoutLibexecinfo}") -+ MESSAGE(STATUS "Does not work, with ${outputWithLibexecinfo}") -+ ENDIF (WITH_LIBEXECINFO) -+ ENDIF (WITHOUT_LIBEXECINFO) -+ ENDIF (NOT LIBEXECINFO_H_DIR STREQUAL "LIBEXECINFO_H-NOTFOUND") -+ -+ IF (HAVE_EXECINFO) -+ SET(CMAKE_CLINK_FLAGS "${CFLAGS} -lexecinfo") -+ SET(CMAKE_CXX_LINK_FLAGS "${CXXFLAGS} -lexecinfo") -+ ENDIF(HAVE_EXECINFO) -+ -+######################################## - # Locale - ######################################## - IF (NOT ADM_LOCALE) -@@ -367,7 +404,9 @@ - # JACK - ######################################## - IF (NOT ADM_OS_WINDOWS) -+ SET(CMAKE_REQUIRED_FLAGS "-pthread") - ADM_CHECK_HL(Jack jack/jack.h jack jack_client_close USE_JACK) -+ SET(CMAKE_REQUIRED_FLAGS) - ENDIF (NOT ADM_OS_WINDOWS) - - ######################################## -@@ -480,7 +519,11 @@ - IF (USE_LATE_BINDING) - CHECK_INCLUDE_FILES(dts.h USE_LIBDCA) - ELSE (USE_LATE_BINDING) -- ADM_CHECK_HL(libdca dts.h dts dts_init USE_LIBDCA_A) -+ IF (ADM_BSD_FAMILY) -+ ADM_CHECK_HL(libdca dts.h dts dca_init USE_LIBDCA_A) -+ ELSE (ADM_BSD_FAMILY) -+ ADM_CHECK_HL(libdca dts.h dts dts_init USE_LIBDCA_A) -+ ENDIF (ADM_BSD_FAMILY) - if(NOT USE_LIBDCA_A) - MESSAGE(STATUS "Trying libdca instead of libdts") - ADM_CHECK_HL(libdca dts.h dca dca_init USE_LIBDCA_B) -@@ -505,7 +548,8 @@ - IF (ADM_OS_WINDOWS) - SET(CMAKE_REQUIRED_LIBRARIES "-lm -lpthreadGC2") - ELSE (ADM_OS_WINDOWS) -- SET(CMAKE_REQUIRED_LIBRARIES "-lm -lpthread") -+ SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -pthread") -+ SET(CMAKE_REQUIRED_LIBRARIES "-lm") - ENDIF (ADM_OS_WINDOWS) - - ADM_CHECK_HL(x264 x264.h x264 x264_encoder_open USE_X264) Index: avidemux2/files/patch-avidemux__ADM_libraries__ADM_lavcodec__mpegvideo.h =================================================================== RCS file: /home/pcvs/ports/multimedia/avidemux2/files/patch-avidemux__ADM_libraries__ADM_lavcodec__mpegvideo.h,v retrieving revision 1.1 diff -u -p -r1.1 patch-avidemux__ADM_libraries__ADM_lavcodec__mpegvideo.h --- avidemux2/files/patch-avidemux__ADM_libraries__ADM_lavcodec__mpegvideo.h 17 Apr 2009 23:35:38 -0000 1.1 +++ avidemux2/files/patch-avidemux__ADM_libraries__ADM_lavcodec__mpegvideo.h 4 Dec 2010 16:38:41 -0000 @@ -1,15 +0,0 @@ ---- avidemux/ADM_libraries/ADM_lavcodec/mpegvideo.h.orig 2007-07-16 21:46:57.000000000 +0400 -+++ avidemux/ADM_libraries/ADM_lavcodec/mpegvideo.h 2009-04-16 20:54:12.000000000 +0400 -@@ -781,10 +781,10 @@ - int16_t (*mv_table)[2], int f_code, int type, int truncate); - void ff_init_me(MpegEncContext *s); - int ff_pre_estimate_p_frame_motion(MpegEncContext * s, int mb_x, int mb_y); --inline int ff_epzs_motion_search(MpegEncContext * s, int *mx_ptr, int *my_ptr, -+int ff_epzs_motion_search(MpegEncContext * s, int *mx_ptr, int *my_ptr, - int P[10][2], int src_index, int ref_index, int16_t (*last_mv)[2], - int ref_mv_scale, int size, int h); --inline int ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index, -+int ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index, - int ref_index, int size, int h, int add_rate); - - /* mpeg12.c */ Index: avidemux2/files/patch-avidemux__ADM_libraries__ADM_lavformat__ADM_lavformat.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/avidemux2/files/patch-avidemux__ADM_libraries__ADM_lavformat__ADM_lavformat.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-avidemux__ADM_libraries__ADM_lavformat__ADM_lavformat.cpp --- avidemux2/files/patch-avidemux__ADM_libraries__ADM_lavformat__ADM_lavformat.cpp 15 Jul 2008 02:53:29 -0000 1.1 +++ avidemux2/files/patch-avidemux__ADM_libraries__ADM_lavformat__ADM_lavformat.cpp 4 Dec 2010 16:38:41 -0000 @@ -1,14 +0,0 @@ ---- ./avidemux/ADM_libraries/ADM_lavformat/ADM_lavformat.cpp.orig 2008-07-05 15:51:54.000000000 +0200 -+++ ./avidemux/ADM_libraries/ADM_lavformat/ADM_lavformat.cpp 2008-07-10 17:16:26.000000000 +0200 -@@ -365,8 +365,10 @@ - break; - } - case 29970: -- c->time_base=fps30; -+ { -+ c->time_base=fps30; - break; -+ } - default: - { - if(_type==MUXER_MP4 || _type==MUXER_PSP || _type==MUXER_FLV || _type==MUXER_MATROSKA) Index: avidemux2/files/patch-avidemux__ADM_libraries__ADM_libtwolame__bitbuffer.h =================================================================== RCS file: /home/pcvs/ports/multimedia/avidemux2/files/patch-avidemux__ADM_libraries__ADM_libtwolame__bitbuffer.h,v retrieving revision 1.1 diff -u -p -r1.1 patch-avidemux__ADM_libraries__ADM_libtwolame__bitbuffer.h --- avidemux2/files/patch-avidemux__ADM_libraries__ADM_libtwolame__bitbuffer.h 17 Apr 2009 23:35:38 -0000 1.1 +++ avidemux2/files/patch-avidemux__ADM_libraries__ADM_libtwolame__bitbuffer.h 4 Dec 2010 16:38:41 -0000 @@ -1,11 +0,0 @@ ---- avidemux/ADM_libraries/ADM_libtwolame/bitbuffer.h.orig 2006-03-19 00:36:30.000000000 +0300 -+++ avidemux/ADM_libraries/ADM_libtwolame/bitbuffer.h 2009-04-16 22:26:17.000000000 +0400 -@@ -40,7 +40,7 @@ - void buffer_deinit( bit_stream ** bs ); - - void buffer_put1bit (bit_stream *, int); --inline void buffer_putbits (bit_stream *, unsigned int, int); -+void buffer_putbits (bit_stream *, unsigned int, int); - unsigned long buffer_sstell (bit_stream *); - - #endif Index: avidemux2/files/patch-avidemux__ADM_userInterfaces__ADM_QT4__ui_support.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/avidemux2/files/patch-avidemux__ADM_userInterfaces__ADM_QT4__ui_support.cpp,v retrieving revision 1.2 diff -u -p -r1.2 patch-avidemux__ADM_userInterfaces__ADM_QT4__ui_support.cpp --- avidemux2/files/patch-avidemux__ADM_userInterfaces__ADM_QT4__ui_support.cpp 17 Apr 2009 23:35:38 -0000 1.2 +++ avidemux2/files/patch-avidemux__ADM_userInterfaces__ADM_QT4__ui_support.cpp 4 Dec 2010 16:38:41 -0000 @@ -1,15 +0,0 @@ ---- ./avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp.orig 2008-09-24 05:09:49.000000000 +0400 -+++ ./avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2009-04-16 17:45:10.000000000 +0400 -@@ -60,10 +60,8 @@ - { - printf("\n[Locale] Locale: %s\n", QLocale::system().name().toUtf8().constData()); - -- QString appdir = QCoreApplication::applicationDirPath() + "/i18n/"; -- -- loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name()); -- loadTranslation(&avidemuxTranslator, appdir + "avidemux_" + QLocale::system().name()); -+ loadTranslation(&qtTranslator, "%%DATADIR%%/qt_" + QLocale::system().name()); -+ loadTranslation(&avidemuxTranslator, "%%DATADIR%%/avidemux_" + QLocale::system().name()); - translatorLoaded = true; - - // Re-translate existing map (to take care of global strings already allocated) Index: avidemux2/files/patch-avidemux__CMakeLists.txt =================================================================== RCS file: /home/pcvs/ports/multimedia/avidemux2/files/patch-avidemux__CMakeLists.txt,v retrieving revision 1.1 diff -u -p -r1.1 patch-avidemux__CMakeLists.txt --- avidemux2/files/patch-avidemux__CMakeLists.txt 23 Aug 2009 10:36:55 -0000 1.1 +++ avidemux2/files/patch-avidemux__CMakeLists.txt 4 Dec 2010 16:38:41 -0000 @@ -1,35 +0,0 @@ ---- ./avidemux/CMakeLists.txt.orig 2008-10-03 15:05:09.000000000 +0400 -+++ ./avidemux/CMakeLists.txt 2009-08-10 23:07:18.000000000 +0400 -@@ -84,7 +84,6 @@ - ADM_audio - ADM_script - ADM_videoFilter --ADM_filter - ADM_video - ADM_audiodevice - ADM_ocr -@@ -93,6 +92,24 @@ - - FOREACH(_current ${ADM_SUBDIR}) - ADD_SUBDIRECTORY(${_current}) -+ENDFOREACH(_current ${ADM_SUBDIR}) -+ -+SET(ADM_SUBDIR -+ADM_filter -+ADM_audiofilter -+ADM_editor -+ADM_audiocodec -+ADM_audio -+ADM_script -+ADM_videoFilter -+ADM_filter -+ADM_video -+ADM_audiodevice -+ADM_ocr -+ADM_colorspace -+) -+ -+FOREACH(_current ${ADM_SUBDIR}) - add_libs_all_targets(${_current}) - ENDFOREACH(_current ${ADM_SUBDIR}) - Index: avidemux2/files/patch-cmake__Ts.cmake =================================================================== RCS file: /home/pcvs/ports/multimedia/avidemux2/files/patch-cmake__Ts.cmake,v retrieving revision 1.2 diff -u -p -r1.2 patch-cmake__Ts.cmake --- avidemux2/files/patch-cmake__Ts.cmake 23 Aug 2009 10:36:55 -0000 1.2 +++ avidemux2/files/patch-cmake__Ts.cmake 4 Dec 2010 16:38:41 -0000 @@ -1,29 +0,0 @@ ---- ./cmake/Ts.cmake.orig 2007-10-14 13:58:28.000000000 +0200 -+++ ./cmake/Ts.cmake 2008-07-10 17:16:26.000000000 +0200 -@@ -14,7 +14,7 @@ - - MACRO(FIND_LRELEASE) - IF(NOT LRELEASE_EXECUTABLE AND NOT LRELEASE_NOT_FOUND) -- FIND_PROGRAM(LRELEASE_EXECUTABLE lrelease PATHS -+ FIND_PROGRAM(LRELEASE_EXECUTABLE lrelease-qt4 PATHS - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" - $ENV{QTDIR}/bin) -@@ -63,7 +63,7 @@ - - SET(qm_files ${qm_files} ${_outXml} ${_out}) - -- INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n") -+ INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux2") - ENDFOREACH(ts_input ${ts_files}) - - SET(${_sources} ${${_sources}} ${qm_files}) -@@ -94,7 +94,7 @@ - - SET(qm_files ${qm_files} ${_out}) - -- INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n") -+ INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux2") - ENDFOREACH(ts_input ${ts_files}) - - SET(${_sources} ${${_sources}} ${qm_files}) Index: avidemux2/files/patch-cmake__conf_summary.cmake =================================================================== RCS file: /home/pcvs/ports/multimedia/avidemux2/files/patch-cmake__conf_summary.cmake,v retrieving revision 1.1 diff -u -p -r1.1 patch-cmake__conf_summary.cmake --- avidemux2/files/patch-cmake__conf_summary.cmake 15 Jul 2008 02:53:29 -0000 1.1 +++ avidemux2/files/patch-cmake__conf_summary.cmake 4 Dec 2010 16:38:41 -0000 @@ -1,27 +0,0 @@ ---- ./cmake/conf_summary.cmake.orig 2008-06-28 10:20:38.000000000 +0200 -+++ ./cmake/conf_summary.cmake 2008-07-10 17:16:26.000000000 +0200 -@@ -1,10 +1,10 @@ - MACRO(ADM_DISPLAY _name _val) - #MESSAGE("${_val}") --if(${_val} EQUAL 1) -+if(${_val} EQUAL 1 OR ${_val} STREQUAL "YES") - set(s "Yes") --else(${_val} EQUAL 1) -+else(${_val} EQUAL 1 OR ${_val} STREQUAL "YES") - set(s "No") --endif(${_val} EQUAL 1) -+endif(${_val} EQUAL 1 OR ${_val} STREQUAL "YES") - MESSAGE("${_name} ${s}") - ENDMACRO(ADM_DISPLAY _name _val) - -@@ -13,8 +13,8 @@ - MESSAGE("*******************") - MESSAGE("** Summary **") - MESSAGE("*******************") --MESSAGE("Gtk ${GTK_FOUND}") --MESSAGE("Qt4 ${QT4_FOUND}") -+ADM_DISPLAY("Gtk " GTK_FOUND) -+ADM_DISPLAY("Qt4 " QT4_FOUND) - MESSAGE("*** Video Codec ***") - ADM_DISPLAY("X264 " USE_X264) - ADM_DISPLAY("Xvid4 " USE_XVID_4) --- /dev/null 2010-12-04 17:33:00.000000000 +0100 +++ avidemux2/Makefile.common 2010-12-04 17:38:41.000000000 +0100 @@ -0,0 +1,247 @@ +# $FreeBSD: $ +# + +AVIDEMUX2_VERSION= 2.5.4 +MASTER_SITES= ${MASTER_SITE_BERLIOS} \ + SF/avidemux/avidemux/${PORTVERSION} +DISTNAME= avidemux_${PORTVERSION} + +BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm +LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame \ + mad.2:${PORTSDIR}/audio/libmad \ + a52.0:${PORTSDIR}/audio/liba52 \ + png.6:${PORTSDIR}/graphics/png \ + samplerate.1:${PORTSDIR}/audio/libsamplerate \ + dca.0:${PORTSDIR}/multimedia/libdca \ + execinfo.1:${PORTSDIR}/devel/libexecinfo + +CONFLICTS= avidemux2-2.[0-46-9].* + +USE_GNOME= libxml2 +USE_QT_VER= 4 +QT_COMPONENTS= + +USE_GMAKE= yes +USE_ICONV= yes +WANT_SDL= yes +USE_CMAKE= yes +CMAKE_USE_PTHREAD=yes +CMAKE_ARGS+= -DTHREADS_HAVE_PTHREAD_ARG:STRING="${PTHREAD_LIBS}" +CMAKE_OUTSOURCE= yes +MAKE_JOBS_SAFE= yes + +BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils +CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin +MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin + +OPTIONS= GTK "GTK+ GUI" on \ + QT4 "QT4 GUI (Experimental)" off \ + FREETYPE "TrueType font rendering engine" on \ + FONTCONFIG "Font configuration API for X" on \ + OSS "OSS audio device" on \ + ESD "ESOUND audio device" off \ + JACK "JACK audio device" off \ + PULSE "PULSE audio device" off \ + XVIDEO "X Video Extension library" on \ + FAAC "FAAC (mpeg4/aac encoder)" on \ + FAAD "FAAD (mpeg4/aac decoder)" on \ + X264 "H.264 encoding" on \ + VPX "VP8 decoding" on \ + XVID "Xvid video" on \ + SDL "SDL audio/video framework" on \ + AMRNB "3GPP AMR Speech Codec" on \ + AMRWB "3GPP AMR-WB Speech Codec" on \ + VORBIS "OGG/Vorbis audio support" on \ + NLS "Native languages support" on + +.include <bsd.port.pre.mk> + +# Package server cannot distribute these +.if defined(PACKAGE_BUILDING) +WITHOUT_LAME= yes +WITHOUT_FAAC= yes +WITHOUT_AMRNB= yes +WITHOUT_AMRWB= yes +.endif + +# We haven't ALSA(Never) & Aften(Yet) on FreeBSD +CMAKE_ARGS+= -DARTS:BOOL=OFF -DALSA:BOOL=OFF -DAFTEN:BOOL=OFF + +.if !defined(WITH_GTK) && !defined(WITH_QT4) +CMAKE_ARGS+= -DX11:BOOL=OFF -DGTK:BOOL=OFF -DQT4:BOOL=OFF +.endif + +.if defined(WITHOUT_GTK) +CMAKE_ARGS+= -DGTK:BOOL=OFF +PLIST_SUB+= GTK="@comment " +.else +USE_GNOME+= gnomeprefix gnomehack gtk20 +PLIST_SUB+= GTK="" +.endif + +.if defined(WITHOUT_QT4) +CMAKE_ARGS+= -DQT4:BOOL=OFF +PLIST_SUB+= QT4="@comment " +.else +CMAKE_ARGS+= -DLRELEASE_EXECUTABLE=${LOCALBASE}/bin/lrelease-qt4 +QT_COMPONENTS= qmake_build moc_build rcc_build uic_build linguist_build gui +PLIST_SUB+= QT4="" +.endif + +.if defined(WITH_GTK) || defined(WITH_QT4) +USE_GNOME+= libxslt desktopfileutils +.endif + +.if defined(WITHOUT_OSS) +CMAKE_ARGS+= -DOSS_SUPPORT:BOOL=OFF +.else +CMAKE_ARGS+= -DOSS_SUPPORT:BOOL=ON +.endif + +.if defined(WITHOUT_ESD) +CMAKE_ARGS+= -DESD:BOOL=OFF +PLIST_SUB+= ESD="@comment " +.else +USE_GNOME+= esound +PLIST_SUB+= ESD="" +.endif + +.if defined(WITHOUT_JACK) +CMAKE_ARGS+= -DJACK:BOOL=OFF +PLIST_SUB+= JACK="@comment " +.else +LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack +PLIST_SUB+= JACK="" +.endif + +.if defined(WITHOUT_PULSE) +CMAKE_ARGS+= -DPULSEAUDIOSIMPLE:BOOL=OFF +PLIST_SUB+= PULSE="@comment " +.else +LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio +PLIST_SUB+= PULSE="" +.endif + +.if defined(WITHOUT_FREETYPE) +CMAKE_ARGS+= -DFREETYPE2:BOOL=OFF +PLIST_SUB+= FREETYPE="@comment " +.else +LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 +PLIST_SUB+= FREETYPE="" +.endif + +.if defined(WITHOUT_FONTCONFIG) +CMAKE_ARGS+= -DFONTCONFIG:BOOL=OFF +.else +LIB_DEPENDS+= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig +.endif + +.if defined(WITHOUT_XVIDEO) +CMAKE_ARGS+= -DXVIDEO:BOOL=OFF +.else +LIB_DEPENDS+= Xv.1:${PORTSDIR}/x11/libXv +.endif + +.if defined(WITHOUT_FAAC) +CMAKE_ARGS+= -DFAAC:BOOL=OFF +PLIST_SUB+= FAAC="@comment " +.else +LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac +PLIST_SUB+= FAAC="" +.endif + +.if defined(WITHOUT_FAAD) +CMAKE_ARGS+= -DFAAD:BOOL=OFF -DNeAAC:BOOL=OFF +PLIST_SUB+= FAAD="@comment " +.else +LIB_DEPENDS+= faad.2:${PORTSDIR}/audio/faad +PLIST_SUB+= FAAD="" +.endif + +.if defined(WITHOUT_X264) +CMAKE_ARGS+= -DX264:BOOL=OFF +PLIST_SUB+= X264="@comment " +.else +LIB_DEPENDS+= x264.110:${PORTSDIR}/multimedia/x264 +PLIST_SUB+= X264="" +.endif + +.if defined(WITHOUT_VPX) +CMAKE_ARGS+= -DVPXDEC:BOOL=OFF +.else +LIB_DEPENDS+= vpx.0:${PORTSDIR}/multimedia/libvpx +.endif + +.if defined(WITHOUT_XVID) +CMAKE_ARGS+= -DXVID:BOOL=OFF +PLIST_SUB+= XVID="@comment " +.else +LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid +PLIST_SUB+= XVID="" +.endif + +.if defined(WITHOUT_SDL) +CMAKE_ARGS+= -DSDL:BOOL=OFF +PLIST_SUB+= SDL="@comment " +.else +USE_SDL= sdl +PLIST_SUB+= SDL="" +.endif + +.if defined(WITHOUT_VORBIS) +CMAKE_ARGS+= -DVORBIS:BOOL=OFF +PLIST_SUB+= VORBIS="@comment " +.else +LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis +PLIST_SUB+= VORBIS="" +.endif + +.if defined(WITHOUT_AMRNB) +CMAKE_ARGS+= -DOPENCORE_AMRNB:BOOL=OFF +PLIST_SUB+= AMRNB="@comment " +.else +LIB_DEPENDS+= amrnb.3:${PORTSDIR}/audio/libamrnb +PLIST_SUB+= AMRNB="" +.endif + +.if defined(WITHOUT_AMRWB) +CMAKE_ARGS+= -DOPENCORE_AMRWB:BOOL=OFF +PLIST_SUB+= AMRWB="@comment " +.else +LIB_DEPENDS+= amrnb.3:${PORTSDIR}/audio/libamrwb +PLIST_SUB+= AMRWB="" +.endif + +.if defined(WITHOUT_NLS) +CMAKE_ARGS+= -DNO_NLS:BOOL=ON +PLIST_SUB+= NLS="@comment " QT_NLS="@comment " +.else +USE_GETTEXT= yes +PLIST_SUB+= NLS="" +. if !defined(WITH_QT4) +PLIST_SUB+= QT_NLS="@comment " +. else +PLIST_SUB+= QT_NLS="" +. endif +.endif + +.if ${ARCH} == "sparc64" +BROKEN= Does not compile on sparc64 +.endif + +post-extract: + @${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//' \ + ${WRKSRC}/avidemux/ADM_libraries/ADM_mplex/ADM_mplexout.cpp + +post-patch: + @${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/*/*/Makefile + @${CP} ${FILESDIR}/execinfo.cpp ${WRKSRC}/cmake_compile_check/ + @${REINPLACE_CMD} "s|%%DATADIR%%|${DATADIR}|g" \ + ${WRKSRC}/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp \ + ${WRKSRC}/cmake/Ts.cmake + @${CP} ${FILESDIR}/*.patch ${WRKSRC}/cmake/patches/ + @${MKDIR} ${CONFIGURE_WRKSRC}/config + @${LN} -s ${LOCALBASE}/include/iconv.h ${CONFIGURE_WRKSRC}/config + +post-configure-common: + @${FIND} ${WRKDIR}/.build/avidemux -name link.txt -print0 |${XARGS} -0 ${REINPLACE_CMD} 's|-ldl||' --- /dev/null 2010-12-04 17:33:00.000000000 +0100 +++ avidemux2/files/ffmpeg-configure.patch 2010-12-04 17:38:41.000000000 +0100 @@ -0,0 +1,11 @@ +--- configure.orig ++++ configure +@@ -3090,7 +3090,7 @@ SRC_PATH="$source_path" + SRC_PATH_BARE=$source_path + BUILD_ROOT="$PWD" + CC_IDENT=$cc_ident +-ARCH=$arch ++FFMPEG_ARCH=$arch + CC=$cc + AS=$as + LD=$ld --- /dev/null 2010-12-04 17:33:00.000000000 +0100 +++ avidemux2/files/ffmpeg-libavcodec-Makefile.patch 2010-12-04 17:38:41.000000000 +0100 @@ -0,0 +1,11 @@ +--- libavcodec/Makefile.orig ++++ libavcodec/Makefile +@@ -619,7 +619,7 @@ OBJS-$(CONFIG_MLIB) + + # well. + OBJS-$(!CONFIG_SMALL) += inverse.o + +--include $(SUBDIR)$(ARCH)/Makefile ++-include $(SUBDIR)$(FFMPEG_ARCH)/Makefile + + SKIPHEADERS = %_tablegen.h + SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h --- /dev/null 2010-12-04 17:33:00.000000000 +0100 +++ avidemux2/files/ffmpeg-libavutil-common.h.patch 2010-12-04 17:38:41.000000000 +0100 @@ -0,0 +1,13 @@ +--- libavutil/common.h.orig ++++ libavutil/common.h +@@ -37,6 +37,10 @@ + #include "attributes.h" + #include "libavutil/avconfig.h" + ++#ifndef UINT64_C ++#define UINT64_C(c) (c ## UL) ++#endif ++ + #if AV_HAVE_BIGENDIAN + # define AV_NE(be, le) (be) + #else --- /dev/null 2010-12-04 17:33:00.000000000 +0100 +++ avidemux2/files/patch-avidemux-ADM_core-src-ADM_crashdump.cpp 2010-12-04 17:38:41.000000000 +0100 @@ -0,0 +1,11 @@ +--- avidemux/ADM_core/src/ADM_crashdump.cpp.orig ++++ avidemux/ADM_core/src/ADM_crashdump.cpp +@@ -47,7 +47,7 @@ void ADM_setCrashHook(ADM_saveFunction * + extern char *ADM_getBaseDir(void); + extern void A_parseECMAScript(const char *name); + +-#ifdef __APPLE__ ++#if defined(__APPLE__) || defined(__FreeBSD__) + void installSigHandler() {} + + void ADM_backTrack(const char *info,int lineno,const char *file) --- /dev/null 2010-12-04 17:33:00.000000000 +0100 +++ avidemux2/files/patch-avidemux-CMakeLists.txt 2010-12-04 17:38:41.000000000 +0100 @@ -0,0 +1,11 @@ +--- avidemux/CMakeLists.txt.orig ++++ avidemux/CMakeLists.txt +@@ -494,7 +494,7 @@ MACRO (ADM_SYMLINK_LIBS) + ADD_CUSTOM_COMMAND(TARGET ${t} + 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} ++ COMMAND ln -sf ` find ${CMAKE_BINARY_DIR}/avidemux -name '*.so*' ` ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX} + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + COMMENT "Creating temporary lib directory for proper plugins linking") + ENDFOREACH (t ) --- /dev/null 2010-12-04 17:33:00.000000000 +0100 +++ avidemux2/files/patch-x264_110 2010-12-04 17:38:41.000000000 +0100 @@ -0,0 +1,35 @@ +--- plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp.orig ++++ plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp +@@ -1386,8 +1386,8 @@ + case X264_WEIGHTP_NONE: + strcpy((char*)xmlBuffer, "none"); + break; +- case X264_WEIGHTP_BLIND: +- strcpy((char*)xmlBuffer, "blind"); ++ case X264_WEIGHTP_SIMPLE: ++ strcpy((char*)xmlBuffer, "simple"); + break; + case X264_WEIGHTP_SMART: + strcpy((char*)xmlBuffer, "smart"); +@@ -1895,8 +1895,8 @@ + { + int weightedPredPFrames = X264_WEIGHTP_NONE; + +- if (strcmp(content, "blind") == 0) +- weightedPredPFrames = X264_WEIGHTP_BLIND; ++ if (strcmp(content, "simple") == 0) ++ weightedPredPFrames = X264_WEIGHTP_SIMPLE; + else if (strcmp(content, "smart") == 0) + weightedPredPFrames = X264_WEIGHTP_SMART; + +--- plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd.orig ++++ plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd +@@ -335,7 +335,7 @@ + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="none"/> +- <xs:enumeration value="blind"/> ++ <xs:enumeration value="simple"/> + <xs:enumeration value="smart"/> + </xs:restriction> + </xs:simpleType> --- /dev/null 2010-12-04 17:33:00.000000000 +0100 +++ avidemux2-plugins/Makefile 2010-12-04 17:38:41.000000000 +0100 @@ -0,0 +1,36 @@ +# New ports collection makefile for: avidemux2 +# Date created: 16 April 2003 +# Whom: Anish Mistry +# with help from mean +# $FreeBSD: $ +# + +PORTNAME= avidemux2 +PORTVERSION= ${AVIDEMUX2_VERSION} +CATEGORIES= multimedia +PKGNAMESUFFIX= -plugins + +MAINTAINER= multimedia@FreeBSD.org +COMMENT= Simple GUI based video editor (Plugins) + +BUILD_DEPENDS= avidemux2_cli:${PORTSDIR}/multimedia/avidemux2 +RUN_DEPENDS= avidemux2_cli:${PORTSDIR}/multimedia/avidemux2 + +MASTERDIR= ${.CURDIR}/../avidemux2 +PLIST= ${.CURDIR}/pkg-plist + +.include "${MASTERDIR}/Makefile.common" + +CMAKE_ARGS+= -DAVIDEMUX_SOURCE_DIR=${WRKSRC} -DAVIDEMUX_INSTALL_PREFIX:PATH="${CMAKE_INSTALL_PREFIX}" -DAVIDEMUX_CORECONFIG_DIR=${CONFIGURE_WRKSRC}/config + +post-configure: post-configure-common + @${MKDIR} ${WRKDIR}/.build-plugins + @cd ${WRKDIR}/.build-plugins && ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${WRKSRC}/plugins + +do-build: + @cd ${WRKDIR}/.build-plugins && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} + +do-install: + @(cd ${WRKDIR}/.build-plugins && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) + +.include <bsd.port.post.mk> --- /dev/null 2010-12-04 17:33:00.000000000 +0100 +++ avidemux2-plugins/pkg-plist 2010-12-04 17:38:41.000000000 +0100 @@ -0,0 +1,157 @@ +lib/ADM_plugins/audioDecoder/libADM_ad_a52.so +%%FAAD%%lib/ADM_plugins/audioDecoder/libADM_ad_faad.so +lib/ADM_plugins/audioDecoder/libADM_ad_Mad.so +lib/ADM_plugins/audioDecoder/libADM_ad_vorbis.so +%%AMRNB%%lib/ADM_plugins/audioDecoder/libADM_ad_opencore_amrnb.so +%%AMRWB%%lib/ADM_plugins/audioDecoder/libADM_ad_opencore_amrwb.so +%%SDL%%lib/ADM_plugins/audioDevices/libADM_av_sdl.so +lib/ADM_plugins/audioDevices/libADM_av_oss.so +%%ESD%%lib/ADM_plugins/audioDevices/libADM_av_esd.so +%%JACK%%lib/ADM_plugins/audioDevices/libADM_av_jack.so +%%PULSE%%lib/ADM_plugins/audioDevices/libADM_av_pulseAudioSimple.so +lib/ADM_plugins/videoEncoder/libADM_vidEnc_avcodec.so +lib/ADM_plugins/videoEncoder/avcodec/Mpeg1Param.xsd +lib/ADM_plugins/videoEncoder/avcodec/Mpeg2Param.xsd +lib/ADM_plugins/videoEncoder/avcodec/Flv1Param.xsd +lib/ADM_plugins/videoEncoder/avcodec/MjpegParam.xsd +lib/ADM_plugins/videoEncoder/avcodec/H263Param.xsd +lib/ADM_plugins/videoEncoder/avcodec/Mpeg4aspParam.xsd +lib/ADM_plugins/videoEncoder/avcodec/mpeg-1/Video CD.xml +lib/ADM_plugins/videoEncoder/avcodec/mpeg-2/DVD.xml +lib/ADM_plugins/videoEncoder/avcodec/mpeg-2/Super Video CD.xml +%%X264%%lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so +%%X264%%lib/ADM_plugins/videoEncoder/x264/x264Param.xsd +%%GTK%%%%X264%%lib/ADM_plugins/videoEncoder/x264/libADM_vidEnc_x264_Gtk.so +%%QT4%%%%X264%%lib/ADM_plugins/videoEncoder/x264/libADM_vidEnc_x264_Qt.so +%%X264%%lib/ADM_plugins/videoEncoder/x264/Apple iPhone.xml +%%X264%%lib/ADM_plugins/videoEncoder/x264/Microsoft Zune.xml +%%X264%%lib/ADM_plugins/videoEncoder/x264/Sony PlayStation Portable.xml +%%X264%%lib/ADM_plugins/videoEncoder/x264/Apple iPod 5.5G.xml +%%X264%%lib/ADM_plugins/videoEncoder/x264/Apple iPod.xml +%%XVID%%lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so +%%XVID%%lib/ADM_plugins/videoEncoder/xvid/XvidParam.xsd +%%GTK%%%%XVID%%lib/ADM_plugins/videoEncoder/xvid/libADM_vidEnc_Xvid_Gtk.so +%%QT4%%%%XVID%%lib/ADM_plugins/videoEncoder/xvid/libADM_vidEnc_Xvid_Qt.so +lib/ADM_plugins/videoEncoder/libADM_vidEnc_mpeg2enc.so +lib/ADM_plugins/videoEncoder/mpeg2enc/Mpeg1Param.xsd +lib/ADM_plugins/videoEncoder/mpeg2enc/Mpeg2Param.xsd +lib/ADM_plugins/videoEncoder/mpeg2enc/mpeg-1/Video CD.xml +lib/ADM_plugins/videoEncoder/mpeg2enc/mpeg-2/DVD.xml +lib/ADM_plugins/videoEncoder/mpeg2enc/mpeg-2/Super Video CD.xml +lib/ADM_plugins/videoFilter/libADM_vf_addborders.so +lib/ADM_plugins/videoFilter/libADM_vf_avsfilter.so +lib/ADM_plugins/videoFilter/libADM_vf_blendRemoval.so +lib/ADM_plugins/videoFilter/libADM_vidChromaU.so +lib/ADM_plugins/videoFilter/libADM_vidChromaV.so +lib/ADM_plugins/videoFilter/libADM_vf_decimate.so +lib/ADM_plugins/videoFilter/libADM_vf_blendDgBob.so +lib/ADM_plugins/videoFilter/libADM_vf_fade.so +lib/ADM_plugins/videoFilter/libADM_vf_fastconvolutionmean.so +lib/ADM_plugins/videoFilter/libADM_vf_fastconvolutiongauss.so +lib/ADM_plugins/videoFilter/libADM_vf_fastconvolutionmedian.so +lib/ADM_plugins/videoFilter/libADM_vf_fastconvolutionsharpen.so +lib/ADM_plugins/videoFilter/libADM_vf_forcedPP.so +lib/ADM_plugins/videoFilter/libADM_vf_largemedian.so +lib/ADM_plugins/videoFilter/libADM_vf_lumaonly.so +lib/ADM_plugins/videoFilter/libADM_vf_mcdeint.so +lib/ADM_plugins/videoFilter/libADM_vf_denoise3dhq.so +lib/ADM_plugins/videoFilter/libADM_vf_denoise3d.so +lib/ADM_plugins/videoFilter/libADM_vf_resampleFps.so +lib/ADM_plugins/videoFilter/libADM_vf_reverse.so +lib/ADM_plugins/videoFilter/libADM_vf_swapuv.so +lib/ADM_plugins/videoFilter/libADM_vf_telecide.so +lib/ADM_plugins/videoFilter/libADM_vf_vlad.so +lib/ADM_plugins/videoFilter/libADM_vf_vflip.so +lib/ADM_plugins/videoFilter/libADM_vf_yadif.so +lib/ADM_plugins/videoFilter/libADM_vf_Pulldown.so +lib/ADM_plugins/videoFilter/libADM_vf_Denoise.so +lib/ADM_plugins/videoFilter/libADM_vf_Delta.so +lib/ADM_plugins/videoFilter/libADM_vf_dropOut.so +%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_avisynthResize_gtk.so +lib/ADM_plugins/videoFilter/libADM_vf_avisynthResize_cli.so +%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_mplayerResize_gtk.so +lib/ADM_plugins/videoFilter/libADM_vf_mplayerResize_cli.so +lib/ADM_plugins/videoFilter/libADM_vf_blackenBorders.so +lib/ADM_plugins/videoFilter/libADM_vf_kernelDeint.so +lib/ADM_plugins/videoFilter/libADM_vf_Deinterlace.so +lib/ADM_plugins/videoFilter/libADM_vf_separateField.so +lib/ADM_plugins/videoFilter/libADM_vf_mergeField.so +lib/ADM_plugins/videoFilter/libADM_vf_stackField.so +lib/ADM_plugins/videoFilter/libADM_vf_hzStackField.so +lib/ADM_plugins/videoFilter/libADM_vf_unstackField.so +lib/ADM_plugins/videoFilter/libADM_vf_FluxSmooth.so +lib/ADM_plugins/videoFilter/libADM_vf_Stabilize.so +lib/ADM_plugins/videoFilter/libADM_vf_Mosaic.so +lib/ADM_plugins/videoFilter/libADM_vf_Whirl.so +lib/ADM_plugins/videoFilter/libADM_vf_palShift.so +lib/ADM_plugins/videoFilter/libADM_vf_smartPalShift.so +lib/ADM_plugins/videoFilter/libADM_vf_swapField.so +lib/ADM_plugins/videoFilter/libADM_vf_smartSwapField.so +lib/ADM_plugins/videoFilter/libADM_vf_keepOddField.so +lib/ADM_plugins/videoFilter/libADM_vf_keepEvenField.so +lib/ADM_plugins/videoFilter/libADM_vf_mSharpen.so +lib/ADM_plugins/videoFilter/libADM_vf_mSmooth.so +lib/ADM_plugins/videoFilter/libADM_vf_soften.so +lib/ADM_plugins/videoFilter/libADM_vf_lavDeinterlace.so +lib/ADM_plugins/videoFilter/libADM_vf_logo.so +%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_chromaShift_gtk.so +lib/ADM_plugins/videoFilter/libADM_vf_chromashift_cli.so +%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_cnr2_gtk.so +lib/ADM_plugins/videoFilter/libADM_vf_cnr2_cli.so +%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_colorYUV_gtk.so +lib/ADM_plugins/videoFilter/libADM_vf_colorYUV_cli.so +%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_equalizer_gtk.so +lib/ADM_plugins/videoFilter/libADM_vf_equalizer_cli.so +%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_mpdelogo_gtk.so +lib/ADM_plugins/videoFilter/libADM_vf_mpdelogo_cli.so +%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_asharp_gtk.so +lib/ADM_plugins/videoFilter/libADM_vf_asharp_cli.so +%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_contrast_gtk.so +lib/ADM_plugins/videoFilter/libADM_vf_contrast_cli.so +%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_eq2_gtk.so +lib/ADM_plugins/videoFilter/libADM_vf_eq2_cli.so +%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_hue_gtk.so +lib/ADM_plugins/videoFilter/libADM_vf_Hue_cli.so +%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_Crop_gtk.so +lib/ADM_plugins/videoFilter/libADM_vf_crop_cli.so +lib/ADM_plugins/videoFilter/libADM_vf_rotate.so +lib/ADM_plugins/videoFilter/libADM_vf_tdeint.so +%%GTK%%%%FREETYPE%%lib/ADM_plugins/videoFilter/libADM_vf_sub_gtk.so +%%QT4%%%%FREETYPE%%lib/ADM_plugins/videoFilter/libADM_vf_sub_qt4.so +%%FREETYPE%%lib/ADM_plugins/videoFilter/libADM_vf_sub_cli.so +%%FREETYPE%%lib/ADM_plugins/videoFilter/libADM_vf_ssa.so +lib/ADM_plugins/videoFilter/libADM_vf_Tisophote.so +%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_avisynthResize_qt4.so +%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_mplayerResize_qt4.so +%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_chromaShift_qt4.so +%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_cnr2_qt4.so +%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_colorYUV_qt4.so +%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_equalizer_qt4.so +%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_mpdelogo_qt4.so +%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_asharp_qt4.so +%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_contrast_qt4.so +%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_eq2_qt4.so +%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_hue_qt4.so +%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_crop_qt4.so +%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_curveEditor_qt4.so +lib/ADM_plugins/audioEncoders/libADM_ae_twolame.so +lib/ADM_plugins/audioEncoders/libADM_ae_pcm.so +lib/ADM_plugins/audioEncoders/libADM_ae_lav_mp2.so +lib/ADM_plugins/audioEncoders/libADM_ae_lav_ac3.so +lib/ADM_plugins/audioEncoders/libADM_ae_lame.so +%%VORBIS%%lib/ADM_plugins/audioEncoders/libADM_ae_vorbis.so +%%FAAC%%lib/ADM_plugins/audioEncoders/libADM_ae_faac.so +@dirrm lib/ADM_plugins/audioDecoder +@dirrm lib/ADM_plugins/audioDevices +@dirrm lib/ADM_plugins/videoEncoder/avcodec/mpeg-1 +@dirrm lib/ADM_plugins/videoEncoder/avcodec/mpeg-2 +@dirrm lib/ADM_plugins/videoEncoder/avcodec +%%X264%%@dirrm lib/ADM_plugins/videoEncoder/x264 +%%XVID%%@dirrm lib/ADM_plugins/videoEncoder/xvid +@dirrm lib/ADM_plugins/videoEncoder/mpeg2enc/mpeg-1 +@dirrm lib/ADM_plugins/videoEncoder/mpeg2enc/mpeg-2 +@dirrm lib/ADM_plugins/videoEncoder/mpeg2enc +@dirrm lib/ADM_plugins/videoEncoder +@dirrm lib/ADM_plugins/videoFilter +@dirrm lib/ADM_plugins/audioEncoders +@dirrm lib/ADM_plugins
On Sat, 4 Dec 2010 18:21:01 +0100 Juergen Lock <nox@jelal.kn-bremen.de> wrote: > I finally got around finishing the avidemux2 update I started last > week and putting it in tb with an up-to-date portstree. I still > have to update the installed ports on this box so I could only > build-test the port with the latest x264 (files/patch-x264_110) > so testing of that function is very welcome, but also of other > features as I obviously couldn't test everything. :) With ports from shortly before Gnome 2.32 hit the tree and the most recent (last portsnap: this morning (CET)) port of x264: starts fine, x264 encoding is running ATM (I think this counts as "it works"). > Oh and it just occured to me: Should we add a pkg-message to tell > people about the seperate plugin port since it is new? And the UPDATING entry, not pkg-message. And it looks like pkg-descr is missing (except you share it between the two ports somewhere, I didn't look at the Makefile*). > plists could probably be sorted... Bye, Alexander.
On Sat, Dec 04, 2010 at 08:47:54PM +0100, Alexander Leidinger wrote: > On Sat, 4 Dec 2010 18:21:01 +0100 Juergen Lock <nox@jelal.kn-bremen.de> > wrote: >[...] > > Oh and it just occured to me: Should we add a pkg-message to tell > > people about the seperate plugin port since it is new? And the > > UPDATING entry, not pkg-message. Yeah ok. > And it looks like pkg-descr is > missing (except you share it between the two ports somewhere, I > didn't look at the Makefile*). Yes its actually shared. Thx, Juergen
State Changed From-To: feedback->closed nox's patch committed
pav 2010-12-10 14:04:46 UTC FreeBSD ports repository Modified files: multimedia Makefile multimedia/avidemux2 Makefile distinfo pkg-plist multimedia/avidemux2/files patch-CMakeLists.txt Added files: multimedia/avidemux2 Makefile.common multimedia/avidemux2/files ffmpeg-configure.patch ffmpeg-libavcodec-Makefile.patch ffmpeg-libavutil-common.h.patch patch-avidemux-ADM_core-src-ADM_crashdump.cpp patch-avidemux-CMakeLists.txt patch-x264_110 multimedia/avidemux2-plugins Makefile pkg-plist Removed files: multimedia/avidemux2/files patch-ConfigureChecks.cmake patch-avidemux__ADM_libraries__ADM_lavcodec__mpegvideo.h patch-avidemux__ADM_libraries__ADM_lavformat__ADM_lavformat.cpp patch-avidemux__ADM_libraries__ADM_libtwolame__bitbuffer.h patch-avidemux__ADM_userInterfaces__ADM_QT4__ui_support.cpp patch-avidemux__CMakeLists.txt patch-cmake__Ts.cmake patch-cmake__conf_summary.cmake Log: - Update to 2.5.4 - Split plugins to separate port - Transfer maintainership to multimedia@ PR: ports/152419 Submitted by: nox Revision Changes Path 1.398 +1 -0 ports/multimedia/Makefile 1.1 +36 -0 ports/multimedia/avidemux2-plugins/Makefile (new) 1.1 +157 -0 ports/multimedia/avidemux2-plugins/pkg-plist (new) 1.72 +4 -207 ports/multimedia/avidemux2/Makefile 1.1 +247 -0 ports/multimedia/avidemux2/Makefile.common (new) 1.20 +2 -3 ports/multimedia/avidemux2/distinfo 1.1 +11 -0 ports/multimedia/avidemux2/files/ffmpeg-configure.patch (new) 1.1 +11 -0 ports/multimedia/avidemux2/files/ffmpeg-libavcodec-Makefile.patch (new) 1.1 +13 -0 ports/multimedia/avidemux2/files/ffmpeg-libavutil-common.h.patch (new) 1.2 +26 -27 ports/multimedia/avidemux2/files/patch-CMakeLists.txt 1.3 +0 -79 ports/multimedia/avidemux2/files/patch-ConfigureChecks.cmake (dead) 1.1 +11 -0 ports/multimedia/avidemux2/files/patch-avidemux-ADM_core-src-ADM_crashdump.cpp (new) 1.1 +11 -0 ports/multimedia/avidemux2/files/patch-avidemux-CMakeLists.txt (new) 1.2 +0 -15 ports/multimedia/avidemux2/files/patch-avidemux__ADM_libraries__ADM_lavcodec__mpegvideo.h (dead) 1.2 +0 -14 ports/multimedia/avidemux2/files/patch-avidemux__ADM_libraries__ADM_lavformat__ADM_lavformat.cpp (dead) 1.2 +0 -11 ports/multimedia/avidemux2/files/patch-avidemux__ADM_libraries__ADM_libtwolame__bitbuffer.h (dead) 1.3 +0 -15 ports/multimedia/avidemux2/files/patch-avidemux__ADM_userInterfaces__ADM_QT4__ui_support.cpp (dead) 1.2 +0 -35 ports/multimedia/avidemux2/files/patch-avidemux__CMakeLists.txt (dead) 1.3 +0 -29 ports/multimedia/avidemux2/files/patch-cmake__Ts.cmake (dead) 1.2 +0 -27 ports/multimedia/avidemux2/files/patch-cmake__conf_summary.cmake (dead) 1.1 +35 -0 ports/multimedia/avidemux2/files/patch-x264_110 (new) 1.11 +60 -16 ports/multimedia/avidemux2/pkg-plist _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
nox 2010-12-10 18:07:09 UTC FreeBSD ports repository Modified files: . UPDATING Log: Add note about multimedia/avidemux2 now having a seperate slave port for plugins. [1] PR: ports/152419 [2] Submitted by: netchild [1], Frank Ebert <frank.ebert@freenet.de> [2] Revision Changes Path 1.1006 +9 -1 ports/UPDATING _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"