Skip to content

Commit

Permalink
Fix #1029 - Update ffmpeg from 0.11.1 to 2.7
Browse files Browse the repository at this point in the history
  • Loading branch information
durack1 committed Jun 11, 2015
1 parent 9f25d77 commit ff225e6
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions CMake/cdat_modules/ffmpeg_pkg.cmake
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
set(FFMPEG_MAJOR_SRC 0)
set(FFMPEG_MINOR_SRC 11)
set(FFMPEG_PATCH_SRC 1)
set(FFMPEG_MAJOR_SRC 2)
set(FFMPEG_MINOR_SRC 7)
set(FFMPEG_PATCH_SRC 0)
set(FFMPEG_URL ${LLNL_URL})
set(FFMPEG_GZ ffmpeg-${FFMPEG_MAJOR_SRC}.${FFMPEG_MINOR_SRC}.${FFMPEG_PATCH_SRC}.tar.gz)
set(FFMPEG_MD5 bded7c1e03c5b11a1d50fa1b5f07c653 )
set(FFMPEG_GZ ffmpeg-${FFMPEG_MAJOR_SRC}.${FFMPEG_MINOR_SRC}.tar.gz)
set(FFMPEG_MD5 3ad0554981faf2c6deef23a1cd4c8c57)

set (nm FFMPEG)
string(TOUPPER ${nm} uc_nm)
set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC})
set(FFMPEG_SOURCE ${FFMPEG_URL}/${FFMPEG_GZ})

add_cdat_package_dependent(FFMPEG "" "" ON "CDAT_BUILD_GRAPHICS" OFF)

0 comments on commit ff225e6

Please sign in to comment.