[csw-devel] SF.net SVN: gar:[21333] csw/mgar/pkg/scummvm-tools/trunk
lblume at users.sourceforge.net
lblume at users.sourceforge.net
Thu Jun 13 18:13:49 CEST 2013
Revision: 21333
http://gar.svn.sourceforge.net/gar/?rev=21333&view=rev
Author: lblume
Date: 2013-06-13 16:13:47 +0000 (Thu, 13 Jun 2013)
Log Message:
-----------
scummvm-tools/trunk: Add necessary patches to build with Studio; add dependencies
Modified Paths:
--------------
csw/mgar/pkg/scummvm-tools/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/scummvm-tools/trunk/files/0001-teach-configure-about-studio.patch
csw/mgar/pkg/scummvm-tools/trunk/files/0002-avoid-deque-constructor-for-studio.patch
csw/mgar/pkg/scummvm-tools/trunk/files/0003-fix-wxT-macro-on-split-lines.patch
csw/mgar/pkg/scummvm-tools/trunk/files/0004-install-should-create-path.patch
Modified: csw/mgar/pkg/scummvm-tools/trunk/Makefile
===================================================================
--- csw/mgar/pkg/scummvm-tools/trunk/Makefile 2013-06-13 12:12:47 UTC (rev 21332)
+++ csw/mgar/pkg/scummvm-tools/trunk/Makefile 2013-06-13 16:13:47 UTC (rev 21333)
@@ -15,7 +15,39 @@
SF_PROJECT = scummvm
DISTFILES = $(DISTNAME).zip
-CONFIGURE_ARGS = $(DIRPATHS)
+GARCOMPILER = SOS12U3
+RUNTIME_DEP_PKGS_CSWscummvm-tools += CSWwxwidgets
+RUNTIME_DEP_PKGS_CSWscummvm-tools += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWscummvm-tools += CSWlibpng15-15
+RUNTIME_DEP_PKGS_CSWscummvm-tools += CSWlibz1
+RUNTIME_DEP_PKGS_CSWscummvm-tools += CSWlibogg0
+RUNTIME_DEP_PKGS_CSWscummvm-tools += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWscummvm-tools += CSWlibvorbis0
+RUNTIME_DEP_PKGS_CSWscummvm-tools += CSWlibvorbisenc2
+RUNTIME_DEP_PKGS_CSWscummvm-tools += CSWlibflac8
+RUNTIME_DEP_PKGS_CSWscummvm-tools += CSWwxwidgetsgtk2
+
+TEST_SCRIPTS =
+
+PATCHFILES += 0001-teach-configure-about-studio.patch
+PATCHFILES += 0002-avoid-deque-constructor-for-studio.patch
+PATCHFILES += 0003-fix-wxT-macro-on-split-lines.patch
+PATCHFILES += 0004-install-should-create-path.patch
+
+CONFIGURE_ARGS = --prefix=$(prefix)
+CONFIGURE_ARGS += --bindir=$(bindir)
+CONFIGURE_ARGS += --mandir=$(mandir)
+CONFIGURE_ARGS += --datadir=$(datadir)
+CONFIGURE_ARGS += --libdir=$(libdir)
+
+EXTRA_CXXFLAGS += -norunpath
+EXTRA_LDFLAGS += -norunpath
+EXTRA_LD_OPTIONS += -z nolazyload -B direct
+
+# To make sure make install does not try to use Solaris' install
+EXTRA_INSTALL_EXPORTS = INSTALL
+INSTALL = ginstall
+
include gar/category.mk
Added: csw/mgar/pkg/scummvm-tools/trunk/files/0001-teach-configure-about-studio.patch
===================================================================
--- csw/mgar/pkg/scummvm-tools/trunk/files/0001-teach-configure-about-studio.patch (rev 0)
+++ csw/mgar/pkg/scummvm-tools/trunk/files/0001-teach-configure-about-studio.patch 2013-06-13 16:13:47 UTC (rev 21333)
@@ -0,0 +1,53 @@
+--- a/configure Sun May 26 23:14:49 2013
++++ b/configure Tue Jun 11 22:19:24 2013
+@@ -752,7 +752,7 @@
+ if test -n "$_host"; then
+ compilers="$_host_alias-g++ $_host_alias-c++ $_host-g++ $_host-c++"
+ else
+- compilers="g++ c++"
++ compilers="g++ c++ CC"
+ fi
+
+ # Iterate over all candidates, pick the first working one
+@@ -812,11 +812,9 @@
+ cxx_version="not found"
+ cxx_verc_fail=yes
+ fi
+- echo non-gcc compiler version ${cxx_version}
+ else
+ cxx_version="not found"
+ cxx_verc_fail=yes
+- echo found non-gcc compiler version ${cxx_version}
+ fi
+
+ case $_host_os in
+@@ -836,6 +834,20 @@
+ ;;
+ esac
+ ;;
++ solaris*)
++ cxx_version=`( $CXX -V ) 2>&1`
++ cxx_version="`echo "${cxx_version}" | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/'`"
++
++ case $cxx_version in
++ 5.1[0-2])
++ cxx_verc_fail=no
++ ;;
++ *)
++ cxx_version="$cxx_version, bad"
++ cxx_verc_fail=yes
++ ;;
++ esac
++ ;;
+ *)
+ cxx_version="$cxx_version, bad"
+ cxx_verc_fail=yes
+@@ -850,6 +862,8 @@
+ echo "The version of your compiler is not supported at this time"
+ echo "Please ensure you are using GCC >= 2.95"
+ exit 1
++else
++ echo found non-gcc compiler version ${cxx_version}
+ fi
+
+ #
Added: csw/mgar/pkg/scummvm-tools/trunk/files/0002-avoid-deque-constructor-for-studio.patch
===================================================================
--- csw/mgar/pkg/scummvm-tools/trunk/files/0002-avoid-deque-constructor-for-studio.patch (rev 0)
+++ csw/mgar/pkg/scummvm-tools/trunk/files/0002-avoid-deque-constructor-for-studio.patch 2013-06-13 16:13:47 UTC (rev 21333)
@@ -0,0 +1,16 @@
+--- a/scummvm-tools-cli.cpp Sun May 26 23:14:49 2013
++++ b/scummvm-tools-cli.cpp Thu Jun 13 14:43:56 2013
+@@ -40,8 +40,13 @@
+ return 2;
+ }
+
++// If using Solaris Studio
++#if defined(__sun) && !defined(__GNUC__)
++ std::deque<std::string> arguments; for (int i = 1; i < argc; i++);
++#else
+ std::deque<std::string> arguments(argv, argv + argc);
+ arguments.pop_front(); // Pop our own name
++#endif
+
+ ToolType type = TOOLTYPE_ALL;
+
Added: csw/mgar/pkg/scummvm-tools/trunk/files/0003-fix-wxT-macro-on-split-lines.patch
===================================================================
--- csw/mgar/pkg/scummvm-tools/trunk/files/0003-fix-wxT-macro-on-split-lines.patch (rev 0)
+++ csw/mgar/pkg/scummvm-tools/trunk/files/0003-fix-wxT-macro-on-split-lines.patch 2013-06-13 16:13:47 UTC (rev 21333)
@@ -0,0 +1,30 @@
+--- a/gui/pages.cpp Sun May 26 23:14:49 2013
++++ b/gui/pages.cpp Thu Jun 13 14:48:39 2013
+@@ -848,10 +848,10 @@
+ ) {
+ wxMessageDialog *msgDialog = new wxMessageDialog(
+ NULL,
+- wxT("The lame executable could not be found. It is needed to compress files to MP3. "
+- "You can either proceed to the advanced audio settings page and give the path to lame "
+- "or you can select another audio format to compress to.\n\n"
+- "Do you want to proceed to the advanced audio settings page?"),
++ wxT("The lame executable could not be found. It is needed to compress files to MP3. ")
++ wxT("You can either proceed to the advanced audio settings page and give the path to lame ")
++ wxT("or you can select another audio format to compress to.\n\n")
++ wxT("Do you want to proceed to the advanced audio settings page?"),
+ wxT("lame not found"),
+ wxYES_NO | wxNO_DEFAULT | wxICON_EXCLAMATION
+ );
+@@ -1050,9 +1050,9 @@
+ if (!Configuration::isLamePathValid(lamePath->GetPath())) {
+ wxMessageDialog *msgDialog = new wxMessageDialog(
+ NULL,
+- wxT("The lame executable could not be found. It is needed to compress files to MP3. "
+- "If you want to use MP3 compression you need to select a valid lame executable. "
+- "Otherwise you can go back to the audio format selection and select another format."),
++ wxT("The lame executable could not be found. It is needed to compress files to MP3. ")
++ wxT("If you want to use MP3 compression you need to select a valid lame executable. ")
++ wxT("Otherwise you can go back to the audio format selection and select another format."),
+ wxT("lame not found"),
+ wxOK | wxICON_EXCLAMATION
+ );
Added: csw/mgar/pkg/scummvm-tools/trunk/files/0004-install-should-create-path.patch
===================================================================
--- csw/mgar/pkg/scummvm-tools/trunk/files/0004-install-should-create-path.patch (rev 0)
+++ csw/mgar/pkg/scummvm-tools/trunk/files/0004-install-should-create-path.patch 2013-06-13 16:13:47 UTC (rev 21333)
@@ -0,0 +1,11 @@
+--- a/Makefile.common Jun 13 17:35:56 2013
++++ b/Makefile.common Thu Jun 13 17:37:20 2013
+@@ -313,6 +313,8 @@
+ all: $(TARGETS)
+
+ install: $(TARGETS)
++ $(INSTALL) -p -m 0755 -d $(DESTDIR)$(BINDIR)
++ $(INSTALL) -p -m 0755 -d $(DESTDIR)$(DATADIR)/scummvm-tools
+ for i in $^ ; do $(INSTALL) -p -m 0755 $$i $(DESTDIR)$(BINDIR) ; done
+ $(INSTALL) -m 0755 -d $(DESTDIR)$(DATADIR)/scummvm-tools
+ $(INSTALL) -p -m 0644 $(srcdir)/gui/media/*.* $(DESTDIR)$(DATADIR)/scummvm-tools
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list