diff options
author | bapt <bapt@FreeBSD.org> | 2011-06-09 14:16:17 +0800 |
---|---|---|
committer | bapt <bapt@FreeBSD.org> | 2011-06-09 14:16:17 +0800 |
commit | 038aa007e0f3fdd5e5936479b4cba02b3304b242 (patch) | |
tree | 67985662dba8010331b8074ba28fc437368628e2 /multimedia | |
parent | d86f99a20654315314c04fb3a9008b17453331f7 (diff) | |
download | freebsd-ports-gnome-038aa007e0f3fdd5e5936479b4cba02b3304b242.tar.gz freebsd-ports-gnome-038aa007e0f3fdd5e5936479b4cba02b3304b242.tar.zst freebsd-ports-gnome-038aa007e0f3fdd5e5936479b4cba02b3304b242.zip |
- update to 2.5.5
- add license
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/avidemux2-plugins/Makefile | 1 | ||||
-rw-r--r-- | multimedia/avidemux2/Makefile | 1 | ||||
-rw-r--r-- | multimedia/avidemux2/Makefile.common | 6 | ||||
-rw-r--r-- | multimedia/avidemux2/distinfo | 4 | ||||
-rw-r--r-- | multimedia/avidemux2/files/patch-x264_110 | 35 | ||||
-rw-r--r-- | multimedia/avidemux2/pkg-plist | 1 |
6 files changed, 6 insertions, 42 deletions
diff --git a/multimedia/avidemux2-plugins/Makefile b/multimedia/avidemux2-plugins/Makefile index ff6b5f0cb03a..f94fecd30e26 100644 --- a/multimedia/avidemux2-plugins/Makefile +++ b/multimedia/avidemux2-plugins/Makefile @@ -7,7 +7,6 @@ PORTNAME= avidemux2 PORTVERSION= ${AVIDEMUX2_VERSION} -PORTREVISION= 2 CATEGORIES= multimedia PKGNAMESUFFIX= -plugins diff --git a/multimedia/avidemux2/Makefile b/multimedia/avidemux2/Makefile index 84a6aadf28e6..3c8ec8e41627 100644 --- a/multimedia/avidemux2/Makefile +++ b/multimedia/avidemux2/Makefile @@ -7,7 +7,6 @@ PORTNAME= avidemux2 PORTVERSION= ${AVIDEMUX2_VERSION} -PORTREVISION= 3 CATEGORIES= multimedia MAINTAINER= multimedia@FreeBSD.org diff --git a/multimedia/avidemux2/Makefile.common b/multimedia/avidemux2/Makefile.common index fc4e5b29428c..694882cc162d 100644 --- a/multimedia/avidemux2/Makefile.common +++ b/multimedia/avidemux2/Makefile.common @@ -1,8 +1,8 @@ # $FreeBSD$ # -AVIDEMUX2_VERSION= 2.5.4 -MASTER_SITES= ${MASTER_SITE_BERLIOS} \ +AVIDEMUX2_VERSION= 2.5.5 +MASTER_SITES= BERLIOS \ SF/avidemux/avidemux/${PORTVERSION} DISTNAME= avidemux_${PORTVERSION} @@ -15,6 +15,8 @@ LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame \ dca.0:${PORTSDIR}/multimedia/libdca \ execinfo.1:${PORTSDIR}/devel/libexecinfo +LICENSE= GPLv2 + CONFLICTS= avidemux2-2.[0-46-9].* USE_GNOME= libxml2 diff --git a/multimedia/avidemux2/distinfo b/multimedia/avidemux2/distinfo index bfa0d5de2696..d8431a224986 100644 --- a/multimedia/avidemux2/distinfo +++ b/multimedia/avidemux2/distinfo @@ -1,2 +1,2 @@ -SHA256 (avidemux_2.5.4.tar.gz) = 355bd3d235f6b3d0af65cbed535f51a1a7213c8abf8794af8b8d2cf88c1d720d -SIZE (avidemux_2.5.4.tar.gz) = 18154965 +SHA256 (avidemux_2.5.5.tar.gz) = c5bf45298911e00b06cf48ae4a936525d28cc2dddd4f41ee22e689b023b4923a +SIZE (avidemux_2.5.5.tar.gz) = 15738941 diff --git a/multimedia/avidemux2/files/patch-x264_110 b/multimedia/avidemux2/files/patch-x264_110 deleted file mode 100644 index 67b32b76b15c..000000000000 --- a/multimedia/avidemux2/files/patch-x264_110 +++ /dev/null @@ -1,35 +0,0 @@ ---- 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>
diff --git a/multimedia/avidemux2/pkg-plist b/multimedia/avidemux2/pkg-plist index b3fb1148bba3..427d33749c71 100644 --- a/multimedia/avidemux2/pkg-plist +++ b/multimedia/avidemux2/pkg-plist @@ -1,6 +1,5 @@ bin/avidemux2_cli lib/libADM5avcodec.so.52 -lib/libADM5avcore.so.0 lib/libADM5avformat.so.52 lib/libADM5avutil.so.50 lib/libADM5postproc.so.51 |