r14006 - in packages/trunk/desmume/debian: . patches

Evgeni Golov evgeni at alioth.debian.org
Sun May 5 11:18:54 UTC 2013 

Author: evgeni
Date: 2013-05-05 11:18:54 +0000 (Sun, 05 May 2013)
New Revision: 14006

Modified:
   packages/trunk/desmume/debian/changelog
   packages/trunk/desmume/debian/patches/01_use_system_tinyxml.patch
   packages/trunk/desmume/debian/rules
Log:
importing 0.9.9


Modified: packages/trunk/desmume/debian/changelog
===================================================================
--- packages/trunk/desmume/debian/changelog	2013-05-04 16:17:53 UTC (rev 14005)
+++ packages/trunk/desmume/debian/changelog	2013-05-05 11:18:54 UTC (rev 14006)
@@ -1,3 +1,10 @@
+desmume (0.9.9-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Refresh 01_use_system_tinyxml.patch against 0.9.9.
+
+ -- Evgeni Golov <evgeni at debian.org>  Sun, 05 May 2013 12:34:12 +0200
+
 desmume (0.9.8-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/trunk/desmume/debian/patches/01_use_system_tinyxml.patch
===================================================================
--- packages/trunk/desmume/debian/patches/01_use_system_tinyxml.patch	2013-05-04 16:17:53 UTC (rev 14005)
+++ packages/trunk/desmume/debian/patches/01_use_system_tinyxml.patch	2013-05-05 11:18:54 UTC (rev 14006)
@@ -1,12 +1,12 @@
 From: Evgeni Golov <evgeni at debian.org>
 Subject: use the system tinyxml instead of the embedded copy
-Last-Update: 2012-05-01
+Last-Update: 2013-05-05
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 235b255..577a97f 100644
+index b8bb18e..b027330 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -78,12 +78,6 @@ libdesmume_a_SOURCES = \
+@@ -79,12 +79,6 @@ libdesmume_a_SOURCES = \
  	utils/libfat/mem_allocate.h \
  	utils/libfat/partition.cpp \
  	utils/libfat/partition.h \
@@ -19,16 +19,16 @@
  	addons.cpp addons.h \
  	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/slot1_none.cpp addons/slot1_r4.cpp addons/slot1_retail.cpp addons/slot1_retail_nand.cpp \
  	cheatSystem.cpp cheatSystem.h \
-@@ -123,3 +117,4 @@ if HAVE_GDB_STUB
+@@ -201,3 +195,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 0cbc343..c52ed1a 100644
+index b862802..dcebe7d 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -113,9 +113,6 @@ am__libdesmume_a_SOURCES_DIST = armcpu.cpp armcpu.h \
+@@ -183,9 +183,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 \
@@ -38,7 +38,7 @@
  	addons.cpp addons.h addons/slot2_mpcf.cpp \
  	addons/slot2_paddle.cpp addons/slot2_gbagame.cpp \
  	addons/slot2_none.cpp addons/slot2_rumblepak.cpp \
-@@ -157,8 +154,7 @@ am_libdesmume_a_OBJECTS = armcpu.$(OBJEXT) arm_instructions.$(OBJEXT) \
+@@ -295,8 +292,7 @@ am_libdesmume_a_OBJECTS = armcpu.$(OBJEXT) arm_instructions.$(OBJEXT) \
  	fatfile.$(OBJEXT) filetime.$(OBJEXT) \
  	file_allocation_table.$(OBJEXT) libfat.$(OBJEXT) \
  	libfat_public_api.$(OBJEXT) lock.$(OBJEXT) partition.$(OBJEXT) \
@@ -48,7 +48,7 @@
  	slot2_paddle.$(OBJEXT) slot2_gbagame.$(OBJEXT) \
  	slot2_none.$(OBJEXT) slot2_rumblepak.$(OBJEXT) \
  	slot2_guitarGrip.$(OBJEXT) slot2_expMemory.$(OBJEXT) \
-@@ -294,7 +290,7 @@ LIBAGG_LIBS = @LIBAGG_LIBS@
+@@ -434,7 +430,7 @@ LIBAGG_LIBS = @LIBAGG_LIBS@
  LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
  LIBGLADE_LIBS = @LIBGLADE_LIBS@
  LIBOBJS = @LIBOBJS@
@@ -57,7 +57,7 @@
  LIBSOUNDTOUCH_CFLAGS = @LIBSOUNDTOUCH_CFLAGS@
  LIBSOUNDTOUCH_LIBS = @LIBSOUNDTOUCH_LIBS@
  LTLIBOBJS = @LTLIBOBJS@
-@@ -452,9 +448,6 @@ libdesmume_a_SOURCES = armcpu.cpp armcpu.h arm_instructions.cpp \
+@@ -592,9 +588,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 \
@@ -67,7 +67,7 @@
  	addons.cpp addons.h addons/slot2_mpcf.cpp \
  	addons/slot2_paddle.cpp addons/slot2_gbagame.cpp \
  	addons/slot2_none.cpp addons/slot2_rumblepak.cpp \
-@@ -594,10 +587,6 @@ distclean-compile:
+@@ -764,10 +757,6 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/task.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/texcache.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/thumb_instructions.Po at am__quote@
@@ -77,8 +77,8 @@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tinyxmlparser.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/version.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vfat.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wifi.Po at am__quote@
-@@ -953,62 +942,6 @@ partition.obj: utils/libfat/partition.cpp
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/videofilter.Po at am__quote@
+@@ -1136,62 +1125,6 @@ partition.obj: utils/libfat/partition.cpp
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o partition.obj `if test -f 'utils/libfat/partition.cpp'; then $(CYGPATH_W) 'utils/libfat/partition.cpp'; else $(CYGPATH_W) '$(srcdir)/utils/libfat/partition.cpp'; fi`
  
@@ -155,10 +155,10 @@
  desmume_cli_LDADD += ../gdbstub/libgdbstub.a
  endif
 diff --git a/src/cli/Makefile.in b/src/cli/Makefile.in
-index 3ba30a0..0b9df57 100644
+index 6d4d37d..722099f 100644
 --- a/src/cli/Makefile.in
 +++ b/src/cli/Makefile.in
-@@ -321,7 +321,7 @@ AM_LDFLAGS =
+@@ -320,7 +320,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) \
@@ -181,10 +181,10 @@
  desmume_glade_LDADD += ../gdbstub/libgdbstub.a
  endif
 diff --git a/src/gtk-glade/Makefile.in b/src/gtk-glade/Makefile.in
-index 436a181..c058a85 100644
+index 103dc8b..930ddac 100644
 --- a/src/gtk-glade/Makefile.in
 +++ b/src/gtk-glade/Makefile.in
-@@ -376,7 +376,7 @@ desmume_glade_SOURCES = \
+@@ -375,7 +375,7 @@ desmume_glade_SOURCES = \
  
  desmume_glade_LDADD = ../libdesmume.a $(SDL_LIBS) $(GTKGLEXT_LIBS) \
  	$(LIBGLADE_LIBS) $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) \
