rpms/desmume/F-20 desmume-0.9.11-dontlookinbuilddir.patch, NONE, 1.1 desmume-0.9.11-tinyxml.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 desmume.spec, 1.22, 1.23 sources, 1.12, 1.13 desmume-0.9-dontlookinbuilddir.patch, 1.1, NONE desmume-0.9.10-glx_3Demu.patch, 1.1, NONE desmume-0.9.10-tinyxml.patch, 1.1, NONE

Andrea Musuruane musuruan at rpmfusion.org
Fri May 15 10:29:46 CEST 2015 

Author: musuruan

Update of /cvs/free/rpms/desmume/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10234

Modified Files:
	.cvsignore desmume.spec sources 
Added Files:
	desmume-0.9.11-dontlookinbuilddir.patch 
	desmume-0.9.11-tinyxml.patch 
Removed Files:
	desmume-0.9-dontlookinbuilddir.patch 
	desmume-0.9.10-glx_3Demu.patch desmume-0.9.10-tinyxml.patch 
Log Message:
* Thu May 14 2015 Andrea Musuruane <musuruan at gmail.com> - 0.9.11-1
- Updated to upstream version 0.9.11
- Spec file cleanup


desmume-0.9.11-dontlookinbuilddir.patch:
 main.cpp |    5 -----
 1 file changed, 5 deletions(-)

--- NEW FILE desmume-0.9.11-dontlookinbuilddir.patch ---
diff -durN desmume-0.9.11.orig/src/gtk-glade/main.cpp desmume-0.9.11/src/gtk-glade/main.cpp
--- desmume-0.9.11.orig/src/gtk-glade/main.cpp	2015-02-14 16:05:26.000000000 +0100
+++ desmume-0.9.11/src/gtk-glade/main.cpp	2015-05-14 14:30:47.121562491 +0200
@@ -324,11 +324,6 @@
 {
 	gchar *path;
 
-	/* looking in uninstalled (aka building) dir first */
-	path = g_build_filename (GLADEUI_UNINSTALLED_DIR, filename, NULL);
-	if (g_file_test (path, G_FILE_TEST_IS_REGULAR)) return path;
-	g_free (path);
-	
 	/* looking in installed dir */
 	path = g_build_filename (DATADIR, filename, NULL);
 	if (g_file_test (path, G_FILE_TEST_IS_REGULAR)) return path;

desmume-0.9.11-tinyxml.patch:
 Makefile.am           |    8 ++------
 Makefile.in           |   30 +-----------------------------
 cli/Makefile.am       |    2 +-
 cli/Makefile.in       |    2 +-
 gtk-glade/Makefile.am |    2 +-
 gtk-glade/Makefile.in |    2 +-
 gtk/Makefile.am       |    2 +-
 gtk/Makefile.in       |    2 +-
 utils/advanscene.cpp  |    2 +-
 9 files changed, 10 insertions(+), 42 deletions(-)

--- NEW FILE desmume-0.9.11-tinyxml.patch ---
diff -durN desmume-0.9.11.orig/src/cli/Makefile.am desmume-0.9.11/src/cli/Makefile.am
--- desmume-0.9.11.orig/src/cli/Makefile.am	2015-02-14 16:05:26.000000000 +0100
+++ desmume-0.9.11/src/cli/Makefile.am	2015-05-14 14:33:02.656690231 +0200
@@ -5,7 +5,7 @@
 
 bin_PROGRAMS = desmume-cli
 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) $(LIBSOUNDTOUCH_LIBS)
+desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS) $(LIBSOUNDTOUCH_LIBS) -ltinyxml
 if HAVE_GDB_STUB
 desmume_cli_LDADD += ../gdbstub/libgdbstub.a
 endif
diff -durN desmume-0.9.11.orig/src/cli/Makefile.in desmume-0.9.11/src/cli/Makefile.in
--- desmume-0.9.11.orig/src/cli/Makefile.in	2015-02-14 16:07:08.000000000 +0100
+++ desmume-0.9.11/src/cli/Makefile.in	2015-05-14 14:33:02.657690240 +0200
@@ -311,7 +311,7 @@
 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) \
-	$(LIBSOUNDTOUCH_LIBS) $(am__append_1)
+	$(LIBSOUNDTOUCH_LIBS) -ltinyxml $(am__append_1)
 all: all-recursive
 
 .SUFFIXES:
