Imported Debian patch 0.21-0.1
Kapil Hari Paranjape authored 15 years ago
RISKO Gergely committed 15 years ago
0 | ffmpeg2theora (0.21-0.1) unstable; urgency=low | |
1 | ||
2 | * Non-maintainer upload to fix RC bugs. | |
3 | * New upstream release (0.21). | |
4 | Closes: #484813, #482218, #487911. | |
5 | * debian/control: | |
6 | - added libavutil-dev, libavdevice-dev, libfaad-dev, libx11-dev, | |
7 | libxext-dev to dependencies. | |
8 | - added Homepage field | |
9 | - Standards-Version 3.8.0 | |
10 | * debian/rules: | |
11 | - added cdbs simple-patchsys include. | |
12 | - added "as-needed" and "no-undefined" flags for linker | |
13 | to reduce dependencies. | |
14 | * debian/patches/01-fix_includes.patch: point the include | |
15 | directives in ffmpeg2theora.c to the correct directories. | |
16 | * debian/patches/02-fix_hyphen-used-as-minus_in_manpage.patch: | |
17 | replaced incorrect uses of hyphen as minus in ffmpeg2theora.1. | |
18 | ||
19 | -- Kapil Hari Paranjape <kapil@debian.org> Thu, 26 Jun 2008 06:47:53 +0530 | |
20 | ||
21 | ffmpeg2theora (0.19-1) unstable; urgency=low | |
22 | ||
23 | * New upstream release (closes: #429937, #368588) | |
24 | * removed now unneeded libdc1394-dev dependecy (closes: #413663) | |
25 | * new build with new version of libavformat0d (closes: #430037) | |
26 | * added libswscale-dev new dependency | |
27 | ||
28 | -- RISKO Gergely <risko@debian.org> Sat, 28 Jul 2007 19:14:08 +0200 | |
29 | ||
30 | ffmpeg2theora (0.16-2) unstable; urgency=low | |
31 | ||
32 | * added libgsm-dev and libdc1394-dev to build-depends (closes: #366025) | |
33 | ||
34 | -- RISKO Gergely <risko@debian.org> Tue, 30 May 2006 16:43:46 +0200 | |
35 | ||
36 | ffmpeg2theora (0.16-1) unstable; urgency=low | |
37 | ||
38 | * New upstream release | |
39 | - fixes segfault when permission denied on output (closes: #352272) | |
40 | - fixes misleading error message for wrong input format (closes: #338872) | |
41 | * ftbfs fixed, i was silly when added -lgsm -ldc1394_control the day | |
42 | before yesterday (closes: #352547) | |
43 | ||
44 | -- RISKO Gergely <risko@debian.org> Mon, 13 Feb 2006 01:16:25 +0100 | |
45 | ||
46 | ffmpeg2theora (0.15-1) unstable; urgency=low | |
47 | ||
48 | * New upstream release (closes: #335854) | |
49 | * '-ldc1394_control -lgsm' added to LDFLAGS in rules (closes: #333636) | |
50 | * changed FSF's postal address (thanks lintian!) | |
51 | ||
52 | -- RISKO Gergely <risko@debian.org> Sat, 11 Feb 2006 14:20:15 +0100 | |
53 | ||
54 | ffmpeg2theora (0.13+svn20050704-1) unstable; urgency=low | |
55 | ||
56 | * initial upload (closes: #279503) | |
57 | ||
58 | -- RISKO Gergely <risko@debian.org> Mon, 4 Jul 2005 23:10:00 +0200 | |
59 |
0 | 4 |
0 | Source: ffmpeg2theora | |
1 | Section: graphics | |
2 | Priority: optional | |
3 | Maintainer: RISKO Gergely <risko@debian.org> | |
4 | Build-Depends: cdbs, debhelper, libavcodec-dev, libavutil-dev, libpostproc-dev, | |
5 | libswscale-dev, libavformat-dev, libavdevice-dev, libogg-dev, libvorbis-dev, | |
6 | libtheora-dev, pkg-config, zlib1g-dev, libdts-dev, libgsm1-dev, libfaad-dev, | |
7 | libx11-dev, libxext-dev | |
8 | Homepage: http://v2v.cc/~j/ffmpeg2theora/ | |
9 | Standards-Version: 3.8.0 | |
10 | ||
11 | Package: ffmpeg2theora | |
12 | Architecture: any | |
13 | Depends: ${shlibs:Depends} | |
14 | Description: Theora video encoder using ffmpeg | |
15 | This package provides a command-line tool to encode/recode various | |
16 | video formats (basically everything that ffmpeg can read) into Theora, | |
17 | the free video codec. |
0 | This package was debianized by RISKO Gergely <risko@debian.org> on | |
1 | Thu, 09 Jun 2005 15:55:02 +0200. | |
2 | ||
3 | It was downloaded from http://www.v2v.cc/~j/ffmpeg2theora/index.html | |
4 | ||
5 | Upstream Author: jan gerber <j@v2v.cc> | |
6 | ||
7 | Copyright as mentioned in ffmpeg2theora.c source file: | |
8 | /* -*- tab-width:4;c-file-style:"cc-mode"; -*- */ | |
9 | /* | |
10 | * ffmpeg2theora.c -- Convert ffmpeg supported a/v files to Ogg Theora | |
11 | * Copyright (C) 2003-2004 <j@v2v.cc> | |
12 | * | |
13 | * This program is free software; you can redistribute it and/or modify | |
14 | * it under the terms of the GNU General Public License as published by | |
15 | * the Free Software Foundation; either version 2 of the License, or | |
16 | * (at your option) any later version. | |
17 | * | |
18 | * This program is distributed in the hope that it will be useful, | |
19 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
20 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
21 | * GNU General Public License for more details. | |
22 | * | |
23 | * You should have received a copy of the GNU General Public License | |
24 | * along with this program; if not, write to the Free Software Foundation, | |
25 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. | |
26 | * | |
27 | */ | |
28 | ||
29 | You can find the mentioned GNU General Public License (GPL) (on a | |
30 | Debian system) in the file /usr/share/common-licenses/GPL. |
0 | --- ffmpeg2theora-0.21/ffmpeg2theora.c.orig 2008-06-24 21:01:30.000000000 +0530 | |
1 | +++ ffmpeg2theora-0.21/ffmpeg2theora.c 2008-06-24 21:03:30.000000000 +0530 | |
2 | @@ -27,10 +27,10 @@ | |
3 | #include <math.h> | |
4 | #include <errno.h> | |
5 | ||
6 | -#include "libavformat/avformat.h" | |
7 | -#include "libavdevice/avdevice.h" | |
8 | -#include "libswscale/swscale.h" | |
9 | -#include "libpostproc/postprocess.h" | |
10 | +#include "ffmpeg/avformat.h" | |
11 | +#include "ffmpeg/avdevice.h" | |
12 | +#include "ffmpeg/swscale.h" | |
13 | +#include "postproc/postprocess.h" | |
14 | ||
15 | #include "theora/theora.h" | |
16 | #include "vorbis/codec.h" |
0 | --- ffmpeg2theora-0.21/ffmpeg2theora.1.orig 2008-05-18 03:42:03.000000000 +0530 | |
1 | +++ ffmpeg2theora-0.21/ffmpeg2theora.1 2008-06-25 16:40:53.000000000 +0530 | |
2 | @@ -96,7 +96,7 @@ | |
3 | [0.1 to 10.0] contrast correction (default: 1.0). Note: lower values make the video darker. | |
4 | .TP | |
5 | .B \-B, \-\-brightness | |
6 | -[-1.0 to 1.0] brightness correction (default: 0.0). Note: lower values make the video darker. | |
7 | +[\-1.0 to 1.0] brightness correction (default: 0.0). Note: lower values make the video darker. | |
8 | .TP | |
9 | .B \-G, \-\-gamma | |
10 | [0.1 to 10.0] gamma correction (default: 1.0). Note: lower values make the video darker. | |
11 | @@ -106,7 +106,7 @@ | |
12 | .SS Audio output options: | |
13 | .TP | |
14 | .B \-a, \-\-audioquality | |
15 | -[-2 to 10] Set encoding quality for audio (default: 1). | |
16 | +[\-2 to 10] Set encoding quality for audio (default: 1). | |
17 | use higher values for better quality | |
18 | .TP | |
19 | .B \-A, \-\-audiobitrate | |
20 | @@ -153,7 +153,7 @@ | |
21 | .B \-\-subtitles | |
22 | Encode subtitles from the given file to a multiplexed Kate stream. | |
23 | The input file should be in SubRip (.srt) format, encoded in utf-8, | |
24 | -unless the --subtitles-encoding option is also given. | |
25 | +unless the \-\-subtitles-encoding option is also given. | |
26 | .TP | |
27 | .B \-\-subtitles-encoding encoding | |
28 | Assumes the corresponding subtitles file is encoded in the given | |
29 | @@ -206,17 +206,17 @@ | |
30 | Encode Videos: | |
31 | ffmpeg2theora videoclip.avi (will write output to videoclip.ogv) | |
32 | ||
33 | - cat something.dv | ffmpeg2theora -f dv -o output.ogv \- | |
34 | + cat something.dv | ffmpeg2theora \-f dv \-o output.ogv \- | |
35 | ||
36 | Encode a series of images: | |
37 | - ffmpeg2theora -f image2 frame%06d.png -o output.ogv | |
38 | + ffmpeg2theora \-f image2 frame%06d.png \-o output.ogv | |
39 | ||
40 | Live streaming from V4L Device: | |
41 | ffmpeg2theora \-\-v4l /dev/video0 \-\-inputfps 15 \-x 160 \-y 128 \-o \- \\ | |
42 | | oggfwd iccast2server 8000 password /theora.ogv | |
43 | ||
44 | Live encoding from a DV camcorder (needs a fast machine): | |
45 | - dvgrab - | ffmpeg2theora -f dv -x 352 -y 288 -o output.ogv -\n" | |
46 | + dvgrab \- | ffmpeg2theora \-f dv \-x 352 \-y 288 \-o output.ogv \-\n" | |
47 | ||
48 | Live encoding and streaming to icecast server: | |
49 | dvgrab \-\-format raw \- \\ |
0 | #!/usr/bin/make -f | |
1 | ||
2 | include /usr/share/cdbs/1/class/autotools.mk | |
3 | include /usr/share/cdbs/1/rules/debhelper.mk | |
4 | include /usr/share/cdbs/1/rules/simple-patchsys.mk | |
5 | ||
6 | # DC1394 is Linux-only and not needed | |
7 | #ifneq (,findstring($(DEB_HOST_ARCH_OS), hurd kfreebsd)) | |
8 | # DC1394="" | |
9 | #else | |
10 | # DC1394="-ldc1394_control" | |
11 | #endif | |
12 | ||
13 | DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lgsm -Wl,-z,defs -Wl,--as-needed" |