[mupen64plus-video-z64] 102/161: Remove upstream merged patches
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:20:34 UTC 2015
This is an automated email from the git hooks/post-receive script.
ecsv-guest pushed a commit to branch master
in repository mupen64plus-video-z64.
commit fb4529831c0a8f9c05dbbee6c7cbde9be4498b45
Author: Sven Eckelmann <sven at narfation.org>
Date: Wed Oct 10 22:00:18 2012 +0200
Remove upstream merged patches
---
debian/changelog | 3 ++
debian/patches/gcc_lto.patch | 28 ------------
debian/patches/mixed_signedness.patch | 62 --------------------------
debian/patches/printf_fixup.patch | 2 +-
debian/patches/series | 3 --
debian/patches/uninitialized_restorefbid.patch | 17 -------
6 files changed, 4 insertions(+), 111 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 976abf7..87acd3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ mupen64plus-video-z64 (1.99.5-1) UNRELEASED; urgency=low
* New Upstream Version
* Upgraded to policy 3.9.4, no changes required
+ * debian/patches:
+ - Remove upstream merged gcc_lto.patch, mixed_signedness.patch and
+ uninitialized_restorefbid.patch
-- Sven Eckelmann <sven at narfation.org> Wed, 19 Sep 2012 08:50:14 +0200
diff --git a/debian/patches/gcc_lto.patch b/debian/patches/gcc_lto.patch
deleted file mode 100644
index 52da476..0000000
--- a/debian/patches/gcc_lto.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Enable experimental support for link-time optimization
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 88fd9a36918bb994076d943b856a5a8ff02fad6a..edf32c56839174bf8c430c8085b2b58d8943f803 100644
---- a/projects/unix/Makefile
-+++ b/projects/unix/Makefile
-@@ -300,6 +300,7 @@ targets:
- @echo " DESTDIR=path == path to prepend to all installation paths (only for packagers)"
- @echo " Debugging Options:"
- @echo " DEBUG=1 == add debugging symbols"
-+ @echo " LTO=1 == enable experimental build with link-time optimization"
- @echo " V=1 == show verbose compiler output"
-
- all: $(TARGET)
-@@ -322,6 +323,11 @@ CFLAGS += -MD
- -include $(OBJECTS:.o=.d)
-
- CXXFLAGS += $(CFLAGS)
-+ifeq ($(LTO), 1)
-+ CFLAGS += -flto
-+ CXXFLAGS += -flto
-+ LDFLAGS += -fuse-linker-plugin $(CXXFLAGS)
-+endif
-
- # standard build rules
- $(OBJDIR)/%.o: $(SRCDIR)/%.c
diff --git a/debian/patches/mixed_signedness.patch b/debian/patches/mixed_signedness.patch
deleted file mode 100644
index 1602e02..0000000
--- a/debian/patches/mixed_signedness.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Description: Fix mixing of signedness
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/src/rdp.h b/src/rdp.h
-index 6d21b1e77b4815671ec609d51bfb030f92f40b9f..9979e3e5666cd8d5a7050b49277df4066a9ee3f2 100644
---- a/src/rdp.h
-+++ b/src/rdp.h
-@@ -122,14 +122,14 @@ struct rdpCombineModes_t {
- #define RDP_GETCM_SUB_B_A1(cm) (((cm).w2 >> 3) & 0x7)
- #define RDP_GETCM_ADD_A1(cm) (((cm).w2 >> 0) & 0x7)
-
--#define RDP_COMBINE_MASK11 ((0xf<<20)|(0x1f<<15)|(0x7<<12)|(0x7<<9))
--#define RDP_COMBINE_MASK12 ((0xf<<28)|(0x7<<15)|(0x7<<12)|(0x7<<9))
--#define RDP_COMBINE_MASK21 ((0xf<<5)|(0x1f<<0))
--#define RDP_COMBINE_MASK22 ((0xf<<24)|(0x7<<21)|(0x7<<18)|(0x7<<6)|(0x7<<3)|(0x7<<0))
-+#define RDP_COMBINE_MASK11 ((0xfu<<20)|(0x1fu<<15)|(0x7u<<12)|(0x7u<<9))
-+#define RDP_COMBINE_MASK12 ((0xfu<<28)|(0x7u<<15)|(0x7u<<12)|(0x7u<<9))
-+#define RDP_COMBINE_MASK21 ((0xfu<<5)|(0x1fu<<0))
-+#define RDP_COMBINE_MASK22 ((0xfu<<24)|(0x7u<<21)|(0x7u<<18)|(0x7u<<6)|(0x7u<<3)|(0x7u<<0))
-
- static const rdpCombineModes_t rdpCombineMasks[4] = {
- { ~RDP_COMBINE_MASK21, ~RDP_COMBINE_MASK22 },
-- { ~0, ~0 },
-+ { ~0u, ~0u },
- { ~(RDP_COMBINE_MASK11|RDP_COMBINE_MASK21), ~(RDP_COMBINE_MASK12|RDP_COMBINE_MASK22) },
- { ~(RDP_COMBINE_MASK11|RDP_COMBINE_MASK21), ~(RDP_COMBINE_MASK12|RDP_COMBINE_MASK22) },
- };
-@@ -181,14 +181,14 @@ struct rdpOtherModes_t {
- #define RDP_GETOM_DITHER_ALPHA_EN(om) (((om).w2 & 0x02) ? 1 : 0)
- #define RDP_GETOM_ALPHA_COMPARE_EN(om) (((om).w2 & 0x01) ? 1 : 0)
-
--#define RDP_BLEND_MASK1 ((3<<30)|(3<<26)|(3<<22)|(3<<18))
--#define RDP_BLEND_MASK2 ((3<<28)|(3<<24)|(3<<20)|(3<<16))
-+#define RDP_BLEND_MASK1 ((3u<<30)|(3u<<26)|(3u<<22)|(3u<<18))
-+#define RDP_BLEND_MASK2 ((3u<<28)|(3u<<24)|(3u<<20)|(3u<<16))
-
- static const rdpOtherModes_t rdpBlendMasks[4] = {
-- { ~0, ~RDP_BLEND_MASK2 },
-- { ~0, ~0 },
-- { ~0, ~(RDP_BLEND_MASK1|RDP_BLEND_MASK2) },
-- { ~0, ~(RDP_BLEND_MASK1|RDP_BLEND_MASK2) },
-+ { ~0u, ~RDP_BLEND_MASK2 },
-+ { ~0u, ~0u },
-+ { ~0u, ~(RDP_BLEND_MASK1|RDP_BLEND_MASK2) },
-+ { ~0u, ~(RDP_BLEND_MASK1|RDP_BLEND_MASK2) },
- };
-
- struct rdpState_t {
-diff --git a/src/rgl_rendermode.cpp b/src/rgl_rendermode.cpp
-index e1a33327b7df002984152478fbc71caac7172f12..1e190b0be1c473b3895f0f3c09f38a90b3f60283 100644
---- a/src/rgl_rendermode.cpp
-+++ b/src/rgl_rendermode.cpp
-@@ -212,7 +212,7 @@ void rglSetCombiner(rglRenderChunk_t & chunk, int format)
-
- rdpState_t & state = chunk.rdpState;
- static rglCombiner_t * c;
-- int cycle = RDP_GETOM_CYCLE_TYPE(state.otherModes);
-+ uint32_t cycle = RDP_GETOM_CYCLE_TYPE(state.otherModes);
- int i; //, fmt, size;
- char * p;
- const char * alphaTest;
diff --git a/debian/patches/printf_fixup.patch b/debian/patches/printf_fixup.patch
index e6237b5..4cbded3 100644
--- a/debian/patches/printf_fixup.patch
+++ b/debian/patches/printf_fixup.patch
@@ -6,7 +6,7 @@ Author: Sven Eckelmann <sven at narfation.org>
---
diff --git a/src/rdp.h b/src/rdp.h
-index bbad3fd0ae694ed9c39bebd0fee890007c042500..6d21b1e77b4815671ec609d51bfb030f92f40b9f 100644
+index 606ffd0d372917a91e7cab0b9f7caff4c78aca28..9979e3e5666cd8d5a7050b49277df4066a9ee3f2 100644
--- a/src/rdp.h
+++ b/src/rdp.h
@@ -247,7 +247,7 @@ int rdp_dasm(uint32_t * rdp_cmd_data, int rdp_cmd_cur, int length, char *buffer)
diff --git a/debian/patches/series b/debian/patches/series
index b92ff7e..5a5a78d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
printf_fixup.patch
-gcc_lto.patch
-uninitialized_restorefbid.patch
-mixed_signedness.patch
diff --git a/debian/patches/uninitialized_restorefbid.patch b/debian/patches/uninitialized_restorefbid.patch
deleted file mode 100644
index de47ff1..0000000
--- a/debian/patches/uninitialized_restorefbid.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Workaround wrong gcc warning about uninitialized variable
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/src/rgl.cpp b/src/rgl.cpp
-index 275bba1c2fe8d0e9412d9ab3b7bc19ddc81f277f..c074457467879a58c7e59613a2a79c9cff0eef55 100644
---- a/src/rgl.cpp
-+++ b/src/rgl.cpp
-@@ -369,7 +369,7 @@ void rglPrepareFramebuffer(rglRenderBuffer_t & buffer)
- if (buffer.area.xh == 8192)
- return;
-
-- GLuint restoreId = 0, restoreFbid;
-+ GLuint restoreId = 0, restoreFbid = 0;
- float d2 = -1;
- float d = 0;
- float restoreW = buffer.width+d2, restoreH = buffer.height+d2;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-z64.git
More information about the Pkg-games-commits
mailing list