diff -durN desmume-0.9.11.orig/src/gtk/Makefile.am desmume-0.9.11/src/gtk/Makefile.am
--- desmume-0.9.11.orig/src/gtk/Makefile.am	2015-02-14 16:05:26.000000000 +0100
+++ desmume-0.9.11/src/gtk/Makefile.am	2015-05-14 14:33:02.657690240 +0200
@@ -32,7 +32,7 @@
 	../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)
+	$(SDL_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(LIBSOUNDTOUCH_LIBS) -ltinyxml
 if HAVE_GDB_STUB
 desmume_LDADD += ../gdbstub/libgdbstub.a
 endif
diff -durN desmume-0.9.11.orig/src/gtk/Makefile.in desmume-0.9.11/src/gtk/Makefile.in
--- desmume-0.9.11.orig/src/gtk/Makefile.in	2015-02-14 16:07:08.000000000 +0100
+++ desmume-0.9.11/src/gtk/Makefile.in	2015-05-14 14:33:02.658690248 +0200
@@ -382,7 +382,7 @@
 
 desmume_LDADD = ../libdesmume.a $(SDL_LIBS) $(GTK_LIBS) \
 	$(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) \
-	$(LIBSOUNDTOUCH_LIBS) $(am__append_1) $(am__append_2) \
+	$(LIBSOUNDTOUCH_LIBS) -ltinyxml $(am__append_1) $(am__append_2) \
 	$(am__append_3)
 UPDATE_DESKTOP = \
   appsdir=$(DESTDIR)$(datadir)/applications ; \
diff -durN desmume-0.9.11.orig/src/gtk-glade/Makefile.am desmume-0.9.11/src/gtk-glade/Makefile.am
--- desmume-0.9.11.orig/src/gtk-glade/Makefile.am	2015-02-14 16:05:26.000000000 +0100
+++ desmume-0.9.11/src/gtk-glade/Makefile.am	2015-05-14 14:33:02.658690248 +0200
@@ -33,7 +33,7 @@
 desmume_glade_LDADD = ../libdesmume.a \
 			$(SDL_LIBS) $(GTKGLEXT_LIBS) $(LIBGLADE_LIBS) \
 			$(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) \
-			$(LIBSOUNDTOUCH_LIBS)
+			$(IBSOUNDTOUCH_LIBS) -ltinyxml
 if HAVE_GDB_STUB
 desmume_glade_LDADD += ../gdbstub/libgdbstub.a
 endif
diff -durN desmume-0.9.11.orig/src/gtk-glade/Makefile.in desmume-0.9.11/src/gtk-glade/Makefile.in
--- desmume-0.9.11.orig/src/gtk-glade/Makefile.in	2015-02-14 16:07:08.000000000 +0100
+++ desmume-0.9.11/src/gtk-glade/Makefile.in	2015-05-14 14:33:02.658690248 +0200
@@ -367,7 +367,7 @@
 
 desmume_glade_LDADD = ../libdesmume.a $(SDL_LIBS) $(GTKGLEXT_LIBS) \
 	$(LIBGLADE_LIBS) $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) \
-	$(LIBSOUNDTOUCH_LIBS) $(am__append_1)
+	$(LIBSOUNDTOUCH_LIBS) -ltinyxml $(am__append_1)
 all: all-recursive
 
 .SUFFIXES:
diff -durN desmume-0.9.11.orig/src/Makefile.am desmume-0.9.11/src/Makefile.am
--- desmume-0.9.11.orig/src/Makefile.am	2015-02-14 16:05:26.000000000 +0100
+++ desmume-0.9.11/src/Makefile.am	2015-05-14 14:37:46.164049196 +0200
@@ -81,12 +81,6 @@
 	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 \
 	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 \
@@ -204,3 +198,5 @@
 libdesmume_a_SOURCES += gdbstub.h
 endif
 libdesmume_a_LIBADD = fs-$(desmume_arch).$(OBJEXT)
+LIBS += -ltinyxml
+
diff -durN desmume-0.9.11.orig/src/Makefile.in desmume-0.9.11/src/Makefile.in
--- desmume-0.9.11.orig/src/Makefile.in	2015-02-14 16:07:08.000000000 +0100
+++ desmume-0.9.11/src/Makefile.in	2015-05-14 14:39:53.916112176 +0200
@@ -184,9 +184,6 @@
 	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 \
 	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 \
@@ -324,10 +321,6 @@
 	utils/libfat/libfat.$(OBJEXT) \
 	utils/libfat/libfat_public_api.$(OBJEXT) \
 	utils/libfat/lock.$(OBJEXT) utils/libfat/partition.$(OBJEXT) \
