From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id aAGbI4WOFl+UYAAA0tVLHw (envelope-from ) for ; Tue, 21 Jul 2020 06:43:17 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id uOqDH4WOFl+hDQAA1q6Kng (envelope-from ) for ; Tue, 21 Jul 2020 06:43:17 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2AFFA9404CD for ; Tue, 21 Jul 2020 06:43:17 +0000 (UTC) Received: from localhost ([::1]:43260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jxlzg-0006by-4b for larch@yhetil.org; Tue, 21 Jul 2020 02:43:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58508) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jxlzS-0006QQ-Mq for guix-patches@gnu.org; Tue, 21 Jul 2020 02:43:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54269) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jxlzS-0006XU-DY for guix-patches@gnu.org; Tue, 21 Jul 2020 02:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jxlzS-0004CJ-B5 for guix-patches@gnu.org; Tue, 21 Jul 2020 02:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42462] [PATCH 2/2] gnu: freedink-engine: Fix sdl hints. References: In-Reply-To: Resent-From: Jesse Gibbons Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Jul 2020 06:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42462 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42462@debbugs.gnu.org Received: via spool by 42462-submit@debbugs.gnu.org id=B42462.159531377916119 (code B ref 42462); Tue, 21 Jul 2020 06:43:02 +0000 Received: (at 42462) by debbugs.gnu.org; 21 Jul 2020 06:42:59 +0000 Received: from localhost ([127.0.0.1]:37581 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jxlzK-0004Bq-RM for submit@debbugs.gnu.org; Tue, 21 Jul 2020 02:42:59 -0400 Received: from mail-pg1-f170.google.com ([209.85.215.170]:38746) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jxlzE-0004BX-T1 for 42462@debbugs.gnu.org; Tue, 21 Jul 2020 02:42:53 -0400 Received: by mail-pg1-f170.google.com with SMTP id e8so11486686pgc.5 for <42462@debbugs.gnu.org>; Mon, 20 Jul 2020 23:42:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:message-id:date:user-agent:mime-version :content-transfer-encoding:content-language; bh=NFmAqmxwl9yBSEuwVXDtsMHtzyQPpbV7/HKXuIdThn8=; b=bDdainpo8cKIFr4VXK2wL5Hc32QqQnxCSOL5QYHQWHq2KzsEhRhW4bXKEh40BOsKP3 /m2/fFSYmlkPDmvc6Zs2YRyYHqBrkyHdj6lYJAPk/TEZVKNfdNqMBODcq6RxRwIDfc4i jRXzqVVATJTZubjC2WG5FgEMZMbsqPIsUvlWuZdTHk7bZ398exwsH8mYzG7ZWpPsrmDY N6rVs+/9X3Ge9uGVYfg+P1S+lnw/aDo8BoDg19f5KX0S2TG0pNOsZUCTGhbJMLfA1ML+ MXt07/0xPNNlF8gTaqfw7V96aMFqNFFvIPoylIf1Q0s7nSQx86I6XeDvmVYw62sH6qU6 auhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:message-id:date:user-agent :mime-version:content-transfer-encoding:content-language; bh=NFmAqmxwl9yBSEuwVXDtsMHtzyQPpbV7/HKXuIdThn8=; b=iXj+3MgNFEmpS5arSYXcetGEmMjjaLmzjQXDCmmqNykdp5kF9tVljWzTVcLqPtbEEH Xj1cKEbjNYhFjfzcbVq3zTjiz8zGhpElU/OxfVttfadUOBh47kzgxfhKv6DdTXdbGj1j brVCtbqVt/63Bj3Ofvxo6p67K5LG+SMNPIQiPFzvj+8wr4G/5FUsytWw9J3/U58gGLAl QgxAL6ps9IY1L2iUtpWMSjCaUGr7iyekzganSS9urvvgppNHqRzmHfsEuuzu6nrX5aKX z9mwAll0K8Xd8hVYIBE57f1f9NxunHT0YHK/KngcwLQakT0SwQxiQtIAS9AwN3Av70ny mARQ== X-Gm-Message-State: AOAM532E+LW2i1lqBqrPr+dRjw2euccWagMaYvFK5S5UVMKKW2aSUxmn zXOXxlZWWwB4XVgIXfwgYsGekudj X-Google-Smtp-Source: ABdhPJw1tCAzm+L5kXYNYAz65iNr5IFP+zheglWotul31qHfJLZTvWyNKd41sGlUmETC66jmybK3PA== X-Received: by 2002:aa7:9ac3:: with SMTP id x3mr21992285pfp.261.1595313762861; Mon, 20 Jul 2020 23:42:42 -0700 (PDT) Received: from [192.168.1.25] ([38.141.58.134]) by smtp.gmail.com with ESMTPSA id z5sm19268675pfn.117.2020.07.20.23.42.41 for <42462@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 20 Jul 2020 23:42:42 -0700 (PDT) From: Jesse Gibbons Message-ID: <417cb347-4ad9-016d-b018-e533a7215832@gmail.com> Date: Tue, 21 Jul 2020 00:42:41 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Icedove/68.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-Spam-Score: 0.3 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -0.7 (/) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=bDdainpo; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.09 X-TUID: G6M9TADtCfSe * gnu/packages/games.scm: freedink: [patches]: Add fix. * gnu/packages/patches/freedink-engine-fix-sdl-hints.patch: New file. * gnu/local.mk: Add it. --- gnu/local.mk | 1 + gnu/packages/games.scm | 1 + .../freedink-engine-fix-sdl-hints.patch | 33 +++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 gnu/packages/patches/freedink-engine-fix-sdl-hints.patch diff --git a/gnu/local.mk b/gnu/local.mk index fc68786ab6..b468ee237a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -950,6 +950,7 @@ dist_patch_DATA = \ %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \ %D%/packages/patches/fontconfig-hurd-path-max.patch \ + %D%/packages/patches/freedink-engine-fix-sdl-hints.patch \ %D%/packages/patches/freeimage-unbundle.patch \ %D%/packages/patches/fuse-overlapping-headers.patch \ %D%/packages/patches/ganeti-deterministic-manual.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 835c8c5f52..2efbb3964e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2730,6 +2730,7 @@ interface or via an external visual interface such as GNU XBoard.") (method url-fetch) (uri (string-append "mirror://gnu/freedink/freedink-" version ".tar.gz")) + (patches (search-patches "freedink-engine-fix-sdl-hints.patch")) (sha256 (base32 "00hhk1bjdrc1np2qz44sa5n1mb62qzwxbvsnws3vpms6iyn3a2sy")))) diff --git a/gnu/packages/patches/freedink-engine-fix-sdl-hints.patch b/gnu/packages/patches/freedink-engine-fix-sdl-hints.patch new file mode 100644 index 0000000000..ce37ab4870 --- /dev/null +++ b/gnu/packages/patches/freedink-engine-fix-sdl-hints.patch @@ -0,0 +1,33 @@ +From 85f8dda6de28ef86e58f26c8aa863a26524f6ce0 Mon Sep 17 00:00:00 2001 +From: Jesse Gibbons +Date: Sun, 9 Feb 2020 21:46:26 -0700 +Subject: [PATCH] Fix mouse/touch event hints for SDL 2.0.10. + +This fixes the bug reported at +. + +It should remain backwards compatible with releases of SDL prior to 2.0.10. +--- + src/input.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/input.cpp b/src/input.cpp +index b5ae21e..153d349 100644 +--- a/src/input.cpp ++++ b/src/input.cpp +@@ -91,7 +91,12 @@ void input_init(void) + + // TODO: don't attempt to simulate mouse events from touch events - + // fake mouse events often are de-centered ++#ifdef SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH + SDL_SetHint(SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH, "0"); ++#elif defined SDL_HINT_MOUSE_TOUCH_EVENTS && defined SDL_HINT_TOUCH_MOUSE_EVENTS ++ SDL_SetHint(SDL_HINT_MOUSE_TOUCH_EVENTS, "0"); ++ SDL_SetHint(SDL_HINT_TOUCH_MOUSE_EVENTS, "0"); ++#endif + + /* Touch devices */ + { +-- +2.25.0 +