Revert r559792 to unbreak INDEX and bulk -a

It seems a lot of reverse dependencies were missed

With hat:	portmgr

6 files changed, 91 insertions, 0 deletions

diff --git a/multimedia/ffmpeg2theora/Makefile b/multimedia/ffmpeg2theora/Makefile
new file mode 100644
index 000000000000..28bb8f71349a
--- /dev/null
+++ b/multimedia/ffmpeg2theora/Makefile
@@ -0,0 +1,28 @@
+# Created by: Anders Nordby <anders@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	ffmpeg2theora
+PORTVERSION=	0.30
+PORTREVISION=	6
+CATEGORIES=	multimedia
+MASTER_SITES=	http://v2v.cc/~j/ffmpeg2theora/downloads/
+
+MAINTAINER=	wg@FreeBSD.org
+COMMENT=	Reencode many media file formats to Ogg Theora
+
+LICENSE=	GPLv3
+
+LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
+		libkate.so:multimedia/libkate \
+		libtheora.so:multimedia/libtheora
+
+USES=		iconv pkgconfig scons:python2 tar:bzip2
+MAKE_ARGS=	APPEND_CCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		APPEND_LINKFLAGS="${LDFLAGS} ${LIBS}"
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB}
+
+PLIST_FILES=	bin/ffmpeg2theora man/man1/ffmpeg2theora.1.gz
+
+.include <bsd.port.mk>
diff --git a/multimedia/ffmpeg2theora/distinfo b/multimedia/ffmpeg2theora/distinfo
new file mode 100644
index 000000000000..647b78d84f65
--- /dev/null
+++ b/multimedia/ffmpeg2theora/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1465461122
+SHA256 (ffmpeg2theora-0.30.tar.bz2) = 4f6464b444acab5d778e0a3359d836e0867a3dcec4ad8f1cdcf87cb711ccc6df
+SIZE (ffmpeg2theora-0.30.tar.bz2) = 91269
diff --git a/multimedia/ffmpeg2theora/files/patch-SConstruct b/multimedia/ffmpeg2theora/files/patch-SConstruct
new file mode 100644
index 000000000000..38b7c79686de
--- /dev/null
+++ b/multimedia/ffmpeg2theora/files/patch-SConstruct
@@ -0,0 +1,30 @@
+--- SConstruct.orig	2016-01-10 04:35:56 UTC
++++ SConstruct
+@@ -38,7 +38,7 @@ opts.AddVariables(
+   BoolVariable('libkate', 'enable libkate support', 1),
+   BoolVariable('crossmingw', 'Set to 1 for crosscompile with mingw', 0)
+ )
+-env = Environment(options = opts)
++env = Environment(options = opts, ENV=os.environ, CC = Split(os.environ['CC']))
+ Help(opts.GenerateHelpText(env))
+ 
+ pkg_flags="--cflags --libs"
+@@ -152,7 +152,6 @@ if not env.GetOption('clean'):
+       "libavcodec >= 52.30.0",
+       "libpostproc",
+       "libswscale",
+-      "libswresample",
+       "libavutil",
+   ]
+   if os.path.exists("./ffmpeg"):
+@@ -214,9 +213,8 @@ if not env.GetOption('clean'):
+       env.Append(CCFLAGS=[
+         '-DHAVE_ICONV'
+       ])
+-      if conf.CheckLib('iconv'):
+-          env.Append(LIBS=['iconv'])
+ 
++  env.Append(LIBS=['m'])
+   if env['crossmingw']:
+       env.Append(CCFLAGS=['-Wl,-subsystem,windows'])
+       env.Append(LIBS=['m'])
diff --git a/multimedia/ffmpeg2theora/files/patch-src_ffmpeg2theora.c b/multimedia/ffmpeg2theora/files/patch-src_ffmpeg2theora.c
new file mode 100644
index 000000000000..5b210f9b14b7
--- /dev/null
+++ b/multimedia/ffmpeg2theora/files/patch-src_ffmpeg2theora.c
@@ -0,0 +1,14 @@
+--- src/ffmpeg2theora.c.orig	2016-01-10 04:35:56 UTC
++++ src/ffmpeg2theora.c
+@@ -3103,7 +3103,11 @@ int main(int argc, char **argv) {
+                 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)
diff --git a/multimedia/ffmpeg2theora/files/patch-src_subtitles.c b/multimedia/ffmpeg2theora/files/patch-src_subtitles.c
new file mode 100644
index 000000000000..490c8670185f
--- /dev/null
+++ b/multimedia/ffmpeg2theora/files/patch-src_subtitles.c
@@ -0,0 +1,11 @@
+--- src/subtitles.c.orig	2016-01-10 04:35:56 UTC
++++ src/subtitles.c
+@@ -284,7 +284,7 @@ static char *convert_subtitle_to_utf8(co
+       return NULL;
+     }
+     outptr=newtext;
+-    if (iconv(cd, &inptr, &insz, &outptr, &outsz) < 0) {
++    if (iconv(cd, &inptr, &insz, &outptr, &outsz) == (size_t)-1) {
+       warn(frontend, NULL, 0, "Failed to convert text to UTF-8\n");
+       free(newtext);
+       newtext = NULL;
diff --git a/multimedia/ffmpeg2theora/pkg-descr b/multimedia/ffmpeg2theora/pkg-descr
new file mode 100644
index 000000000000..4745349a15c3
--- /dev/null
+++ b/multimedia/ffmpeg2theora/pkg-descr
@@ -0,0 +1,5 @@
+ffmpeg2theora is a simple command line tool to convert media files to
+.ogg with Theora video and Vorbis audio streams. It supports reading any
+file format that ffmpeg can decode.
+
+WWW: http://v2v.cc/~j/ffmpeg2theora/