Created attachment 246179 [details] Makefile maintenance & dependency cleanup During poudriere-testport, noticed the following I did: > ====> Running Q/A tests (stage-qa) > Warning: 'lib/wine/x86_64-unix/nsiproxy.so' is not stripped consider trying INSTALL_TARGET=install-strip or using ${STRIP_CMD} > Error: /usr/local/lib/wine/x86_64-unix/winegstreamer.so is linked to /usr/local/lib/libgobject-2.0.so.0 from devel/glib20 but it is not declared as a dependency > Warning: you need USE_GNOME+=glib20 > Error: /usr/local/lib/wine/x86_64-unix/winegstreamer.so is linked to /usr/local/lib/libglib-2.0.so.0 from devel/glib20 but it is not declared as a dependency > Warning: you need USE_GNOME+=glib20 > Error: /usr/local/lib/wine/x86_64-unix/winegstreamer.so is linked to /usr/local/lib/libintl.so.8 from devel/gettext-runtime but it is not declared as a dependency > Warning: you need USES+=gettext-runtime Attached patch address the above, as well as the fallout from the port tools. poudriere-testport: 12.4-{amd64,i386}-release: OK 13.2-{amd64,i386}-release: OK 14.0-{amd64,i386}-rc4: OK main-{amd64,i386}: OK poudriere-testport: main-{amd64,i386} all options on plus OSS: OK main-{amd64,i386} all options off plus ALSA: OK
Created attachment 246253 [details] Makefile maintenance & dependency cleanup Update/sync patch with Main.
At a first glance this looks fine. Just please, *please*, PLEASE let's not go for all those whitespace changes. Damjan made a series of such whitespace changes when becoming maintainer two years ago. This now would be yet another such set of changes. * That makes the wine-devel and wine ports diverge for no real benefit (and I worked to align them again after Damjan's changes). * It destroys `git blame`. * And many of us really don't consider the PLIST_SUB change, let alone (cd ${WRKSRC} && \ ${MAKE_CMD} depend) over cd ${WRKSRC} && ${MAKE_CMD} depend and improvement (looking at ports in general). (Don't get me wrong, I also have been trying to stay within 80 columns; it's just a balance.) This port has been portlint-clean (where reasonable) for two decades. portclippy and portfmt have their own preferences - and I recommend against simply applying the latter. If you want to apply changes suggested by the former, I'd do that as a distinct commit.
Created attachment 246270 [details] GSTREAMER dependency cleanup Reproduce patch addressing only the missing GSTREAMER Makefile components, and passing ${STRIP_CMD} to the GNU configure environment.
Current patch poudriere-testport: 12.4-{amd64,i386}-release: OK 13.2-{amd64,i386}-release: OK 14.0-{amd64,i386}-rc4: OK main-{amd64,i386}-current: OK (Tested both ALSA/OSS)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=132921c8f898c5ca11780b9b87543cce6eb406d2 commit 132921c8f898c5ca11780b9b87543cce6eb406d2 Author: Alastair Hogge <agh@riseup.net> AuthorDate: 2023-11-16 11:41:07 +0000 Commit: Gerald Pfeifer <gerald@FreeBSD.org> CommitDate: 2023-11-16 23:40:27 +0000 emulators/wine-devel: GSTREAMER dependency cleanup * Add missing USES=gnome and USE=GNOME=glib20 for GSTREAMER dependencies * Add ${STRIP_CMD} to GNU configure environment variable ac_cv_prog_STRIP PR: 274953 emulators/wine-devel/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
Thank you, Alastair! Personally I probably would have skipped the strip part (and this hack doesn't seem to be part of any other port), I pushed it still since it's your work and it addresses a warning.
(In reply to Gerald Pfeifer from comment #6) Thanks Gerald, You are right it is a hack, I had another look today, and adding ${STRIP_CMD} to GNU Configure only silences the warning, it makes no change to the produced binary. I am so sorry about this error I have made, and the unfortunate legacy the Port is now collecting. For the record, I do not agree that the hack should be committed.
(In reply to Alastair Hogge from comment #7) > You are right it is a hack, I had another look today, and adding > ${STRIP_CMD} to GNU Configure only silences the warning, it makes > no change to the produced binary. No worries, Alastair, and thank you for investing this in more depth! I've just prepared an update to wine-devel and will include reverting this change.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=5d2af9e3de9ccb187138c2fb33064233cf0ce817 commit 5d2af9e3de9ccb187138c2fb33064233cf0ce817 Author: Gerald Pfeifer <gerald@FreeBSD.org> AuthorDate: 2023-11-26 21:25:03 +0000 Commit: Gerald Pfeifer <gerald@FreeBSD.org> CommitDate: 2023-11-26 21:25:03 +0000 emulators/wine-devel: Update to Wine 8.21 This includes the following changes: - High-DPI scaling and initial Vulkan support in the Wayland driver (which we don't use yet, though). - Updates to the locale database. - Various bug fixes. Revert * Add ${STRIP_CMD} to GNU configure environment variable ac_cv_prog_STRIP from commit 132921c8f8. [1] PR: 274953 [1] Discussed with: Alastair Hogge <agh@riseup.net> [1] emulators/wine-devel/Makefile | 5 ++--- emulators/wine-devel/distinfo | 6 +++--- emulators/wine-devel/pkg-plist | 4 ++++ 3 files changed, 9 insertions(+), 6 deletions(-)