[gentoo-commits] gentoo-x86 commit in games-emulation/yabause/files: yabause-0.9.14-RWX.patch yabause-0.9.14-cmake.patch

[gentoo-commits] gentoo-x86 commit in games-emulation/yabause/files: yabause-0.9.14-RWX.patch yabause-0.9.14-cmake.patch

[Michael Sterrett (mr_bones_)]

mr_bones_    15/02/09 21:39:51

  Added:                yabause-0.9.14-RWX.patch yabause-0.9.14-cmake.patch
  Log:
  version bump
  
  (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.1                  games-emulation/yabause/files/yabause-0.9.14-RWX.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/yabause/files/yabause-0.9.14-RWX.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/yabause/files/yabause-0.9.14-RWX.patch?rev=1.1&content-type=text/plain

Index: yabause-0.9.14-RWX.patch
===================================================================
--- yabause-0.9.13.orig/src/sh2_dynarec/linkage_x64.s
+++ yabause-0.9.13/src/sh2_dynarec/linkage_x64.s
@@ -747,3 +747,11 @@
 	ret
 	/* Set breakpoint here for debugging */
 	.size	breakpoint, .-breakpoint
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
--- yabause-0.9.13.orig/src/sh2_dynarec/linkage_x86.s
+++ yabause-0.9.13/src/sh2_dynarec/linkage_x86.s
@@ -743,3 +743,7 @@
 	ret
 	/* Set breakpoint here for debugging */
 	.size	breakpoint, .-breakpoint
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif



1.1                  games-emulation/yabause/files/yabause-0.9.14-cmake.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/yabause/files/yabause-0.9.14-cmake.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/yabause/files/yabause-0.9.14-cmake.patch?rev=1.1&content-type=text/plain

Index: yabause-0.9.14-cmake.patch
===================================================================
--- yabause-0.9.13.orig/l10n/CMakeLists.txt
+++ yabause-0.9.13/l10n/CMakeLists.txt
@@ -2,9 +2,12 @@
 
 set(LANGS de es fr it lt nl pt pt_BR sv)
 
+# paths
+set(TRANSDIR "share/yabause/yts" CACHE STRING "dir to translation files")
+
 if (UNIX AND NOT APPLE)
     foreach(LANG ${LANGS})
-	    install(FILES "yabause_${LANG}.yts" DESTINATION "share/yabause/yts" RENAME "${LANG}.yts")
+	    install(FILES "yabause_${LANG}.yts" DESTINATION ${TRANSDIR} RENAME "${LANG}.yts")
     endforeach()
 elseif (WIN32)
     foreach(LANG ${LANGS})
--- yabause-0.9.13.orig/src/gtk/CMakeLists.txt
+++ yabause-0.9.13/src/gtk/CMakeLists.txt
@@ -59,7 +59,10 @@
 yab_port_success(yabause-gtk)
 configure_file(yabause.desktop.in ${YAB_PORT_NAME}.desktop)
 
-install(TARGETS yabause-gtk DESTINATION "bin")
+# paths
+set(BINDIR "bin" CACHE STRING "dir to binary")
+
+install(TARGETS yabause-gtk DESTINATION ${BINDIR})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${YAB_PORT_NAME}.desktop DESTINATION "share/applications")
 install(FILES "doc/yabause.1" DESTINATION "${YAB_MAN_DIR}/man1" RENAME "${YAB_PORT_NAME}.1")
 install(FILES "yabause.png" DESTINATION "share/pixmaps")
--- yabause-0.9.13.orig/src/qt/CMakeLists.txt
+++ yabause-0.9.13/src/qt/CMakeLists.txt
@@ -237,6 +237,9 @@
 yab_port_success(yabause-qt)
 configure_file(yabause.desktop.in ${YAB_PORT_NAME}.desktop)
 
+# paths
+set(BINDIR "bin" CACHE STRING "dir to binary")
+
 if (WIN32)
 	install(TARGETS yabause-qt DESTINATION ".")
 	if (GLUT_FOUND)
@@ -277,7 +280,7 @@
 		endif()
 	endif ()
 else ()
-	install(TARGETS yabause-qt DESTINATION "bin")
+	install(TARGETS yabause-qt DESTINATION ${BINDIR})
 	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${YAB_PORT_NAME}.desktop DESTINATION "share/applications")
 	install(FILES "doc/yabause.1" DESTINATION "${YAB_MAN_DIR}/man1" RENAME "${YAB_PORT_NAME}.1")
 	install(FILES "resources/icons/yabause.png" DESTINATION "share/pixmaps")