mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-06 06:30:19 +00:00
Code Issues Releases Activity

Chase recent changes in ffmpeg* ports: look for non-suffixed ffmpeg by default

Browse Source
This commit is contained in:
Max Brazhnikov 2013-10-23 13:42:43 +00:00
parent d689316961
commit 3095946235
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=331385
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
x11/kdelibs4/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
CATEGORIES= x11 kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src

12
x11/kdelibs4/files/patch-cmake_modules_FindFFmpeg.cmake
View File

@ -1,5 +1,5 @@
--- ./cmake/modules/FindFFmpeg.cmake.orig 2013-03-01 06:26:13.331789000 +0000
+++ ./cmake/modules/FindFFmpeg.cmake 2013-03-06 22:29:44.367663443 +0000
--- ./cmake/modules/FindFFmpeg.cmake.orig 2013-06-28 17:03:40.713321000 +0000
+++ ./cmake/modules/FindFFmpeg.cmake 2013-10-23 13:30:59.895502135 +0000
@@ -71,13 +71,15 @@
${PC_LIB${_component}_INCLUDEDIR}
${PC_LIB${_component}_INCLUDE_DIRS}
@ -18,15 +18,9 @@
)
set(${_component}_DEFINITIONS ${PC_${_component}_CFLAGS_OTHER} CACHE STRING "The ${_component} CFLAGS.")
@@ -97,13 +99,18 @@
# Check for cached results. If there are skip the costly part.
@@ -98,12 +100,12 @@
if (NOT FFMPEG_LIBRARIES)
+ # Look for ffmpeg1 by default. Use empty suffix for ffmpeg-0.7
+ if (NOT DEFINED FFMPEG_SUFFIX)
+ set(FFMPEG_SUFFIX 1)
+ endif ()
+
# Check for all possible component.
- find_component(AVCODEC libavcodec avcodec libavcodec/avcodec.h)
- find_component(AVFORMAT libavformat avformat libavformat/avformat.h)