Attachment 126404 Details for Bug 170159 – file.diff

[patch] file.diff

file.diff (text/plain), 3.60 KB, created by tkato432 on 2012-07-25 19:10:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2012-07-25 19:10:14 UTC

Size: 3.60 KB

patch

obsolete

>diff -urN /usr/ports/multimedia/ffmpeg2theora/Makefile multimedia/ffmpeg2theora/Makefile
>--- /usr/ports/multimedia/ffmpeg2theora/Makefile	2012-07-20 05:15:37.000000000 +0900
>+++ multimedia/ffmpeg2theora/Makefile	2012-07-24 01:39:46.000000000 +0900
>@@ -5,8 +5,7 @@
> # $FreeBSD: ports/multimedia/ffmpeg2theora/Makefile,v 1.16 2012/07/19 20:15:37 naddy Exp $
> 
> PORTNAME=	ffmpeg2theora
>-PORTVERSION=	0.28
>-PORTREVISION=	4
>+PORTVERSION=	0.29
> CATEGORIES=	multimedia
> MASTER_SITES=	http://v2v.cc/~j/ffmpeg2theora/downloads/
> 
>@@ -15,15 +14,19 @@
> 
> LICENSE=	GPLv3
> 
>-LIB_DEPENDS=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
>-		theora.0:${PORTSDIR}/multimedia/libtheora \
>-		kate.4:${PORTSDIR}/multimedia/libkate
>+LIB_DEPENDS=	avcodec:${PORTSDIR}/multimedia/ffmpeg \
>+		kate:${PORTSDIR}/multimedia/libkate \
>+		theora:${PORTSDIR}/multimedia/libtheora
> 
> USE_BZIP2=	yes
>+USE_ICONV=	yes
> USE_SCONS=	yes
>+SCONS_BUILDENV=	CC="${CC}" CCFLAGS="${CFLAGS}" \
>+		APPEND_CCFLAGS="${CPPFLAGS}" APPEND_LINKFLAGS="${LDFLAGS}"
>+MAKE_JOBS_SAFE=	yes
> 
>-SCONS_ENV+=	APPEND_LINKFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
>-		APPEND_CFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include"
>+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
>+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
> 
> MAN1=		ffmpeg2theora.1
> PLIST_FILES=	bin/ffmpeg2theora
>diff -urN /usr/ports/multimedia/ffmpeg2theora/distinfo multimedia/ffmpeg2theora/distinfo
>--- /usr/ports/multimedia/ffmpeg2theora/distinfo	2011-09-01 03:15:52.000000000 +0900
>+++ multimedia/ffmpeg2theora/distinfo	2012-07-03 22:06:42.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (ffmpeg2theora-0.28.tar.bz2) = 6893c1444d730a1514275ba76ba487ca207205b916d6cb1285704225ee86fe1e
>-SIZE (ffmpeg2theora-0.28.tar.bz2) = 95404
>+SHA256 (ffmpeg2theora-0.29.tar.bz2) = 214110e2a5afdd8ff8e0be18152e893dbff5dabc1ae1d1124e64d9f93eae946d
>+SIZE (ffmpeg2theora-0.29.tar.bz2) = 90143
>diff -urN /usr/ports/multimedia/ffmpeg2theora/files/patch-SConstruct multimedia/ffmpeg2theora/files/patch-SConstruct
>--- /usr/ports/multimedia/ffmpeg2theora/files/patch-SConstruct	1970-01-01 09:00:00.000000000 +0900
>+++ multimedia/ffmpeg2theora/files/patch-SConstruct	2012-07-04 01:53:43.000000000 +0900
>@@ -0,0 +1,19 @@
>+--- SConstruct.orig	2012-06-26 02:15:16.000000000 +0900
>++++ SConstruct	2012-07-04 01:17:19.000000000 +0900
>+@@ -37,7 +37,7 @@
>+   BoolVariable('libkate', 'enable libkate support', 1),
>+   BoolVariable('crossmingw', 'Set to 1 for crosscompile with mingw', 0)
>+ )
>+-env = Environment(options = opts)
>++env = Environment(options = opts, CC = Split(os.environ['CC']), CCFLAGS = Split(os.environ['CCFLAGS']))
>+ Help(opts.GenerateHelpText(env))
>+ 
>+ pkg_flags="--cflags --libs"
>+@@ -151,7 +151,6 @@
>+       "libavcodec >= 52.30.0",
>+       "libpostproc",
>+       "libswscale",
>+-      "libswresample",
>+       "libavutil",
>+   ]
>+   if os.path.exists("./ffmpeg"):
>diff -urN /usr/ports/multimedia/ffmpeg2theora/files/patch-src__ffmpeg2theora.c multimedia/ffmpeg2theora/files/patch-src__ffmpeg2theora.c
>--- /usr/ports/multimedia/ffmpeg2theora/files/patch-src__ffmpeg2theora.c	1970-01-01 09:00:00.000000000 +0900
>+++ multimedia/ffmpeg2theora/files/patch-src__ffmpeg2theora.c	2012-07-04 01:49:31.000000000 +0900
>@@ -0,0 +1,14 @@
>+--- src/ffmpeg2theora.c.orig	2012-01-29 17:00:19.000000000 +0900
>++++ src/ffmpeg2theora.c	2012-07-04 01:49:09.000000000 +0900
>+@@ -2970,7 +2970,11 @@
>+                 fprintf(stderr,"\nUnable to decode input.\n");
>+             return(1);
>+         }
>++#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53,17,0)
>++        av_close_input_file(convert->context);
>++#else
>+         avformat_close_input(&convert->context);
>++#endif
>+     }
>+     else{
>+         if (info.frontend)

Actions: View | Diff

Attachments on bug 170159: 126404