[SCM] MediaTomb packaging branch, master, updated. debian/0.12.0.svn2018-4-9-ga0fceb3

ceros-guest at users.alioth.debian.org ceros-guest at users.alioth.debian.org
Mon Feb 8 04:13:06 UTC 2010


The following commit has been merged in the master branch:
commit 6897b771f5da02a235dc4b9cd1ece8982f080030
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun Feb 7 15:52:58 2010 -0500

    Allow mediatomb to build against ffmpegthumbnailer 2.0 library.

diff --git a/debian/changelog b/debian/changelog
index f5571f0..40275f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mediatomb (0.12.0~svn2018-6) UNRELEASED; urgency=low
+
+  * Allow mediatomb to build against ffmpegthumbnailer 2.0 library.
+
+ -- Andres Mejia <mcitadel at gmail.com>  Sun, 07 Feb 2010 15:36:54 -0500
+
 mediatomb (0.12.0~svn2018-5) unstable; urgency=medium
 
   [ Mehdi Dogguy ]
diff --git a/debian/patches/autoreconf_-fi.patch b/debian/patches/autoreconf_-fi.patch
index 5b4d7c1..fb27cd7 100644
--- a/debian/patches/autoreconf_-fi.patch
+++ b/debian/patches/autoreconf_-fi.patch
@@ -2684,7 +2684,7 @@ Patch that applies changes after `autoreconf -fi` is done.
 +.NOEXPORT:
 --- /dev/null
 +++ b/autoconfig.h.in
-@@ -0,0 +1,718 @@
+@@ -0,0 +1,721 @@
 +/* autoconfig.h.in.  Generated from configure.ac by autoheader.  */
 +
 +/* Define if building universal (internal helper macro) */
@@ -2754,6 +2754,9 @@ Patch that applies changes after `autoreconf -fi` is done.
 +/* external transcoding feature */
 +#undef EXTERNAL_TRANSCODING
 +
++/* use ffmpegthumbnailer API */
++#undef FFMPEGTHUMBNAILER_OLD_API
++
 +/* Define to 1 if you have `alloca', as a function or macro. */
 +#undef HAVE_ALLOCA
 +
@@ -7351,7 +7354,7 @@ Patch that applies changes after `autoreconf -fi` is done.
 +.NOEXPORT:
 --- /dev/null
 +++ b/configure
-@@ -0,0 +1,21341 @@
+@@ -0,0 +1,21815 @@
 +#! /bin/sh
 +# Guess values for system-dependent variables and create Makefiles.
 +# Generated by GNU Autoconf 2.65 for MediaTomb 0.12.0.
@@ -18170,7 +18173,13 @@ Patch that applies changes after `autoreconf -fi` is done.
 +
 +else
 +
-+                as_fn_error "pthread library not found in requested location $mt_pthread_search_libs" "$LINENO" 5
++                mt_pthread_library_status=missing
++                if test "" = "pass"; then
++                    { $as_echo "$as_me:${as_lineno-$LINENO}: pthread library not found in requested location $mt_pthread_search_libs" >&5
++$as_echo "$as_me: pthread library not found in requested location $mt_pthread_search_libs" >&6;}
++                else
++                    as_fn_error "pthread library not found in requested location $mt_pthread_search_libs" "$LINENO" 5
++                fi
 +
 +
 +fi
@@ -18733,7 +18742,13 @@ Patch that applies changes after `autoreconf -fi` is done.
 +
 +else
 +
-+                as_fn_error "rt library not found in requested location $mt_rt_search_libs" "$LINENO" 5
++                mt_rt_library_status=missing
++                if test "" = "pass"; then
++                    { $as_echo "$as_me:${as_lineno-$LINENO}: rt library not found in requested location $mt_rt_search_libs" >&5
++$as_echo "$as_me: rt library not found in requested location $mt_rt_search_libs" >&6;}
++                else
++                    as_fn_error "rt library not found in requested location $mt_rt_search_libs" "$LINENO" 5
++                fi
 +
 +
 +fi
@@ -19065,7 +19080,13 @@ Patch that applies changes after `autoreconf -fi` is done.
 +
 +else
 +
-+                as_fn_error "zlib library not found in requested location $mt_zlib_search_libs" "$LINENO" 5
++                mt_zlib_library_status=missing
++                if test "" = "pass"; then
++                    { $as_echo "$as_me:${as_lineno-$LINENO}: zlib library not found in requested location $mt_zlib_search_libs" >&5
++$as_echo "$as_me: zlib library not found in requested location $mt_zlib_search_libs" >&6;}
++                else
++                    as_fn_error "zlib library not found in requested location $mt_zlib_search_libs" "$LINENO" 5
++                fi
 +
 +
 +fi
@@ -19197,7 +19218,7 @@ Patch that applies changes after `autoreconf -fi` is done.
 +
 +    if ((test "x${ZLIB_OPTION_ENABLED}" = xyes) &&
 +        (test "x${ZLIB_OPTION_REQUESTED}" = xyes) &&
-+        (test "x$mt_zlib_status" != xyes)); then
++        (test "x$mt_zlib_status" != xyes) && (test "" != "pass")); then
 +        as_fn_error "unable to configure zlib support" "$LINENO" 5
 +    fi
 +
