Fix ffmpeg linking with sws_getContext by adding -lswscale to FFMPEGLIBS, and fix up ffmpeg's configure checks as well

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1138 32389bae-6d03-0410-99cf-db05cde120eb

3 files changed, 59 insertions, 8 deletions

diff --git a/sci-libs/opencv/ChangeLog b/sci-libs/opencv/ChangeLog
index cabf9c1ab..ffa038ea3 100644
--- a/sci-libs/opencv/ChangeLog
+++ b/sci-libs/opencv/ChangeLog
@@ -4,6 +4,11 @@
 
   12 Jun 2008; Thomas Anderson (gentoofan23) <gentoofan23@gmail.com>
   ChangeLog:
+  Fix ffmpeg linking with sws_getContext by adding -lswscale to FFMPEGLIBS,
+  and fix up ffmpeg's configure checks as well
+
+  12 Jun 2008; Thomas Anderson (gentoofan23) <gentoofan23@gmail.com>
+  ChangeLog:
   Add demos USE flag for sample opencv applications, change to a better
   format(unified) for the cvcapffmpeg patch
 
diff --git a/sci-libs/opencv/Manifest b/sci-libs/opencv/Manifest
index 11c18becc..7ad6fb5f6 100644
--- a/sci-libs/opencv/Manifest
+++ b/sci-libs/opencv/Manifest
@@ -1,9 +1,9 @@
-AUX opencv-1.0.0-automagicdependencies.patch 16847 RMD160 2c2a0a24b2f81ac67cab19fb5b9e2bbca90012f4 SHA1 0f094ed964003253f3b78423ff0a5483371aa0a2 SHA256 4ec70684d2c138891a04dc931df6a050a33b10744f2acdd998f02b9370edeeaf
+AUX opencv-1.0.0-automagicdependencies.patch 19266 RMD160 cd959401b1016a217241d3233a9ab35f4224ff91 SHA1 0974b4da4d5d2d4878f037fa62d6cdf298db75e1 SHA256 7ecd67468c8e0817391093318729f565429358916815949ffbddc05fe98b7af0
 AUX opencv-1.0.0-cvcapffmpegundefinedsymbols.patch 2762 RMD160 cd6d3624205ecc69e5513d0e7424d85c3ea4d932 SHA1 c31d0fe278e1e7f005c668255214ec204a1d70d8 SHA256 90fc7035d3084f71319eea5a33f8440522e93dd5ec090a89fdd36a4bd84cb8ee
 AUX opencv-1.0.0-enableuseflags.patch 5107 RMD160 fb23cfe9ff83be4196f85448d462409e29797bf3 SHA1 9ad3158e2e5b0f84b13269bf9944b3753baab1c9 SHA256 af59706ebe8a4529366cfb335e4d8a2e17f9ab07127455a624df54876130e153
 AUX opencv-1.0.0-fixpythonmultilib.patch 423 RMD160 a3cdb0c1a25b4f8ab8447ac6e4776ade2daad458 SHA1 f3d43b10b5cdfd77ce50cfea7cf9c1431479c5de SHA256 317750f75417b5e2434c09f8244d347c7340eebe721579c7f39639b526af61fb
 AUX opencv-1.0.0-havepngexrdefs.patch 1869 RMD160 477e487f34c9ebdc8e7666d2d6c7369a44bde7ed SHA1 9c7df4269887a5d5d3e2a4b17840f168098224f2 SHA256 5b077c9958d1699ec8b1d1c952f90d2830d4a4f9b0fe7a01a21747a6280f12d6
 DIST opencv-1.0.0.tar.gz 11146334 RMD160 f041798ea63101b90e945957e0d0ad3f7497dcd4 SHA1 c7dd500703b0060cedfa049fcb33de0846e631fb SHA256 3a6ee888e4dd4ab7f2bc80d046688c099c6a95d1267af554b7c8f1543b66f21e
 EBUILD opencv-1.0.0-r1.ebuild 2335 RMD160 8888536e007cba11fd742767d3f2a04320678290 SHA1 521328a2a3889be4ed5f3a00a8381e8ae6e6e638 SHA256 79fa69fbef90fd7966b9afbf4a18453f9b15884adbcae50aa521cd8d88dee42a
-MISC ChangeLog 570 RMD160 37d1281f608069296d5b38061fea7c2ae36b7ac3 SHA1 27e467426c61805075b18940de7c733eb5c3c19c SHA256 d63feb1d6a74bb5dfcca082319fa83792b7961f7e50758103176b45622a4d735
+MISC ChangeLog 776 RMD160 ded24d0132e7c7c967e76d76fa7cb6c265c1c05f SHA1 eddfa62eab801235b3b31845861627a037b47a62 SHA256 842512b8daf17e52e530acdcd6e516b1f9ded1b4496138a2822d2397001d5068
 MISC metadata.xml 691 RMD160 759e574f771a8d57512b84db50a97acec7ba6a78 SHA1 9faa300f7489783893ac6684198d75c90600ae31 SHA256 d79926876ff2fdc9c9ef5a8660fee8959d05b9605db49651b2cd4fb360fd3696
