[wxmupen64plus] 59/71: Update version check patch to upstream version

Sven Eckelmann ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:23:38 UTC 2015 

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch experimental
in repository wxmupen64plus.

commit 2cc72549fc05ec4bcd394fe75f2266ec3a138ecb
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun May 20 20:23:51 2012 +0200

    Update version check patch to upstream version
---
 debian/patches/fix_bindir.patch      |  4 +--
 debian/patches/missing_symbols.patch |  8 +++---
 debian/patches/release_version.patch |  2 +-
 debian/patches/version_check.patch   | 47 +++++++++++++++++++++---------------
 debian/rules                         |  2 +-
 5 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/debian/patches/fix_bindir.patch b/debian/patches/fix_bindir.patch
index 9d15abb..19570c3 100644
--- a/debian/patches/fix_bindir.patch
+++ b/debian/patches/fix_bindir.patch
@@ -4,10 +4,10 @@ Author: Sven Eckelmann <sven at narfation.org>
 
 ---
 diff --git a/wscript b/wscript
-index 1725a4a6272c67ef44861db7c0352a6653ab842c..8438e6da5f4ca352b4b0ab2fd625ac439fa7f112 100644
+index 6950eee2e9888471311115575c1bd9a10e2eda65..6be96d11fad07b7476ec86dcc15ba5f805a29a19 100644
 --- a/wscript
 +++ b/wscript
-@@ -82,6 +82,7 @@ def configure(ctx):
+@@ -84,6 +84,7 @@ def configure(ctx):
      ctx.env['wxhome'] = wxhome
      ctx.env['datadir'] = Options.options.datadir
      ctx.env['libdir'] = Options.options.libdir
diff --git a/debian/patches/missing_symbols.patch b/debian/patches/missing_symbols.patch
index 64209ed..d3e6387 100644
--- a/debian/patches/missing_symbols.patch
+++ b/debian/patches/missing_symbols.patch
@@ -3,15 +3,15 @@ Author: Sven Eckelmann <sven at narfation.org>
 
 ---
 diff --git a/wscript b/wscript
-index 313d42f094a13a84b202d81a754b7b20cb16ed65..1725a4a6272c67ef44861db7c0352a6653ab842c 100644
+index 9924cb400b864047ea1cb262bb265b4339f0b0cc..6950eee2e9888471311115575c1bd9a10e2eda65 100644
 --- a/wscript
 +++ b/wscript
-@@ -98,7 +98,7 @@ def configure(ctx):
+@@ -102,7 +102,7 @@ def configure(ctx):
              ctx.fatal("On Windows, the --wxhome argument is mandatory")
          ctx.check_cfg(msg="Checking for wxWidgets 2.9.x", path=wx_config,  args='--version=2.9 --cxxflags --prefix=' + wxhome + ' ' + wxconfig_args + ' --libs core,base,gl,html', package='', uselib_store='wxWidgets')
      else:
 -        ctx.check_cfg(msg="Checking for wxWidgets 2.9.x", path=wx_config,  args='--version=2.9 --cxxflags --libs core,base,gl,html ' + wxconfig_args, package='', uselib_store='wxWidgets')
 +        ctx.check_cfg(msg="Checking for wxWidgets 2.9.x", path=wx_config,  args='--version=2.9 --cxxflags --libs adv,core,base,gl,html ' + wxconfig_args, package='', uselib_store='wxWidgets')
  
