Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-emulation/yabause/files: yabause-0.9.14-RWX.patch yabause-0.9.14-cmake.patch
Date: Mon, 09 Feb 2015 21:39:56
Message-Id: 20150209213951.E863811692@oystercatcher.gentoo.org
1 mr_bones_ 15/02/09 21:39:51
2
3 Added: yabause-0.9.14-RWX.patch yabause-0.9.14-cmake.patch
4 Log:
5 version bump
6
7 (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
8
9 Revision Changes Path
10 1.1 games-emulation/yabause/files/yabause-0.9.14-RWX.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/yabause/files/yabause-0.9.14-RWX.patch?rev=1.1&view=markup
13 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
14
15 Index: yabause-0.9.14-RWX.patch
16 ===================================================================
17 --- yabause-0.9.13.orig/src/sh2_dynarec/linkage_x64.s
18 +++ yabause-0.9.13/src/sh2_dynarec/linkage_x64.s
19 @@ -747,3 +747,11 @@
20 ret
21 /* Set breakpoint here for debugging */
22 .size breakpoint, .-breakpoint
23 +
24 +#if defined(__linux__) && defined(__ELF__)
25 +.section .note.GNU-stack,"",%progbits
26 +#endif
27 +
28 +#if defined(__linux__) && defined(__ELF__)
29 +.section .note.GNU-stack,"",%progbits
30 +#endif
31 --- yabause-0.9.13.orig/src/sh2_dynarec/linkage_x86.s
32 +++ yabause-0.9.13/src/sh2_dynarec/linkage_x86.s
33 @@ -743,3 +743,7 @@
34 ret
35 /* Set breakpoint here for debugging */
36 .size breakpoint, .-breakpoint
37 +
38 +#if defined(__linux__) && defined(__ELF__)
39 +.section .note.GNU-stack,"",%progbits
40 +#endif
41
42
43
44 1.1 games-emulation/yabause/files/yabause-0.9.14-cmake.patch
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/yabause/files/yabause-0.9.14-cmake.patch?rev=1.1&view=markup
47 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
48
49 Index: yabause-0.9.14-cmake.patch
50 ===================================================================
51 --- yabause-0.9.13.orig/l10n/CMakeLists.txt
52 +++ yabause-0.9.13/l10n/CMakeLists.txt
53 @@ -2,9 +2,12 @@
54
55 set(LANGS de es fr it lt nl pt pt_BR sv)
56
57 +# paths
58 +set(TRANSDIR "share/yabause/yts" CACHE STRING "dir to translation files")
59 +
60 if (UNIX AND NOT APPLE)
61 foreach(LANG ${LANGS})
62 - install(FILES "yabause_${LANG}.yts" DESTINATION "share/yabause/yts" RENAME "${LANG}.yts")
63 + install(FILES "yabause_${LANG}.yts" DESTINATION ${TRANSDIR} RENAME "${LANG}.yts")
64 endforeach()
65 elseif (WIN32)
66 foreach(LANG ${LANGS})
67 --- yabause-0.9.13.orig/src/gtk/CMakeLists.txt
68 +++ yabause-0.9.13/src/gtk/CMakeLists.txt
69 @@ -59,7 +59,10 @@
70 yab_port_success(yabause-gtk)
71 configure_file(yabause.desktop.in ${YAB_PORT_NAME}.desktop)
72
73 -install(TARGETS yabause-gtk DESTINATION "bin")
74 +# paths
75 +set(BINDIR "bin" CACHE STRING "dir to binary")
76 +
77 +install(TARGETS yabause-gtk DESTINATION ${BINDIR})
78 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${YAB_PORT_NAME}.desktop DESTINATION "share/applications")
79 install(FILES "doc/yabause.1" DESTINATION "${YAB_MAN_DIR}/man1" RENAME "${YAB_PORT_NAME}.1")
80 install(FILES "yabause.png" DESTINATION "share/pixmaps")
81 --- yabause-0.9.13.orig/src/qt/CMakeLists.txt
82 +++ yabause-0.9.13/src/qt/CMakeLists.txt
83 @@ -237,6 +237,9 @@
84 yab_port_success(yabause-qt)
85 configure_file(yabause.desktop.in ${YAB_PORT_NAME}.desktop)
86
87 +# paths
88 +set(BINDIR "bin" CACHE STRING "dir to binary")
89 +
90 if (WIN32)
91 install(TARGETS yabause-qt DESTINATION ".")
92 if (GLUT_FOUND)
93 @@ -277,7 +280,7 @@
94 endif()
95 endif ()
96 else ()
97 - install(TARGETS yabause-qt DESTINATION "bin")
98 + install(TARGETS yabause-qt DESTINATION ${BINDIR})
99 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${YAB_PORT_NAME}.desktop DESTINATION "share/applications")
100 install(FILES "doc/yabause.1" DESTINATION "${YAB_MAN_DIR}/man1" RENAME "${YAB_PORT_NAME}.1")
101 install(FILES "resources/icons/yabause.png" DESTINATION "share/pixmaps")