Attachment 95196 Details for Bug 133539 – file.diff

[patch] file.diff

file.diff (text/plain), 8.11 KB, created by me on 2009-04-09 15:30:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: me

Created: 2009-04-09 15:30:08 UTC

Size: 8.11 KB

patch

obsolete

>diff -u multimedia/avidemux2/distinfo.orig multimedia/avidemux2/distinfo
>--- multimedia/avidemux2/distinfo.orig	2008-07-15 04:53:28.000000000 +0200
>+++ multimedia/avidemux2/distinfo	2009-04-09 13:55:59.000000000 +0200
>@@ -1,3 +1,3 @@
>-MD5 (avidemux_2.4.2.tar.gz) = 6c86fcfa491491b83e1291112fe3a3be
>-SHA256 (avidemux_2.4.2.tar.gz) = 747dfb2efc9c1b3d4e60a6f426e5c22476ec7b141a8091cc0f1c5a75b451cfe4
>-SIZE (avidemux_2.4.2.tar.gz) = 6683907
>+MD5 (avidemux_2.4.4.tar.gz) = 503dfd25842ef81be7c769811e7bc54e
>+SHA256 (avidemux_2.4.4.tar.gz) = 45aafd6e54047edcfe9c985f4c9523c0efd71f7d21dad5e584aceb92c63e2956
>+SIZE (avidemux_2.4.4.tar.gz) = 6894690
>diff -u multimedia/avidemux2/Makefile.orig multimedia/avidemux2/Makefile
>--- multimedia/avidemux2/Makefile.orig	2009-03-24 20:13:22.000000000 +0100
>+++ multimedia/avidemux2/Makefile	2009-04-09 13:52:51.000000000 +0200
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	avidemux2
>-PORTVERSION=	2.4.2
>-PORTREVISION=	3
>+PORTVERSION=	2.4.4
> CATEGORIES=	multimedia
> MASTER_SITES=	${MASTER_SITE_BERLIOS} \
> 		${MASTER_SITE_SOURCEFORGE}
>@@ -17,11 +16,11 @@
> MAINTAINER=	amistry@am-productions.biz
> COMMENT=	Simple GUI based video editor
> 
>-LIB_DEPENDS=	mp3lame:${PORTSDIR}/audio/lame \
>-		mad:${PORTSDIR}/audio/libmad \
>-		a52:${PORTSDIR}/audio/liba52 \
>-		png:${PORTSDIR}/graphics/png \
>-		execinfo:${PORTSDIR}/devel/libexecinfo
>+LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
>+		mad.2:${PORTSDIR}/audio/libmad \
>+		a52.0:${PORTSDIR}/audio/liba52 \
>+		png.5:${PORTSDIR}/graphics/png \
>+		execinfo.1:${PORTSDIR}/devel/libexecinfo
> 
> CONFLICTS=	avidemux2-2.[0-35-9].*
> # Necessary for CMake to find libs
>@@ -108,61 +107,61 @@
> .if defined(WITHOUT_JACK)
> CMAKE_ARGS+=	-DNO_Jack=1
> .else
>-LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
>+LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
> .endif
> 
> .if defined(WITHOUT_PULSE)
> CMAKE_ARGS+=	-DNO_PULSE_SIMPLE=1
> .else
>-LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
>+LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
> .endif
> 
> .if defined(WITHOUT_FREETYPE)
> CMAKE_ARGS+=	-DNO_FREETYPE=1
> .else
>-LIB_DEPENDS+=	freetype:${PORTSDIR}/print/freetype2
>+LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
> .endif
> 
> .if defined(WITHOUT_FONTCONFIG)
> CMAKE_ARGS+=	-DNO_FontConfig=1
> .else
>-LIB_DEPENDS+=	fontconfig:${PORTSDIR}/x11-fonts/fontconfig
>+LIB_DEPENDS+=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
> .endif
> 
> .if defined(WITHOUT_SAMPLERATE)
> CMAKE_ARGS+=	-DNO_libsamplerate=1
> .else
>-LIB_DEPENDS+=	samplerate:${PORTSDIR}/audio/libsamplerate
>+LIB_DEPENDS+=	samplerate.1:${PORTSDIR}/audio/libsamplerate
> .endif
> 
> .if defined(WITHOUT_XVIDEO)
> CMAKE_ARGS+=	-DNO_XV=1
> .else
>-LIB_DEPENDS+=	Xv:${PORTSDIR}/x11/libXv
>+LIB_DEPENDS+=	Xv.1:${PORTSDIR}/x11/libXv
> .endif
> 
> .if defined(WITHOUT_FAAC)
> CMAKE_ARGS+=	-DNO_FAAC=1
> .else
>-LIB_DEPENDS+=	faac:${PORTSDIR}/audio/faac
>+LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
> .endif
> 
> .if defined(WITHOUT_FAAD)
> CMAKE_ARGS+=	-DNO_FAAD=1 -DNO_NeAAC=1
> .else
>-LIB_DEPENDS+=	faad:${PORTSDIR}/audio/faad
>+LIB_DEPENDS+=	faad.2:${PORTSDIR}/audio/faad
> .endif
> 
> .if defined(WITHOUT_X264)
> CMAKE_ARGS+=	-DNO_x264=1
> .else
>-LIB_DEPENDS+=	x264:${PORTSDIR}/multimedia/x264
>+LIB_DEPENDS+=	x264.65:${PORTSDIR}/multimedia/x264
> .endif
> 
> .if defined(WITHOUT_XVID)
> CMAKE_ARGS+=	-DNO_Xvid=1
> .else
>-LIB_DEPENDS+=	xvidcore:${PORTSDIR}/multimedia/xvid
>+LIB_DEPENDS+=	xvidcore.4:${PORTSDIR}/multimedia/xvid
> .endif
> 
> .if defined(WITHOUT_SDL)
>@@ -174,19 +173,19 @@
> .if defined(WITHOUT_VORBIS)
> CMAKE_ARGS+=	-DNO_Vorbis=1
> .else
>-LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
>+LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
> .endif
> 
> .if defined(WITHOUT_DCA)
> CMAKE_ARGS+=	-DNO_libdca=1
> .else
>-LIB_DEPENDS+=	dca:${PORTSDIR}/multimedia/libdca
>+LIB_DEPENDS+=	dca.0:${PORTSDIR}/multimedia/libdca
> .endif
> 
> .if defined(WITHOUT_AMRNB)
> CMAKE_ARGS+=	-DNO_AMRNB=1
> .else
>-LIB_DEPENDS+=	amrnb:${PORTSDIR}/audio/libamrnb
>+LIB_DEPENDS+=	amrnb.3:${PORTSDIR}/audio/libamrnb
> .endif
> 
> .if defined(WITHOUT_NLS)
>diff -u multimedia/avidemux2/files/patch-ConfigureChecks.cmake.orig multimedia/avidemux2/files/patch-ConfigureChecks.cmake
>--- multimedia/avidemux2/files/patch-ConfigureChecks.cmake.orig	2008-07-15 04:53:29.000000000 +0200
>+++ multimedia/avidemux2/files/patch-ConfigureChecks.cmake	2009-04-09 15:17:12.000000000 +0200
>@@ -1,6 +1,6 @@
>---- ./ConfigureChecks.cmake.orig	2008-07-05 20:24:01.000000000 +0200
>-+++ ./ConfigureChecks.cmake	2008-07-10 17:16:26.000000000 +0200
>-@@ -220,6 +220,43 @@
>+--- 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)
>  
>  ########################################
>@@ -43,8 +43,8 @@
> +########################################
>  # Locale
>  ########################################
>- SET(ADM_LOCALE "${CMAKE_INSTALL_PREFIX}/share/locale")
>-@@ -362,7 +399,9 @@
>+ IF (NOT ADM_LOCALE) 
>+@@ -367,7 +404,9 @@
>  # JACK
>  ########################################
>  IF (NOT ADM_OS_WINDOWS)
>@@ -54,20 +54,20 @@
>  ENDIF (NOT ADM_OS_WINDOWS)
>  
>  ########################################
>-@@ -475,7 +514,11 @@
>+@@ -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)
>+-	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)
>++               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)
>++               ADM_CHECK_HL(libdca dts.h dts dts_init USE_LIBDCA_A)
> +       ENDIF (ADM_BSD_FAMILY)
>- ENDIF (USE_LATE_BINDING)
>- 
>- SET(CMAKE_REQUIRED_LIBRARIES)
>-@@ -489,7 +532,8 @@
>+         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)
>diff -u multimedia/avidemux2/files/patch-avidemux__ADM_encoder__adm_encx264.cpp.orig multimedia/avidemux2/files/patch-avidemux__ADM_encoder__adm_encx264.cpp
>--- multimedia/avidemux2/files/patch-avidemux__ADM_encoder__adm_encx264.cpp.orig	2008-07-15 04:53:29.000000000 +0200
>+++ multimedia/avidemux2/files/patch-avidemux__ADM_encoder__adm_encx264.cpp	2009-04-09 15:54:30.000000000 +0200
>@@ -1,10 +0,0 @@
>---- ./avidemux/ADM_encoder/adm_encx264.cpp.orig	2008-06-30 20:30:09.000000000 +0200
>-+++ ./avidemux/ADM_encoder/adm_encx264.cpp	2008-07-10 17:27:51.000000000 +0200
>-@@ -271,6 +271,7 @@
>- {
>-   uint32_t    bitrate;
>- 
>-+  _delayed = 0;
>-   ADM_assert (_state == enc_Pass1);
>-   printf ("\n[x264] Starting pass 2 (%d x %d)\n", _w, _h);
>- 
>diff -u multimedia/avidemux2/files/patch-avidemux__ADM_userInterfaces__ADM_QT4__ui_support.cpp.orig multimedia/avidemux2/files/patch-avidemux__ADM_userInterfaces__ADM_QT4__ui_support.cpp
>--- multimedia/avidemux2/files/patch-avidemux__ADM_userInterfaces__ADM_QT4__ui_support.cpp.orig	2008-07-15 04:53:29.000000000 +0200
>+++ multimedia/avidemux2/files/patch-avidemux__ADM_userInterfaces__ADM_QT4__ui_support.cpp	2009-04-09 15:35:10.000000000 +0200
>@@ -1,6 +1,6 @@
>---- ./avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp.orig	2008-03-28 20:02:18.000000000 +0100
>-+++ ./avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp	2008-07-10 17:16:26.000000000 +0200
>-@@ -38,10 +38,8 @@
>+--- avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp.orig	2008-09-24 03:09:49.000000000 +0200
>++++ avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp	2009-04-09 15:32:35.000000000 +0200
>+@@ -60,10 +60,8 @@
>  {
>  	printf("\n[Locale] Locale: %s\n", QLocale::system().name().toUtf8().constData());
>  
>@@ -10,6 +10,6 @@
> -	loadTranslation(&avidemuxTranslator, appdir + "avidemux_" + QLocale::system().name());
> +	loadTranslation(&qtTranslator, "%%DATADIR%%/qt_" + QLocale::system().name());
> +	loadTranslation(&avidemuxTranslator, "%%DATADIR%%/avidemux_" + QLocale::system().name());
>+ 	translatorLoaded = true;
>  
>- 	printf("[Locale] Test: &Edit -> %s\n\n", HIDE_STRING_FROM_QT("MainWindow", "&Edit").toUtf8().data());
>- }
>+ 	// Re-translate existing map (to take care of global strings already allocated)

Actions: View | Diff

Attachments on bug 133539: 95196