This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch master in repository wxmupen64plus.
commit ac8034add102fcd3b7e1335d66dc917390701f7e Author: Sven Eckelmann <[email protected]> Date: Mon Jan 27 00:05:26 2014 +0100 Switch to wxwidgets 3.0 --- debian/control | 4 +-- debian/patches/series | 2 ++ debian/patches/vidext3_semi_compat.patch | 30 ++++++++++++++++ debian/patches/wxwidgets3.0.patch | 59 ++++++++++++++++++++++++++++++++ debian/rules | 2 +- 5 files changed, 94 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index ce66ece..4bbcb3a 100644 --- a/debian/control +++ b/debian/control @@ -13,8 +13,8 @@ Build-Depends: dpkg-dev (>= 1.16.0), libmupen64plus-dev (>= 1.99.5), libgl1-mesa-dev | libgl-dev, - libsdl1.2-dev | libsdl-dev, - libwxgtk2.9-dev, + libsdl2-dev, + libwxgtk3.0-dev, libx11-dev, python, diff --git a/debian/patches/series b/debian/patches/series index e175c51..c8d7caf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,5 @@ release_version.patch missing_symbols.patch fix_bindir.patch manpage.patch +wxwidgets3.0.patch +vidext3_semi_compat.patch diff --git a/debian/patches/vidext3_semi_compat.patch b/debian/patches/vidext3_semi_compat.patch new file mode 100644 index 0000000..a19e445 --- /dev/null +++ b/debian/patches/vidext3_semi_compat.patch @@ -0,0 +1,30 @@ +Description: Allow to build against vidext3 +Author: Sven Eckelmann <[email protected]> + +--- +diff --git a/wxvidext.cpp b/wxvidext.cpp +index a0d7487f21371c80be2008db76afce59493b0865..06efe8df907e93f7d6ca48f806a4e7432220048c 100644 +--- a/wxvidext.cpp ++++ b/wxvidext.cpp +@@ -455,7 +455,7 @@ void VidExt_InitGLCanvas() + #endif + */ + +-m64p_error VidExt_SetVideoMode(int Width, int Height, int BitsPerPixel, /*m64p_video_mode*/ int ScreenMode) ++m64p_error VidExt_SetVideoMode(int Width, int Height, int BitsPerPixel, /*m64p_video_mode*/ int ScreenMode, int Flags) + { + gWidth = Width; + gHeight = Height; +diff --git a/wxvidext.h b/wxvidext.h +index 3e378bde457a18b9f0ef59ac54a44e77f54d34ed..4e1fdbaccc299b7bb0a7501cecd6fad8ed23f3cd 100644 +--- a/wxvidext.h ++++ b/wxvidext.h +@@ -33,7 +33,7 @@ m64p_error VidExt_SetVideoMode(int Width, int Height, int BitsPerPixel, /*m64p_v + m64p_error VidExt_SetCaption(const char *Title); + m64p_error VidExt_ToggleFullScreen(void); + void* VidExt_GL_GetProcAddress(const char* Proc); +-m64p_error VidExt_GL_SetAttribute(m64p_GLattr Attr, int Value); ++m64p_error VidExt_GL_SetAttribute(m64p_GLattr Attr, int Value, int Flags); + m64p_error VidExt_GL_SwapBuffers(void); + + m64p_error installWxVideoExtension(); diff --git a/debian/patches/wxwidgets3.0.patch b/debian/patches/wxwidgets3.0.patch new file mode 100644 index 0000000..fca51c3 --- /dev/null +++ b/debian/patches/wxwidgets3.0.patch @@ -0,0 +1,59 @@ +Description: Use released wxwidgets 3.0 +Author: Sven Eckelmann <[email protected]> + +--- +diff --git a/wscript b/wscript +index 6be96d11fad07b7476ec86dcc15ba5f805a29a19..9c51b7c69337539c41b8042d7c565ef7161acc04 100644 +--- a/wscript ++++ b/wscript +@@ -7,7 +7,7 @@ + # export LDFLAGS="-arch i386" + # export CXXFLAGS="-arch i386" + # export CFLAGS="-arch i386" +-# waf configure --mupenapi=/Developer/hg/mupen64plus/mupen64plus-core/src/api --wxconfig=/usr/local/bin/wx-config-2.9 ++# waf configure --mupenapi=/Developer/hg/mupen64plus/mupen64plus-core/src/api --wxconfig=/usr/local/bin/wx-config-3.0 + # waf + + # the following two variables are used by the target "waf dist" +@@ -101,9 +101,9 @@ def configure(ctx): + if os.name == 'nt': + if wxhome == None : + 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') ++ ctx.check_cfg(msg="Checking for wxWidgets 3.0.x", path=wx_config, args='--version=3.0 --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 adv,core,base,gl,html ' + wxconfig_args, package='', uselib_store='wxWidgets') ++ ctx.check_cfg(msg="Checking for wxWidgets 3.0.x", path=wx_config, args='--version=3.0 --cxxflags --libs adv,core,base,gl,html ' + wxconfig_args, package='', uselib_store='wxWidgets') + + 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/wxMupen64PlusWin.project b/wxMupen64PlusWin.project +index d3538249281f0d487cac0e6001c332ee66325a59..c9c1e95b493b3f509715f914f5b252b69390998a 100644 +--- a/wxMupen64PlusWin.project ++++ b/wxMupen64PlusWin.project +@@ -53,10 +53,10 @@ + <ResourceCompiler Options=""/> + </GlobalSettings> + <Configuration Name="Debug" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append"> +- <Compiler Options="-g;$(shell /usr/local/bin/wx-config-2.9 --cxxflags --unicode=yes --debug=yes);-arch;i386;$(shell /usr/local/bin/sdl-config --cflags)" C_Options="-g;$(shell /usr/local/bin/wx-config-2.9 --cxxflags --unicode=yes --debug=yes);-arch;i386;$(shell /usr/local/bin/sdl-config --cflags)" Required="yes" PreCompiledHeader=""> ++ <Compiler Options="-g;$(shell /usr/local/bin/wx-config-3.0 --cxxflags --unicode=yes --debug=yes);-arch;i386;$(shell /usr/local/bin/sdl-config --cflags)" C_Options="-g;$(shell /usr/local/bin/wx-config-3.0 --cxxflags --unicode=yes --debug=yes);-arch;i386;$(shell /usr/local/bin/sdl-config --cflags)" Required="yes" PreCompiledHeader=""> + <Preprocessor Value="__WX__"/> + </Compiler> +- <Linker Options="-mwindows;$(shell /usr/local/bin/wx-config-2.9 --debug=yes --libs --unicode=yes);-arch;i386;$(shell /usr/local/bin/sdl-config --libs)" Required="yes"/> ++ <Linker Options="-mwindows;$(shell /usr/local/bin/wx-config-3.0 --debug=yes --libs --unicode=yes);-arch;i386;$(shell /usr/local/bin/sdl-config --libs)" Required="yes"/> + <ResourceCompiler Options="$(shell wx-config --rcflags)" Required="no"/> + <General OutputFile="$(IntermediateDirectory)/$(ProjectName)" IntermediateDirectory="./Debug" Command="C:\Documents and Settings\mmg\Desktop\wxmupen64plus\build\wxmupen64plus.exe" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="C:/Documents and Settings/mmg/Desktop/wxmupen64plus/build" PauseExecWhenProcTerminates="yes"/> + <Environment EnvVarSetName="<Use Defaults>" DbgSetName="<Use Defaults>"/> +@@ -89,10 +89,10 @@ $(IntermediateDirectory)/$(ProjectName).app/Contents/Resources/wxMupen64Plus.icn + </AdditionalRules> + </Configuration> + <Configuration Name="Release" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append"> +- <Compiler Options="-O2;$(shell /usr/local/bin/wx-config-2.9 --cxxflags --unicode=yes --debug=no);-arch;i386;$(shell /usr/local/bin/sdl-config --cflags)" C_Options="-O2;$(shell /usr/local/bin/wx-config-2.9 --cxxflags --unicode=yes --debug=no);-arch;i386;$(shell /usr/local/bin/sdl-config --cflags)" Required="yes" PreCompiledHeader=""> ++ <Compiler Options="-O2;$(shell /usr/local/bin/wx-config-3.0 --cxxflags --unicode=yes --debug=no);-arch;i386;$(shell /usr/local/bin/sdl-config --cflags)" C_Options="-O2;$(shell /usr/local/bin/wx-config-3.0 --cxxflags --unicode=yes --debug=no);-arch;i386;$(shell /usr/local/bin/sdl-config --cflags)" Required="yes" PreCompiledHeader=""> + <Preprocessor Value="__WX__"/> + </Compiler> +- <Linker Options="-mwindows;-s;$(shell /usr/local/bin/wx-config-2.9 --debug=no --libs --unicode=yes);-arch;i386;$(shell /usr/local/bin/sdl-config --libs)" Required="yes"/> ++ <Linker Options="-mwindows;-s;$(shell /usr/local/bin/wx-config-3.0 --debug=no --libs --unicode=yes);-arch;i386;$(shell /usr/local/bin/sdl-config --libs)" Required="yes"/> + <ResourceCompiler Options="$(shell wx-config --rcflags)" Required="no"/> + <General OutputFile="$(IntermediateDirectory)/$(ProjectName)" IntermediateDirectory="./Release" Command="./$(ProjectName).app/Contents/MacOS/$(ProjectName)" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes"/> + <Environment EnvVarSetName="<Use Defaults>" DbgSetName="<Use Defaults>"/> diff --git a/debian/rules b/debian/rules index 07b30de..52f8859 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,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 --version_check=false +MAKEOPTIONS = -v --mupenapi=/usr/include/mupen64plus/ --prefix=/usr --bindir='/usr/games/' --sdlconfig=/usr/bin/sdl2-config --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 _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
