app-misc/gizmod: Added patch to enforce libvisual USE flag. Thanks to Tommy[D] for the catch

svn path=/sunrise/; revision=9623

4 files changed, 112 insertions, 2 deletions

diff --git a/app-misc/gizmod/ChangeLog b/app-misc/gizmod/ChangeLog
index 6ad72565f..ad46fd32f 100644
--- a/app-misc/gizmod/ChangeLog
+++ b/app-misc/gizmod/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Nov 2009; Justin Riley <justin.t.riley@gmail.com> gizmod-3.5.ebuild,
+  +files/gizmod-3.5-libvisual.patch:
+  Added patch to enforce libvisual USE flag. Thanks to Tommy[D] for the catch
+
   25 Nov 2009; Justin Riley <justin.t.riley@gmail.com> gizmod-3.5.ebuild,
   +files/gizmod.rc:
   Added init script, changed LIB_INSTALL_DIR to LIB_SUFFIX which removed need
diff --git a/app-misc/gizmod/Manifest b/app-misc/gizmod/Manifest
index ec98bb482..8adb437d8 100644
--- a/app-misc/gizmod/Manifest
+++ b/app-misc/gizmod/Manifest
@@ -1,5 +1,6 @@
+AUX gizmod-3.5-libvisual.patch 3591 RMD160 e1a76a983a0c2eec3382356256bb5bc24b6ac68f SHA1 df2c4ea56028616382c5d9ac97964e8e12f34e65 SHA256 e130a082336f3ad2fc9f1f69f625c577792145449217e6d4ee481cc96e97967e
 AUX gizmod.rc 363 RMD160 1b3f4294b344f0ff2126302c3e8c5c3bfbd7d340 SHA1 a2b9d751a24541e8a0fff403cb31c5c0e3a7ddd0 SHA256 80ed92ee5d0c6d7b574bf58bde29d65b0dfd54d61aab01c7ab69bbec1278f7d9
 DIST gizmod-3.5.tar.bz2 115721 RMD160 90bf061e759713cf24629016443fba09eb00131d SHA1 baecf3b493a43836586fbb91001c6e79bd933a18 SHA256 63c7620e14a43719be0302f44597ca6c38f263de1672b9bb58da63db48d6ecef
-EBUILD gizmod-3.5.ebuild 2081 RMD160 b3a47126e04d5e59f0032fd2a16c155d6e508c47 SHA1 3f5bc017a680a9c1530ba04695a09d0e5abdf2b1 SHA256 cdeb8e2d8db630aaf0f38c622453568b513d66bbc8bc6f893bfd7da760405d70
-MISC ChangeLog 1976 RMD160 ff904073635a3448c4fcdebcf624b5cf38f98588 SHA1 92c26826afba9be2e85689976001690a91b57e97 SHA256 55cc39d38f8567d195f20b8cb656cc1c1de827bdf7a074a3af7a7ceee74eebfe
+EBUILD gizmod-3.5.ebuild 2176 RMD160 db5983c6264990ae71dd383ff071bba184f94bcf SHA1 20594a2b87671bf6ac09b35f7f2900b54b40643f SHA256 d4ec87a78e740abb579294a17e6138dde10188392a950cd69e8032beff7b1cd5
+MISC ChangeLog 2166 RMD160 e6e6f0b774e3ff9d21012cbd6d6631350f94717e SHA1 ad4d5e74e9af525adeca4a8340158a5d44c9b30f SHA256 d7af6153de00f8664cfd5e866865617ce6a8105af90c6f49062722e7de5b776d
 MISC metadata.xml 277 RMD160 d54adef29a37b47ca08b2194f5e6ebd0f668f4cf SHA1 caca608e4c20dfe264ebad8228ab8294b1f54b02 SHA256 bdb7a5f3eb5a695584b91f703ceae716d54fbadb7d6a329539bb16aac30377fe
