| Summary: | games-emulation/advancemame-3.9 bump request | ||
|---|---|---|---|
| Product: | Gentoo Linux | Reporter: | Sebastian Pipping <sping> |
| Component: | Current packages | Assignee: | Gentoo Games <games> |
| Status: | RESOLVED FIXED | ||
| Severity: | normal | CC: | alex, mads, scott |
| Priority: | Normal | Keywords: | PullRequest |
| Version: | unspecified | ||
| Hardware: | All | ||
| OS: | Linux | ||
| See Also: | https://github.com/gentoo/gentoo/pull/15173 | ||
| Whiteboard: | |||
| Package list: | Runtime testing required: | --- | |
| Bug Depends on: | 709974 | ||
| Bug Blocks: | |||
| Attachments: |
advancemame-3.9.ebuild
advancemame-3.9-replace_ac_check_cc_opt.patch advancemame-3.9.ebuild (sed patch) advancemame-3.9.ebuild (sed patch) |
||
|
Description
Sebastian Pipping
2018-09-12 11:20:52 UTC
Created attachment 627056 [details]
advancemame-3.9.ebuild
Updated ebuild, less patches.
Created attachment 627058 [details, diff]
advancemame-3.9-replace_ac_check_cc_opt.patch
New patch to replace the deprecated ac_check_cc_opt with ax_check_compile_flag. I don't believe the other 3.7 patches are needed, most seem to be applied upstream including the github patch in distfiles. This should replace advancemame-3.7-move_aclocal_to_acinclude.patch.
advancemame-3.9-replace_ac_check_cc_opt.patch can probably be replaced with sed if 4k is too much patch. Created attachment 627476 [details]
advancemame-3.9.ebuild (sed patch)
Created attachment 627478 [details]
advancemame-3.9.ebuild (sed patch)
I was thinking this is looking great aside from some tweaks to the dependencies but unfortunately it failed to build for me. I was hit by bug #709974, which only happens with USE=fbcon. Now you could argue that this bug is already present so I might as well merge this but if I do, lots of users will hit this when they update. The answer is to apply pkg-config logic to configure just like what was done for SDL2. Assuming zip/unzip aren't really needed at build time, the dependencies should look like: DEPEND=" dev-libs/expat media-libs/libsdl2[video] sys-libs/zlib alsa? ( media-libs/alsa-lib ) truetype? ( media-libs/freetype:2 ) " RDEPEND=" ${DEPEND} app-arch/unzip app-arch/zip " BDEPEND=" virtual/pkgconfig x86? ( >=dev-lang/nasm-0.98 ) " I just got it to duplicate! Sweet, I will get it patched upstream and add a patch to the new ebuild. I also added use support ncurses as it seems to be optional. I will update the PR and report back when I think it is working. Thanks for the testing and review. Hi James, I have updated the pull request with the fixes for sys-libs/ncurses[tinfo] and some other fixes. I have created a new patch file for upstream PR https://github.com/amadvance/advancemame/pull/8. Please re-review when you have a moment and let me know if I should fix anything else. Thanks. The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6edf4db508c9d80eb285fcbff4be119ea96edfa commit e6edf4db508c9d80eb285fcbff4be119ea96edfa Author: Alexander Barker <alex@1stleg.com> AuthorDate: 2020-03-30 16:12:11 +0000 Commit: James Le Cuirot <chewi@gentoo.org> CommitDate: 2020-04-28 22:54:53 +0000 games-emulation/advancemame-3.9: Version Bump Bug: https://bugs.gentoo.org/665770 Closes: https://bugs.gentoo.org/665770 Signed-off-by: Alex Barker <alex@1stleg.com> Closes: https://github.com/gentoo/gentoo/pull/15173 Signed-off-by: James Le Cuirot <chewi@gentoo.org> games-emulation/advancemame/Manifest | 3 +- ...vancemame-3.7.ebuild => advancemame-3.9.ebuild} | 40 +++-- ...advancemame-3.7-move_aclocal_to_acinclude.patch | 78 --------- ...cemame-3.7-remove_static_configure_option.patch | 41 ----- ...emame-3.9-pkgconfig_for_ncurses_and_slang.patch | 184 +++++++++++++++++++++ ...ncemame-1.2-pic.patch => advancemame-pic.patch} | 0 ...rboselog.patch => advancemame-verboselog.patch} | 0 7 files changed, 207 insertions(+), 139 deletions(-) Additionally, it has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6edf4db508c9d80eb285fcbff4be119ea96edfa commit e6edf4db508c9d80eb285fcbff4be119ea96edfa Author: Alexander Barker <alex@1stleg.com> AuthorDate: 2020-03-30 16:12:11 +0000 Commit: James Le Cuirot <chewi@gentoo.org> CommitDate: 2020-04-28 22:54:53 +0000 games-emulation/advancemame-3.9: Version Bump Bug: https://bugs.gentoo.org/665770 Closes: https://bugs.gentoo.org/665770 Signed-off-by: Alex Barker <alex@1stleg.com> Closes: https://github.com/gentoo/gentoo/pull/15173 Signed-off-by: James Le Cuirot <chewi@gentoo.org> games-emulation/advancemame/Manifest | 3 +- ...vancemame-3.7.ebuild => advancemame-3.9.ebuild} | 40 +++-- ...advancemame-3.7-move_aclocal_to_acinclude.patch | 78 --------- ...cemame-3.7-remove_static_configure_option.patch | 41 ----- ...emame-3.9-pkgconfig_for_ncurses_and_slang.patch | 184 +++++++++++++++++++++ ...ncemame-1.2-pic.patch => advancemame-pic.patch} | 0 ...rboselog.patch => advancemame-verboselog.patch} | 0 7 files changed, 207 insertions(+), 139 deletions(-) Not sure we want this behavior: * Messages for package games-emulation/advancemame-3.9: * * Installation of a regular file is blocked by a directory: * '/usr/share/advance/rom' * This file will be merged with a different name: * '/usr/share/advance/rom.backup.0000' (In reply to Kobboi from comment #10) > Not sure we want this behavior: > > * Messages for package games-emulation/advancemame-3.9: > * > * Installation of a regular file is blocked by a directory: > * '/usr/share/advance/rom' > * This file will be merged with a different name: > * '/usr/share/advance/rom.backup.0000' I have reproduced this. I'm not sure what's going on yet except that /usr/share/advance/rom is being created as a zip. I have my day job to do just now but I'll try to fix it later today. Thanks for reporting. (In reply to James Le Cuirot from comment #11) > I have reproduced this. I'm not sure what's going on yet except that > /usr/share/advance/rom is being created as a zip. I have my day job to do > just now but I'll try to fix it later today. Thanks for reporting. And thank you for addressing it :) The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33e06e748ded1d938628b43bfd664f2ece852572 commit 33e06e748ded1d938628b43bfd664f2ece852572 Author: James Le Cuirot <chewi@gentoo.org> AuthorDate: 2020-04-29 10:08:15 +0000 Commit: James Le Cuirot <chewi@gentoo.org> CommitDate: 2020-04-29 10:08:22 +0000 games-emulation/advancemame: Work around parallel install bug with -j1 I'll try to fix it properly later. Bug: https://bugs.gentoo.org/665770 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: James Le Cuirot <chewi@gentoo.org> games-emulation/advancemame/advancemame-3.9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) |