@@ -194,11 +194,11 @@
  
  .SUFFIXES:
 diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am
-index 754204d..2905a58 100644
+index 4cdf643..88ca09a 100644
 --- a/src/gtk/Makefile.am
 +++ b/src/gtk/Makefile.am
-@@ -20,7 +20,7 @@ desmume_SOURCES = \
- 	cheatsGTK.h cheatsGTK.cpp \
+@@ -26,7 +26,7 @@ desmume_SOURCES = \
+ 	../filter/videofilter.cpp ../filter/videofilter.h \
  	main.cpp main.h
  desmume_LDADD = ../libdesmume.a \
 -	$(SDL_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(LIBSOUNDTOUCH_LIBS)
@@ -207,10 +207,10 @@
  desmume_LDADD += ../gdbstub/libgdbstub.a
  endif
 diff --git a/src/gtk/Makefile.in b/src/gtk/Makefile.in
-index 6149035..da09818 100644
+index 120353f..cb5e5f1 100644
 --- a/src/gtk/Makefile.in
 +++ b/src/gtk/Makefile.in
-@@ -370,7 +370,8 @@ desmume_SOURCES = \
+@@ -377,7 +377,8 @@ desmume_SOURCES = \
  
  desmume_LDADD = ../libdesmume.a $(SDL_LIBS) $(GTK_LIBS) \
  	$(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) \
@@ -221,7 +221,7 @@
    appsdir=$(DESTDIR)$(datadir)/applications ; \
    if [ -f $$appsdir/mimeinfo.cache ] ; then \
 diff --git a/src/mc.cpp b/src/mc.cpp
-index d2e2225..c8807ed 100644
+index eedf0d3..0a3fde9 100644
 --- a/src/mc.cpp
 +++ b/src/mc.cpp
 @@ -26,7 +26,7 @@
@@ -234,7 +234,7 @@
  //temporary hack until we have better error reporting facilities
  #ifdef _WINDOWS
 diff --git a/src/mc.h b/src/mc.h
-index f949f8f..e91265a 100644
+index 7afcd60..2848b01 100644
 --- a/src/mc.h
 +++ b/src/mc.h
 @@ -26,7 +26,7 @@

Modified: packages/trunk/desmume/debian/rules
===================================================================
--- packages/trunk/desmume/debian/rules	2013-05-04 16:17:53 UTC (rev 14005)
+++ packages/trunk/desmume/debian/rules	2013-05-05 11:18:54 UTC (rev 14006)
@@ -15,7 +15,8 @@
 			--bindir=/usr/games --datadir=/usr/share/games \
 			--localedir=/usr/share/locale \
 			--enable-gdb-stub \
-			--enable-osmesa
+			--enable-osmesa \
+			--enable-glade
 
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
   configure_flags += --build $(DEB_HOST_GNU_TYPE)

More information about the Pkg-games-commits mailing list