Skip to contentSkip to conversation

chocolate-doom: bump to version 2.3.0

PATCH New Rodrigo Rebello 2 participants 5 messages Mar 5, 2017

lore
Share & tools
lore

Rodrigo Rebello

author
#0 lore raw

PATCH 1/1 chocolate-doom: bump to version 2.3.0

Also remove patches that have been merged upstream.

Signed-off-by Rodrigo Rebello <[email protected]>
---
 ...ruct-attribute-directive-ignored-warnings.patch | 49 -------------
 ...-configure-fix-with-PACKAGE-option-checks.patch | 67 ------------------
 ...se-of-ioperm-inb-outb-to-x86-architecture.patch | 80 ----------------------
 package/chocolate-doom/chocolate-doom.hash         |  2 +-
 package/chocolate-doom/chocolate-doom.mk           |  2 +-
 5 files changed, 2 insertions(+), 198 deletions(-)
 delete mode 100644 package/chocolate-doom/0001-Fix-gcc_struct-attribute-directive-ignored-warnings.patch
 delete mode 100644 package/chocolate-doom/0002-configure-fix-with-PACKAGE-option-checks.patch
 delete mode 100644 package/chocolate-doom/0003-opl-limit-use-of-ioperm-inb-outb-to-x86-architecture.patch
package/chocolate-doom/0001-Fix-gcc_struct-attribute-directive-ignored-warnings.patch deleted +0 -49
deleted file mode 100644
index bff8e3e..0000000
@@ -1,49 +0,0 @@
-From d9c517d9a4e168c1f7ed28ad0eb9365d69f5ceb2 Mon Sep 17 00:00:00 2001
-From: Rodrigo Rebello <[email protected]>
-Date: Thu, 22 Oct 2015 11:29:55 -0200
-Subject: [PATCH] Fix "`gcc_struct' attribute directive ignored" warnings
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Compilation for target architectures other than i386, x86_64 or PowerPC
-(e.g. ARM) caused multiple warnings like the following to appear:
-
-  doomdata.h:75:1: warning: ?gcc_struct? attribute directive ignored
-   } PACKEDATTR mapsidedef_t;
-   ^
-
-This was due to 'gcc_struct' being undefined for these architectures.
-Since that attribute was actually introduced by commit 87db726b9a9ae61ca
-to address the fact that -mms-bitfields became the default for GCC on
-Windows, limit it to that case.
-
-Upstream-status: accepted, not yet released.
-https://github.com/chocolate-doom/chocolate-doom/pull/629
-
-Signed-off-by: Rodrigo Rebello <[email protected]>
----
- src/doomtype.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/doomtype.h b/src/doomtype.h
-index bf0a40e..77c026c 100644
---- a/src/doomtype.h
-+++ b/src/doomtype.h
-@@ -52,10 +52,10 @@
- 
- #ifdef __GNUC__
- 
--#ifdef __clang__
--#define PACKEDATTR __attribute__((packed))
--#else
-+#if defined(_WIN32) && !defined(__clang__)
- #define PACKEDATTR __attribute__((packed,gcc_struct))
-+#else
-+#define PACKEDATTR __attribute__((packed))
- #endif
- 
- #else
--- 
-2.1.4
-
package/chocolate-doom/0002-configure-fix-with-PACKAGE-option-checks.patch deleted +0 -67

67 lines not on this page · raw message

package/chocolate-doom/0003-opl-limit-use-of-ioperm-inb-outb-to-x86-architecture.patch deleted +0 -80

80 lines not on this page · raw message

package/chocolate-doom/chocolate-doom.hash +1 -1
index bdf5698..6751c7d 100644
@@ -1,2 +1,2 @@
 # Locally computed
-sha256	ad11e2871667c6fa0658abf2dcba0cd9b26fbd651ee8df55adfdc18ad8fd674a	chocolate-doom-2.2.1.tar.gz
+sha256	3e6d1a82ac5c8b025a9695ce1e47d0dc6ed142ebb1129b1e4a70e2740f79150c	chocolate-doom-2.3.0.tar.gz
package/chocolate-doom/chocolate-doom.mk +1 -1
index dad7352..7283092 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CHOCOLATE_DOOM_VERSION = 2.2.1
+CHOCOLATE_DOOM_VERSION = 2.3.0
 CHOCOLATE_DOOM_SITE = http://www.chocolate-doom.org/downloads/$(CHOCOLATE_DOOM_VERSION)
 CHOCOLATE_DOOM_LICENSE = GPLv2+
 CHOCOLATE_DOOM_LICENSE_FILES = COPYING
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 chocolate-doom: bump to version 2.3.0

