[csw-devel] SF.net SVN: gar:[21226] csw/mgar/pkg/scummvm/trunk/Makefile

[lblume at users.sourceforge.net]

Revision: 21226
          http://gar.svn.sourceforge.net/gar/?rev=21226&view=rev
Author:   lblume
Date:     2013-05-30 18:31:21 +0000 (Thu, 30 May 2013)
Log Message:
-----------
scummvm/trunk: Clean up dependencies and overrides; add isaexec

Modified Paths:
--------------
    csw/mgar/pkg/scummvm/trunk/Makefile

Modified: csw/mgar/pkg/scummvm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/scummvm/trunk/Makefile	2013-05-30 09:47:56 UTC (rev 21225)
+++ csw/mgar/pkg/scummvm/trunk/Makefile	2013-05-30 18:31:21 UTC (rev 21226)
@@ -9,29 +9,32 @@
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 
-RUNTIME_DEP_PKGS_CSWscummvm += CSWlibpng12-0
 RUNTIME_DEP_PKGS_CSWscummvm += CSWlibz1
 RUNTIME_DEP_PKGS_CSWscummvm += CSWlibogg0
 RUNTIME_DEP_PKGS_CSWscummvm += CSWlibvorbis0
 RUNTIME_DEP_PKGS_CSWscummvm += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWscummvm += CSWlibsdl1-2-0
 RUNTIME_DEP_PKGS_CSWscummvm += CSWlibflac8
-RUNTIME_DEP_PKGS_CSWscummvm += CSWlibtheoradec1
-RUNTIME_DEP_PKGS_CSWscummvm += CSWlibmad0
 RUNTIME_DEP_PKGS_CSWscummvm += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWscummvm += CSWlibvorbisfile3
 RUNTIME_DEP_PKGS_CSWscummvm += CSWlibfluidsynth1
+RUNTIME_DEP_PKGS_CSWscummvm += CSWmesa
+RUNTIME_DEP_PKGS_CSWscummvm += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWscummvm += CSWlibmad0
+RUNTIME_DEP_PKGS_CSWscummvm += CSWlibfaad2
+RUNTIME_DEP_PKGS_CSWscummvm += CSWlibtheoradec1
 
-BUILD64=1
+BUILD64 = 1
+ISAEXEC = 1
 
 BUILD_DEP_PKGS_CSWscummvm += CSWlibsdl-dev
 BUILD_DEP_PKGS_CSWscummvm += CSWfluidsynth-dev
+BUILD_DEP_PKGS_CSWscummvm += CSWlibmad-dev
+BUILD_DEP_PKGS_CSWscummvm += CSWlibfaad-dev
+BUILD_DEP_PKGS_CSWscummvm += CSWlibtheora-dev
 
 PATCHFILES += 0001-redefining-FILE.patch
 PATCHFILES += 0002-configure-really-is-a-bash-script.patch
-# Don't know about these, investigate later
-CHECKPKG_OVERRIDES_CSWscummvm += file-with-bad-content|/usr/local|root/opt/csw/bin/scummvm
-CHECKPKG_OVERRIDES_CSWscummvm += file-with-bad-content|/usr/local|root/opt/csw/share/man/man6/scummvm.6
 
 GARCOMPILER = GCC4
 
@@ -45,6 +48,7 @@
 CONFIGURE_ARGS += --enable-plugins
 CONFIGURE_ARGS += --default-dynamic
 CONFIGURE_ARGS += --enable-updates
+CONFIGURE_ARGS += --disable-nasm
 
 TEST_TARGET = test
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.