r15505 - in packages/trunk/desmume/debian: . patches
Evgeni Golov
evgeni at moszumanska.debian.org
Sun Aug 9 09:51:22 UTC 2015
Author: evgeni
Date: 2015-08-09 09:51:21 +0000 (Sun, 09 Aug 2015)
New Revision: 15505
Added:
packages/trunk/desmume/debian/patches/osmesa_printf.patch
Removed:
packages/trunk/desmume/debian/patches/bsd_sysctl_ftbfs_fix.patch
Modified:
packages/trunk/desmume/debian/
packages/trunk/desmume/debian/changelog
packages/trunk/desmume/debian/patches/01_use_system_tinyxml.patch
packages/trunk/desmume/debian/patches/series
Log:
start 0.9.11
Property changes on: packages/trunk/desmume/debian
___________________________________________________________________
Modified: svn-bp:origUrl
- http://pkg-games.alioth.debian.org/tarballs/desmume_0.9.10.orig.tar.gz
+ http://pkg-games.alioth.debian.org/tarballs/desmume_0.9.11.orig.tar.gz
Modified: packages/trunk/desmume/debian/changelog
===================================================================
--- packages/trunk/desmume/debian/changelog 2015-08-05 17:46:30 UTC (rev 15504)
+++ packages/trunk/desmume/debian/changelog 2015-08-09 09:51:21 UTC (rev 15505)
@@ -1,3 +1,9 @@
+desmume (0.9.11-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Evgeni Golov <evgeni at debian.org> Sun, 09 Aug 2015 11:08:39 +0200
+
desmume (0.9.10-2) unstable; urgency=medium
* Fix FTBFS on *BSD due to sysctl() not taking const parameters.
Modified: packages/trunk/desmume/debian/patches/01_use_system_tinyxml.patch
===================================================================
--- packages/trunk/desmume/debian/patches/01_use_system_tinyxml.patch 2015-08-05 17:46:30 UTC (rev 15504)
+++ packages/trunk/desmume/debian/patches/01_use_system_tinyxml.patch 2015-08-09 09:51:21 UTC (rev 15505)
@@ -1,12 +1,12 @@
From: Evgeni Golov <evgeni at debian.org>
Subject: use the system tinyxml instead of the embedded copy
-Last-Update: 2014-03-23
+Last-Update: 2015-08-09
diff --git a/src/Makefile.am b/src/Makefile.am
-index 13d7957..0284eed 100644
+index 7b9e263..bc7ba8c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -82,12 +82,6 @@ libdesmume_a_SOURCES = \
+@@ -81,12 +81,6 @@ libdesmume_a_SOURCES = \
utils/libfat/mem_allocate.h \
utils/libfat/partition.cpp \
utils/libfat/partition.h \
@@ -16,29 +16,29 @@
- utils/tinyxml/tinyxml.h \
- utils/tinyxml/tinyxmlerror.cpp \
- utils/tinyxml/tinyxmlparser.cpp \
+ utils/glcorearb.h \
addons/slot2_auto.cpp addons/slot2_mpcf.cpp addons/slot2_paddle.cpp addons/slot2_gbagame.cpp addons/slot2_none.cpp addons/slot2_rumblepak.cpp addons/slot2_guitarGrip.cpp addons/slot2_expMemory.cpp addons/slot2_piano.cpp addons/slot2_passme.cpp addons/slot1_none.cpp addons/slot1_r4.cpp addons/slot1_retail_nand.cpp addons/slot1_retail_auto.cpp addons/slot1_retail_mcrom.cpp addons/slot1_retail_mcrom_debug.cpp addons/slot1comp_mc.cpp addons/slot1comp_mc.h addons/slot1comp_rom.h addons/slot1comp_rom.cpp addons/slot1comp_protocol.h addons/slot1comp_protocol.cpp \
cheatSystem.cpp cheatSystem.h \
- texcache.cpp texcache.h rasterize.cpp rasterize.h \
-@@ -203,3 +197,4 @@ if HAVE_GDB_STUB
+@@ -204,3 +198,4 @@ if HAVE_GDB_STUB
libdesmume_a_SOURCES += gdbstub.h
endif
libdesmume_a_LIBADD = fs-$(desmume_arch).$(OBJEXT)
+LIBS += -ltinyxml
diff --git a/src/Makefile.in b/src/Makefile.in
-index 27747fe..5e207f5 100644
+index 9cf26a3..d9ff7b2 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -215,9 +215,6 @@ am__libdesmume_a_SOURCES_DIST = armcpu.cpp armcpu.h \
+@@ -184,9 +184,6 @@ am__libdesmume_a_SOURCES_DIST = armcpu.cpp armcpu.h \
utils/libfat/libfat_public_api.h utils/libfat/lock.cpp \
utils/libfat/lock.h utils/libfat/mem_allocate.h \
utils/libfat/partition.cpp utils/libfat/partition.h \
- utils/tinyxml/tinystr.cpp utils/tinyxml/tinystr.h \
- utils/tinyxml/tinyxml.cpp utils/tinyxml/tinyxml.h \
- utils/tinyxml/tinyxmlerror.cpp utils/tinyxml/tinyxmlparser.cpp \
- addons/slot2_auto.cpp addons/slot2_mpcf.cpp \
+ utils/glcorearb.h addons/slot2_auto.cpp addons/slot2_mpcf.cpp \
addons/slot2_paddle.cpp addons/slot2_gbagame.cpp \
addons/slot2_none.cpp addons/slot2_rumblepak.cpp \
-@@ -354,10 +351,6 @@ am_libdesmume_a_OBJECTS = armcpu.$(OBJEXT) arm_instructions.$(OBJEXT) \
+@@ -324,10 +321,6 @@ am_libdesmume_a_OBJECTS = armcpu.$(OBJEXT) arm_instructions.$(OBJEXT) \
utils/libfat/libfat.$(OBJEXT) \
utils/libfat/libfat_public_api.$(OBJEXT) \
utils/libfat/lock.$(OBJEXT) utils/libfat/partition.$(OBJEXT) \
@@ -49,7 +49,7 @@
addons/slot2_auto.$(OBJEXT) addons/slot2_mpcf.$(OBJEXT) \
addons/slot2_paddle.$(OBJEXT) addons/slot2_gbagame.$(OBJEXT) \
addons/slot2_none.$(OBJEXT) addons/slot2_rumblepak.$(OBJEXT) \
-@@ -554,7 +547,7 @@ LIBAGG_LIBS = @LIBAGG_LIBS@
+@@ -475,7 +468,7 @@ LIBAGG_LIBS = @LIBAGG_LIBS@
LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
LIBGLADE_LIBS = @LIBGLADE_LIBS@
LIBOBJS = @LIBOBJS@
@@ -58,17 +58,17 @@
LIBSOUNDTOUCH_CFLAGS = @LIBSOUNDTOUCH_CFLAGS@
LIBSOUNDTOUCH_LIBS = @LIBSOUNDTOUCH_LIBS@
LTLIBOBJS = @LTLIBOBJS@
-@@ -704,9 +697,6 @@ libdesmume_a_SOURCES = armcpu.cpp armcpu.h arm_instructions.cpp \
+@@ -625,9 +618,6 @@ libdesmume_a_SOURCES = armcpu.cpp armcpu.h arm_instructions.cpp \
utils/libfat/libfat_public_api.h utils/libfat/lock.cpp \
utils/libfat/lock.h utils/libfat/mem_allocate.h \
utils/libfat/partition.cpp utils/libfat/partition.h \
- utils/tinyxml/tinystr.cpp utils/tinyxml/tinystr.h \
- utils/tinyxml/tinyxml.cpp utils/tinyxml/tinyxml.h \
- utils/tinyxml/tinyxmlerror.cpp utils/tinyxml/tinyxmlparser.cpp \
- addons/slot2_auto.cpp addons/slot2_mpcf.cpp \
+ utils/glcorearb.h addons/slot2_auto.cpp addons/slot2_mpcf.cpp \
addons/slot2_paddle.cpp addons/slot2_gbagame.cpp \
addons/slot2_none.cpp addons/slot2_rumblepak.cpp \
-@@ -839,20 +829,6 @@ utils/libfat/lock.$(OBJEXT): utils/libfat/$(am__dirstamp) \
+@@ -760,20 +750,6 @@ utils/libfat/lock.$(OBJEXT): utils/libfat/$(am__dirstamp) \
utils/libfat/$(DEPDIR)/$(am__dirstamp)
utils/libfat/partition.$(OBJEXT): utils/libfat/$(am__dirstamp) \
utils/libfat/$(DEPDIR)/$(am__dirstamp)
@@ -89,15 +89,18 @@
addons/$(am__dirstamp):
@$(MKDIR_P) addons
@: > addons/$(am__dirstamp)
-@@ -1038,7 +1014,6 @@ mostlyclean-compile:
- -rm -f utils/AsmJit/x86/*.$(OBJEXT)
- -rm -f utils/decrypt/*.$(OBJEXT)
- -rm -f utils/libfat/*.$(OBJEXT)
-- -rm -f utils/tinyxml/*.$(OBJEXT)
+@@ -1035,10 +1011,6 @@ mostlyclean-compile:
+ -rm -f utils/libfat/partition.$(OBJEXT)
+ -rm -f utils/md5.$(OBJEXT)
+ -rm -f utils/task.$(OBJEXT)
+- -rm -f utils/tinyxml/tinystr.$(OBJEXT)
+- -rm -f utils/tinyxml/tinyxml.$(OBJEXT)
+- -rm -f utils/tinyxml/tinyxmlerror.$(OBJEXT)
+- -rm -f utils/tinyxml/tinyxmlparser.$(OBJEXT)
+ -rm -f utils/vfat.$(OBJEXT)
+ -rm -f utils/xstring.$(OBJEXT)
- distclean-compile:
- -rm -f *.tab.c
-@@ -1171,10 +1146,6 @@ distclean-compile:
+@@ -1175,10 +1147,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at utils/libfat/$(DEPDIR)/libfat_public_api.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at utils/libfat/$(DEPDIR)/lock.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at utils/libfat/$(DEPDIR)/partition.Po at am__quote@
@@ -107,8 +110,8 @@
- at AMDEP_TRUE@@am__include@ @am__quote at utils/tinyxml/$(DEPDIR)/tinyxmlparser.Po at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@@ -1409,8 +1380,6 @@ distclean-generic:
+ @am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@@ -1449,8 +1417,6 @@ distclean-generic:
-rm -f utils/decrypt/$(am__dirstamp)
-rm -f utils/libfat/$(DEPDIR)/$(am__dirstamp)
-rm -f utils/libfat/$(am__dirstamp)
@@ -117,7 +120,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -1420,7 +1389,7 @@ clean: clean-recursive
+@@ -1460,7 +1426,7 @@ clean: clean-recursive
clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
distclean: distclean-recursive
@@ -126,7 +129,7 @@
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
-@@ -1466,7 +1435,7 @@ install-ps-am:
+@@ -1506,7 +1472,7 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -136,7 +139,7 @@
maintainer-clean-am: distclean-am maintainer-clean-generic
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
-index 1985209..d958323 100644
+index 1985209..d958323 100755
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS += $(SDL_CFLAGS) $(ALSA_CFLAGS) $(LIBAGG_CFLAGS) $(GLIB_CFLAGS) $(GT
@@ -149,10 +152,10 @@
desmume_cli_LDADD += ../gdbstub/libgdbstub.a
endif
diff --git a/src/cli/Makefile.in b/src/cli/Makefile.in
-index 7e9afc3..f568745 100644
+index 14efd77..f04ab7d 100644
--- a/src/cli/Makefile.in
+++ b/src/cli/Makefile.in
-@@ -387,7 +387,7 @@ AM_LDFLAGS =
+@@ -311,7 +311,7 @@ AM_LDFLAGS =
desmume_cli_SOURCES = main.cpp ../sndsdl.cpp ../ctrlssdl.h ../ctrlssdl.cpp ../driver.h ../driver.cpp
desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS) $(ALSA_LIBS) \
$(LIBAGG_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS) \
@@ -162,7 +165,7 @@
.SUFFIXES:
diff --git a/src/gtk-glade/Makefile.am b/src/gtk-glade/Makefile.am
-index b667fca..c79fdac 100644
+index b667fca..c79fdac 100755
--- a/src/gtk-glade/Makefile.am
+++ b/src/gtk-glade/Makefile.am
@@ -33,7 +33,7 @@ desmume_glade_SOURCES = \
@@ -175,10 +178,10 @@
desmume_glade_LDADD += ../gdbstub/libgdbstub.a
endif
diff --git a/src/gtk-glade/Makefile.in b/src/gtk-glade/Makefile.in
-index b633083..e7dd238 100644
+index 5f77ec5..012aa72 100644
--- a/src/gtk-glade/Makefile.in
+++ b/src/gtk-glade/Makefile.in
-@@ -443,7 +443,7 @@ desmume_glade_SOURCES = \
+@@ -367,7 +367,7 @@ desmume_glade_SOURCES = \
desmume_glade_LDADD = ../libdesmume.a $(SDL_LIBS) $(GTKGLEXT_LIBS) \
$(LIBGLADE_LIBS) $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) \
@@ -188,10 +191,10 @@
.SUFFIXES:
diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am
-index 4bfda77..29bacc3 100644
+index 59cb1f2..e451102 100755
--- a/src/gtk/Makefile.am
+++ b/src/gtk/Makefile.am
-@@ -27,7 +27,7 @@ desmume_SOURCES = \
+@@ -32,7 +32,7 @@ desmume_SOURCES = \
../filter/videofilter.cpp ../filter/videofilter.h \
main.cpp main.h
desmume_LDADD = ../libdesmume.a \
@@ -201,10 +204,10 @@
desmume_LDADD += ../gdbstub/libgdbstub.a
endif
diff --git a/src/gtk/Makefile.in b/src/gtk/Makefile.in
-index 3718566..a653c99 100644
+index e1a2c37..75f392f 100644
--- a/src/gtk/Makefile.in
+++ b/src/gtk/Makefile.in
-@@ -452,7 +452,7 @@ desmume_SOURCES = \
+@@ -382,7 +382,7 @@ desmume_SOURCES = \
desmume_LDADD = ../libdesmume.a $(SDL_LIBS) $(GTK_LIBS) \
$(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) \
@@ -213,21 +216,8 @@
$(am__append_3)
UPDATE_DESKTOP = \
appsdir=$(DESTDIR)$(datadir)/applications ; \
-diff --git a/src/mc.h b/src/mc.h
-index 2495d7b..1c44753 100644
---- a/src/mc.h
-+++ b/src/mc.h
-@@ -26,7 +26,7 @@
- #include "types.h"
- #include "emufile.h"
- #include "common.h"
--#include "utils/tinyxml/tinyxml.h"
-+#include <tinyxml.h>
-
- #define MAX_SAVE_TYPES 13
- #define MC_TYPE_AUTODETECT 0x0
diff --git a/src/utils/advanscene.cpp b/src/utils/advanscene.cpp
-index af22335..ca3dd33 100644
+index 8d8f370..09c35bb 100755
--- a/src/utils/advanscene.cpp
+++ b/src/utils/advanscene.cpp
@@ -19,7 +19,7 @@
@@ -238,4 +228,4 @@
+#include <tinyxml.h>
#include "advanscene.h"
- #include "mc.h"
+ #include "../common.h"
Deleted: packages/trunk/desmume/debian/patches/bsd_sysctl_ftbfs_fix.patch
===================================================================
--- packages/trunk/desmume/debian/patches/bsd_sysctl_ftbfs_fix.patch 2015-08-05 17:46:30 UTC (rev 15504)
+++ packages/trunk/desmume/debian/patches/bsd_sysctl_ftbfs_fix.patch 2015-08-09 09:51:21 UTC (rev 15505)
@@ -1,15 +0,0 @@
-diff --git a/src/utils/task.cpp b/src/utils/task.cpp
-index a169276..83cfa57 100644
---- a/src/utils/task.cpp
-+++ b/src/utils/task.cpp
-@@ -41,8 +41,8 @@ int getOnlineCores (void)
- return sysconf(_SC_NPROCESSORS_ONLN);
- #elif defined HOST_BSD
- int cores;
-- const int mib[4] = { CTL_HW, HW_NCPU, 0, 0 };
-- const size_t len = sizeof(cores);
-+ int mib[4] = { CTL_HW, HW_NCPU, 0, 0 };
-+ size_t len = sizeof(cores); //don't make this const, i guess sysctl can't take a const *
- sysctl(mib, 2, &cores, &len, NULL, 0);
- return (cores < 1) ? 1 : cores;
- #else
Added: packages/trunk/desmume/debian/patches/osmesa_printf.patch
===================================================================
--- packages/trunk/desmume/debian/patches/osmesa_printf.patch (rev 0)
+++ packages/trunk/desmume/debian/patches/osmesa_printf.patch 2015-08-09 09:51:21 UTC (rev 15505)
@@ -0,0 +1,12 @@
+diff --git a/src/gtk/osmesa_3Demu.cpp b/src/gtk/osmesa_3Demu.cpp
+index 4e20fd4..51d9182 100755
+--- a/src/gtk/osmesa_3Demu.cpp
++++ b/src/gtk/osmesa_3Demu.cpp
+@@ -20,6 +20,7 @@
+
+ #ifdef HAVE_LIBOSMESA
+ #include <stdlib.h>
++#include <stdio.h>
+ #include <GL/osmesa.h>
+ #include "../OGLRender.h"
+ #include "osmesa_3Demu.h"
Modified: packages/trunk/desmume/debian/patches/series
===================================================================
--- packages/trunk/desmume/debian/patches/series 2015-08-05 17:46:30 UTC (rev 15504)
+++ packages/trunk/desmume/debian/patches/series 2015-08-09 09:51:21 UTC (rev 15505)
@@ -1,3 +1,3 @@
01_use_system_tinyxml.patch
add-keywords-to-desktop-files.patch
-bsd_sysctl_ftbfs_fix.patch
+osmesa_printf.patch
More information about the Pkg-games-commits
mailing list