@@ -19511,7 +19532,13 @@ Patch that applies changes after `autoreconf -fi` is done.
 +
 +else
 +
-+                as_fn_error "sqlite3 library not found in requested location $mt_sqlite3_search_libs" "$LINENO" 5
++                mt_sqlite3_library_status=missing
++                if test "" = "pass"; then
++                    { $as_echo "$as_me:${as_lineno-$LINENO}: sqlite3 library not found in requested location $mt_sqlite3_search_libs" >&5
++$as_echo "$as_me: sqlite3 library not found in requested location $mt_sqlite3_search_libs" >&6;}
++                else
++                    as_fn_error "sqlite3 library not found in requested location $mt_sqlite3_search_libs" "$LINENO" 5
++                fi
 +
 +
 +fi
@@ -19643,7 +19670,7 @@ Patch that applies changes after `autoreconf -fi` is done.
 +
 +    if ((test "x${SQLITE3_OPTION_ENABLED}" = xyes) &&
 +        (test "x${SQLITE3_OPTION_REQUESTED}" = xyes) &&
-+        (test "x$mt_sqlite3_status" != xyes)); then
++        (test "x$mt_sqlite3_status" != xyes) && (test "" != "pass")); then
 +        as_fn_error "unable to configure sqlite3 support" "$LINENO" 5
 +    fi
 +
@@ -20912,7 +20939,13 @@ Patch that applies changes after `autoreconf -fi` is done.
 +
 +else
 +
-+                as_fn_error "libmagic library not found in requested location $mt_libmagic_search_libs" "$LINENO" 5
++                mt_libmagic_library_status=missing
++                if test "" = "pass"; then
++                    { $as_echo "$as_me:${as_lineno-$LINENO}: libmagic library not found in requested location $mt_libmagic_search_libs" >&5
++$as_echo "$as_me: libmagic library not found in requested location $mt_libmagic_search_libs" >&6;}
++                else
++                    as_fn_error "libmagic library not found in requested location $mt_libmagic_search_libs" "$LINENO" 5
++                fi
 +
 +
 +fi
@@ -21125,7 +21158,13 @@ Patch that applies changes after `autoreconf -fi` is done.
 +
 +else
 +
-+                as_fn_error "zlib library not found in requested location $mt_zlib_search_libs" "$LINENO" 5
++                mt_zlib_library_status=missing
++                if test "" = "pass"; then
++                    { $as_echo "$as_me:${as_lineno-$LINENO}: zlib library not found in requested location $mt_zlib_search_libs" >&5
++$as_echo "$as_me: zlib library not found in requested location $mt_zlib_search_libs" >&6;}
++                else
++                    as_fn_error "zlib library not found in requested location $mt_zlib_search_libs" "$LINENO" 5
++                fi
 +
 +
 +fi
@@ -21420,7 +21459,13 @@ Patch that applies changes after `autoreconf -fi` is done.
 +
 +else
 +
-+                as_fn_error "libmagic library not found in requested location $mt_libmagic_search_libs" "$LINENO" 5
++                mt_libmagic_library_status=missing
++                if test "" = "pass"; then
++                    { $as_echo "$as_me:${as_lineno-$LINENO}: libmagic library not found in requested location $mt_libmagic_search_libs" >&5
++$as_echo "$as_me: libmagic library not found in requested location $mt_libmagic_search_libs" >&6;}
++                else
++                    as_fn_error "libmagic library not found in requested location $mt_libmagic_search_libs" "$LINENO" 5
++                fi
 +
 +
 +fi
@@ -21736,7 +21781,13 @@ Patch that applies changes after `autoreconf -fi` is done.
 +
 +else
 +
-+                as_fn_error "libmagic library not found in requested location $mt_libmagic_search_libs" "$LINENO" 5
++                mt_libmagic_library_status=missing
++                if test "" = "pass"; then
++                    { $as_echo "$as_me:${as_lineno-$LINENO}: libmagic library not found in requested location $mt_libmagic_search_libs" >&5
++$as_echo "$as_me: libmagic library not found in requested location $mt_libmagic_search_libs" >&6;}
++                else
++                    as_fn_error "libmagic library not found in requested location $mt_libmagic_search_libs" "$LINENO" 5
++                fi
 +
 +
 +fi
@@ -22507,7 +22558,13 @@ Patch that applies changes after `autoreconf -fi` is done.
 +
 +else
 +
-+                as_fn_error "id3lib library not found in requested location $mt_id3lib_search_libs" "$LINENO" 5
++                mt_id3lib_library_status=missing
++                if test "" = "pass"; then
++                    { $as_echo "$as_me:${as_lineno-$LINENO}: id3lib library not found in requested location $mt_id3lib_search_libs" >&5
++$as_echo "$as_me: id3lib library not found in requested location $mt_id3lib_search_libs" >&6;}
++                else
++                    as_fn_error "id3lib library not found in requested location $mt_id3lib_search_libs" "$LINENO" 5
++                fi
 +
 +
 +fi
