From owner-svn-ports-all@FreeBSD.ORG Wed Oct 23 13:42:44 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 2E13D9F1; Wed, 23 Oct 2013 13:42:44 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 00301207E; Wed, 23 Oct 2013 13:42:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NDghah092127; Wed, 23 Oct 2013 13:42:43 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NDghBm092125; Wed, 23 Oct 2013 13:42:43 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201310231342.r9NDghBm092125@svn.freebsd.org> From: Max Brazhnikov Date: Wed, 23 Oct 2013 13:42:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331385 - in head/x11/kdelibs4: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 13:42:44 -0000 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)