Packman Build Service PMBS

ffmpeg2theora.changes Changed

ffmpeg2theora.spec Changed

@@ -7,13 +7,12 @@
 Name:         ffmpeg2theora
 License:      GNU General Public License (GPL)
 Group:        Productivity/Multimedia/Other
-Version:      0.28
+Version:      0.29
 Release:      1
 Summary:      A simple converter to create Ogg Theora files
 URL:          http://v2v.cc/~j/ffmpeg2theora/index.html
 Source0:      http://v2v.cc/~j/ffmpeg2theora/%{name}-%{version}.tar.bz2
 Patch0:       ffmpeg2theora-fix-include-path.patch
-Patch1:       ffmpeg2theora-ffmpeg11.patch
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -32,15 +31,12 @@
 %setup -q
 # Patch0:       ffmpeg2theora-fix-include-path.patch
 %patch0 -p1
-# Patch1:       ffmpeg2theora-ffmpeg11.patch
-%patch1 -p1
 
 %build
-export LDFLAGS="$LDFLAGS -lm"
-scons prefix=%{_prefix} APPEND_CCFLAGS="%{optflags}"
+scons prefix=%{_prefix} APPEND_CCFLAGS="%{optflags}" APPEND_LINKFLAGS="-lm"
 
 %install
-scons prefix=%{_prefix} mandir=%{_mandir} destdir=%{buildroot} install
+scons prefix=%{_prefix} mandir=%{_mandir} destdir=%{buildroot} APPEND_CCFLAGS="%{optflags}" APPEND_LINKFLAGS="-lm" install
 %__install -D -m 0644 ffmpeg2theora.1 %{buildroot}%{_mandir}/man1/ffmpeg2theora.1
 
 %clean
@@ -53,4 +49,3 @@
 %doc %{_mandir}/man1/ffmpeg2theora.1*
 
 %changelog
-

ffmpeg2theora-ffmpeg11.patch Deleted