@@ -22708,7 +22765,13 @@ Patch that applies changes after `autoreconf -fi` is done.
 +
 +else
 +
-+                as_fn_error "zlib library not found in requested location $mt_zlib_search_libs" "$LINENO" 5
++                mt_zlib_library_status=missing
++                if test "" = "pass"; then
++                    { $as_echo "$as_me:${as_lineno-$LINENO}: zlib library not found in requested location $mt_zlib_search_libs" >&5
++$as_echo "$as_me: zlib library not found in requested location $mt_zlib_search_libs" >&6;}
++                else
++                    as_fn_error "zlib library not found in requested location $mt_zlib_search_libs" "$LINENO" 5
++                fi
 +
 +
 +fi
@@ -22997,7 +23060,13 @@ Patch that applies changes after `autoreconf -fi` is done.
 +
 +else
 +
-+                as_fn_error "id3lib library not found in requested location $mt_id3lib_search_libs" "$LINENO" 5
++                mt_id3lib_library_status=missing
++                if test "" = "pass"; then
++                    { $as_echo "$as_me:${as_lineno-$LINENO}: id3lib library not found in requested location $mt_id3lib_search_libs" >&5
++$as_echo "$as_me: id3lib library not found in requested location $mt_id3lib_search_libs" >&6;}
++                else
++                    as_fn_error "id3lib library not found in requested location $mt_id3lib_search_libs" "$LINENO" 5
++                fi
 +
 +
 +fi
@@ -23295,7 +23364,13 @@ Patch that applies changes after `autoreconf -fi` is done.
 +
 +else
 +
-+                as_fn_error "id3lib library not found in requested location $mt_id3lib_search_libs" "$LINENO" 5
++                mt_id3lib_library_status=missing
++                if test "" = "pass"; then
++                    { $as_echo "$as_me:${as_lineno-$LINENO}: id3lib library not found in requested location $mt_id3lib_search_libs" >&5
++$as_echo "$as_me: id3lib library not found in requested location $mt_id3lib_search_libs" >&6;}
++                else
++                    as_fn_error "id3lib library not found in requested location $mt_id3lib_search_libs" "$LINENO" 5
++                fi
 +
 +
 +fi
@@ -24188,7 +24263,13 @@ Patch that applies changes after `autoreconf -fi` is done.
 +
 +else
 +
-+                as_fn_error "avformat library not found in requested location $mt_avformat_search_libs" "$LINENO" 5
++                mt_avformat_library_status=missing
++                if test "" = "pass"; then
++                    { $as_echo "$as_me:${as_lineno-$LINENO}: avformat library not found in requested location $mt_avformat_search_libs" >&5
++$as_echo "$as_me: avformat library not found in requested location $mt_avformat_search_libs" >&6;}
++                else
++                    as_fn_error "avformat library not found in requested location $mt_avformat_search_libs" "$LINENO" 5
++                fi
 +
 +
 +fi
@@ -24382,7 +24463,13 @@ Patch that applies changes after `autoreconf -fi` is done.
 +
 +else
 +
-+                as_fn_error "avutil library not found in requested location $mt_avutil_search_libs" "$LINENO" 5
++                mt_avutil_library_status=missing
++                if test "" = "pass"; then
++                    { $as_echo "$as_me:${as_lineno-$LINENO}: avutil library not found in requested location $mt_avutil_search_libs" >&5
++$as_echo "$as_me: avutil library not found in requested location $mt_avutil_search_libs" >&6;}
++                else
++                    as_fn_error "avutil library not found in requested location $mt_avutil_search_libs" "$LINENO" 5
++                fi
 +
 +
 +fi
@@ -24533,7 +24620,7 @@ Patch that applies changes after `autoreconf -fi` is done.
 +
 +
 +else
-+    if test "x$FFMPEG_OPTIEON_REQUESTED" = xyes; then
++    if test "x$FFMPEG_OPTION_REQUESTED" = xyes; then
 +        as_fn_error "unable to configure ffmpeg support" "$LINENO" 5
 +    fi
 +fi
@@ -24609,6 +24696,359 @@ Patch that applies changes after `autoreconf -fi` is done.
 +else
 +
 +                mt_ffmpegthumbnailer_header_status=missing
++                if test "pass" = "pass"; then
++                    { $as_echo "$as_me:${as_lineno-$LINENO}: ffmpegthumbnailer headers not found in requested location $mt_ffmpegthumbnailer_search_headers" >&5
++$as_echo "$as_me: ffmpegthumbnailer headers not found in requested location $mt_ffmpegthumbnailer_search_headers" >&6;}
++                else
++                    as_fn_error "ffmpegthumbnailer headers not found in requested location $mt_ffmpegthumbnailer_search_headers" "$LINENO" 5
++                fi
++
++
++fi
++
++
++    else
++        unset ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h
++        ac_fn_cxx_check_header_mongrel "$LINENO" "libffmpegthumbnailer/videothumbnailerc.h" "ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h" "$ac_includes_default"
++if test "x$ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h" = x""yes; then :
++
++else
++
++                CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
++                CXXFLAGS="$CXXFLAGS -I$MT_SEARCHPATH_HEADERS"
++                CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
++                unset ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h
++                as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h" | $as_tr_sh`
++ac_fn_cxx_check_header_mongrel "$LINENO" "$MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
++
++                        mt_ffmpegthumbnailer_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
++
++else
++
++                        mt_ffmpegthumbnailer_header_status=missing
++
++
++fi
++
++
++
++
++fi
++
++
++    fi
++
++    if test "x$mt_ffmpegthumbnailer_header_status" != xyes; then
++        mt_ffmpegthumbnailer_cxxflags=""
++    fi
++
++    LIBS=$LIBS_SAVE
++    LDFLAGS=$LDFLAGS_SAVE
++    CFLAGS=$CFLAGS_SAVE
++    CXXFLAGS=$CXXFLAGS_SAVE
++    CPPFLAGS=$CPPFLAGS_SAVE
++
++    mt_ffmpegthumbnailer_package_status=${mt_ffmpegthumbnailer_header_status}
++
++    if test "x$mt_ffmpegthumbnailer_package_status" = xyes; then
++
++    mt_ffmpegthumbnailer_arg_default=yes
++    mt_ffmpegthumbnailer_library_status=yes
++
++    LIBS_SAVE=$LIBS
++    LDFLAGS_SAVE=$LDFLAGS
++    CFLAGS_SAVE=$CFLAGS
++    CXXFLAGS_SAVE=$CXXFLAGS
++    CPPFLAGS_SAVE=$CPPFLAGS
++
++
++# Check whether --with-ffmpegthumbnailer-libs was given.
++if test "${with_ffmpegthumbnailer_libs+set}" = set; then :
++  withval=$with_ffmpegthumbnailer_libs;
++            mt_ffmpegthumbnailer_search_libs="$withval"
++            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for ffmpegthumbnailer libs in $withval" >&5
++$as_echo "$as_me: Will search for ffmpegthumbnailer libs in $withval" >&6;}
++
++
++fi
++
++
++    if test "$mt_ffmpegthumbnailer_search_libs" ; then
++        unset ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create
++        LDFLAGS="$LDFLAGS -L$mt_ffmpegthumbnailer_search_libs"
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for video_thumbnailer_create in -lffmpegthumbnailer" >&5
++$as_echo_n "checking for video_thumbnailer_create in -lffmpegthumbnailer... " >&6; }
++if test "${ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lffmpegthumbnailer  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char video_thumbnailer_create ();
++int
++main ()
++{
++return video_thumbnailer_create ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_link "$LINENO"; then :
++  ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create=yes
++else
++  ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create" >&5
++$as_echo "$ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create" >&6; }
++if test "x$ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create" = x""yes; then :
++
++                mt_ffmpegthumbnailer_libs="-lffmpegthumbnailer"
++                mt_ffmpegthumbnailer_ldflags="-L$mt_ffmpegthumbnailer_search_libs"
++
++else
++
++                mt_ffmpegthumbnailer_library_status=missing
++                if test "pass" = "pass"; then
++                    { $as_echo "$as_me:${as_lineno-$LINENO}: ffmpegthumbnailer library not found in requested location $mt_ffmpegthumbnailer_search_libs" >&5
++$as_echo "$as_me: ffmpegthumbnailer library not found in requested location $mt_ffmpegthumbnailer_search_libs" >&6;}
++                else
++                    as_fn_error "ffmpegthumbnailer library not found in requested location $mt_ffmpegthumbnailer_search_libs" "$LINENO" 5
++                fi
++
++
++fi
++
++    else
++        unset ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for video_thumbnailer_create in -lffmpegthumbnailer" >&5
++$as_echo_n "checking for video_thumbnailer_create in -lffmpegthumbnailer... " >&6; }
++if test "${ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lffmpegthumbnailer  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char video_thumbnailer_create ();
++int
++main ()
++{
++return video_thumbnailer_create ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_link "$LINENO"; then :
++  ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create=yes
++else
++  ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create" >&5
++$as_echo "$ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create" >&6; }
++if test "x$ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create" = x""yes; then :
++
++                mt_ffmpegthumbnailer_libs="-lffmpegthumbnailer"
++
++else
++
++                LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
++                unset ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create
++                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for video_thumbnailer_create in -lffmpegthumbnailer" >&5
++$as_echo_n "checking for video_thumbnailer_create in -lffmpegthumbnailer... " >&6; }
++if test "${ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lffmpegthumbnailer  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char video_thumbnailer_create ();
++int
++main ()
++{
++return video_thumbnailer_create ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_link "$LINENO"; then :
++  ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create=yes
++else
++  ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create" >&5
++$as_echo "$ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create" >&6; }
++if test "x$ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create" = x""yes; then :
++
++                        mt_ffmpegthumbnailer_libs="-lffmpegthumbnailer"
++                        mt_ffmpegthumbnailer_ldflags="-L$MT_SEARCHPATH_LIBS"
++
++else
++
++                        mt_ffmpegthumbnailer_library_status=missing
++
++
++fi
++
++
++
++fi
++
++    fi
++
++    if test "x$mt_ffmpegthumbnailer_library_status" != xyes; then
++        mt_ffmpegthumbnailer_libs=""
++        mt_ffmpegthumbnailer_ldflags=""
++    fi
++
++    LIBS=$LIBS_SAVE
++    LDFLAGS=$LDFLAGS_SAVE
++    CFLAGS=$CFLAGS_SAVE
++    CXXFLAGS=$CXXFLAGS_SAVE
++    CPPFLAGS=$CPPFLAGS_SAVE
++
++        mt_ffmpegthumbnailer_package_status=${mt_ffmpegthumbnailer_library_status}
++    fi
++
++    if test "x$mt_ffmpegthumbnailer_package_status" = xyes; then
++        FFMPEGTHUMBNAILER_CFLAGS=${mt_ffmpegthumbnailer_cxxflags}
++        FFMPEGTHUMBNAILER_LIBS=${mt_ffmpegthumbnailer_libs}
++        FFMPEGTHUMBNAILER_LDFLAGS=${mt_ffmpegthumbnailer_ldflags}
++    fi
++
++        mt_ffmpegthumbnailer_status=${mt_ffmpegthumbnailer_package_status}
++    else
++        mt_ffmpegthumbnailer_status=disabled
++    fi
++
++    if ((test "x${FFMPEGTHUMBNAILER_OPTION_ENABLED}" = xyes) &&
++        (test "x${FFMPEGTHUMBNAILER_OPTION_REQUESTED}" = xyes) &&
++        (test "x$mt_ffmpegthumbnailer_status" != xyes) && (test "pass" != "pass")); then
++        as_fn_error "unable to configure ffmpegthumbnailer support" "$LINENO" 5
++    fi
++
++    if test "x$mt_ffmpegthumbnailer_status" = xyes; then
++
++$as_echo "#define HAVE_FFMPEGTHUMBNAILER 1" >>confdefs.h
++
++    fi
++
++    FFMPEGTHUMBNAILER_STATUS=${mt_ffmpegthumbnailer_status}
++
++
++
++
++
++
++
++if (test "x$FFMPEGTHUMBNAILER_STATUS" != xyes); then
++
++    mt_ffmpegthumbnailer_status=yes
++
++
++
++    mt_ffmpegthumbnailer_option_enabled=
++    mt_ffmpegthumbnailer_option_requested=no
++    if test "xdisable" = xdisable; then
++        mt_ffmpegthumbnailer_option_enabled=yes
++    else
++        mt_ffmpegthumbnailer_option_enabled=no
++    fi
++
++    # Check whether --enable-ffmpegthumbnailer was given.
++if test "${enable_ffmpegthumbnailer+set}" = set; then :
++  enableval=$enable_ffmpegthumbnailer;
++            mt_ffmpegthumbnailer_option_enabled=$enableval
++            mt_ffmpegthumbnailer_option_requested=yes
++
++
++fi
++
++
++    FFMPEGTHUMBNAILER_OPTION_ENABLED=${mt_ffmpegthumbnailer_option_enabled}
++    FFMPEGTHUMBNAILER_OPTION_REQUESTED=${mt_ffmpegthumbnailer_option_requested}
++
++
++
++
++    if test "x${mt_ffmpegthumbnailer_option_enabled}" = xyes; then :
++
++fi
++
++    if test "x${FFMPEGTHUMBNAILER_OPTION_ENABLED}" = xyes; then
++
++
++    LIBS_SAVE=$LIBS
++    LDFLAGS_SAVE=$LDFLAGS
++    CFLAGS_SAVE=$CFLAGS
++    CXXFLAGS_SAVE=$CXXFLAGS
++    CPPFLAGS_SAVE=$CPPFLAGS
++
++    mt_ffmpegthumbnailer_header_status=yes
++
++
++# Check whether --with-ffmpegthumbnailer-h was given.
++if test "${with_ffmpegthumbnailer_h+set}" = set; then :
++  withval=$with_ffmpegthumbnailer_h;
++            mt_ffmpegthumbnailer_search_headers="$withval"
++            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for ffmpegthumbnailer headers in $withval" >&5
++$as_echo "$as_me: Will search for ffmpegthumbnailer headers in $withval" >&6;}
++
++
++fi
++
++
++    if test "$mt_ffmpegthumbnailer_search_headers" ; then
++        unset ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h
++        CFLAGS="$CFLAGS -I${mt_ffmpegthumbnailer_search_headers}"
++        CXXFLAGS="$CXXFLAGS -I${mt_ffmpegthumbnailer_search_headers}"
++        CPPFLAGS="$CPPFLAGS -I${mt_ffmpegthumbnailer_search_headers}"
++        as_ac_Header=`$as_echo "ac_cv_header_$mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h" | $as_tr_sh`
++ac_fn_cxx_check_header_mongrel "$LINENO" "$mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
++
++                mt_ffmpegthumbnailer_cxxflags="-I${mt_ffmpegthumbnailer_search_headers}"
++
++else
++
++                mt_ffmpegthumbnailer_header_status=missing
 +                if test "" = "pass"; then
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: ffmpegthumbnailer headers not found in requested location $mt_ffmpegthumbnailer_search_headers" >&5
 +$as_echo "$as_me: ffmpegthumbnailer headers not found in requested location $mt_ffmpegthumbnailer_search_headers" >&6;}
