- update to 2.5.5

- add license
This commit is contained in:
Baptiste Daroussin 2011-06-09 06:16:17 +00:00
parent 94b6ecf0c7
commit 5750b863cc
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=275256
6 changed files with 6 additions and 42 deletions

View file

@ -7,7 +7,6 @@
PORTNAME= avidemux2
PORTVERSION= ${AVIDEMUX2_VERSION}
PORTREVISION= 2
CATEGORIES= multimedia
PKGNAMESUFFIX= -plugins

View file

@ -7,7 +7,6 @@
PORTNAME= avidemux2
PORTVERSION= ${AVIDEMUX2_VERSION}
PORTREVISION= 3
CATEGORIES= multimedia
MAINTAINER= multimedia@FreeBSD.org

View file

@ -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

View file

@ -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

View file

@ -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>

View file

@ -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