99 Commits

Author SHA1 Message Date
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
Andreas Müller
f95f8607db Add thud to LAYERSERIES_COMPAT
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-10-03 23:23:58 +02:00
Andreas Müller
cfedf61b4d README: update layer dependencies - libsdl-net is in meta-oe now
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-09-09 22:45:49 +02:00
Andreas Müller
b5b2c33106 mame: remove doule lua from DEPENDS
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-09-09 22:45:16 +02:00
Andreas Müller
e43925c734 dosbox: upgrade 0.74 -> 0.74-2
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-09-09 22:42:06 +02:00
Andreas Müller
d9388d17dc mame: upgrade 0196 -> 0201
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-09-01 12:58:25 +02:00
Andreas Müller
b4910889b1 stella: upgrade 5.1.1 -> 5.1.3
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-08-26 15:50:35 +02:00
Andreas Müller
c2cac4231a vice: add bison-native to DEPENDS
| checking for byacc... no
| checking for yacc... no
| checking for bison... no
| configure: error: Could not find byacc, yacc or bison!

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-08-20 22:06:32 +02:00
Andreas Müller
78e98999cc mame: Fix build for 64-bit targets
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-08-14 19:35:19 +02:00
Andreas Müller
ee2615c618 mame: Rework NOSAM logic
Detected when building for aarch64. x86 may ovveride, but I have no cycles to
test.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-08-14 19:35:19 +02:00
Andreas Müller
4ed7403e85 opentyrian: fix build with gcc8
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-07-05 22:12:37 +02:00
Andreas Müller
fe67bafd78 email address adaption
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-06-09 01:19:45 +02:00
Andreas Müller
c9b4c505bd vice: fix build with latest FFMPEG
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-06-08 23:50:26 +02:00
Andreas Müller
366fa8b35c vice: upgrade 3.1 -> 3.2
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-06-07 23:50:23 +02:00
Andreas Müller
89daaabdbd xa: fix native install / cleanup slightly
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-06-07 23:41:32 +02:00
Andreas Müller
00ca5c6a7e xa: initial add 2.3.8
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-06-07 01:10:41 +02:00
Andreas Müller
3f0a91dfa9 gtkglext: Fix build caused by variable name conflict
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-06-06 20:03:31 +02:00
Andreas Müller
7af4a511fd mame: woraround race
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-06-01 19:22:07 +02:00
Andreas Müller
e6e2d9fbda layer.conf: add LAYERDEPEND / LAYERSERIES
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-04-06 20:59:54 +02:00
Andreas Müller
d6d52b5844 mame: update 0193 -> 0196
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-04-01 13:54:42 +02:00
Andreas Müller
eb9a74f4c2 stella: update 5.0.0-pre9 -> 5.1.1
They moved to github

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-03-28 17:53:58 +02:00
Andreas Müller
0e135ed3e8 vice: refresh 0001-fix-autoreconfig.patch
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-03-27 17:08:32 +02:00
Andreas Müller
07916c7dc7 mame: update 0188 -> 0193
License checksum was caused by trademark owner change:

-MAME is a registered trademark of Nicola Salmoria.
+MAME is a registered trademark of Gregory Ember.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2017-12-29 11:26:35 +01:00
Andreas Müller
59483b8e84 vice: update 2.4.33 -> 3.1
Seems that International Karate is playable on Raspi3 without audio underrruns now!

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2017-12-26 18:44:17 +01:00
Andreas Müller
0aa58a6cd7 mame: update 0187 -> 0188
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2017-08-06 21:52:27 +02:00
Andreas Müller
1aea34d009 mame: update 0184 -> 0187
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2017-07-04 16:46:22 +02:00
Andreas Müller
d9445af61a opentyrian: fix build with gcc7
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2017-06-30 11:22:01 +02:00
Andreas Müller
e328d684cc stella: update to 5.0.0-pre9 to fix build with gcc7
while we are here cleanup recipe and patch

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2017-06-30 09:38:17 +02:00
Andreas Müller
e989773041 d2x-rebirth: remove it came in accidently and does not build
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2017-04-15 20:46:23 +02:00
Andreas Müller
c8d2ec7d46 README: add meta-games to our dependency list for libsdl-net
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2017-04-14 11:55:00 +02:00
Andreas Müller
e13dcacee7 opentyrian: add pkgconfig to inherit
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2017-04-14 11:54:21 +02:00
Andreas Müller
885a451756 d1x-rebirth: fix do_unpack by setting dependency on p7zip-native properly
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2017-04-13 22:30:12 +02:00
Andreas Müller
b89ba1c28b stella: reorganize inherit ans DEPENDS to fix build on latest oe-core
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2017-04-13 10:59:15 +02:00
Andreas Müller
94cd8b43c8 vice: add native dependencies to fix build with latest oe-core
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2017-04-13 10:59:15 +02:00
Andreas Müller
81274208c1 mame: mame update 0180 -> 0184
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2017-04-03 07:22:41 +02:00
Andreas Müller
b9d7c40c80 gtkglext: add glib-2.0-native to DEPENDS to fix rss-build
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2017-03-04 19:47:24 +01:00
Andreas Müller
0d931f88da dosbox: add libglu to DEPENDS
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2017-02-12 13:33:35 +01:00
Andreas Müller
715a9fb2f1 d1x-rebirth: add p7zip-native to DEPENDS
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2017-02-03 15:39:07 +01:00
Andreas Müller
8216dc4853 vice/PACKAGECONFIG[pulseaudio]: add pulseaudio-server to RDEPENDS
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2017-02-03 14:24:54 +01:00
Andreas Müller
d7e5b3d7bc stella: stella update 4.6.1 -> 4.7.3 and follow sources to github
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2017-02-03 14:22:13 +01:00
Andreas Müller
e250dc0aca vice: enhance and cleanup
* cleanup DEPENDS
* fix install location of c64 icon
* configure with --enable-fullscreen / --with-uithreads / --without-oss by default
* depend on gtkglext for x1 and opengl in DISTRO_FEATURES
* add PACKAGECONFIG for pulseaudio - disabled by default

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2016-12-21 08:46:07 +01:00
Andreas Müller
1431e56b96 gtkglext: initial add 1.2.0
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2016-12-21 08:46:07 +01:00
Andreas Müller
f99e60bd37 pangox-compat: initial add 0.0.2
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2016-12-20 23:49:25 +01:00
Andreas Müller
0210b95d23 stella: add CLEANBROKEN = "1"
| NOTE: make clean
| ERROR: oe_runmake failed
| Makefile:42: config.mak: No such file or directory
| You need to run ./configure before you can run make

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2016-12-20 02:44:16 +01:00
Andreas Müller
206f7d04b9 vice: update to 2.4.33
* pimp desktop file
* icons were taken from local fedora installation

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2016-12-19 16:03:50 +01:00
Andreas Müller
072e5db6d8 mame: update to 0180
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2016-12-09 00:17:31 +01:00
Andreas Müller
7c6cef29d6 dosbox: fix typo in SUMMARY
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2016-11-06 22:02:32 +01:00
Andreas Müller
2c2fe94f77 vice: select gtk ui seems best choice currently
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2016-10-22 01:53:10 +02:00
Andreas Müller
e430980a44 vice: update to 2.4.28
This was much harder than expected. It does not crash anymore but is not really
usable

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2016-10-22 00:59:41 +02:00
Andreas Müller
ccc41e2148 vice: add libxxf86vm to DEPENDS
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2016-10-20 21:48:46 +02:00
Andreas Müller
6fb3886511 dosbox: add PACKAGECONFIG opengl to ,ake build deterministic
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2016-10-20 21:28:03 +02:00
Andreas Müller
f40f7d5f63 mame: add lua to DEPENDS
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2016-10-20 21:27:00 +02:00
Andreas Müller
f91f9c08bf mame: update to 0178
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2016-10-19 01:16:16 +02:00
Andreas Müller
fe0ea15c2f vice: build with both versions of giflib 4.x and 5.1.x
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2016-08-05 17:41:37 +02:00
Andreas Müller
512ac81342 opentyrian: fix build wit gcc6
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2016-07-31 04:09:23 +02:00
Andreas Müller
6ffaef6848 mame update to 0176 and fix build with gcc6
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2016-07-31 02:51:17 +02:00
42 changed files with 1670 additions and 721 deletions

9
README
View File

