OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

51 lines
2.0 KiB

  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../wxsvg/wxsvg-1.0.8-1-ffmpeg-avutil.h.patch
  5. # Copyright (C) 2011 The OpenSDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  16. Description: Fix to check for avutil.h in a path where newer versions of ffmpeg install the header
  17. Origin: OpenSDE (http://opensde.org)
  18. This fix also implies the to explicitely pass -D__STDC_CONSTANT_MACROS to get
  19. the UINT64_C macro from stdint.h which is used in libavutil/common.h.
  20. Furthermore the check for avutil.h at the old location has been preserver, but
  21. is only used as a fallback when there was libavutil/avutil.h was found.
  22. --- wxsvg-1.0.8-1/configure.in.orig 2011-03-10 21:22:55.000000000 +0100
  23. +++ wxsvg-1.0.8-1/configure.in 2011-04-17 16:17:07.364077975 +0200
  24. @@ -176,8 +176,21 @@
  25. AM_CONDITIONAL(USE_FFMPEG, [test x$enable_ffmpeg = xyes])
  26. if test x$enable_ffmpeg = xyes; then
  27. PKG_CHECK_MODULES(FFMPEG, [libavformat >= 50.0.0 libavcodec >= 51.0.0 libavutil >= 49.0.0 libswscale])
  28. - # check path for old ffmpeg
  29. - AC_CHECK_HEADERS([ffmpeg/avutil.h])
  30. + # check path for new ffmpeg
  31. + # we need to explicitely pass -D__STDC_CONSTANT_MACROS to get the UINT64_C macro from stdint.h which
  32. + # is used in libavutil/common.h
  33. + CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS"
  34. + AC_CHECK_HEADERS([libavutil/avutil.h],
  35. + [],
  36. + [
  37. + # check path for old ffmpeg
  38. + AC_CHECK_HEADERS([ffmpeg/avutil.h])
  39. + ],
  40. + [[
  41. + #ifdef HAVE_STDINT_H
  42. + # include <stdint.h>
  43. + #endif
  44. + ]])
  45. CXXFLAGS="$CXXFLAGS -DUSE_FFMPEG $FFMPEG_CFLAGS"
  46. LIBS="$LIBS $FFMPEG_LIBS"
  47. fi