@@ -1,1714 +0,0 @@
-diff '--exclude=.svn' -uNr ffmpeg2theora-0.28.orig/build_ffmpeg.sh ffmpeg2theora/build_ffmpeg.sh
---- ffmpeg2theora-0.28.orig/build_ffmpeg.sh	1970-01-01 01:00:00.000000000 +0100
-+++ ffmpeg2theora/build_ffmpeg.sh	2012-05-27 02:20:15.247986935 +0200
-@@ -0,0 +1,25 @@
-+#!/bin/sh
-+. ./ffmpegrev
-+
-+
-+common="--enable-gpl --enable-postproc --disable-muxers --disable-encoders --enable-libvorbis"
-+common="$common --disable-ffmpeg --disable-ffplay --disable-ffserver --disable-ffprobe --disable-doc"
-+
-+#optional, if you have those libs installed(requires GPL3):
-+#extra="$extra --enable-version3 --enable-libopencore-amrnb --enable-libopencore-amrwb"
-+
-+#apt-get install liba52-dev libgsm1-dev
-+#extra="$extra  --enable-libgsm"
-+
-+#optional, if you have libvpx installed:
-+#extra="$extra --enable-libvpx"
-+
-+#linux
-+options="$common --enable-pthreads $extra"
-+
-+#mingw32
-+uname | grep MINGW && options="$common --enable-memalign-hack --enable-mingw32 --extra-cflags=-I/usr/local/include --extra-ldflags=-L/usr/local/lib $extra"
-+
-+#configure and build ffmpeg
-+cd $FFMPEG_CO_DIR && ./configure $options && make
-+
-diff '--exclude=.svn' -uNr ffmpeg2theora-0.28.orig/ChangeLog ffmpeg2theora/ChangeLog
---- ffmpeg2theora-0.28.orig/ChangeLog	2011-07-30 21:55:10.000000000 +0200
-+++ ffmpeg2theora/ChangeLog	2012-05-27 02:20:15.246986961 +0200
-@@ -1,3 +1,9 @@
-+svn  2011-09-15
-+    - use GPL 2 or later, to make use of some decoders only available
-+      in GPL 2 version of ffmpeg
-+    - update to current ffmpeg api
-+    - output version information of libraries used
-+
- 0.28 2011-07-30
-     - select resize method via commandline
-     - fix 5.1 channel ordering
-diff '--exclude=.svn' -uNr ffmpeg2theora-0.28.orig/COPYING ffmpeg2theora/COPYING
---- ffmpeg2theora-0.28.orig/COPYING	2009-11-28 15:00:35.000000000 +0100
-+++ ffmpeg2theora/COPYING	2012-05-27 02:20:15.249986882 +0200
-@@ -1,627 +1,285 @@
-+                    GNU GENERAL PUBLIC LICENSE
-+                       Version 2, June 1991
- 
--		    GNU GENERAL PUBLIC LICENSE
--		       Version 3, 29 June 2007
--
-- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
-+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
-+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-  Everyone is permitted to copy and distribute verbatim copies
-  of this license document, but changing it is not allowed.
- 
--			    Preamble
--
--  The GNU General Public License is a free, copyleft license for
--software and other kinds of works.
-+                            Preamble
- 
--  The licenses for most software and other practical works are designed
--to take away your freedom to share and change the works.  By contrast,
--the GNU General Public License is intended to guarantee your freedom to
--share and change all versions of a program--to make sure it remains free
--software for all its users.  We, the Free Software Foundation, use the
--GNU General Public License for most of our software; it applies also to
--any other work released this way by its authors.  You can apply it to
-+  The licenses for most software are designed to take away your
-+freedom to share and change it.  By contrast, the GNU General Public
-+License is intended to guarantee your freedom to share and change free
-+software--to make sure the software is free for all its users.  This
-+General Public License applies to most of the Free Software
-+Foundation's software and to any other program whose authors commit to
-+using it.  (Some other Free Software Foundation software is covered by
-+the GNU Lesser General Public License instead.)  You can apply it to
- your programs, too.
- 
-   When we speak of free software, we are referring to freedom, not
- price.  Our General Public Licenses are designed to make sure that you
- have the freedom to distribute copies of free software (and charge for
--them if you wish), that you receive source code or can get it if you
--want it, that you can change the software or use pieces of it in new
--free programs, and that you know you can do these things.
--
--  To protect your rights, we need to prevent others from denying you
--these rights or asking you to surrender the rights.  Therefore, you have
--certain responsibilities if you distribute copies of the software, or if
--you modify it: responsibilities to respect the freedom of others.
-+this service if you wish), that you receive source code or can get it
-+if you want it, that you can change the software or use pieces of it
-+in new free programs; and that you know you can do these things.
-+
-+  To protect your rights, we need to make restrictions that forbid
-+anyone to deny you these rights or to ask you to surrender the rights.
-+These restrictions translate to certain responsibilities for you if you
-+distribute copies of the software, or if you modify it.
- 
-   For example, if you distribute copies of such a program, whether
--gratis or for a fee, you must pass on to the recipients the same
--freedoms that you received.  You must make sure that they, too, receive
--or can get the source code.  And you must show them these terms so they
--know their rights.
--
--  Developers that use the GNU GPL protect your rights with two steps:
--(1) assert copyright on the software, and (2) offer you this License
--giving you legal permission to copy, distribute and/or modify it.
--
--  For the developers' and authors' protection, the GPL clearly explains
--that there is no warranty for this free software.  For both users' and
--authors' sake, the GPL requires that modified versions be marked as
--changed, so that their problems will not be attributed erroneously to
--authors of previous versions.
--
--  Some devices are designed to deny users access to install or run
--modified versions of the software inside them, although the manufacturer
--can do so.  This is fundamentally incompatible with the aim of
--protecting users' freedom to change the software.  The systematic
--pattern of such abuse occurs in the area of products for individuals to
--use, which is precisely where it is most unacceptable.  Therefore, we
--have designed this version of the GPL to prohibit the practice for those
--products.  If such problems arise substantially in other domains, we
--stand ready to extend this provision to those domains in future versions
--of the GPL, as needed to protect the freedom of users.
--
--  Finally, every program is threatened constantly by software patents.
--States should not allow patents to restrict development and use of
--software on general-purpose computers, but in those that do, we wish to
--avoid the special danger that patents applied to a free program could
--make it effectively proprietary.  To prevent this, the GPL assures that
--patents cannot be used to render the program non-free.
-+gratis or for a fee, you must give the recipients all the rights that
-+you have.  You must make sure that they, too, receive or can get the
-+source code.  And you must show them these terms so they know their
-+rights.
-+
-+  We protect your rights with two steps: (1) copyright the software, and
-+(2) offer you this license which gives you legal permission to copy,
-+distribute and/or modify the software.
-+
-+  Also, for each author's protection and ours, we want to make certain
-+that everyone understands that there is no warranty for this free
-+software.  If the software is modified by someone else and passed on, we
-+want its recipients to know that what they have is not the original, so
-+that any problems introduced by others will not reflect on the original
-+authors' reputations.
-+
-+  Finally, any free program is threatened constantly by software
-+patents.  We wish to avoid the danger that redistributors of a free
-+program will individually obtain patent licenses, in effect making the
-+program proprietary.  To prevent this, we have made it clear that any
-+patent must be licensed for everyone's free use or not licensed at all.
- 
-   The precise terms and conditions for copying, distribution and
- modification follow.
- 
--		       TERMS AND CONDITIONS
--
--  0. Definitions.
-+                    GNU GENERAL PUBLIC LICENSE
-+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- 
--  "This License" refers to version 3 of the GNU General Public License.
--
--  "Copyright" also means copyright-like laws that apply to other kinds of
--works, such as semiconductor masks.
-- 
--  "The Program" refers to any copyrightable work licensed under this
--License.  Each licensee is addressed as "you".  "Licensees" and
--"recipients" may be individuals or organizations.
--
--  To "modify" a work means to copy from or adapt all or part of the work
--in a fashion requiring copyright permission, other than the making of an
--exact copy.  The resulting work is called a "modified version" of the
--earlier work or a work "based on" the earlier work.
--
--  A "covered work" means either the unmodified Program or a work based
--on the Program.
--
--  To "propagate" a work means to do anything with it that, without
--permission, would make you directly or secondarily liable for
--infringement under applicable copyright law, except executing it on a
--computer or modifying a private copy.  Propagation includes copying,
--distribution (with or without modification), making available to the
--public, and in some countries other activities as well.
--
--  To "convey" a work means any kind of propagation that enables other
--parties to make or receive copies.  Mere interaction with a user through
--a computer network, with no transfer of a copy, is not conveying.
--
--  An interactive user interface displays "Appropriate Legal Notices"
--to the extent that it includes a convenient and prominently visible
--feature that (1) displays an appropriate copyright notice, and (2)
--tells the user that there is no warranty for the work (except to the
--extent that warranties are provided), that licensees may convey the
--work under this License, and how to view a copy of this License.  If

