[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090706-6-22-gef11c38

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4c454aa925c7fa7a28df871aacaf7c7f807700a7
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 3 21:56:17 2010 +0100

    merge changes from ubuntu packaging
    
     - allow building against opencore-amr if installed
     - install presets in 'libavcodec' instead of 'ffmpeg'

diff --git a/debian/confflags b/debian/confflags
index 070c966..3179711 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -57,6 +57,11 @@ define cond_enable
 	$(shell test -r $(1) && echo --enable-$(2) )
 endef
 
+# variant that also require --enable-version3
+define cond_enable_v3
+	$(shell test -r $(1) && echo --enable-$(2) --enable-version3 )
+endef
+
 # variant that also require --enable-nonfree
 define cond_enable_nf
 	$(shell test -r $(1) && echo --enable-$(2) --enable-nonfree )
@@ -118,11 +123,16 @@ confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
 confflags += $(call cond_enable_nf,/usr/include/amrnb/sp_dec.h,libamr-nb)
 confflags += $(call cond_enable_nf,/usr/include/amrwb/dec.h,libamr-wb)
 
+# Opencore-amr requires GPL v3
+v3_confflags += $(call cond_enable_v3,/usr/include/opencore-amrnb/interf_dec.h,libopencore-amrnb)
+v3_confflags += $(call cond_enable_v3,/usr/include/opencore-amrwb/dec_if.h,libopencore-amrwb)
+
 # AAC is considered non-free upstream
 confflags += $(call cond_enable_nf,/usr/include/faac.h,libfaac)
 
 # comment out following line for LGPL versions of the libraries
 confflags += $(gpl_confflags)
+confflags += $(v3_confflags)
 
 # Enable IEEE 1394 (FireWire) support on Linux only
 ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
diff --git a/debian/control b/debian/control
index ca87105..87dced1 100644
--- a/debian/control
+++ b/debian/control
@@ -89,6 +89,7 @@ Package: libavcodec52
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Replaces: ffmpeg (<< 4:0.5.1-1)
 Description: ffmpeg codec library
  This is the codec library from the ffmpeg project. It supports most existing
  encoding formats (MPEG, DivX, MPEG4, AC3, DV...).
diff --git a/debian/ffmpeg.install b/debian/ffmpeg.install
index 98227ed..8a656e2 100644
--- a/debian/ffmpeg.install
+++ b/debian/ffmpeg.install
@@ -1,4 +1,3 @@
 etc
 usr/bin
 usr/share/man
-usr/share/ffmpeg/*.ffpreset
diff --git a/debian/libavcodec52.install b/debian/libavcodec52.install
index db9ed34..40df581 100644
--- a/debian/libavcodec52.install
+++ b/debian/libavcodec52.install
@@ -1 +1,2 @@
 usr/lib/{,*/,*/*/}libavcodec.so.*
+usr/share/ffmpeg/*.ffpreset

-- 
FFmpeg packaging