@@ -1,9 +0,0 @@
OE layer for all in midlife crisis
This layer depends on:
URI: git://git.openembedded.org/openembedded-core
branch: master
revision: HEAD
Layer maintainer: Andreas Müller <schnitzeltony@googlemail.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 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 maintainers. For questions/suggestions.. use GitHub issues.
* Pull requests should follow [OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) with the following additions:
* Use 4 spaces for indention always
* 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

@@ -7,3 +7,6 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb"
BBFILE_COLLECTIONS += "meta-retro"
BBFILE_PATTERN_meta-retro := "^${LAYERDIR}/"
BBFILE_PRIORITY_meta-retro = "10"
LAYERDEPENDS_meta-retro = "core openembedded-layer filesystems-layer"
LAYERSERIES_COMPAT_meta-retro = "thud warrior"

View File

@@ -1,4 +1,4 @@
SUMMARY = "OSBox is a DOS-emulator that uses the SDL-library"
SUMMARY = "DOSBox is a DOS-emulator that uses the SDL-library"
HOMEPAGE = "http://www.dosbox.com/"
LICENSE = "GPLv2+"
@@ -13,10 +13,15 @@ SRC_URI = " \
file://dosbox.desktop \
file://dosbox.png \
file://0001-use-pkgconfig-to-find-sdl.patch \
file://0002-include-dos_inc.h-add-missing-include.patch \
"
SRC_URI[md5sum] = "b9b240fa87104421962d14eee71351e8"
SRC_URI[sha256sum] = "13f74916e2d4002bad1978e55727f302ff6df3d9be2f9b0e271501bd0a938e05"
SRC_URI[md5sum] = "7110ee24a45a2b4951ad52eb1a3722be"
SRC_URI[sha256sum] = "7077303595bedd7cd0bb94227fa9a6b5609e7c90a3e6523af11bc4afcb0a57cf"
PACKAGECONFIG ??= " \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)} \
"
PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgl libglu"
do_install_append() {
install -d ${D}/${datadir}/applications

View File

@@ -1,6 +1,6 @@
From 032998923ef3a8e3267d64063723482679a7f736 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Fri, 26 Feb 2016 22:49:19 +0100
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sun, 9 Sep 2018 22:31:41 +0200
Subject: [PATCH] use pkgconfig to find sdl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -8,19 +8,20 @@ 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>
---
configure.in | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
configure.ac | 21 +--------------------
1 file changed, 1 insertion(+), 20 deletions(-)
diff --git a/configure.in b/configure.in
index 016ea95..79341e5 100644
--- a/configure.in
+++ b/configure.in
@@ -28,28 +28,10 @@ if test x$host = xi386-pc-os2-emx ; then
diff --git a/configure.ac b/configure.ac
index a723222..3b28be1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,29 +26,10 @@ if test x$host = xi386-pc-os2-emx ; then
LDFLAGS="$LDFLAGS -Zomf -Zmt"
fi
dnl Check for SDL
-dnl Check for SDL
-SDL_VERSION=1.2.0
-AM_PATH_SDL($SDL_VERSION,
- :,
@@ -32,7 +33,7 @@ index 016ea95..79341e5 100644
-dnl Check if SDL is 1.2.x (1.3 not supported)
-AC_MSG_CHECKING([SDL version only being 1.2.X])
-AC_COMPILE_IFELSE([
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include "SDL.h"
-void blah(){
-#if SDL_MINOR_VERSION != 2
@@ -40,7 +41,7 @@ index 016ea95..79341e5 100644
-#endif
-;
-}
-],AC_MSG_RESULT([yes]),[
-])],AC_MSG_RESULT([yes]),[
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([Only libSDL 1.2.X supported])])
-
@@ -48,5 +49,5 @@ index 016ea95..79341e5 100644
dnl Checks for typedefs, structures, and compiler characteristics.
--
2.5.0
2.14.4

View File

@@ -1,35 +0,0 @@
From 9502307543db1329af0d7d6aadb0ee67d4089f52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Fri, 26 Feb 2016 22:57:57 +0100
Subject: [PATCH] include/dos_inc.h: add missing include
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
More or less taken from [1]
[1] http://pkgs.fedoraproject.org/cgit/rpms/dosbox.git/tree/dosbox-0.74-gcc46.patch
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
include/dos_inc.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/dos_inc.h b/include/dos_inc.h
index 290d76b..b16a164 100644
--- a/include/dos_inc.h
+++ b/include/dos_inc.h
@@ -28,6 +28,8 @@
#include "mem.h"
#endif
+#include <stddef.h>
+
#ifdef _MSC_VER
#pragma pack (1)
#endif
--
2.5.0

View File