@@ -24734,7 +25174,13 @@ Patch that applies changes after `autoreconf -fi` is done.
 +
 +else
 +
-+                as_fn_error "ffmpegthumbnailer library not found in requested location $mt_ffmpegthumbnailer_search_libs" "$LINENO" 5
++                mt_ffmpegthumbnailer_library_status=missing
++                if test "" = "pass"; then
++                    { $as_echo "$as_me:${as_lineno-$LINENO}: ffmpegthumbnailer library not found in requested location $mt_ffmpegthumbnailer_search_libs" >&5
++$as_echo "$as_me: ffmpegthumbnailer library not found in requested location $mt_ffmpegthumbnailer_search_libs" >&6;}
++                else
++                    as_fn_error "ffmpegthumbnailer library not found in requested location $mt_ffmpegthumbnailer_search_libs" "$LINENO" 5
++                fi
 +
 +
 +fi
@@ -24866,7 +25312,7 @@ Patch that applies changes after `autoreconf -fi` is done.
 +
 +    if ((test "x${FFMPEGTHUMBNAILER_OPTION_ENABLED}" = xyes) &&
 +        (test "x${FFMPEGTHUMBNAILER_OPTION_REQUESTED}" = xyes) &&
-+        (test "x$mt_ffmpegthumbnailer_status" != xyes)); then
++        (test "x$mt_ffmpegthumbnailer_status" != xyes) && (test "" != "pass")); then
 +        as_fn_error "unable to configure ffmpegthumbnailer support" "$LINENO" 5
 +    fi
 +
@@ -24884,6 +25330,13 @@ Patch that applies changes after `autoreconf -fi` is done.
 +
 +
 +
++    if (test "x$FFMPEGTHUMBNAILER_STATUS" = xyes); then
++
++$as_echo "#define FFMPEGTHUMBNAILER_OLD_API 1" >>confdefs.h
++
++    fi
++fi
++
 +if ((test "x$FFMPEG_STATUS" != xyes) && (test "x$FFMPEGTHUMBNAILER_STATUS" = xyes)); then
 +    if test "x$FFMPEGTHUMBNAILER_OPTION_REQUESTED" = xyes; then
 +      as_fn_error "ffmpeg libraries are required in order to use ffmpegthumbnailer" "$LINENO" 5
@@ -25070,7 +25523,13 @@ Patch that applies changes after `autoreconf -fi` is done.
 +
 +else
 +
-+                as_fn_error "libextractor library not found in requested location $mt_libextractor_search_libs" "$LINENO" 5
++                mt_libextractor_library_status=missing
++                if test "" = "pass"; then
++                    { $as_echo "$as_me:${as_lineno-$LINENO}: libextractor library not found in requested location $mt_libextractor_search_libs" >&5
++$as_echo "$as_me: libextractor library not found in requested location $mt_libextractor_search_libs" >&6;}
++                else
++                    as_fn_error "libextractor library not found in requested location $mt_libextractor_search_libs" "$LINENO" 5
++                fi
 +
 +
 +fi
@@ -25421,7 +25880,13 @@ Patch that applies changes after `autoreconf -fi` is done.
 +
 +else
 +
-+                as_fn_error "libexif library not found in requested location $mt_libexif_search_libs" "$LINENO" 5
++                mt_libexif_library_status=missing
++                if test "" = "pass"; then
++                    { $as_echo "$as_me:${as_lineno-$LINENO}: libexif library not found in requested location $mt_libexif_search_libs" >&5
++$as_echo "$as_me: libexif library not found in requested location $mt_libexif_search_libs" >&6;}
++                else
++                    as_fn_error "libexif library not found in requested location $mt_libexif_search_libs" "$LINENO" 5
++                fi
 +
 +
 +fi
@@ -25553,7 +26018,7 @@ Patch that applies changes after `autoreconf -fi` is done.
 +
 +    if ((test "x${LIBEXIF_OPTION_ENABLED}" = xyes) &&
 +        (test "x${LIBEXIF_OPTION_REQUESTED}" = xyes) &&
-+        (test "x$mt_libexif_status" != xyes)); then
++        (test "x$mt_libexif_status" != xyes) && (test "" != "pass")); then
 +        as_fn_error "unable to configure libexif support" "$LINENO" 5
 +    fi
 +
