--- oggvideotools-0.8a.orig/src/oggTranscode.cpp +++ oggvideotools-0.8a/src/oggTranscode.cpp @@ -34,6 +34,7 @@ #include #include #include +#include #ifdef HAVE_CONFIG_H #include "config.h" --- oggvideotools-0.8a.orig/src/oggCat.cpp +++ oggvideotools-0.8a/src/oggCat.cpp @@ -32,6 +32,7 @@ #include #include +#include #include "definition.h" #include "helper.h" --- oggvideotools-0.8a.orig/src/oggSlideshow.cpp +++ oggvideotools-0.8a/src/oggSlideshow.cpp @@ -36,6 +36,7 @@ #include #include #include +#include #include "th_helper.h" --- oggvideotools-0.8a.orig/src/oggSilence.cpp +++ oggvideotools-0.8a/src/oggSilence.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #include "vorbisEncoder.h" #include "streamMux.h" --- oggvideotools-0.8a.orig/src/oggCut.cpp +++ oggvideotools-0.8a/src/oggCut.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include "fileRepository.h" #include "streamSerializer.h" --- oggvideotools-0.8a.orig/src/CMakeLists.txt +++ oggvideotools-0.8a/src/CMakeLists.txt @@ -123,7 +123,8 @@ IF ( $ENV{MAKE_PACKAGE} ) ADD_LIBRARY ( oggvideotools STATIC ${LIBRARY_SRC} ${RESAMPLE_SRC} ) ELSE ( $ENV{MAKE_PACKAGE} ) - ADD_LIBRARY ( oggvideotools SHARED ${LIBRARY_SRC} ${RESAMPLE_SRC} ) + ADD_LIBRARY ( oggvideotools STATIC ${LIBRARY_SRC} ${RESAMPLE_SRC} ) +# ADD_LIBRARY ( oggvideotools SHARED ${LIBRARY_SRC} ${RESAMPLE_SRC} ) ENDIF ( $ENV{MAKE_PACKAGE} ) TARGET_LINK_LIBRARIES ( oggvideotools ${ALL_LIBS}) --- oggvideotools-0.8a.orig/src/oggDump.cpp +++ oggvideotools-0.8a/src/oggDump.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include "fileRepository.h" #include "rawMediaPacket.h" --- oggvideotools-0.8a.orig/src/oggLength.cpp +++ oggvideotools-0.8a/src/oggLength.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include "fileRepository.h" #include "streamSerializer.h" --- oggvideotools-0.8a.orig/debian/watch +++ oggvideotools-0.8a/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/oggvideotools/oggvideotools-(.+)\.tar\.gz --- oggvideotools-0.8a.orig/debian/rules +++ oggvideotools-0.8a/debian/rules @@ -0,0 +1,62 @@ +#!/usr/bin/make -f +# Ron Lee 2003 - 2012 + +#export DH_VERBOSE=1 +export DH_OPTIONS + +SHELL = /bin/bash + +NUM_CPUS = $(shell getconf _NPROCESSORS_ONLN 2>/dev/null) +PARALLEL = $(subst parallel=,,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +NJOBS = -j$(or $(PARALLEL),$(NUM_CPUS),1) + + +objdir := objs + + +clean: + dh_testdir + dh_testroot + $(RM) *-stamp + $(RM) -r $(objdir) + dh_clean + + +$(objdir)/Makefile: + dh_testdir + mkdir -p $(objdir) + cd $(objdir) && cmake .. + +build: build-arch +build-arch: build-arch-stamp +build-indep: + +build-arch-stamp: $(objdir)/Makefile + dh_testdir + $(MAKE) $(NJOBS) -C $(objdir) + touch $@ + + +binary: binary-arch + +binary-indep: + +binary-arch: DH_OPTIONS = -a +binary-arch: + dh_testdir + dh_testroot + dh_install $(objdir)/src/ogg* scripts/mkThumbs usr/bin + dh_installman docs/*.1 + dh_installdocs + dh_installchangelogs + dh_strip --dbg-package=oggvideotools-dbg + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + + +.PHONY: clean build build-arch build-indep binary binary-arch binary-indep --- oggvideotools-0.8a.orig/debian/copyright +++ oggvideotools-0.8a/debian/copyright @@ -0,0 +1,42 @@ +This package was debianized by Jan Gerber on +Thu, 10 Aug 2009 18:55:02 +0200. + +The debian package is co-maintained by: + Jan Gerber + John Ferlito + +It was downloaded from + https://oggvideotools.svn.sourceforge.net/svnroot/oggvideotools/trunk + +Upstream Author: Joern Seger (Yorn) yorn_at_gmx.net + +Copyright and license terms: + + Copyright © 2008 Joern Seger + + 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 program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. + +On Debian systems, the full text of the GNU General Public License is available +in /usr/share/common-licenses/GPL-2. + +Copyright and license terms for src/libresample/*: + + Copyright Dominic Mazzoni + + Licensed under LGPL Version 2.1 + +On Debian systems, the full text of the GNU Lesser General Public License is available +in /usr/share/common-licenses/LGPL-2.1. --- oggvideotools-0.8a.orig/debian/compat +++ oggvideotools-0.8a/debian/compat @@ -0,0 +1 @@ +7 --- oggvideotools-0.8a.orig/debian/control +++ oggvideotools-0.8a/debian/control @@ -0,0 +1,48 @@ +Source: oggvideotools +Section: video +Priority: optional +Maintainer: Debian Xiph.org Maintainers +Uploaders: John Francesco Ferlito , + Ron Lee +Build-Depends: debhelper (>= 7.0.50~), cmake, libogg-dev, libtheora-dev, libvorbis-dev, libsdl-dev, libgd2-xpm-dev +Standards-Version: 3.9.3.1 + +Package: oggvideotools +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: A toolbox for manipulating and creating Ogg video files + Contains the following command line tools: + . + * oggCat - concatenates two ogg video files + * oggCut - extracts parts of an ogg file + * oggDump + * oggJoin - multiplexes ogg streams + * oggLength + * oggResize - resizes ogg files in multiple ways + * oggScroll + * oggSilence + * oggSlideshow - creates slideshows from pictures + * oggSplit - demultiplexes ogv files + * oggThumb - creates thumbnails from an ogg video file + +Package: oggvideotools-dbg +Section: debug +Priority: extra +Architecture: any +Depends: oggvideotools (= ${binary:Version}), ${misc:Depends} +Description: A toolbox for manipulating and creating Ogg video files (debug symbols) + Contains the following command line tools: + . + * oggCat - concatenates two ogg video files + * oggCut - extracts parts of an ogg file + * oggDump + * oggJoin - multiplexes ogg streams + * oggLength + * oggResize - resizes ogg files in multiple ways + * oggScroll + * oggSilence + * oggSlideshow - creates slideshows from pictures + * oggSplit - demultiplexes ogv files + * oggThumb - creates thumbnails from an ogg video file + . + This package contains debugging symbols. --- oggvideotools-0.8a.orig/debian/changelog +++ oggvideotools-0.8a/debian/changelog @@ -0,0 +1,64 @@ +oggvideotools (0.8a-1build1) saucy; urgency=low + + * Rebuild for libgd3. + + -- Colin Watson Mon, 20 May 2013 00:25:05 +0100 + +oggvideotools (0.8a-1) unstable; urgency=low + + * New upstream release with the blessing of John. Closes: #652958 + Add myself to uploaders. + * s/komas/commas/g in the docs. Closes: #606225 + + -- Ron Lee Sat, 02 Jun 2012 23:54:42 +0930 + +oggvideotools (0.8-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "ftbfs with GCC-4.7": add patch from Paul Tagliamonte (missing + includes). + (Closes: #667308) + + -- gregor herrmann Fri, 25 May 2012 15:22:15 +0200 + +oggvideotools (0.8-1) unstable; urgency=low + + * Initial Debian Release (Closes: #563446). + * debian/copyright + - Add John Ferlito as package maintainer. + - Add copyright details for libresample. + - Fix FSF address. + * debian/watch + - Move to version 3. + - Use debian sourceforge redirector. + * debian/compat + - Update to 7. + - Move to using dh instead of cdbs. + * debian/rules + - Move to dh 7. + - Add quilt support. + * debian/control + - Change maintainer to Debian Xiph.org Maintainers. + - Add ${misc:Depends}. + - Update standars version to 3.8.3. + - Depend on debhelper >= 7.0.50~ + - Improve package description. + - Add quilt dependency. + - Remove cdbs dependency. + - Add -dbg package. + * debian/patches/manpages + - Fix hyphenation in man pages. + + -- John Francesco Ferlito Sun, 03 Jan 2010 13:05:14 +1100 + +oggvideotools (0.7b-ubuntu1) jaunty; urgency=low + + * rebuilt with libtheora beta1 + + -- jan gerber Tue, 11 Aug 2009 00:27:20 +0200 + +oggvideotools (0.7b) jaunty; urgency=low + + * initial version + + -- jan gerber Fri, 10 August 2009 18:20:00 +0200 --- oggvideotools-0.8a.orig/docs/oggThumb.1 +++ oggvideotools-0.8a/docs/oggThumb.1 @@ -15,12 +15,12 @@ .SH OPTIONS .IP -t -Time at which a thumbnail should be created. More than one thumbnail time can be concatenated by komas. The times can be set by integer or floating point values in seconds. If the time is not exactly matching, the next frame is used. The times don't have to be sorted incrementally. +Time at which a thumbnail should be created. More than one thumbnail time can be concatenated by commas. The times can be set by integer or floating point values in seconds. If the time is not exactly matching, the next frame is used. The times don't have to be sorted incrementally. .I Example: \-t 12.4,14.157,13.23 .IP -f -Number of a frame that should be created as a thumbnail. More than one thumbnail frame can be concatenated by komas. The frame numbers must be an integers. The frame numbers don't have to be sorted incrementally. +Number of a frame that should be created as a thumbnail. More than one thumbnail frame can be concatenated by commas. The frame numbers must be an integers. The frame numbers don't have to be sorted incrementally. .I Example: \-f 12000,13000,11000 @@ -58,4 +58,4 @@ .BR oggSplit (1), .BR oggTranscode (1), .BR oggSlideshow (1), -.BR oggSilence (1) \ No newline at end of file +.BR oggSilence (1) --- oggvideotools-0.8a.orig/docs/oggThumb.html +++ oggvideotools-0.8a/docs/oggThumb.html @@ -35,13 +35,13 @@
-t
-Time at which a thumbnail should be created. More than one thumbnail time can be concatenated by komas. The times can be set by integer or floating point values in seconds. If the time is not exactly matching, the next frame is used. The times don't have to be sorted incrementally. +Time at which a thumbnail should be created. More than one thumbnail time can be concatenated by commas. The times can be set by integer or floating point values in seconds. If the time is not exactly matching, the next frame is used. The times don't have to be sorted incrementally.

Example: -t 12.4,14.157,13.23

-f
-Number of a frame that should be created as a thumbnail. More than one thumbnail frame can be concatenated by komas. The frame numbers must be an integers. The frame numbers don't have to be sorted incrementally. +Number of a frame that should be created as a thumbnail. More than one thumbnail frame can be concatenated by commas. The frame numbers must be an integers. The frame numbers don't have to be sorted incrementally.

Example: -f 12000,13000,11000