[SCM] gmerlin-avdecoder packaging branch, master, updated. upstream/1.0.3-19-gfd24ec5

[zmoelnig-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e4874c799a8331c4a89706a1b8260d7dfb475ffd
Author: IOhannes m zmölnig <zmoelnig at umlaeute.mur.at>
Date:   Sat Aug 14 18:34:21 2010 +0200

    fix for missing DVDInit/DVDFinish
    
    backported fix from upstream for libdvdread that don't provide
    DVDInit/DVDFinish

diff --git a/debian/patches/fix_dvdread_configure.patch b/debian/patches/fix_dvdread_configure.patch
index dc9ad48..9bb5bfa 100644
--- a/debian/patches/fix_dvdread_configure.patch
+++ b/debian/patches/fix_dvdread_configure.patch
@@ -1,6 +1,6 @@
 Fix dvdread detection.
---- a/m4/check_funcs.m4
-+++ b/m4/check_funcs.m4
+--- gmerlin-avdecoder.orig/m4/check_funcs.m4
++++ gmerlin-avdecoder/m4/check_funcs.m4
 @@ -945,11 +945,7 @@
      #include <stdio.h>
      main()
@@ -13,3 +13,41 @@ Fix dvdread detection.
      }
    ],
    [
+@@ -964,6 +960,10 @@
+     AC_MSG_RESULT(no)
+ )
+ 
++if test "x$have_dvdread" = "xtrue"; then
++ AC_CHECK_FUNCS(DVDInit DVDFinish)
++fi
++
+ CFLAGS=$OLD_CFLAGS
+ LIBS=$OLD_LIBS
+ 
+--- gmerlin-avdecoder.orig/lib/in_dvd.c
++++ gmerlin-avdecoder/lib/in_dvd.c
+@@ -1250,19 +1250,24 @@
+ 
+ #if defined(__GNUC__) && defined(__ELF__)
+ 
++#ifdef HAVE_DVDFINISH
+ static void __cleanup() __attribute__ ((destructor));
+  
+ static void __cleanup()
+   {
+   DVDFinish();
+   }
++#endif
+ 
++#ifdef HAVE_DVDINIT
+ static void __init() __attribute__ ((constructor));
+  
+ static void __init()
+   {
+   DVDInit();
+   }
++#endif
++
+ 
+ #endif
+ 

-- 
gmerlin-avdecoder packaging