@@ -25823,7 +26288,13 @@ Patch that applies changes after `autoreconf -fi` is done.
 +
 +else
 +
-+                as_fn_error "expat library not found in requested location $mt_expat_search_libs" "$LINENO" 5
++                mt_expat_library_status=missing
++                if test "" = "pass"; then
++                    { $as_echo "$as_me:${as_lineno-$LINENO}: expat library not found in requested location $mt_expat_search_libs" >&5
++$as_echo "$as_me: expat library not found in requested location $mt_expat_search_libs" >&6;}
++                else
++                    as_fn_error "expat library not found in requested location $mt_expat_search_libs" "$LINENO" 5
++                fi
 +
 +
 +fi
@@ -26162,7 +26633,13 @@ Patch that applies changes after `autoreconf -fi` is done.
 +
 +else
 +
-+                as_fn_error "libmp4v2 library not found in requested location $mt_libmp4v2_search_libs" "$LINENO" 5
++                mt_libmp4v2_library_status=missing
++                if test "" = "pass"; then
++                    { $as_echo "$as_me:${as_lineno-$LINENO}: libmp4v2 library not found in requested location $mt_libmp4v2_search_libs" >&5
++$as_echo "$as_me: libmp4v2 library not found in requested location $mt_libmp4v2_search_libs" >&6;}
++                else
++                    as_fn_error "libmp4v2 library not found in requested location $mt_libmp4v2_search_libs" "$LINENO" 5
++                fi
 +
 +
 +fi
@@ -26294,7 +26771,7 @@ Patch that applies changes after `autoreconf -fi` is done.
 +
 +    if ((test "x${LIBMP4V2_OPTION_ENABLED}" = xyes) &&
 +        (test "x${LIBMP4V2_OPTION_REQUESTED}" = xyes) &&
-+        (test "x$mt_libmp4v2_status" != xyes)); then
++        (test "x$mt_libmp4v2_status" != xyes) && (test "" != "pass")); then
 +        as_fn_error "unable to configure libmp4v2 support" "$LINENO" 5
 +    fi
 +
