From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Mar 15 07:50:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3E007106566C for ; Sat, 15 Mar 2008 07:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 0DE198FC24 for ; Sat, 15 Mar 2008 07:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m2F7o1Z2006892 for ; Sat, 15 Mar 2008 07:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m2F7o1rd006891; Sat, 15 Mar 2008 07:50:01 GMT (envelope-from gnats) Resent-Date: Sat, 15 Mar 2008 07:50:01 GMT Resent-Message-Id: <200803150750.m2F7o1rd006891@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Yarodin Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 623F11065678 for ; Sat, 15 Mar 2008 07:49:53 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 4130B8FC2B for ; Sat, 15 Mar 2008 07:49:53 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m2F7kVaX022306 for ; Sat, 15 Mar 2008 07:46:31 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m2F7kVhw022305; Sat, 15 Mar 2008 07:46:31 GMT (envelope-from nobody) Message-Id: <200803150746.m2F7kVhw022305@www.freebsd.org> Date: Sat, 15 Mar 2008 07:46:31 GMT From: Yarodin To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/121724: [UPDATE] Update multimedia/avidemux2 to 2.4.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Mar 2008 07:50:02 -0000 >Number: 121724 >Category: ports >Synopsis: [UPDATE] Update multimedia/avidemux2 to 2.4.1 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Mar 15 07:50:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Yarodin >Release: 6.3-RELEASE >Organization: >Environment: >Description: How to apply patch: 1) Put patch-avidemux2.txt to /usr/ports/multimedia/ 2) cd /usr/ports/multimedia/ && patch -Ep How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN avidemux2.orig/Makefile avidemux2/Makefile --- avidemux2.orig/Makefile 2008-03-13 19:28:26.000000000 +0500 +++ avidemux2/Makefile 2008-03-09 19:03:14.000000000 +0500 @@ -2,128 +2,301 @@ # Date created: 16 April 2003 # Whom: Anish Mistry # with help from mean -# $FreeBSD: ports/multimedia/avidemux2/Makefile,v 1.48 2008/03/13 14:28:26 miwi Exp $ +# $FreeBSD: ports/multimedia/avidemux2/Makefile,v 1.47 2007/09/30 04:47:08 linimon Exp $ # PORTNAME= avidemux2 -PORTVERSION= 2.3.0 -PORTREVISION= 5 +PORTVERSION= 2.4.1 CATEGORIES= multimedia MASTER_SITES= http://fixounet.free.fr/avidemux/ \ - ${MASTER_SITE_BERLIOS} + ${MASTER_SITE_BERLIOS} \ + ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= avidemux DISTNAME= avidemux_${PORTVERSION} MAINTAINER= amistry@am-productions.biz COMMENT= Simple GUI based video editor -PATCH_DEPENDS= ${ACLOCAL}:${PORTSDIR}/devel/automake19 -BUILD_DEPENDS= spidermonkey>=1.5_3:${PORTSDIR}/lang/spidermonkey +BUILD_DEPENDS= spidermonkey>=1.5_3:${PORTSDIR}/lang/spidermonkey \ + cmake:${PORTSDIR}/devel/cmake LIB_DEPENDS= mp3lame:${PORTSDIR}/audio/lame \ mad:${PORTSDIR}/audio/libmad \ + a52:${PORTSDIR}/audio/liba52 \ + png:${PORTSDIR}/graphics/png/ \ js:${PORTSDIR}/lang/spidermonkey \ - xml2:${PORTSDIR}/textproc/libxml2 + xml2:${PORTSDIR}/textproc/libxml2 \ + execinfo:${PORTSDIR}/devel/libexecinfo + +CMAKE_ARGS= -DCMAKE_BUILD_TYPE:STRING=Release \ + -DCMAKE_THREAD_LIBS:STRING="${PTHREAD_LIBS}" \ + -DCMAKE_USE_PTHREADS:BOOL=ON \ + -DCMAKE_C_COMPILER:STRING='${CC}' \ + -DCMAKE_CXX_COMPILER:STRING=${CXX} \ + -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS} \ + -I${LOCALBASE}/include -I/usr/include -I${X11BASE}/include \ + -L${LOCALBASE}/lib -L/usr/include -L${X11BASE}/lib ${PTHREAD_LIBS}" \ + -DCMAKE_C_FLAGS:STRING="${CFLAGS} \ + -I${LOCALBASE}/include -I/usr/include -I${X11BASE}/include \ + -L${LOCALBASE}/lib -L/usr/include -L${X11BASE}/lib ${PTHREAD_LIBS}" + +USE_QT_VER= 4 +QT_COMPONENTS= -USE_AUTOTOOLS= automake:19:env autoconf:261:env libtool:15 aclocal:19:env -USE_GETTEXT= yes -USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack gtk20 -WANT_SDL= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \ - -I${LOCALBASE}/include/a52dec" \ - LIBFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" \ - PTHREAD_LIBS=${PTHREAD_LIBS} \ - PTHREAD_CFLAGS=${PTHREAD_CFLAGS} -CONFIGURE_ARGS= --disable-warnings \ - --with-jsapi-include=${LOCALBASE}/include USE_GMAKE= yes -DESKTOP_ENTRIES= Avidemux "Simple video editor" "" "avidemux2" "" false -OPTIONS= OPTIMIZED_CFLAGS "build with -O3 for lavcodec" off \ - FAAC "FAAC (mpeg4/aac encoder)" off \ - FAAD "FAAD (mpeg4/aac decoder)" off \ - X264 "H.264 encoding" off \ - A52 "A52 audio" off \ - XVID "Xvid video" off \ - SDL "SDL audio/video framework" off \ - VORBIS "OGG/Vorbis audio support" off +USE_ICONV= yes +WANT_GNOME= yes +WANT_SDL= yes + +CONFLICTS= avidemux2-2.[123567890].* + +OPTIONS= GTK "GTK+ GUI" on \ + QT "QT4 GUI (Experimental)" off \ + OSS "OSS audio device" on \ + ARTS "ARTS audio device" on \ + ESD "ESOUND audio device" on \ + JACK "JACK audio device" on \ + FREETYPE "TrueType font rendering engine" on \ + FONTCONFIG "Font configuration API for X" on \ + NLS "Native languages support" on \ + SAMPLERATE "Sample Rate Converter for audio" on \ + XVIDEO "X Video Extension library" on \ + OPTIMIZED_CFLAGS "build with -O3 for lavcodec" 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 .include -#.if ${HAVE_SDL:Msdl}!="" -#WITH_SDL= yes -#.endif +APP_NAME_CLI= avidemux2_cli -.if exists(${LOCALBASE}/lib/libvorbis.so) -WITH_VORBIS= yes -.endif +# We haven't ALSA (Never) & Aften (Yet) on FreeBSD +CMAKE_ARGS+= -DNO_ALSA=1 -DNO_Aften=1 -.if exists(${LOCALBASE}/lib/libx264.so) -WITH_X264= yes +.if defined(WITHOUT_GTK) +CMAKE_ARGS+= -DNO_GTK=1 +.else +USE_XLIB= yes +USE_GNOME+= gnomeprefix gnomehack gtk20 +APP_NAME_GTK= avidemux2_gtk .endif -.if exists(${LOCALBASE}/lib/libfaac.so) -WITH_FAAC= yes +.if defined(WITHOUT_QT) +CMAKE_ARGS+= -DNO_QT=1 +.else +USE_XLIB= yes +BUILD_DEPENDS+= moc:${PORTSDIR}/devel/qt4-moc \ + qmake:${PORTSDIR}/devel/qmake4 \ + rcc:${PORTSDIR}/devel/qt4-rcc \ + uic:${PORTSDIR}/devel/qt4-uic +LIB_DEPENDS+= QtCore:${PORTSDIR}/devel/qt4-corelib +QT_COMPONENTS= gui moc qmake rcc uic +QT_PREFIX= ${LOCALBASE} +MOC= ${QT_PREFIX}/bin/moc4 +UIC= ${QT_PREFIX}/bin/uic4 +QMAKE= ${QT_PREFIX}/bin/qmake-qt4 +QMAKESPEC= ${QT_PREFIX}/share/qt4/mkspecs/freebsd-g++ +ENV+= QMAKESPEC="${QMAKESPEC}" +APP_NAME_QT= avidemux2_qt4 .endif -.if exists(${LOCALBASE}/lib/libfaad.so) -WITH_FAAD= yes +.if defined(WITHOUT_OSS) +CMAKE_ARGS+= -DNO_OSS=1 .endif -.if exists(${LOCALBASE}/lib/liba52.so) -WITH_A52= yes +.if defined(WITHOUT_ARTS) +CMAKE_ARGS+= -DNO_ARTS=1 .endif -.if exists(${LOCALBASE}/lib/libxvidcore.so) -WITH_XVID= yes +.if defined(WITHOUT_ESD) +CMAKE_ARGS+= -DNO_Esd=1 .endif -.if defined(WITH_XVID) -LIB_DEPENDS+= xvidcore:${PORTSDIR}/multimedia/xvid -CONFIGURE_ARGS+= --with-xvid-as-decoder +.if defined(WITHOUT_JACK) +CMAKE_ARGS+= -DNO_Jack=1 .endif -.if defined(WITH_A52) -LIB_DEPENDS+= a52:${PORTSDIR}/audio/liba52 +.if defined(WITHOUT_FREETYPE) +CMAKE_ARGS+= -DNO_FREETYPE=1 +.else +LIB_DEPENDS+= freetype:${PORTSDIR}/print/freetype2 .endif -.if defined(WITH_SDL) -USE_SDL+= sdl +.if defined(WITHOUT_FONTCONFIG) +CMAKE_ARGS+= -DNO_FontConfig=1 +.else +LIB_DEPENDS+= fontconfig:${PORTSDIR}/x11-fonts/fontconfig .endif -.if defined(WITH_FAAC) +.if defined(WITHOUT_NLS) +CMAKE_ARGS+= -DNO_NLS=1 +PLIST_SUB+= NLS="@comment " +.else +USE_GETTEXT= yes +PLIST_SUB+= NLS="" +PLIST_FILES+= %%NLS%%share/locale/pt_BR/LC_MESSAGES/avidemux.mo \ + %%NLS%%share/locale/es/LC_MESSAGES/avidemux.mo \ + %%NLS%%share/locale/fr/LC_MESSAGES/avidemux.mo \ + %%NLS%%share/locale/it/LC_MESSAGES/avidemux.mo \ + %%NLS%%share/locale/sr@latin/LC_MESSAGES/avidemux.mo \ + %%NLS%%share/locale/ca/LC_MESSAGES/avidemux.mo \ + %%NLS%%share/locale/sr/LC_MESSAGES/avidemux.mo \ + %%NLS%%share/locale/tr/LC_MESSAGES/avidemux.mo \ + %%NLS%%share/locale/ru/LC_MESSAGES/avidemux.mo \ + %%NLS%%share/locale/cs/LC_MESSAGES/avidemux.mo \ + %%NLS%%share/locale/de/LC_MESSAGES/avidemux.mo \ + %%NLS%%share/locale/ja/LC_MESSAGES/avidemux.mo \ + %%NLS%%share/locale/el/LC_MESSAGES/avidemux.mo \ + %%NLS%%share/locale/klingon/LC_MESSAGES/avidemux.mo \ + "@unexec ${RMDIR} %D/share/locale/klingon/LC_MESSAGES 2>/dev/null || ${TRUE}" \ + "@unexec ${RMDIR} %D/share/locale/klingon 2>/dev/null || ${TRUE}" +.endif + +.if defined(WITHOUT_SAMPLERATE) +CMAKE_ARGS+= -DNO_libsamplerate=1 +.else +LIB_DEPENDS+= samplerate:${PORTSDIR}/audio/libsamplerate +.endif + +.if defined(WITHOUT_XVIDEO) +CMAKE_ARGS+= -DNO_Xvideo=1 +.else +LIB_DEPENDS+= Xv:${PORTSDIR}/x11/libXv +.endif + +.if defined(WITHOUT_FAAC) +CMAKE_ARGS+= -DNO_FAAC=1 +.else LIB_DEPENDS+= faac:${PORTSDIR}/audio/faac .endif -.if defined(WITH_FAAD) +.if defined(WITHOUT_FAAD) +CMAKE_ARGS+= -DNO_FAAD=1 -DNO_NeAAC=1 +.else LIB_DEPENDS+= faad:${PORTSDIR}/audio/faad .endif -.if defined(WITH_X264) +.if defined(WITHOUT_X264) +CMAKE_ARGS+= -DNO_x264=1 +.else LIB_DEPENDS+= x264:${PORTSDIR}/multimedia/x264 .endif -.if defined(WITH_VORBIS) +.if defined(WITHOUT_XVID) +CMAKE_ARGS+= -DNO_Xvid=1 +.else +LIB_DEPENDS+= xvidcore:${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:${PORTSDIR}/audio/libvorbis .endif +.if defined(WITHOUT_DCA) +CMAKE_ARGS+= -DNO_libdca=1 +.else +LIB_DEPENDS+= dca:${PORTSDIR}/multimedia/libdca +.endif + +.if defined(WITHOUT_AMRNB) +CMAKE_ARGS+= -DNO_AMRNB=1 +.else +LIB_DEPENDS+= dca:${PORTSDIR}/multimedia/libdca +.endif + post-extract: @${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//' \ - ${WRKSRC}/avidemux/ADM_mplex/ADM_mplexout.cpp + ${WRKSRC}/avidemux/ADM_libraries/ADM_mplex/ADM_mplexout.cpp -pre-build: - @${FIND} ${WRKSRC} -type f -print0 | \ - ${XARGS} -x -n 10 -0 ${TOUCH} +do-configure: + @cd ${WRKSRC} && ${SETENV} ${ENV} ${LOCALBASE}/bin/cmake ${CMAKE_ARGS} . post-patch: @${TOUCH} ${WRKSRC}/* - @${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure ${WRKSRC}/*/*/Makefile - @${REINPLACE_CMD} 's|||g' ${WRKSRC}/avidemux/ADM_lavcodec/*.c - @${REINPLACE_CMD} 's|||g' ${WRKSRC}/avidemux/ADM_lavcodec/*/*.c - @${REINPLACE_CMD} 's|ADM_LOCALEDIR=$${datadir}/locale|ADM_LOCALEDIR=${PREFIX}/share/locale|' ${WRKSRC}/configure - @${REINPLACE_CMD} "s|-O2|${CFLAGS}|" ${WRKSRC}/configure + @${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/*/*/Makefile + @${REINPLACE_CMD} 's|||g' ${WRKSRC}/avidemux/ADM_libraries/ADM_lavcodec/*.c + @${REINPLACE_CMD} 's|||g' ${WRKSRC}/avidemux/ADM_libraries/ADM_lavcodec/*/*.c + @${CP} ${PORTSDIR}/multimedia/avidemux2/files/execinfo.cpp ${WRKSRC}/cmake_compile_check/ .if !defined(WITH_OPTIMIZED_CFLAGS) - @${REINPLACE_CMD} "s|-O3|${CFLAGS}|" ${WRKSRC}/avidemux/ADM_lavcodec/Makefile.am + @${REINPLACE_CMD} "s|-O3|${CFLAGS}|" ${WRKSRC}/avidemux/ADM_libraries/ADM_lavcodec/Makefile.am +.endif + +post-install: + + @if ${TEST} -f ${WRKSRC}/avidemux/avidemux2_cli ; then \ + ${ECHO_CMD} "bin/avidemux2_cli" >> ${TMPPLIST}; \ + fi + +.if (defined(WITH_GTK)) || (defined(WITH_QT)) + @${MKDIR} ${LOCALBASE}/share/avidemux2 + @${CP} ${WRKSRC}/avidemux_icon.png ${LOCALBASE}/share/avidemux2/avidemux2.png +.endif + +.if (defined(WITH_GTK) && defined(WITH_QT)) + @if ${TEST} -f ${WRKSRC}/avidemux/avidemux2_gtk ; then \ + ${CP} ${PORTSDIR}/multimedia/avidemux2/files/avidemux.desktop ${LOCALBASE}/share/applications/avidemux.desktop; \ + ${REINPLACE_CMD} -i '' -e 's|%%PREFIX%%|${PREFIX}|g' ${LOCALBASE}/share/applications/avidemux.desktop; \ + ${REINPLACE_CMD} -i '' -e 's|%%APP_NAME%%|${APP_NAME_GTK}|g' ${LOCALBASE}/share/applications/avidemux.desktop; \ + ${REINPLACE_CMD} -i '' -e 's|%%API%%|-gtk|g' ${LOCALBASE}/share/applications/avidemux.desktop; \ + ${ECHO_CMD} "share/applications/avidemux.desktop" >> ${TMPPLIST}; \ + ${ECHO_CMD} "bin/avidemux2_gtk" >> ${TMPPLIST}; \ + else \ + ${REINPLACE_CMD} -i '' -e 's|-qt||g' ${LOCALBASE}/share/applications/avidemuxqt.desktop; \ + fi + @if ${TEST} -f ${WRKSRC}/avidemux/avidemux2_qt4; then \ + ${CP} ${PORTSDIR}/multimedia/avidemux2/files/avidemux.desktop ${LOCALBASE}/share/applications/avidemuxqt.desktop; \ + ${REINPLACE_CMD} -i '' -e 's|%%PREFIX%%|${PREFIX}|g' ${LOCALBASE}/share/applications/avidemuxqt.desktop; \ + ${REINPLACE_CMD} -i '' -e 's|%%APP_NAME%%|${APP_NAME_QT}|g' ${LOCALBASE}/share/applications/avidemuxqt.desktop; \ + ${REINPLACE_CMD} -i '' -e 's|%%API%%|-qt|g' ${LOCALBASE}/share/applications/avidemuxqt.desktop; \ + ${ECHO_CMD} "share/applications/avidemuxqt.desktop" >> ${TMPPLIST}; \ + ${ECHO_CMD} "bin/avidemux2_qt4" >> ${TMPPLIST}; \ + else \ + ${REINPLACE_CMD} -i '' -e 's|-gtk||g' ${LOCALBASE}/share/applications/avidemux.desktop; \ + fi +.endif + +.if (defined(WITH_GTK) && defined(WITHOUT_QT)) + @if ${TEST} -f ${WRKSRC}/avidemux/avidemux2_gtk ; then \ + ${ECHO_CMD} "bin/avidemux2_gtk" >> ${TMPPLIST}; \ + ${ECHO_CMD} "share/applications/avidemux.desktop" >> ${TMPPLIST}; \ + ${CP} ${PORTSDIR}/multimedia/avidemux2/files/avidemux.desktop ${LOCALBASE}/share/applications/avidemux.desktop; \ + ${REINPLACE_CMD} -i '' -e 's|%%PREFIX%%|${PREFIX}|g' ${LOCALBASE}/share/applications/avidemux.desktop; \ + ${REINPLACE_CMD} -i '' -e 's|%%APP_NAME%%|${APP_NAME_GTK}|g' ${LOCALBASE}/share/applications/avidemux.desktop; \ + ${REINPLACE_CMD} -i '' -e 's|%%API%%||g' ${LOCALBASE}/share/applications/avidemux.desktop; \ + fi +.endif + +.if (defined(WITH_QT) && defined(WITHOUT_GTK)) + @if ${TEST} -f ${WRKSRC}/avidemux/avidemux2_qt4 ; then \ + ${ECHO_CMD} "bin/avidemux2_qt4" >> ${TMPPLIST}; \ + ${ECHO_CMD} "share/applications/avidemux.desktop" >> ${TMPPLIST}; \ + ${CP} ${PORTSDIR}/multimedia/avidemux2/files/avidemux.desktop ${LOCALBASE}/share/applications/avidemux.desktop; \ + ${REINPLACE_CMD} -i '' -e 's|%%PREFIX%%|${PREFIX}|g' ${LOCALBASE}/share/applications/avidemux.desktop; \ + ${REINPLACE_CMD} -i '' -e 's|%%APP_NAME%%|${APP_NAME_QT}|g' ${LOCALBASE}/share/applications/avidemux.desktop; \ + ${REINPLACE_CMD} -i '' -e 's|%%API%%||g' ${LOCALBASE}/share/applications/avidemux.desktop; \ + fi +.endif + +.if (defined(WITH_GTK)) || (defined(WITH_QT)) + @if ${TEST} -f ${WRKSRC}/avidemux/avidemux2_gtk || ${TEST} -f ${WRKSRC}/avidemux/avidemux2_qt4; then \ + ${ECHO_CMD} "share/avidemux2/avidemux2.png" >> ${TMPPLIST}; \ + ${ECHO_CMD} "@unexec ${RMDIR} %D/share/avidemux2 2>/dev/null || ${TRUE}" >>${TMPPLIST}; \ + ${ECHO_CMD} "@exec %D/bin/update-desktop-database 2>/dev/null || ${TRUE}" >>${TMPPLIST}; \ + ${ECHO_CMD} "@unexec %D/bin/update-desktop-database 2>/dev/null || ${TRUE}" >>${TMPPLIST}; \ + update-desktop-database; \ + fi .endif .include diff -ruN avidemux2.orig/distinfo avidemux2/distinfo --- avidemux2.orig/distinfo 2006-12-02 21:52:54.000000000 +0500 +++ avidemux2/distinfo 2008-03-09 18:39:08.000000000 +0500 @@ -1,3 +1,3 @@ -MD5 (avidemux_2.3.0.tar.gz) = 14c58c14fc9757d36e4d72498431da42 -SHA256 (avidemux_2.3.0.tar.gz) = ef083ab24e3ec612b10c8a0163845ff680fea845d5eade21d60d47e843b4c623 -SIZE (avidemux_2.3.0.tar.gz) = 4750919 +MD5 (avidemux_2.4.1.tar.gz) = 2d972f6b8795c891dd6e0ebe5035852a +SHA256 (avidemux_2.4.1.tar.gz) = f3c7ada9da6cd65ce840127dfa7062a7004af0a44a2e3a474ff153b0e7d50b51 +SIZE (avidemux_2.4.1.tar.gz) = 5788014 diff -ruN avidemux2.orig/files/avidemux.desktop avidemux2/files/avidemux.desktop --- avidemux2.orig/files/avidemux.desktop 1970-01-01 05:00:00.000000000 +0500 +++ avidemux2/files/avidemux.desktop 2008-01-08 14:55:15.000000000 +0500 @@ -0,0 +1,12 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Avidemux2%%API%% +GenericName[ru]=Видеоредактор +Comment=Video Editor +Comment[ru]=Видеоредактор +Exec=%%PREFIX%%/bin/%%APP_NAME%% +MimeType=video/mpeg;video/quicktime;video/x-msvideo;video/x-anim;audio/x-mp3;audio/x-mp2; +Icon=%%PREFIX%%/share/avidemux2/avidemux2.png +Terminal=false +Type=Application +Categories=Application;AudioVideo;AudioVideoEditing; diff -ruN avidemux2.orig/files/execinfo.cpp avidemux2/files/execinfo.cpp --- avidemux2.orig/files/execinfo.cpp 1970-01-01 05:00:00.000000000 +0500 +++ avidemux2/files/execinfo.cpp 2008-01-06 22:26:58.000000000 +0500 @@ -0,0 +1,37 @@ +#include +#include +#include + +/* Obtain a backtrace and print it to stdout. */ +void +print_trace (void) +{ + void *array[10]; + size_t size; + char **strings; + size_t i; + + size = backtrace (array, 10); + strings = backtrace_symbols (array, size); + + printf ("Obtained %zd stack frames.\n", size); + + for (i = 0; i < size; i++) + printf ("%s\n", strings[i]); + + free (strings); +} + +/* A dummy function to make the backtrace more interesting. */ +void +dummy_function (void) +{ + print_trace (); +} + +int +main (void) +{ + dummy_function (); + return 0; +} diff -ruN avidemux2.orig/files/patch-ADM_lavformat.cpp avidemux2/files/patch-ADM_lavformat.cpp --- avidemux2.orig/files/patch-ADM_lavformat.cpp 1970-01-01 05:00:00.000000000 +0500 +++ avidemux2/files/patch-ADM_lavformat.cpp 2008-03-15 11:58:14.000000000 +0500 @@ -0,0 +1,14 @@ +--- avidemux/ADM_libraries/ADM_lavformat/ADM_lavformat.cpp.orig 2008-01-13 20:56:28.000000000 +0500 ++++ avidemux/ADM_libraries/ADM_lavformat/ADM_lavformat.cpp 2008-03-15 11:55:28.000000000 +0500 +@@ -362,8 +362,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) diff -ruN avidemux2.orig/files/patch-ConfigureChecks.cmake avidemux2/files/patch-ConfigureChecks.cmake --- avidemux2.orig/files/patch-ConfigureChecks.cmake 1970-01-01 05:00:00.000000000 +0500 +++ avidemux2/files/patch-ConfigureChecks.cmake 2008-03-09 18:52:11.000000000 +0500 @@ -0,0 +1,59 @@ +--- ConfigureChecks.cmake.orig 2008-03-09 18:47:46.000000000 +0500 ++++ ConfigureChecks.cmake 2008-03-09 18:51:57.000000000 +0500 +@@ -220,6 +220,43 @@ + ENDIF (NO_NLS) + + ######################################## ++# Execinfo ++######################################## ++MESSAGE(STATUS "") ++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} "-lexecinfo" 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 "${LDFLAGS} -lexecinfo") ++ SET(CMAKE_CXX_LINK_FLAGS "${LDFLAGS} -lexecinfo") ++ ENDIF(HAVE_EXECINFO) ++ ++######################################## + # Locale + ######################################## + SET(ADM_LOCALE "${CMAKE_INSTALL_PREFIX}/share/locale") +@@ -468,7 +505,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) ++ IF (ADM_BSD_FAMILY) ++ ADM_CHECK_HL(libdca dts.h dts dca_init USE_LIBDCA) ++ ELSE (ADM_BSD_FAMILY) ++ ADM_CHECK_HL(libdca dts.h dts dts_init USE_LIBDCA) ++ ENDIF (ADM_BSD_FAMILY) + ENDIF (USE_LATE_BINDING) + + SET(CMAKE_REQUIRED_LIBRARIES) diff -ruN avidemux2.orig/files/patch-avidemux_ADM_lavformat_ADM_lavformat.cpp avidemux2/files/patch-avidemux_ADM_lavformat_ADM_lavformat.cpp --- avidemux2.orig/files/patch-avidemux_ADM_lavformat_ADM_lavformat.cpp 2007-05-30 13:43:39.000000000 +0600 +++ avidemux2/files/patch-avidemux_ADM_lavformat_ADM_lavformat.cpp 1970-01-01 05:00:00.000000000 +0500 @@ -1,28 +0,0 @@ ---- avidemux/ADM_lavformat/ADM_lavformat.cpp.orig Mon May 28 10:32:13 2007 -+++ avidemux/ADM_lavformat/ADM_lavformat.cpp Mon May 28 10:33:09 2007 -@@ -260,10 +260,12 @@ - switch(_fps1000) - { - case 25000: -+ { - c->time_base= (AVRational){1001,25025}; - //c->frame_rate = 25025; - //c->frame_rate_base = 1001; - break; -+ } - case 23976: - /* - c->frame_rate = 24000; -@@ -276,10 +278,12 @@ - break; - } - case 29970: -+ { - c->time_base= (AVRational){1001,30000}; - //c->frame_rate = 30000; - //c->frame_rate_base = 1001; - break; -+ } - default: - if(_type==MUXER_MP4 || _type==MUXER_PSP) - { diff -ruN avidemux2.orig/pkg-plist avidemux2/pkg-plist --- avidemux2.orig/pkg-plist 2007-05-20 02:17:04.000000000 +0600 +++ avidemux2/pkg-plist 1970-01-01 05:00:00.000000000 +0500 @@ -1,8 +0,0 @@ -bin/avidemux2 -share/locale/es/LC_MESSAGES/avidemux.mo -share/locale/fr/LC_MESSAGES/avidemux.mo -share/locale/ru/LC_MESSAGES/avidemux.mo -share/locale/cs/LC_MESSAGES/avidemux.mo -share/locale/klingon/LC_MESSAGES/avidemux.mo -@dirrmtry share/locale/klingon/LC_MESSAGES -@dirrmtry share/locale/klingon >Release-Note: >Audit-Trail: >Unformatted: