This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch experimental in repository wxmupen64plus.
commit 7efdf1ff2a72d487056e5f89e40106d1d3fbbaba Author: Sven Eckelmann <[email protected]> Date: Sun May 22 22:43:31 2011 +0200 Add datadir and libdir flags --- debian/changelog | 1 + debian/patches/series | 1 + debian/patches/wscript_configurable_dir.patch | 39 +++++++++++++++++++++++++++ debian/rules | 6 ++--- 4 files changed, 43 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7cf84b6..01a3ad5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,5 +3,6 @@ wxmupen64plus (0.1+20110516-1) UNRELEASED; urgency=low * Initial release (Closes: #TODO) * debian/patches: - Add install_games.patch, Install under /usr/games + - Add wscript_configurable_dir.patch, Add datadir and libdir flags -- Sven Eckelmann <[email protected]> Mon, 17 Aug 2009 10:18:49 +0200 diff --git a/debian/patches/series b/debian/patches/series index a83020f..75619fc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ install_games.patch single_window.patch +wscript_configurable_dir.patch diff --git a/debian/patches/wscript_configurable_dir.patch b/debian/patches/wscript_configurable_dir.patch new file mode 100644 index 0000000..2fc8a77 --- /dev/null +++ b/debian/patches/wscript_configurable_dir.patch @@ -0,0 +1,39 @@ +Description: Add datadir and libdir flags +Author: Marianne Gagnon <[email protected]> +Origin: backport, https://bitbucket.org/auria/wxmupen64plus/changeset/a0763d9c6c13/raw/wxmupen64plus-a0763d9c6c13.diff + +--- +diff --git a/wscript b/wscript +index 193c313daff18b1bfaf1e5ffa964c9a6e427363c..06394befeea10b6dcf369632532973ad450df160 100644 +--- a/wscript ++++ b/wscript +@@ -30,6 +30,8 @@ def options(opt): + opt.add_option('--sdlconfig', action='store', help='Which sdl-config utility to use (optional)', default='sdl-config', dest="sdlconfig") + opt.add_option('--debug', action='store', help='Whether to make a debug build (may be \'true\' or \'false\')', default='false', dest="debugmode") + opt.add_option('--wxconfig_args', action='store', help='Additional arguments passed to wx-config', default='', dest='wxconfig_args') ++ opt.add_option('--datadir', action='store', help='(Optional) the directory where to look for data files', default='', dest='datadir') ++ opt.add_option('--libdir', action='store', help='(Optional) the directory where to look for plugin files', default='', dest='libdir') + + if os.name == 'nt': + opt.add_option('--wxhome', action='store', help='Where your wxWidgets build is installed', default=None, dest='wxhome') +@@ -77,6 +79,8 @@ def configure(ctx): + ctx.env['api_path'] = api_path + ctx.env['is_debug'] = is_debug + ctx.env['wxhome'] = wxhome ++ ctx.env['datadir'] = Options.options.datadir ++ ctx.env['libdir'] = Options.options.libdir + + ctx.find_program('gcc', var='GCC', mandatory=True) + ctx.find_program('g++', var='GPP', mandatory=True) +@@ -115,6 +119,11 @@ def build(bld): + else: + build_flags += ['-O2','-DNEBUG=1'] + ++ if len(bld.env['datadir']) > 0: ++ build_flags += ['-DDATADIR="' + bld.env['datadir'] + '"'] ++ if len(bld.env['libdir']) > 0: ++ build_flags += ['-DLIBDIR="' + bld.env['libdir'] + '"'] ++ + bin_install_path = "${PREFIX}/games" + + osal_src = [] diff --git a/debian/rules b/debian/rules index e89ab0b..f9fb7af 100755 --- a/debian/rules +++ b/debian/rules @@ -18,10 +18,8 @@ LDFLAGS += -Wl,--as-needed DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) -MAKEOPTIONS = --mupenapi=/usr/include/mupen64plus/ --prefix=/usr --destdir=debian/tmp +MAKEOPTIONS = --mupenapi=/usr/include/mupen64plus/ --prefix=/usr --libdir=/usr/lib/mupen64plus --datadir=/usr/share/wxmupen64plus/ --destdir=debian/tmp #DEBUG=1 COREDIR="/usr/lib/$(DEB_HOST_MULTIARCH)/" PLUGINDIR="/usr/lib/$(DEB_HOST_MULTIARCH)/mupen64plus" MANDIR=/usr/share/man/man6/ BINDIR=/usr/games/ -CFLAGS += -DLIBDIR="\"/usr/lib/mupen64plus\"" -DDATADIR="\"/usr/share/wxmupen64plus/\"" -CXXFLAGS += -DLIBDIR="\"/usr/lib/mupen64plus\"" -DDATADIR="\"/usr/share/wxmupen64plus/\"" %: dh $@ --parallel --list-missing @@ -30,7 +28,7 @@ get-orig-source: uscan --verbose --force-download override_dh_auto_clean: - /usr/bin/python waf distclean $(MAKEOPTIONS) + /usr/bin/python waf distclean rm -rf build override_dh_auto_build: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/wxmupen64plus.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
