Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 9 Jun 2016 15:29:41 +0000 (UTC)
From:      Ben Woods <woodsb02@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r416611 - in head/multimedia/ffmpeg2theora: . files
Message-ID:  <201606091529.u59FTf6C022310@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: woodsb02
Date: Thu Jun  9 15:29:41 2016
New Revision: 416611
URL: https://svnweb.freebsd.org/changeset/ports/416611

Log:
  multimedia/ffmpeg2theora:
  - Update to 0.30
  - Remove patch-ffmpeg2 (not needed now that 0.30 uses new FFmpeg API)
  - Tidy up remaining patches (pet portlint)
  
  Changes this release:
    https://git.xiph.org/?p=ffmpeg2theora.git;a=blob;f=ChangeLog;h=7b2c20e19e4ca6d042d8f2bb3d4491e513d422fa;hb=ff86d204adf335b6314ef568b08d4af8799f108d
  
  This new version also allows ffmpeg2theora to build successfully once
  multimedia/ffmpeg is updated to 3.0.x. Note that multimedia/ffmpeg is
  currently still on the 2.8.x branch, however this update is backwards
  compatible with ffmpeg 2.8.x.
  
  PR:		209375
  Approved by:	wg (maintainer timeout), mat (mentor)
  Differential Revision:	https://reviews.freebsd.org/D6784

Added:
  head/multimedia/ffmpeg2theora/files/patch-src_ffmpeg2theora.c
     - copied, changed from r416610, head/multimedia/ffmpeg2theora/files/patch-src__ffmpeg2theora.c
  head/multimedia/ffmpeg2theora/files/patch-src_subtitles.c
     - copied, changed from r416610, head/multimedia/ffmpeg2theora/files/patch-src-subtitles.c
Deleted:
  head/multimedia/ffmpeg2theora/files/patch-ffmpeg2
  head/multimedia/ffmpeg2theora/files/patch-src-subtitles.c
  head/multimedia/ffmpeg2theora/files/patch-src__ffmpeg2theora.c
Modified:
  head/multimedia/ffmpeg2theora/Makefile
  head/multimedia/ffmpeg2theora/distinfo
  head/multimedia/ffmpeg2theora/files/patch-SConstruct

Modified: head/multimedia/ffmpeg2theora/Makefile
==============================================================================
--- head/multimedia/ffmpeg2theora/Makefile	Thu Jun  9 15:29:38 2016	(r416610)
+++ head/multimedia/ffmpeg2theora/Makefile	Thu Jun  9 15:29:41 2016	(r416611)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ffmpeg2theora
-PORTVERSION=	0.29
-PORTREVISION=	2
+PORTVERSION=	0.30
 CATEGORIES=	multimedia
 MASTER_SITES=	http://v2v.cc/~j/ffmpeg2theora/downloads/
 

Modified: head/multimedia/ffmpeg2theora/distinfo
==============================================================================
--- head/multimedia/ffmpeg2theora/distinfo	Thu Jun  9 15:29:38 2016	(r416610)
+++ head/multimedia/ffmpeg2theora/distinfo	Thu Jun  9 15:29:41 2016	(r416611)
@@ -1,2 +1,3 @@
-SHA256 (ffmpeg2theora-0.29.tar.bz2) = 214110e2a5afdd8ff8e0be18152e893dbff5dabc1ae1d1124e64d9f93eae946d
-SIZE (ffmpeg2theora-0.29.tar.bz2) = 90143
+TIMESTAMP = 1465461122
+SHA256 (ffmpeg2theora-0.30.tar.bz2) = 4f6464b444acab5d778e0a3359d836e0867a3dcec4ad8f1cdcf87cb711ccc6df
+SIZE (ffmpeg2theora-0.30.tar.bz2) = 91269

Modified: head/multimedia/ffmpeg2theora/files/patch-SConstruct
==============================================================================
--- head/multimedia/ffmpeg2theora/files/patch-SConstruct	Thu Jun  9 15:29:38 2016	(r416610)
+++ head/multimedia/ffmpeg2theora/files/patch-SConstruct	Thu Jun  9 15:29:41 2016	(r416611)
@@ -1,6 +1,6 @@
---- SConstruct.orig	2012-06-25 17:15:16 UTC
+--- SConstruct.orig	2016-01-10 04:35:56 UTC
 +++ SConstruct
-@@ -37,7 +37,7 @@ opts.AddVariables(
+@@ -38,7 +38,7 @@ opts.AddVariables(
    BoolVariable('libkate', 'enable libkate support', 1),
    BoolVariable('crossmingw', 'Set to 1 for crosscompile with mingw', 0)
  )
@@ -9,7 +9,7 @@
  Help(opts.GenerateHelpText(env))
  
  pkg_flags="--cflags --libs"
-@@ -151,7 +151,6 @@ if not env.GetOption('clean'):
+@@ -152,7 +152,6 @@ if not env.GetOption('clean'):
        "libavcodec >= 52.30.0",
        "libpostproc",
        "libswscale",
@@ -17,7 +17,7 @@
        "libavutil",
    ]
    if os.path.exists("./ffmpeg"):
-@@ -200,9 +199,8 @@ if not env.GetOption('clean'):
+@@ -214,9 +213,8 @@ if not env.GetOption('clean'):
        env.Append(CCFLAGS=[
          '-DHAVE_ICONV'
        ])

Copied and modified: head/multimedia/ffmpeg2theora/files/patch-src_ffmpeg2theora.c (from r416610, head/multimedia/ffmpeg2theora/files/patch-src__ffmpeg2theora.c)
==============================================================================
--- head/multimedia/ffmpeg2theora/files/patch-src__ffmpeg2theora.c	Thu Jun  9 15:29:38 2016	(r416610, copy source)
+++ head/multimedia/ffmpeg2theora/files/patch-src_ffmpeg2theora.c	Thu Jun  9 15:29:41 2016	(r416611)
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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);
          }

Copied and modified: head/multimedia/ffmpeg2theora/files/patch-src_subtitles.c (from r416610, head/multimedia/ffmpeg2theora/files/patch-src-subtitles.c)
==============================================================================
--- head/multimedia/ffmpeg2theora/files/patch-src-subtitles.c	Thu Jun  9 15:29:38 2016	(r416610, copy source)
+++ head/multimedia/ffmpeg2theora/files/patch-src_subtitles.c	Thu Jun  9 15:29:41 2016	(r416611)
@@ -1,4 +1,4 @@
---- src/subtitles.c.orig	2011-09-15 20:20:46 UTC
+--- 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;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606091529.u59FTf6C022310>