-	utils/tinyxml/tinystr.$(OBJEXT) \
-	utils/tinyxml/tinyxml.$(OBJEXT) \
-	utils/tinyxml/tinyxmlerror.$(OBJEXT) \
-	utils/tinyxml/tinyxmlparser.$(OBJEXT) \
 	addons/slot2_auto.$(OBJEXT) addons/slot2_mpcf.$(OBJEXT) \
 	addons/slot2_paddle.$(OBJEXT) addons/slot2_gbagame.$(OBJEXT) \
 	addons/slot2_none.$(OBJEXT) addons/slot2_rumblepak.$(OBJEXT) \
@@ -475,7 +468,7 @@
 LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
 LIBGLADE_LIBS = @LIBGLADE_LIBS@
 LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
+LIBS = @LIBS@ -ltinyxml
 LIBSOUNDTOUCH_CFLAGS = @LIBSOUNDTOUCH_CFLAGS@
 LIBSOUNDTOUCH_LIBS = @LIBSOUNDTOUCH_LIBS@
 LTLIBOBJS = @LTLIBOBJS@
@@ -625,9 +618,6 @@
 	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 \
 	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 \
@@ -760,20 +750,6 @@
 	utils/libfat/$(DEPDIR)/$(am__dirstamp)
 utils/libfat/partition.$(OBJEXT): utils/libfat/$(am__dirstamp) \
 	utils/libfat/$(DEPDIR)/$(am__dirstamp)
-utils/tinyxml/$(am__dirstamp):
-	@$(MKDIR_P) utils/tinyxml
-	@: > utils/tinyxml/$(am__dirstamp)
-utils/tinyxml/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) utils/tinyxml/$(DEPDIR)
-	@: > utils/tinyxml/$(DEPDIR)/$(am__dirstamp)
-utils/tinyxml/tinystr.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \
-	utils/tinyxml/$(DEPDIR)/$(am__dirstamp)
-utils/tinyxml/tinyxml.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \
-	utils/tinyxml/$(DEPDIR)/$(am__dirstamp)
-utils/tinyxml/tinyxmlerror.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \
-	utils/tinyxml/$(DEPDIR)/$(am__dirstamp)
-utils/tinyxml/tinyxmlparser.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \
-	utils/tinyxml/$(DEPDIR)/$(am__dirstamp)
 addons/$(am__dirstamp):
 	@$(MKDIR_P) addons
 	@: > addons/$(am__dirstamp)
@@ -1175,10 +1151,6 @@
 @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@
- at AMDEP_TRUE@@am__include@ @am__quote at utils/tinyxml/$(DEPDIR)/tinystr.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at utils/tinyxml/$(DEPDIR)/tinyxml.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at utils/tinyxml/$(DEPDIR)/tinyxmlerror.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at utils/tinyxml/$(DEPDIR)/tinyxmlparser.Po at am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
diff -durN desmume-0.9.11.orig/src/utils/advanscene.cpp desmume-0.9.11/src/utils/advanscene.cpp
--- desmume-0.9.11.orig/src/utils/advanscene.cpp	2015-02-14 16:05:26.000000000 +0100
+++ desmume-0.9.11/src/utils/advanscene.cpp	2015-05-14 14:33:02.661690273 +0200
@@ -19,7 +19,7 @@
 #include <time.h>
 
 #define TIXML_USE_STL
-#include "tinyxml/tinyxml.h"
+#include <tinyxml.h>
 
 #include "advanscene.h"
 #include "../common.h"


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/desmume/F-20/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	10 Dec 2013 07:20:22 -0000	1.12
+++ .cvsignore	15 May 2015 08:29:46 -0000	1.13
@@ -1 +1 @@
-desmume-0.9.10.tar.tar
+desmume-0.9.11.tar.gz


Index: desmume.spec
===================================================================
RCS file: /cvs/free/rpms/desmume/F-20/desmume.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- desmume.spec	10 Dec 2013 07:20:22 -0000	1.22
+++ desmume.spec	15 May 2015 08:29:46 -0000	1.23
@@ -1,31 +1,20 @@
-%if (0%{?fedora} && 0%{?fedora}) < 19
-%global with_desktop_vendor_tag 1
-%endif
-
 Name: desmume
-Version: 0.9.10
+Version: 0.9.11
 Release: 1%{?dist}
 Summary: A Nintendo DS emulator
 
 License: GPLv2+
 URL: http://desmume.org/
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.tar
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # Do not look into builddir
-Patch0: %{name}-0.9-dontlookinbuilddir.patch
-# Fix compile errors
-# Upstream CVS
-Patch1: %{name}-0.9.10-glx_3Demu.patch
+Patch0: %{name}-0.9.11-dontlookinbuilddir.patch
 # Use system tinyxml instead of the embedded copy
