svn commit: r315158 - in head/deskutils/strigi: . files

[Max Brazhnikov]

Author: makc
Date: Sun Mar 24 20:26:48 2013
New Revision: 315158
URL: http://svnweb.freebsd.org/changeset/ports/315158

Log:
  - Really respect FFMPEG_SUFFIX and thus fix build [1]
  - Switch to out-of-source build
  
  Reported by:	miwi [1]

Added:
  head/deskutils/strigi/files/extrapatch-libstreamanalyzer__plugins__endplugins__CMakeLists.txt
     - copied, changed from r314930, head/deskutils/strigi/files/patch-libstreamanalyzer__plugins__endplugins__CMakeLists.txt
Deleted:
  head/deskutils/strigi/files/patch-libstreamanalyzer__plugins__endplugins__CMakeLists.txt
Modified:
  head/deskutils/strigi/Makefile
  head/deskutils/strigi/files/patch-libstreamanalyzer__cmake__FindFFmpeg.cmake

Modified: head/deskutils/strigi/Makefile
==============================================================================
--- head/deskutils/strigi/Makefile	Sun Mar 24 20:19:41 2013	(r315157)
+++ head/deskutils/strigi/Makefile	Sun Mar 24 20:26:48 2013	(r315158)
@@ -21,11 +21,20 @@ USE_GNOME=	libxml2
 USE_PKGCONFIG=	build
 USE_FAM=	yes
 USE_LDCONFIG=	yes
-USES=		cmake
+USES=		cmake:outsource
 MAKE_JOBS_UNSAFE=	yes
 
 # supported versions: ffmpeg, ffmpeg1, ffmpeg-devel
+# corresponding FFMPEG_SUFFIX: '', '1', '-devel'
 FFMPEG_SUFFIX?=	#
+CMAKE_ARGS+=	-DFFMPEG_SUFFIX:STRING="${FFMPEG_SUFFIX}"
+
+.if !empty(FFMPEG_SUFFIX)
+# Reorder include directories to allow build with multiple ffmpeg installed.
+# This patch must NOT be used, if ffmpeg headers are installed
+# directly to ${LOCALBASE}/include
+EXTRA_PATCHES+=	${FILESDIR}/extrapatch-libstreamanalyzer__plugins__endplugins__CMakeLists.txt
+.endif
 
 post-patch:
 	${MKDIR} ${WRKSRC}

Copied and modified: head/deskutils/strigi/files/extrapatch-libstreamanalyzer__plugins__endplugins__CMakeLists.txt (from r314930, head/deskutils/strigi/files/patch-libstreamanalyzer__plugins__endplugins__CMakeLists.txt)
==============================================================================
--- head/deskutils/strigi/files/patch-libstreamanalyzer__plugins__endplugins__CMakeLists.txt	Fri Mar 22 13:40:46 2013	(r314930, copy source)
+++ head/deskutils/strigi/files/extrapatch-libstreamanalyzer__plugins__endplugins__CMakeLists.txt	Sun Mar 24 20:26:48 2013	(r315158)
@@ -1,4 +1,5 @@
-# Reorder include directories to fix build when multiple ffmpeg installed
+# Reorder include directories to allow build with multiple ffmpeg installed.
+# This patch must NOT be used, if FFMPEG_INCLUDE_DIRS == ${LOCALBASE}/include
 #
 --- ./libstreamanalyzer/plugins/endplugins/CMakeLists.txt.orig	2011-12-07 20:28:33.000000000 +0000
 +++ ./libstreamanalyzer/plugins/endplugins/CMakeLists.txt	2013-03-06 00:58:08.824363575 +0000

Modified: head/deskutils/strigi/files/patch-libstreamanalyzer__cmake__FindFFmpeg.cmake
==============================================================================
--- head/deskutils/strigi/files/patch-libstreamanalyzer__cmake__FindFFmpeg.cmake	Sun Mar 24 20:19:41 2013	(r315157)
+++ head/deskutils/strigi/files/patch-libstreamanalyzer__cmake__FindFFmpeg.cmake	Sun Mar 24 20:26:48 2013	(r315158)
@@ -23,7 +23,7 @@
  if (NOT FFMPEG_LIBRARIES)
  
 +  # Look for ffmpeg1 by default. Use empty suffix for ffmpeg-0.7
-+  if (NOT FFMPEG_SUFFIX)
++  if (NOT DEFINED FFMPEG_SUFFIX)
 +    set(FFMPEG_SUFFIX 1)
 +  endif ()
 +