diff --git a/sci-libs/opencv/files/opencv-1.0.0-automagicdependencies.patch b/sci-libs/opencv/files/opencv-1.0.0-automagicdependencies.patch
index bcc14aaed..2104c9f57 100644
--- a/sci-libs/opencv/files/opencv-1.0.0-automagicdependencies.patch
+++ b/sci-libs/opencv/files/opencv-1.0.0-automagicdependencies.patch
@@ -1,5 +1,5 @@
 --- opencv-1.0.0-orig/configure.in	2006-11-03 10:54:33.000000000 -0500
-+++ opencv-1.0.0/configure.in	2008-06-12 10:36:29.000000000 -0400
++++ opencv-1.0.0/configure.in	2008-06-12 14:25:31.000000000 -0400
 @@ -20,7 +20,6 @@
  AC_INIT([opencv],[opencv_version],[opencvlibrary-devel@lists.sourceforge.net])
  AC_CONFIG_SRCDIR([opencv.pc.in])
@@ -116,7 +116,53 @@
  
      # check other ./configure flags
      if test x"$with_ffmpeg" = "xyes"; then
-@@ -460,92 +475,47 @@
+@@ -423,129 +438,62 @@
+ AC_SUBST(XINE_LIBS)
+ AM_CONDITIONAL([BUILD_XINE], [test x"$have_xine" = "xyes"])
+ 
+-# unfortunately, xine does not feature video writing,
+-# so we have to resort to FFMPEG here
+-if test x"$with_ffmpeg" = "xno"; then
+-    have_ffmpeg=no
+-    # FFMPEGLIBS=""
+-else
+-
+-    # check if ./configure arguments are valid
+-    if test x"$with_ffmpeg" = "xauto"; then
+-       with_ffmpeg=yes
+-    fi
+-    if test x"$with_ffmpeg" = "xyes"; then
+-        AC_CHECK_HEADER(ffmpeg/avcodec.h,
+-                        AC_CHECK_LIB(avcodec, avcodec_decode_video,
+-                                     [
+-                                       AC_CHECK_LIB(avformat, av_open_input_file,
+-                                                    [
+-                                                      have_ffmpeg=yes
+-                                                      AC_DEFINE(HAVE_FFMPEG,,[FFMpeg video library])
+-                                                      FFMPEGLIBS="-lavcodec -lavformat"
+-                                                    ],
+-                                                    [ have_ffmpeg=no ],
+-                                                    [-lavcodec])
+-                                     ],
+-                                     [ have_ffmpeg=no ]),
+-                        [ have_ffmpeg=no ])
+-    else
+-        # if we get here then --with-ffmpeg was not called with 'yes','no' or 'auto'
+-        AC_MSG_WARN([unexpected arguments for option --with-ffmpeg, continuing assuming 'no'])
+-        have_ffmpeg=no
+-    fi
++if test x"$with_ffmpeg" = x"yes"; then
++        AC_CHECK_HEADER(ffmpeg/avcodec.h,, [AC_MSG_ERROR([FFmpeg requested but header file ffmpeg/avcodec.h not found])])
++        AC_CHECK_HEADER(ffmpeg/swscale.h,, [AC_MSG_ERROR([FFmpeg requested but header file ffmpeg/swscale.h not found])])
++        AC_CHECK_LIB(avcodec, avcodec_decode_video,, [AC_MSG_ERROR([FFmpeg requested but ffmpeg libraries not found])])
++        AC_CHECK_LIB(avformat, av_open_input_file,, [AC_MSG_ERROR([FFmpeg requested but ffmpeg libraries not found])])
++        AC_CHECK_LIB(swscale, sws_getContext,, [AC_MSG_ERROR([FFmpeg requested but ffmpeg libraries not found])])
++        AC_DEFINE(HAVE_FFMPEG,,[FFMpeg video library])
++        FFMPEGLIBS="-lavcodec -lavformat -lswscale"
++        have_ffmpeg=yes
+ fi
+ AC_SUBST(FFMPEGLIBS)
+ AM_CONDITIONAL([BUILD_FFMPEG], [test x"$have_ffmpeg" = "xyes"])
  
  # IEEE1394 / FireWire video video i/o with libdc1394, libraw1394
  # (can be managed by QuickTime as well)
@@ -240,7 +286,7 @@
  fi
  AM_CONDITIONAL([BUILD_V4L], [test x"$have_v4l1or2" = "xyes"])
  
-@@ -558,78 +528,86 @@
+@@ -558,78 +506,86 @@
  
  AC_SUBST(IMAGELIBS)
  
@@ -399,7 +445,7 @@
  
  # Restore original LIBS settings...
  LIBS="$SAVELIBS"
-@@ -690,7 +668,7 @@
+@@ -690,7 +646,7 @@
  AM_CONDITIONAL([BUILD_PYTHON_WRAPPERS], [test x"$have_python" = "xyes"])
  
  # check for swig itself
@@ -408,7 +454,7 @@
  if test x"$with_swig" = "xyes"; then
      AC_MSG_NOTICE([Checking for SWIG])
  
-@@ -807,12 +785,12 @@
+@@ -807,12 +763,12 @@
      Use gthread:              ${have_gthread}
      
      Image I/O ---------------------
@@ -427,7 +473,7 @@
      
      Video I/O ---------------------
      Use QuickTime / Mac OS X: ${have_quicktime}
-@@ -828,6 +806,7 @@
+@@ -828,6 +784,7 @@
  
  Additional build settings ============================================
      Build demo apps           ${enable_apps}