debian/0000755000000000000000000000000012203047667007175 5ustar debian/copyright0000644000000000000000000000230712203047667011132 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: flvmeta Upstream-Contact: Marc Noirot Source: http://github.com/noirotm/flvmeta/tags Files: * Copyright: 2007-2013, Marc Noirot License: GPL-2+ Files: debian/* Copyright: 2011-2013, Neutron Soutmun License: GPL-2+ License: GPL-2+ 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 2 of the License, or (at your option) any later version. . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . You should have received a copy of the GNU General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA . On Debian systems, the complete text of the GNU General Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". debian/docs0000644000000000000000000000003312203047667010044 0ustar NEWS README TODO README.md debian/control0000644000000000000000000000140512203047667010600 0ustar Source: flvmeta Section: video Priority: extra Maintainer: Neutron Soutmun Build-Depends: cmake, debhelper (>= 9.20120909~), libyaml-dev, pandoc Standards-Version: 3.9.4 Vcs-Git: git://anonscm.debian.org/collab-maint/flvmeta.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/flvmeta.git Homepage: http://github.com/noirotm/flvmeta Package: flvmeta Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} Description: Metadata injector for FLV video files flvmeta has the ability to inject all standard metadata tags into the onMetaData event, as well as insert an onLastSecond event. . It is also pretty fast and has a very small memory footprint, making it ideal for use as an automated tool on server environments. debian/rules0000755000000000000000000000014012203047667010250 0ustar #!/usr/bin/make -f export DEB_BUILD_MAINT_OPTIONS=hardening=+all %: dh $@ --buildsystem=cmake debian/changelog0000644000000000000000000001367212203047667011060 0ustar flvmeta (1.1.2-1) unstable; urgency=low * Imported Upstream version 1.1.2 * Add patch and fix typo * debian/patches/91_fix_file_offset_t_printf_format_warning.patch: - Add patch to fix the printf format warning of type file_offset_t * debian/patches/90-cmake-use-system-libyaml.patch: - Fix my lastname typo * Fix Vcs-Git field is not canonical -- Neutron Soutmun Thu, 15 Aug 2013 09:52:22 +0700 flvmeta (1.1.1-1) unstable; urgency=low * Imported Upstream version 1.1.1 (upload to unstable) * Drop d/p/99-fix-spelling-error-in-manpage.patch, merged upstream. * Fix watch file, thanks to Bart Martens * Update copyright years * Make package backports friendly * debian/control: - Build-dep on debhelper (>=9.20120909~) -- Neutron Soutmun Sat, 11 May 2013 10:15:41 +0700 flvmeta (1.1.0-1) experimental; urgency=low * Imported Upstream version 1.1.0 * Upstream change main development repository to github * debian/control, debian/copyright: - Update Homepage, Source, to flvmeta github repository. * debian/watch: - Watching the tarball release via githubredir.d.n * debian/copyright: - Update the copyright format to 1.0, no changes needed. * Switch to cmake build system * debian/compat: Bump compat level to 9. * debian/control: - Bump Standards-Version to 3.9.4, no changes needed. - Drop autotools-dev, check, dh-autoreconf, pkg-config from build-deps as they are no longer needed by the cmake build system. - Add cmake to build-deps. * debian/rules: - Force to use cmake build system as it was requested from upstream. (Upstream has a plan to discontinue support autotools build system) * debian/patches/90-cmake-use-system-libyaml.patch: Add patch. * Use upstream manpage * debian/control: - Add pandoc to build-deps. * debian/manpages, debian/flvmeta.1: - Drop, superseded by upstream autogenerated manpage by pandoc * Install README.md * Add patch to fix spelling error in manpage * debian/patches/99-fix-spelling-error-in-manpage.patch: - Fix spelling error in manpage -- Neutron Soutmun Tue, 02 Oct 2012 14:32:00 +0700 flvmeta (1.1~r235-2) experimental; urgency=low * Use wrap-and-sort tool and re-wrap lines in debian copyright * Update watch file * debian/watch: - Add dversionmangle option. - Update the http url. * Drop roff documentation from manpage * Update patch description * debian/patches/01-use-system-libs.patch: - Add forwarded url. * Add compiler warning fix patch * debian/patches/03-update-json-compiler-warning-prix64.patch: - Add patch. (Forwarded upstream) * debian/patches/series: - Add patch to series. -- Neutron Soutmun Wed, 23 Nov 2011 13:12:07 +0700 flvmeta (1.1~r235-1) experimental; urgency=low * Imported Upstream version 1.1~r235 * Drop the blank line in debian/watch * Use gitweb for Vcs-Browser URL * Add "use-system-libs" patch * debian/patches/01-use-system-libs.patch: - Add "use-system-libs" patch. (forwarded upstream, waiting for review). * debian/patches/02-configure-drop-svnversion-check.patch: - Add "configure-drop-svnversion-check", as the use-system-libs patch was applied, we need to reconfig but the configured version which gathering from the svnversion is unnecessary. * debian/patches/series: - Add the patches to the series. * debian/control: - Add dh-autoreconf, libyaml-dev, pkg-config and check to build-deps. * debian/rules: - Override the dh_auto_configure to add option --with-system-libs. * Update debian copyright to DEP-5 rev 206 * debian/copyright: - Update to DEP-5 rev 206. - Update text "Debian GNU/Linux systems" to "Debian systems" in GPL-2+ license text. * Add hardening build flags which getting from dpkg-buildflags -- Neutron Soutmun Tue, 22 Nov 2011 15:33:53 +0700 flvmeta (1.1~r230-1) experimental; urgency=low * Imported Upstream version 1.1~r230 * debian/flvmeta.1: - Add new Dump options -e, --event. - Update wording as upstream changes. * debian/patches/90-typo-fix.patch: - Drop, fixed in upstream. * debian/patches/series: - Drop, no patches. -- Neutron Soutmun Fri, 24 Jun 2011 00:29:07 +0700 flvmeta (1.1~r221-1) experimental; urgency=low * Imported Upstream version 1.1~r221 * Drop flvdump manpage. * debian/flvdump.1: - Drop as the flvdump has been merged to flvmeta in the upstream. * debian/manpages: - Drop flvdump manpage. * Update flvmeta manpage. * debian/flvmeta.1: - Update as upstream has been changed, more options and functions added. * Add Vcs-Git, Vcs-Browser. * debian/control: - Add Vcs-Git, Vcs-Browser. * Update upstream copyright year. * debian/copyright: - Update upstream copyright year. * Add .gitignore. * .gitignore: - Ignore to include .pc/ in the repository. * Add 90-typo-fix.patch. * debian/patches/series, debian/patches/90-typo-fix.patch: - Add 90-typo-fix.patch, fix the typo in the upstream source to make lintian happy and then forwarded to upstream. * Fix lintian warning in manpage. * debian/flvmeta.1: - Fix lintian warning "spelling-error-in-manpage". Fix typo "ommitted" to "omitted". - Fix lintian warning "hyphen-used-as-minus-sign". Therefore, "-" must be escaped ("\-"). * Update Standards-Version to 3.9.2. * debian/control: - Update Standards-Version to 3.9.2, no changes needed. -- Neutron Soutmun Sun, 24 Apr 2011 14:09:23 +0700 flvmeta (1.0.11-1) unstable; urgency=low * Initial release (Closes: #520900). -- Neutron Soutmun Fri, 11 Feb 2011 23:54:06 +0700 debian/source/0000755000000000000000000000000012203047667010475 5ustar debian/source/format0000644000000000000000000000001412203047667011703 0ustar 3.0 (quilt) debian/compat0000644000000000000000000000000212203047667010373 0ustar 9 debian/patches/0000755000000000000000000000000012203047667010624 5ustar debian/patches/91_fix_file_offset_t_printf_format_warning.patch0000644000000000000000000001526012203047667022317 0ustar Description: Fix the printf format warning of type file_offset_t Author: Neutron Soutmun Forwarded: not-needed. Last-Update: 2013-08-15 Index: b/src/check.c =================================================================== --- a/src/check.c 2013-08-15 09:07:26.544310063 +0700 +++ b/src/check.c 2013-08-15 09:07:26.540310033 +0700 @@ -133,7 +133,7 @@ if (opts->check_report_format == FLVMETA_FORMAT_XML) { /* XML report entry */ printf(" ", offset); + printf(" offset=\"%" FILE_OFFSET_PRINTF_FORMAT "i\">", (intmax_t)offset); printf("%s\n", message); } else if (opts->check_report_format == FLVMETA_FORMAT_JSON) { @@ -157,7 +157,7 @@ else { /* raw report entry */ /*printf("%s:", opts->input_file);*/ - printf("0x%.8" FILE_OFFSET_PRINTF_FORMAT "x: ", offset); + printf("0x%.8" FILE_OFFSET_PRINTF_FORMAT "x: ", (uintmax_t)offset); printf("%s %s: %s\n", levelstr, code, message); } } Index: b/src/dump_raw.c =================================================================== --- a/src/dump_raw.c 2013-08-15 09:07:26.544310063 +0700 +++ b/src/dump_raw.c 2013-08-15 09:07:26.540310033 +0700 @@ -53,8 +53,8 @@ n = ((int*)parser->user_data); ++(*n); - printf("--- Tag #%u at 0x%" FILE_OFFSET_PRINTF_FORMAT "X", *n, parser->stream->current_tag_offset); - printf(" (%" FILE_OFFSET_PRINTF_FORMAT "i) ---\n", parser->stream->current_tag_offset); + printf("--- Tag #%u at 0x%" FILE_OFFSET_PRINTF_FORMAT "X", *n, (uintmax_t)parser->stream->current_tag_offset); + printf(" (%" FILE_OFFSET_PRINTF_FORMAT "i) ---\n", (intmax_t)parser->stream->current_tag_offset); printf("Tag type: %s\n", dump_string_get_tag_type(tag)); printf("Body length: %u\n", flv_tag_get_body_length(*tag)); printf("Timestamp: %u\n", flv_tag_get_timestamp(*tag)); Index: b/src/dump_yaml.c =================================================================== --- a/src/dump_yaml.c 2013-08-15 09:07:26.544310063 +0700 +++ b/src/dump_yaml.c 2013-08-15 09:07:26.540310033 +0700 @@ -209,7 +209,7 @@ yaml_scalar_event_initialize(&event, NULL, NULL, (yaml_char_t*)"offset", 6, 1, 1, YAML_ANY_SCALAR_STYLE); yaml_emitter_emit(emitter, &event); - sprintf(buffer, "%" FILE_OFFSET_PRINTF_FORMAT "i", parser->stream->current_tag_offset); + sprintf(buffer, "%" FILE_OFFSET_PRINTF_FORMAT "i", (intmax_t)parser->stream->current_tag_offset); yaml_scalar_event_initialize(&event, NULL, NULL, (yaml_char_t*)buffer, (int)strlen(buffer), 1, 1, YAML_ANY_SCALAR_STYLE); yaml_emitter_emit(emitter, &event); Index: b/src/info.c =================================================================== --- a/src/info.c 2013-08-15 09:07:26.544310063 +0700 +++ b/src/info.c 2013-08-15 09:07:26.540310033 +0700 @@ -335,7 +335,7 @@ if (body_length == 0) { if (opts->verbose) { - fprintf(stdout, "Warning: empty metadata tag at 0x%" FILE_OFFSET_PRINTF_FORMAT "X\n", offset); + fprintf(stdout, "Warning: empty metadata tag at 0x%" FILE_OFFSET_PRINTF_FORMAT "X\n", (uintmax_t)offset); } } else { @@ -347,12 +347,12 @@ } else if (retval == FLV_ERROR_INVALID_METADATA_NAME) { if (opts->verbose) { - fprintf(stdout, "Warning: invalid metadata name at 0x%" FILE_OFFSET_PRINTF_FORMAT "X\n", offset); + fprintf(stdout, "Warning: invalid metadata name at 0x%" FILE_OFFSET_PRINTF_FORMAT "X\n", (uintmax_t)offset); } } else if (retval == FLV_ERROR_INVALID_METADATA) { if (opts->verbose) { - fprintf(stdout, "Warning: invalid metadata at 0x%" FILE_OFFSET_PRINTF_FORMAT "X\n", offset); + fprintf(stdout, "Warning: invalid metadata at 0x%" FILE_OFFSET_PRINTF_FORMAT "X\n", (uintmax_t)offset); } if (opts->error_handling == FLVMETA_EXIT_ON_ERROR) { amf_data_free(tag_name); @@ -413,7 +413,7 @@ /* do not take video frame into account if body length is zero and we ignore errors */ if (body_length == 0) { if (opts->verbose) { - fprintf(stdout, "Warning: empty video tag at 0x%" FILE_OFFSET_PRINTF_FORMAT "X\n", offset); + fprintf(stdout, "Warning: empty video tag at 0x%" FILE_OFFSET_PRINTF_FORMAT "X\n", (uintmax_t)offset); } } else { @@ -483,7 +483,7 @@ /* do not take audio frame into account if body length is zero and we ignore errors */ if (body_length == 0) { if (opts->verbose) { - fprintf(stdout, "Warning: empty audio tag at 0x%" FILE_OFFSET_PRINTF_FORMAT "X\n", offset); + fprintf(stdout, "Warning: empty audio tag at 0x%" FILE_OFFSET_PRINTF_FORMAT "X\n", (uintmax_t)offset); } } else { @@ -519,7 +519,7 @@ else if (opts->error_handling == FLVMETA_IGNORE_ERRORS) { /* let's continue the parsing */ if (opts->verbose) { - fprintf(stdout, "Warning: invalid tag at 0x%" FILE_OFFSET_PRINTF_FORMAT "X\n", offset); + fprintf(stdout, "Warning: invalid tag at 0x%" FILE_OFFSET_PRINTF_FORMAT "X\n", (uintmax_t)offset); } info->total_prev_tags_size += sizeof(uint32_be); } Index: b/src/json.c =================================================================== --- a/src/json.c 2013-08-15 09:07:26.544310063 +0700 +++ b/src/json.c 2013-08-15 09:07:26.540310033 +0700 @@ -108,7 +108,7 @@ void json_emit_file_offset(json_emitter * je, file_offset_t value) { json_print_comma(je); - printf("%" FILE_OFFSET_PRINTF_FORMAT "i", value); + printf("%" FILE_OFFSET_PRINTF_FORMAT "i", (intmax_t)value); je->print_comma = 1; } Index: b/src/types.h =================================================================== --- a/src/types.h 2013-08-15 09:07:26.544310063 +0700 +++ b/src/types.h 2013-08-15 09:10:32.789539329 +0700 @@ -140,7 +140,11 @@ /* file offset printf specifier */ #ifdef FILE_OFFSET_T_64_BITS -# define FILE_OFFSET_PRINTF_FORMAT "ll" +# if __WORDSIZE == 64 +# define FILE_OFFSET_PRINTF_FORMAT "l" +# else +# define FILE_OFFSET_PRINTF_FORMAT "ll" +# endif #else # define FILE_OFFSET_PRINTF_FORMAT "l" #endif debian/patches/90-cmake-use-system-libyaml.patch0000644000000000000000000000102612203047667016715 0ustar Description: Config cmake to use system libyaml Author: Neutron Soutmun Forwarded: not-needed. Last-Update: 2012-05-14 Index: b/CMakeLists.txt =================================================================== --- a/CMakeLists.txt 2012-10-02 16:11:13.951741790 +0700 +++ b/CMakeLists.txt 2012-10-02 16:11:16.767760325 +0700 @@ -35,7 +35,7 @@ # build options set( - FLVMETA_USE_SYSTEM_LIBYAML FALSE + FLVMETA_USE_SYSTEM_LIBYAML TRUE CACHE BOOL "Link flvmeta to the installed version of libyaml" ) debian/patches/series0000644000000000000000000000012312203047667012035 0ustar 90-cmake-use-system-libyaml.patch 91_fix_file_offset_t_printf_format_warning.patch debian/watch0000644000000000000000000000027512203047667010232 0ustar version=3 https://github.com/noirotm/flvmeta/tags \ .*/archive/(?:upstream/)?(?:v||version-|release-|X|R)(\d\S*)\.tar\.gz # Bart Martens Wed, 13 Mar 2013 18:38:25 +0000