This is an automated email from the git hooks/post-receive script. jcowgill-guest pushed a commit to branch master in repository dolphin-emu.
commit 1a672fae24d9c32d754361365c4bbddeb0b49a84 Author: James Cowgill <[email protected]> Date: Sat Dec 6 17:31:53 2014 +0000 Add support for armhf --- debian/control | 2 +- debian/patches/09_arm-use-gl.patch | 16 ++++++++++++++++ debian/patches/series | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index ef8a345..ac0088c 100644 --- a/debian/control +++ b/debian/control @@ -44,7 +44,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-games/dolphin-emu.git Vcs-Browser: http://anonscm.debian.org/cgit/pkg-games/dolphin-emu.git Package: dolphin-emu -Architecture: i386 amd64 +Architecture: amd64 armhf i386 Depends: ${shlibs:Depends}, ${misc:Depends}, dolphin-emu-data (= ${source:Version}) Description: Gamecube, Wii and Triforce emulator Dolphin is a Gamecube, Wii and Triforce (the arcade machine based on the diff --git a/debian/patches/09_arm-use-gl.patch b/debian/patches/09_arm-use-gl.patch new file mode 100644 index 0000000..a9bee39 --- /dev/null +++ b/debian/patches/09_arm-use-gl.patch @@ -0,0 +1,16 @@ +Description: Don't force use of GLES on ARM +Author: James Cowgill <[email protected]> +Applied-Upstream: https://github.com/dolphin-emu/dolphin/commit/839df31347cd1331c5426c2eae549371d7ae160f +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -118,8 +118,6 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^a + add_definitions(-marm -march=armv7-a) + add_definitions(-D_M_ARM=1) + add_definitions(-D_M_GENERIC=1) +- # Set generic options so you don't have to pass anything to cmake to build ARM +- set(USE_GLES 1) + endif() + + if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "mips") diff --git a/debian/patches/series b/debian/patches/series index 66a9400..7a0e760 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ 06_fix-findminiupnpc-warnings.patch 07_cmake-sfml-fixes.patch 08_sfml-use-2.1.patch +09_arm-use-gl.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dolphin-emu.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
