diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-09-23 07:57:53 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-09-23 07:57:53 +0000 |
commit | c0a5541e4b5ffaafad602122098b9e662069aee9 (patch) | |
tree | 61ece3fd6daf10fc3e5c5fc5f8737e20b428fff7 /media-video | |
parent | punt realbasic, fetch restricted and upstream stopped providing... demo versi... (diff) | |
download | historical-c0a5541e4b5ffaafad602122098b9e662069aee9.tar.gz historical-c0a5541e4b5ffaafad602122098b9e662069aee9.tar.bz2 historical-c0a5541e4b5ffaafad602122098b9e662069aee9.zip |
punt qt-faststart, moved to as USE flag in ffmpeg at least since 9999 versions from which snapshots are created
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/qt-faststart/ChangeLog | 27 | ||||
-rw-r--r-- | media-video/qt-faststart/Manifest | 6 | ||||
-rw-r--r-- | media-video/qt-faststart/files/qt-faststart-0.2.diff | 268 | ||||
-rw-r--r-- | media-video/qt-faststart/metadata.xml | 9 | ||||
-rw-r--r-- | media-video/qt-faststart/qt-faststart-0.1.ebuild | 25 | ||||
-rw-r--r-- | media-video/qt-faststart/qt-faststart-0.2.ebuild | 38 |
6 files changed, 0 insertions, 373 deletions
diff --git a/media-video/qt-faststart/ChangeLog b/media-video/qt-faststart/ChangeLog deleted file mode 100644 index e28d7acbb43b..000000000000 --- a/media-video/qt-faststart/ChangeLog +++ /dev/null @@ -1,27 +0,0 @@ -# ChangeLog for media-video/qt-faststart -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/qt-faststart/ChangeLog,v 1.5 2010/08/09 23:48:29 hwoarang Exp $ - - 09 Aug 2010; Markos Chandras <hwoarang@gentoo.org> - qt-faststart-0.2.ebuild: - Respect CC,CFLAGS,LDFLAGS. Bug #331791. Thanks to Diego E. 'Flameeyes' - Pettenò <flameeyes@gentoo.org> for reporting - - 02 Jun 2010; Torsten Veller <tove@gentoo.org> metadata.xml: - Remove caleb from metadata.xml (#317071) - -*qt-faststart-0.2 (28 Dec 2008) - - 28 Dec 2008; Caleb Tennis <caleb@gentoo.org> +files/qt-faststart-0.2.diff, - +qt-faststart-0.2.ebuild: - version bump, with patch from 249953 - - 07 Jun 2008; Caleb Tennis <caleb@gentoo.org> qt-faststart-0.1.ebuild: - amd64 stable - -*qt-faststart-0.1 (19 Jan 2008) - - 19 Jan 2008; Caleb Tennis <caleb@gentoo.org> +metadata.xml, - +qt-faststart-0.1.ebuild: - Initial import - diff --git a/media-video/qt-faststart/Manifest b/media-video/qt-faststart/Manifest deleted file mode 100644 index 8afc29b75ce9..000000000000 --- a/media-video/qt-faststart/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX qt-faststart-0.2.diff 8333 RMD160 bdc2b818c8e6b6458d641cb2ece2a591b2a578bb SHA1 f200e44e9c31a7da56187b2db4f2f39722adfa65 SHA256 0d54f2f85258a114668668bda8a36549c2ec5ea4569fcc835c9f8cbebe2df35a -DIST ffmpeg-0.4.9-p20070616.tar.bz2 2275972 RMD160 73d0334b85f0859bbfc40a4d9c27fb987b36ca25 SHA1 6c649cf5b4c803bf7aec2f70adbd9d0992360e71 SHA256 bb15d2aee946ac6113928386f7385b15ffa4d9640e60830bd9868079bfb2da88 -EBUILD qt-faststart-0.1.ebuild 724 RMD160 0b25cb750e3a5d733237331daaa3613c786b70a9 SHA1 d1a742715560c890dfef39fd22724c60a279cc8d SHA256 0a093a1dc5f7670944120b9ac3f5669a970fd8137ec0401852a80d5fca818233 -EBUILD qt-faststart-0.2.ebuild 1047 RMD160 68bb6b2745069729d7050a8d64cf596cd15565e7 SHA1 f96eec866d0feed6485d69670c4eaadce52a156b SHA256 c6ac211d2544e84f5ac2cb8d50d370c01010400b2fbdff394f83d44b2f479b50 -MISC ChangeLog 938 RMD160 9693e483215b15a55836cc364524740c1fdec673 SHA1 cda1185fa1afabc2f82e9bf02a33527fcfd09a59 SHA256 0a0fdfb51585fc2091ffb6f449246f718c75e0851f9117d703e84dad4e2ab0ba -MISC metadata.xml 237 RMD160 c8e67b9ed38f0b1f4a09268a438fd51981e0a017 SHA1 893e2795205e43c12fbb4b034fb48356f047b449 SHA256 ba5b60fec3f01393f9e5a70f37a0372d8e99b6b15934baefa95566dce16dd3d8 diff --git a/media-video/qt-faststart/files/qt-faststart-0.2.diff b/media-video/qt-faststart/files/qt-faststart-0.2.diff deleted file mode 100644 index 985917abdd4a..000000000000 --- a/media-video/qt-faststart/files/qt-faststart-0.2.diff +++ /dev/null @@ -1,268 +0,0 @@ ---- qt-faststart.c 2008-12-05 11:33:16 -0500 -+++ qt-faststart.c 2008-12-05 11:45:19 -0500 -@@ -1,9 +1,16 @@ - /* -- * qt-faststart.c, v0.1 -+ * qt-faststart.c, v0.2 -+ * - * by Mike Melanson (melanson@pcisys.net) - * This file is placed in the public domain. Use the program however you - * see fit. - * -+ * ChangLog -+ * 20081205 - Andrew Andkjar <andkjar@obtech.net> -+ * qt-faststart.c v0.2 - fixes for infinite loops caused by various malformed input files -+ * Pre 20081205 - Mike Melanson <melanson@pcisys.net> -+ * qt-faststart.c v0.1 - original version -+ * - * This utility rearranges a Quicktime file such that the moov atom - * is in front of the data, thus facilitating network streaming. - * -@@ -70,32 +77,32 @@ - - int main(int argc, char *argv[]) - { -- FILE *infile; -- FILE *outfile; -+ FILE *infile = NULL; -+ FILE *outfile = NULL; - unsigned char atom_bytes[ATOM_PREAMBLE_SIZE]; - uint32_t atom_type = 0; - uint64_t atom_size = 0; -- uint64_t last_offset; -- unsigned char *moov_atom; -- unsigned char *ftyp_atom = 0; -- uint64_t moov_atom_size; -+ uint64_t last_offset = 0; -+ unsigned char *moov_atom = NULL; -+ unsigned char *ftyp_atom = NULL; -+ uint64_t moov_atom_size = 0; - uint64_t ftyp_atom_size = 0; -- uint64_t i, j; -- uint32_t offset_count; -- uint64_t current_offset; -+ uint64_t i = 0, j = 0; -+ uint32_t offset_count = 0; -+ uint64_t current_offset = 0; - uint64_t start_offset = 0; - unsigned char copy_buffer[COPY_BUFFER_SIZE]; -- int bytes_to_copy; -+ int bytes_to_copy = 0; - - if (argc != 3) { -- printf ("Usage: qt-faststart <infile.mov> <outfile.mov>\n"); -+ fprintf(stderr, "Usage: qt-faststart <infile.mov> <outfile.mov>\n"); - return 0; - } - - infile = fopen(argv[1], "rb"); - if (!infile) { - perror(argv[1]); -- return 1; -+ goto error_out; - } - - /* traverse through the atoms in the file to make sure that 'moov' is -@@ -107,6 +114,11 @@ - atom_size = (uint32_t)BE_32(&atom_bytes[0]); - atom_type = BE_32(&atom_bytes[4]); - -+ if(atom_size < ATOM_PREAMBLE_SIZE) { -+ fprintf(stderr, "fatal error: bad atom size\n"); -+ goto error_out; -+ } -+ - if ((atom_type != FREE_ATOM) && - (atom_type != JUNK_ATOM) && - (atom_type != MDAT_ATOM) && -@@ -116,7 +128,7 @@ - (atom_type != WIDE_ATOM) && - (atom_type != PICT_ATOM) && - (atom_type != FTYP_ATOM)) { -- printf ("encountered non-QT top-level atom (is this a Quicktime file?)\n"); -+ fprintf(stderr, "encountered non-QT top-level atom (is this a Quicktime file?)\n"); - break; - } - -@@ -125,70 +137,82 @@ - ftyp_atom_size = atom_size; - ftyp_atom = malloc(ftyp_atom_size); - if (!ftyp_atom) { -- printf ("could not allocate 0x%llX byte for ftyp atom\n", -- atom_size); -- fclose(infile); -- return 1; -+ fprintf(stderr, "could not allocate 0x%llX byte for ftyp atom\n", atom_size); -+ goto error_out; - } -- fseeko(infile, -ATOM_PREAMBLE_SIZE, SEEK_CUR); -+ -+ if(0 != fseeko(infile, -ATOM_PREAMBLE_SIZE, SEEK_CUR)) { -+ perror(argv[1]); -+ goto error_out; -+ } -+ - if (fread(ftyp_atom, atom_size, 1, infile) != 1) { - perror(argv[1]); -- free(ftyp_atom); -- fclose(infile); -- return 1; -+ goto error_out; - } - start_offset = ftello(infile); -+ if(start_offset < 0) { -+ perror(argv[1]); -+ goto error_out; -+ } - continue; - } - - /* 64-bit special case */ - if (atom_size == 1) { - if (fread(atom_bytes, ATOM_PREAMBLE_SIZE, 1, infile) != 1) { -- break; -+ break; - } - atom_size = BE_64(&atom_bytes[0]); -- fseeko(infile, atom_size - ATOM_PREAMBLE_SIZE * 2, SEEK_CUR); -+ if(0 != fseeko(infile, atom_size - ATOM_PREAMBLE_SIZE * 2, SEEK_CUR)) { -+ perror(argv[1]); -+ goto error_out; -+ } - } else { -- fseeko(infile, atom_size - ATOM_PREAMBLE_SIZE, SEEK_CUR); -+ if(0 != fseeko(infile, atom_size - ATOM_PREAMBLE_SIZE, SEEK_CUR)) { -+ perror(argv[1]); -+ goto error_out; -+ } - } - } - - if (atom_type != MOOV_ATOM) { -- printf ("last atom in file was not a moov atom\n"); -- fclose(infile); -- return 0; -+ fprintf(stderr, "last atom in file was not a moov atom\n"); -+ goto error_out; - } - - /* moov atom was, in fact, the last atom in the chunk; load the whole - * moov atom */ -- fseeko(infile, -atom_size, SEEK_END); -+ if(0 != fseeko(infile, -atom_size, SEEK_END)) { -+ perror(argv[1]); -+ goto error_out; -+ } - last_offset = ftello(infile); -+ if(last_offset < 0) { -+ perror(argv[1]); -+ goto error_out; -+ } - moov_atom_size = atom_size; - moov_atom = malloc(moov_atom_size); - if (!moov_atom) { -- printf ("could not allocate 0x%llX byte for moov atom\n", -- atom_size); -- fclose(infile); -- return 1; -+ fprintf(stderr, "could not allocate 0x%llX byte for moov atom\n", atom_size); -+ goto error_out; - } - if (fread(moov_atom, atom_size, 1, infile) != 1) { - perror(argv[1]); -- free(moov_atom); -- fclose(infile); -- return 1; -+ goto error_out; - } - - /* this utility does not support compressed atoms yet, so disqualify - * files with compressed QT atoms */ - if (BE_32(&moov_atom[12]) == CMOV_ATOM) { -- printf ("this utility does not support compressed moov atoms yet\n"); -- free(moov_atom); -- fclose(infile); -- return 1; -+ fprintf(stderr, "this utility does not support compressed moov atoms yet\n"); -+ goto error_out; - } - - /* close; will be re-opened later */ - fclose(infile); -+ infile = NULL; - - /* crawl through the moov chunk in search of stco or co64 atoms */ - for (i = 4; i < moov_atom_size - 4; i++) { -@@ -198,8 +222,7 @@ - atom_size = BE_32(&moov_atom[i - 4]); - if (i + atom_size - 4 > moov_atom_size) { - printf (" bad atom size\n"); -- free(moov_atom); -- return 1; -+ goto error_out; - } - offset_count = BE_32(&moov_atom[i + 8]); - for (j = 0; j < offset_count; j++) { -@@ -216,8 +239,7 @@ - atom_size = BE_32(&moov_atom[i - 4]); - if (i + atom_size - 4 > moov_atom_size) { - printf (" bad atom size\n"); -- free(moov_atom); -- return 1; -+ goto error_out; - } - offset_count = BE_32(&moov_atom[i + 8]); - for (j = 0; j < offset_count; j++) { -@@ -240,21 +262,21 @@ - infile = fopen(argv[1], "rb"); - if (!infile) { - perror(argv[1]); -- free(moov_atom); -- return 1; -+ goto error_out; - } - - if (start_offset > 0) { /* seek after ftyp atom */ -- fseeko(infile, start_offset, SEEK_SET); -+ if(0 != fseeko(infile, start_offset, SEEK_SET)) { -+ perror(argv[1]); -+ goto error_out; -+ } - last_offset -= start_offset; - } - - outfile = fopen(argv[2], "wb"); - if (!outfile) { - perror(argv[2]); -- fclose(outfile); -- free(moov_atom); -- return 1; -+ goto error_out; - } - - /* dump the same ftyp atom */ -@@ -295,17 +317,16 @@ - - fclose(infile); - fclose(outfile); -- free(moov_atom); -- if (ftyp_atom_size > 0) -- free(ftyp_atom); -- -+ free(moov_atom); -+ free(ftyp_atom); - return 0; - - error_out: -- fclose(infile); -- fclose(outfile); -+ if(infile) -+ fclose(infile); -+ if(outfile) -+ fclose(outfile); - free(moov_atom); -- if (ftyp_atom_size > 0) -- free(ftyp_atom); -+ free(ftyp_atom); - return 1; - } diff --git a/media-video/qt-faststart/metadata.xml b/media-video/qt-faststart/metadata.xml deleted file mode 100644 index 907cc31e07f1..000000000000 --- a/media-video/qt-faststart/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>no-herd</herd> - <maintainer> - <email>maintainer-needed@gentoo.org</email> - </maintainer> -</pkgmetadata> - diff --git a/media-video/qt-faststart/qt-faststart-0.1.ebuild b/media-video/qt-faststart/qt-faststart-0.1.ebuild deleted file mode 100644 index cf4f8116a709..000000000000 --- a/media-video/qt-faststart/qt-faststart-0.1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/qt-faststart/qt-faststart-0.1.ebuild,v 1.3 2008/06/07 12:59:48 caleb Exp $ - -DESCRIPTION="qt-faststart rearranges quicktime files to help with better network streaming" -HOMEPAGE="http://svn.mplayerhq.hu/ffmpeg/trunk/tools/qt-faststart.c" -SRC_URI="mirror://gentoo/ffmpeg-0.4.9-p20070616.tar.bz2" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="" - -src_compile() { - cd "${WORKDIR}/ffmpeg" - ./configure - make qt-faststart -} - -src_install() { - install -D -m 755 -o root -g root "${WORKDIR}/ffmpeg/qt-faststart" "${D}/usr/bin/qt-faststart" -} diff --git a/media-video/qt-faststart/qt-faststart-0.2.ebuild b/media-video/qt-faststart/qt-faststart-0.2.ebuild deleted file mode 100644 index ee957e2eb2aa..000000000000 --- a/media-video/qt-faststart/qt-faststart-0.2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/qt-faststart/qt-faststart-0.2.ebuild,v 1.3 2010/08/09 23:48:29 hwoarang Exp $ - -inherit toolchain-funcs eutils - -DESCRIPTION="qt-faststart rearranges quicktime files to help with better network streaming" -HOMEPAGE="http://svn.mplayerhq.hu/ffmpeg/trunk/tools/qt-faststart.c" -SRC_URI="mirror://gentoo/ffmpeg-0.4.9-p20070616.tar.bz2" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="" - -S="${WORKDIR}/ffmpeg" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${P}.diff" || die "patch failed" - # add missing LDFLAGS - sed -i "/qt-faststart/{n; s:\$(CFLAGS):& \$(LDFLAGS) :}" Makefile -} - -src_compile() { - cd "${WORKDIR}/ffmpeg" - ./configure --extra-ldflags="${LDFLAGS}" --extra-cflags="${CFLAGS}" \ - --cc=$(tc-getCC) - make qt-faststart -} - -src_install() { - install -D -m 755 -o root -g root "${WORKDIR}/ffmpeg/qt-faststart" "${D}/usr/bin/qt-faststart" -} |