ffmpeg2theora-0.28.tar.bz2/ffmpeg2theora.pmproj Deleted

ffmpeg2theora-0.28.tar.bz2/COPYING -> ffmpeg2theora-0.29.tar.bz2/COPYING Changed

@@ -1,627 +1,285 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
+                            Preamble
 
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
 
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
 
   For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
- 
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated

ffmpeg2theora-0.28.tar.bz2/ChangeLog -> ffmpeg2theora-0.29.tar.bz2/ChangeLog Changed

ffmpeg2theora-0.28.tar.bz2/SConstruct -> ffmpeg2theora-0.29.tar.bz2/SConstruct Changed

@@ -1,17 +1,17 @@
 # SCons build specification
+# vi:si:et:sw=2:sts=2:ts=2
 from glob import glob
 import os
 
 import SCons
 
-def svnversion():
+def version():
     f = os.popen("./version.sh")
     version = f.read().strip()
     f.close()
     return version
 
-pkg_version="0.28"
-#pkg_version +="+svn" + svnversion()
+pkg_version="0.29"
 
 pkg_name="ffmpeg2theora"
 
@@ -27,6 +27,7 @@
 opts.AddVariables(
   BoolVariable('static', 'Set to 1 for static linking', 0),
   BoolVariable('debug', 'Set to 1 to enable debugging', 0),
+  BoolVariable('build_ffmpeg', 'Set to 1 to build local copy of ffmpeg', 0),
   ('prefix', 'install files in', '/usr/local'),
   ('bindir', 'user executables', 'PREFIX/bin'),
   ('mandir', 'man documentation', 'PREFIX/man'),
@@ -71,8 +72,6 @@
 if GetOption("help"):
     Return()
 
-env.PrependENVPath ('PATH', os.environ'PATH')
-
 def ParsePKGConfig(env, name): 
   if os.environ.get('PKG_CONFIG_PATH', ''):
     action = 'PKG_CONFIG_PATH=%s pkg-config %s "%s"' % (os.environ'PKG_CONFIG_PATH', pkg_flags, name)
@@ -103,101 +102,113 @@
   context.Result( ret ) 
   return ret
 
+env.PrependENVPath ('PATH', os.environ'PATH')
+
 conf = Configure(env, custom_tests = {
   'CheckPKGConfig' : CheckPKGConfig,
   'CheckPKG' : CheckPKG,
-  })
-
-pkgconfig_version='0.15.0'
-if not conf.CheckPKGConfig(pkgconfig_version): 
-   print 'pkg-config >= %s not found.' % pkgconfig_version 
-   Exit(1)
-
-if not conf.CheckPKG("ogg >= 1.1"): 
-  print 'ogg >= 1.1 missing'
-  Exit(1) 
-
-if not conf.CheckPKG("vorbis"): 
-  print 'vorbis missing'
-  Exit(1) 
-
-if not conf.CheckPKG("vorbisenc"): 
-  print 'vorbisenc missing'
-  Exit(1) 
-
-if not conf.CheckPKG("theoraenc >= 1.1.0"): 
-  print 'theoraenc >= 1.1.0 missing'
-  Exit(1) 
-
-XIPH_LIBS="ogg >= 1.1 vorbis vorbisenc theoraenc >= 1.1.0"
-
-if not conf.CheckPKG(XIPH_LIBS): 
-  print 'some xiph libs are missing, ffmpeg2theora depends on %s' % XIPH_LIBS
-  Exit(1) 
-ParsePKGConfig(env, XIPH_LIBS)
-
-FFMPEG_LIBS=
-    "libavdevice",
-    "libavformat",
-    "libavcodec >= 52.30.0",
-    "libpostproc",
-    "libswscale",
-    "libavutil",
-
-if os.path.exists("./ffmpeg"):
-  pkg_path = list(set(map(os.path.dirname, glob('./ffmpeg/*/*.pc'))))
-  pkg_path.append(os.environ.get('PKG_CONFIG_PATH', ''))
-  os.environ'PKG_CONFIG_PATH' = ':'.join(pkg_path)
-  env.Append(CCFLAGS=
-    '-Iffmpeg'
-  )
-
-if not conf.CheckPKG(' '.join(FFMPEG_LIBS)): 
-  print """
-      Could not find %s.
-      You can install it via
-       sudo apt-get install %s
-      or update PKG_CONFIG_PATH to point to ffmpeg's source folder
-      or run ./get_ffmpeg.sh (for more information see INSTALL)
-  """ %(" ".join(FFMPEG_LIBS), " ".join("%s-dev"%l.split()0 for l in FFMPEG_LIBS))
-  Exit(1) 
-
-for lib in FFMPEG_LIBS:
-    ParsePKGConfig(env, lib)
-
-if conf.CheckCHeader('libavformat/framehook.h'):
-    env.Append(CCFLAGS=
-      '-DHAVE_FRAMEHOOK'
-    )
+})
 
