--- chromium-codecs-ffmpeg-0.5+svn20091210r34297+35231+35248.orig/debian/compat
+++ chromium-codecs-ffmpeg-0.5+svn20091210r34297+35231+35248/debian/compat
@@ -0,0 +1 @@
+5
--- chromium-codecs-ffmpeg-0.5+svn20091210r34297+35231+35248.orig/debian/control
+++ chromium-codecs-ffmpeg-0.5+svn20091210r34297+35231+35248/debian/control
@@ -0,0 +1,62 @@
+Source: chromium-codecs-ffmpeg
+Section: web
+Priority: optional
+Maintainer: Fabien Tassin <fta@ubuntu.com>
+Vcs-Bzr: https://code.launchpad.net/~chromium-team/chromium-browser/chromium-codecs-ffmpeg.head
+Build-Depends: cdbs,
+	debhelper (>= 5),
+	patchutils (>= 0.2.25),
+	lsb-release,
+	zlib1g-dev,
+	gyp,
+	yasm (>= 0.7)
+Standards-Version: 3.8.3
+
+Package: chromium-codecs-ffmpeg
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, chromium-browser (>= 4.0.203.0~)
+Conflicts: chromium-codecs-ffmpeg-nonfree
+Replaces: chromium-codecs-ffmpeg-nonfree
+Breaks: chromium-browser (<< 3.0.197.0~svn20090802r22252)
+Description: Free ffmpeg codecs for the Chromium Browser
+ Chromium is an open-source browser project that aims to build a safer, faster,
+ and more stable way for all Internet users to experience the web.
+ .
+ This package contains the multi-threaded ffmpeg codecs needed for the HTML5
+ <audio> and <video> tags. Only the free ogg, vorbis and theora codecs are
+ included. See chromium-codecs-ffmpeg-nonfree for additionnal non-free codecs
+
+Package: chromium-codecs-ffmpeg-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: ${shlibs:Depends}, ${misc:Depends}, chromium-codecs-ffmpeg (= ${binary:Version})
+Conflicts: chromium-codecs-ffmpeg-nonfree-dbg
+Replaces: chromium-codecs-ffmpeg-nonfree-dbg
+Description: chromium-codecs-ffmpeg debug symbols
+ Debug symbols for the free ffmpeg-mt codecs
+
+Package: chromium-codecs-ffmpeg-nonfree
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, chromium-browser (>= 4.0.203.0~)
+Conflicts: chromium-codecs-ffmpeg
+Breaks: chromium-browser (<< 3.0.197.0~svn20090802r22252)
+Replaces: chromium-codecs-ffmpeg, chromium-browser
+Description: Non-free ffmpeg codecs for the Chromium Browser
+ Chromium is an open-source browser project that aims to build a safer, faster,
+ and more stable way for all Internet users to experience the web.
+ .
+ This package contains the multi-threaded ffmpeg codecs needed for the HTML5
+ <audio> and <video> tags. In addition to the free ogg, vorbis and theora codecs,
+ aac/ac3/mpeg4audio/h264/mov/mp3 are also included.
+ See chromium-codecs-ffmpeg if you prefer only the free codecs
+
+Package: chromium-codecs-ffmpeg-nonfree-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: ${shlibs:Depends}, ${misc:Depends}, chromium-codecs-ffmpeg (= ${binary:Version})
+Conflicts: chromium-codecs-ffmpeg-dbg
+Replaces: chromium-codecs-ffmpeg-dbg
+Description: chromium-codecs-ffmpeg-nonfree debug symbols
+ Debug symbols for the non-free ffmpeg-mt codecs
--- chromium-codecs-ffmpeg-0.5+svn20091210r34297+35231+35248.orig/debian/changelog
+++ chromium-codecs-ffmpeg-0.5+svn20091210r34297+35231+35248/debian/changelog
@@ -0,0 +1,5 @@
+chromium-codecs-ffmpeg (0.5+svn20091210r34297+35231+35248-0ubuntu1~ucd1~karmic) karmic; urgency=low
+
+  * Initial release. (Closes: #XXXXXX)
+
+ -- Fabien Tassin <fta@ubuntu.com>  Thu, 24 Dec 2009 17:00:01 +0100
--- chromium-codecs-ffmpeg-0.5+svn20091210r34297+35231+35248.orig/debian/rules
+++ chromium-codecs-ffmpeg-0.5+svn20091210r34297+35231+35248/debian/rules
@@ -0,0 +1,186 @@
+#!/usr/bin/make -f
+
+DEBIAN_NAME		:= $(shell dpkg-parsechangelog | sed -n 's/^Source: *\(.*\)$$/\1/ p')
+DEBIAN_VERSION		:= $(shell dpkg-parsechangelog | sed -n 's/^Version: *\(.*\)$$/\1/ p')
+DEBIAN_UPSTREAM_VERSION	:= $(shell echo $(DEBIAN_VERSION) | sed 's/^\(.*\)-[^-]*$$/\1/')
+DEBIAN_REVISION		:= $(shell echo $(DEBIAN_VERSION) | sed 's/^.*r\([^-]*\)-.*/\1/')
+DEBIAN_DIST             := $(shell lsb_release -ds | tr -d '()')
+
+SRC_DIR        := $(CURDIR)
+SOURCES_DIR    := src/source/patched-ffmpeg-mt
+LIB_DIR        := usr/lib/chromium-browser
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+
+MAKE_ARGS := BUILDTYPE=Release
+# MAKE_ARGS += CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
+
+ifeq (armel,$(DEB_BUILD_ARCH))
+GYP_DEFINES += \
+        target_arch=arm \
+        $(NULL)
+ifneq (,$(filter unstable development,$(DEBIAN_DIST)))
+# on $(DEB_BUILD_ARCH) and $(DEBIAN_DIST), enforce an armv7 with thumb build
+GYP_DEFINES += \
+        armv7=1 \
+        arm_thumb=1 \
+        $(NULL)
+endif
+else
+ifeq (x86_64,$(DEB_BUILD_GNU_CPU))
+GYP_DEFINES += target_arch=x64
+else
+GYP_DEFINES += target_arch=ia32
+endif
+endif
+
+GYP_DEFINES += \
+	release_extra_cflags=-g \
+	use_system_yasm=1 \
+	$(NULL)
+
+# the ffmpeg_branding variable controls which codecs are built inside the sumo lib.
+# By default, ffmpeg_branding equals to "Chromium" and only builds free codecs.
+# When set to "Chrome", it adds aac/ac3/mpeg4audio/h264/mov/mp3
+FFMPEG_MT_FREE_FLAGS     = $(NULL)
+FFMPEG_MT_NON_FREE_FLAGS = ffmpeg_branding=Chrome
+
+DEB_DH_SHLIBDEPS_ARGS_$(DEBIAN_NAME) := -l$(CURDIR)/debian/$(DEBIAN_NAME)/$(LIB_DIR)
+DEB_DH_SHLIBDEPS_ARGS_$(DEBIAN_NAME)-nonfree := -l$(CURDIR)/debian/$(DEBIAN_NAME)-nonfree/$(LIB_DIR)
+
+# Build a custom ffmpeg from the multi-threaded branch, and do it twice
+# with different flags
+common-build-arch:: debian/stamp-build-ffmpeg-free debian/stamp-build-ffmpeg-nonfree
+
+debian/stamp-unpack:
+	rm -rf $(SRC_DIR)/ffmpeg-mt $(SRC_DIR)/$(SOURCES_DIR)
+	cd $(SRC_DIR) && tar zxf ffmpeg-mt.tar.gz
+	@$(foreach patch,$(sort $(notdir $(wildcard $(SRC_DIR)/patches/*.patch $(SRC_DIR)/patches/*/*.patch))),echo "# Apply $(patch) ..." ; \
+	  cd $(SRC_DIR)/ffmpeg-mt && patch -p1 < $(wildcard $(SRC_DIR)/patches/$(patch) $(SRC_DIR)/patches/*/$(patch));)
+	mkdir -p $(SRC_DIR)/$(dir $(SOURCES_DIR))
+	mv $(SRC_DIR)/ffmpeg-mt $(SRC_DIR)/$(SOURCES_DIR)
+	touch $@
+	
+debian/stamp-configure-ffmpeg-%: GYP_DEFINES += $(FFMPEG_MT_$(subst non,NON_,$(subst free,FREE,$*))_FLAGS)
+debian/stamp-configure-ffmpeg-%: debian/stamp-unpack
+	rm -rf $(SRC_DIR)/*.mk $(SRC_DIR)/src/out
+	cd $(SRC_DIR)/src && GYP_DEFINES="$(GYP_DEFINES)" GYP_GENERATORS=make build/gyp_chromium --depth=../src ffmpeg.gyp
+	touch $@
+
+debian/stamp-build-ffmpeg-%: debian/stamp-configure-ffmpeg-%
+	cd $(SRC_DIR)/src ; $(MAKE) $(MAKE_ARGS) libffmpegsumo.so
+	install -d -m 755 $(CURDIR)/debian/tmp-$*/$(LIB_DIR)
+	install -m 644 $(SRC_DIR)/src/out/Release/lib.target/libffmpegsumo.so $(CURDIR)/debian/tmp-$*/$(LIB_DIR)
+	touch $@
+
+clean::
+	rm -rf debian/stamp-* debian/tmp-*
+	rm -rf $(addprefix $(SRC_DIR)/,ffmpeg-mt src/out src/*.mk src/Makefile src/source/patched-ffmpeg-mt)
+
+###############################################################################################
+
+# Tarball (get-orig-source & get-current-source)
+FFMPEG_URL   := http://src.chromium.org/svn/trunk/deps/third_party/ffmpeg/
+RULES_URL    := http://src.chromium.org/svn/trunk/src/third_party/ffmpeg/
+BUILD_URL    := http://src.chromium.org/svn/trunk/src/build/
+
+SRC_FILES    := \
+	src/build/common.gypi \
+	src/build/compiler_version.py \
+	src/build/external_code.gypi \
+	src/build/features_override.gypi \
+	src/build/gyp_chromium \
+	src/build/linux \
+	ffmpeg/ffmpeg-mt.tar.gz \
+	ffmpeg/patches \
+	ffmpeg/README.chromium \
+	gyp/ffmpeg.gyp \
+	gyp/source \
+	$(NULL)
+
+TMP_DDIR     := $(DEBIAN_NAME)-$(shell echo $$$$)
+ifeq (,$(LOCAL_BRANCH))
+TMP_DIR      := $(TMP_DDIR)
+else
+TMP_DIR      := $(LOCAL_BRANCH)
+endif
+
+DO = (echo "$(1)" ; $(1))
+
+ifneq (,$(DEBIAN_TAG))
+get-orig-source: TAG1  = $(NULL)
+get-orig-source: TAG2  = $(NULL)
+get-orig-source: TAG3  = $(NULL)
+else
+get-orig-source: TAG1  = -r $(shell svn log --limit 1 $(FFMPEG_URL) | grep ^r | head -1 | sed -e 's/^r\([^ ]*\).*/\1/')
+get-orig-source: TAG2  = -r $(shell svn log --limit 1 $(RULES_URL)  | grep ^r | head -1 | sed -e 's/^r\([^ ]*\).*/\1/')
+get-orig-source: TAG3  = -r $(shell svn log --limit 1 $(BUILD_URL)  | grep ^r | head -1 | sed -e 's/^r\([^ ]*\).*/\1/')
+endif
+get-orig-source: gos-all
+
+get-current-source: TAG1 = -r $(shell echo $(DEBIAN_REVISION) | cut -d+ -f1)
+get-current-source: TAG2 = -r $(shell echo $(DEBIAN_REVISION) | cut -d+ -f2)
+get-current-source: TAG3 = -r $(shell echo $(DEBIAN_REVISION) | cut -d+ -f3)
+get-current-source: gos-all
+
+gos-all: gos-co gos-pack
+ifneq (,$(DEBIAN_TAG))
+gos-all: LOCAL_BRANCH = $(NULL)
+endif
+gos-co:
+ifeq (,$(LOCAL_BRANCH))
+	rm -rf $(TMP_DIR)
+endif
+	@if [ ! -d $(TMP_DIR)/ffmpeg ] ; then $(call DO,mkdir -p $(TMP_DIR)/ffmpeg) ; fi
+	@if [ ! -f $(TMP_DIR)/ffmpeg/README.chromium ] ; then \
+	  $(call DO,svn co $(TAG1) -N $(FFMPEG_URL) $(TMP_DIR)/ffmpeg) ; \
+	  $(call DO,svn co $(TAG1) $(FFMPEG_URL)/patches $(TMP_DIR)/ffmpeg/patches) ; \
+	else \
+	  $(call DO,svn update $(TAG1) -N $(TMP_DIR)/ffmpeg) ; \
+	  $(call DO,svn update $(TAG1) $(TMP_DIR)/ffmpeg/patches) ; \
+	fi
+	@if [ ! -d $(TMP_DIR)/gyp ] ; then $(call DO,mkdir -p $(TMP_DIR)/gyp) ; fi
+	@if [ ! -d $(TMP_DIR)/gyp/source/config/Chromium/linux ] ; then $(call DO,mkdir -p $(TMP_DIR)/gyp/source/config/Chromium/linux) ; fi
+	@if [ ! -d $(TMP_DIR)/gyp/source/config/Chrome/linux ] ; then $(call DO,mkdir -p $(TMP_DIR)/gyp/source/config/Chrome/linux) ; fi
+	@if [ ! -f $(TMP_DIR)/gyp/ffmpeg.gyp ] ; then \
+	  $(call DO,svn co $(TAG2) -N $(RULES_URL) $(TMP_DIR)/gyp) ; \
+	  $(call DO,svn co $(TAG2) $(RULES_URL)/source/config/Chromium/linux $(TMP_DIR)/gyp/source/config/Chromium/linux) ; \
+	  $(call DO,svn co $(TAG2) $(RULES_URL)/source/config/Chrome/linux $(TMP_DIR)/gyp/source/config/Chrome/linux) ; \
+	else \
+	  $(call DO,svn update $(TAG2) -N $(TMP_DIR)/gyp) ; \
+	  $(call DO,svn update $(TAG2) $(TMP_DIR)/gyp/source/config/Chromium/linux) ; \
+	  $(call DO,svn update $(TAG2) $(TMP_DIR)/gyp/source/config/Chrome/linux) ; \
+	fi
+	@if [ ! -d $(TMP_DIR)/src/build ]; then $(call DO,mkdir -p $(TMP_DIR)/src/build) ; fi
+	@if [ ! -f $(TMP_DIR)/src/build/common.gypi ] ; then \
+	  $(call DO,svn co $(TAG3) $(BUILD_URL) $(TMP_DIR)/src/build) ; \
+	else \
+	  $(call DO,svn update $(TAG3) $(TMP_DIR)/src/build) ; \
+	fi
+ifneq (,$(LOCAL_BRANCH))
+	rm -rf $(TMP_DDIR)
+	cp -la $(TMP_DIR) $(TMP_DDIR)
+endif
+	cd $(TMP_DDIR)/ffmpeg && tar zxvf ffmpeg-mt.tar.gz ffmpeg-mt/Changelog
+
+gos-pack: TMP_DIR  = $(TMP_DDIR)
+ifneq (,$(DEBIAN_TAG))
+gos-pack: VERSION  = $(shell echo $(DEBIAN_TAG) | cut -d= -f2)
+else
+gos-pack: REVISION = $(shell cd $(TMP_DIR)/ffmpeg && svn log --xml --limit 1 | grep -E '^( *revision=|<date>)' | tr -d '\n' | \
+	             sed -e 's/.*"\([0-9]*\)".*>\(....\)-\(..\)-\(..\)T.*/\2\3\4r\1/')+$(shell cd $(TMP_DIR)/gyp && \
+	             svn log --limit 1 | grep ^r | head -1 | sed -e 's/^r\([^ ]*\).*/\1/')+$(shell cd $(TMP_DIR)/src/build && \
+	             svn log --limit 1 | grep ^r | head -1 | sed -e 's/^r\([^ ]*\).*/\1/')
+gos-pack: VERSION  = $(shell grep -E '^version [0-9][^:]*:.*' $(TMP_DIR)/ffmpeg/ffmpeg-mt/Changelog | head -1 | sed -e 's/.* \(.*\):/\1/')+svn$(REVISION)
+endif
+gos-pack:
+	# Pack
+	rm -rf  $(TMP_DIR)/ffmpeg-mt
+	mkdir $(TMP_DIR)/$(DEBIAN_NAME)-$(VERSION)
+	tar -cf - -C $(TMP_DIR) $(SRC_FILES) --exclude .svn | tar -xf - -C $(TMP_DIR)/$(DEBIAN_NAME)-$(VERSION)
+	@$(foreach dir,ffmpeg gyp,$(call DO,mv $(TMP_DIR)/$(DEBIAN_NAME)-$(VERSION)/$(dir)/* $(TMP_DIR)/$(DEBIAN_NAME)-$(VERSION)/src); rmdir $(TMP_DIR)/$(DEBIAN_NAME)-$(VERSION)/$(dir);)
+	@$(foreach ent,*.tar.gz patches,$(call DO,mv $(TMP_DIR)/$(DEBIAN_NAME)-$(VERSION)/src/$(ent) $(TMP_DIR)/$(DEBIAN_NAME)-$(VERSION));)
+	cd $(TMP_DIR) && tar zcf ../$(DEBIAN_NAME)_$(VERSION).orig.tar.gz --exclude=.svn $(DEBIAN_NAME)-$(VERSION)
+	rm -rf $(TMP_DIR)
+	@echo "# Done (created $(DEBIAN_NAME)_$(VERSION).orig.tar.gz)"
+	@ls -l $(DEBIAN_NAME)_$(VERSION).orig.tar.gz
--- chromium-codecs-ffmpeg-0.5+svn20091210r34297+35231+35248.orig/debian/chromium-codecs-ffmpeg.install
+++ chromium-codecs-ffmpeg-0.5+svn20091210r34297+35231+35248/debian/chromium-codecs-ffmpeg.install
@@ -0,0 +1 @@
+debian/tmp-free/usr/lib/chromium-browser usr/lib
--- chromium-codecs-ffmpeg-0.5+svn20091210r34297+35231+35248.orig/debian/copyright
+++ chromium-codecs-ffmpeg-0.5+svn20091210r34297+35231+35248/debian/copyright
@@ -0,0 +1,110 @@
+This package was created by Fabien Tassin <fta@sofaraway.org> on
+Wed, 29 Jul 2009 21:04:32 +0200
+
+The sources were downloaded from the Chromium repository,
+http://src.chromium.org/svn/trunk/deps/third_party/ffmpeg, itself
+coming from Alexander Strange's ffmpeg-mt branch:
+git://gitorious.org/~astrange/ffmpeg/ffmpeg-mt.git and
+git://git.ffmpeg.org/libswscale
+
+Copyright,
+
+(copy of the libavcodec52 copyright file)
+
+SVN snapshots are downloaded with subversion from the ffmpeg SVN at:
+    <svn://svn.mplayerhq.hu/ffmpeg/trunk>
+
+Upstream Authors: Fabrice Bellard
+                  Alex Beregszaszi
+                  BERO
+                  Mario Brito
+                  Ronald Bultje
+                  Tim Ferguson
+                  Brian Foley
+                  Arpad Gereoffy
+                  Philip Gladstone
+                  Vladimir Gneushev
+                  Wolfgang Hesseler
+                  Falk Hueffner
+                  Zdenek Kabelac
+                  Robin Kay
+                  Todd Kirby
+                  Nick Kurshev
+                  Mike Melanson
+                  Michael Niedermayer
+                  François Revol
+                  Roman Shaposhnik
+                  Dieter Shirley
+                  Juan J. Sierralta
+                  Ewald Snel
+                  Leon van Stuivenberg
+                  Roberto Togni
+                  Lionel Ulmer
+
+Copyright (c) 2000-2004 Fabrice Bellard et al.
+
+The following files are licensed under the GNU GPL, as clarified below:
+
+ * ffmpeg.c
+ * libavcodec:
+   + dtsdec.c
+   + i386/idct_mmx.c
+   + liba52/*.[ch]
+ * libavformat:
+   + x11grab.c
+   + gxfenc.c
+ * libpostproc:
+   + postprocess_internal.h
+   + postprocess_altivec_template.c
+   + postprocess.h
+   + postprocess_template.c
+   + postprocess.c
+   + mangle.h
+ * libswscale:
+   + swscale.c
+   + swscale-example.c
+   + yuv2rgb_template.c
+   + swscale_altivec_template.c
+   + yuv2rgb_altivec.c
+   + swscale_template.c
+   + rgb2rgb_template.c
+   + rgb2rgb.c
+   + cs_test.c
+   + yuv2rgb_mlib.c
+   + yuv2rgb.c
+
+ | This library 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 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 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
+
+The rest of the code is licensed under the GNU LGPL:
+
+ | 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 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 text of the
+GNU Lesser General Public License is in `/usr/share/common-licenses/LGPL'.
+
+=====
--- chromium-codecs-ffmpeg-0.5+svn20091210r34297+35231+35248.orig/debian/chromium-codecs-ffmpeg-nonfree.install
+++ chromium-codecs-ffmpeg-0.5+svn20091210r34297+35231+35248/debian/chromium-codecs-ffmpeg-nonfree.install
@@ -0,0 +1 @@
+debian/tmp-nonfree/usr/lib/chromium-browser usr/lib