[mupen64plus-core] 212/310: Rebase patches on top of 2.0~rc3+3+5d46baa3dd76
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 05:58:02 UTC 2015
This is an automated email from the git hooks/post-receive script.
ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-core.
commit ae6790112a755c2f179540d3be26f7c5703ab70a
Author: Sven Eckelmann <sven at narfation.org>
Date: Wed Jun 5 11:26:33 2013 +0200
Rebase patches on top of 2.0~rc3+3+5d46baa3dd76
---
debian/changelog | 4 ++--
debian/patches/dejavu-font.patch | 6 +++---
.../patches/disable_recompiler_disassembler.patch | 6 +++---
debian/patches/osd_exit_resize.patch | 23 ----------------------
debian/patches/printf_fixup.patch | 6 +++---
debian/patches/series | 1 -
6 files changed, 11 insertions(+), 35 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 648e3df..5f0c89d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,8 @@ mupen64plus-core (2.0~rc3+3+5d46baa3dd76-1) UNRELEASED; urgency=low
* Enable link-time optimization in debian/rules similar to upstream
* Add VidExt_ResizeWindow at Base to libmupen64plus2 symbols
* debian/patches:
- - Add osd_exit_resize.patch, Don't free user managed msg when doing
- osd_exit during resize
+ - Rebase dejavu-font.patch, disable_recompiler_disassembler.patch and
+ printf_fixup.patch on top of 2.0~rc3+3+5d46baa3dd76
-- Sven Eckelmann <sven at narfation.org> Tue, 28 May 2013 19:26:55 +0200
diff --git a/debian/patches/dejavu-font.patch b/debian/patches/dejavu-font.patch
index d50b90a..e21711c 100644
--- a/debian/patches/dejavu-font.patch
+++ b/debian/patches/dejavu-font.patch
@@ -4,10 +4,10 @@ Author: Sven Eckelmann <sven at narfation.org>
---
diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 1a3a02f3bff7bfd93215b3495b0d14adc636b459..6ed750c77f32fce9e10fed21c5424258e17ec272 100644
+index 038e836c64e7d4fee17236e88e465417304ef0c8..08d0eb49c9f38fe15451ab20d1a6ebf2080b042e 100644
--- a/projects/unix/Makefile
+++ b/projects/unix/Makefile
-@@ -528,6 +528,7 @@ install: $(TARGET)
+@@ -550,6 +550,7 @@ install: $(TARGET)
$(INSTALL) -m 0644 $(INSTALL_STRIP_FLAG) $(TARGET) "$(DESTDIR)$(LIBDIR)"
$(INSTALL) -d "$(DESTDIR)$(SHAREDIR)"
$(INSTALL) -m 0644 ../../data/* "$(DESTDIR)$(SHAREDIR)"
@@ -16,7 +16,7 @@ index 1a3a02f3bff7bfd93215b3495b0d14adc636b459..6ed750c77f32fce9e10fed21c5424258
$(INSTALL) -m 0644 ../../src/api/m64p_*.h "$(DESTDIR)$(INCDIR)"
-$(LDCONFIG) "$(DESTDIR)$(LIBDIR)"
diff --git a/src/osd/osd.cpp b/src/osd/osd.cpp
-index 934d0fbcf3ff8604b547dde4c638fd7b7686312b..add98c82567872679af9d4158ea07fda9a441d4d 100644
+index c06b9bbea43d8a878c0e66bfa6829a75bd4377af..f428dc98fc57752a1cd626f5217ab070e787f8ab 100644
--- a/src/osd/osd.cpp
+++ b/src/osd/osd.cpp
@@ -40,7 +40,7 @@ extern "C" {
diff --git a/debian/patches/disable_recompiler_disassembler.patch b/debian/patches/disable_recompiler_disassembler.patch
index 86cdc02..ab51b81 100644
--- a/debian/patches/disable_recompiler_disassembler.patch
+++ b/debian/patches/disable_recompiler_disassembler.patch
@@ -9,10 +9,10 @@ Author: Sven Eckelmann <sven at narfation.org>
---
diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 6ed750c77f32fce9e10fed21c5424258e17ec272..3e10db4b6f994b463ed6c71fbcf4cb779232def8 100644
+index 08d0eb49c9f38fe15451ab20d1a6ebf2080b042e..63ce323e025798e84a406d1b4434d38e7e3648b7 100644
--- a/projects/unix/Makefile
+++ b/projects/unix/Makefile
-@@ -474,7 +474,7 @@ ifeq ($(DEBUGGER), 1)
+@@ -497,7 +497,7 @@ ifeq ($(DEBUGGER), 1)
$(SRCDIR)/debugger/dbg_decoder.c \
$(SRCDIR)/debugger/dbg_memory.c \
$(SRCDIR)/debugger/dbg_breakpoints.c
@@ -22,7 +22,7 @@ index 6ed750c77f32fce9e10fed21c5424258e17ec272..3e10db4b6f994b463ed6c71fbcf4cb77
# generate a list of object files to build, make a temporary directory for them
diff --git a/src/debugger/dbg_memory.c b/src/debugger/dbg_memory.c
-index 9d6519d12dca85c9449a1107b0194bb32dba7ea3..985604c5d1e6990632504302f832845b622c3bb0 100644
+index c8988bf867763fb69d27626bd82e8b2895a879af..93510c30b3ec4499ba28b3707a1020e1f7868412 100644
--- a/src/debugger/dbg_memory.c
+++ b/src/debugger/dbg_memory.c
@@ -73,7 +73,7 @@ static MEMBREAKREAD(read_romd, 8);
diff --git a/debian/patches/osd_exit_resize.patch b/debian/patches/osd_exit_resize.patch
deleted file mode 100644
index 720f83c..0000000
--- a/debian/patches/osd_exit_resize.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Don't free user managed msg when doing osd_exit during resize
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/src/osd/osd.cpp b/src/osd/osd.cpp
-index cf59a9cfa7e02b710661b4978add723887d8e50b..d5a59f38f24ba7a38735a596bfe0b69b142f0060 100644
---- a/src/osd/osd.cpp
-+++ b/src/osd/osd.cpp
-@@ -276,8 +276,12 @@ void osd_exit(void)
- // delete message queue
- SDL_LockMutex(osd_list_lock);
- list_for_each_entry_safe(msg, safe, &l_messageQueue, osd_message_t, list) {
-- free(msg->text);
-- free(msg);
-+ if (msg->user_managed) {
-+ osd_remove_message(msg);
-+ } else {
-+ osd_remove_message(msg);
-+ free(msg);
-+ }
- }
- SDL_UnlockMutex(osd_list_lock);
-
diff --git a/debian/patches/printf_fixup.patch b/debian/patches/printf_fixup.patch
index be78590..cbc36e7 100644
--- a/debian/patches/printf_fixup.patch
+++ b/debian/patches/printf_fixup.patch
@@ -35,7 +35,7 @@ index 6cd56ba7bac99e08b81374c5c2cdc900d2fb127d..99ff7a92b62a8dde15124abc7eaa070d
{
int l;
diff --git a/src/main/main.h b/src/main/main.h
-index abe32737aeb95ae2b3a8f04c4e30f9a7910124d1..355bb9b99f3eed1a043f5e044c55769c4b5bc63c 100644
+index d034c909e469d0c2164791730cc77b3447a834b7..1ffaccdd985f2a995e8faeee1b81c11a959a6c30 100644
--- a/src/main/main.h
+++ b/src/main/main.h
@@ -40,7 +40,7 @@ void new_frame(void);
@@ -48,10 +48,10 @@ index abe32737aeb95ae2b3a8f04c4e30f9a7910124d1..355bb9b99f3eed1a043f5e044c55769c
m64p_error main_run(void);
void main_stop(void);
diff --git a/src/osd/osd.h b/src/osd/osd.h
-index 199ac0df74e96f70473c4dc1e4e4a9eec5238327..e3b879f2785b40916fe01475ddf0477933b6f265 100644
+index bbdd699ed8c49fa869e37cd931fc4d1dba62da70..8779ffb9ebf3b0dbcbc06d548a4951866198454d 100644
--- a/src/osd/osd.h
+++ b/src/osd/osd.h
-@@ -92,8 +92,8 @@ extern "C" {
+@@ -93,8 +93,8 @@ extern "C" {
void osd_init(int width, int height);
void osd_exit(void);
void osd_render(void);
diff --git a/debian/patches/series b/debian/patches/series
index db9c979..f2b4630 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
dejavu-font.patch
printf_fixup.patch
disable_recompiler_disassembler.patch
-osd_exit_resize.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-core.git
More information about the Pkg-games-commits
mailing list