- # --------------------------------------------------------------------------------------------
- #                                            BUILD
+     if version_check:
+         ctx.check_cc(compile_filename='test.c', execute=False, cflags=["-I"+api_path], msg="Checking mupen64plus is recent enough...", fragment=
diff --git a/debian/patches/release_version.patch b/debian/patches/release_version.patch
index 4706dd1..20bc3e9 100644
--- a/debian/patches/release_version.patch
+++ b/debian/patches/release_version.patch
@@ -3,7 +3,7 @@ Author: Sven Eckelmann <sven at narfation.org>
 
 ---
 diff --git a/wscript b/wscript
-index 26645efd95b5ea31649e627d553215a151242f03..313d42f094a13a84b202d81a754b7b20cb16ed65 100644
+index 966ceb26d80dba85062cfdf45647a676c80a1349..9924cb400b864047ea1cb262bb265b4339f0b0cc 100644
 --- a/wscript
 +++ b/wscript
 @@ -11,7 +11,7 @@
diff --git a/debian/patches/version_check.patch b/debian/patches/version_check.patch
index 5381e7e..e334cee 100644
--- a/debian/patches/version_check.patch
+++ b/debian/patches/version_check.patch
@@ -1,36 +1,45 @@
-Description: Disable in-tree mupen64plus-core version check
+Description: Allow to disable checking of the local m64p version
+Origin: upstream, https://bitbucket.org/auria/wxmupen64plus/changeset/0d17c122e33b
 Author; Sven Eckelmann <sven at narfation.org>
 
 ---
 diff --git a/wscript b/wscript
-index 1789cc1af49a091b770736c0ac9268e259522606..26645efd95b5ea31649e627d553215a151242f03 100644
+index 1789cc1af49a091b770736c0ac9268e259522606..966ceb26d80dba85062cfdf45647a676c80a1349 100644
 --- a/wscript
 +++ b/wscript
-@@ -90,7 +90,6 @@ def configure(ctx):
+@@ -33,6 +33,7 @@ def options(opt):
+     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')
+     opt.add_option('--bindir', action='store', help='(Optional) the directory where to install wxmupen64plus binary', default='',  dest='bindir')
++    opt.add_option('--version_check', action='store', help='Enable or disable check of the mupen64plus-core version (true or false).', default='true',  dest='version_check')
+     
+     if os.name == 'nt':
+         opt.add_option('--wxhome', action='store', help='Where your wxWidgets build is installed', default=None,  dest='wxhome')
+@@ -62,6 +63,7 @@ def configure(ctx):
+     api_path   = Options.options.mupenapi
+     wx_config  = Options.options.wxconfig
+     sdl_config = Options.options.sdlconfig
++    version_check = (Options.options.version_check == 'true')
+     
+     wxconfig_args = Options.options.wxconfig_args
+     
+@@ -90,7 +92,8 @@ def configure(ctx):
      ctx.check_cc(header_name="m64p_frontend.h",   includes=[api_path])
      ctx.check_cc(header_name="m64p_config.h",     includes=[api_path])
      ctx.check_cc(header_name="m64p_types.h",      includes=[api_path])
 -    ctx.check_cc(header_name="../main/version.h", includes=[api_path])
++    if version_check:
++	ctx.check_cc(header_name="../main/version.h", includes=[api_path])
  
      ctx.check_cfg(path=sdl_config, args='--cflags --libs',   package='', uselib_store='SDL')
      
-@@ -101,19 +100,6 @@ def configure(ctx):
+@@ -101,7 +104,8 @@ def configure(ctx):
      else:
          ctx.check_cfg(msg="Checking for wxWidgets 2.9.x", path=wx_config,  args='--version=2.9 --cxxflags --libs core,base,gl,html ' + wxconfig_args, package='', uselib_store='wxWidgets')
  
 -    ctx.check_cc(compile_filename='test.c', execute=False, cflags=["-I"+api_path], msg="Checking mupen64plus is recent enough...", fragment=
--"""#include "../main/version.h"
--   #if FRONTEND_API_VERSION < 0x020001
--   #error Your mupen64plus build is too old, please upgrade
--   #endif
--   #if CONFIG_API_VERSION < 0x020000
--   #error Your mupen64plus build is too old, please upgrade
--   #endif
--   #if VIDEXT_API_VERSION < 0x020000
--   #error Your mupen64plus build is too old, please upgrade
--   #endif
--   int main(int argc, char** argv) {}""")
--
- # --------------------------------------------------------------------------------------------
- #                                            BUILD
- # --------------------------------------------------------------------------------------------
++    if version_check:
++        ctx.check_cc(compile_filename='test.c', execute=False, cflags=["-I"+api_path], msg="Checking mupen64plus is recent enough...", fragment=
+ """#include "../main/version.h"
+    #if FRONTEND_API_VERSION < 0x020001
+    #error Your mupen64plus build is too old, please upgrade
diff --git a/debian/rules b/debian/rules
index 2e49ea7..20b4814 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ DBG_PACKAGE=$(shell dpkg-parsechangelog|grep '^Source: '|sed 's/^Source:\s*//')-
 export DEB_CFLAGS_MAINT_APPEND=-DCOREDIR="\"/usr/lib/$(DEB_HOST_MULTIARCH)/\""
 export DEB_CXXFLAGS_MAINT_APPEND=-DCOREDIR="\"/usr/lib/$(DEB_HOST_MULTIARCH)/\""
 
-MAKEOPTIONS = -v --mupenapi=/usr/include/mupen64plus/ --prefix=/usr --bindir='/usr/games/' --libdir='/usr/lib/$(DEB_HOST_MULTIARCH)/mupen64plus/' --datadir='/usr/share/games/wxmupen64plus/' --destdir=debian/tmp
+MAKEOPTIONS = -v --mupenapi=/usr/include/mupen64plus/ --prefix=/usr --bindir='/usr/games/' --libdir='/usr/lib/$(DEB_HOST_MULTIARCH)/mupen64plus/' --datadir='/usr/share/games/wxmupen64plus/' --destdir=debian/tmp --version_check=false
 
 binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep:
 	dh $@ --parallel --list-missing

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/wxmupen64plus.git

More information about the Pkg-games-commits mailing list