Date: Wed, 23 Oct 2013 13:42:43 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331385 - in head/x11/kdelibs4: . files Message-ID: <201310231342.r9NDghBm092125@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Wed Oct 23 13:42:43 2013 New Revision: 331385 URL: http://svnweb.freebsd.org/changeset/ports/331385 Log: Chase recent changes in ffmpeg* ports: look for non-suffixed ffmpeg by default Modified: head/x11/kdelibs4/Makefile head/x11/kdelibs4/files/patch-cmake_modules_FindFFmpeg.cmake Modified: head/x11/kdelibs4/Makefile ============================================================================== --- head/x11/kdelibs4/Makefile Wed Oct 23 13:15:46 2013 (r331384) +++ head/x11/kdelibs4/Makefile Wed Oct 23 13:42:43 2013 (r331385) @@ -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 Modified: head/x11/kdelibs4/files/patch-cmake_modules_FindFFmpeg.cmake ============================================================================== --- head/x11/kdelibs4/files/patch-cmake_modules_FindFFmpeg.cmake Wed Oct 23 13:15:46 2013 (r331384) +++ head/x11/kdelibs4/files/patch-cmake_modules_FindFFmpeg.cmake Wed Oct 23 13:42:43 2013 (r331385) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310231342.r9NDghBm092125>