Attachment #126404 for bug #170159

View | Details | Raw Unified | Return to bug 170159
Collapse All | Expand All




# $FreeBSD: ports/multimedia/ffmpeg2theora/Makefile,v 1.16 2012/07/19 20:15:37 naddy Exp $

PORTNAME=	ffmpeg2theora
PORTVERSION=	0.29
PORTREVISION=	4
CATEGORIES=	multimedia
MASTER_SITES=	http://v2v.cc/~j/ffmpeg2theora/downloads/



LICENSE=	GPLv3

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

CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}

MAN1=		ffmpeg2theora.1
PLIST_FILES=	bin/ffmpeg2theora

Lines 1-2 Link Here

(-)multimedia/ffmpeg2theora/distinfo (-2 / +2 lines)
1	SHA256 (ffmpeg2theora-0.28.tar.bz2) = 6893c1444d730a1514275ba76ba487ca207205b916d6cb1285704225ee86fe1e	1	SHA256 (ffmpeg2theora-0.29.tar.bz2) = 214110e2a5afdd8ff8e0be18152e893dbff5dabc1ae1d1124e64d9f93eae946d
2	SIZE (ffmpeg2theora-0.28.tar.bz2) = 95404	2	SIZE (ffmpeg2theora-0.29.tar.bz2) = 90143




--- 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"):




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

Return to bug 170159

Lines 5-12 Link Here

(-)multimedia/ffmpeg2theora/Makefile (-7 / +10 lines)
5	# $FreeBSD: ports/multimedia/ffmpeg2theora/Makefile,v 1.16 2012/07/19 20:15:37 naddy Exp $	5	# $FreeBSD: ports/multimedia/ffmpeg2theora/Makefile,v 1.16 2012/07/19 20:15:37 naddy Exp $
6		6
7	PORTNAME= ffmpeg2theora	7	PORTNAME= ffmpeg2theora
8	PORTVERSION= 0.28	8	PORTVERSION= 0.29
9	PORTREVISION= 4
10	CATEGORIES= multimedia	9	CATEGORIES= multimedia
11	MASTER_SITES= http://v2v.cc/~j/ffmpeg2theora/downloads/	10	MASTER_SITES= http://v2v.cc/~j/ffmpeg2theora/downloads/
12		11
Lines 15-29 Link Here
15		14
16	LICENSE= GPLv3	15	LICENSE= GPLv3
17		16
18	LIB_DEPENDS= avcodec.1:${PORTSDIR}/multimedia/ffmpeg \	17	LIB_DEPENDS= avcodec:${PORTSDIR}/multimedia/ffmpeg \
19	theora.0:${PORTSDIR}/multimedia/libtheora \	18	kate:${PORTSDIR}/multimedia/libkate \
20	kate.4:${PORTSDIR}/multimedia/libkate	19	theora:${PORTSDIR}/multimedia/libtheora
21		20
22	USE_BZIP2= yes	21	USE_BZIP2= yes
		22	USE_ICONV= yes
23	USE_SCONS= yes	23	USE_SCONS= yes
		24	SCONS_BUILDENV= CC="${CC}" CCFLAGS="${CFLAGS}" \
		25	APPEND_CCFLAGS="${CPPFLAGS}" APPEND_LINKFLAGS="${LDFLAGS}"
		26	MAKE_JOBS_SAFE= yes
24		27
25	SCONS_ENV+= APPEND_LINKFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \	28	CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
26	APPEND_CFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include"	29	LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
27		30
28	MAN1= ffmpeg2theora.1	31	MAN1= ffmpeg2theora.1
29	PLIST_FILES= bin/ffmpeg2theora	32	PLIST_FILES= bin/ffmpeg2theora

Line 0 Link Here

(-)multimedia/ffmpeg2theora/files/patch-SConstruct (+19 lines)
	1	--- SConstruct.orig 2012-06-26 02:15:16.000000000 +0900
	2	+++ SConstruct 2012-07-04 01:17:19.000000000 +0900
	3	@@ -37,7 +37,7 @@
	4	BoolVariable('libkate', 'enable libkate support', 1),
	5	BoolVariable('crossmingw', 'Set to 1 for crosscompile with mingw', 0)
	6	)
	7	-env = Environment(options = opts)
	8	+env = Environment(options = opts, CC = Split(os.environ['CC']), CCFLAGS = Split(os.environ['CCFLAGS']))
	9	Help(opts.GenerateHelpText(env))
	10
	11	pkg_flags="--cflags --libs"
	12	@@ -151,7 +151,6 @@
	13	"libavcodec >= 52.30.0",
	14	"libpostproc",
	15	"libswscale",
	16	- "libswresample",
	17	"libavutil",
	18	]
	19	if os.path.exists("./ffmpeg"):

Line 0 Link Here

(-)multimedia/ffmpeg2theora/files/patch-src__ffmpeg2theora.c (+14 lines)
	1	--- src/ffmpeg2theora.c.orig 2012-01-29 17:00:19.000000000 +0900
	2	+++ src/ffmpeg2theora.c 2012-07-04 01:49:09.000000000 +0900
	3	@@ -2970,7 +2970,11 @@
	4	fprintf(stderr,"\nUnable to decode input.\n");
	5	return(1);
	6	}
	7	+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53,17,0)
	8	+ av_close_input_file(convert->context);
	9	+#else
	10	avformat_close_input(&convert->context);
	11	+#endif
	12	}
	13	else{
	14	if (info.frontend)