@@ -1,68 +0,0 @@
From 168f7f181099e6fbbb4ba7100e45f224afec6107 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sat, 26 Dec 2015 21:29:16 +0100
Subject: [PATCH] use pkg-config for finding sdl library settings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
scripts/src/osd/sdl.lua | 6 +++---
scripts/src/osd/sdl_cfg.lua | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index d1a8322..32ca84a 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -78,7 +78,7 @@ function maintargetosdoptions(_target,_subtarget)
}
configuration { }
else
- local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'")
+ local str = backtick("pkg-config --libs sdl2 | sed 's/-lSDLmain//'")
addlibfromstring(str)
addoptionsfromstring(str)
end
@@ -280,7 +280,7 @@ if BASE_TARGETOS=="unix" then
"SDL2.framework",
}
else
- local str = backtick(sdlconfigcmd() .. " --libs --static | sed 's/-lSDLmain//'")
+ local str = backtick("pkg-config --libs --static sdl2 | sed 's/-lSDLmain//'")
addlibfromstring(str)
addoptionsfromstring(str)
end
@@ -300,7 +300,7 @@ if BASE_TARGETOS=="unix" then
"SDL2",
}
else
- local str = backtick(sdlconfigcmd() .. " --libs")
+ local str = backtick("pkg-config --libs sdl2")
addlibfromstring(str)
addoptionsfromstring(str)
end
diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua
index 0fd15e5..839a468 100644
--- a/scripts/src/osd/sdl_cfg.lua
+++ b/scripts/src/osd/sdl_cfg.lua
@@ -84,13 +84,13 @@ if BASE_TARGETOS=="unix" then
"MACOSX_USE_LIBSDL",
}
buildoptions {
- backtick(sdlconfigcmd() .. " --cflags | sed 's:/SDL::'"),
+ backtick("pkg-config --cflags sdl2 | sed 's:/SDL::'"),
}
end
end
else
buildoptions {
- backtick(sdlconfigcmd() .. " --cflags"),
+ backtick("pkg-config --cflags sdl2"),
}
if _OPTIONS["targetos"]~="asmjs" then
buildoptions {
--
2.5.5

View File

@@ -1,327 +0,0 @@
From 917f9e35b110c84b7748e47d7cf27097c04f8e49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Fri, 1 Jan 2016 20:48:10 +0100
Subject: [PATCH] float4_neon.h: refactor buildins for later gcc's
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
taken from [1-2]
[1] https://patchwork.ozlabs.org/patch/410050/
[2] https://gcc.gnu.org/ml/gcc-patches/2014-04/txtfStfgLNxV5.txt
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
3rdparty/bx/include/bx/float4_neon.h | 74 ++++++++++++++++++++++++------------------------
1 file changed, 37 insertions(+), 37 deletions(-)
diff --git a/3rdparty/bx/include/bx/float4_neon.h b/3rdparty/bx/include/bx/float4_neon.h
index 3b6fa18..df42814 100644
--- a/3rdparty/bx/include/bx/float4_neon.h
+++ b/3rdparty/bx/include/bx/float4_neon.h
@@ -96,22 +96,22 @@ IMPLEMENT_TEST(xyzw , xyzw);
BX_FLOAT4_FORCE_INLINE float float4_x(float4_t _a)
{
- return __builtin_neon_vget_lanev4sf(_a, 0, 3);
+ return __builtin_neon_vget_lanev4sf(_a, 0);
}
BX_FLOAT4_FORCE_INLINE float float4_y(float4_t _a)
{
- return __builtin_neon_vget_lanev4sf(_a, 1, 3);
+ return __builtin_neon_vget_lanev4sf(_a, 1);
}
BX_FLOAT4_FORCE_INLINE float float4_z(float4_t _a)
{
- return __builtin_neon_vget_lanev4sf(_a, 2, 3);
+ return __builtin_neon_vget_lanev4sf(_a, 2);
}
BX_FLOAT4_FORCE_INLINE float float4_w(float4_t _a)
{
- return __builtin_neon_vget_lanev4sf(_a, 3, 3);
+ return __builtin_neon_vget_lanev4sf(_a, 3);
}
BX_FLOAT4_FORCE_INLINE float4_t float4_ld(const void* _ptr)
@@ -179,14 +179,14 @@ IMPLEMENT_TEST(xyzw , xyzw);
BX_FLOAT4_FORCE_INLINE float4_t float4_itof(float4_t _a)
{
const _i32x4_t itof = __builtin_neon_vreinterpretv4siv4sf(_a);
- const float4_t result = __builtin_neon_vcvtv4si(itof, 1);
+ const float4_t result = __builtin_neon_vcvtsv4si(itof);
return result;
}
BX_FLOAT4_FORCE_INLINE float4_t float4_ftoi(float4_t _a)
{
- const _i32x4_t ftoi = __builtin_neon_vcvtv4sf(_a, 1);
+ const _i32x4_t ftoi = __builtin_neon_vcvtsv4sf(_a);
const float4_t result = __builtin_neon_vreinterpretv4sfv4si(ftoi);
return result;
@@ -194,32 +194,32 @@ IMPLEMENT_TEST(xyzw , xyzw);
BX_FLOAT4_FORCE_INLINE float4_t float4_add(float4_t _a, float4_t _b)
{
- return __builtin_neon_vaddv4sf(_a, _b, 3);
+ return __builtin_neon_vaddv4sf(_a, _b);
}
BX_FLOAT4_FORCE_INLINE float4_t float4_sub(float4_t _a, float4_t _b)
{
- return __builtin_neon_vsubv4sf(_a, _b, 3);
+ return __builtin_neon_vsubv4sf(_a, _b);
}
BX_FLOAT4_FORCE_INLINE float4_t float4_mul(float4_t _a, float4_t _b)
{
- return __builtin_neon_vmulv4sf(_a, _b, 3);
+ return __builtin_neon_vmulfv4sf(_a, _b);
}
BX_FLOAT4_FORCE_INLINE float4_t float4_rcp_est(float4_t _a)
{
- return __builtin_neon_vrecpev4sf(_a, 3);
+ return __builtin_neon_vrecpev4sf(_a);
}
BX_FLOAT4_FORCE_INLINE float4_t float4_rsqrt_est(float4_t _a)
{
- return __builtin_neon_vrsqrtev4sf(_a, 3);
+ return __builtin_neon_vrsqrtev4sf(_a);
}
BX_FLOAT4_FORCE_INLINE float4_t float4_cmpeq(float4_t _a, float4_t _b)
{
- const _i32x4_t tmp = __builtin_neon_vceqv4sf(_a, _b, 3);
+ const _i32x4_t tmp = __builtin_neon_vceqv4sf(_a, _b);
const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp);
return result;
@@ -227,7 +227,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
BX_FLOAT4_FORCE_INLINE float4_t float4_cmplt(float4_t _a, float4_t _b)
{
- const _i32x4_t tmp = __builtin_neon_vcgtv4sf(_b, _a, 3);
+ const _i32x4_t tmp = __builtin_neon_vcgtv4sf(_b, _a);
const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp);
return result;
@@ -235,7 +235,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
BX_FLOAT4_FORCE_INLINE float4_t float4_cmple(float4_t _a, float4_t _b)
{
- const _i32x4_t tmp = __builtin_neon_vcgev4sf(_b, _a, 3);
+ const _i32x4_t tmp = __builtin_neon_vcgev4sf(_b, _a);
const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp);
return result;
@@ -243,7 +243,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
BX_FLOAT4_FORCE_INLINE float4_t float4_cmpgt(float4_t _a, float4_t _b)
{
- const _i32x4_t tmp = __builtin_neon_vcgtv4sf(_a, _b, 3);
+ const _i32x4_t tmp = __builtin_neon_vcgtv4sf(_a, _b);
const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp);
return result;
@@ -251,7 +251,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
BX_FLOAT4_FORCE_INLINE float4_t float4_cmpge(float4_t _a, float4_t _b)
{
- const _i32x4_t tmp = __builtin_neon_vcgev4sf(_a, _b, 3);
+ const _i32x4_t tmp = __builtin_neon_vcgev4sf(_a, _b);
const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp);
return result;
@@ -259,19 +259,19 @@ IMPLEMENT_TEST(xyzw , xyzw);
BX_FLOAT4_FORCE_INLINE float4_t float4_min(float4_t _a, float4_t _b)
{
- return __builtin_neon_vminv4sf(_a, _b, 3);
+ return __builtin_neon_vminfv4sf(_a, _b);
}
BX_FLOAT4_FORCE_INLINE float4_t float4_max(float4_t _a, float4_t _b)
{
- return __builtin_neon_vmaxv4sf(_a, _b, 3);
+ return __builtin_neon_vmaxfv4sf(_a, _b);
}
BX_FLOAT4_FORCE_INLINE float4_t float4_and(float4_t _a, float4_t _b)
{
const _i32x4_t tmp0 = __builtin_neon_vreinterpretv4siv4sf(_a);
const _i32x4_t tmp1 = __builtin_neon_vreinterpretv4siv4sf(_b);
- const _i32x4_t tmp2 = __builtin_neon_vandv4si(tmp0, tmp1, 0);
+ const _i32x4_t tmp2 = tmp0 & tmp1;
const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp2);
return result;
@@ -281,7 +281,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
{
const _i32x4_t tmp0 = __builtin_neon_vreinterpretv4siv4sf(_a);
const _i32x4_t tmp1 = __builtin_neon_vreinterpretv4siv4sf(_b);
- const _i32x4_t tmp2 = __builtin_neon_vbicv4si(tmp0, tmp1, 0);
+ const _i32x4_t tmp2 = tmp0 & ~tmp1;
const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp2);
return result;
@@ -291,7 +291,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
{
const _i32x4_t tmp0 = __builtin_neon_vreinterpretv4siv4sf(_a);
const _i32x4_t tmp1 = __builtin_neon_vreinterpretv4siv4sf(_b);
- const _i32x4_t tmp2 = __builtin_neon_vorrv4si(tmp0, tmp1, 0);
+ const _i32x4_t tmp2 = tmp0 | tmp1;
const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp2);
return result;
@@ -301,7 +301,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
{
const _i32x4_t tmp0 = __builtin_neon_vreinterpretv4siv4sf(_a);
const _i32x4_t tmp1 = __builtin_neon_vreinterpretv4siv4sf(_b);
- const _i32x4_t tmp2 = __builtin_neon_veorv4si(tmp0, tmp1, 0);
+ const _i32x4_t tmp2 = tmp0 ^ tmp1;
const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp2);
return result;
@@ -312,7 +312,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
if (__builtin_constant_p(_count) )
{
const _i32x4_t tmp0 = __builtin_neon_vreinterpretv4siv4sf(_a);
- const _i32x4_t tmp1 = __builtin_neon_vshl_nv4si(tmp0, _count, 0);
+ const _i32x4_t tmp1 = __builtin_neon_vshl_nv4si(tmp0, _count);
const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp1);
return result;
@@ -320,7 +320,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
const _i32x4_t tmp0 = __builtin_neon_vreinterpretv4siv4sf(_a);
const _i32x4_t shift = __builtin_neon_vdup_nv4si( (__builtin_neon_si)_count);
- const _i32x4_t tmp1 = __builtin_neon_vshlv4si(tmp0, shift, 1);
+ const _i32x4_t tmp1 = __builtin_neon_vshlsv4si(tmp0, shift);
const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp1);
return result;
@@ -331,7 +331,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
if (__builtin_constant_p(_count) )
{
const _i32x4_t tmp0 = __builtin_neon_vreinterpretv4siv4sf(_a);
- const _i32x4_t tmp1 = __builtin_neon_vshr_nv4si(tmp0, _count, 0);
+ const _i32x4_t tmp1 = __builtin_neon_vshru_nv4si(tmp0, _count);
const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp1);
return result;
@@ -339,7 +339,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
const _i32x4_t tmp0 = __builtin_neon_vreinterpretv4siv4sf(_a);
const _i32x4_t shift = __builtin_neon_vdup_nv4si( (__builtin_neon_si)-_count);
- const _i32x4_t tmp1 = __builtin_neon_vshlv4si(tmp0, shift, 1);
+ const _i32x4_t tmp1 = __builtin_neon_vshlsv4si(tmp0, shift);
const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp1);
return result;
@@ -350,7 +350,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
if (__builtin_constant_p(_count) )
{
const _i32x4_t tmp0 = __builtin_neon_vreinterpretv4siv4sf(_a);
- const _i32x4_t tmp1 = __builtin_neon_vshr_nv4si(tmp0, _count, 1);
+ const _i32x4_t tmp1 = __builtin_neon_vshrs_nv4si(tmp0, _count);
const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp1);
return result;
@@ -358,7 +358,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
const _i32x4_t tmp0 = __builtin_neon_vreinterpretv4siv4sf(_a);
const _i32x4_t shift = __builtin_neon_vdup_nv4si( (__builtin_neon_si)-_count);
- const _i32x4_t tmp1 = __builtin_neon_vshlv4si(tmp0, shift, 1);
+ const _i32x4_t tmp1 = __builtin_neon_vshlsv4si(tmp0, shift);
const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp1);
return result;
@@ -366,19 +366,19 @@ IMPLEMENT_TEST(xyzw , xyzw);
BX_FLOAT4_FORCE_INLINE float4_t float4_madd(float4_t _a, float4_t _b, float4_t _c)
{
- return __builtin_neon_vmlav4sf(_c, _a, _b, 3);
+ return __builtin_neon_vmlav4sf(_c, _a, _b);
}
BX_FLOAT4_FORCE_INLINE float4_t float4_nmsub(float4_t _a, float4_t _b, float4_t _c)
{
- return __builtin_neon_vmlsv4sf(_c, _a, _b, 3);
+ return __builtin_neon_vmlsv4sf(_c, _a, _b);
}
BX_FLOAT4_FORCE_INLINE float4_t float4_icmpeq(float4_t _a, float4_t _b)
{
const _i32x4_t tmp0 = __builtin_neon_vreinterpretv4siv4sf(_a);
const _i32x4_t tmp1 = __builtin_neon_vreinterpretv4siv4sf(_b);
- const _i32x4_t tmp2 = __builtin_neon_vceqv4si(tmp0, tmp1, 1);
+ const _i32x4_t tmp2 = __builtin_neon_vceqv4si(tmp0, tmp1);
const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp2);
return result;
@@ -388,7 +388,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
{
const _i32x4_t tmp0 = __builtin_neon_vreinterpretv4siv4sf(_a);
const _i32x4_t tmp1 = __builtin_neon_vreinterpretv4siv4sf(_b);
- const _i32x4_t tmp2 = __builtin_neon_vcgtv4si(tmp1, tmp0, 1);
+ const _i32x4_t tmp2 = __builtin_neon_vcgtv4si(tmp1, tmp0);
const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp2);
return result;
@@ -398,7 +398,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
{
const _i32x4_t tmp0 = __builtin_neon_vreinterpretv4siv4sf(_a);
const _i32x4_t tmp1 = __builtin_neon_vreinterpretv4siv4sf(_b);
- const _i32x4_t tmp2 = __builtin_neon_vcgtv4si(tmp0, tmp1, 1);
+ const _i32x4_t tmp2 = __builtin_neon_vcgtv4si(tmp0, tmp1);
const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp2);
return result;
@@ -408,7 +408,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
{
const _i32x4_t tmp0 = __builtin_neon_vreinterpretv4siv4sf(_a);
const _i32x4_t tmp1 = __builtin_neon_vreinterpretv4siv4sf(_b);
- const _i32x4_t tmp2 = __builtin_neon_vminv4si(tmp0, tmp1, 1);
+ const _i32x4_t tmp2 = __builtin_neon_vminsv4si(tmp0, tmp1);
const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp2);
return result;
@@ -418,7 +418,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
{
const _i32x4_t tmp0 = __builtin_neon_vreinterpretv4siv4sf(_a);
const _i32x4_t tmp1 = __builtin_neon_vreinterpretv4siv4sf(_b);
- const _i32x4_t tmp2 = __builtin_neon_vmaxv4si(tmp0, tmp1, 1);
+ const _i32x4_t tmp2 = __builtin_neon_vmaxsv4si(tmp0, tmp1);
const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp2);
return result;
@@ -428,7 +428,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
{
const _i32x4_t tmp0 = __builtin_neon_vreinterpretv4siv4sf(_a);
const _i32x4_t tmp1 = __builtin_neon_vreinterpretv4siv4sf(_b);
- const _i32x4_t tmp2 = __builtin_neon_vaddv4si(tmp0, tmp1, 1);
+ const _i32x4_t tmp2 = tmp0 + tmp1;
const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp2);
return result;
@@ -438,7 +438,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
{
const _i32x4_t tmp0 = __builtin_neon_vreinterpretv4siv4sf(_a);
const _i32x4_t tmp1 = __builtin_neon_vreinterpretv4siv4sf(_b);
- const _i32x4_t tmp2 = __builtin_neon_vsubv4si(tmp0, tmp1, 1);
+ const _i32x4_t tmp2 = tmp0 - tmp1;
const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp2);
return result;
--
2.5.0