-Patch2: %{name}-0.9.10-tinyxml.patch
+Patch1: %{name}-0.9.11-tinyxml.patch
 
 BuildRequires: gtkglext-devel
 BuildRequires: libglade2-devel
 BuildRequires: openal-soft-devel
-%if 0%{?fedora} >= 20
-BuildRequires:  compat-lua-devel
-%else
-BuildRequires:  lua-devel
-%endif
+BuildRequires: compat-lua-devel
 BuildRequires: zziplib-devel 
 BuildRequires: agg-devel
 BuildRequires: tinyxml-devel
@@ -64,7 +53,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 # Remove bundled tinyxml
 rm -rf src/utils/tinyxml
@@ -81,9 +69,10 @@
 done
 
 # Fix premissions
-chmod 644 src/*.{cpp,h}
-chmod 644 src/gtk-glade/*.{cpp,h}
-chmod 644 src/gtk-glade/dTools/*.{cpp,h}
+chmod 644 COPYING README README.LIN
+chmod 644 src/filter/hq4x.dat
+chmod 644 src/gtk/DeSmuME.xpm
+find src -name *.[ch]* -exec chmod 644 {} \;
 
 # Fix glade path
 sed -i 's|gladedir = $(datadir)/desmume/glade|gladedir = $(datadir)/desmume-glade/|g' src/gtk-glade/Makefile.{am,in}
@@ -98,7 +87,8 @@
 %build
 %configure \
   --enable-openal \
-  --enable-glade
+  --enable-glade \
+  --enable-wifi
 make %{?_smp_mflags}
 
 
@@ -117,9 +107,6 @@
 mkdir -p %{buildroot}%{_datadir}/applications
 desktop-file-install \
   --delete-original \
-%if %{with_desktop_vendor_tag}
-  --vendor dribble \
-%endif
   --remove-key Version \
   --remove-category GNOME \
   --remove-category GTK \
@@ -128,9 +115,6 @@
 
 desktop-file-install \
   --delete-original \
-%if %{with_desktop_vendor_tag}  
-  --vendor dribble \
-%endif
   --remove-key Version \
   --remove-category GNOME \
   --remove-category GTK \
@@ -174,11 +158,7 @@
 %files
 %{_bindir}/%{name}
 %{_datadir}/icons/hicolor/32x32/apps/DeSmuME.xpm
-%if %{with_desktop_vendor_tag} 
-%{_datadir}/applications/dribble-%{name}.desktop
-%else
 %{_datadir}/applications/%{name}.desktop
-%endif
 %{_mandir}/man1/%{name}.1*
 %doc AUTHORS ChangeLog COPYING README README.LIN
 
@@ -187,11 +167,7 @@
 %{_bindir}/%{name}-glade
 %{_datadir}/%{name}-glade
 %{_datadir}/icons/hicolor/32x32/apps/DeSmuME-glade.xpm
-%if %{with_desktop_vendor_tag}
-%{_datadir}/applications/dribble-%{name}-glade.desktop
-%else
 %{_datadir}/applications/%{name}-glade.desktop
-%endif
 %{_mandir}/man1/%{name}-glade.1*
 %doc AUTHORS ChangeLog COPYING README README.LIN
 
@@ -203,6 +179,13 @@
 
 
 %changelog
+* Thu May 14 2015 Andrea Musuruane <musuruan at gmail.com> - 0.9.11-1
+- Updated to upstream version 0.9.11
+- Spec file cleanup
+
+* Sun Aug 31 2014 Sérgio Basto <sergio at serjux.com> - 0.9.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Sun Dec 01 2013 Andrea Musuruane <musuruan at gmail.com> - 0.9.10-1
 - Updated to upstream version 0.9.10
 - Added a patch to use system tinyxml


Index: sources
===================================================================
RCS file: /cvs/free/rpms/desmume/F-20/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	10 Dec 2013 07:20:22 -0000	1.12
+++ sources	15 May 2015 08:29:46 -0000	1.13
@@ -1 +1 @@
-a6aedfe5d6437d481aa9ac5fb5aebbea  desmume-0.9.10.tar.tar
+269b5d4ddc5715720469a9d0efc53044  desmume-0.9.11.tar.gz


--- desmume-0.9-dontlookinbuilddir.patch DELETED ---


--- desmume-0.9.10-glx_3Demu.patch DELETED ---


--- desmume-0.9.10-tinyxml.patch DELETED ---

More information about the rpmfusion-commits mailing list