diff --git a/app-misc/gizmod/files/gizmod-3.5-libvisual.patch b/app-misc/gizmod/files/gizmod-3.5-libvisual.patch
new file mode 100644
index 000000000..2b2a98d31
--- /dev/null
+++ b/app-misc/gizmod/files/gizmod-3.5-libvisual.patch
@@ -0,0 +1,103 @@
+diff -urN gizmod-3.5/cmake/Modules/FindLibvisual.cmake gizmod-3.5-fixed/cmake/Modules/FindLibvisual.cmake
+--- gizmod-3.5/cmake/Modules/FindLibvisual.cmake	2008-08-24 12:45:54.000000000 -0400
++++ gizmod-3.5-fixed/cmake/Modules/FindLibvisual.cmake	2009-11-26 16:08:22.000000000 -0500
+@@ -12,43 +12,48 @@
+ 
+ set(_visual "visual-0.4")
+ 
+-if(NOT WIN32)
+-    # use pkg-config to get the directories and then use these values
+-    # in the FIND_PATH() and FIND_LIBRARY() calls
+-    INCLUDE(UsePkgConfig)
+-    INCLUDE(UsePkgConfigVariable)
+-  
+-    # get info from pkgconfig
+-    PKGCONFIG(lib${_visual} _LIBVISUALIncDir _LIBVISUALLinkDir _LIBVISUALLinkFlags _LIBVISUALCflags)
+-    set(LIBVISUAL_DEFINITIONS ${_LIBVISUALCflags})
+-    
+-    # get plugins dir
+-    PKGCONFIG_VAR(lib${_visual} "pluginsbasedir" _LIBVISUALPluginDir)
+-    set(LIBVISUAL_PLUGINS_DIR ${_LIBVISUALPluginDir})
+-endif(NOT WIN32)
+-FIND_PATH(LIBVISUAL_INCLUDE_DIR libvisual/libvisual.h
+-    ${_LIBVISUALIncDir}
+-    /usr/include
+-    /usr/local/include
+-)
++if(BUILD_VIS_PLUGIN)
+ 
+-FIND_LIBRARY(LIBVISUAL_LIBRARIES NAMES ${_visual}
+-    PATHS
+-    ${_LIBVISUALLinkDir}
+-    /usr/lib
+-    /usr/local/lib
+-)
+-  
+-if (LIBVISUAL_INCLUDE_DIR AND LIBVISUAL_LIBRARIES)
+-     set(LIBVISUAL_FOUND TRUE)
+-endif (LIBVISUAL_INCLUDE_DIR AND LIBVISUAL_LIBRARIES)
+-  
+-if (NOT LIBVISUAL_FOUND)
+-    if (Libvisual_FIND_REQUIRED)
+-      message(FATAL_ERROR "Could NOT find libvisual")
+-    else (Libvisual_FIND_REQUIRED)
+-      message(STATUS "Could NOT find libvisual")
+-    endif (Libvisual_FIND_REQUIRED)
+-endif (NOT LIBVISUAL_FOUND)
+-  
+-MARK_AS_ADVANCED(LIBVISUAL_INCLUDE_DIR LIBVISUAL_LIBRARIES)
++	if(NOT WIN32)
++	    # use pkg-config to get the directories and then use these values
++	    # in the FIND_PATH() and FIND_LIBRARY() calls
++	    INCLUDE(UsePkgConfig)
++	    INCLUDE(UsePkgConfigVariable)
++	  
++	    # get info from pkgconfig
++	    PKGCONFIG(lib${_visual} _LIBVISUALIncDir _LIBVISUALLinkDir _LIBVISUALLinkFlags _LIBVISUALCflags)
++	    set(LIBVISUAL_DEFINITIONS ${_LIBVISUALCflags})
++	    
++	    # get plugins dir
++	    PKGCONFIG_VAR(lib${_visual} "pluginsbasedir" _LIBVISUALPluginDir)
++	    set(LIBVISUAL_PLUGINS_DIR ${_LIBVISUALPluginDir})
++	endif(NOT WIN32)
++	FIND_PATH(LIBVISUAL_INCLUDE_DIR libvisual/libvisual.h
++	    ${_LIBVISUALIncDir}
++	    /usr/include
++	    /usr/local/include
++	)
++
++	FIND_LIBRARY(LIBVISUAL_LIBRARIES NAMES ${_visual}
++	    PATHS
++	    ${_LIBVISUALLinkDir}
++	    /usr/lib
++	    /usr/local/lib
++	)
++	  
++	if (LIBVISUAL_INCLUDE_DIR AND LIBVISUAL_LIBRARIES)
++	     set(LIBVISUAL_FOUND TRUE)
++	endif (LIBVISUAL_INCLUDE_DIR AND LIBVISUAL_LIBRARIES)
++	  
++	if (NOT LIBVISUAL_FOUND)
++	    if (Libvisual_FIND_REQUIRED)
++	      message(FATAL_ERROR "Could NOT find libvisual")
++	    else (Libvisual_FIND_REQUIRED)
++	      message(STATUS "Could NOT find libvisual")
++	    endif (Libvisual_FIND_REQUIRED)
++	else (NOT LIBVISUAL_FOUND)
++	    message(STATUS "Found libvisual: ${LIBVISUAL_LIBRARIES}")
++	endif (NOT LIBVISUAL_FOUND)
++	  
++	MARK_AS_ADVANCED(LIBVISUAL_INCLUDE_DIR LIBVISUAL_LIBRARIES)
++endif(BUILD_VIS_PLUGIN)
+diff -urN gizmod-3.5/ConfigureChecks.cmake gizmod-3.5-fixed/ConfigureChecks.cmake
+--- gizmod-3.5/ConfigureChecks.cmake	2008-11-03 07:45:04.000000000 -0500
++++ gizmod-3.5-fixed/ConfigureChecks.cmake	2009-11-26 15:59:44.000000000 -0500
+@@ -46,7 +46,7 @@
+ 
+ # set default build type to release
+ if (NOT BUILD_VIS_PLUGIN)
+-	set(BUILD_VIS_PLUGIN True CACHE BOOLEAN TRUE FORCE)
++	set(BUILD_VIS_PLUGIN False CACHE BOOLEAN FALSE FORCE)
+ endif (NOT BUILD_VIS_PLUGIN)
+ 
+ #################################
diff --git a/app-misc/gizmod/gizmod-3.5.ebuild b/app-misc/gizmod/gizmod-3.5.ebuild
index 4e3e26f77..c73458062 100644
--- a/app-misc/gizmod/gizmod-3.5.ebuild
+++ b/app-misc/gizmod/gizmod-3.5.ebuild
@@ -47,6 +47,8 @@ options can only be built directly into the kernel.
 "
 
 src_prepare() {
+	# patch gizmod to properly obey libvisual use flag
+	epatch "${FILESDIR}"/${P}-libvisual.patch
 	## straighten up the paths
 	sed -i CMakeLists.txt -e /DefineInstallationPaths/d || die "sed: removal of DefineInstallationPaths failed"
 	sed -i libGizmod/CMakeLists.txt -e 's:lib$:lib${LIB_SUFFIX}:' || die "sed: replacing lib with LIB_INSTALL_DIR failed"