-KATE_LIBS="oggkate"
-if env'libkate':
-  if os.path.exists("./libkate/misc/pkgconfig"):
-    os.environ'PKG_CONFIG_PATH' = "./libkate/misc/pkgconfig:" + os.environ.get('PKG_CONFIG_PATH', '')
-  if os.path.exists("./libkate/pkg/pkgconfig"):
-    os.environ'PKG_CONFIG_PATH' = "./libkate/pkg/pkgconfig:" + os.environ.get('PKG_CONFIG_PATH', '')
-  if conf.CheckPKG(KATE_LIBS):
-    ParsePKGConfig(env, KATE_LIBS)
-    env.Append(CCFLAGS='-DHAVE_KATE', '-DHAVE_OGGKATE')
+if env"build_ffmpeg":
+  if env.GetOption('clean'):
+    TryAction("cd ffmpeg;make distclean")
   else:
-    print """
-        Could not find libkate. Subtitles support will be disabled.
-        You can also run ./get_libkate.sh (for more information see INSTALL)
-        or update PKG_CONFIG_PATH to point to libkate's source folder
-    """
-
-if conf.CheckCHeader('iconv.h'):
+    TryAction("./build_ffmpeg.sh")
+
+if not env.GetOption('clean'):
+  pkgconfig_version='0.15.0'
+  if not conf.CheckPKGConfig(pkgconfig_version): 
+     print 'pkg-config >= %s not found.' % pkgconfig_version 
+     Exit(1)
+
+  if not conf.CheckPKG("ogg >= 1.1"): 
+    print 'ogg >= 1.1 missing'
+    Exit(1) 
+
+  if not conf.CheckPKG("vorbis"): 
+    print 'vorbis missing'
+    Exit(1) 
+
+  if not conf.CheckPKG("vorbisenc"): 
+    print 'vorbisenc missing'
+    Exit(1) 
+
+  if not conf.CheckPKG("theoraenc >= 1.1.0"): 
+    print 'theoraenc >= 1.1.0 missing'
+    Exit(1) 
+
+  XIPH_LIBS="ogg >= 1.1 vorbis vorbisenc theoraenc >= 1.1.0"
+
+  if not conf.CheckPKG(XIPH_LIBS): 
+    print 'some xiph libs are missing, ffmpeg2theora depends on %s' % XIPH_LIBS
+    Exit(1) 
+  ParsePKGConfig(env, XIPH_LIBS)
+
+  FFMPEG_LIBS=
+      "libavdevice",
+      "libavformat",
+      "libavfilter",
+      "libavcodec >= 52.30.0",
+      "libpostproc",
+      "libswscale",
+      "libswresample",
+      "libavutil",
+  
+  if os.path.exists("./ffmpeg"):
+    pkg_path = list(set(map(os.path.dirname, glob('./ffmpeg/*/*.pc'))))
+    pkg_path.append(os.environ.get('PKG_CONFIG_PATH', ''))
+    os.environ'PKG_CONFIG_PATH' = ':'.join(pkg_path)
     env.Append(CCFLAGS=
-      '-DHAVE_ICONV'
+      '-Iffmpeg'
     )
