--- x264-0.98.1653+git88b90d9.orig/debian/x264.install +++ x264-0.98.1653+git88b90d9/debian/x264.install @@ -0,0 +1 @@ +shared/usr/bin/x264 usr/bin --- x264-0.98.1653+git88b90d9.orig/debian/debian-version.sh +++ x264-0.98.1653+git88b90d9/debian/debian-version.sh @@ -0,0 +1,11 @@ +#!/bin/sh -e + +# mimics upstream's version.h but works inside the debian package +VENDOR=`dpkg-vendor --query vendor` +PACKAGE_VERSION=`dpkg-parsechangelog | awk '/^Version:/ {print $$2}'` +BUILD=`grep '#define X264_BUILD' < x264.h | sed -e 's/.* \([1-9][0-9]*\).*/\1/'` +POINTVER=`echo $PACKAGE_VERSION | sed -e 's/[0-9]\:\(0\.[0-9]*\.[0-9]*\).*/\1/'` + +echo "#define X264_VERSION \" ${VENDOR}_${PACKAGE_VERSION}\"" >> config.h +echo "#define X264_POINTVER \"$POINTVER ${VENDOR}_${PACKAGE_VERSION}\"" >> config.h + --- x264-0.98.1653+git88b90d9.orig/debian/confflags +++ x264-0.98.1653+git88b90d9/debian/confflags @@ -0,0 +1,138 @@ +# -*- mode: makefile -*- +# vi:syntax=make +# configure flags logic + +common_confflags += \ + --prefix=/usr \ + --enable-debug + +# XXX why isn't --enable-visualize used in the static build? +# TODO --disable-asm when we build an opt flavor? +static_confflags += \ + $(common_confflags) + +# upstream defaults to forcing a bunch of optimizations on various arches; +# --disable-asm should disable them all, but then we need to figure out what +# the toolchain actually targets to turn then back on ourselves if appropriate; +# also, we try providing an optimized flavor for the arches / toolchain +# combinations where it makes sense + +shared_confflags += \ + $(common_confflags) \ + --enable-shared + +opt_confflags += \ + $(common_confflags) \ + --enable-shared \ + --libdir=$(opt_libdir) + +# this is only used for the check_asm macro +ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) +CC := gcc +else +CC := $(DEB_HOST_GNU_TYPE)-gcc +endif + +# this outputs 0 or 1 depending on whether a piece of C or assembly can be +# compiled with the *default* gcc flags; this is used to test the toolchain +# *default* configuration +check_c = $(shell echo 'int main(void) { $(1); }' | $(CC) -Werror $(2) -x c - -o /dev/null 2>/dev/null && echo 1 || echo 0) +check_asm = $(call check_c, __asm__ volatile("$(1)")) + +do_opt := no + +# X86 upstream arch, hurd-i386, i386, and kfreebsd-i386 Debian arches; upstream +# adds -march=i686 and -mfpmath=sse -msse by default and runtime detects MMX, +# SSE, SSE2 etc. +ifneq (,$(filter i386 i486 i586 i686 pentium,$(DEB_HOST_GNU_CPU))) +sse_asm := addss m0, m0 +has_sse := $(call check_asm, $(sse_asm)) +ifneq ($(has_sse),1) +# build an SSE optimized flavor for i686 +do_opt := yes +opt_libdir := /usr/lib/i686/sse2 +shared_confflags += --disable-asm +endif +endif + +# X86_64 upstream arch, amd64 and kfreebsd-amd64 Debian arches; no upstream +# flags by default +#ifeq (x86-64,$(DEB_HOST_GNU_CPU)) +#endif + +# PPC upstream arch, powerpc and ppc64 Debian arches; upstream adds -maltivec +# -mabi=altivec by default +# XXX upstream: --disable-asm should disable altivec; fixed in +# 6a443d3cdf338408b1b39e7f336306d2a34703f6 +ifneq (,$(filter powerpc powerpc64,$(DEB_HOST_GNU_CPU))) +altivec_c := vector signed int v1, v2, v3; v1 = vec_add(v2, v3) +has_altivec := $(call check_c, $(altivec_c), -include altivec.h) +ifneq ($(has_altivec),1) +# build an Altivec optimized flavor +do_opt := yes +opt_libdir := /usr/lib/altivec +shared_confflags += --disable-asm +endif +endif + +# Sparc and UltraSparc upstream arches, sparc Debian arch; upstream adds +# -mcpu=ultrasparc to CFLAGS and LDFLAGS and -xarch=v8plusa to ASFLAGS by +# default +# XXX upstream: --disable-asm should disable vis; fixed in +# 6a443d3cdf338408b1b39e7f336306d2a34703f6 +ifeq (sparc,$(DEB_HOST_GNU_CPU)) +vis_asm := pdist %f0, %f0, %f0 +has_vis := $(call check_asm, $(vis_asm)) +ifneq ($(has_vis),1) +# build a VIS optimized flavor +do_opt := yes +opt_libdir := /usr/lib/v9 +shared_confflags += --disable-asm +endif +endif + +# MIPS upstream arch, mips and mipsel Debian arches; no upstream flags by +# default +#ifneq (,$(filter mips mipsel,$(DEB_HOST_GNU_CPU))) +#endif + +# ARM upsteam arch, arm, armeb, and armel Debian arches; upstream prepends -O3 +# -fno-fast-math by default, but that's ok as we override -O and we don't care +# about -ffast-math which is said to be negligible and buggy by upstream, and +# appends -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp by default; upstream +# supports ARMv6t2 with runtime detection of NEON, so if the baseline supports +# ARMv6t2, use it, otherwise build a NEON opt flavor; note that NEON implies +# VFP and ARMv7 and hence the flags are ok +ifeq (arm,$(DEB_HOST_GNU_CPU)) +armv6t2_asm := movt r0, \#0 +has_armv6t2 := $(call check_asm, $(armv6t2_asm)) +ifeq ($(has_armv6t2),1) +# extract the actual -march= the toolchain targets +toolchain_arch := $(shell $(CC) -v 2>&1 | sed -n '/^Configured with: / s/.* --with-arch=\([^ ]*\).*/\1/p') +ifeq ($(toolchain_arch),) +toolchain_arch := armv6t2 +endif +shared_extra_cflags += -march=$(toolchain_arch) +else +do_opt := yes +opt_libdir := /usr/lib/neon/vfp +shared_confflags += --disable-asm +endif +endif + +# S390 upstream arch, s390 and s390x Debian arches; no upstream flags by +# default +#ifneq (,$(filter s390 s390x,$(DEB_HOST_GNU_CPU))) +#endif + +# IA64 upstream arch, ia64 Debian arch; no upstream flags by default +# XXX upstream: --enable-pic is a workaround until the patches to set PIC by +# default on IA64 get merged +ifeq (ia64,$(DEB_HOST_GNU_CPU)) +shared_confflags += --enable-pic +endif + +# there's no special handling for other arches upstream, except for PARISC +# which is not supported in Debian and for which there's no upstream flags by +# default + --- x264-0.98.1653+git88b90d9.orig/debian/libx264-dev.install +++ x264-0.98.1653+git88b90d9/debian/libx264-dev.install @@ -0,0 +1,4 @@ +shared/usr/lib/libx264.so usr/lib +static/usr/lib/libx264.a usr/lib +shared/usr/lib/pkgconfig/x264.pc usr/lib/pkgconfig +shared/usr/include/x264.h usr/include --- x264-0.98.1653+git88b90d9.orig/debian/rules +++ x264-0.98.1653+git88b90d9/debian/rules @@ -0,0 +1,91 @@ +#!/usr/bin/make -f + +include /usr/share/quilt/quilt.make + +libx264N := $(shell sed -rn 's/^Package:[[:space:]]*(libx264-[0-9]+)[[:space:]]*$$/\1/p' debian/control) + +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) + +DEB_BUILD_OPTIONS_PARALLEL ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +PARALLEL_FLAGS += $(if $(DEB_BUILD_OPTIONS_PARALLEL),-j$(DEB_BUILD_OPTIONS_PARALLEL)) +# will affect concurrency of debian/rules as well +MAKEFLAGS += $(PARALLEL_FLAGS) + +include debian/confflags + +LDFLAGS += -Wl,--as-needed + +build: build-stamp +build-stamp: debian/stamp-patched + dh_testdir + # fix version.sh for the debian package + mv version.sh version.sh-upstream + cp debian/debian-version.sh version.sh + chmod +x version.sh + # Build static lib + LDFLAGS="$(LDFLAGS)" ./configure $(static_confflags) + $(MAKE) + $(MAKE) install DESTDIR=$(CURDIR)/debian/install/static + $(MAKE) distclean + # Build shared lib + CFLAGS="$(shared_extra_cflags)" LDFLAGS="$(LDFLAGS)" ./configure $(shared_confflags) + $(MAKE) + $(MAKE) install DESTDIR=$(CURDIR)/debian/install/shared +ifeq ($(do_opt),yes) + $(MAKE) distclean + # Build opt lib + LDFLAGS="$(LDFLAGS)" ./configure $(opt_confflags) + $(MAKE) + $(MAKE) install DESTDIR=$(CURDIR)/debian/install/opt +endif + mv version.sh-upstream version.sh + touch $@ + +debian/x264.1: build-stamp + help2man -n"fast h264 encoder" -N -s1 -S "Videolan project" -h '--fullhelp' \ + debian/install/static/usr/bin/x264 > $@ + +clean: + dh_testdir + dh_testroot + rm -rf debian/install + [ ! -f Makefile ] || $(MAKE) distclean + [ ! -f version.sh-upstream ] || mv version.sh-upstream version.sh + $(MAKE) -f debian/rules unpatch + dh_clean build-stamp debian/x264.1 + +install: + dh_testdir + dh_testroot + dh_prep + dh_installdirs + dh_install --list-missing --sourcedir=debian/install +ifeq ($(do_opt),yes) + mkdir -p debian/$(libx264N)$(opt_libdir) + cp -a debian/install/opt$(opt_libdir)/*.so.* debian/$(libx264N)$(opt_libdir) +endif + +binary-arch: build install debian/x264.1 + dh_testdir + dh_testroot + dh_installchangelogs -s + dh_installdocs -s + dh_installexamples -s + dh_installman -s + dh_link -s + dh_strip -s + dh_compress -s + dh_fixperms -s + dh_makeshlibs -s + dh_installdeb -s + dh_shlibdeps -s + dh_gencontrol -s + dh_md5sums -s + dh_builddeb -s + +binary-indep: build install + +binary: binary-arch binary-indep +.PHONY: build clean binary-indep binary-arch binary install --- x264-0.98.1653+git88b90d9.orig/debian/x264.docs +++ x264-0.98.1653+git88b90d9/debian/x264.docs @@ -0,0 +1 @@ +doc/*.txt --- x264-0.98.1653+git88b90d9.orig/debian/compat +++ x264-0.98.1653+git88b90d9/debian/compat @@ -0,0 +1 @@ +7 --- x264-0.98.1653+git88b90d9.orig/debian/control +++ x264-0.98.1653+git88b90d9/debian/control @@ -0,0 +1,69 @@ +Source: x264 +Section: libs +Priority: extra +Maintainer: Debian multimedia packages maintainers +Uploaders: Reinhard Tartler +Build-Depends: debhelper (>= 7), + libavformat-dev (>= 4:0.6-1~), + help2man, + yasm [i386 amd64 kfreebsd-amd64 lpia], + libgpac-dev, + libswscale-dev, + libx11-dev, + quilt +Standards-Version: 3.8.4 +Vcs-Git: git://git.debian.org/git/pkg-multimedia/x264.git +Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/x264.git + +Package: x264 +Section: graphics +Architecture: any +Depends: ${shlibs:Depends}, + ${misc: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-98 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc: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-98 (= ${binary:Version}), + ${misc:Depends} +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.98.1653+git88b90d9.orig/debian/copyright +++ x264-0.98.1653+git88b90d9/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.98.1653+git88b90d9.orig/debian/libx264-98.install +++ x264-0.98.1653+git88b90d9/debian/libx264-98.install @@ -0,0 +1 @@ +shared/usr/lib/libx264.so.* usr/lib --- x264-0.98.1653+git88b90d9.orig/debian/changelog +++ x264-0.98.1653+git88b90d9/debian/changelog @@ -0,0 +1,344 @@ +x264 (2:0.98.1653+git88b90d9-3) maverick; urgency=low + + * Add libswscale-dev to Build-Depends to enable libav* support (LP: #655148). + + -- Benjamin Drung Tue, 05 Oct 2010 17:36:27 +0200 + +x264 (2:0.98.1653+git88b90d9-2) maverick; urgency=low + + * reintroduce quilt infrastructure + * add fix-8x8dct+slices+no-sliced-threads+cavlc+deblock.patch on + upstream's request + + -- Reinhard Tartler Sat, 18 Sep 2010 11:39:17 +0200 + +x264 (2:0.98.1653+git88b90d9-1) maverick; urgency=low + + * require libavformat-dev from 0.6 or better + * remove conflicts/replaces to ancient package x264-bin (dapper! + times) + * new upstream release + + -- Reinhard Tartler Sun, 04 Jul 2010 16:23:51 -0400 + +x264 (2:0.85.1448+git1a6d32-4) lucid; urgency=low + + * install sse optimized version in /usr/lib/sse2. LP: #550524 + + -- Reinhard Tartler Tue, 30 Mar 2010 22:27:28 +0200 + +x264 (2:0.85.1448+git1a6d32-3) lucid; urgency=low + + [ Loïc Minier ] + * Finish confflags logic and/or add workarounds + + [ Reinhard Tartler ] + * build depend on libgpac-dev to enable mp4 support, LP: #464797 + * simplify configure line, LP: #538555 + * generate manpage with help2man to keep it up-to-date, LP: #391281 + + -- Reinhard Tartler Sun, 14 Mar 2010 10:10:26 +0100 + +x264 (2:0.85.1448+git1a6d32-2) lucid; urgency=low + + * Add check_c() macro and use it for altivec check + + -- Loïc Minier Tue, 09 Mar 2010 21:40:23 +0100 + +x264 (2:0.85.1448+git1a6d32-1) lucid; urgency=low + + [ Loic Minier ] + * Drop --enable-pic, let's see what breaks, LP: #524859 + + [ Reinhard Tartler ] + * New upstream snapshot, no new features, LP: #526396 + * remove quilt infrastructure + * don't set CFLAGS in debian/rules, upstream build system overrides + this anyways + + -- Reinhard Tartler Sun, 21 Feb 2010 16:57:21 +0100 + +x264 (2:0.85.1442.1+git781d30-1) lucid; urgency=low + + * use proper upstream version + (NB: the first number (85) is the API version, + the second the number of git commits so far) + * New upstream version should fix: LP: #315697, #463516 + * Many ARM Neon Optimisations, LP: #388388 + * this package is properly maintained in ubuntu. Indicate this by using + "-N" as versioning scheme. + * change versioning scheme as discussed with upstream. Requires bumping + epoch, though. + * ensure that MP4 output support is enabled, LP: #464797 + + -- Reinhard Tartler Thu, 18 Feb 2010 07:39:51 +0100 + +x264 (1:0.svn20100213+gitfcf70c-0ubuntu1~ppa1) lucid; urgency=low + + * new upstream version test upload. + + -- Reinhard Tartler Sat, 13 Feb 2010 18:07:40 +0100 + +x264 (1:0.svn20090621+git364d7d-0ubuntu2) karmic; urgency=low + + * update symbol files with architecture specific symbols. + * remove reference to the now removed bime version, LP: #371786 + + -- Reinhard Tartler Sun, 21 Jun 2009 18:18:51 +0200 + +x264 (1:0.svn20090621+git364d7d-0ubuntu1) karmic; urgency=low + + * New Upstream Version + * add symbols file + * make dh_makeshlibs less strict + + -- Reinhard Tartler Sun, 21 Jun 2009 11:22:31 +0200 + +x264 (1:0.svn20090502-0.0ubuntu2) karmic; urgency=low + + * take over marillats package under the umbrella of pkg-multimedia + + -- Reinhard Tartler Sun, 14 Jun 2009 17:49:13 +0200 + +x264 (1:0.svn20090502-0.0ubuntu1) karmic; urgency=low + + * Merge from debian-multimedia, Ubuntu remaining changes: + - Build-Depends on yasm for lpia. + + -- Alessio Treglia Mon, 04 May 2009 23:15:42 +0200 + +x264 (1:0.svn20090502-0.0) unstable; urgency=low + + * New git release. + + -- Christian Marillat Sat, 02 May 2009 10:34:20 +0200 + +x264 (1:0.svn20090413-0.0) unstable; urgency=low + + * New git release. + + -- Christian Marillat Mon, 13 Apr 2009 15:43:31 +0200 + +x264 (1:0.svn20090327-0.1) unstable; urgency=low + + * New patch to fix powerpc build. + + -- Christian Marillat Sat, 28 Mar 2009 14:12:38 +0100 + +x264 (1:0.svn20090327-0.0) unstable; urgency=low + + * New git release. + * New library soname (67). + * Don't Build-Depends on libgpac-dev (circulary dependency with ffmpeg, + gpac and x264) and remove --enable-mp4-output. + + -- Christian Marillat Fri, 27 Mar 2009 15:02:02 +0100 + +x264 (1:0.svn20090222-0.0) unstable; urgency=low + + * New git release. + * New library soname (66). + + -- Christian Marillat Sun, 22 Feb 2009 09:07:29 +0100 + +x264 (1:0.svn20090115-0.0) unstable; urgency=low + + * New git release. + + -- Christian Marillat Thu, 15 Jan 2009 18:22:50 +0100 + +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.98.1653+git88b90d9.orig/debian/gbp.conf +++ x264-0.98.1653+git88b90d9/debian/gbp.conf @@ -0,0 +1,6 @@ +[DEFAULT] +upstream-branch = upstream +debian-branch = ubuntu +upstream-tag = upstream/%(version)s +debian-tag = debian/%(version)s +pristine-tar = True --- x264-0.98.1653+git88b90d9.orig/debian/x264.manpages +++ x264-0.98.1653+git88b90d9/debian/x264.manpages @@ -0,0 +1 @@ +debian/x264.1 --- x264-0.98.1653+git88b90d9.orig/debian/patches/fix-8x8dct+slices+no-sliced-threads+cavlc+deblock.patch +++ x264-0.98.1653+git88b90d9/debian/patches/fix-8x8dct+slices+no-sliced-threads+cavlc+deblock.patch @@ -0,0 +1,30 @@ +From: Jason Garrett-Glaser +Date: Thu, 15 Jul 2010 01:47:14 +0000 (-0700) +Subject: Fix 8x8dct+slices+no sliced threads+cavlc+deblock +X-Git-Url: http://git.videolan.org/?p=x264.git;a=commitdiff_plain;h=c953140b3b622b33e892c1a3d327d35b74762293;hp=d6228aea4f0adf29be8526b8ce1d9d1237d23975 + +Fix 8x8dct+slices+no sliced threads+cavlc+deblock +Deblocking was done slightly incorrectly. +Regression in r1612. +--- + +diff --git a/common/macroblock.c b/common/macroblock.c +index f0a624f..ebff1c5 100644 +--- a/common/macroblock.c ++++ b/common/macroblock.c +@@ -929,6 +929,7 @@ void x264_macroblock_cache_load_deblock( x264_t *h ) + int mb_x = h->mb.i_mb_x; + int mb_y = h->mb.i_mb_y; + x264_macroblock_cache_load_neighbours_deblock( h, mb_x, mb_y ); ++ int new_neighbour = h->mb.i_neighbour; + h->mb.i_neighbour &= ~old_neighbour; + if( h->mb.i_neighbour ) + { +@@ -984,6 +985,7 @@ void x264_macroblock_cache_load_deblock( x264_t *h ) + } + } + } ++ h->mb.i_neighbour = new_neighbour; + } + + if( h->param.analyse.i_weighted_pred && h->sh.i_type == SLICE_TYPE_P ) --- x264-0.98.1653+git88b90d9.orig/debian/patches/series +++ x264-0.98.1653+git88b90d9/debian/patches/series @@ -0,0 +1 @@ +fix-8x8dct+slices+no-sliced-threads+cavlc+deblock.patch