From 87ee8c700aebc90c07b9e339da15a4849df3f8c7 Mon Sep 17 00:00:00 2001 From: Mystro256 Date: Fri, 9 Dec 2016 23:33:19 -0500 Subject: [PATCH 1/6] Forgot two instances of SYSCONF_INSTALL_DIR --- src/common/ConfigManager.cpp | 2 +- src/sdl/SDL.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/ConfigManager.cpp b/src/common/ConfigManager.cpp index 44257dc0..dafdb72b 100644 --- a/src/common/ConfigManager.cpp +++ b/src/common/ConfigManager.cpp @@ -696,7 +696,7 @@ const char* FindConfigFile(const char *name) return path; } - sprintf(path, "%s%c%s", SYSCONFDIR, FILE_SEP, name); + sprintf(path, "%s%c%s", SYSCONF_INSTALL_DIR, FILE_SEP, name); if (FileExists(path)) { return path; diff --git a/src/sdl/SDL.cpp b/src/sdl/SDL.cpp index 4dc5eec1..ac328e8e 100644 --- a/src/sdl/SDL.cpp +++ b/src/sdl/SDL.cpp @@ -422,8 +422,8 @@ FILE* sdlFindFile(const char* name) if (f != NULL) return f; - fprintf(stdout, "Searching system config directory: %s\n", SYSCONFDIR); - sprintf(path, "%s%c%s", SYSCONFDIR, FILE_SEP, name); + fprintf(stdout, "Searching system config directory: %s\n", SYSCONF_INSTALL_DIR); + sprintf(path, "%s%c%s", SYSCONF_INSTALL_DIR, FILE_SEP, name); f = fopen(path, "r"); if (f != NULL) return f; From 24d2521914e3c02333cf08a50945b5e38b539b7a Mon Sep 17 00:00:00 2001 From: Mystro256 Date: Sat, 10 Dec 2016 17:50:27 -0500 Subject: [PATCH 2/6] Manpage fixes --- CMakeLists.txt | 10 +++++----- src/debian/{gvbam.1 => gvbam.6} | 12 +++++------ src/debian/{vbam.1 => vbam.6} | 2 +- src/debian/{wxvbam.1 => visualboyadvance-m.6} | 20 +++++++++---------- 4 files changed, 21 insertions(+), 23 deletions(-) rename src/debian/{gvbam.1 => gvbam.6} (63%) rename src/debian/{vbam.1 => vbam.6} (98%) rename src/debian/{wxvbam.1 => visualboyadvance-m.6} (66%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 07f40643..3ee91ef9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -708,12 +708,12 @@ ENDIF(NOT APPLE) # manual pages IF( UNIX ) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/vbam.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1) - IF( ENABLE_GTK ) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/gvbam.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1) - ENDIF( ENABLE_GTK ) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/vbam.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6) + IF( ENABLE_GTK OR ENABLE_GTK3 ) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/gvbam.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6) + ENDIF( ENABLE_GTK OR ENABLE_GTK3 ) IF( ENABLE_WX ) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/wxvbam.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/visualboyadvance-m.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6) ENDIF( ENABLE_WX ) ENDIF( UNIX ) diff --git a/src/debian/gvbam.1 b/src/debian/gvbam.6 similarity index 63% rename from src/debian/gvbam.1 rename to src/debian/gvbam.6 index 0cb396fc..cac64593 100644 --- a/src/debian/gvbam.1 +++ b/src/debian/gvbam.6 @@ -1,9 +1,9 @@ -.TH gvbam 1 "March 28, 2012" +.TH gvbam 6 "December 10, 2016" .SH NAME VBAM-GTK \- (aka .B gvbam -) A gtk GUI for a high compatibility Gameboy Advance -Emulator combining Visual Boy Advance developments. +) A gtk+ GUI for a high compatibility Gameboy Advance +Emulator integrating the best features from various Visual Boy Advance builds. .SH SYNOPSIS .B GVBAM .RI [ options ] @@ -17,7 +17,7 @@ addition to the original Game Boy hand held systems and its Super and Color variants. .P VBA-M is a continued development of the now inactive VisualBoy -Advance project, with many improvements from various developments of VBA. +Advance project, with many improvements from various builds of VBA. .P This application is the GTK GUI version of VisualBoyAdvance-M. .SH OPTIONS @@ -28,5 +28,5 @@ Output version information .B \-v, \-\-version Output version information .SH AUTHOR -This manual page was written by Jeremy Newton , -for the RPMFusion and VBAM. This man page can be free used by anyone. +This manual page was written by Jeremy Newton (Mystro256). +This man page is licensed as GPLv2 or later. diff --git a/src/debian/vbam.1 b/src/debian/vbam.6 similarity index 98% rename from src/debian/vbam.1 rename to src/debian/vbam.6 index 37e7cd94..1da29478 100644 --- a/src/debian/vbam.1 +++ b/src/debian/vbam.6 @@ -1,4 +1,4 @@ -.TH "VBAM" "1" "January 2008" "VBA-M development team" "User Commands" +.TH "VBAM" "6" "January 2008" "VBA-M development team" "User Commands" .SH "NAME" vbam \- manual page for VisualBoy Advance\-M .SH "DESCRIPTION" diff --git a/src/debian/wxvbam.1 b/src/debian/visualboyadvance-m.6 similarity index 66% rename from src/debian/wxvbam.1 rename to src/debian/visualboyadvance-m.6 index 1fd7c8a5..f0f94aea 100644 --- a/src/debian/wxvbam.1 +++ b/src/debian/visualboyadvance-m.6 @@ -1,11 +1,9 @@ -.TH wxvbam 1 "March 28, 2012" +.TH visualboyadvance-m 6 "December 10, 2016" .SH NAME -VBAM-WX \- (aka -.B wxvbam -) A wxWidgets GUI for a high compatibility Gameboy Advance -Emulator combining Visual Boy Advance developments. +VisualBoyAdvance-M - A wxWidgets GUI for a high compatibility Gameboy Advance +Emulator integrating the best features from various Visual Boy Advance builds. .SH SYNOPSIS -.B WXVBAM +.B visualboyadvance-m .RI [ options ] .SH DESCRIPTION .B VisualBoyAdvance-M @@ -17,7 +15,7 @@ addition to the original Game Boy hand held systems and its Super and Color variants. .P VBA-M is a continued development of the now inactive VisualBoy -Advance project, with many improvements from various developments of VBA. +Advance project, with many improvements from various builds of VBA. .P This application is the wxWidgets GUI version of VisualBoyAdvance-M. .SH OPTIONS @@ -31,10 +29,10 @@ Generate verbose log messages .B \-\-save-xrc= Save built-in XRC file and exit .TP -.B \-\-save-over= +.B \-\-save-over= Save built-in vba-over.ini and exit .TP -.B \-\-print-cfg-path +.B \-\-print-cfg-path Print configuration path and exit .TP .B \-f, \-\-fullscreen @@ -46,5 +44,5 @@ Delete shared link state first, if it exists .B \-o, \-\-list-options List all settable options and exit .SH AUTHOR -This manual page was written by Jeremy Newton , -for the RPMFusion and VBAM. This man page can be free used by anyone. +This manual page was written by Jeremy Newton (Mystro256). +This man page is licensed as GPLv2 or later. From d6228254cfc0358b8b49fc915d7f2b1895a850c2 Mon Sep 17 00:00:00 2001 From: Mystro256 Date: Sat, 10 Dec 2016 18:27:18 -0500 Subject: [PATCH 3/6] cmake fixes -Whitespace fixes -Binaries installation fixes --- CMakeLists.txt | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ee91ef9..b98afb08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -276,10 +276,10 @@ if( ENABLE_NLS ) IF(ENABLE_LINK) FIND_PATH(LIBINTL_INC libintl.h ) FIND_LIBRARY(LIBINTL_LIB intl ) - IF(LIBINTL_LIB) + IF(LIBINTL_LIB) SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${LIBINTL_LIB}) SET(VBAMCORE_LIBS ${VBAMCORE_LIBS} ${LIBINTL_LIB}) - ENDIF(LIBINTL_LIB) + ENDIF(LIBINTL_LIB) INCLUDE(CheckFunctionExists) CHECK_FUNCTION_EXISTS(gettext GETTEXT_FN) IF(NOT LIBINTL_INC OR NOT GETTEXT_FN) @@ -674,25 +674,27 @@ IF( ENABLE_SDL ) ${WIN32_LIBRARIES} ${LIRC_CLIENT_LIBRARY} ) - IF( WIN32 ) - INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/visualboyadvance-m${CMAKE_EXECUTABLE_SUFFIX} DESTINATION bin) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example - DESTINATION ${CMAKE_INSTALL_PREFIX}/${SYSCONF_INSTALL_DIR} - RENAME vbam.cfg) - ELSE( WIN32 ) - INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vbam DESTINATION bin) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example - DESTINATION ${SYSCONF_INSTALL_DIR} - RENAME vbam.cfg) - ENDIF( WIN32 ) + INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vbam DESTINATION bin) + + IF( WIN32 ) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example + DESTINATION ${CMAKE_INSTALL_PREFIX}/${SYSCONF_INSTALL_DIR} + RENAME vbam.cfg) + ELSE( WIN32 ) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example + DESTINATION ${SYSCONF_INSTALL_DIR} + RENAME vbam.cfg) + ENDIF( WIN32 ) ENDIF( ENABLE_SDL ) IF( ENABLE_GTK OR ENABLE_GTK3 ) - add_subdirectory (src/gtk) + add_subdirectory (src/gtk) + INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/gvbam${CMAKE_EXECUTABLE_SUFFIX} DESTINATION bin) ENDIF( ENABLE_GTK OR ENABLE_GTK3 ) IF( ENABLE_WX ) add_subdirectory(src/wx) + INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/visualboyadvance-m${CMAKE_EXECUTABLE_SUFFIX} DESTINATION bin) ENDIF( ENABLE_WX ) if( ENABLE_GTK OR ENABLE_GTK3 OR ENABLE_WX ) @@ -708,7 +710,9 @@ ENDIF(NOT APPLE) # manual pages IF( UNIX ) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/vbam.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6) + IF( ENABLE_SDL ) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/vbam.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6) + ENDIF( ENABLE_SDL ) IF( ENABLE_GTK OR ENABLE_GTK3 ) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/gvbam.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6) ENDIF( ENABLE_GTK OR ENABLE_GTK3 ) From 8baa41584828b1e557046a790033e2b0f8e0ff5a Mon Sep 17 00:00:00 2001 From: Mystro256 Date: Sat, 10 Dec 2016 18:33:01 -0500 Subject: [PATCH 4/6] Add linux appdata and fixes Desktop files aren't installed for linux by default --- CMakeLists.txt | 12 ++++++++++++ src/gtk/gvbam.appdata.xml | 19 +++++++++++++++++++ src/wx/wxvbam.appdata.xml | 19 +++++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 src/gtk/gvbam.appdata.xml create mode 100644 src/wx/wxvbam.appdata.xml diff --git a/CMakeLists.txt b/CMakeLists.txt index b98afb08..a279f1f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -721,6 +721,18 @@ IF( UNIX ) ENDIF( ENABLE_WX ) ENDIF( UNIX ) +# linux data files +IF( NOT WIN32 AND NOT APPLE ) + IF( ENABLE_GTK OR ENABLE_GTK3 ) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/gvbam.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/gvbam.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/appdata) + ENDIF( ENABLE_GTK OR ENABLE_GTK3 ) + IF( ENABLE_WX ) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/wx/wxvbam.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/wx/wxvbam.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/appdata) + ENDIF( ENABLE_WX ) +ENDIF( NOT WIN32 AND NOT APPLE ) + SET(CPACK_GENERATOR "ZIP") set(CPACK_SOURCE_GENERATOR "TGZ") SET(CPACK_PACKAGE_VERSION_MAJOR "2") diff --git a/src/gtk/gvbam.appdata.xml b/src/gtk/gvbam.appdata.xml new file mode 100644 index 00000000..7bde09c5 --- /dev/null +++ b/src/gtk/gvbam.appdata.xml @@ -0,0 +1,19 @@ + + + gvbam.desktop + GPLv2 + GPLv2 + VBAM (GTK) + GTK3 GUI for VBA-M, a high compatibility Gameboy Advance Emulator + +

+ VisualBoyAdvance-M is a Nintendo Game Boy Emulator with high compatibility with + commercial games. It emulates the Nintendo Game Boy Advance hand held console, + in addition to the original Game Boy hand held systems and its Super and Color + variants. VBA-M is a continued development of the now inactive VisualBoy + Advance project, with many improvements from various developments of VBA. +

+ + http://vba-m.com/ + https://github.com/visualboyadvance-m/visualboyadvance-m/issues + diff --git a/src/wx/wxvbam.appdata.xml b/src/wx/wxvbam.appdata.xml new file mode 100644 index 00000000..a5dcf093 --- /dev/null +++ b/src/wx/wxvbam.appdata.xml @@ -0,0 +1,19 @@ + + + wxvbam.desktop + GPLv2 + GPLv2 + VBAM (WX) + WX GUI for VBA-M, a high compatibility Gameboy Advance Emulator + +

+ VisualBoyAdvance-M is a Nintendo Game Boy Emulator with high compatibility with + commercial games. It emulates the Nintendo Game Boy Advance hand held console, + in addition to the original Game Boy hand held systems and its Super and Color + variants. VBA-M is a continued development of the now inactive VisualBoy + Advance project, with many improvements from various developments of VBA. +

+ + http://vba-m.com/ + https://github.com/visualboyadvance-m/visualboyadvance-m/issues + From 8f694f054bf2c5b7f978c4735b0054392c957bc0 Mon Sep 17 00:00:00 2001 From: Mystro256 Date: Sat, 10 Dec 2016 19:19:34 -0500 Subject: [PATCH 5/6] Fix FSF address information --- src/filters/admame.cpp | 4 ++-- src/filters/hq2x.cpp | 4 ++-- src/filters/interp.h | 4 ++-- src/sdl/text.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/filters/admame.cpp b/src/filters/admame.cpp index d6661e3c..094101d0 100644 --- a/src/filters/admame.cpp +++ b/src/filters/admame.cpp @@ -14,8 +14,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * In addition, as a special exception, Andrea Mazzoleni * gives permission to link the code of this program with diff --git a/src/filters/hq2x.cpp b/src/filters/hq2x.cpp index 67a5cb5e..8fd39b97 100644 --- a/src/filters/hq2x.cpp +++ b/src/filters/hq2x.cpp @@ -14,8 +14,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * In addition, as a special exception, Andrea Mazzoleni * gives permission to link the code of this program with diff --git a/src/filters/interp.h b/src/filters/interp.h index 0b2b7bba..394a91db 100644 --- a/src/filters/interp.h +++ b/src/filters/interp.h @@ -14,8 +14,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * In addition, as a special exception, Andrea Mazzoleni * gives permission to link the code of this program with diff --git a/src/sdl/text.cpp b/src/sdl/text.cpp index 5b1dc115..d5481cd7 100644 --- a/src/sdl/text.cpp +++ b/src/sdl/text.cpp @@ -14,8 +14,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* Code originally from fceu/drawing.h file, adapted by Forgotten From 1af42f486c390a58cbc159cac95501b8eb400ae6 Mon Sep 17 00:00:00 2001 From: Mystro256 Date: Sat, 10 Dec 2016 19:34:16 -0500 Subject: [PATCH 6/6] Use full name for wx appdata --- src/wx/wxvbam.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wx/wxvbam.appdata.xml b/src/wx/wxvbam.appdata.xml index a5dcf093..b4e0af5a 100644 --- a/src/wx/wxvbam.appdata.xml +++ b/src/wx/wxvbam.appdata.xml @@ -3,7 +3,7 @@ wxvbam.desktop GPLv2 GPLv2 - VBAM (WX) + VisualBoyAdvance-M WX GUI for VBA-M, a high compatibility Gameboy Advance Emulator