-    if conf.CheckLib('iconv'):
-        env.Append(LIBS='iconv')
 
-if env'crossmingw':
-    env.Append(CCFLAGS='-Wl,-subsystem,windows')
-    env.Append(LIBS='m')
-elif env'static':
-    env.Append(LIBS='m', 'dl')
+  if not conf.CheckPKG(' '.join(FFMPEG_LIBS)): 
+    print """
+        Could not find %s.
+        You can install it via
+         sudo apt-get install %s
+        or update PKG_CONFIG_PATH to point to ffmpeg's source folder
+        or run ./get_ffmpeg.sh (for more information see INSTALL)
+    """ %(" ".join(FFMPEG_LIBS), " ".join("%s-dev"%l.split()0 for l in FFMPEG_LIBS))
+    Exit(1) 
+
+  for lib in FFMPEG_LIBS:

ffmpeg2theora-0.29.tar.bz2/build_ffmpeg.sh Added

ffmpeg2theora-0.29.tar.bz2/ffmpeg2theora.pmdoc Added

ffmpeg2theora-0.29.tar.bz2/ffmpeg2theora.pmdoc/01ffmpeg-contents.xml Added

ffmpeg2theora-0.29.tar.bz2/ffmpeg2theora.pmdoc/01ffmpeg.xml Added

ffmpeg2theora-0.29.tar.bz2/ffmpeg2theora.pmdoc/index.xml Added

ffmpeg2theora-0.28.tar.bz2/get_ffmpeg.sh -> ffmpeg2theora-0.29.tar.bz2/get_ffmpeg.sh Changed

@@ -1,30 +1,14 @@
 #!/bin/sh
-
-common="--enable-version3 --enable-gpl --enable-postproc --disable-muxers --disable-encoders --enable-libvorbis"
-common="$common --disable-ffmpeg --disable-ffplay --disable-ffserver --disable-ffprobe --disable-doc"
-
-#optional, if you have those libs installed:
-#extra="$extra --enable-libopencore-amrnb --enable-libopencore-amrwb"
-
-#apt-get install liba52-dev libgsm1-dev
-#extra="$extra  --enable-libgsm"
-
-#optional, if you have libvpx installed:
-#extra="$extra --enable-libvpx"
-
-#linux
-options="$common --enable-pthreads $extra"
-
-#mingw32
-uname | grep MINGW && options="$common --enable-memalign-hack --enable-mingw32 --extra-cflags=-I/usr/local/include --extra-ldflags=-L/usr/local/lib $extra"
+cd `dirname $0`
 
 # load FFMPEG specific properties
 . ./ffmpegrev
 
-test -e $FFMPEG_CO_DIR || git clone $FFMPEG_URL $FFMPEG_CO_DIR
+test -e $FFMPEG_CO_DIR || git clone --depth 1 $FFMPEG_URL $FFMPEG_CO_DIR
 cd $FFMPEG_CO_DIR
 #git pull -r $FFMPEG_REVISION
-git checkout release/0.7 
+#git checkout release/0.7 
+git checkout master
 git pull
 cd ..
 
@@ -37,7 +21,5 @@
   cd ..
 }
 
-#test -e $FFMPEG_CO_DIR/.ffmpeg2theora_patched || apply_patches
-#configure and build ffmpeg
-cd $FFMPEG_CO_DIR && ./configure $options && make
+./build_ffmpeg.sh

ffmpeg2theora-0.28.tar.bz2/get_libkate.sh -> ffmpeg2theora-0.29.tar.bz2/get_libkate.sh Changed

ffmpeg2theora-0.28.tar.bz2/scons-tools/crossmingw.py -> ffmpeg2theora-0.29.tar.bz2/scons-tools/crossmingw.py Changed

ffmpeg2theora-0.28.tar.bz2/src/avinfo.c -> ffmpeg2theora-0.29.tar.bz2/src/avinfo.c Changed