Hello,

Quoted 10 lines · Rodrigo Rebello

Also remove patches that have been merged upstream.

Signed-off-by Rodrigo Rebello <[email protected]>
---
 ...ruct-attribute-directive-ignored-warnings.patch | 49 -------------
 ...-configure-fix-with-PACKAGE-option-checks.patch | 67 ------------------
 ...se-of-ioperm-inb-outb-to-x86-architecture.patch | 80 ----------------------
 package/chocolate-doom/chocolate-doom.hash         |  2 +-
 package/chocolate-doom/chocolate-doom.mk           |  2 +-
 5 files changed, 2 insertions(+), 198 deletions(-)

Since you're removing all patches, can we remove <pkg>_AUTORECONF = YES in the .mk file?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
author
#2 lore raw

PATCH 1/1 chocolate-doom: bump to version 2.3.0

Not really. There's still one remaining patch (0004-configure-Switch-to-pkg-config-macros.patch) which unfortunately touches configure.ac. Only the ones which have been merged upstream were removed.

The next chocolate-doom release (v3.0.0) will use SDL2, and that wil include changes on the configure script to use pkg-config for finding libraries, so we'll be able to get rid of that last remaining patch when this version comes out. For now, however, v2.3.0 is the latest stable release.

2017-03-05 17:25 GMT-03:00 Thomas Petazzoni
<[email protected]>:

Quoted 22 lines

Hello,

Quoted 10 lines · Rodrigo Rebello

Also remove patches that have been merged upstream.

Signed-off-by Rodrigo Rebello <[email protected]>
---
 ...ruct-attribute-directive-ignored-warnings.patch | 49 -------------
 ...-configure-fix-with-PACKAGE-option-checks.patch | 67 ------------------
 ...se-of-ioperm-inb-outb-to-x86-architecture.patch | 80 ----------------------
 package/chocolate-doom/chocolate-doom.hash         |  2 +-
 package/chocolate-doom/chocolate-doom.mk           |  2 +-
 5 files changed, 2 insertions(+), 198 deletions(-)

Since you're removing all patches, can we remove <pkg>_AUTORECONF = YES in the .mk file?

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

#3 lore raw

PATCH 1/1 chocolate-doom: bump to version 2.3.0

Hello,

Quoted 4 lines · Rodrigo Rebello

Not really. There's still one remaining patch (0004-configure-Switch-to-pkg-config-macros.patch) which unfortunately touches configure.ac. Only the ones which have been merged upstream were removed.

Ah, yes, sorry, I missed that one when looking at the list of patches.

Quoted 5 lines

The next chocolate-doom release (v3.0.0) will use SDL2, and that wil include changes on the configure script to use pkg-config for finding libraries, so we'll be able to get rid of that last remaining patch when this version comes out. For now, however, v2.3.0 is the latest stable release.

Sure. Thanks, I'll apply your patch then.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
Applied
#4 lore raw

PATCH 1/1 chocolate-doom: bump to version 2.3.0

In reply to Rodrigo Rebello

Hello,

Quoted 13 lines · Rodrigo Rebello

Also remove patches that have been merged upstream.

Signed-off-by Rodrigo Rebello <[email protected]>
---
 ...ruct-attribute-directive-ignored-warnings.patch | 49 -------------
 ...-configure-fix-with-PACKAGE-option-checks.patch | 67 ------------------
 ...se-of-ioperm-inb-outb-to-x86-architecture.patch | 80 ----------------------
 package/chocolate-doom/chocolate-doom.hash         |  2 +-
 package/chocolate-doom/chocolate-doom.mk           |  2 +-
 5 files changed, 2 insertions(+), 198 deletions(-)
 delete mode 100644 package/chocolate-doom/0001-Fix-gcc_struct-attribute-directive-ignored-warnings.patch
 delete mode 100644 package/chocolate-doom/0002-configure-fix-with-PACKAGE-option-checks.patch
 delete mode 100644 package/chocolate-doom/0003-opl-limit-use-of-ioperm-inb-outb-to-x86-architecture.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com