r1573 - in /experimental/ffmpeg-debian/debian/patches: 050_disable_faad_test.diff 51_dlopen_correct_libfaad_and_liba52_so.diff

[siretart at users.alioth.debian.org]

Author: siretart
Date: Sat Nov 15 14:18:02 2008
New Revision: 1573

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1573
Log:

add patches developed for ubuntu to support loading libfaad at runtime.
however do not activate them (yet) in debian.

Added:
    experimental/ffmpeg-debian/debian/patches/050_disable_faad_test.diff
    experimental/ffmpeg-debian/debian/patches/51_dlopen_correct_libfaad_and_liba52_so.diff

Added: experimental/ffmpeg-debian/debian/patches/050_disable_faad_test.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg-debian/debian/patches/050_disable_faad_test.diff?rev=1573&op=file
==============================================================================
--- experimental/ffmpeg-debian/debian/patches/050_disable_faad_test.diff (added)
+++ experimental/ffmpeg-debian/debian/patches/050_disable_faad_test.diff Sat Nov 15 14:18:02 2008
@@ -1,0 +1,46 @@
+disable configure checks for libfaad2 and liba52.
+
+in debian/ubuntu, we cannot have the headers an libraries on the
+system. however, we ship with copies of the headers. This means that we
+manually ensure that this works, but the checks are too tight here for
+our needs.
+
+--- a/configure
++++ b/configure
+@@ -1331,21 +1331,9 @@ fi
+ disabled static && LIBNAME=""
+ 
+ if enabled_any libfaad libfaadbin ; then
+-    if check_header faad.h; then
+-        check_cc << EOF
+-#include <faad.h>
+-#ifndef FAAD2_VERSION
+-ok faad1
+-#endif
+-int main(void) { return 0; }
+-EOF
+-        test $? = 0 && enable libfaad2
+-    else
+-        die "FAAD test failed."
+-    fi
++    enable libfaad2
+ fi
+ 
+-
+ if ! enabled gpl; then
+     die_gpl_disabled(){
+         name=$1
+@@ -1639,11 +1627,11 @@ done
+ 
+ # these are off by default, so fail if requested and not available
+ enabled avisynth   && require2 vfw32 "windows.h vfw.h" AVIFileInit -lvfw32
+-enabled liba52     && require  liba52 a52dec/a52.h a52_init -la52
++# enabled liba52     && require  liba52 a52dec/a52.h a52_init -la52
+ enabled libamr_nb  && require  libamrnb amrnb/interf_dec.h Speech_Decode_Frame_init -lamrnb -lm
+ enabled libamr_wb  && require  libamrwb amrwb/dec_if.h D_IF_init -lamrwb -lm
+ enabled libfaac    && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
+-enabled libfaad    && require2 libfaad faad.h faacDecOpen -lfaad
++# enabled libfaad    && require2 libfaad faad.h faacDecOpen -lfaad
+ enabled libgsm     && require  libgsm gsm.h gsm_create -lgsm
+ enabled libmp3lame && require  LAME lame/lame.h lame_init -lmp3lame -lm
+ enabled libnut     && require  libnut libnut.h nut_demuxer_init -lnut

Added: experimental/ffmpeg-debian/debian/patches/51_dlopen_correct_libfaad_and_liba52_so.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg-debian/debian/patches/51_dlopen_correct_libfaad_and_liba52_so.diff?rev=1573&op=file
==============================================================================
--- experimental/ffmpeg-debian/debian/patches/51_dlopen_correct_libfaad_and_liba52_so.diff (added)
+++ experimental/ffmpeg-debian/debian/patches/51_dlopen_correct_libfaad_and_liba52_so.diff Sat Nov 15 14:18:02 2008
@@ -1,0 +1,28 @@
+Adjust sonames on liba52 and libfaad
+
+In debian and ubuntu, the sonames used by upstream are too tight,
+because they are only provided by the development patches. Using tighter
+names enables their use if only the library packages are installed.
+
+--- a/libavcodec/liba52.c
++++ b/libavcodec/liba52.c
+@@ -29,7 +29,7 @@
+ 
+ #ifdef CONFIG_LIBA52BIN
+ #include <dlfcn.h>
+-static const char* liba52name = "liba52.so.0";
++static const char* liba52name = "liba52-0.7.4.so";
+ #endif
+ 
+ /**
+--- a/libavcodec/libfaad.c
++++ b/libavcodec/libfaad.c
+@@ -42,7 +42,7 @@
+ 
+ #ifdef CONFIG_LIBFAADBIN
+ #include <dlfcn.h>
+-static const char* libfaadname = "libfaad.so";
++static const char* libfaadname = "libfaad.so.0";
+ #else
+ #define dlopen(a)
+ #define dlclose(a)