@@ -1,13 +1,13 @@
 /* -*- tab-width:4;c-file-style:"cc-mode"; -*- */
 /*
  * avinfo.c -- Convert ffmpeg supported a/v files to  Ogg Theora / Vorbis
- * Copyright (C) 2003-2009 <j@v2v.cc>
+ * Copyright (C) 2003-2011 <j@v2v.cc>
  *
  *   gcc -o avinfo avinfo.c -DAVINFO `pkg-config --cflags --libs libavcodec libavformat`
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation, either version 2 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -42,6 +42,7 @@
 #include <sys/stat.h>
 
 #include "libavformat/avformat.h"
+#include "libavutil/pixdesc.h"
 
 #ifndef WIN32
 #if !defined(off64_t)
@@ -200,7 +201,7 @@
         codec_name = fix_codec_name(codec_name);
         json_add_key_value(output, "codec", (void *)codec_name, JSON_STRING, 0, indent);
         if (enc->pix_fmt != PIX_FMT_NONE) {
-            json_add_key_value(output, "pixel_format", (void *)avcodec_get_pix_fmt_name(enc->pix_fmt), JSON_STRING, 0, indent);
+            json_add_key_value(output, "pixel_format", (void *)av_get_pix_fmt_name(enc->pix_fmt), JSON_STRING, 0, indent);
         }
         if (enc->width) {
             json_add_key_value(output, "width", &enc->width, JSON_INT, 0, indent);
@@ -358,6 +359,7 @@
       i+=4;
       continue;
     }
+    if (si < 0) goto error;
     if (si < 128) {
       i++;
       continue;
@@ -385,12 +387,11 @@
 error:
   return i == n;
 }
-
-void json_metadata(FILE *output, const AVFormatContext *av)
+int _json_metadata(FILE *output, AVDictionary *m, int first, int indent)
 {
-    int first = 1, indent=2;
-    AVMetadataTag *tag = NULL;
-    while ((tag = av_metadata_get(av->metadata, "", tag, AV_METADATA_IGNORE_SUFFIX))) {
+    int i = 0;
+    AVDictionaryEntry *tag = NULL;
+    while ((tag = av_dict_get(m, "", tag, AV_DICT_IGNORE_SUFFIX))) {
         if (strlen(tag->value) && utf8_validate (tag->value, strlen(tag->value))) {
             if (first) {
                 first = 0;
@@ -404,6 +405,17 @@
             json_add_key_value(output, tag->key, tag->value, JSON_STRING, 1, indent);
         }
     }
+    return first;
+}
+
+void json_metadata(FILE *output, const AVFormatContext *av)
+{
+    int first = 1, indent=2, i=0;
+    first = _json_metadata(output, av->metadata, first, indent);
+
+    for(i=0;i<av->nb_streams;i++) {
+        first = _json_metadata(output, av->streamsi->metadata, first, indent);
+    }
     if (!first) {
         do_indent(output, 1);
         fprintf(output, "},\n");

ffmpeg2theora-0.28.tar.bz2/src/ffmpeg2theora.c -> ffmpeg2theora-0.29.tar.bz2/src/ffmpeg2theora.c Changed

@@ -1,11 +1,11 @@
 /* -*- tab-width:4;c-file-style:"cc-mode"; -*- */
 /*
  * ffmpeg2theora.c -- Convert ffmpeg supported a/v files to  Ogg Theora / Vorbis
- * Copyright (C) 2003-2009 <j@v2v.cc>
+ * Copyright (C) 2003-2011 <j@v2v.cc>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation, either version 2 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -504,7 +504,7 @@
 
 static const char *find_language_for_subtitle_stream(const AVStream *s)
 {
-  AVMetadataTag *language = av_metadata_get(s->metadata, "language", NULL, 0);
+  AVDictionaryEntry *language = av_dict_get(s->metadata, "language", NULL, 0);
   const char *lang=find_iso639_1(language->value);
   if (!lang) {
     fprintf(stderr, "WARNING - unrecognized ISO 639-2 language code: %s\n",
@@ -517,13 +517,13 @@
     unsigned int i;
     AVCodecContext *aenc = NULL;
     AVCodecContext *venc = NULL;
-    int venc_pix_fmt;
+    int venc_pix_fmt = 0;
     AVStream *astream = NULL;
     AVStream *vstream = NULL;
     AVCodec *acodec = NULL;
     AVCodec *vcodec = NULL;
-    pp_mode_t *ppMode = NULL;
-    pp_context_t *ppContext = NULL;
+    pp_mode *ppMode = NULL;
+    pp_context *ppContext = NULL;
     int sws_flags = this->resize_method;
     float frame_aspect = 0;
     double fps = 0.0;
@@ -575,6 +575,7 @@
         vstream = this->context->streamsthis->video_index;
         venc = vstream->codec;
         vcodec = avcodec_find_decoder (venc->codec_id);
+
         display_width = venc->width;
         display_height = venc->height;
         venc_pix_fmt =  venc->pix_fmt;
@@ -594,7 +595,7 @@
         }
         this->fps = fps = av_q2d(vstream_fps);
 
-        if (vcodec == NULL || avcodec_open (venc, vcodec) < 0) {
+        if (vcodec == NULL || avcodec_open2 (venc, vcodec, NULL) < 0) {
             this->video_index = -1;
         }
         this->fps = fps;
@@ -954,14 +955,14 @@
                 this->channels = aenc->channels;
         }
 
-        if (acodec != NULL && avcodec_open (aenc, acodec) >= 0) {
+        if (acodec != NULL && avcodec_open2 (aenc, acodec, NULL) >= 0) {
             if (this->sample_rate != sample_rate
                 || this->channels != aenc->channels
-                || aenc->sample_fmt != SAMPLE_FMT_S16) {
+                || aenc->sample_fmt != AV_SAMPLE_FMT_S16) {
                 // values take from libavcodec/resample.c
                 this->audio_resample_ctx = av_audio_resample_init(this->channels,    aenc->channels,
                                                                   this->sample_rate, sample_rate,
-                                                                  SAMPLE_FMT_S16,    aenc->sample_fmt,
+                                                                  AV_SAMPLE_FMT_S16,    aenc->sample_fmt,
                                                                   16, 10, 0, 0.8);
                 if (!this->audio_resample_ctx) {
                     this->channels = aenc->channels;
@@ -991,7 +992,7 @@
           const char *category;
           if (enc->codec_type == AVMEDIA_TYPE_SUBTITLE) {
             AVCodec *codec = avcodec_find_decoder (enc->codec_id);
-            if (codec && avcodec_open (enc, codec) >= 0) {
+            if (codec && avcodec_open2 (enc, codec, NULL) >= 0) {
               subtitles_openedi = 1;
             }
             category = find_category_for_subtitle_stream(this, i, this->included_subtitles);
@@ -1530,7 +1531,7 @@
                     int samples=0;
                     int samples_out=0;
                     int data_size = 4*AVCODEC_MAX_AUDIO_FRAME_SIZE;
-                    int bytes_per_sample = av_get_bits_per_sample_fmt(aenc->sample_fmt)/8;
+                    int bytes_per_sample = av_get_bytes_per_sample(aenc->sample_fmt);
 
                     if (avpkt.size > 0) {
                         len1 = avcodec_decode_audio3(astream->codec, audio_buf, &data_size, &avpkt);
@@ -1785,6 +1786,7 @@
     /* clear out state */
     if (info.passno != 1)
       free_subtitles(this);