View File

@@ -0,0 +1,222 @@
SUMMARY = "Multiple Arcade Machine Emulator"
HOMEPAGE = "http://www.mamedev.org/index.php"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=798620970c471a3a6b7b5e9c9192fe12"
SRC_URI = " \
git://github.com/mamedev/mame.git \
file://no-upstream/0001-pokey-Make-step_one_clock-inline.patch \
file://mame.desktop \
"
PV = "0212"
SRCREV = "1182bd9325bd3381cc94cce6d7d9a1b510ed6ae4"
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 \
${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-qt5-extra', 'portmidi', '', d)} \
"
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 \
${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-qt5-extra', 'USE_SYSTEM_LIB_PORTMIDI=1', '', d)} \
SDL_INI_PATH=${sysconfdir}/${BPN} \
"
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 src2html 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
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,48 @@
From 0ba9c56e7a27bd926270678e7add074fb00204f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sun, 3 Mar 2019 15:00:41 +0100
Subject: [PATCH] pokey: Make step_one_clock inline
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This gives another small performance win on machines using multiple pokeys. Since
it ruins our valgind output and upstream will not be keen on:
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/devices/sound/pokey.cpp | 2 +-
src/devices/sound/pokey.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/devices/sound/pokey.cpp b/src/devices/sound/pokey.cpp
index 231dc01e8b..d20c20cc8a 100644
--- a/src/devices/sound/pokey.cpp
+++ b/src/devices/sound/pokey.cpp
@@ -562,7 +562,7 @@ void pokey_device::step_pot()
*
*/
-void pokey_device::step_one_clock(void)
+inline void pokey_device::step_one_clock(void)
{
/* Clocks only count if we are not in a reset */
if (m_SKCTL & SK_RESET)
diff --git a/src/devices/sound/pokey.h b/src/devices/sound/pokey.h
index 7e63e89e54..48858bc743 100644
--- a/src/devices/sound/pokey.h
+++ b/src/devices/sound/pokey.h
@@ -264,7 +264,7 @@ private:
static constexpr int POKEY_CHANNELS = 4;
- void step_one_clock();
+ inline void step_one_clock();
void step_keyboard();
void step_pot();
--
2.20.1

View File

@@ -1,79 +0,0 @@
SUMMARY = "Multiple Arcade Machine Emulator"
HOMEPAGE = "http://www.mamedev.org/index.php"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=89436197a991695e278e47475b4ff7ae"
SRC_URI = " \
https://github.com/mamedev/mame/archive/${BPN}${PV}.tar.gz \
file://0001-use-pkg-config-for-finding-sdl-library-settings.patch \
file://0002-float4_neon.h-refactor-buildins-for-later-gcc-s.patch \
"
SRC_URI[md5sum] = "299b77d7be7e303c8bfc71237fcf84b2"
SRC_URI[sha256sum] = "249dc43d27f435b47e6bd30754eaa2b52253da37aa04498cb9cc6df5c2041cfa"
S = "${WORKDIR}/${BPN}-${BPN}${PV}"
DEPENDS = " \
libsdl2 \
libsdl2-ttf \
fontconfig \
libxinerama \
\
expat \
zlib \
flac \
jpeg \
lua lua-native \
sqlite3 \
portaudio-v19 \
"
CLEANBROKEN = "1"
EXTRA_OEMAKE = " \
linux \
CROSS_BUILD=1 \
OVERRIDE_CC='${CC}' \
OVERRIDE_CXX='${CXX}' \
TOOLS=1 \
USE_QTDEBUG=0 \
NOWERROR=1 \
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 \
"
EXTRA_OEMAKE_append_arm = " \
NOASM=1 \
"
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,8 +1,25 @@
From 389ed0e18c10a8b3368d0b9fbd2e1f5a7e37f072 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 30 Jun 2017 09:30:32 +0200
Subject: [PATCH] custtomize configure and Makefile to our needs
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>
---
Makefile | 2 +-
configure | 39 +++++++++++++++++++++++----------------
2 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/Makefile b/Makefile
index 67b1a10a7a81..620072cc1b9c 100644
index 35a1e36..a8984d0 100644
--- a/Makefile
+++ b/Makefile
@@ -172,7 +172,7 @@ config.mak: $(srcdir)/configure
@@ -177,7 +177,7 @@ config.mak: $(srcdir)/configure
install: all
$(INSTALL) -d "$(DESTDIR)$(BINDIR)"
@@ -12,71 +29,30 @@ index 67b1a10a7a81..620072cc1b9c 100644
$(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 419eb8a5fe10..8f453b9f5d62 100755
index a1ecfb1..05e5c1c 100755
--- a/configure
+++ b/configure
@@ -334,6 +334,7 @@ mingw32-cross)
@@ -307,6 +307,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/'`
+ _host_prefix=$_host
+ _host_prefix=$_host
;;
esac
@@ -375,20 +376,27 @@ 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++"
-else
- compilers="$CXX g++ c++"
-fi
-for compiler in $compilers; do
- if test_compiler $compiler; then
- CXX=$compiler
- echo $CXX
- break
- fi
-done
-if test -z $CXX; then
+if test_compiler "$CXX"; then
+ echo "$CXX"
+else
+ 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
+
+if test -z "$CXX"; then
echo "none found!"
exit 1
fi
@@ -529,8 +537,9 @@ if test -n "$_host"; then
@@ -511,8 +517,9 @@ if test -n "$_host"; then
_host_os=win32
;;
*)
- echo "Cross-compiling to unknown target, please add your target to configure."
- exit 1
+ echo "Cross-compiling for Yocto Project based systems."
+ DEFINES="$DEFINES -DUNIX"
+ _host_os=unix
+ echo "Cross-compiling for Yocto Project based systems."
+ DEFINES="$DEFINES -DUNIX"
+ _host_os=unix
;;
esac
@@ -734,7 +743,7 @@ fi
@@ -676,7 +683,7 @@ fi
# Now, add the appropriate defines/libraries/headers
#
echo
@@ -85,21 +61,24 @@ index 419eb8a5fe10..8f453b9f5d62 100755
SRC="src"
CORE="$SRC/emucore"
@@ -750,7 +759,7 @@ ZLIB="$SRC/zlib"
@@ -698,7 +698,7 @@ ZLIB="$SRC/zlib"
INCLUDES="-I$CORE -I$COMMON -I$TV -I$GUI"
INCLUDES="-I$CORE -I$COMMON -I$TV -I$GUI -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"
@@ -758,7 +767,7 @@ else
@@ -706,7 +706,7 @@ else
_sdl_conf_libs="--libs"
fi
-LIBS="$LIBS `$_sdlconfig $_sdl_conf_libs`"
+LIBS="$LIBS `pkg-config --libs sdl2`"
LD=$CXX
+LIBS="$LIBS `pkg-config $_sdl_conf_libs sdl2`"
LD=$CXX
case $_host_os in
unix)
--
2.14.3

View File

@@ -1,18 +0,0 @@
SUMMARY = "Multi-platform Atari 2600 VCS emulator"
HOMEPAGE = "http://stella.sourceforge.net/"
SECTION = "emulators"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://License.txt;md5=878e3965c7b52d85827c75f5a2f3b314"
SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}-src.tar.gz \
file://cross_compile_support.patch"
SRC_URI[md5sum] = "91d7a7333097345e81f90a39fcdcc324"
SRC_URI[sha256sum] = "c1921671dbc08422ae8a7a4102c6a2a34433f04594d67f55a7129c1504bcd288"
DEPENDS = "libsdl2 zlib libpng"
FILES_${PN} += "${datadir}/icons"
inherit autotools-brokensep

