--- x264-0.svn20100207.orig/debian/compat +++ x264-0.svn20100207/debian/compat @@ -0,0 +1 @@ +7 --- x264-0.svn20100207.orig/debian/libx264-dev.install +++ x264-0.svn20100207/debian/libx264-dev.install @@ -0,0 +1,4 @@ +/usr/lib/libx264.so +/usr/lib/libx264.a +/usr/lib/pkgconfig/x264.pc +/usr/include/x264.h --- x264-0.svn20100207.orig/debian/changelog +++ x264-0.svn20100207/debian/changelog @@ -0,0 +1,221 @@ +x264 (1:0.svn20100207-0.0ubuntu1~nvidiavdpauppa1) karmic; urgency=low + + * New git release + * Build for ppa. + + -- Brandon Snider Mon, 08 Feb 2010 15:05:35 -0500 + +x264 (1:0.svn20090703-0.0ubuntu1~karmic~ppa1) karmic; urgency=low + + * New git release + * Build for ppa. + + -- Brandon Snider Sat, 04 Jul 2009 00:16:34 -0400 + +x264 (1:0.svn20090329-0.0ubuntu3) intrepid; urgency=low + + * New git release + + -- Jean-Yves Avenard Sun, 29 Mar 2009 19:51:18 +1100 + +x264 (1:0.svn20081230-0.0ubuntu5) intrepid; urgency=low + + * Build for Intrepid (8.10) + + -- Jean-Yves Avenard Mon, 16 Mar 2009 02:15:27 +1100 + +x264 (1:0.svn20081230-0.0ubuntu1) jaunty; urgency=low + + * Merge from Debian multimedia (LP: #243451), remaining Ubuntu changes: + - b-d on yasm on lpia. + + -- Lionel Le Folgoc Thu, 15 Jan 2009 23:15:42 +0100 + +x264 (1:0.svn20081230-0.0) unstable; urgency=low + + * New git release. + + -- Christian Marillat Tue, 30 Dec 2008 16:11:33 +0100 + +x264 (1:0.svn20081210-0.0) unstable; urgency=low + + * Net git release. + * Now yasm is the default assembler. + * The GTK frontend is gone. + + -- Christian Marillat Wed, 10 Dec 2008 14:40:45 +0100 + +x264 (1:0.svn20080712-0.1) unstable; urgency=high + + * Seems to be a problem with the previous release (Segfault) that I'm + unable to reproduce, so back to this version for Lenny. + + -- Christian Marillat Sat, 13 Sep 2008 17:53:03 +0200 + +x264 (0.svn20080828-0.0) unstable; urgency=low + + * New git release. + + -- Christian Marillat Thu, 28 Aug 2008 12:59:18 +0200 + +x264 (0.svn20080712-0.0) unstable; urgency=low + + * New git release. + + -- Christian Marillat Sat, 12 Jul 2008 23:13:24 +0200 + +x264 (0.svn20080616-0.0) unstable; urgency=low + + * New git release. + + -- Christian Marillat Mon, 16 Jun 2008 15:26:32 +0200 + +x264 (1:0.svn20080408-0.0ubuntu1) intrepid; urgency=low + + * Merge from debian-multimedia. Remaining Ubuntu changes: + - Maintainer field + - Set epoch + + -- John Dong Sat, 03 May 2008 01:12:18 -0400 + +x264 (0.svn20080408-0.0) unstable; urgency=low + + * New git release. + + -- Christian Marillat Tue, 08 Apr 2008 14:21:37 +0200 + +x264 (0.svn20080223-0.0) unstable; urgency=low + + * New svn release 736. + + -- Christian Marillat Sat, 23 Feb 2008 14:31:31 +0100 + +x264 (1:0.svn20071224-0.0ubuntu1) hardy; urgency=low + + * Merge from debian-multimedia (LP: #177082) + - Maintainer field + - Set epoch + - b-d nasm on lpia + - Drop b-d version on nasm, associated Debian issue not relevant + to Ubuntu. + + -- John Dong Sun, 06 Jan 2008 23:38:50 -0500 + +x264 (0.svn20071224-0.0) unstable; urgency=low + + * New svn release 714. + + -- Christian Marillat Mon, 24 Dec 2007 09:23:30 +0100 + +x264 (0.svn20071202-0.0) unstable; urgency=low + + * New svn release 705. + + -- Christian Marillat Sun, 02 Dec 2007 14:24:50 +0100 + +x264 (1:0.svn20070930-0.0ubuntu2) hardy; urgency=low + + * No source change reupload, got accidentally removed from archive. + + -- John Dong Fri, 30 Nov 2007 23:00:11 -0500 + +x264 (1:0.svn20070930-0.0ubuntu1) hardy; urgency=low + + * Fakesync with debian-multimedia (LP: #138854) + - Set epoch + - b-d nasm on lpia + - Drop b-d version on nasm, associated Debian issue not relevant + to Ubuntu. + + -- John Dong Sun, 18 Nov 2007 15:14:01 -0500 + +x264 (0.svn20070930-0.0) unstable; urgency=low + + * New svn release 680. + + -- Christian Marillat Sun, 30 Sep 2007 09:25:00 +0200 + +x264 (0.svn20070823-0.1) unstable; urgency=low + + * Same bug as in 0.svn20070613-0.2 yasm doesn't work and the latest nasm + (0.99.01-1) doesn't work too... So make a Build-Depends on + nasm (= 0.98.38-1.2). + + + -- Christian Marillat Fri, 31 Aug 2007 18:41:42 +0200 + +x264 (0.svn20070823-0.0) unstable; urgency=low + + * New svn release 671. + * Back to yasm for i386 (doesn't build with latest nasm and yasm support + for i386 seem's to be fixed). + + -- Christian Marillat Thu, 23 Aug 2007 10:19:52 +0200 + +x264 (0.svn20070613-0.2) unstable; urgency=low + + * Build with nasm for i386. + + -- Christian Marillat Sat, 23 Jun 2007 11:50:58 +0200 + +x264 (0.svn20070613-0.1) unstable; urgency=low + + * Forgot to add dpatch in Build-Depends. Also this package is build with + --enable-mp4-output + + -- Christian Marillat Wed, 13 Jun 2007 23:31:55 +0200 + +x264 (0.svn20070613-0.0) unstable; urgency=low + + * New svn release. + * Build with --enable-gtk, --enable-mp4-output and --enable-visualize + * Use yasm instead of nasm for i386. + + -- Christian Marillat Wed, 13 Jun 2007 17:45:02 +0200 + +x264 (0.svn20070309-5) unstable; urgency=low + + * Upload for my repository. + + -- Christian Marillat Wed, 16 May 2007 15:29:36 +0200 + +x264 (0.svn20070309-4) unstable; urgency=low + + * debian/patches/010_altivec_crash.diff: + + Updated upstream patch to fix an FTBFS. + + -- Sam Hocevar (Debian packages) Wed, 14 Mar 2007 23:10:23 +0100 + +x264 (0.svn20070309-3) unstable; urgency=low + + * debian/control: + + Set pkg-multimedia-maintainers as main maintainer, added Fabian + Greffrath as uploader. + + Updated VCS fields. + + * debian/patches/010_altivec_crash.diff: + + New patch from upstream: runtime AltiVec detection and workaround + for gcc generating AltiVec code here and there with -maltivec. + + -- Sam Hocevar (Debian packages) Wed, 14 Mar 2007 19:20:43 +0100 + +x264 (0.svn20070309-2) unstable; urgency=low + + * debian/rules: + + Activate --enable-pthread. + * debian/control: + + Added conflicts/replaces x264-bin because of unofficial packages that + decided "x264" was not a good package name for the "x264" program + (Closes: #414648). + * debian/copyright: + + Cleaned up, removed mention to NetBSD files that are no longer here. + * debian/patches/000_usr_prefix.diff: + + Remove this patch in favour of --prefix=/usr. + + -- Sam Hocevar (Debian packages) Tue, 13 Mar 2007 02:04:58 +0100 + +x264 (0.svn20070309-1) unstable; urgency=low + + * Initial release (Closes: #405212). + + -- Sam Hocevar (Debian packages) Fri, 9 Mar 2007 22:59:37 +0100 --- x264-0.svn20100207.orig/debian/copyright +++ x264-0.svn20100207/debian/copyright @@ -0,0 +1,71 @@ +This package was debianized by Sam Hocevar (Debian packages) + on Fri, 9 Mar 2007 22:59:37 +0100. + +It was downloaded from svn://svn.videolan.org/x264/trunk/ + +encoder/eval.c, extras/getopt.c: + Copyright (C) 2002 Michael Niedermayer + Copyright (C) 1987-1996, 1998-2001 Free Software Foundation, Inc. + Licensed unter the GNU LGPL, version 2.1 or later. + +all other files: + Copyright (c) 2003-2006 Laurent Aimar + Alex Izvorski (aizvorski(at)gmail.com) + Alex Wright (alexw0885(at)hotmail.com) + Andrew Dunstan + bobololo + Christian Heine (sennindemokrit(at)gmx.net) + Eric Petit + Francesco Corriga + Justin Clay (justin_clay(at)hotmail.com) + Loren Merritt (lorenm(at)u.washington.edu) + Måns Rullgård (mru(at)mru.ath.cx) + Michael Niedermayer (michaelni(at)gmx.at) + Mike Matsnev (mike(at)po.cs.msu.su) + Min Chen + Phil Jensen (philj(at)csufresno.edu) + Radek Czyz (radoslaw(at)syskin.cjb.net) + Riccardo Stievano (walkunafraid(at)tin.it) + Tuukka Toivonen (tuukkat(at)ee.oulu.fi) + Vincent Torri (Vincent.Torri(at)iecn.u-nancy.fr) + Copyright (C) 1989-1994, 1996-1999, 2001 Free Software Foundation, Inc. + Licensed under the GNU General Public License, version 2 or later. + +The blurb for the GNU Lesser General Publice License, version 2.1 or later: + + | This library is free software; you can redistribute it and/or + | modify it under the terms of the GNU Lesser General Public + | License as published by the Free Software Foundation; either + | version 2.1 of the License, or (at your option) any later version. + | + | This library 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 + | Lesser General Public License for more details. + | + | You should have received a copy of the GNU Lesser General Public + | License along with this library; if not, write to the Free Software + | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +The blurb for the GNU General Publice License, version 2 or later: + + | 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, 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 GNU/Linux systems, the complete text of the GNU General Public +License can be found in `/usr/share/common-licenses/GPL'. and the +complete text of the GNU Lesser General Public License can be found in +the `/usr/share/common-licenses/LGPL' file. + + --- x264-0.svn20100207.orig/debian/libx264-84.install +++ x264-0.svn20100207/debian/libx264-84.install @@ -0,0 +1 @@ +/usr/lib/libx264.so.* --- x264-0.svn20100207.orig/debian/rules +++ x264-0.svn20100207/debian/rules @@ -0,0 +1,106 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +NCPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) + +ifeq ($(NCPUS),-1) + NCPUS:=1 +endif + +ifeq ($(NCPUS),0) + NCPUS:=1 +endif + +confflags = --enable-pthread --prefix=/usr --enable-debug + +CFLAGS = -Wall -g +LDFLAGS = -Wl,--as-needed + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +build: build-stamp +build-stamp: debian/stamp-patched + dh_testdir + + # Build static lib +# $(MAKE) clean + CFLAGS="$(CFLAGS)" ./configure $(confflags) + $(MAKE) -j $(NCPUS) libx264.a + + # Backup static lib + mv libx264.a libx264.a.bak + + # Build shared lib + GTK frontend + $(MAKE) clean + + CFLAGS="$(CFLAGS)" ./configure $(confflags) --enable-shared \ + --enable-pic --enable-visualize --enable-mp4-output + + $(MAKE) -j $(NCPUS) + + # Restore static lib + mv libx264.a.bak libx264.a + + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + [ ! -f Makefile ] || $(MAKE) distclean + + rm -f libx264.a.bak + + debian/rules unpatch + + dh_clean + +install: + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + + dh_install --fail-missing --sourcedir=debian/tmp + +binary-common: + dh_testdir + dh_testroot + dh_installdocs + dh_installexamples + dh_installman debian/x264.1 + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs -V + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary-indep: build install + +binary-arch: build install + $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common + +binary: binary-arch binary-indep +.PHONY: build clean binary-indep binary-arch binary install --- x264-0.svn20100207.orig/debian/control +++ x264-0.svn20100207/debian/control @@ -0,0 +1,59 @@ +Source: x264 +Section: libs +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Christian Marillat +Bugs: mailto:marillat@debian.org +Homepage: http://www.videolan.org/developers/x264.html +Standards-Version: 3.8.0 +Build-Depends: debhelper (>= 7), yasm (>= 0.7) [amd64 i386 lpia], libgpac-dev, quilt, libx11-dev + +Package: x264 +Section: graphics +Architecture: any +Depends: ${shlibs:Depends} +Conflicts: x264-bin +Replaces: x264-bin +Description: video encoder for the H.264/MPEG-4 AVC standard + x264 is an advanced commandline encoder for creating H.264 (MPEG-4 AVC) + video streams. + . + x264 supports the following features: + * CABAC (context-based adaptive binary arithmetic coding) and CAVLC + (context-based adaptive variable length coding + * multiple reference frames + * 16x16, 8x8 and 4x4 intra-predicted macroblocks + * all P-frame inter-predicted macroblock types + * B-Inter-predicted macroblock types from 16x16 down to 8x8 + * rate distortion optimization + * multiple rate control modes (constant quantizer, constant quality, single + or multipass ABR with the option of VBV) + * scene cut detection + * adaptive B-frame placement, with the option of keeping B-frames as + references / arbitrary frame order + * 8x8 and 4x4 adaptive spatial transform (high profile) + * lossless mode (high 4:4:4 profile) + * custom quantization matrices (high profile) + * parallel encoding on multiple CPUs + * interlaced streams + +Package: libx264-84 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Description: x264 video coding library + libx264 is an advanced encoding library for creating H.264 (MPEG-4 AVC) + video streams. + . + This package contains the libx264 shared library. + +Package: libx264-dev +Section: libdevel +Architecture: any +Depends: libx264-84 (= ${binary:Version}) +Description: development files for libx264 + libx264 is an advanced encoding library for creating H.264 (MPEG-4 AVC) + video streams. + . + This package contains the static library and headers used to build programs + that use libx264. --- x264-0.svn20100207.orig/debian/x264.install +++ x264-0.svn20100207/debian/x264.install @@ -0,0 +1 @@ +/usr/bin/x264 --- x264-0.svn20100207.orig/debian/x264.1 +++ x264-0.svn20100207/debian/x264.1 @@ -0,0 +1,338 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. +.TH X264 "1" "March 2007" "x264" "User Commands" +.SH NAME +x264 \- H.264 encoder +.SH SYNOPSIS +\fBx264 [options] \-o outfile infile [widthxheight] +.SH DESCRIPTION +x264 encodes a video stream using the H.264 codec. +.PP +Infile can be raw YUV 4:2:0 (in which case resolution is required) or +YUV4MPEG 4:2:0 (*.y4m). +.PP +Outfile type is selected by filename: \fB.264\fR (raw bytestream) or +\fB.mkv\fR (Matroska). +.SH OPTIONS +.TP +\fB\-h\fR, \fB\-\-help\fR +List the more commonly used options +.TP +\fB\-\-longhelp\fR +List all options +.PP +Frame\-type options: +.TP +\fB\-I\fR, \fB\-\-keyint\fR +Maximum GOP size [250] +.TP +\fB\-i\fR, \fB\-\-min\-keyint\fR +Minimum GOP size [25] +.TP +\fB\-\-scenecut\fR +How aggressively to insert extra I\-frames [40] +.TP +\fB\-\-pre\-scenecut\fR +Faster, less precise scenecut detection. +Required and implied by multi\-threading. +.TP +\fB\-b\fR, \fB\-\-bframes\fR +Number of B\-frames between I and P [0] +.TP +\fB\-\-no\-b\-adapt\fR +Disable adaptive B\-frame decision +.TP +\fB\-\-b\-bias\fR +Influences how often B\-frames are used [0] +.TP +\fB\-\-b\-pyramid\fR +Keep some B\-frames as references +.TP +\fB\-\-no\-cabac\fR +Disable CABAC +.TP +\fB\-r\fR, \fB\-\-ref\fR +Number of reference frames [1] +.TP +\fB\-\-no\-deblock\fR +Disable loop filter +.TP +\fB\-f\fR, \fB\-\-deblock\fR +Loop filter AlphaC0 and Beta parameters [0:0] +.TP +\fB\-\-interlaced\fR +Enable pure\-interlaced mode +.PP +Ratecontrol: +.TP +\fB\-q\fR, \fB\-\-qp\fR +Set QP (0=lossless) [26] +.TP +\fB\-B\fR, \fB\-\-bitrate\fR +Set bitrate (kbit/s) +.TP +\fB\-\-crf\fR +Quality\-based VBR (nominal QP) +.HP +\fB\-\-vbv\-maxrate\fR Max local bitrate (kbit/s) [0] +.HP +\fB\-\-vbv\-bufsize\fR Enable CBR and set size of the VBV buffer (kbit) [0] +.TP +\fB\-\-vbv\-init\fR +Initial VBV buffer occupancy [0.9] +.TP +\fB\-\-qpmin\fR +Set min QP [10] +.TP +\fB\-\-qpmax\fR +Set max QP [51] +.TP +\fB\-\-qpstep\fR +Set max QP step [4] +.TP +\fB\-\-ratetol\fR +Allowed variance of average bitrate [1.0] +.TP +\fB\-\-ipratio\fR +QP factor between I and P [1.40] +.TP +\fB\-\-pbratio\fR +QP factor between P and B [1.30] +.TP +\fB\-\-chroma\-qp\-offset\fR +QP difference between chroma and luma [0] +.TP +\fB\-p\fR, \fB\-\-pass\fR <1|2|3> +Enable multipass ratecontrol +\- 1: First pass, creates stats file +\- 2: Last pass, does not overwrite stats file +\- 3: Nth pass, overwrites stats file +.TP +\fB\-\-stats\fR +Filename for 2 pass stats ["x264_2pass.log"] +.TP +\fB\-\-rceq\fR +Ratecontrol equation ["blurCplx^(1\-qComp)"] +.TP +\fB\-\-qcomp\fR +QP curve compression: 0.0 => CBR, 1.0 => CQP [0.60] +.TP +\fB\-\-cplxblur\fR +Reduce fluctuations in QP (before curve compression) [20.0] +.TP +\fB\-\-qblur\fR +Reduce fluctuations in QP (after curve compression) [0.5] +.TP +\fB\-\-zones\fR //... +Tweak the bitrate of some regions of the video +Each zone is of the form +.IP +,,