--- qemu-2.2.0/configure.orig 2014-12-09 15:45:40.000000000 +0100 +++ qemu-2.2.0/configure 2014-12-10 16:15:20.450042400 +0100 @@ -555,7 +555,7 @@ CYGWIN*) mingw32="yes" QEMU_CFLAGS="-mno-cygwin $QEMU_CFLAGS" - audio_possible_drivers="winwave sdl" + audio_possible_drivers="winwave dsound sdl fmod" audio_drv_list="winwave" ;; MINGW32*) --- qemu-2.2.0/Makefile.objs.orig 2014-12-09 15:45:40.000000000 +0100 +++ qemu-2.2.0/Makefile.objs 2014-12-10 16:15:36.355632800 +0100 @@ -10,7 +10,7 @@ block-obj-y += nbd.o block.o blockjob.o block-obj-y += main-loop.o iohandler.o qemu-timer.o block-obj-$(CONFIG_POSIX) += aio-posix.o -block-obj-$(CONFIG_WIN32) += aio-win32.o +block-obj-$(CONFIG_WIN32) += aio-win32.o version.o block-obj-y += block/ block-obj-y += qemu-io-cmds.o --- qemu-2.2.0/Makefile.orig 2014-12-09 15:45:40.000000000 +0100 +++ qemu-2.2.0/Makefile 2014-12-10 16:36:32.984283100 +0100 @@ -172,7 +172,7 @@ $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pixman V="$(V)" all,) pixman/Makefile: $(SRC_PATH)/pixman/configure - (cd pixman; CFLAGS="$(CFLAGS) -fPIC $(extra_cflags) $(extra_ldflags)" $(SRC_PATH)/pixman/configure $(AUTOCONF_HOST) --disable-gtk --disable-shared --enable-static) + (cd pixman; CFLAGS="$(CFLAGS) $(extra_cflags) $(extra_ldflags)" $(SRC_PATH)/pixman/configure $(AUTOCONF_HOST) --disable-gtk --disable-shared --enable-static) $(SRC_PATH)/pixman/configure: (cd $(SRC_PATH)/pixman; autoreconf -v --install) @@ -197,11 +197,10 @@ recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES) -$(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc $(BUILD_DIR)/config-host.h | $(BUILD_DIR)/version.lo +$(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc $(SRC_PATH)/qemu.ico $(BUILD_DIR)/config-host.h | $(BUILD_DIR)/version.lo $(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<," RC version.o") -$(BUILD_DIR)/version.lo: $(SRC_PATH)/version.rc $(BUILD_DIR)/config-host.h +$(BUILD_DIR)/version.lo: $(SRC_PATH)/version.rc $(SRC_PATH)/qemu.ico $(BUILD_DIR)/config-host.h $(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<," RC version.lo") - Makefile: $(version-obj-y) $(version-lobj-y) ###################################################################### @@ -211,15 +210,15 @@ libqemuutil.a: $(util-obj-y) block-modules = $(foreach o,$(block-obj-m),"$(basename $(subst /,-,$o))",) NULL -util/module.o-cflags = -D'CONFIG_BLOCK_MODULES=$(block-modules)' +util/module.o-cflags = -DCONFIG_BLOCK_MODULES="$(block-modules)" ###################################################################### qemu-img.o: qemu-img-cmds.h -qemu-img$(EXESUF): qemu-img.o $(block-obj-y) libqemuutil.a libqemustub.a -qemu-nbd$(EXESUF): qemu-nbd.o $(block-obj-y) libqemuutil.a libqemustub.a -qemu-io$(EXESUF): qemu-io.o $(block-obj-y) libqemuutil.a libqemustub.a +qemu-img$(EXESUF): qemu-img.o $(block-obj-y) $(version-obj-y) libqemuutil.a libqemustub.a +qemu-nbd$(EXESUF): qemu-nbd.o $(block-obj-y) $(version-obj-y) libqemuutil.a libqemustub.a +qemu-io$(EXESUF): qemu-io.o $(block-obj-y) $(version-obj-y) libqemuutil.a libqemustub.a qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o @@ -388,6 +387,7 @@ $(INSTALL_DIR) "$(DESTDIR)$(qemu_confdir)" install-sysconfig: install-datadir install-confdir + $(INSTALL_DATA) $(SRC_PATH)/qemu.ico "$(DESTDIR)$(qemu_confdir)" $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)" install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \ @@ -543,11 +543,12 @@ makensis $(nsisflags) \ $(if $(BUILD_DOCS),-DCONFIG_DOCUMENTATION="y") \ $(if $(CONFIG_GTK),-DCONFIG_GTK="y") \ - -DBINDIR="${INSTDIR}" \ + -DBINDIR=`cygpath -w "${INSTDIR}"` \ + -DCONFSUFFIX="/Bios" \ $(if $(DLL_PATH),-DDLLDIR="$(DLL_PATH)") \ - -DSRCDIR="$(SRC_PATH)" \ - -DOUTFILE="$(INSTALLER)" \ - $(SRC_PATH)/qemu.nsi + -DSRCDIR=`cygpath -w "$(SRC_PATH)"` \ + -DOUTFILE=`cygpath -w "$(INSTALLER)"` \ + `cygpath -w $(SRC_PATH)/qemu.nsi` rm -r ${INSTDIR} ifdef SIGNCODE $(SIGNCODE) $(INSTALLER) --- qemu-2.2.0/po/fr_FR.po.orig 2014-12-09 15:45:43.000000000 +0100 +++ qemu-2.2.0/po/fr_FR.po 2014-12-10 16:15:36.412638500 +0100 @@ -2,24 +2,24 @@ # This file is put in the public domain. # # Aurelien Jarno , 2013, 2014. +# Éric Lassauge , 2014. msgid "" msgstr "" -"Project-Id-Version: QEMU 1.4.50\n" +"Project-Id-Version: QEMU 2.1.2\n" "Report-Msgid-Bugs-To: qemu-devel@nongnu.org\n" -"POT-Creation-Date: 2014-07-28 23:14+0200\n" -"PO-Revision-Date: 2014-07-28 23:25+0200\n" -"Last-Translator: Aurelien Jarno \n" +"POT-Creation-Date: 2014-10-15 13:32+0200\n" +"PO-Revision-Date: 2014-10-15 13:32+0200\n" +"Last-Translator: Eric Lassauge \n" "Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.4\n" #: ui/gtk.c:321 msgid " - Press Ctrl+Alt+G to release grab" -msgstr "- Appuyer sur Ctrl+Alt+G pour arrêter la capture" +msgstr "- Appuyez sur Ctrl+Alt+G pour arrêter la capture" #: ui/gtk.c:325 msgid " [Paused]" @@ -35,7 +35,7 @@ #: ui/gtk.c:1610 msgid "Power _Down" -msgstr "_Éteindre" +msgstr "Ét_eindre" #: ui/gtk.c:1616 msgid "_Quit" @@ -51,7 +51,7 @@ #: ui/gtk.c:1709 msgid "Zoom _Out" -msgstr "_Zoom arrière" +msgstr "Zoom a_rrière" #: ui/gtk.c:1716 msgid "Best _Fit" --- qemu-2.2.0/qemu.nsi.orig 2014-12-09 15:45:43.000000000 +0100 +++ qemu-2.2.0/qemu.nsi 2014-12-10 16:15:36.446641900 +0100 @@ -28,6 +28,12 @@ !ifndef BINDIR !define BINDIR nsis.tmp !endif +!ifndef CONFSUFFIX +!define CONFSUFFIX "" +!endif +!ifndef CONFDIR +!define CONFDIR "${BINDIR}${CONFSUFFIX}" +!endif !ifndef SRCDIR !define SRCDIR . !endif @@ -119,13 +125,13 @@ File "${SRCDIR}\README" File "${SRCDIR}\VERSION" - File "${BINDIR}\*.bmp" - File "${BINDIR}\*.bin" - File "${BINDIR}\*.dtb" - File "${BINDIR}\*.rom" - File "${BINDIR}\openbios-*" + File "${CONFDIR}\*.bmp" + File "${CONFDIR}\*.bin" + File "${CONFDIR}\*.dtb" + File "${CONFDIR}\*.rom" + File "${CONFDIR}\openbios-*" - File /r "${BINDIR}\keymaps" + File /r "${CONFDIR}\keymaps" !ifdef CONFIG_GTK File /r "${BINDIR}\share" !endif @@ -167,11 +173,12 @@ !ifdef CONFIG_DOCUMENTATION Section "Documentation" SectionDoc SetOutPath "$INSTDIR" - File "${BINDIR}\qemu-doc.html" - File "${BINDIR}\qemu-tech.html" + File "${BINDIR}\Doc\qemu-doc.html" + File "${BINDIR}\Doc\qemu-tech.html" + ;; File "${BINDIR}\Doc\*.txt" CreateDirectory "$SMPROGRAMS\${PRODUCT}" - CreateShortCut "$SMPROGRAMS\${PRODUCT}\User Documentation.lnk" "$INSTDIR\qemu-doc.html" "" "$INSTDIR\qemu-doc.html" 0 - CreateShortCut "$SMPROGRAMS\${PRODUCT}\Technical Documentation.lnk" "$INSTDIR\qemu-tech.html" "" "$INSTDIR\qemu-tech.html" 0 + CreateShortCut "$SMPROGRAMS\${PRODUCT}\User Documentation.lnk" "$INSTDIR\Doc\qemu-doc.html" "" "$INSTDIR\Doc\qemu-doc.html" 0 + CreateShortCut "$SMPROGRAMS\${PRODUCT}\Technical Documentation.lnk" "$INSTDIR\Doc\qemu-tech.html" "" "$INSTDIR\Doc\qemu-tech.html" 0 SectionEnd !endif @@ -205,19 +212,19 @@ Delete "$INSTDIR\COPYING.LIB" Delete "$INSTDIR\README" Delete "$INSTDIR\VERSION" - Delete "$INSTDIR\*.bmp" - Delete "$INSTDIR\*.bin" - Delete "$INSTDIR\*.dll" - Delete "$INSTDIR\*.dtb" - Delete "$INSTDIR\*.rom" - Delete "$INSTDIR\openbios-*" + Delete "${CONFDIR}\*.bmp" + Delete "${CONFDIR}\*.bin" + Delete "${CONFDIR}\*.dll" + Delete "${CONFDIR}\*.dtb" + Delete "${CONFDIR}\*.rom" + Delete "${CONFDIR}\openbios-*" Delete "$INSTDIR\qemu-img.exe" Delete "$INSTDIR\qemu-io.exe" Delete "$INSTDIR\qemu.exe" Delete "$INSTDIR\qemu-system-*.exe" - Delete "$INSTDIR\qemu-doc.html" - Delete "$INSTDIR\qemu-tech.html" - RMDir /r "$INSTDIR\keymaps" + Delete "$INSTDIR\Doc\qemu-doc.html" + Delete "$INSTDIR\Doc\qemu-tech.html" + RMDir /r "${CONFDIR}\keymaps" RMDir /r "$INSTDIR\share" ; Remove generated files Delete "$INSTDIR\stderr.txt" --- qemu-2.2.0/rules.mak.orig 2014-12-09 15:45:43.000000000 +0100 +++ qemu-2.2.0/rules.mak 2014-12-10 16:15:36.472644500 +0100 @@ -17,7 +17,7 @@ QEMU_CXXFLAGS = -D__STDC_LIMIT_MACROS $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wold-style-declaration -Wold-style-definition -Wredundant-decls, $(QEMU_CFLAGS)) # Flags for dependency generation -QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(*D)/$(*F).d +QEMU_DGFLAGS = # Same as -I$(SRC_PATH) -I., but for the nested source/object directories QEMU_INCLUDES += -I$(free_scale = FALSE; setlocale(LC_ALL, ""); - bindtextdomain("qemu", CONFIG_QEMU_LOCALEDIR); textdomain("qemu"); +#ifdef CONFIG_WIN32 + char *execdirname = qemu_get_exec_dir(); + char *dirname = g_strdup_printf("%s\\share",execdirname); + bindtextdomain("qemu",dirname); + g_free(dirname); + g_free(execdirname); +#else + bindtextdomain("qemu", CONFIG_QEMU_LOCALEDIR); +#endif s->null_cursor = gdk_cursor_new(GDK_BLANK_CURSOR); --- qemu-2.2.0/ui/vnc-enc-tight.c.orig 2014-12-09 15:45:46.000000000 +0100 +++ qemu-2.2.0/ui/vnc-enc-tight.c 2014-12-10 16:15:36.524649700 +0100 @@ -50,6 +50,8 @@ #include "vnc-enc-tight.h" #include "vnc-palette.h" +typedef unsigned int uint; + /* Compression level stuff. The following array contains various encoder parameters for each of 10 compression levels (0..9). Last three parameters correspond to JPEG quality levels (0..9). */ --- qemu-2.2.0/version.rc.orig 2014-12-09 15:45:46.000000000 +0100 +++ qemu-2.2.0/version.rc 2014-12-10 16:15:36.570654300 +0100 @@ -1,6 +1,7 @@ #include #include "config-host.h" +500 ICON "qemu.ico" VS_VERSION_INFO VERSIONINFO FILEVERSION CONFIG_FILEVERSION PRODUCTVERSION CONFIG_PRODUCTVERSION