View File

@@ -0,0 +1,19 @@
SUMMARY = "Multi-platform Atari 2600 VCS emulator"
HOMEPAGE = "https://stella-emu.github.io/"
SECTION = "emulators"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://License.txt;md5=878e3965c7b52d85827c75f5a2f3b314"
inherit autotools-brokensep gtk-icon-cache
DEPENDS += "libsdl2 zlib libpng"
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] = "9df5fd3af9720115359ebf0171ed36e6"
SRC_URI[sha256sum] = "d611f98bb35ed9eacfb63826b12b4e8b67b874a2a87019d4bdaf1e7f4724c40d"
CLEANBROKEN = "1"

View File

@@ -0,0 +1,34 @@
From 701abed61ce01e2d91394bc266b98281f006efe7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Fri, 21 Oct 2016 18:15:31 +0200
Subject: [PATCH] fix autoreconfig
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
fixes:
| gnu-configize: 'configure.ac' or 'configure.in' is required
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
configure.ac | 1 -
1 file changed, 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index b5403d2..3b7f0bb 100755
--- a/configure.ac
+++ b/configure.ac
@@ -2360,7 +2360,6 @@ if test x"$FFMPEG_DO_SUBDIRS" = "xyes"; then
else
ac_configure_args="$ac_configure_args --enable-yasm-command=${YASM} --enable-make-command=${MAKE-make} --enable-full-host=${ac_cv_host} --enable-compiler=${CC} --prefix=${prefix}"
fi
- AC_CONFIG_SUBDIRS(src/lib/ffmpeg)
fi
if test x"$HAVE_SHARED_FFMPEG" = "xyes"; then
--
2.5.5

View File

