131 Commits

Author SHA1 Message Date
Andreas Müller
c5c7d602fe mame: upgrade 0231 -> 0232
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
(cherry picked from commit 3a3f8188c9)
2021-05-28 23:12:36 +02:00
Andreas Müller
3f6bfaec17 d1x-rebirth: various enhancements
* upgrade to latest
* fix build with gcc11
* enable parallel make

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
(cherry picked from commit 7f96da9298)
2021-05-08 18:00:53 +02:00
Andreas Müller
261136a10e dosbox-x: upgrade 0.83.11 -> 0.83.13
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
(cherry picked from commit 1a762aa0fc)
2021-05-02 20:32:36 +02:00
Andreas Müller
1522a42536 mame: upgrade 0230 -> 0231
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2021-04-29 22:33:21 +02:00
Andreas Müller
157249a152 Add hardknott to compatible revisions
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2021-04-05 00:40:07 +02:00
Andreas Müller
b9e215678e mame: Upgrade 0229 -> 0230
First mame upgrade without Jürgen Buchmüller 😢

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2021-04-02 23:46:00 +02:00
Andreas Müller
fba6ea3f1e dosbox-x: upgrade 0.83.10 -> 0.83.11
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2021-03-20 22:27:25 +01:00
Andreas Müller
3b208515ed mame: upgrade 0228 -> 0229
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2021-03-07 01:52:29 +01:00
Andreas Müller
61be80c51e dosbox-x: upgrade 0.83.9 -> 0.83.10
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2021-02-01 18:35:25 +01:00
Andreas Müller
6a7a0c9cc6 mame: upgrade 0227 -> 0228
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2021-01-27 22:58:46 +01:00
Andreas Müller
4f593451b2 mame: upgrade 0226 -> 0227
License chacksum changed by change of copyright years

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2021-01-06 19:06:04 +01:00
Andreas Müller
a9c7f16cbf dosbox-x: Add patch to fix build with hardened security flags
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2021-01-02 16:37:07 +01:00
Andreas Müller
519162419b dosbox-x: upgrade 0.83.8 -> 0.83.9
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2021-01-02 15:31:19 +01:00
Andreas Müller
475bc53f19 cage: add PACKAGECONFIGS for xwayland
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-12-08 21:59:10 +01:00
Andreas Müller
b2c63928a1 wlroots: add PACKAGECONFIGS for xwayland/x11-backend
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-12-08 21:56:37 +01:00
Andreas Müller
e1d46300a5 cage: initial add 0.1.2.1
Want Windows on dosbox-x as wayland kiosk session - see how far we get

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-12-08 02:30:34 +01:00
Andreas Müller
90740e6d39 wlroots: initial add 0.12.0
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-12-08 02:18:17 +01:00
Andreas Müller
ee04bcdcb9 dosbox-x: upgrade 0.83.7 -> 0.83.8
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-12-03 00:21:42 +01:00
Andreas Müller
775fc818bb dosbox-x: FIx build with hardened security flags
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-11-15 21:06:58 +01:00
Andreas Müller
351863bd53 opentyrian: use latest sources from github
* old version did not build with hardened security flage
* they moved to sdl2
* many nasty patches can go
* data moved

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-11-14 23:11:45 +01:00
Andreas Müller
ce2c630c82 dosbox-x: Give up our desktop file - since last upgrade dosbox-x ships its own
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-11-03 01:49:02 +01:00
Andreas Müller
13216f6bbb mame: upgrade 0225 -> 0226
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-11-02 19:53:12 +01:00
Andreas Müller
b234683913 dosbox: replace icon with official logo
file was created from dosbox.ico in sources

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-11-02 00:43:02 +01:00
Andreas Müller
e460305ac9 dosbox-x: upgrade 0.83.6 -> 0.83.7
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-11-02 00:30:11 +01:00
Andreas Müller
c8545696d9 dosbox-x: Hack configure to detect armv7 build
This is a lazy hack tested on armv7 only. To make it work we have to disable
elder arm arches. That should not be a prblem because it does not make much
sense to run dosbox-x on them.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-11-02 00:30:11 +01:00
Andreas Müller
16afcade9b dosbox-x: Save a working set for win98
Yes Win98 is slow but core=dynamic does not run yet at least on armv7

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-10-26 00:38:25 +01:00
Andreas Müller
368ee22a59 dosbox-x: Fix segfault at startup
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-10-21 22:33:30 +02:00
Andreas Müller
2be950e1c8 dosbox-x: Set enable_unaligned_memory by recipe
That's what configure would do if it would detect cpu properly

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-10-19 23:13:40 +02:00
Andreas Müller
4b5edad658 dosbox-x: add a desktop file
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-10-17 01:58:47 +02:00
Andreas Müller
e70f909501 dosbox.desktop: do not add to system menu
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-10-17 01:57:51 +02:00
Andreas Müller
1af61446fa dosbox-x: inital add 0.83.6
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-10-17 01:26:52 +02:00
Andreas Müller
492cc044c0 dosbox: rework recipe & file layout
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-10-16 21:57:44 +02:00
Andreas Müller
560876fdb7 dosbox: upgrade 0.74-2 -> 0.74-3
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-10-16 19:48:16 +02:00
Andreas Müller
e54a8384f6 Adjust LAYERSERIES_COMPAT
* remove zeus: We have a zeus branch
* add gatesgarth

And yes we are still dunfell compatible

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-10-15 19:10:26 +02:00
Andreas Müller
b706cf267d mame: upgrade 0224 -> 0225
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-10-03 22:04:28 +02:00
Andreas Müller
b3e170047e vice: Add upstream patches to fix build with gcc10 / -fno-common
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-09-07 21:25:31 +02:00
Andreas Müller
cdbfe06e83 z80: upgrade sources to fix build with gcc10 / -fno-common
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-09-07 20:56:47 +02:00
Andreas Müller
9e3300c646 opentyrian: Add patch to fix build with gcc / -fno-common
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-09-07 20:41:23 +02:00
Andreas Müller
42e399c0f7 mame: upgrade 0223 -> 0224
They are early this time

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-08-31 21:10:29 +02:00
Andreas Müller
136dee2eac mame: upgrade 0222 -> 0223
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-08-15 00:49:54 +02:00
Andreas Müller
f607a83eab mame: Depend on portmidi unconditionally
portmidi is in this layer either

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-08-11 22:07:05 +02:00
Andreas Müller
7de1712fac mame: upgrade 0221 -> 0222
* License checksum changed by adding another author
* Give up our inline pokey patch

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-06-28 16:14:58 +02:00
Andreas Müller
398261e82b opentyrian: Hack to build with gcc10
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-06-10 23:11:51 +02:00
Andreas Müller
c0e7a80a7e d1x-rebirth: Add Upstream-Status to patch added recently
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-06-09 22:26:56 +02:00
Andreas Müller
45eec2837a doomretro: initial add 3.5.10
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-06-09 21:00:54 +02:00
Andreas Müller
99382e1e81 xa: upgrade 2.3.10 -> 2.3.11
This fixes build with gcc10

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-06-09 20:18:29 +02:00
Andreas Müller
4dc6cfb528 d1x-rebirth: upgrade to latests / fix build with gcc10
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-06-09 20:06:38 +02:00
Andreas Müller
f497d56cc3 midori: initial add 9.0
Theoretically this belongs to meta-browser. Unfortunately it is in such bad
shape that I cannot send it there. So midori: As the first working browser I
had on embedded device give you a last resort for historical and sentimental
reasons.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-06-01 22:32:12 +02:00
Andreas Müller
8e17c15a58 stella: upgrade 6.0.1 -> 6.1.2
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-05-20 22:15:56 +02:00
Andreas Müller
98c38b3b9a mame: upgrade 0220 -> 0221
License checksum was changed by reformatting only [1]

[1] ea677489db

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-05-20 00:11:01 +02:00
Andreas Müller
8c7c78625f mame: Add a desktop file with 32k for layzy old colour genie users
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-05-04 12:57:57 +02:00
Andreas Müller
40d0e0a737 cass80: initial add
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-05-02 21:16:03 +02:00
Andreas Müller
b0979e90d3 Revert "mame: Start with -natural"
This reverts commit 811ec4fd4a.
2020-04-13 11:59:53 +02:00
Andreas Müller
811ec4fd4a mame: Start with -natural
Unpain having a german keyboard

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-04-12 23:46:39 +02:00
Andreas Müller
a9ace0b00a README.md: more adjustments
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-04-12 14:13:07 +02:00
Andreas Müller
fe30925eb9 README.md: Minor fixes/adjustements
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-04-12 14:00:18 +02:00
Andreas Müller
0731df8ae6 mame: upgrade 0219 -> 0220
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-04-06 15:11:10 +02:00
Andreas Müller
8ed31b759d Mark layer add dunfell compatible
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-03-16 11:27:59 +01:00
Andreas Müller
e9e2884e4b vice: Add desktop files for 'new' x64's
and state out why it's better to use old one

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-03-15 20:20:35 +01:00
Andreas Müller
6ea71f3257 vice-3.2: remove
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-03-15 16:32:14 +01:00
Andreas Müller
3a343f1cc0 vice: cleanup configuration options / add 'old' x64
* Standard whitelisting does not fork for vice so remove unknown options
  explicitly
* FWIW: On Raspi4 using cairo as renderer instead of OpenGL vice performs again
  on 100% frame rate - hmmm...

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-03-15 16:28:52 +01:00
Andreas Müller
e070e08113 mame: upgrade 0218 -> 0219
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-03-01 14:16:25 +01:00
Andreas Müller
07f7d6e7f6 mame: upgrade 0217 -> 0218
License checksum changed by:

commit 88909dc0d01f34bacbbbc3da6a9df705123b2f42
Author: Stiletto <stilett0@users.noreply.github.com>
Date:   Sat Jan 4 01:13:50 2020 -0500

    Happy New Year 2020 (nw) (#6128)

    Happy New Year 2020 (nw) (#6128)

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-02-02 23:12:50 +01:00
Andreas Müller
1f3213b461 vice: upgrade 3.3 -> 3.4
* add missing glew dependency
* make 'opengl' and 'x11' required distro-features

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-12-31 13:16:02 +01:00
Andreas Müller
87269ef2d3 mame: upgrade 0216 -> 0217
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-12-25 16:07:55 +01:00
Andreas Müller
1c2df55d33 mame: Move build to python3
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-12-13 19:10:05 +01:00
Andreas Müller
d37a4c2843 xa: upgrade 2.3.9 -> 2.3.10
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-12-10 17:34:07 +01:00
Andreas Müller
5ba79cbfd3 xa: Fix source download by adding mirror
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-12-10 17:34:07 +01:00
Andreas Müller
4c59484a58 layer.conf: remove thud & warrior from compatible layers
distro_features_check -> features_check rename made incompatible

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-12-02 09:43:45 +01:00
Andreas Müller
4efd2b12a6 mame: upgrade 0215 -> 0216
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-11-30 12:26:51 +01:00
Andreas Müller
d94bd168c1 gtkglext: replace distro_features_check by to fix warning
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-11-25 00:16:41 +01:00
Andreas Müller
45129fe430 xa: upgrade 2.3.8 -> 2.3.9
Sources for 2.3.8 are gone

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-11-04 11:24:55 +01:00
Andreas Müller
44f3ef2b7c mame: upgrade 0214 -> 0215
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-10-30 21:47:21 +01:00
Andreas Müller
2655720ab8 Mark zeus as compatible release
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-10-10 00:27:18 +02:00
Andreas Müller
7465aa6ce6 vice-3.2: re-add vice 3.2
vice 3.3 performs ugly

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-09-28 00:41:25 +02:00
Andreas Müller
ceebd516b5 mame: upgrade 0213 -> 0214
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-09-27 22:26:49 +02:00
Andreas Müller
57a16f33ef pangox-compat: fix build with latest pango
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-09-27 22:25:56 +02:00
Andreas Müller
df91c16f07 Revert "pangox-compat: remove"
This reverts commit b70f89d0f7.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-09-27 22:25:56 +02:00
Andreas Müller
2b6d865da4 Revert "gtkglext: remove - vice does not require it anymore"
This reverts commit 0f4512f223.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-09-27 22:25:56 +02:00
Andreas Müller
40aee0ebf4 mame: upgrade 0212 -> 0213
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-09-05 22:53:38 +02:00
Andreas Müller
997fb0203c d1x-rebirth: build latest git / switch to python3-scons-native
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-08-24 00:28:36 +02:00
Andreas Müller
4876f737e7 vice: export ar_check="no" instead of patching to avoid usage of ar wrapper
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-08-21 21:56:28 +02:00
Andreas Müller
9f0e801b3f vice: add hicolor-icon-theme to RDEPENDS
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-08-21 02:46:08 +02:00
Andreas Müller
3b3dc67bbe vice: undo accidental removal of important parts of recipe
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-08-21 02:36:59 +02:00
Andreas Müller
b70f89d0f7 pangox-compat: remove
* vice was the only consumer
* it broke by recent pango upgrade

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-08-21 02:13:10 +02:00
Andreas Müller
0f4512f223 gtkglext: remove - vice does not require it anymore
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-08-21 02:12:10 +02:00
Andreas Müller
d354597505 vice: upgrade 3.2 -> 3.3
Now they prefer GTK3

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-08-21 01:57:45 +02:00
Andreas Müller
80fb6c39ee mame: upgrade 0211 -> 0212
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-08-04 00:51:34 +02:00
Andreas Müller
f7e303aa4d stella: Fix typo in my email address
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-07-07 22:39:54 +02:00
Andreas Müller
44adac19d8 stella: upgrade 6.0 -> 6.0.1
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-07-07 21:38:24 +02:00
Andreas Müller
a2f89f74cd stella: avoid sdl2-config completely
Fixes:
| arm-mortsgna-linux-gnueabi-g++: error: unrecognized command line option '--should-not-have-used-/usr/bin/sdl2-config'

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-07-07 21:25:18 +02:00
Andreas Müller
6622445abf mame: upgrade 0210 -> 0211
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-06-29 13:09:35 +02:00
Andreas Müller
817bb2b0e2 opentyrian: fix build with gcc 9
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-06-07 21:53:11 +02:00
Andreas Müller
abdc056942 mame: upgrade 0209 -> 0210
Fetch sources from git

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-06-07 21:52:49 +02:00
Andreas Müller
8e331dc790 stella: upgrade 5.1.3 -> 6.0
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-04-27 02:22:04 +02:00
Andreas Müller
1dcb78a87a mame: upgrade 0208 -> 0209
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-04-24 13:47:40 +02:00
Andreas Müller
43d327c345 layer.conf: warrier -> warrior
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-04-09 13:02:53 +02:00
Andreas Müller
00aef02835 layer.conf: move to thus & warrier compatibility
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-04-02 16:44:08 +02:00
Andreas Müller
d531df3af0 mame: upgrade 0207 -> 0208
patches made into release announcement :)))

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-03-28 07:22:32 +01:00
Andreas Müller
f7ed4d9e73 Update README again 2019-03-25 23:49:38 +01:00
Andreas Müller
0d67a6d16d Update README
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-03-25 12:57:53 +01:00
Andreas Müller
b8fe3147e2 Update README
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-03-25 12:56:52 +01:00
Andreas Müller
0c1e7f6cd9 portmidi: add temporarily
Will try to get portmidi to meta-oe [1]. As long as this is not done, add it
here.

