Projects
Multimedia
ffmpeg2theora
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 5
View file
ffmpeg2theora.changes
Changed
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sun May 27 00:00:00 UTC 2012 - Manfred.Tremmel@iiv.de + +- updates from svn to get it work with ffmpeg 0.11 + +------------------------------------------------------------------- Thu Mar 15 17:00:45 UTC 2012 - jw@suse.de - build failed due to api changes in ffmpeg. Adding suggested patch from
View file
ffmpeg2theora.spec
Changed
@@ -13,7 +13,7 @@ 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: lp_509_508_jw.diff +Patch1: ffmpeg2theora-ffmpeg11.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -32,10 +32,11 @@ %setup -q # Patch0: ffmpeg2theora-fix-include-path.patch %patch0 -p1 -# Patch1: lp_509_508_jw.diff +# Patch1: ffmpeg2theora-ffmpeg11.patch %patch1 -p1 %build +export LDFLAGS="$LDFLAGS -lm" scons prefix=%{_prefix} APPEND_CCFLAGS="%{optflags}" %install @@ -52,35 +53,4 @@ %doc %{_mandir}/man1/ffmpeg2theora.1* %changelog -* Sun Jul 31 2011 Manfred.Tremmel <Manfred.Tremmel@iiv.de> - 0.28-0.pm.1 -- updated to version 0.28 -* Sat Jun 19 2010 Manfred.Tremmel <Manfred.Tremmel@iiv.de> - 0.27-0.pm.1 -- updated to version 0.27 -* Sat Feb 06 2010 Manfred.Tremmel <Manfred.Tremmel@iiv.de> - 0.26-0.pm.1 -- updated to version 0.26 -* Sat Oct 17 2009 Manfred.Tremmel <Manfred.Tremmel@iiv.de> - 0.25-0.pm.1 -- updated to version 0.25 -* Sun Sep 06 2009 Manfred.Tremmel <Manfred.Tremmel@iiv.de> - 0.24-1.pm.1 -- cleanups where rpmlint wasn't so happy -* Sat Mar 28 2009 - Manfred.Tremmel@iiv.de -- updated to version 0.24 -* Fri Nov 28 2008 - anschneider@suse.de -- updated to version 0.22 - * enable v4l input again (-f video4linux or -f video4linux2) - * ability to set framerate for image sequences (--inputfps) - * fix several memory leaks - * if only width or height are given, the other is set to preserve aspect ratio - * -start / -end options now work with audio only input - * new option --novideo to disable input video - * remove autotools build system, only scons build is supported now. -* Wed Jul 23 2008 - guru@unixtech.be -- new upstream version: 0.21 -- added support for libkate -* Wed Jul 23 2008 - guru@unixtech.be -- added debug_package -- build on 11.0 -- added missing BuildRequires: libmp3lame-devel -* Thu Dec 20 2007 - Manfred.Tremmel@iiv.de -- added a patch to build with latest ffmpeg version -* Thu Nov 08 2007 - andreas@links2linux.de -- initial package version 0.19 +
View file
ffmpeg2theora-ffmpeg11.patch
Added
@@ -0,0 +1,1714 @@ +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
View file
lp_509_508_jw.diff
Deleted
@@ -1,88 +0,0 @@ ---- ffmpeg2theora-0.28/src/ffmpeg2theora.c.orig 2011-07-30 22:04:25.000000000 +0200 -+++ ffmpeg2theora-0.28/src/ffmpeg2theora.c 2012-03-15 18:17:04.419200000 +0100 -@@ -520,12 +520,12 @@ void ff2theora_output(ff2theora this) { - int venc_pix_fmt; - 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; - AVRational vstream_fps; - int display_width = -1, display_height = -1; -@@ -955,15 +955,15 @@ void ff2theora_output(ff2theora this) { - } - - if (acodec != NULL && avcodec_open (aenc, acodec) >= 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; - } - if (!info.frontend && this->sample_rate!=sample_rate) -@@ -2831,11 +2831,11 @@ int main(int argc, char **argv) { - formatParams->time_base.den = convert->framerate_new.num; - formatParams->time_base.num = convert->framerate_new.den; - } - } - if (av_open_input_file(&convert->context, inputfile_name, input_fmt, 0, formatParams) >= 0) { -- if (av_find_stream_info(convert->context) >= 0) { -+ if (avformat_find_stream_info(convert->context, NULL) >= 0) { - - if (output_filename_needs_building) { - int i; - /* work out the stream types the output will hold */ - int has_video = 0, has_audio = 0, has_kate = 0, has_skeleton = 0; -@@ -2958,11 +2958,11 @@ int main(int argc, char **argv) { - json_format_info(stdout, NULL, inputfile_name); - else - fprintf(stderr,"\nUnable to decode input.\n"); - return(1); - } -- av_close_input_file(convert->context); -+ avformat_close_input(&convert->context); - } - else{ - if (info.frontend) - json_format_info(info.frontend, NULL, inputfile_name); - else if (output_json) ---- ffmpeg2theora-0.28/SConstruct.orig 2011-07-31 12:20:37.000000000 +0200 -+++ ffmpeg2theora-0.28/SConstruct 2012-03-15 18:43:13.703216000 +0100 -@@ -140,10 +140,11 @@ FFMPEG_LIBS= - "libavdevice", - "libavformat", - "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', '')) -@@ -196,10 +197,12 @@ if conf.CheckCHeader('iconv.h'): - if env'crossmingw': - env.Append(CCFLAGS='-Wl,-subsystem,windows') - env.Append(LIBS='m') - elif env'static': - env.Append(LIBS='m', 'dl') -+else: -+ env.Append(LIBS='m') - - env = conf.Finish() - - # ffmpeg2theora - ffmpeg2theora = env.Clone()
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.