@@ -1,56 +0,0 @@
From 0901ffbd5537d3cf974a3d790304ebf049ca60b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Fri, 13 May 2016 00:24:03 +0200
Subject: [PATCH] gifdrv.c: fix build with giflib > 5.1.0
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/gfxoutputdrv/gifdrv.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/gfxoutputdrv/gifdrv.c b/src/gfxoutputdrv/gifdrv.c
index 7f7f3bc..5056b55 100644
--- a/src/gfxoutputdrv/gifdrv.c
+++ b/src/gfxoutputdrv/gifdrv.c
@@ -114,7 +114,7 @@ static int gifdrv_open(screenshot_t *screenshot, const char *filename)
if (EGifPutScreenDesc(sdata->fd, screenshot->width, screenshot->height, 8, 0, gif_colors) == GIF_ERROR ||
EGifPutImageDesc(sdata->fd, 0, 0, screenshot->width, screenshot->height, 0, NULL) == GIF_ERROR)
{
- EGifCloseFile(sdata->fd);
+ EGifCloseFile(sdata->fd, 0);
VICE_FreeMapObject(gif_colors);
lib_free(sdata->data);
lib_free(sdata->ext_filename);
@@ -145,7 +145,7 @@ static int gifdrv_close(screenshot_t *screenshot)
sdata = screenshot->gfxoutputdrv_data;
- EGifCloseFile(sdata->fd);
+ EGifCloseFile(sdata->fd, 0);
VICE_FreeMapObject(gif_colors);
/* for some reason giflib will create a file with unexpected
@@ -184,7 +184,7 @@ static char *gifdrv_memmap_ext_filename;
static int gifdrv_close_memmap(void)
{
- EGifCloseFile(gifdrv_memmap_fd);
+ EGifCloseFile(gifdrv_memmap_fd, 0);
VICE_FreeMapObject(gif_colors);
lib_free(gifdrv_memmap_ext_filename);
@@ -231,7 +231,7 @@ static int gifdrv_open_memmap(const char *filename, int x_size, int y_size, BYTE
if (EGifPutScreenDesc(gifdrv_memmap_fd, x_size, y_size, 8, 0, gif_colors) == GIF_ERROR ||
EGifPutImageDesc(gifdrv_memmap_fd, 0, 0, x_size, y_size, 0, NULL) == GIF_ERROR)
{
- EGifCloseFile(gifdrv_memmap_fd);
+ EGifCloseFile(gifdrv_memmap_fd, 0);
VICE_FreeMapObject(gif_colors);
lib_free(gifdrv_memmap_ext_filename);
return -1;
--
2.5.5

View File

@@ -0,0 +1,101 @@
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,30 @@
From f4fa367ab6e79cbfd77254237335f383311006ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 9 Feb 2019 22:16:52 +0100
Subject: [PATCH] Set fixed VICEDIR
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@gmail.com>
---
configure.ac | 1 +
1 file changed, 1 insertion(+)
diff --git a/configure.ac b/configure.ac
index c5139fd..402e893 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5010,6 +5010,7 @@ case "$host_os" in
AM_CONDITIONAL(ALTERNATE_DOCDIR, false)
;;
esac
+VICEDIR="$libdir/vice"
AC_SUBST(VICEDIR)
AC_DEFINE_UNQUOTED(VICEDIR, "$VICEDIR",
[Where should we lookup for data files?])
--
2.20.1

Binary file not shown.

After

Width:  |  Height:  |  Size: 620 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 572 B

View File

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

View File

@@ -1,51 +0,0 @@
SUMMARY = "Versatile Commodore Emulator"
HOMEPAGE = "http://vice-emu.sourceforge.net"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://doc/html/plain/COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
# Sources for c64 software:
# [1] ftp://arnold.c64.org/pub/games/
SRC_URI = " \
${SOURCEFORGE_MIRROR}/project/vice-emu/releases/${BPN}-${PV}.tar.gz \
file://0001-gifdrv.c-fix-build-with-giflib-5.1.0.patch \
file://vice_64.desktop \
"
SRC_URI[md5sum] = "b017647a0c159bbe43cdb81762d1c577"
SRC_URI[sha256sum] = "ff8b8d5f0f497d1f8e75b95bbc4204993a789284a08a8a59ba727ad81dcace10"
inherit autotools pkgconfig
DEPENDS = "libxt libxmu libxaw libxpm libxv pulseaudio libav libsdl libpng jpeg giflib"
# some options autotools.bbclass adds by default cause configure to complain
# so (hack): copy from autotools.bbclass and remove unwanted
CONFIGUREOPTS = " \
--build=${BUILD_SYS} \
--host=${HOST_SYS} \
--target=${TARGET_SYS} \
--prefix=${prefix} \
--exec_prefix=${exec_prefix} \
--bindir=${bindir} \
--sbindir=${sbindir} \
--libexecdir=${libexecdir} \
--datadir=${datadir} \
--sysconfdir=${sysconfdir} \
--sharedstatedir=${sharedstatedir} \
--localstatedir=${localstatedir} \
--libdir=${libdir} \
--includedir=${includedir} \
--oldincludedir=${oldincludedir} \
--infodir=${infodir} \
--mandir=${mandir} \
${CONFIGUREOPT_DEPTRACK} \
"
EXTRA_OECONF = "--disable-ffmpeg"
do_install_append() {
install -d ${D}/${datadir}/applications
install -m 0644 ${WORKDIR}/vice_64.desktop ${D}/${datadir}/applications
}
FILES_${PN} += "${datadir}/icons"

View File

@@ -0,0 +1,68 @@
SUMMARY = "Versatile Commodore Emulator"
HOMEPAGE = "http://vice-emu.sourceforge.net"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
# Sources for c64 software:
# [1] ftp://arnold.c64.org/pub/games/
SRC_URI = " \
${SOURCEFORGE_MIRROR}/vice-emu/${BPN}-${PV}.tar.gz \
file://0001-fix-autoreconfig.patch \
file://0002-Hack-build-with-latest-FFMPEG.patch \
file://0003-Set-fixed-VICEDIR.patch \
file://c64_16.png \
file://c64_32.png \
file://c64_48.png \
file://vice_64.desktop \
"
SRC_URI[md5sum] = "58ba6b6653097898e059e0194615705a"
SRC_URI[sha256sum] = "28d99f5e110720c97ef16d8dd4219cf9a67661d58819835d19378143697ba523"
inherit autotools pkgconfig gtk-icon-cache
DEPENDS = " \
bdftopcf-native \
mkfontdir-native \
mkfontscale-native \
xa-native \
bison-native \
gtk+ \
libav \
libsdl \
libpng \
jpeg \
giflib \
libxxf86vm \
portaudio-v19 \
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 \
--without-oss \
--libdir=${libdir} \
"
do_install_append() {
install -d ${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
install -m 0644 ${WORKDIR}/c64_${size}.png ${D}/${datadir}/icons/hicolor/${size}x${size}/apps/c64.png
done
}
FILES_${PN} += "${datadir}/icons"

View File

@@ -23,6 +23,8 @@ SRC_URI[music.sha256sum] = "b27f7b9dc5f9c2744402c56c9499dfd9503c17e73a2a5223e745
S = "${WORKDIR}/${BPN}_${PV}-src"
do_unpack[depends] += "p7zip-native:do_populate_sysroot"
do_compile() {
scons opengl=0 prefix=${D}${prefix} sharepath=${datadir}/${BPN}
}

View File

@@ -0,0 +1,28 @@
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,73 @@
From 229d704ce2958ed22ca3ece49169bf1b1b97163d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Fri, 30 Jun 2017 11:15:40 +0200
Subject: [PATCH] increase buffer size to avoid gcc7 format-overflow errors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
src/episodes.c | 2 +-
src/episodes.h | 2 +-
src/lvllib.c | 2 +-
src/lvllib.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/episodes.c b/src/episodes.c
index 796d531..f346641 100644
--- a/src/episodes.c
+++ b/src/episodes.c
@@ -41,7 +41,7 @@ JE_EnemyDatType enemyDat;
/* EPISODE variables */
JE_byte initial_episode_num, episodeNum = 0;
JE_boolean episodeAvail[EPISODE_MAX]; /* [1..episodemax] */
-char episode_file[13], cube_file[13];
+char episode_file[15], cube_file[15];
JE_longint episode1DataLoc;
diff --git a/src/episodes.h b/src/episodes.h
index 598e1ae..0ff4380 100644
--- a/src/episodes.h
+++ b/src/episodes.h
@@ -162,7 +162,7 @@ extern JE_EnemyDatType enemyDat;
extern JE_byte initial_episode_num, episodeNum;
extern JE_boolean episodeAvail[EPISODE_MAX];
-extern char episode_file[13], cube_file[13];
+extern char episode_file[15], cube_file[15];
extern JE_longint episode1DataLoc;
extern JE_boolean bonusLevel;
diff --git a/src/lvllib.c b/src/lvllib.c
index a09c040..ca9a183 100644
--- a/src/lvllib.c
+++ b/src/lvllib.c
@@ -22,7 +22,7 @@
JE_LvlPosType lvlPos;
-char levelFile[13]; /* string [12] */
+char levelFile[30]; /* string [29] for gcc7's sake */
JE_word lvlNum;
void JE_analyzeLevel( void )
diff --git a/src/lvllib.h b/src/lvllib.h
index f22e3f5..61b3882 100644
--- a/src/lvllib.h
+++ b/src/lvllib.h
@@ -25,7 +25,7 @@
typedef JE_longint JE_LvlPosType[43]; /* [1..42 + 1] */
extern JE_LvlPosType lvlPos;
-extern char levelFile[13]; /* string [12] */
+extern char levelFile[30]; /* string [29] for gcc7's sake */
extern JE_word lvlNum;
void JE_analyzeLevel( void );
--
2.9.4

View File

@@ -0,0 +1,82 @@
From 655427d665ee6c9bd9f61193b6e48d3dde8b0bde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 5 Jul 2018 19:11:21 +0200
Subject: [PATCH] fix build with gcc8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/game_menu.c | 2 +-
src/joystick.c | 4 ++--
src/tyrian2.c | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/game_menu.c b/src/game_menu.c
index 416f2cb..7d24ad7 100644
--- a/src/game_menu.c
+++ b/src/game_menu.c
@@ -852,7 +852,7 @@ void JE_itemScreen( void )
? 100
: (yLoc * 100) / ((cube[currentCube].last_line - 9) * 12);
- char buf[20];
+ char buf[50];
snprintf(buf, sizeof(buf), "%s %d%%", miscText[11], percent_read);
JE_outTextAndDarken(VGAScreen, 176, 160, buf, 14, 1, TINY_FONT);
diff --git a/src/joystick.c b/src/joystick.c
index bf99647..933b791 100644
--- a/src/joystick.c
+++ b/src/joystick.c
@@ -493,14 +493,14 @@ void code_to_assignment( Joystick_assignment *assignment, const char *buffer )
assignment->negative_axis = (toupper(direction) == '-');
}
-/* gives the short (6 or less characters) identifier for a joystick assignment
+/* gives the short (15 or less characters) identifier for a joystick assignment
*
* two of these per direction/action is all that can fit on the joystick config screen,
* assuming two digits for the axis/button/hat number
*/
const char *assignment_to_code( const Joystick_assignment *assignment )
{
- static char name[7];
+ static char name[16];
switch (assignment->type)
{
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);
char buf[256];
- strncpy(buf, (strlen(s) > 8) ? s + 8 : "", sizeof(buf));
+ strncpy(buf, (strlen(s) > 8) ? s + 8 : "", sizeof(buf)-1);
int j = 0, temp;
while (str_pop_int(buf, &temp))
--
2.14.4

View File

@@ -0,0 +1,64 @@
From 28a0682bf3af1433ffdcd3c0458fdf4ebd5cc11a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 7 Jun 2019 21:49:17 +0200
Subject: [PATCH] Fix build with gcc 9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/destruct.c | 2 +-
src/game_menu.c | 4 ++--
src/video_scale_hqNx.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/destruct.c b/src/destruct.c
index 873c76b..1150ab5 100644
--- a/src/destruct.c
+++ b/src/destruct.c
@@ -2240,7 +2240,7 @@ static void DE_RunTickAI( void )
ptrUnit = ptrTarget->unit;
for (j = 0; j < config.max_installations; j++, ptrUnit++)
{
- if (abs(ptrUnit->unitX - ptrCurUnit->unitX) < 8)
+ if (abs(((Sint32)ptrUnit->unitX) - ((Sint32)ptrCurUnit->unitX)) < 8)
{
/* I get it. This makes helicoptors hover over
* their enemies. */
diff --git a/src/game_menu.c b/src/game_menu.c
index 7d24ad7..438c247 100644
--- a/src/game_menu.c
+++ b/src/game_menu.c
@@ -1992,9 +1992,9 @@ void JE_updateNavScreen( void )
navX = navX + (newNavX - navX) / 2.0f;
navY = navY + (newNavY - navY) / 2.0f;
- if (abs(newNavX - navX) < 1)
+ if (fabs(newNavX - navX) < 1)
navX = newNavX;
- if (abs(newNavY - navY) < 1)
+ if (fabs(newNavY - navY) < 1)
navY = newNavY;
fill_rectangle_xy(VGAScreen, 314, 0, 319, 199, 230);
diff --git a/src/video_scale_hqNx.c b/src/video_scale_hqNx.c
index 51836e6..6c7b5a5 100644
--- a/src/video_scale_hqNx.c
+++ b/src/video_scale_hqNx.c
@@ -120,8 +120,8 @@ inline void interp10(Uint32 *pc, Uint32 c1, Uint32 c2, Uint32 c3)
inline bool diff(unsigned int w1, unsigned int w2)
{
- Uint32 YUV1 = yuv_palette[w1];
- Uint32 YUV2 = yuv_palette[w2];
+ Sint32 YUV1 = yuv_palette[w1];
+ Sint32 YUV2 = yuv_palette[w2];
return ( ( abs((YUV1 & Ymask) - (YUV2 & Ymask)) > trY ) ||
( abs((YUV1 & Umask) - (YUV2 & Umask)) > trU ) ||
( abs((YUV1 & Vmask) - (YUV2 & Vmask)) > trV ) );
--
2.20.1

View File

@@ -6,13 +6,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
DEPENDS = "libsdl libsdl-net"
inherit autotools-brokensep
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 \
file://0006-Fix-build-with-gcc-9.patch \
"
SRC_URI[md5sum] = "978686c5a1dfbac69a2161aadf084c2b"
SRC_URI[sha256sum] = "f54b6b3cedcefa187c9f605d6164aae29ec46a731a6df30d351af4c008dee45f"
@@ -20,6 +24,8 @@ SRC_URI[sha256sum] = "f54b6b3cedcefa187c9f605d6164aae29ec46a731a6df30d351af4c008
SRC_URI[data.md5sum] = "2a3b206a6de25ed4b771af073f8ca904"
SRC_URI[data.sha256sum] = "7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277"
CFLAGS += "-Wimplicit-fallthrough=0"
do_install() {
install -d ${D}${bindir}
install ${BPN} ${D}${bindir}

View File

@@ -0,0 +1,173 @@
From be3b1dcbe0d9920eff4094e0a2ef8cd736051dff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 21 Dec 2016 08:20:27 +0100
Subject: [PATCH] gtkglwidget: various fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Taken from [1]
[1] http://pkgs.fedoraproject.org/cgit/rpms/gtkglext.git/plain/gtkglext-1.2.0-bz677457.diff
Upstream Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
gtk/gtkglwidget.c | 31 +++++++++++++++++++------------
1 file changed, 19 insertions(+), 12 deletions(-)
diff --git a/gtk/gtkglwidget.c b/gtk/gtkglwidget.c
index ecb41ef..2e5e9f6 100644
--- a/gtk/gtkglwidget.c
+++ b/gtk/gtkglwidget.c
@@ -16,7 +16,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include <gtk/gtkmain.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
#include "gtkglprivate.h"
#include "gtkglwidget.h"
@@ -68,6 +70,7 @@
gtk_gl_widget_realize (GtkWidget *widget,
GLWidgetPrivate *private)
{
+ GdkWindow *window;
GdkGLWindow *glwindow;
GTK_GL_NOTE_FUNC_PRIVATE ();
@@ -77,9 +80,10 @@
* handlers.
*/
- if (!gdk_window_is_gl_capable (widget->window))
+ window = gtk_widget_get_window (widget);
+ if (!gdk_window_is_gl_capable (window))
{
- glwindow = gdk_window_set_gl_capability (widget->window,
+ glwindow = gdk_window_set_gl_capability (window,
private->glconfig,
NULL);
if (glwindow == NULL)
@@ -127,9 +131,9 @@
* Synchronize OpenGL and window resizing request streams.
*/
- if (GTK_WIDGET_REALIZED (widget) && private->is_realized)
+ if (gtk_widget_get_realized (widget) && private->is_realized)
{
- gldrawable = gdk_window_get_gl_drawable (widget->window);
+ gldrawable = gdk_window_get_gl_drawable (gtk_widget_get_window (widget));
gdk_gl_drawable_wait_gdk (gldrawable);
}
}
@@ -146,7 +150,7 @@
if (private->glcontext != NULL)
{
- gdk_gl_context_destroy (private->glcontext);
+ g_object_unref (private->glcontext);
private->glcontext = NULL;
}
@@ -154,8 +158,8 @@
* Remove OpenGL-capability from widget->window.
*/
- if (GTK_WIDGET_REALIZED (widget))
- gdk_window_unset_gl_capability (widget->window);
+ if (gtk_widget_get_realized (widget))
+ gdk_window_unset_gl_capability (gtk_widget_get_window (widget));
private->is_realized = FALSE;
}
@@ -174,7 +178,7 @@
*/
toplevel = gtk_widget_get_toplevel (widget);
- if (GTK_WIDGET_TOPLEVEL (toplevel) && !GTK_WIDGET_REALIZED (toplevel))
+ if (gtk_widget_is_toplevel (toplevel) && !gtk_widget_get_realized (toplevel))
{
GTK_GL_NOTE (MISC,
g_message (" - Install colormap to the top-level window."));
@@ -188,23 +192,27 @@
GtkStyle *previous_style,
gpointer user_data)
{
+ GdkWindow *window;
+
GTK_GL_NOTE_FUNC_PRIVATE ();
/*
* Set a background of "None" on window to avoid AIX X server crash.
*/
- if (GTK_WIDGET_REALIZED (widget))
+ if (gtk_widget_get_realized (widget))
{
+ window = gtk_widget_get_window (widget);
+
GTK_GL_NOTE (MISC,
g_message (" - window->bg_pixmap = %p",
- ((GdkWindowObject *) (widget->window))->bg_pixmap));
+ ((GdkWindowObject *) window)->bg_pixmap));
- gdk_window_set_back_pixmap (widget->window, NULL, FALSE);
+ gdk_window_set_back_pixmap (window, NULL, FALSE);
GTK_GL_NOTE (MISC,
g_message (" - window->bg_pixmap = %p",
- ((GdkWindowObject *) (widget->window))->bg_pixmap));
+ ((GdkWindowObject *) window)->bg_pixmap));
}
}
@@ -250,8 +258,8 @@
GTK_GL_NOTE_FUNC ();
g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
- g_return_val_if_fail (!GTK_WIDGET_NO_WINDOW (widget), FALSE);
- g_return_val_if_fail (!GTK_WIDGET_REALIZED (widget), FALSE);
+ g_return_val_if_fail (gtk_widget_get_has_window (widget), FALSE);
+ g_return_val_if_fail (!gtk_widget_get_realized (widget), FALSE);
g_return_val_if_fail (GDK_IS_GL_CONFIG (glconfig), FALSE);
/*
@@ -432,9 +440,9 @@
GTK_GL_NOTE_FUNC ();
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
+ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
- gldrawable = gdk_window_get_gl_drawable (widget->window);
+ gldrawable = gdk_window_get_gl_drawable (gtk_widget_get_window (widget));
if (gldrawable == NULL)
return NULL;
@@ -474,7 +482,7 @@
GLWidgetPrivate *private;
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
+ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
private = g_object_get_qdata (G_OBJECT (widget), quark_gl_private);
if (private == NULL)
@@ -501,7 +509,7 @@
gtk_widget_get_gl_window (GtkWidget *widget)
{
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
+ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
- return gdk_window_get_gl_window (widget->window);
+ return gdk_window_get_gl_window (gtk_widget_get_window (widget));
}
--
2.5.5

View File

@@ -0,0 +1,51 @@
From 9cbea61c54ee97b6a92263f6392cd84a4918aa54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Wed, 6 Jun 2018 14:10:19 +0200
Subject: [PATCH] Fix variable name conflict
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
| ../../gtkglext-1.2.0/gdk/gdkglshapes.c:547:12: error: 'index' redeclared as different kind of symbol
| static int index[20][3] =
| ^~~~~
| In file included from /home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/gtkglext/1.2.0-r0/recipe-sysroot/usr/include/string.h:431:0,
| from /home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/gtkglext/1.2.0-r0/recipe-sysroot/usr/include/glib-2.0/glib/gtestutils.h:30,
| from /home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/gtkglext/1.2.0-r0/recipe-sysroot/usr/include/glib-2.0/glib.h:82,
| from ../../gtkglext-1.2.0/gdk/gdkglshapes.c:21:
| /home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/gtkglext/1.2.0-r0/recipe-sysroot/usr/include/strings.h:68:14: note: previous declaration of 'index' was here
| extern char *index (const char *__s, int __c)
| ^~~~~
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
gdk/gdkglshapes.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gdk/gdkglshapes.c b/gdk/gdkglshapes.c
index f72abba..d468b05 100644
--- a/gdk/gdkglshapes.c
+++ b/gdk/gdkglshapes.c
@@ -544,7 +544,7 @@ static GLfloat idata[12][3] =
{-Z, -X, 0}
};
-static int index[20][3] =
+static int _index[20][3] =
{
{0, 4, 1},
{0, 9, 4},
@@ -574,7 +574,7 @@ icosahedron(GLenum shadeType)
int i;
for (i = 19; i >= 0; i--) {
- drawtriangle(i, idata, index, shadeType);
+ drawtriangle(i, idata, _index, shadeType);
}
}
--
2.14.3

View File

@@ -0,0 +1,20 @@
SUMMARY = "OpenGL Extension to GTK"
LICENSE = "GPLv2 | LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff"
inherit gnomebase pkgconfig distro_features_check
REQUIRED_DISTRO_FEATURES = "x11 opengl"
DEPENDS += "gtk+ glib-2.0-native pangox-compat libglu libxmu"
SRC_URI += " \
file://0001-gtkglwidget-various-fixes.patch \
file://0002-Fix-variable-name-conflict.patch \
"
SRC_URI[archive.md5sum] = "ed7ba24ce06a8630c07f2d0ee5f04ab4"
SRC_URI[archive.sha256sum] = "16bd736074f6b14180f206b7e91263fc721b49912ea3258ab5f094cfa5497f51"
GNOME_COMPRESS_TYPE="bz2"
FILES_${PN}-dev += "${libdir}/gtkglext-1.0"

View File

@@ -0,0 +1,10 @@
SUMMARY = "Compatibility library for pangox"
LICENSE = "LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
inherit gnomebase pkgconfig
DEPENDS += "pango"
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

@@ -0,0 +1,107 @@
From 59fbf0c8d72e22caa7e19afa48c031f8822f276e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Wed, 6 Jun 2018 23:38:38 +0200
Subject: [PATCH] Align Makefiles for cross compiling
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>
---
Makefile | 39 ++++++---------------------------------
misc/Makefile | 10 +++++-----
2 files changed, 11 insertions(+), 38 deletions(-)
diff --git a/Makefile b/Makefile
index 0cda4d6..5b9ead0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,30 +1,4 @@
-# Unix gcc or DOS go32 cross-compiling gcc
-#
-CC = gcc
-LD = gcc
-# for testing. not to be used; build failures in misc/.
-#CFLAGS = -O2 -W -Wall -pedantic -ansi
-CFLAGS = -O2
-LDFLAGS = -lc
-
-# for DOS?
-# CC = gcc-go32
-# LD = gcc-go32
-# CFLAGS = -W -Wall -pedantic
-
-# Other cc
-#CC = cc
-#CFLAGS =
-#LD = ld
-
-DESTDIR = /usr/local
-
-BINDIR = $(DESTDIR)/bin
-MANDIR = $(DESTDIR)/share/man/man1
-DOCDIR = $(DESTDIR)/share/doc
-
-MKDIR = mkdir -p
-INSTALL = install
+LD = $(CC)
all: killxa xa uncpk
@@ -32,7 +6,7 @@ killxa:
rm -f xa
xa:
- (cd src && LD=${LD} CC="${CC} ${CFLAGS}" ${MAKE})
+ (cd src && LD="${LD}" CC="${CC} ${CFLAGS}" ${MAKE})
load:
(cd loader && CC="${CC} ${CFLAGS}" ${MAKE})
@@ -56,11 +30,10 @@ clean:
rm -f xa *.exe *.o65
install: xa uncpk
- $(MKDIR) $(BINDIR)
- $(MKDIR) $(MANDIR)
- $(INSTALL) xa reloc65 ldo65 file65 printcbm uncpk $(BINDIR)
- $(INSTALL) man/file65.1 man/ldo65.1 man/printcbm.1 man/reloc65.1 man/uncpk.1 man/xa.1 $(MANDIR)
- #$(MKDIR) $(DOCDIR)/xa65
+ install -d $(DESTDIR)$(PREFIX)/bin
+ install -m 755 xa reloc65 ldo65 file65 printcbm uncpk $(DESTDIR)$(PREFIX)/bin
+ install -d $(DESTDIR)$(PREFIX)/share/man/man1
+ 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
diff --git a/misc/Makefile b/misc/Makefile
index 2b450e0..6967dad 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -10,19 +10,19 @@ LIBS = #-lncurses -ltermcap -lm
all: ../mkrom.sh ../uncpk ../printcbm ../file65 ../reloc65 ../ldo65
../uncpk: uncpk.c
- ${CC} ${CFLAGS} uncpk.c -o $(XCBMLIB)/uncpk
+ ${CC} ${CFLAGS} $(LDFLAGS) uncpk.c -o $(XCBMLIB)/uncpk
../printcbm: printcbm.c
- ${CC} ${CFLAGS} printcbm.c -o $(XCBMLIB)/printcbm
+ ${CC} ${CFLAGS} $(LDFLAGS) printcbm.c -o $(XCBMLIB)/printcbm
../file65: file65.c
- ${CC} ${CFLAGS} file65.c -o $(XCBMLIB)/file65
+ ${CC} ${CFLAGS} $(LDFLAGS) file65.c -o $(XCBMLIB)/file65
../ldo65: ldo65.c
- ${CC} ${CFLAGS} ldo65.c -o $(XCBMLIB)/ldo65
+ ${CC} ${CFLAGS} $(LDFLAGS) ldo65.c -o $(XCBMLIB)/ldo65
../reloc65: reloc65.c
- ${CC} ${CFLAGS} reloc65.c -o $(XCBMLIB)/reloc65
+ ${CC} ${CFLAGS} $(LDFLAGS) reloc65.c -o $(XCBMLIB)/reloc65
../mkrom.sh: mkrom.sh
cp mkrom.sh ../mkrom.sh

View File

@@ -0,0 +1,16 @@
SUMMARY = "Open-source 6502 cross assembler"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=1f67e705f4eb5064027b8c40ccfdb43e"
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"
BBCLASSEXTEND = "native"
do_install() {
oe_runmake DESTDIR=${D} PREFIX=${prefix} install
}