[1] https://github.com/schnitzeltony/meta-musicians/issues/3

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-03-18 10:16:29 +01:00
Andreas Müller
7596b6195b mame: remove patch causing sound regression
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-03-10 00:37:20 +01:00
Andreas Müller
106081e31a mame: update patches
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-03-09 03:26:27 +01:00
Andreas Müller
0f33da9e5a mame: rework ogl-patch
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-03-04 02:00:22 +01:00
Andreas Müller
edda184eef mame: add more pokey performance
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-03-03 23:13:07 +01:00
Andreas Müller
279d2bfd32 mame: add further micro optimizations
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-03-03 17:46:50 +01:00
Andreas Müller
9efa55d805 mame: Add Upstream-Status for recent patches
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-03-02 14:02:45 +01:00
Andreas Müller
7f6f2e4520 mame: add further pokey performance enhancements
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-03-02 00:09:03 +01:00
Andreas Müller
ca531fdc2b mame: do not force settings by command line params
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-02-27 23:40:58 +01:00
Andreas Müller
5dda562627 mame: upgrade 0206 -> 0207
* use upstream logo
* 0001-Show-video-mode-option-accel-in-help-and-GUI.patch was applied upstream

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-02-27 22:04:43 +01:00
Andreas Müller
a8f3b1177b mame: Add pokey performance patch
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-02-27 20:40:05 +01:00
Andreas Müller
95a81a31e9 mame: Use system libraries rapidjson & portmidi
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-02-23 22:15:33 +01:00
Andreas Müller
0e49d50f1b vice: enable pulseaudio for pulseaudio in DISTRO_FEATURES
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-02-23 19:31:09 +01:00
Andreas Müller
f6c4639407 mame: add configuration for historypath
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-02-18 22:35:22 +01:00
Andreas Müller
91c18615d3 mame: add missing install for desktop file
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-02-18 21:32:57 +01:00
Andreas Müller
2d99e9044b mame: copmpile with -O3
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-02-18 00:41:52 +01:00
Andreas Müller
b52ff24ca4 mame: Rework recipe for a better user experience
Now that the right configuration options for mame to perform acceptable on
Raspi were found (took 3 years!), it is time to lift recipe out of 'academical'
state:

* Add desktop file with defaults perfoming best (currently). Icon was stolen
  from current mame git and should be included with next release
* Add many useful folders to install
* Split out tools into mame-tools package
* Add a configuration file
* Add user paths for files created by mame
* Add user paths for samples and roms for simple browser download/store

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-02-18 00:17:14 +01:00
Andreas Müller
1ba03c6494 mame: Add patch to show video-mode option 'accel' in help and GUI
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-02-16 22:51:01 +01:00
Andreas Müller
b11abed246 mame: rework installation
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-02-16 22:47:55 +01:00
Andreas Müller
a9dc0c13df vice: fix install - broken by last commit
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-02-09 22:34:36 +01:00
Andreas Müller
c03690cf1d vice: Fix multilib install
ERROR: vice-3.2-r0 do_package: QA Issue: vice: Files/directories were installed but not shipped in any package:
  /usr/lib
  /usr/lib/vice
  /usr/lib/vice/PET
  /usr/lib/vice/C64
  /usr/lib/vice/SCPU64
  /usr/lib/vice/doc
  /usr/lib/vice/fonts
  /usr/lib/vice/VIC20
  /usr/lib/vice/PRINTER
  /usr/lib/vice/CBM-II
  /usr/lib/vice/C64DTV
  /usr/lib/vice/DRIVES
  /usr/lib/vice/C128
  /usr/lib/vice/PLUS4
  ...

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-02-08 14:00:06 +01:00
Andreas Müller
347a2bebae mame: upgrade 0205 -> 0206
License checksum was changed by copyright year change

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-02-03 00:51:57 +01:00
Andreas Müller
979574e784 vice: replace PN by BPN in SRC_URI
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-01-28 11:42:25 +01:00
Andreas Müller
80b9ac0bde mame: upgrade 0204 -> 0205
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-12-28 02:24:27 +01:00
Andreas Müller
453c6b3070 mame: upgrade 201 -> 204
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-12-03 15:50:12 +01:00
Andreas Müller
4b7177f5c3 mame: make size of executable strippable again
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-10-24 20:52:21 +02:00
Andreas Müller
1edd08a8c8 mame: disable LTO
It does nothing useful for mame's mega binary.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-10-24 00:10:08 +02:00
Andreas Müller
a16b96ca86 Readd sumo to compatible layers
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-10-24 00:04:02 +02:00
Andreas Müller
ac8eaf7ed8 Update dependencies to current master/thud
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-10-08 23:21:58 +02:00
59 changed files with 1708 additions and 516 deletions

14
README
View File

@@ -1,14 +0,0 @@
OE layer for all in midlife crisis
This layer depends on:
URI: git://git.openembedded.org/openembedded-core
branch: master
revision: HEAD
URI: git://git.openembedded.org/meta-openembedded
branch: master
revision: HEAD
layers: meta-oe
Layer maintainer: Andreas Müller <schnitzeltony@gmail.com>

27
README.md Normal file
View File

