Merge pull request #1039 from carstene1ns/release

Some last minute fixes and version 0.5.0

.github/ISSUE_TEMPLATE.md

@@ -1,6 +1,6 @@
 Thank you for supporting EasyRPG Player.
 Before creating an issue, please verify that your bug still occurs in the "continuous builds" of the Player.
-You can get them at the bottom of our download section: https://easy-rpg.org/player/downloads
+You can get them at the bottom of our download section: https://easyrpg.org/player/downloads
 
 ---
 Please fill in the following fields before submitting an issue:

CMakeLists.txt

@@ -5,6 +5,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED on)
 include(CMakeDependentOption)
 
 project(EasyRPG_Player CXX C)
+set(PACKAGE_VERSION "0.5.0")
 
 # Source Files
 set(PLAYER_SRCS
@@ -397,7 +398,7 @@ set(MAN_NAME easyrpg-player.6)
 find_program(A2X_EXECUTABLE NAMES a2x a2x.py)
 if(NOT A2X_EXECUTABLE STREQUAL "A2X_EXECUTABLE-NOTFOUND")
 	add_custom_command(OUTPUT resources/${MAN_NAME}
-		COMMAND ${A2X_EXECUTABLE} -a player_version="0.4.1" -f manpage -D ${CMAKE_CURRENT_BINARY_DIR}/resources ${CMAKE_CURRENT_SOURCE_DIR}/resources/${MAN_NAME}.adoc
+		COMMAND ${A2X_EXECUTABLE} -a player_version="${PACKAGE_VERSION}" -f manpage -D ${CMAKE_CURRENT_BINARY_DIR}/resources ${CMAKE_CURRENT_SOURCE_DIR}/resources/${MAN_NAME}.adoc
 		DEPENDS resources/${MAN_NAME}.adoc
 		COMMENT "(Re-)building manpage ${MAN_NAME}"
 		VERBATIM)
@@ -423,7 +424,6 @@ if(DOXYGEN_FOUND)
 	set(srcdir ${CMAKE_CURRENT_SOURCE_DIR})
 	configure_file(resources/Doxyfile.in resources/Doxyfile @ONLY)
 	unset(DX_DOCDIR)
-	unset(PACKAGE_VERSION)
 	unset(srcdir)
 
 	add_custom_target(player_doc

Makefile.am

@@ -1,7 +1,7 @@
 ACLOCAL_AMFLAGS = --install -I builds/autoconf/m4
 include builds/autoconf/aminclude/doxygen.am
 
-EXTRA_DIST = AUTHORS.md README.md builds lib/README resources CMakeLists.txt
+EXTRA_DIST = AUTHORS.md README.md builds lib/README.md resources CMakeLists.txt
 MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
 bin_PROGRAMS = easyrpg-player
@@ -377,9 +377,9 @@ endif
 endif
 
 # bash completion
-if HAVE_BASHCOMP
-bashcompdir = @bashcompinstdir@
-dist_bashcomp_DATA = resources/unix/bash-completion/easyrpg-player
+if HAVE_BASHCOMPLETION
+bashcompletiondir = $(BASHCOMPLETION_DIR)
+dist_bashcompletion_DATA = resources/unix/bash-completion/easyrpg-player
 endif
 
 # FIXME make filefinder work without external scripting

README.md

@@ -23,7 +23,7 @@ Documentation is available at the documentation wiki: https://wiki.easyrpg.org
 - libpng for PNG image support.
 - zlib for XYZ image support.
 
-SDL and SDL_mixer 1.2 are still supported but deprecated.
+SDL and SDL_mixer 1.2 are still supported, but deprecated.
 
 ### extended / recommended
 
@@ -66,8 +66,8 @@ Building requirements:
 
 Step-by-step instructions:
 
-    tar xf easyrpg-player-0.4.1.tar.xz # unpack the tarball 
-    cd easyrpg-player-0.4.1            # enter in the package directory
+    tar xf easyrpg-player-0.5.0.tar.xz # unpack the tarball
+    cd easyrpg-player-0.5.0            # enter in the package directory
     ./configure                        # find libraries, set options
     make                               # compile the executable
 

builds/android/app/src/main/java/org/easyrpg/player/player/EasyRpgPlayerActivity.java

@@ -231,7 +231,7 @@ public void onClick(DialogInterface dialog, int id) {
                         Intent intent = new Intent(Intent.ACTION_SEND_MULTIPLE);
                         intent.setData(Uri.parse("mailto:"));
                         intent.setType("*/*");
-                        intent.putExtra(Intent.EXTRA_EMAIL, new String[]{"easyrpg@easy-rpg.org"});
+                        intent.putExtra(Intent.EXTRA_EMAIL, new String[]{"easyrpg@easyrpg.org"});
                         intent.putExtra(Intent.EXTRA_SUBJECT, "Bug report");
                         intent.putExtra(Intent.EXTRA_TEXT, getApplicationContext().getString(R.string.report_bug_mail));
                         intent.putExtra(Intent.EXTRA_STREAM, files);

builds/wii/meta.xml

@@ -2,10 +2,10 @@
 <app version="1">
   <name>EasyRPG Player</name>
   <coder>EasyRPG Team</coder>
-  <version>0.4.1</version>
-  <release_date>20160319000000</release_date>
+  <version>0.5.0</version>
+  <release_date>20160918000000</release_date>
   <short_description>RPG Maker 2000/2003 player</short_description>
-  <long_description>EasyRPG is a Role Playing Game interpreter for playing games created by the RPG Maker 2000/2003.
+  <long_description>EasyRPG Player is a Role Playing Game interpreter for playing games created by RPG Maker 2000/2003.
 
-Homepage: https://easy-rpg.org/</long_description>
+Homepage: https://easyrpg.org/</long_description>
 </app>

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([easyrpg-player],[0.4.1],[https://github.com/EasyRPG/Player/issues],[easyrpg-player],[https://easy-rpg.org/])
+AC_INIT([easyrpg-player],[0.5.0],[https://github.com/EasyRPG/Player/issues],[easyrpg-player],[https://easyrpg.org])
 
 AC_CONFIG_AUX_DIR([builds/autoconf])
 AM_INIT_AUTOMAKE([1.11.4 foreign subdir-objects tar-ustar -Wall -Werror])
@@ -17,6 +17,7 @@ AC_CONFIG_HEADERS([config.h])
 AM_PROG_AR
 AC_PROG_CXX
 LT_INIT([disable-shared])
+PKG_PROG_PKG_CONFIG
 
 # Options
 AC_ARG_VAR([EM_GAME_URL], [Game URL/directory (only used for the Emscripten port)])
@@ -89,6 +90,21 @@ AS_IF([test "x$with_libspeexdsp" != "xno"],[
 	PKG_CHECK_MODULES([SPEEXDSP],[speexdsp],[AC_DEFINE(HAVE_LIBSPEEXDSP,[1],[Disable resampling support provided by libspeexdsp])],[auto_speexdsp=0])
 ])
 
+# bash completion
+AC_ARG_WITH([bash-completion-dir],[AS_HELP_STRING([--with-bash-completion-dir@<:@=DIR@:>@],
+	[Install the parameter auto-completion script for bash in DIR. @<:@default=auto@:>@])],
+	[],[with_bash_completion_dir=yes])
+AS_IF([test "x$with_bash_completion_dir" = "xyes"],[
+	BASHCOMPLETION_DIR="`$PKG_CONFIG --silence-errors --define-variable=prefix="\${prefix}" --variable=completionsdir bash-completion`"
+],[
+	BASHCOMPLETION_DIR=$with_bash_completion_dir
+])
+AS_IF([test "x$BASHCOMPLETION_DIR" = "x"],[
+	BASHCOMPLETION_DIR="${datadir}/bash-completion/completions"
+])
+AC_SUBST([BASHCOMPLETION_DIR])
+AM_CONDITIONAL([HAVE_BASHCOMPLETION], [test "x$with_bash_completion_dir" != "xno"])
+
 # Checks for header files.
 AC_CHECK_HEADERS([stdint.h stdlib.h string.h unistd.h wchar.h])
 
@@ -106,8 +122,7 @@ AC_TYPE_UINT8_T
 
 # Checks for library functions.
 AC_FUNC_ERROR_AT_LINE
-AC_FUNC_MALLOC
-AC_CHECK_FUNCS([floor getcwd memset putenv strerror])
+AC_CHECK_FUNCS([malloc floor getcwd memset putenv strerror])
 
 # manual page
 AC_CHECK_PROGS([A2X], [a2x a2x.py], [no])
@@ -117,11 +132,6 @@ AS_IF([test x"$A2X" = "xno" && test ! -f "${srcdir}/resources/easyrpg-player.6"]
   AC_MSG_WARN([a2x is required to create the manual page]))
 AM_CONDITIONAL([HAVE_MANUAL], [test -f "${srcdir}/resources/easyrpg-player.6"])
 
-# bash completion
-PKG_CHECK_VAR([bashcompinstdir],[bash-completion],[completionsdir])
-AM_CONDITIONAL([HAVE_BASHCOMP], [test "x$bashcompinstdir" != "x"])
-AC_SUBST(bashcompinstdir)
-
 # Doxygen source documentation
 m4_include([builds/autoconf/m4/ax_prog_doxygen.m4])
 DX_DOXYGEN_FEATURE(OFF)

lib/README → lib/README.md

@@ -6,6 +6,5 @@ The following note only applies to these builds:
 - Visual Studio 2015 project (Windows)
 - OpenDingux Makefile (Dingoo, GCW Zero)
 
-Before compiling the player clone liblcf into a subfolder called
-liblcf here.
+Before compiling the Player, clone liblcf into a subfolder called `liblcf` here.
 The library can be found under https://github.com/EasyRPG/liblcf

resources/easyrpg-player.6.adoc

@@ -146,8 +146,8 @@ https://github.com/EasyRPG/Player/issues
 
 
 == COPYRIGHT / AUTHORS
-EasyRPG Player is Copyright (C) 2007-2016 the EasyRPG authors, see file AUTHORS
-for details.
+EasyRPG Player is Copyright (C) 2007-2016 the EasyRPG authors, see file
+AUTHORS.md for details.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU GPL version 3.
@@ -159,5 +159,5 @@ mkxp - An open source RGSS (Ruby Game Scripting System) interface
 implementation that aims to support games created by "RPG Maker XP",
 "RPG Maker VX" and "RPG Maker VX Ace"
 
-For additional information aubout EasyRPG software and related projects there
-is a wiki: https://easy-rpg.org/wiki/
+For additional information about EasyRPG software and related projects there
+is a wiki: https://wiki.easyrpg.org

resources/osx/Info.plist

@@ -7,7 +7,7 @@
     <string>EasyRPG Player</string>
 
     <key>CFBundleGetInfoString</key>
-    <string>https://easy-rpg.org/</string>
+    <string>https://easyrpg.org</string>
 
     <key>CFBundleIconFile</key>
     <string>Player.icns</string>
@@ -31,7 +31,7 @@
     <string>APPL</string>
 
     <key>CFBundleShortVersionString</key>
-    <string>0.4.1</string>
+    <string>0.5.0</string>
 
 </dict>
 </plist>

resources/player.rc

@@ -3,23 +3,23 @@
 1 24 "player.xml"
 #endif
 1 VERSIONINFO
-FILEVERSION 0,4,1,0
-PRODUCTVERSION 0,4,1,0
+FILEVERSION 0,5,0,0
+PRODUCTVERSION 0,5,0,0
 FILETYPE 0x00000001L
 {
 	BLOCK "StringFileInfo"
 	{
 		BLOCK "000004E4"
 		{
-			VALUE "Comments", "https://easy-rpg.org/"
+			VALUE "Comments", "https://easyrpg.org"
 			VALUE "CompanyName", "EasyRPG Project"
-			VALUE "FileVersion", "0.4.1.0"
+			VALUE "FileVersion", "0.5.0.0"
 			VALUE "FileDescription", "EasyRPG Player"
 			VALUE "InternalName", "easyrpg-player"
 			VALUE "LegalCopyright", "2005-2016 EasyRPG Project"
 			VALUE "OriginalFilename", "Player.exe"
 			VALUE "ProductName", "EasyRPG Player"
-			VALUE "ProductVersion", "0.4.1.0"
+			VALUE "ProductVersion", "0.5.0.0"
 		}
 	}
 	BLOCK "VarFileInfo"

src/decoder_wildmidi.cpp

@@ -172,18 +172,19 @@ int WildMidiDecoder::FillBuffer(uint8_t* buffer, int length) {
 	if (!handle)
 		return -1;
 
-	int res = WildMidi_GetOutput(handle, reinterpret_cast<char*>(buffer), length);
-
-	/* Old wildmidi (< 0.4.0) did output only in little endian, this inverts the buffer.
-	 * The used version macro exists since 0.4.0
+	/* Old wildmidi (< 0.4.0) did output only in little endian and had a different API,
+	 * this inverts the buffer. The used version macro exists since 0.4.0.
 	 */
 #ifndef LIBWILDMIDI_VERSION
+	int res = WildMidi_GetOutput(handle, reinterpret_cast<char*>(buffer), length);
 	if (Utils::IsBigEndian() && res > 0) {
 		uint16_t* buffer_16 = reinterpret_cast<uint16_t*>(buffer);
 		for (int i = 0; i < res / 2; ++i) {
 			Utils::SwapByteOrder(buffer_16[i]);
 		}
 	}
+#else
+	int res = WildMidi_GetOutput(handle, reinterpret_cast<int8_t*>(buffer), length);
 #endif
 	return res;
 }

src/exfont.h

@@ -16,7 +16,7 @@
  */
 
 // The default EXFONT, composed by filosofiamanga
-// https://easy-rpg.org/forums/viewtopic.php?t=36
+// https://community.easyrpg.org/t/volunteer-for-exfont-replacement/56
 
 #ifndef _EXFONT_H_
 #define _EXFONT_H_