diff --git a/debian/patches/ffmpegthumbnailer-2.0.patch b/debian/patches/ffmpegthumbnailer-2.0.patch
new file mode 100644
index 0000000..ccef51e
--- /dev/null
+++ b/debian/patches/ffmpegthumbnailer-2.0.patch
@@ -0,0 +1,151 @@
+Upstream patch that allows mediatomb to be built with new ffmpegthumbnailer 2.0
+library
+==========================================================================
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -266,6 +266,7 @@
+ # $1 with parameter/package name
+ # $2 library name
+ # $3 function name
++# $4 "pass" if requested option failed
+ # 
+ # returns:
+ #   mt_$1_library_status
+@@ -300,7 +301,12 @@
+                 mt_$1_ldflags="-L$mt_$1_search_libs"
+             ],
+             [
+-                AC_MSG_ERROR([$1 library not found in requested location $mt_$1_search_libs])
++                mt_$1_library_status=missing
++                if test "$4" = "pass"; then
++                    AC_MSG_NOTICE([$1 library not found in requested location $mt_$1_search_libs])
++                else
++                    AC_MSG_ERROR([$1 library not found in requested location $mt_$1_search_libs])
++                fi
+             ]
+         )
+     else
+@@ -418,6 +424,7 @@
+ # $2 header name (without .h extension)
+ # $3 library name
+ # $4 function name
++# $5 "pass" if requestd options failed
+ #
+ # returns:
+ #   mt_$1_package_status
+@@ -427,11 +434,11 @@
+    
+ AC_DEFUN([MT_CHECK_PACKAGE_INTERNAL],
+ [
+-    MT_CHECK_HEADER_INTERNAL([$1], [$2])
++    MT_CHECK_HEADER_INTERNAL([$1], [$2], [$5])
+     mt_$1_package_status=${mt_$1_header_status}
+   
+     if test "x$mt_$1_package_status" = xyes; then 
+-        MT_CHECK_LIBRARY_INTERNAL([$1], [$3], [$4])
++        MT_CHECK_LIBRARY_INTERNAL([$1], [$3], [$4], [$5])
+         mt_$1_package_status=${mt_$1_library_status}
+     fi
+     
+@@ -486,6 +493,7 @@
+ # $4 header name (without .h)
+ # $5 library name
+ # $6 function name
++# $7 "pass" on requested options
+ # returns substed:
+ #   $1_STATUS
+ #   $1_LDFLAGS
+@@ -499,7 +507,7 @@
+     MT_OPTION([$1], [$2], [$3],[],[])
+ 
+     if test "x${translit($1, `a-z/.-', `A-Z___')_OPTION_ENABLED}" = xyes; then
+-        MT_CHECK_PACKAGE_INTERNAL([$1], [$4], [$5], [$6])
++        MT_CHECK_PACKAGE_INTERNAL([$1], [$4], [$5], [$6], [$7])
+         mt_$1_status=${mt_$1_package_status}
+     else
+         mt_$1_status=disabled
+@@ -507,7 +515,7 @@
+     
+     if ((test "x${translit($1, `a-z/.-', `A-Z___')_OPTION_ENABLED}" = xyes) &&
+         (test "x${translit($1, `a-z/.-', `A-Z___')_OPTION_REQUESTED}" = xyes) &&
+-        (test "x$mt_$1_status" != xyes)); then
++        (test "x$mt_$1_status" != xyes) && (test "$7" != "pass")); then
+         AC_MSG_ERROR([unable to configure $1 support])
+     fi
+ 
+--- a/configure.ac
++++ b/configure.ac
+@@ -1543,7 +1543,7 @@
+     AC_SUBST(FFMPEG_LDFLAGS)
+     AC_SUBST(FFMPEG_LIBS)
+ else
+-    if test "x$FFMPEG_OPTIEON_REQUESTED" = xyes; then
++    if test "x$FFMPEG_OPTION_REQUESTED" = xyes; then
+         AC_MSG_ERROR(unable to configure ffmpeg support)
+     fi
+ fi
+@@ -1551,8 +1551,19 @@
+ MT_CHECK_OPTIONAL_PACKAGE([ffmpegthumbnailer], [disable], 
+         [compile with ffmpegthumbnailer support for video thumbnail generation],
+         [libffmpegthumbnailer/videothumbnailerc], 
++        [ffmpegthumbnailer], [video_thumbnailer_create], [pass])
++
++if (test "x$FFMPEGTHUMBNAILER_STATUS" != xyes); then
++    MT_CHECK_OPTIONAL_PACKAGE([ffmpegthumbnailer], [disable], 
++        [compile with ffmpegthumbnailer support for video thumbnail generation],
++        [libffmpegthumbnailer/videothumbnailerc], 
+         [ffmpegthumbnailer], [create_thumbnailer])
+ 
++    if (test "x$FFMPEGTHUMBNAILER_STATUS" = xyes); then
++        AC_DEFINE([FFMPEGTHUMBNAILER_OLD_API], [1], [use ffmpegthumbnailer API])
++    fi
++fi
++
+ if ((test "x$FFMPEG_STATUS" != xyes) && (test "x$FFMPEGTHUMBNAILER_STATUS" = xyes)); then
+     if test "x$FFMPEGTHUMBNAILER_OPTION_REQUESTED" = xyes; then
+       AC_MSG_ERROR([ffmpeg libraries are required in order to use ffmpegthumbnailer])
+--- a/src/metadata/ffmpeg_handler.cc
++++ b/src/metadata/ffmpeg_handler.cc
+@@ -288,8 +288,14 @@
+     if (!cfg->getBoolOption(CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_ENABLED))
+         return nil;
+ 
++#ifdef FFMPEGTHUMBNAILER_OLD_API
+     video_thumbnailer *th = create_thumbnailer();
+     image_data *img = create_image_data();
++#else
++    video_thumbnailer *th = video_thumbnailer_create();
++    image_data *img = video_thumbnailer_create_image_data();
++#endif // old api
++
+ 
+     th->seek_percentage        = cfg->getIntOption(CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_SEEK_PERCENTAGE);
+ 
+@@ -302,14 +308,26 @@
+     th->thumbnail_image_type   = Jpeg;
+ 
+     log_debug("Generating thumbnail for file: %s\n", item->getLocation().c_str());
++
++#ifdef FFMPEGTHUMBNAILER_OLD_API
+     if (generate_thumbnail_to_buffer(th, item->getLocation().c_str(), img) != 0)
+-        throw _Exception(_("Could not generate thumbnail for ") + item->getLocation());
++#else
++    if (video_thumbnailer_generate_thumbnail_to_buffer(th, 
++                                         item->getLocation().c_str(), img) != 0)
++#endif // old api
++        throw _Exception(_("Could not generate thumbnail for ") + 
++                item->getLocation());
+ 
+     *data_size = (off_t)img->image_data_size;
+     Ref<IOHandler> h(new MemIOHandler((void *)img->image_data_ptr, 
+                                               img->image_data_size));
++#ifdef FFMPEGTHUMBNAILER_OLD_API
+     destroy_image_data(img);
+     destroy_thumbnailer(th);
++#else
++    video_thumbnailer_destroy_image_data(img);
++    video_thumbnailer_destroy(th);
++#endif// old api
+     return h;
+ #else
+     return nil;
diff --git a/debian/patches/series b/debian/patches/series
index d262ca8..7ad2277 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
-autoreconf_-fi.patch
 debug-mode-fix.patch
 config_xml_comment.patch
 service-id_fix.patch
 const_char_conversion.patch
+ffmpegthumbnailer-2.0.patch
+autoreconf_-fi.patch

-- 
MediaTomb packaging



More information about the pkg-multimedia-commits mailing list