@@ -0,0 +1,27 @@
OE layer for emulators and games from 8/16-bit era
--------------------------------------------------
Layer dependencies:
-------------------
see [layer.conf](conf/layer.conf) for dependencies and [Layer-index](https://layers.openembedded.org/layerindex/branch/master/layers/) where to find layers
Contributing
------------
* Submit any patches against the `meta-retro` layer by using the GitHub pull-request feature.
Policies
--------
* **Please do not send private emails to maintainer - they will not be answered anymore**. For bug-reports/questions/suggestions.. use [issues](https://github.com/schnitzeltony/meta-retro/issues).
* Pull requests should follow [OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) with the following additions:
* Use 4 spaces for indentation always (shell and python code)
* For splitting of long list values use four-space indentation on sucessive lines and prefer the closing quote as the first character ([OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) - second example)
* Pull-requests with patches fixing issues for musl, clang or gold-linker are accepeted only if patches have upstream-status "Applied" or "Backport" and contain a link to the upstream patch.
Maintainers
-----------
Layer maintainer: Andreas Müller <schnitzeltony@gmail.com>

View File

@@ -8,5 +8,5 @@ BBFILE_COLLECTIONS += "meta-retro"
BBFILE_PATTERN_meta-retro := "^${LAYERDIR}/"
BBFILE_PRIORITY_meta-retro = "10"
LAYERDEPENDS_meta-retro = "core openembedded-layer filesystems-layer games-layer"
LAYERSERIES_COMPAT_meta-retro = "rocko sumo thud"
LAYERDEPENDS_meta-retro = "core openembedded-layer filesystems-layer"
LAYERSERIES_COMPAT_meta-retro = "dunfell gatesgarth hardknott"

View File

@@ -0,0 +1,32 @@
From ccf4abdd7b2e521e0665186e620a606277682597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Tue, 18 Feb 2020 00:07:24 +0100
Subject: [PATCH] Do no search for cross g-ir-compiler but
g-ir-compiler-wrapper
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
core/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index c4982de9..80fdd309 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -66,7 +66,7 @@ set_target_properties("${LIBCORE}" PROPERTIES
VERSION ${LIBCORE_VERSION}
)
-find_program (GIR_COMPILER_BIN g-ir-compiler)
+find_program (GIR_COMPILER_BIN g-ir-compiler-wrapper)
add_custom_target(${LIBCORE_GIR}.typelib ALL
COMMAND ${GIR_COMPILER_BIN} ${CMAKE_CURRENT_BINARY_DIR}/${LIBCORE_GIR}.gir
--output ${CMAKE_CURRENT_BINARY_DIR}/${LIBCORE_GIR}.typelib
--
2.21.0

View File

@@ -0,0 +1,61 @@
SUMMARY = "A lightweight web browser"
HOMEPAGE = "https://www.midori-browser.org/"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
DEPENDS = " \
intltool-native \
gcr \
webkitgtk \
json-glib \
libarchive \
libsoup-2.4 \
libpeas \
sqlite \
"
inherit cmake pkgconfig gtk-icon-cache gettext vala python3native features_check gobject-introspection mime-xdg
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
# Midori requires gobject-introspection to build. Check below is not the whole
# story: There are some extra machine-specific disable entries in webkitgtk
# recipe and there is nothing we can do to check here...
python () {
if d.getVar('GI_DATA_ENABLED') != 'True':
raise bb.parse.SkipRecipe('Midori needs gobject-introspection but it is either disabled or machine does not support it!' )
}
SRC_URI = " \
git://github.com/midori-browser/core.git \
file://0001-Do-no-search-for-cross-g-ir-compiler-but-g-ir-compil.patch \
"
SRCREV = "f6b3b1e030db7eb2de7faf73ec4ccc18949b668d"
PV = "9.0"
S = "${WORKDIR}/git"
EXTRA_OECMAKE = " \
-DCMAKE_INSTALL_PREFIX=${prefix} \
-DCMAKE_INSTALL_SYSCONFDIR=/etc \
"
do_configure_prepend() {
export VALAC=${STAGING_BINDIR_NATIVE}/valac
}
RRECOMMENDS_${PN} += " \
glib-networking ca-certificates \
adwaita-icon-theme \
"
# No project but oe packs gstreamer plugins that fine as we do. Cannot say
# which plugins are # really necessary so use gstreamer1.0-plugins-*-meta.
# These are necessary to make video streaming work - see [1]
# [1] https://github.com/midori-browser/core/issues/329
RRECOMMENDS_${PN} += " \
gstreamer1.0-plugins-base-meta \
gstreamer1.0-plugins-good-meta \
gstreamer1.0-libav \
"
FILES_${PN} += "${datadir}/metainfo"

View File

@@ -0,0 +1,43 @@
SUMMARY = "DOSBox-X fork of the DOSBox project"
HOMEPAGE = "https://dosbox-x.com/"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=b5d36d7c1f35e9597b9843b9bedb6667"
DEPENDS = " \
libsdl2 \
libsdl2-net \
libpcap \
libxkbfile \
libpng \
alsa-lib \
fluidsynth \
"
inherit autotools-brokensep pkgconfig dos2unix gtk-icon-cache features_check
REQUIRED_DISTRO_FEATURES = "x11 opengl"
SRC_URI = " \
git://github.com/joncampbell123/dosbox-x.git \
file://0001-use-pkgconfig-to-find-sdl2.patch \
file://0002-Enable-unaligned-memory-based-on-recipe-s-suggestion.patch \
"
SRCREV = "9c950893419b387425172c2f532c45cb81cd709a"
PV = "0.83.13"
S = "${WORKDIR}/git"
EXTRA_OECONF = " \
--disable-sdl \
--disable-sdltest \
--enable-sdl2 \
--disable-sdl2test \
--disable-alsatest \
"
# sorry - but it does not make sense
COMPATIBLE_HOST_armv4 = 'null'
COMPATIBLE_HOST_armv5 = 'null'
COMPATIBLE_HOST_armv6 = 'null'
FILES_${PN} += "${datadir}/metainfo"

View File

@@ -0,0 +1,102 @@
From 94c1308880c9bed9f7ddecf930e8f1e771a9f552 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 16 Oct 2020 23:41:09 +0200
Subject: [PATCH] use pkgconfig to find sdl2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
acinclude.m4 | 64 ++++------------------------------------------------
1 file changed, 4 insertions(+), 60 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index a7424b901..edf15214e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -12,37 +12,9 @@ AC_ARG_ENABLE(sdl2, [ --enable-sdl2 Enable SDL 2.x],
AH_TEMPLATE(C_SDL2,[Set to 1 to enable SDL 2.x support])
- SDL2_CONFIG=no
if test x$enable_sdl2enable = xyes ; then
- if test x$sdl2_exec_prefix != x ; then
- sdl2_args="$sdl2_args --exec-prefix=$sdl2_exec_prefix"
- if test x${SDL2_CONFIG+set} != xset ; then
- SDL2_CONFIG=$sdl2_exec_prefix/bin/sdl2-config
- fi
- fi
- if test x$sdl2_prefix != x ; then
- sdl2_args="$sdl2_args --prefix=$sdl2_prefix"
- if test x${SDL2_CONFIG+set} != xset ; then
- SDL2_CONFIG=$sdl2_prefix/bin/sdl2-config
- fi
- fi
-
- if test -x vs2015/sdl2/linux-host/bin/sdl2-config ; then
- SDL2_CONFIG=vs2015/sdl2/linux-host/bin/sdl2-config
- PATH=vs2015/sdl2/linux-host/bin:$PATH
- fi
-
- AC_PATH_PROG(SDL2_CONFIG, sdl2-config, no)
- min_sdl2_version=ifelse([$1], ,0.11.0,$1)
- AC_MSG_CHECKING(for SDL2 - version >= $min_sdl2_version)
- no_sdl2=""
- if test "$SDL2_CONFIG" = "no" ; then
- no_sdl2=yes
- else
- SDL2_CFLAGS=`$SDL2_CONFIG $sdl2conf_args --cflags`
- SDL2_LIBS=`$SDL2_CONFIG $sdl2conf_args --libs`
- AC_DEFINE(C_SDL2,1)
- fi
+ AC_DEFINE(C_SDL2,1)
+ PKG_CHECK_MODULES([SDL2], [sdl2])
fi
AC_SUBST(SDL2_CFLAGS)
@@ -67,37 +39,9 @@ AC_ARG_ENABLE(sdl, [ --enable-sdl Enable SDL 1.x],
AH_TEMPLATE(C_SDL1,[Set to 1 to enable SDL 1.x support])
- SDL_CONFIG=no
if test x$enable_sdlenable = xyes ; then
- if test x$sdl_exec_prefix != x ; then
- sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
- if test x${SDL_CONFIG+set} != xset ; then
- SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
- fi
- fi
- if test x$sdl_prefix != x ; then
- sdl_args="$sdl_args --prefix=$sdl_prefix"
- if test x${SDL_CONFIG+set} != xset ; then
- SDL_CONFIG=$sdl_prefix/bin/sdl-config
- fi
- fi
-
- if test -x vs2015/sdl/linux-host/bin/sdl-config ; then
- SDL_CONFIG=vs2015/sdl/linux-host/bin/sdl-config
- PATH=vs2015/sdl/linux-host/bin:$PATH
- fi
-
- AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
- min_sdl_version=ifelse([$1], ,0.11.0,$1)
- AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
- no_sdl=""
- if test "$SDL_CONFIG" = "no" ; then
- no_sdl=yes
- else
- SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
- SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
- AC_DEFINE(C_SDL1,1)
- fi
+ AC_DEFINE(C_SDL1,1)
+ PKG_CHECK_MODULES([SDL], [sdl])
fi
AC_SUBST(SDL_CFLAGS)
--
2.26.2

View File

@@ -0,0 +1,34 @@
From 7513e63ca7621f730adb41df556af470f9fba372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Mon, 19 Oct 2020 23:02:41 +0200
Subject: [PATCH] Enable unaligned memory based on recipe's suggestion
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
CPU detection as dosbox-x handles it does not work here. So set in recipe
what configure would do.
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index d832bcc9a..8841e6c4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -850,7 +850,7 @@ dnl FEATURE: Whether to enable unaligned memory access
AH_TEMPLATE(C_UNALIGNED_MEMORY,[Define to 1 to use a unaligned memory access])
AC_ARG_ENABLE(unaligned_memory,AC_HELP_STRING([--disable-unaligned-memory],[Disable unaligned memory access]),,enable_unaligned_memory=yes)
AC_MSG_CHECKING(whether to enable unaligned memory access)
-if test x$enable_unaligned_memory = xyes -a x$c_unalignedmemory = xyes; then
+if test x$enable_unaligned_memory = xyes; then
AC_DEFINE(C_UNALIGNED_MEMORY,1)
AC_MSG_RESULT(yes)
else
--
2.26.2

View File

@@ -0,0 +1,58 @@
[dosbox]
title=Windows 98
memsize=64
[sdl]
priority = higher,higher
autolock = true
fullresolution = desktop
windowresolution = 1024x768
output = opengl
mouse_wheel_key = -0
[render]
scaler = none
aspect = true
[cpu]
cycles = fixed 60000
core = dynamic
cputype = auto
dynamic core cache block size = 32
[video]
vesa modelist width limit=0
vesa modelist height limit=0
[dos]
automountall=true
[fdc, primary]
int13fakev86io=true
[ide, primary]
enable=true
pnp=true
int13fakeio=true
int13fakev86io=true
enable pio32=true
[ide, secondary]
int13fakeio=true
int13fakev86io=true
cd-rom insertion delay=2000
[autoexec]
keyb de
# This is done once only
imgmake /home/morona/Emulators/dosbox-x/win98/win98hd.img -t hd_2gig
# This will be our C:
imgmount 2 /home/morona/Emulators/dosbox-x/win98/win98hd.img -t hdd
# Installation CD
imgmount d /home/morona/Emulators/dosbox-x/win98/install-media/win98-de.iso
# Bootdisc - comment after install
boot /home/morona/Emulators/dosbox-x/win98/install-media/win98-boot.img

View File

@@ -0,0 +1,59 @@
[dosbox]
title=Windows 98
memsize=64
[sdl]
priority = higher,normal
autolock = true
fullresolution = desktop
windowresolution = 1024x768
output = opengl
mouse_wheel_key = -0
[render]
aspect = true
[cpu]
cycles = fixed 12000
#core = dynamic
core = normal
cputype = auto
#dynamic core cache block size = 1
#use dynamic core with paging on = false
[video]
vesa modelist width limit=0
vesa modelist height limit=0
[dos]
automountall=true
[mixer]
blocksize = 1024
[fdc, primary]
int13fakev86io=true
[ide, primary]
enable=true
pnp=true
int13fakeio=true
int13fakev86io=true
enable pio32=true
[ide, secondary]
int13fakeio=true
int13fakev86io=true
cd-rom insertion delay=2000
[autoexec]
keyb de
# This is our C:
imgmount 2 /home/morona/Emulators/dosbox-x/win98/win98hd.img -t hdd
# Installation CD
imgmount d /home/morona/Emulators/dosbox-x/win98/install-media/win98-de.iso
boot /home/morona/Emulators/dosbox-x/win98/win98hd.img

View File

@@ -14,13 +14,10 @@ SRC_URI = " \
file://dosbox.png \
file://0001-use-pkgconfig-to-find-sdl.patch \
"
SRC_URI[md5sum] = "7110ee24a45a2b4951ad52eb1a3722be"
SRC_URI[sha256sum] = "7077303595bedd7cd0bb94227fa9a6b5609e7c90a3e6523af11bc4afcb0a57cf"
PACKAGECONFIG ??= " \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)} \
"
SRC_URI[sha256sum] = "c0d13dd7ed2ed363b68de615475781e891cd582e8162b5c3669137502222260a"
PV = "0.74-3"
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}"
PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgl libglu"
do_install_append() {

View File

@@ -5,4 +5,4 @@ Exec=dosbox
Icon=dosbox.png
Terminal=false
Type=Application
Categories=System;Emulator;Game;
Categories=Emulator;Game;

Binary file not shown.

After

Width:  |  Height:  |  Size: 116 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 206 B

View File

@@ -0,0 +1,224 @@
SUMMARY = "Multiple Arcade Machine Emulator"
HOMEPAGE = "http://www.mamedev.org/index.php"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=417c683350df4c63046fee551c461bd4"
SRC_URI = " \
git://github.com/mamedev/mame.git \
file://mame.desktop \
file://mame32k.desktop \
"
PV = "0232"
SRCREV = "2b0f01bc3aee493b3c05cf34c15af7cf5521210a"
S = "${WORKDIR}/git"
inherit siteinfo gtk-icon-cache
DEPENDS = " \
libsdl2 \
libsdl2-ttf \
fontconfig \
libxinerama \
\
expat \
zlib \
flac \
jpeg \
glm \
lua lua-native \
sqlite3 \
portaudio-v19 \
rapidjson \
portmidi \
"
CLEANBROKEN = "1"
# avoid stip fail for size of executable >> 4GB - stolen from chromium
DEBUG_FLAGS_remove_arm = "-g"
DEBUG_FLAGS_append_arm = "-g1"
DEBUG_FLAGS_remove_x86 = "-g"
DEBUG_FLAGS_append_x86 = "-g1"
DEBUG_FLAGS_remove_aarch64 = "-g"
DEBUG_FLAGS_append_aarch64 = "-g1"
DEBUG_FLAGS_remove_x86-64 = "-g"
DEBUG_FLAGS_append_x86-64 = "-g1"
PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
# TBD: x86 may overrideoverrides later - cannot test
MAME_NOASM="NOASM=1"
# genie.lua does not detect 64bit targets at least on aarch64
MAME_PTR64 = "${@oe.utils.conditional('SITEINFO_BITS', '64', '-DPTR64=1', '', d)}"
EXTRA_OEMAKE = " \
linux \
CROSS_BUILD=1 \
OVERRIDE_CC='${CC} ${MAME_PTR64}' \
OVERRIDE_CXX='${CXX} ${MAME_PTR64}' \
OPTIMIZE=3 \
TOOLS=1 \
USE_QTDEBUG=0 \
LTO=0 \
NOWERROR=1 \
${MAME_NOASM} \
USE_SYSTEM_LIB_EXPAT=1 \
USE_SYSTEM_LIB_FLAC=1 \
USE_SYSTEM_LIB_JPEG=1 \
USE_SYSTEM_LIB_GLM=1 \
USE_SYSTEM_LIB_LUA=1 \
USE_SYSTEM_LIB_PORTAUDIO=1 \
USE_SYSTEM_LIB_SQLITE3=1 \
USE_SYSTEM_LIB_ZLIB=1 \
USE_SYSTEM_LIB_RAPIDJSON=1 \
USE_OPENMP=1 \
USE_SYSTEM_LIB_PORTMIDI=1 \
SDL_INI_PATH=${sysconfdir}/${BPN} \
PYTHON_EXECUTABLE=python3 \
"
do_compile_prepend() {
# seems there is some race. Build complains
# | Assembler messages:
# | Fatal error: can't create obj/Release/3rdparty/lzma/C/7zAlloc.o: No such file or directory
# | Assembler messages:
# | Fatal error: can't create obj/Release/src/mame/drivers/acvirus.o: No such file or directory
# But that directory is created with a few files
mkdir -p ${S}/build/projects/sdl/mame/gmake-linux/obj/Release/3rdparty/lzma/C
}
do_install() {
# stolen much from https://src.fedoraproject.org/cgit/rpms/mame.git/tree/mame.spec
# executables
install -d ${D}${bindir}
install -pm 755 castool chdman floptool imgtool jedutil ldresample ldverify \
mame nltool nlwav pngcmp romcmp unidasm ${D}${bindir}
for tool in regrep split srcclean; do
install -pm 755 $tool ${D}${bindir}/${BPN}-$tool
done
# misc
install -d ${D}${datadir}/applications
install -m 644 ${WORKDIR}/mame.desktop ${D}${datadir}/applications
install -m 644 ${WORKDIR}/mame32k.desktop ${D}${datadir}/applications
pushd artwork
find -type d -exec install -d ${D}${datadir}/${BPN}/artwork/{} \;
find -type f -exec install -pm 644 {} ${D}${datadir}/${BPN}/artwork/{} \;
popd
install -d ${D}${datadir}/${BPN}/ctrlr
install -pm 644 ctrlr/*.cfg ${D}${datadir}/${BPN}/ctrlr
install -d ${D}${datadir}/${BPN}/fonts
install -m 644 uismall.bdf ${D}${datadir}/${BPN}/fonts
install -d ${D}${datadir}/${BPN}/hash
install -pm 644 hash/* ${D}${datadir}/${BPN}/hash
install -d ${D}${datadir}/${BPN}/hlsl
install -pm 644 hlsl/*.fx ${D}${datadir}/${BPN}/hlsl
install -d ${D}${datadir}/${BPN}/keymaps
install -pm 644 keymaps/* ${D}${datadir}/${BPN}/keymaps
pushd language
find -type d -exec install -d ${D}${datadir}/${BPN}/language/{} \;
find -type f -name \*.mo -exec install -pm 644 {} ${D}${datadir}/${BPN}/language/{} \;
popd
pushd plugins
find -type d -exec install -d ${D}${datadir}/${BPN}/plugins/{} \;
find -type f -exec install -pm 644 {} ${D}${datadir}/${BPN}/plugins/{} \;
popd
install -d ${D}${datadir}/${BPN}/shader
pushd src/osd/modules/opengl
install -pm 644 shader/*.?sh ${D}${datadir}/${BPN}/shader
popd
pushd docs/man
install -d ${D}${mandir}/man1
install -pm 644 castool.1 chdman.1 imgtool.1 floptool.1 jedutil.1 ldresample.1 \
ldverify.1 romcmp.1 ${D}${mandir}/man1
install -d ${D}${mandir}/man6
install -pm 644 mame.6 mess.6 ${D}${mandir}/man6
popd
# install paths where user can add downloaded files
for folder in roms samples; do
install -d ${D}${sysconfdir}/skel/Emulators/${BPN}/$folder
done
echo "Store your downloaded files in subfolders" >> ${D}${sysconfdir}/skel/Emulators/${BPN}/Readme
# install paths for created data
for folder in cfg comments diff history inp nvram snap state; do
install -d ${D}${sysconfdir}/skel/.${BPN}/$folder
done
# user config
install -d ${D}${sysconfdir}/skel/.config/${BPN}/ini
# Create ini file
cat > ${WORKDIR}/${BPN}.ini << EOF
# Define source paths
artpath ${datadir}/${BPN}/artwork
#bgfx_path ${datadir}/${BPN}/bgfx
#cheatpath ${datadir}/${BPN}/cheat
#crosshairpath ${datadir}/${BPN}/crosshair
ctrlrpath ${datadir}/${BPN}/ctrlr
fontpath ${datadir}/${BPN}/fonts
hashpath ${datadir}/${BPN}/hash
languagepath ${datadir}/${BPN}/language
pluginspath ${datadir}/${BPN}/plugins
# Have these per user for simple download/install
rompath \$HOME/Emulators/${BPN}/roms
samplepath \$HOME/Emulators/${BPN}/samples
# Allow user to override ini settings
inipath \$HOME/.config/${BPN}/ini;${sysconfdir}/${BPN}
# Set paths for local storage
cfg_directory \$HOME/.${BPN}/cfg
comment_directory \$HOME/.${BPN}/comments
diff_directory \$HOME/.${BPN}/diff
historypath \$HOME/.${BPN}/history
input_directory \$HOME/.${BPN}/inp
nvram_directory \$HOME/.${BPN}/nvram
snapshot_directory \$HOME/.${BPN}/snap
state_directory \$HOME/.${BPN}/state
EOF
install -d ${D}${sysconfdir}/${BPN}
install -m 644 ${WORKDIR}/${BPN}.ini ${D}${sysconfdir}/${BPN}
# Logo
install -d ${D}${datadir}/pixmaps
install -m 644 ${S}/docs/source/images/MAMElogo.svg ${D}${datadir}/pixmaps
# cleanup
find ${D}${datadir}/${BPN} -name LICENSE -exec rm {} \;
find ${D}${datadir}/${BPN} -name README.md -exec rm {} \;
}
PACKAGES =+ "${PN}-tools"
FILES_${PN}-tools = " \
${bindir}/castool \
${bindir}/chdman \
${bindir}/floptool \
${bindir}/imgtool \
${bindir}/jedutil \
${bindir}/ldresample \
${bindir}/ldverify \
${bindir}/nltool \
${bindir}/nlwav \
${bindir}/pngcmp \
${bindir}/${BPN}-regrep \
${bindir}/romcmp \
${bindir}/${BPN}-split \
${bindir}/${BPN}-src2html \
${bindir}/${BPN}-srcclean \
${bindir}/unidasm \
"

View File

@@ -0,0 +1,9 @@
[Desktop Entry]
Type=Application
Name=Mame
Comment=MAME is a multi-purpose emulation framework
Exec=mame
Icon=MAMElogo.svg
Terminal=false
StartupNotify=false
Categories=Game

View File

@@ -0,0 +1,9 @@
[Desktop Entry]
Type=Application
Name=Mame (32k RAM)
Comment=MAME is a multi-purpose emulation framework
Exec=mame -ramsize 32k
Icon=MAMElogo.svg
Terminal=false
StartupNotify=false
Categories=Game

View File

@@ -1,92 +0,0 @@
SUMMARY = "Multiple Arcade Machine Emulator"
HOMEPAGE = "http://www.mamedev.org/index.php"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=f7c747554c44283f89bdf31be2d12551"
SRC_URI = " \
https://github.com/mamedev/mame/archive/${BPN}${PV}.tar.gz \
"
SRC_URI[md5sum] = "e690994e57a13380045bd74258a698ca"
SRC_URI[sha256sum] = "d51f2a3d740dff13acbe23b0bdcdd9a7077ee873baeabdf8ad5b1499bd9df99f"
S = "${WORKDIR}/${BPN}-${BPN}${PV}"
inherit siteinfo
DEPENDS = " \
libsdl2 \
libsdl2-ttf \
fontconfig \
libxinerama \
\
expat \
zlib \
flac \
jpeg \
lua lua-native \
sqlite3 \
portaudio-v19 \
"
CLEANBROKEN = "1"
# TBD: x86 may overrideoverrides later - cannot test
MAME_NOASM="NOASM=1"
# genie.lua does not detect 64bit targets at least on aarch64
MAME_PTR64 = "${@oe.utils.conditional('SITEINFO_BITS', '64', '-DPTR64=1', '', d)}"
EXTRA_OEMAKE = " \
linux \
CROSS_BUILD=1 \
OVERRIDE_CC='${CC} ${MAME_PTR64}' \
OVERRIDE_CXX='${CXX} ${MAME_PTR64}' \
TOOLS=1 \
USE_QTDEBUG=0 \
NOWERROR=1 \
${MAME_NOASM} \
USE_SYSTEM_LIB_EXPAT=1 \
USE_SYSTEM_LIB_ZLIB=1 \
USE_SYSTEM_LIB_FLAC=1 \
USE_SYSTEM_LIB_JPEG=1 \
USE_SYSTEM_LIB_LUA=1 \
USE_SYSTEM_LIB_SQLITE3=1 \
USE_SYSTEM_LIB_PORTAUDIO=1 \
"
do_compile_prepend() {
# seems there is some race. Build complains
# | Assembler messages:
# | Fatal error: can't create obj/Release/3rdparty/lzma/C/7zAlloc.o: No such file or directory
# | Assembler messages:
# | Fatal error: can't create obj/Release/src/mame/drivers/acvirus.o: No such file or directory
# But that directory is created with a few files
mkdir -p ${S}/build/projects/sdl/mame/gmake-linux/obj/Release/3rdparty/lzma/C
}
do_install() {
# Note: Unstripped mame binary for armv7 is > 1GB!!
install -d ${D}${bindir}
install mame ${D}${bindir}/
install -d ${D}${libexecdir}
for binary in \
castool \
chdman \
floptool \
imgtool \
jedutil \
ldresample \
ldverify \
mame \
nltool \
romcmp \
split \
src2html \
unidasm \
; \
do
install $binary ${D}${libexecdir}/
done
}

View File

@@ -1,6 +1,6 @@
From 389ed0e18c10a8b3368d0b9fbd2e1f5a7e37f072 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Fri, 30 Jun 2017 09:30:32 +0200
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Wed, 20 May 2020 22:12:52 +0200
Subject: [PATCH] custtomize configure and Makefile to our needs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -8,31 +8,17 @@ Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [oe-specific]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
Makefile | 2 +-
configure | 39 +++++++++++++++++++++++----------------
2 files changed, 24 insertions(+), 17 deletions(-)
configure | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 35a1e36..a8984d0 100644
--- a/Makefile
+++ b/Makefile
@@ -177,7 +177,7 @@ config.mak: $(srcdir)/configure
install: all
$(INSTALL) -d "$(DESTDIR)$(BINDIR)"
- $(INSTALL) -c -s -m 755 "$(srcdir)/stella$(EXEEXT)" "$(DESTDIR)$(BINDIR)/stella$(EXEEXT)"
+ $(INSTALL) -c -m 755 "$(srcdir)/stella$(EXEEXT)" "$(DESTDIR)$(BINDIR)/stella$(EXEEXT)"
$(INSTALL) -d "$(DESTDIR)$(DOCDIR)"
$(INSTALL) -c -m 644 "$(srcdir)/Announce.txt" "$(srcdir)/Changes.txt" "$(srcdir)/Copyright.txt" "$(srcdir)/License.txt" "$(srcdir)/README-SDL.txt" "$(srcdir)/Readme.txt" "$(srcdir)/Todo.txt" "$(srcdir)/docs/index.html" "$(srcdir)/docs/debugger.html" "$(DESTDIR)$(DOCDIR)/"
$(INSTALL) -d "$(DESTDIR)$(DOCDIR)/graphics"
diff --git a/configure b/configure
index a1ecfb1..05e5c1c 100755
index 4fb2cf0..37f502e 100755
--- a/configure
+++ b/configure
@@ -307,6 +307,7 @@ mingw32-cross)
@@ -331,6 +331,7 @@ mingw32-cross)
_host_cpu=`echo $guessed_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
_host_os=`echo $guessed_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
_host_vendor=`echo $guessed_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
@@ -40,47 +26,8 @@ index a1ecfb1..05e5c1c 100755
;;
esac
@@ -347,21 +348,26 @@ esac
#
# Determine the C++ compiler
#
-echo_n "Looking for C++ compiler... "
-if test -n "$_host"; then
- compilers="$CXX $_host_prefix-g++ $_host_prefix-c++ $_host_cpu-$_host_os-g++ $_host_cpu-$_host_os-c++"
+if test_compiler "$CXX"; then
+ echo "$CXX"
else
- compilers="$CXX g++ c++"
+ if test -n "$_host"; then
+ compilers="$_host_prefix-g++ $_host_prefix-c++ $_host_cpu-$_host_os-g++ $_host_cpu-$_host_os-c++"
+ else
+ compilers="g++ c++"
+ fi
+
+ for compiler in $compilers; do
+ echo "testing compile $compiler"
+ if test_compiler $compiler; then
+ CXX=$compiler
+ echo $CXX
+ break
+ fi
+ done
fi
-for compiler in $compilers; do
- if test_compiler "$compiler -std=c++14"; then
- CXX=$compiler
- echo $CXX
- break
- fi
-done
-if test -z $CXX; then
+if test -z "$CXX"; then
echo "none found!"
exit 1
fi
@@ -511,8 +517,9 @@ if test -n "$_host"; then
_host_os=win32
@@ -557,8 +558,9 @@ if test -n "$_host"; then
_host_os=unix
;;
*)
- echo "Cross-compiling to unknown target, please add your target to configure."
@@ -91,7 +38,7 @@ index a1ecfb1..05e5c1c 100755
;;
esac
@@ -676,7 +683,7 @@ fi
@@ -802,7 +804,7 @@ fi
# Now, add the appropriate defines/libraries/headers
#
echo
@@ -100,15 +47,24 @@ index a1ecfb1..05e5c1c 100755
SRC="src"
CORE="$SRC/emucore"
@@ -694,7 +701,7 @@ ZLIB="$SRC/zlib"
@@ -821,7 +823,7 @@ SQLITE="$SRC/common/repository/sqlite"
INCLUDES="-I$CORE -I$COMMON -I$TV -I$GUI -I$TIA -I$TIA_FRAME_MANAGER"
INCLUDES="-I$CORE -I$COMMON -I$TV -I$TIA -I$TIA_FRAME_MANAGER"
-INCLUDES="$INCLUDES `$_sdlconfig --cflags`"
+INCLUDES="$INCLUDES `pkg-config --cflags sdl2`"
if test "$_build_static" = yes ; then
_sdl_conf_libs="--static-libs"
LDFLAGS="-static $LDFLAGS"
@@ -829,7 +831,7 @@ else
_sdl_conf_libs="--libs"
fi
-LIBS="$LIBS `$_sdlconfig $_sdl_conf_libs`"
+LIBS="$LIBS `pkg-config $_sdl_conf_libs sdl2`"
LD=$CXX
case $_host_os in
--
2.14.3
2.21.1

View File

@@ -13,9 +13,7 @@ SRC_URI = " \
https://github.com/stella-emu/stella/releases/download/${PV}/${BPN}-${PV}-src.tar.xz \
file://0001-custtomize-configure-and-Makefile-to-our-needs.patch \
"
SRC_URI[md5sum] = "f7cccdf4761b7183a235ffeef136e180"
SRC_URI[sha256sum] = "e074317c25e5d4cabec4558909d301c3a7654ad620863f05d342244fe6bdfe0a"
SRC_URI[md5sum] = "36b927c46ca0be0ae7dee06760b9091b"
SRC_URI[sha256sum] = "8086e57c231625f0b840ca361f493969247d20476cbb53609d778d37bda17c34"
CLEANBROKEN = "1"
FILES_${PN} += "${datadir}/icons"

View File

@@ -1,101 +0,0 @@
From 6f69c122f0ea97b89bb0bb72cb75e97dc24d5506 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 8 Jun 2018 11:10:25 +0200
Subject: [PATCH] Hack build with latest FFMPEG
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Taking videos in raw format won't work with ne FFMPEG.
| ../../../vice-3.2/src/gfxoutputdrv/ffmpegdrv.c:363:34: error: 'CODEC_CAP_VARIABLE_FRAME_SIZE' undeclared (first use in this function); did you mean 'AV_CODEC_CAP_VARIABLE_FRAME_SIZE'?
| if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| AV_CODEC_CAP_VARIABLE_FRAME_SIZE
| ../../../vice-3.2/src/gfxoutputdrv/ffmpegdrv.c:461:21: error: 'CODEC_FLAG_GLOBAL_HEADER' undeclared (first use in this function); did you mean 'AV_CODEC_FLAG_GLOBAL_HEADER'?
| c->flags |= CODEC_FLAG_GLOBAL_HEADER;
| ^~~~~~~~~~~~~~~~~~~~~~~~
| AV_CODEC_FLAG_GLOBAL_HEADER
| ../../../../../../../../../oe-core/workspace/sources/vice/src/gfxoutputdrv/ffmpegdrv.c:982:40: error: 'AVFMT_RAWPICTURE' undeclared (first use in this function); did you mean 'FF_API_AVPICTURE'?
| if (ffmpegdrv_oc->oformat->flags & AVFMT_RAWPICTURE) {
| ^~~~~~~~~~~~~~~~
| FF_API_AVPICTURE
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/gfxoutputdrv/ffmpegdrv.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/src/gfxoutputdrv/ffmpegdrv.c b/src/gfxoutputdrv/ffmpegdrv.c
index 4748348..b52e39b 100644
--- a/src/gfxoutputdrv/ffmpegdrv.c
+++ b/src/gfxoutputdrv/ffmpegdrv.c
@@ -360,7 +360,11 @@ static int ffmpegdrv_open_audio(AVFormatContext *oc, AVStream *st)
}
audio_is_open = 1;
+#ifdef AV_CODEC_CAP_VARIABLE_FRAME_SIZE
+ if (c->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) {
+#else
if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) {
+#endif
audio_inbuf_samples = 10000;
} else {
audio_inbuf_samples = c->frame_size;
@@ -454,7 +458,11 @@ static int ffmpegmovie_init_audio(int speed, int channels, soundmovie_buffer_t *
/* Some formats want stream headers to be separate. */
if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER)
+#ifdef AV_CODEC_FLAG_GLOBAL_HEADER
+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+#else
c->flags |= CODEC_FLAG_GLOBAL_HEADER;
+#endif
/* create resampler context */
#ifndef HAVE_FFMPEG_AVRESAMPLE
@@ -787,7 +795,11 @@ static void ffmpegdrv_init_video(screenshot_t *screenshot)
/* Some formats want stream headers to be separate. */
if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER) {
+#ifdef AV_CODEC_FLAG_GLOBAL_HEADER
+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+#else
c->flags |= CODEC_FLAG_GLOBAL_HEADER;
+#endif
}
if (audio_init_done) {
@@ -967,6 +979,7 @@ static int ffmpegdrv_record(screenshot_t *screenshot)
video_st.frame->pts = video_st.next_pts++;
+#ifdef AVFMT_RAWPICTURE
if (ffmpegdrv_oc->oformat->flags & AVFMT_RAWPICTURE) {
AVPacket pkt;
VICE_P_AV_INIT_PACKET(&pkt);
@@ -978,6 +991,7 @@ static int ffmpegdrv_record(screenshot_t *screenshot)
ret = VICE_P_AV_INTERLEAVED_WRITE_FRAME(ffmpegdrv_oc, &pkt);
} else {
+#endif
AVPacket pkt = { 0 };
int got_packet;
@@ -998,7 +1012,9 @@ static int ffmpegdrv_record(screenshot_t *screenshot)
} else {
ret = 0;
}
+#ifdef AVFMT_RAWPICTURE
}
+#endif
if (ret < 0) {
log_debug("Error while writing video frame");
return -1;
--
2.14.3

View File

@@ -0,0 +1,43 @@
From 7570ff1980acb288e11ae91221b89bfdc5b396d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Mon, 7 Sep 2020 21:06:16 +0200
Subject: [PATCH] use extern for the declarations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Accepted[https://sourceforge.net/p/vice-emu/code/37520/]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/arch/gtk3/widgets/base/carthelpers.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/arch/gtk3/widgets/base/carthelpers.h b/src/arch/gtk3/widgets/base/carthelpers.h
index 1de1d40..cfee67a 100644
--- a/src/arch/gtk3/widgets/base/carthelpers.h
+++ b/src/arch/gtk3/widgets/base/carthelpers.h
@@ -31,13 +31,13 @@
#include "vice.h"
#include <gtk/gtk.h>
-int (*carthelpers_save_func)(int type, const char *filename);
-int (*carthelpers_flush_func)(int type);
-int (*carthelpers_is_enabled_func)(int type);
-int (*carthelpers_enable_func)(int type);
-int (*carthelpers_disable_func)(int type);
-int (*carthelpers_can_save_func)(int type);
-int (*carthelpers_can_flush_func)(int type);
+extern int (*carthelpers_save_func)(int type, const char *filename);
+extern int (*carthelpers_flush_func)(int type);
+extern int (*carthelpers_is_enabled_func)(int type);
+extern int (*carthelpers_enable_func)(int type);
+extern int (*carthelpers_disable_func)(int type);
+extern int (*carthelpers_can_save_func)(int type);
+extern int (*carthelpers_can_flush_func)(int type);
void carthelpers_set_functions(
--
2.26.2

View File

@@ -0,0 +1,46 @@
From 1936dac13d3019ecb2fc07fb7b61106f5164cac4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Mon, 7 Sep 2020 21:22:32 +0200
Subject: [PATCH] two more fixes to fix -fno-common compiliation, patch #217
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Accepted[https://sourceforge.net/p/vice-emu/code/37527/]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/c128/z80.c | 3 ++-
src/rs232drv/rs232.h | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/c128/z80.c b/src/c128/z80.c
index 3a7eba3..f53f55d 100644
--- a/src/c128/z80.c
+++ b/src/c128/z80.c
@@ -444,7 +444,8 @@ static const uint8_t SZP[256] = {
/* ------------------------------------------------------------------------- */
-z80_regs_t z80_regs;
+/* This struct variable is exported by ../c64/cart/cpmcart.c */
+/* z80_regs_t z80_regs; */
static void import_registers(void)
{
diff --git a/src/rs232drv/rs232.h b/src/rs232drv/rs232.h
index 1c5e6ff..e21fbaf 100644
--- a/src/rs232drv/rs232.h
+++ b/src/rs232drv/rs232.h
@@ -78,7 +78,7 @@ extern int rs232_cmdline_options_init(void);
#define RS232_NUM_DEVICES 4
extern char *rs232_devfile[RS232_NUM_DEVICES];
-int rs232_useip232[RS232_NUM_DEVICES];
+extern int rs232_useip232[RS232_NUM_DEVICES];
/* the "ip232" protocol used by tcpser
--
2.26.2

View File

Before

Width:  |  Height:  |  Size: 620 B

After

Width:  |  Height:  |  Size: 620 B

View File

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

Before

Width:  |  Height:  |  Size: 572 B

After

Width:  |  Height:  |  Size: 572 B

View File

@@ -0,0 +1,9 @@
[Desktop Entry]
Type=Application
Name=X64-old (Vice)
Comment=Commodore 64 Emulator (performing best currently)
Exec=x64
Icon=c64
Terminal=false
StartupNotify=false
Categories=Game

View File

@@ -0,0 +1,10 @@
[Desktop Entry]
Type=Application
Name=X64dtv (Vice)
Comment=Commodore 64 Emulator
Exec=x64dtv
Icon=c64
Terminal=false
StartupNotify=false
Categories=Game
Name[en_US]=vice_64dtv

View File

@@ -1,9 +1,10 @@
[Desktop Entry]
Type=Application
Name=X64 (Vice)
Name=X64sc (Vice)
Comment=Commodore 64 Emulator
Exec=x64
Exec=x64sc
Icon=c64
Terminal=false
StartupNotify=false
Categories=Game
Name[en_US]=vice_64sc

View File

@@ -7,26 +7,33 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
# [1] ftp://arnold.c64.org/pub/games/
SRC_URI = " \
${SOURCEFORGE_MIRROR}/vice-emu/${PN}-${PV}.tar.gz \
${SOURCEFORGE_MIRROR}/vice-emu/${BPN}-${PV}.tar.gz \
file://0001-fix-autoreconfig.patch \
file://0002-Hack-build-with-latest-FFMPEG.patch \
file://0002-use-extern-for-the-declarations.patch \
file://0003-two-more-fixes-to-fix-fno-common-compiliation-patch-.patch \
file://c64_16.png \
file://c64_32.png \
file://c64_48.png \
file://vice_64.desktop \
file://vice_64dtv.desktop \
file://vice_64sc.desktop \
"
SRC_URI[md5sum] = "58ba6b6653097898e059e0194615705a"
SRC_URI[sha256sum] = "28d99f5e110720c97ef16d8dd4219cf9a67661d58819835d19378143697ba523"
SRC_URI[md5sum] = "24d83f692910f5d87de19857e8095f0b"
SRC_URI[sha256sum] = "4bd00c1c63d38cd1fe01b90032834b52f774bc29e4b67eeb1e525b14fee07aeb"
inherit autotools pkgconfig gtk-icon-cache
inherit autotools pkgconfig gtk-icon-cache features_check
REQUIRED_DISTRO_FEATURES = "opengl x11"
DEPENDS = " \
glib-2.0-native \
bdftopcf-native \
mkfontdir-native \
mkfontscale-native \
xa-native \
bison-native \
gtk+ \
glew \
gtk+3 \
libav \
libsdl \
libpng \
@@ -37,24 +44,34 @@ DEPENDS = " \
mpg123 \
virtual/libgl \
vte9 \
${@bb.utils.contains("DISTRO_FEATURES", "x11 opengl", "gtkglext", "", d)} \
"
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)}"
PACKAGECONFIG[pulseaudio] = "--with-pulse,--without-pulse,pulseaudio,pulseaudio-server"
EXTRA_OECONF = " \
--disable-option-checking \
--enable-external-ffmpeg \
--enable-parsid \
--enable-fullscreen \
--enable-gnomeui \
--with-uithreads \
--enable-native-gtk3ui \
--without-oss \
--libdir=${libdir} \
--enable-x64 \
"
EXTRA_OECONF_remove = " \
--disable-static \
"
CONFIGUREOPTS_remove = " \
--disable-silent-rules \
${@append_libtool_sysroot(d)} \
"
export ar_check="no"
do_install_append() {
install -d ${D}/${datadir}/applications
install -m 0644 ${WORKDIR}/vice_64.desktop ${D}/${datadir}/applications
install -m 0644 ${WORKDIR}/vice_64*.desktop ${D}/${datadir}/applications
for size in 16 32 48; do
install -d ${D}/${datadir}/icons/hicolor/${size}x${size}/apps
@@ -62,4 +79,7 @@ do_install_append() {
done
}
FILES_${PN} += "${datadir}/icons"
RDEPENDS_${PN} += "hicolor-icon-theme"
RREPLACES_${PN} += "vice-3.2"
RCONFLICTS_${PN} += "vice-3.2"

View File

@@ -0,0 +1,21 @@
DESCRIPTION = "Cas juggler"
AUTHOR = "Jürgen Buchmüller"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=9fa70e05c591cf3ab4016b22aab701df"
SRC_URI = "git://github.com/pullmoll/cass80.git"
SRCREV= "372455830343e5c8ebd42125cfe13191f976c343"
PV = "0.0.0+git${SRCPV}"
S = "${WORKDIR}/git"
inherit qmake5
DEPENDS = "qtbase"
do_install_append() {
install -d ${D}${bindir}
mv ${D}/opt/cass80/bin/cass80 ${D}${bindir}
rm -r ${D}/opt
}

View File

@@ -11,7 +11,7 @@ SRC_URI = " \
file://trs80.desktop \
"
SRCREV= "413ca44336c4423ac0e39b55d75fce95ff4c31fc"
SRCREV= "a9658c2fd33e862adc618d9dcbccf55a52d0c89d"
PV = "0.3.1+git${SRCPV}"
inherit pkgconfig

View File

@@ -0,0 +1,26 @@
SUMMARY = "The classic, refined DOOM source port"
HOMEPAGE = "https://www.doomretro.com"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://LICENSE;md5=435fa6b85536eff97b3594b76fd0048f"
DEPENDS = "libsdl2 libsdl2-image libsdl2-mixer"
inherit cmake
SRC_URI = " \
git://github.com/bradharding/doomretro.git \
file://doomretro.png \
file://doomretro.desktop \
"
SRCREV = "2655445b7a82643568bd58192185b25a864e5380"
PV = "3.5.10"
S = "${WORKDIR}/git"
do_install_append() {
install -d ${D}${datadir}/applications
install ${WORKDIR}/${BPN}.desktop ${D}${datadir}/applications
install -d ${D}${datadir}/pixmaps
install ${WORKDIR}/${BPN}.png ${D}${datadir}/pixmaps/${BPN}.png
}

View File

@@ -0,0 +1,9 @@
[Desktop Entry]
Type=Application
Name=Doomretro
Comment=The classic, refined DOOM source port
Exec=doomretro
Icon=doomretro
Terminal=false
StartupNotify=false
Categories=Game

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -0,0 +1,37 @@
From a9bdc7d166851eb032af187b5873f2e74b6deaaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 8 May 2021 16:23:08 +0200
Subject: [PATCH] Hack build with gcc11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
| common/2d/canvas.cpp:58:19: error: '<unknown>' may be used uninitialized [-Werror=maybe-uninitialized]
| 58 | gr_init_bitmap(canv.cv_bitmap, pixtype, 0, 0, w, h, wreal, pixdata);
| | ~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
common/2d/canvas.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/common/2d/canvas.cpp b/common/2d/canvas.cpp
index b32b31902..c47aa3ce1 100644
--- a/common/2d/canvas.cpp
+++ b/common/2d/canvas.cpp
@@ -55,7 +55,10 @@ void gr_init_canvas(grs_canvas &canv, unsigned char *const pixdata, const bm_mod
canv.cv_font_fg_color = 0;
canv.cv_font_bg_color = 0;
auto wreal = w;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
gr_init_bitmap(canv.cv_bitmap, pixtype, 0, 0, w, h, wreal, pixdata);
+#pragma GCC diagnostic pop
}
void gr_init_sub_canvas(grs_canvas &n, grs_canvas &src, uint16_t x, uint16_t y, uint16_t w, uint16_t h)
--
2.30.2

View File

@@ -2,18 +2,30 @@ SUMMARY = "D1X-Rebirth is a Source Port of the Descent Game"
HOMEPAGE = "http://www.dxx-rebirth.com/"
SECTION = "games"
LICENSE = "DXX-Rebirth"
LIC_FILES_CHKSUM = "file://COPYING.txt;md5=022f1bfd6fd458067b51b10cd3186e78"
LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7077769a51d612f2edcc6abd1e5dfa6d"
DEPENDS = "python-scons-native libsdl libsdl-mixer physfs"
inherit python3native
DEPENDS = " \
python3-scons-native \
libsdl \
libsdl-mixer \
libsdl-image \
physfs \
libpng \
"
SRC_URI = " \
http://www.dxx-rebirth.com/download/dxx/${BPN}_${PV}-src.tar.gz \
git://github.com/dxx-rebirth/dxx-rebirth.git \
http://www.dxx-rebirth.com/download/dxx/content/descent-mac-demo.zip;name=data \
http://www.descent2.de/files/sound/hires-sounds.7z;name=sound \
http://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.dxa;name=music;unpack=0 \
file://0001-Hack-build-with-gcc11.patch \
"
SRC_URI[md5sum] = "8f43e66191fdedd0c7ff9278719accf1"
SRC_URI[sha256sum] = "5befc8a2ab1159fdb4d4141ba9f0e229450592d5ada209e832101da5b0b3e38e"
SRCREV = "48589d0fb019eb971818c15665358e30fa778dc4"
PV = "v0.59+git${SRCPV}"
S = "${WORKDIR}/git"
SRC_URI[data.md5sum] = "010815be5d87d61150a938ad593102fe"
SRC_URI[data.sha256sum] = "17d2fdefc06a96a50f54d4eba745835b619115e5327ddc3d23052bf4ec0e3300"
SRC_URI[sound.md5sum] = "474fdf1c1f8d2bbbc68f271cb9aa28b8"
@@ -21,26 +33,24 @@ SRC_URI[sound.sha256sum] = "39cab9e2aed4c6ec9e3b811bbdf2c880d4acd87e4c66a9e1f80f
SRC_URI[music.md5sum] = "bf54b45a648052b2531bbb95c001403b"
SRC_URI[music.sha256sum] = "b27f7b9dc5f9c2744402c56c9499dfd9503c17e73a2a5223e745529d7867962f"
S = "${WORKDIR}/${BPN}_${PV}-src"
do_unpack[depends] += "p7zip-native:do_populate_sysroot"
do_compile() {
scons opengl=0 prefix=${D}${prefix} sharepath=${datadir}/${BPN}
scons ${PARALLEL_MAKE} opengl=0 prefix=${D}${prefix} sharepath=${datadir}/${BPN}
}
do_install() {
install -d ${D}${bindir}
install ${BPN} ${D}${bindir}
install ${S}/${BPN}/${BPN} ${D}${bindir}
install -d ${D}${datadir}/applications
install ${BPN}.desktop ${D}${datadir}/applications
install ${S}/${BPN}/${BPN}.desktop ${D}${datadir}/applications
install -d ${D}${datadir}/pixmaps
install ${BPN}.xpm ${D}${datadir}/pixmaps
install ${S}/${BPN}/${BPN}.xpm ${D}${datadir}/pixmaps
install -d ${D}${datadir}/${BPN}
install ../descent.hog ../descent.pig ../d1xr-sc55-music.dxa ${D}${datadir}/${BPN}
install ${WORKDIR}/descent.hog ${WORKDIR}/descent.pig ${WORKDIR}/d1xr-sc55-music.dxa ${D}${datadir}/${BPN}
}
RRECOMMENDS_${PN} = "tremor"

View File

@@ -1,42 +0,0 @@
From de64bf5798755f4ea24cc1b8f1d6197b8a0fc7c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sun, 16 Aug 2015 15:43:44 +0200
Subject: [PATCH 1/2] Makefile: use pkgconfig to find sdl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [Configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
Makefile | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 88a8bd6..63c2983 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,6 @@ WITH_NETWORK := true
STRIP := strip
-SDL_CONFIG := sdl-config
-
SRCS := $(wildcard src/*.c)
OBJS := $(SRCS:src/%.c=obj/%.o)
@@ -39,8 +37,8 @@ endif
EXTRA_LDLIBS += -lm
-SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags)
-SDL_LDLIBS := $(shell $(SDL_CONFIG) --libs)
+SDL_CFLAGS := $(shell pkg-config --cflags sdl)
+SDL_LDLIBS := $(shell pkg-config --libs sdl)
ifeq ($(WITH_NETWORK), true)
SDL_LDLIBS += -lSDL_net
endif
--
2.1.0

View File

@@ -1,63 +0,0 @@
From 7e1c9fb3c30d12139ad531b6b14c53fb5764b24c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sun, 16 Aug 2015 16:04:41 +0200
Subject: [PATCH 2/2] Fix several uninitialized variable warnings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Backport [1]
[1] https://bitbucket.org/opentyrian/opentyrian/commits/03cdbc8922f7856378f2e4b51f9adb5073f6fc9e/raw/
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
src/mainint.c | 2 +-
src/shots.c | 2 +-
src/tyrian2.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/mainint.c b/src/mainint.c
index 2805752..b00074e 100644
--- a/src/mainint.c
+++ b/src/mainint.c
@@ -3635,7 +3635,7 @@ redo:
blit_sprite2x2(VGAScreen, this_player->x - 17, this_player->y - 7, *shapes9ptr_, 220);
blit_sprite2x2(VGAScreen, this_player->x + 7, this_player->y - 7, *shapes9ptr_, 222);
- int ship_banking;
+ int ship_banking = 0;
switch (ship_sprite)
{
case 5:
diff --git a/src/shots.c b/src/shots.c
index 606a19f..7aa6ac5 100644
--- a/src/shots.c
+++ b/src/shots.c
@@ -319,7 +319,7 @@ JE_integer player_shot_create( JE_word portNum, uint bay_i, JE_word PX, JE_word
if (weapon->sound > 0)
soundQueue[soundChannel[bay_i]] = weapon->sound;
- int shot_id;
+ int shot_id = MAX_PWEAPON;
/*Rot*/
for (int multi_i = 1; multi_i <= weapon->multi; multi_i++)
{
diff --git a/src/tyrian2.c b/src/tyrian2.c
index 3a0a101..4d528cf 100644
--- a/src/tyrian2.c
+++ b/src/tyrian2.c
@@ -4325,8 +4325,8 @@ void JE_eventSystem( void )
case 19: /* Enemy Global Move */
{
- int initial_i, max_i;
- bool all_enemies;
+ int initial_i = 0, max_i = 0;
+ bool all_enemies = false;
if (eventRec[eventLoc-1].eventdat3 > 79 && eventRec[eventLoc-1].eventdat3 < 90)
{
--
2.1.0

View File

@@ -1,28 +0,0 @@
From 95788b1b09b0bd8e89cc3c7e5ed769ae3e87ac34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sun, 31 Jul 2016 04:02:51 +0200
Subject: [PATCH] fix build with pedantic gcc6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
src/joystick.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/joystick.c b/src/joystick.c
index 63dd75d..bf99647 100644
--- a/src/joystick.c
+++ b/src/joystick.c
@@ -42,7 +42,6 @@ bool ignore_joystick = false;
int joysticks = 0;
Joystick *joystick = NULL;
-static const char joystick_cfg_version = 1;
static const int joystick_analog_max = 32767;
// eliminates axis movement below the threshold
--
2.5.5

View File

@@ -0,0 +1,48 @@
SUMMARY = "OpenTyrian is a port of the DOS shoot-em-up Tyrian"
HOMEPAGE = "https://bitbucket.org/opentyrian/opentyrian/wiki/Home"
SECTION = "games"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
DEPENDS = "libsdl2 libsdl2-net"
inherit autotools-brokensep pkgconfig
SRC_URI = " \
git://github.com/opentyrian/opentyrian.git \
http://camanis.net/opentyrian/tyrian21.zip;name=data \
file://0001-increase-buffer-size-to-avoid-gcc7-format-overflow-e.patch \
file://0002-fix-build-with-gcc8.patch \
"
S = "${WORKDIR}/git"
SRCREV = "822c71943f6a06bc2599a0478ea41b6d413648d6"
PV = "2.1.20130907+git${SRCPV}"
SRC_URI[data.md5sum] = "2a3b206a6de25ed4b771af073f8ca904"
SRC_URI[data.sha256sum] = "7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277"
do_install() {
install -d ${D}${bindir}
install ${BPN} ${D}${bindir}
install -d ${D}${mandir}/man6
install linux/man/${BPN}.6 ${D}${mandir}/man6
install -d ${D}${datadir}/applications
install linux/${BPN}.desktop ${D}${datadir}/applications
install -d ${D}${datadir}/pixmaps
install linux/icons/tyrian-128.png ${D}${datadir}/pixmaps/${BPN}.png
install -d ${D}${datadir}/games/tyrian
install ${WORKDIR}/tyrian21/* ${D}${datadir}/games/tyrian
# remove unneeded DOS stuff
find ${D}${datadir}/games/tyrian -name '*.exe' -exec rm -f {} \;
find ${D}${datadir}/games/tyrian -name '*.ovl' -exec rm -f {} \;
find ${D}${datadir}/games/tyrian -name 'setup.*' -exec rm -f {} \;
find ${D}${datadir}/games/tyrian -name '*.doc' -exec rm -f {} \;
find ${D}${datadir}/games/tyrian -name '*.tfp' -exec rm -f {} \;
}
FILES_${PN} += "${datadir}/games"

View File

@@ -53,21 +53,6 @@ diff --git a/src/tyrian2.c b/src/tyrian2.c
index 4d528cf..411d8b6 100644
--- a/src/tyrian2.c
+++ b/src/tyrian2.c
@@ -2088,12 +2088,12 @@ draw_player_shot_loop_end:
if (debug)
{
strcpy(tempStr, "");
- for (temp = 0; temp < 9; temp++)
+ /*for (temp = 0; temp < 9; temp++)
{
sprintf(tempStr, "%s%c", tempStr, smoothies[temp] + 48);
}
sprintf(buffer, "SM = %s", tempStr);
- JE_outText(VGAScreen, 30, 70, buffer, 4, 0);
+ JE_outText(VGAScreen, 30, 70, buffer, 4, 0);*/
sprintf(buffer, "Memory left = %d", -1);
JE_outText(VGAScreen, 30, 80, buffer, 4, 0);
@@ -2608,7 +2608,7 @@ new_game:
read_encrypted_pascal_string(s, sizeof(s), ep_f);

View File

@@ -1,50 +0,0 @@
SUMMARY = "OpenTyrian is a port of the DOS shoot-em-up Tyrian"
HOMEPAGE = "https://bitbucket.org/opentyrian/opentyrian/wiki/Home"
SECTION = "games"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
DEPENDS = "libsdl libsdl-net"
inherit autotools-brokensep pkgconfig
SRC_URI = " \
http://www.camanis.net/opentyrian/releases/${BPN}-${PV}-src.tar.gz \
http://camanis.net/opentyrian/tyrian21.zip;name=data \
file://0001-Makefile-use-pkgconfig-to-find-sdl.patch \
file://0002-Fix-several-uninitialized-variable-warnings.patch \
file://0003-fix-build-with-pedantic-gcc6.patch \
file://0004-increase-buffer-size-to-avoid-gcc7-format-overflow-e.patch \
file://0005-fix-build-with-gcc8.patch \
"
SRC_URI[md5sum] = "978686c5a1dfbac69a2161aadf084c2b"
SRC_URI[sha256sum] = "f54b6b3cedcefa187c9f605d6164aae29ec46a731a6df30d351af4c008dee45f"
SRC_URI[data.md5sum] = "2a3b206a6de25ed4b771af073f8ca904"
SRC_URI[data.sha256sum] = "7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277"
CFLAGS += "-Wimplicit-fallthrough=0"
do_install() {
install -d ${D}${bindir}
install ${BPN} ${D}${bindir}
install -d ${D}${mandir}/man6
install linux/man/${BPN}.6 ${D}${mandir}/man6
install -d ${D}${datadir}/applications
install linux/${BPN}.desktop ${D}${datadir}/applications
install -d ${D}${datadir}/pixmaps
install linux/icons/tyrian-128.png ${D}${datadir}/pixmaps/${BPN}.png
install -d ${D}${datadir}/${BPN}/data
install ${WORKDIR}/tyrian21/* ${D}${datadir}/${BPN}/data
# remove unneeded DOS stuff
find ${D}${datadir}/${BPN}/data -name '*.exe' -exec rm -f {} \;
find ${D}${datadir}/${BPN}/data -name '*.ovl' -exec rm -f {} \;
find ${D}${datadir}/${BPN}/data -name 'setup.*' -exec rm -f {} \;
find ${D}${datadir}/${BPN}/data -name '*.doc' -exec rm -f {} \;
find ${D}${datadir}/${BPN}/data -name '*.tfp' -exec rm -f {} \;
}

View File

@@ -3,7 +3,7 @@ LICENSE = "GPLv2 | LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff"
inherit gnomebase pkgconfig distro_features_check
inherit gnomebase pkgconfig features_check
REQUIRED_DISTRO_FEATURES = "x11 opengl"

View File

@@ -0,0 +1,189 @@
From 23b4318e2836d82c04b3bead9d21ab2e53d0dd5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sun, 25 Aug 2019 22:12:39 +0200
Subject: [PATCH] Hack to build with recent pango
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inapropriate [dead-project]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
pango-impl-utils.h | 145 +++++++++++++++++++++++++++++++++++++++++++++
pangox.c | 2 +
2 files changed, 147 insertions(+)
diff --git a/pango-impl-utils.h b/pango-impl-utils.h
index 6d6c8ff..55af764 100644
--- a/pango-impl-utils.h
+++ b/pango-impl-utils.h
@@ -27,6 +27,151 @@
#include <glib-object.h>
#include <pango/pango.h>
+/* pango plays remove and oops don't remove with PangoFontClass so add our own fallback [1]
+ * [1] https://gitlab.gnome.org/GNOME/pango/commit/db1e5dae6e355db792e75cdcca0b7845c89ac4a4 */
+
+#include <pango/pango-font.h>
+
+#ifndef PANGO_FONT_CLASS
+#define PANGO_FONT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FONT, PangoFontClass))
+#define PANGO_IS_FONT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FONT))
+#define PANGO_FONT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FONT, PangoFontClass))
+
+typedef struct _PangoFontClass PangoFontClass;
+
+struct _PangoFontMetrics
+{
+ /* <private> */
+ guint ref_count;
+
+ int ascent;
+ int descent;
+ int height;
+ int approximate_char_width;
+ int approximate_digit_width;
+ int underline_position;
+ int underline_thickness;
+ int strikethrough_position;
+ int strikethrough_thickness;
+};
+
+struct _PangoFontClass
+{
+ GObjectClass parent_class;
+
+ /*< public >*/
+
+ PangoFontDescription *(*describe) (PangoFont *font);
+ PangoCoverage * (*get_coverage) (PangoFont *font,
+ PangoLanguage *language);
+ void (*get_glyph_extents) (PangoFont *font,
+ PangoGlyph glyph,
+ PangoRectangle *ink_rect,
+ PangoRectangle *logical_rect);
+ PangoFontMetrics * (*get_metrics) (PangoFont *font,
+ PangoLanguage *language);
+ PangoFontMap * (*get_font_map) (PangoFont *font);
+ PangoFontDescription *(*describe_absolute) (PangoFont *font);
+ void (*get_features) (PangoFont *font,
+ hb_feature_t *features,
+ guint len,
+ guint *num_features);
+ hb_font_t * (*create_hb_font) (PangoFont *font);
+};
+#endif /* PANGO_FONT_CLASS */
+
+
+#ifndef PANGO_FONT_FAMILY_CLASS
+#define PANGO_FONT_FAMILY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FONT_FAMILY, PangoFontFamilyClass))
+#define PANGO_IS_FONT_FAMILY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FONT_FAMILY))
+#define PANGO_FONT_FAMILY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FONT_FAMILY, PangoFontFamilyClass))
+
+typedef struct _PangoFontFamily PangoFontFamily;
+typedef struct _PangoFontFamilyClass PangoFontFamilyClass;
+
+#ifndef PANGO_DISABLE_DEPRECATED
+
+/**
+ * PangoFontFamily:
+ *
+ * The #PangoFontFamily structure is used to represent a family of related
+ * font faces. The faces in a family share a common design, but differ in
+ * slant, weight, width and other aspects.
+ */
+struct _PangoFontFamily
+{
+ GObject parent_instance;
+};
+
+struct _PangoFontFamilyClass
+{
+ GObjectClass parent_class;
+
+ /*< public >*/
+
+ void (*list_faces) (PangoFontFamily *family,
+ PangoFontFace ***faces,
+ int *n_faces);
+ const char * (*get_name) (PangoFontFamily *family);
+ gboolean (*is_monospace) (PangoFontFamily *family);
+ gboolean (*is_variable) (PangoFontFamily *family);
+
+ /*< private >*/
+
+ /* Padding for future expansion */
+ void (*_pango_reserved2) (void);
+ void (*_pango_reserved3) (void);
+};
+
+#endif /* PANGO_DISABLE_DEPRECATED */
+#endif /* PANGO_FONT_FAMILY_CLASS */
+
+#ifndef PANGO_FONT_FACE_CLASS
+
+#define PANGO_FONT_FACE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FONT_FACE, PangoFontFaceClass))
+#define PANGO_IS_FONT_FACE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FONT_FACE))
+#define PANGO_FONT_FACE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FONT_FACE, PangoFontFaceClass))
+
+typedef struct _PangoFontFaceClass PangoFontFaceClass;
+
+#ifndef PANGO_DISABLE_DEPRECATED
+
+/**
+ * PangoFontFace:
+ *
+ * The #PangoFontFace structure is used to represent a group of fonts with
+ * the same family, slant, weight, width, but varying sizes.
+ */
+struct _PangoFontFace
+{
+ GObject parent_instance;
+};
+
+struct _PangoFontFaceClass
+{
+ GObjectClass parent_class;
+
+ /*< public >*/
+
+ const char * (*get_face_name) (PangoFontFace *face);
+ PangoFontDescription * (*describe) (PangoFontFace *face);
+ void (*list_sizes) (PangoFontFace *face,
+ int **sizes,
+ int *n_sizes);
+ gboolean (*is_synthesized) (PangoFontFace *face);
+
+ /*< private >*/
+
+ /* Padding for future expansion */
+ void (*_pango_reserved3) (void);
+ void (*_pango_reserved4) (void);
+};
+
+#endif /* PANGO_DISABLE_DEPRECATED */
+#endif /* PANGO_FONT_FACE_CLASS */
+
+/* end of pango fallback */
+
G_BEGIN_DECLS
#define PANGO_DEFINE_TYPE_FULL(name, prefix, \
diff --git a/pangox.c b/pangox.c
index 1a98fa5..1362c14 100644
--- a/pangox.c
+++ b/pangox.c
@@ -279,7 +279,9 @@ pango_x_font_class_init (PangoXFontClass *class)
font_class->describe = pango_x_font_describe;
font_class->get_coverage = pango_x_font_get_coverage;
+#ifndef PANGO_VERSION_1_44
font_class->find_shaper = pango_x_font_find_shaper;
+#endif
font_class->get_glyph_extents = pango_x_font_get_glyph_extents;
font_class->get_metrics = pango_x_font_get_metrics;
font_class->get_font_map = pango_x_font_get_font_map;
--
2.21.0

View File

@@ -6,5 +6,6 @@ inherit gnomebase pkgconfig
DEPENDS += "pango"
SRC_URI += "file://0001-Hack-to-build-with-recent-pango.patch"
SRC_URI[archive.md5sum] = "7bcbd0187f03e1e27af9a81e07249c33"
SRC_URI[archive.sha256sum] = "552092b3b6c23f47f4beee05495d0f9a153781f62a1c4b7ec53857a37dfce046"

View File

@@ -0,0 +1,97 @@
From 908d5fcdfeac32d7ab5cff307d0a46a962ed600f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Tue, 6 Sep 2016 00:08:16 +0200
Subject: [PATCH] do not build java application to set midi defaults
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
dragging in whole java environment for a small tool not everybody misses
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
CMakeLists.txt | 2 --
pm_common/CMakeLists.txt | 18 +-----------------
pm_dylib/CMakeLists.txt | 14 --------------
3 files changed, 1 insertion(+), 33 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4919b78..2137ce4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,6 +72,4 @@ add_subdirectory(pm_test)
add_subdirectory(pm_dylib)
-# Cannot figure out how to make an xcode Java application with CMake
-add_subdirectory(pm_java)
diff --git a/pm_common/CMakeLists.txt b/pm_common/CMakeLists.txt
index bfd4ab9..9ea9030 100644
--- a/pm_common/CMakeLists.txt
+++ b/pm_common/CMakeLists.txt
@@ -67,15 +67,6 @@ if(UNIX)
message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
else(APPLE)
# LINUX settings...
- include(FindJNI)
- message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
- message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
- message(STATUS "JAVA_INCLUDE_PATH2 is " ${JAVA_INCLUDE_PATH2})
- message(STATUS "JAVA_JVM_LIBRARY is " ${JAVA_JVM_LIBRARY})
- set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
- # libjvm.so is found relative to JAVA_INCLUDE_PATH:
- set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}/libjvm.so)
-
set(LINUXSRC pmlinuxalsa pmlinux finddefault)
prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})
list(APPEND LIBSRC ../porttime/ptlinux)
@@ -109,17 +100,10 @@ add_library(portmidi-static ${LIBSRC})
set_target_properties(portmidi-static PROPERTIES OUTPUT_NAME "portmidi_s")
target_link_libraries(portmidi-static ${PM_NEEDED_LIBS})
-# define the jni library
-include_directories(${JAVA_INCLUDE_PATHS})
-
-set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c)
-add_library(pmjni SHARED ${JNISRC})
-target_link_libraries(pmjni ${JNI_EXTRA_LIBS})
-set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib")
# install the libraries (Linux and Mac OS X command line)
if(UNIX)
- INSTALL(TARGETS portmidi-static pmjni
+ INSTALL(TARGETS portmidi-static
LIBRARY DESTINATION ${LIB_INSTALL_DIR}
ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
# .h files installed by pm_dylib/CMakeLists.txt, so don't need them here
diff --git a/pm_dylib/CMakeLists.txt b/pm_dylib/CMakeLists.txt
index a0c615e..8ad415f 100644
--- a/pm_dylib/CMakeLists.txt
+++ b/pm_dylib/CMakeLists.txt
@@ -63,20 +63,6 @@ if(UNIX)
message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
else(APPLE)
# LINUX settings...
- include(FindJNI)
- # message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
- # message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
- # note: should use JAVA_JVM_LIB_PATH, but it is not set properly
- # note: user might need to set JAVA_INCLUDE_PATH manually
- #
- # this will probably break on BSD and other Unix systems; the fix
- # depends on whether FindJNI can find Java or not. If yes, then
- # we should try to rely on automatically set JAVA_INCLUDE_PATH and
- # JAVA_INCLUDE_PATH2; if no, then we need to make both JAVA_INCLUDE_PATH
- # and JAVA_INCLUDE_PATH2 set by user (will need clear documentation
- # because JAVA_INCLUDE_PATH2 is pretty obscure)
- set(JAVAVM_LIB ${JAVA_JVM_LIBRARY})
-
set(LINUXSRC pmlinuxalsa pmlinux finddefault)
prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})
list(APPEND LIBSRC ../porttime/ptlinux)
--
2.5.5

View File

@@ -0,0 +1,48 @@
From 7240f951277e47f2f37523b3ca5408bfe5fc3c53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Tue, 6 Sep 2016 01:04:42 +0200
Subject: [PATCH 2/2] fix compilation du to unkown functions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
pm_linux/finddefault.c | 3 +++
pm_linux/pmlinux.c | 2 ++
2 files changed, 5 insertions(+)
diff --git a/pm_linux/finddefault.c b/pm_linux/finddefault.c
index 6340316..89ca43a 100644
--- a/pm_linux/finddefault.c
+++ b/pm_linux/finddefault.c
@@ -5,10 +5,13 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+#include <ctype.h>
#include "portmidi.h"
#define STRING_MAX 256
+int pm_find_default_device(char *pattern, int is_input);
+
/* skip over spaces, return first non-space */
void skip_spaces(FILE *inf)
{
diff --git a/pm_linux/pmlinux.c b/pm_linux/pmlinux.c
index 49e266d..42c0906 100755
--- a/pm_linux/pmlinux.c
+++ b/pm_linux/pmlinux.c
@@ -26,6 +26,8 @@
PmDeviceID pm_default_input_device_id = -1;
PmDeviceID pm_default_output_device_id = -1;
+PmDeviceID find_default_device(char *path, int input, PmDeviceID id);
+
void pm_init()
{
/* Note: it is not an error for PMALSA to fail to initialize.
--
2.5.5

View File

@@ -0,0 +1,124 @@
From e597c5c8636a269dbe5e664c706e66887479f161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Tue, 26 Sep 2018 01:44:12 +0200
Subject: [PATCH] Fix format-security
Stolen from [1]
[1] https://src.fedoraproject.org/cgit/rpms/portmidi.git/plain/portmidi-217-format-security.patch
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
pm_test/latency.c | 2 +-
pm_test/midiclock.c | 4 ++--
pm_test/mm.c | 8 ++++----
pm_test/sysex.c | 2 +-
pm_test/test.c | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pm_test/latency.c b/pm_test/latency.c
index 507648c..5f4bb5c 100755
--- a/pm_test/latency.c
+++ b/pm_test/latency.c
@@ -280,7 +280,7 @@ int get_number(char *prompt)
{
char line[STRING_MAX];
int n = 0, i;
- printf(prompt);
+ printf("%s",prompt);
while (n != 1) {
n = scanf("%d", &i);
fgets(line, STRING_MAX, stdin);
diff --git a/pm_test/midiclock.c b/pm_test/midiclock.c
index 60fcf7a..17967a5 100644
--- a/pm_test/midiclock.c
+++ b/pm_test/midiclock.c
@@ -167,7 +167,7 @@ int get_number(char *prompt)
{
char line[STRING_MAX];
int n = 0, i;
- printf(prompt);
+ printf("%s",prompt);
while (n != 1) {
n = scanf("%d", &i);
fgets(line, STRING_MAX, stdin);
@@ -256,7 +256,7 @@ int main(int argc, char **argv)
err = Pm_OpenOutput(&midi, outp, DRIVER_INFO, OUTPUT_BUFFER_SIZE,
TIME_PROC, TIME_INFO, LATENCY);
if (err) {
- printf(Pm_GetErrorText(err));
+ printf("%s",Pm_GetErrorText(err));
goto error_exit_no_device;
}
active = true;
diff --git a/pm_test/mm.c b/pm_test/mm.c
index 209ff74..f3e6e7b 100755
--- a/pm_test/mm.c
+++ b/pm_test/mm.c
@@ -119,7 +119,7 @@ int get_number(char *prompt)
{
char line[STRING_MAX];
int n = 0, i;
- printf(prompt);
+ printf("%s",prompt);
while (n != 1) {
n = scanf("%d", &i);
fgets(line, STRING_MAX, stdin);
@@ -136,7 +136,7 @@ void receive_poll(PtTimestamp timestamp, void *userData)
if (!active) return;
while ((count = Pm_Read(midi_in, &event, 1))) {
if (count == 1) output(event.message);
- else printf(Pm_GetErrorText(count));
+ else printf("%s",Pm_GetErrorText(count));
}
}
@@ -168,7 +168,7 @@ int main(int argc, char **argv)
inp = get_number("Type input device number: ");
err = Pm_OpenInput(&midi_in, inp, NULL, 512, NULL, NULL);
if (err) {
- printf(Pm_GetErrorText(err));
+ printf("%s",Pm_GetErrorText(err));
Pt_Stop();
mmexit(1);
}
@@ -484,7 +484,7 @@ private int put_pitch(int p)
"gs", "a", "bf", "b" };
/* note octave correction below */
sprintf(result, "%s%d", ptos[p % 12], (p / 12) - 1);
- printf(result);
+ printf("%s",result);
return strlen(result);
}
diff --git a/pm_test/sysex.c b/pm_test/sysex.c
index 627a3df..da2bb90 100755
--- a/pm_test/sysex.c
+++ b/pm_test/sysex.c
@@ -39,7 +39,7 @@ int get_number(char *prompt)
{
char line[STRING_MAX];
int n = 0, i;
- printf(prompt);
+ printf("%s",prompt);
while (n != 1) {
n = scanf("%d", &i);
fgets(line, STRING_MAX, stdin);
diff --git a/pm_test/test.c b/pm_test/test.c
index 03d6331..dcac1bc 100755
--- a/pm_test/test.c
+++ b/pm_test/test.c
@@ -37,7 +37,7 @@ int get_number(char *prompt)
{
char line[STRING_MAX];
int n = 0, i;
- printf(prompt);
+ printf("%s",prompt);
while (n != 1) {
n = scanf("%d", &i);
fgets(line, STRING_MAX, stdin);
--
2.14.4

View File

@@ -0,0 +1,107 @@
diff -rupN portmidi.old/pm_common/CMakeLists.txt portmidi/pm_common/CMakeLists.txt
--- portmidi.old/pm_common/CMakeLists.txt 2010-09-20 15:57:48.000000000 -0400
+++ portmidi/pm_common/CMakeLists.txt 2011-06-23 22:35:41.000000000 -0400
@@ -120,8 +120,8 @@ set_target_properties(pmjni PROPERTIES E
# install the libraries (Linux and Mac OS X command line)
if(UNIX)
INSTALL(TARGETS portmidi-static pmjni
- LIBRARY DESTINATION /usr/local/lib
- ARCHIVE DESTINATION /usr/local/lib)
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
# .h files installed by pm_dylib/CMakeLists.txt, so don't need them here
# INSTALL(FILES portmidi.h ../porttime/porttime.h
# DESTINATION /usr/local/include)
diff -rupN portmidi.old/pm_dylib/CMakeLists.txt portmidi/pm_dylib/CMakeLists.txt
--- portmidi.old/pm_dylib/CMakeLists.txt 2009-11-20 00:41:09.000000000 -0500
+++ portmidi/pm_dylib/CMakeLists.txt 2011-06-23 22:35:41.000000000 -0400
@@ -59,7 +59,7 @@ if(UNIX)
set(JAVAVM_LIB "${FRAMEWORK_PATH}/JavaVM.framework")
set(JAVA_INCLUDE_PATHS ${JAVAVM_LIB}/Headers)
- set(INSTALL_NAME_DIR "/usr/local/lib")
+ set(INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
else(APPLE)
# LINUX settings...
@@ -75,11 +75,7 @@ if(UNIX)
# JAVA_INCLUDE_PATH2; if no, then we need to make both JAVA_INCLUDE_PATH
# and JAVA_INCLUDE_PATH2 set by user (will need clear documentation
# because JAVA_INCLUDE_PATH2 is pretty obscure)
- set(JAVA_INCLUDE_PATH ${JAVA_INCLUDE_PATH-UNKNOWN}
- CACHE STRING "where to find Java SDK include directory")
- set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH}/linux)
- # libjvm.so is found relative to JAVA_INCLUDE_PATH:
- set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../jre/lib/i386/client/libjvm.so)
+ set(JAVAVM_LIB ${JAVA_JVM_LIBRARY})
set(LINUXSRC pmlinuxalsa pmlinux finddefault)
prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})
@@ -114,14 +110,14 @@ prepend_path(SHARED_PATHS ../pm_common/
list(APPEND LIBSRC ${SHARED_PATHS})
add_library(portmidi-dynamic SHARED ${LIBSRC})
-set_target_properties(portmidi-dynamic PROPERTIES OUTPUT_NAME "portmidi")
+set_target_properties(portmidi-dynamic PROPERTIES LINK_FLAGS "-L${CMAKE_CACHEFILE_DIR}/Release" SOVERSION 0 VERSION 0.${VERSION} OUTPUT_NAME "portmidi")
target_link_libraries(portmidi-dynamic ${PM_NEEDED_LIBS})
# install the libraries (Linux and Mac OS X command line)
if(UNIX)
INSTALL(TARGETS portmidi-dynamic
- LIBRARY DESTINATION /usr/local/lib
- ARCHIVE DESTINATION /usr/local/lib)
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
INSTALL(FILES ../pm_common/portmidi.h ../porttime/porttime.h
- DESTINATION /usr/local/include)
+ DESTINATION ${INCLUDE_INSTALL_DIR})
endif(UNIX)
diff -rupN portmidi.old/pm_java/CMakeLists.txt portmidi/pm_java/CMakeLists.txt
--- portmidi.old/pm_java/CMakeLists.txt 2009-11-04 10:20:44.000000000 -0500
+++ portmidi/pm_java/CMakeLists.txt 2011-06-23 22:35:54.000000000 -0400
@@ -16,12 +16,12 @@ if(UNIX)
COMMAND javac -classpath . pmdefaults/PmDefaultsFrame.java
MAIN_DEPENDENCY pmdefaults/PmDefaultsFrame.java
DEPENDS pmdefaults/PmDefaults.java
- WORKING_DIRECTORY pm_java)
+ )
add_custom_command(OUTPUT pmdefaults/PmDefaults.class
COMMAND javac -classpath . pmdefaults/PmDefaults.java
MAIN_DEPENDENCY pmdefaults/PmDefaults.java
DEPENDS pmdefaults/PmDefaultsFrame.java
- WORKING_DIRECTORY pm_java)
+ )
add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar
COMMAND cp pmdefaults/portmusic_logo.png .
COMMAND jar cmf pmdefaults/manifest.txt pmdefaults.jar
@@ -32,7 +32,7 @@ if(UNIX)
COMMAND rm portmusic_logo.png
MAIN_DEPENDENCY pmdefaults/PmDefaults.class
DEPENDS ${PMDEFAULTS_ALL_CLASSES}
- WORKING_DIRECTORY pm_java)
+ )
add_custom_target(pmdefaults_target ALL
DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar)
# message(STATUS "add_custom_target: pmdefaults.jar")
@@ -41,7 +41,7 @@ if(UNIX)
INSTALL(FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar
DESTINATION /usr/share/java)
INSTALL(PROGRAMS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults
- DESTINATION /usr/local/bin)
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
endif(APPLE)
endif(UNIX)
# In windows, use pm_java/make.bat
diff -rupN portmidi.old/pm_test/CMakeLists.txt portmidi/pm_test/CMakeLists.txt
--- portmidi.old/pm_test/CMakeLists.txt 2010-09-20 15:57:48.000000000 -0400
+++ portmidi/pm_test/CMakeLists.txt 2011-06-23 22:35:41.000000000 -0400
@@ -12,7 +12,7 @@ endif(WIN32)
macro(make_a_test name)
add_executable(${name} ${name}.c)
- target_link_libraries(${name} portmidi-static ${PM_NEEDED_LIBS})
+ target_link_libraries(${name} portmidi-dynamic)
add_dependencies(${name} portmidi-static)
endmacro(make_a_test)

View File

@@ -0,0 +1,36 @@
SUMMARY = "Real-time Midi I/O Library"
HOMEPAGE = "http://portmedia.sourceforge.net"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://license.txt;md5=a0c1c261bc48165d48388e3a121a31e9"
inherit cmake dos2unix
DEPENDS += " \
alsa-lib \
"
SRC_URI = " \
${SOURCEFORGE_MIRROR}/project/portmedia/${BPN}/${PV}/${BPN}-src-${PV}.zip \
file://fedora-portmidi-cmake.patch \
file://0001-do-not-build-java-application-to-set-midi-defaults.patch \
file://0002-fix-compilation-du-to-unkown-functions.patch \
file://0003-fix-format-security..patch \
"
SRC_URI[md5sum] = "03f46fd3947e2ef4c8c465baaf832241"
SRC_URI[sha256sum] = "08e9a892bd80bdb1115213fb72dc29a7bf2ff108b378180586aa65f3cfd42e0f"
S = "${WORKDIR}/${BPN}"
EXTRA_OECMAKE += " \
-DLIB_INSTALL_DIR=${libdir} \
-DINCLUDE_INSTALL_DIR=${includedir} \
-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=Release \
-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=Release \
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=Release \
"
do_install_append() {
ln -s libportmidi.so.0. "${D}/${libdir}/libporttime.so"
ln -s libportmidi.so.0. "${D}/${libdir}/libporttime.so.0"
ln -s libportmidi.so.0. "${D}/${libdir}/libporttime.so.0."
}

View File

@@ -75,7 +75,7 @@ index 0cda4d6..5b9ead0 100644
+ install -m 644 man/file65.1 man/ldo65.1 man/printcbm.1 man/reloc65.1 man/uncpk.1 man/xa.1 $(DESTDIR)$(PREFIX)/share/man/man1
dist: clean
#cd .. ; tar cvf xa-2.3.8A.tar xa-2.3.8 ; gzip xa-2.3.8A.tar
cd .. ; tar cvf xa-2.3.11.tar xa-2.3.11 ; gzip xa-2.3.11.tar
diff --git a/misc/Makefile b/misc/Makefile
index 2b450e0..6967dad 100644
--- a/misc/Makefile

View File

@@ -2,12 +2,15 @@ SUMMARY = "Open-source 6502 cross assembler"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=1f67e705f4eb5064027b8c40ccfdb43e"
# They move old versions to a different folder
MIRRORS =+ "http://www.floodgap.com/retrotech/xa/dists/ http://www.floodgap.com/retrotech/xa/dists/unsupported/"
SRC_URI = " \
http://www.floodgap.com/retrotech/xa/dists/${BPN}-${PV}.tar.gz \
file://0001-Align-Makefiles-for-cross-compiling.patch \
"
SRC_URI[md5sum] = "884c3dc5bcc8e8f10b05a6907781623d"
SRC_URI[sha256sum] = "3b97d2fe8891336676ca28ff127b69e997f0b5accf2c7009b4517496929b462a"
SRC_URI[md5sum] = "72cbd5619f75b0c9839b90c41d0f9ea6"
SRC_URI[sha256sum] = "32f2164c99e305218e992970856dd8e2309b5cb6ac4758d7b2afe3bfebc9012d"
BBCLASSEXTEND = "native"

View File

@@ -0,0 +1,26 @@
SUMMARY = "Cage: a Wayland kiosk"
HOMEPAGE = "https://www.hjdskes.nl/projects/cage/"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=e3d06ce025701c9a0b391f15902ce8ed"
DEPENDS = " \
wayland-native \
wayland \
wayland-protocols \
wlroots \
pixman \
libxkbcommon \
"
inherit meson features_check
REQUIRED_DISTRO_FEATURES = "wayland"
SRC_URI = "git://github.com/Hjdskes/${BPN}.git"
SRCREV = "d09739373288adef901cdd58c983c0d02302932c"
PV = "0.1.2.1"
S = "${WORKDIR}/git"
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','x11','xwayland','',d)}"
PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,xserver-xorg,xserver-xorg-xwayland"

View File

@@ -0,0 +1,34 @@
SUMMARY = "Modules for building a Wayland compositor"
HOMEPAGE = "https://github.com/swaywm/wlroots"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=7578fad101710ea2d289ff5411f1b818"
DEPENDS = " \
wayland-native \
wayland \
wayland-protocols \
virtual/egl \
virtual/libgles2 \
libdrm \
virtual/libgbm \
libinput \
libxkbcommon \
udev \
pixman \
"
inherit meson features_check
REQUIRED_DISTRO_FEATURES = "wayland opengl"
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','x11','xwayland x11-backend','',d)}"
PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,xserver-xorg,xserver-xorg-xwayland"
PACKAGECONFIG[x11-backend] = "-Dx11-backend=enabled,-Dx11-backend=disabled,xserver-xorg"
SRC_URI = " \
git://github.com/swaywm/${BPN}.git \
file://0001-Adjust-meson.build-to-meson-0.54.patch \
"
SRCREV = "238d1c078fb03338e9f271d98f7bf6b1fc399285"
PV = "0.12.0"
S = "${WORKDIR}/git"

View File

@@ -0,0 +1,43 @@
From df8a70b2db61a395bb424d4f4942434544e3ef43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Tue, 8 Dec 2020 01:57:15 +0100
Subject: [PATCH] Adjust meson.build to meson < 0.54
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* meson.override_dependency is not required here. It requires meson >= 0.54
* we set min version to what dunfell ships
Upstream-Status: Inappropriate[Configuration]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
meson.build | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/meson.build b/meson.build
index 835e0195..b07760ab 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project(
'c',
version: '0.12.0',
license: 'MIT',
- meson_version: '>=0.54.0',
+ meson_version: '>=0.53.2',
default_options: [
'c_std=c11',
'warning_level=2',
@@ -172,8 +172,6 @@ wlroots = declare_dependency(
include_directories: wlr_inc,
)
-meson.override_dependency('wlroots', wlroots)
-
summary({
'systemd': conf_data.get('WLR_HAS_SYSTEMD', 0),
'elogind': conf_data.get('WLR_HAS_ELOGIND', 0),
--
2.26.2