+    this->context = NULL;
     if (info.twopass != 3) {
         av_free(this);
     }
@@ -1922,8 +1924,8 @@
 
         "AUTHOR"
     };
-    AVMetadataTag *tag = NULL;
-    while ((tag = av_metadata_get(av->metadata, "", tag, AV_METADATA_IGNORE_SUFFIX))) {
+    AVDictionaryEntry *tag = NULL;
+    while ((tag = av_dict_get(av->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) {
         char uc_key16;
         int i;
         for (i = 0; tag->keyi != '\0' && i < LENGTH(uc_key) - 1; i++)
@@ -1984,9 +1986,21 @@
     th_encode_free(td);
 
     fprintf(stdout,
-        PACKAGE " " PACKAGE_VERSION " - %s\n", th_version_string());
+        PACKAGE " " PACKAGE_VERSION "\n\n"
+        "\t%s\n"
+        "\t%s\n",
+        th_version_string(),
+        vorbis_version_string());
+
+    unsigned int version = avcodec_version();
+    fprintf(stdout, "\tFFmpeg\t libavcodec %02d.%d.%d\n",
+                    version >> 16, version >> 8 & 0xff, version & 0xff);
+    version = avformat_version();
+    fprintf(stdout, "\tFFmpeg\t libavformat %02d.%d.%d\n",
+                    version >> 16, version >> 8 & 0xff, version & 0xff);
+
     fprintf(stdout,
-        "\n"
+        "\n\n"
         "  Usage: " PACKAGE " options input\n"
         "\n"
         "General output options:\n"
@@ -2180,7 +2194,7 @@
     static int metadata_flag = -1;
 
     AVInputFormat *input_fmt = NULL;
-    AVFormatParameters params, *formatParams = NULL;
+    AVDictionary *format_opts = NULL;
 
     int c,long_option_index;
     const char *optstring = "P:o:k:f:F:x:y:v:V:a:A:K:d:H:c:G:Z:C:B:p:N:s:e:D:h::";
@@ -2811,29 +2825,25 @@
     for(info.passno=(info.twopass==3?1:info.twopass);info.passno<=(info.twopass==3?2:info.twopass);info.passno++){
     //detect image sequences and set framerate if provided
     if (input_fmt != NULL && strcmp(input_fmt->name, "video4linux") >= 0) {
-        formatParams = &params;
-        memset(formatParams, 0, sizeof(*formatParams));
-        if (input_fmt != NULL && strcmp(input_fmt->name, "video4linux") >= 0) {
-            formatParams->channel = 0;
-            formatParams->width = PAL_HALF_WIDTH;
-            formatParams->height = PAL_HALF_HEIGHT;
-            formatParams->time_base.den = 25;
-            formatParams->time_base.num = 2;
-            if (convert->picture_width)
-                formatParams->width = convert->picture_width;
-            if (convert->picture_height)
-                formatParams->height = convert->picture_height;
+        char buf100;
+        av_dict_set(&format_opts, "channel", "0", 0);
+        if (convert->picture_width || convert->picture_height) {
+            snprintf(buf, sizeof(buf), "%dx%d",
+                          convert->picture_width, convert->picture_height);
+            av_dict_set(&format_opts,"video_size", buf, 0); 
         }
         if (convert->force_input_fps.num > 0) {
-            formatParams->time_base.den = convert->force_input_fps.num;
-            formatParams->time_base.num = convert->force_input_fps.den;
+            snprintf(buf, sizeof(buf), "%d/%d", 
+                          convert->force_input_fps.den, convert->force_input_fps.num);
+            av_dict_set(&format_opts, "framerate", buf, 0);
         } else if (convert->framerate_new.num > 0) {
-            formatParams->time_base.den = convert->framerate_new.num;
-            formatParams->time_base.num = convert->framerate_new.den;
+            snprintf(buf, sizeof(buf), "%d/%d", 
+                          convert->framerate_new.den, convert->framerate_new.num);
+            av_dict_set(&format_opts, "framerate", buf, 0);
         }
     }
-    if (av_open_input_file(&convert->context, inputfile_name, input_fmt, 0, formatParams) >= 0) {
-        if (av_find_stream_info(convert->context) >= 0) {
+    if (avformat_open_input(&convert->context, inputfile_name, input_fmt, &format_opts) >= 0) {
+        if (avformat_find_stream_info(convert->context, NULL) >= 0) {
 
                 if (output_filename_needs_building) {
                     int i;
@@ -2863,7 +2873,7 @@
                     /* reserve 4 bytes in the buffer for the `.ogva' extension */
                     snprintf(outputfile_name, sizeof(outputfile_name) - strlen(ext), "%s",inputfile_name);
                     if ((str_ptr = strrchr(outputfile_name, '.'))) {
-                        sprintf(str_ptr, ext);
+                        sprintf(str_ptr, "%s", ext);
                         if (!strcmp(inputfile_name, outputfile_name)) {
                             snprintf(outputfile_name, sizeof(outputfile_name), "%s%s", inputfile_name, ext);
                         }
@@ -2960,7 +2970,7 @@
                 fprintf(stderr,"\nUnable to decode input.\n");

ffmpeg2theora-0.28.tar.bz2/src/index.c -> ffmpeg2theora-0.29.tar.bz2/src/index.c Changed

ffmpeg2theora-0.28.tar.bz2/src/index.h -> ffmpeg2theora-0.29.tar.bz2/src/index.h Changed

ffmpeg2theora-0.28.tar.bz2/src/subtitles.c -> ffmpeg2theora-0.29.tar.bz2/src/subtitles.c Changed

ffmpeg2theora-0.28.tar.bz2/src/theorautils.c -> ffmpeg2theora-0.29.tar.bz2/src/theorautils.c Changed

@@ -1,11 +1,11 @@
 /* -*- tab-width:4;c-file-style:"cc-mode"; -*- */
 /*
  * theorautils.c - Ogg Theora/Ogg Vorbis Abstraction and Muxing
- * Copyright (C) 2003-2009 <j@v2v.cc>
+ * Copyright (C) 2003-2011 <j@v2v.cc>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation, either version 2 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -36,11 +36,6 @@
 #endif
 #endif
 
-#ifdef WIN32
-#define fseeko fseeko64
-#define ftello ftello64
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -51,6 +46,13 @@
 #include <math.h>
 #include <limits.h>
 
+#ifdef WIN32
+#if !defined(fseeko)
+#define fseeko fseeko64
+#define ftello ftello64
+#endif
+#endif
+
 #include "theora/theoraenc.h"
 #include "vorbis/codec.h"
 #include "vorbis/vorbisenc.h"
@@ -533,8 +535,12 @@
     int index_bytes = 0;  
     int keypoints_cutoff = 0;
 
-    /* Must have indexed keypoints. */
-    assert(index->max_keypoints > 0 && index->packet_num > 0);
+    /* Must have indexed keypoints to go on */
+    if (index->max_keypoints == 0 || index->packet_num == 0) {
+      fprintf(stderr, "WARNING: no key points for %s stream %08x\n", name, serialno);
+      return 0;
+    }
+
     /* Must have placeholder packet to rewrite. */
     assert(index->page_location > 0);

ffmpeg2theora-0.28.tar.bz2/src/theorautils.h -> ffmpeg2theora-0.29.tar.bz2/src/theorautils.h Changed

ffmpeg2theora-0.28.tar.bz2/version.sh -> ffmpeg2theora-0.29.tar.bz2/version.sh Changed

Changes of Revision 6