Bug 215338 - emulators/wine-devel: refresh pkg-plist
Summary: emulators/wine-devel: refresh pkg-plist
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Gerald Pfeifer
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2016-12-16 12:20 UTC by Matthieu Volat
Modified: 2016-12-30 19:24 UTC (History)
0 users

See Also:


Attachments
Update pkg-plist for wine-2.0; add missing audio dlls enabled with OPENAL (23.25 KB, patch)
2016-12-16 12:20 UTC, Matthieu Volat
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Matthieu Volat 2016-12-16 12:20:00 UTC
Created attachment 178009 [details]
Update pkg-plist for wine-2.0; add missing audio dlls enabled with OPENAL

Hi,

I've been building i386-wine-devel and noticed that the PLIST is not really up to date (despite what check-plist says): 

- more than a few files previously from the STAGING patchset are now in the default version
- audio dll are not included when building with OPENAL[1]

Here's a patch that tries to fix those issues, a few entries are just moved to easier diff'ing bewteen pkg-plist and output of makeplist.

A few QA (do not tell much, as previously it seemed to ignore some files); port is generated in a i386 chroot on a amd64 host:

/usr/ports/emulators/i386-wine-devel # make check-plist
====> Checking for pkg-plist issues (check-plist)
===> Parsing plist
===> Checking for items in STAGEDIR missing from pkg-plist
===> Checking for items in pkg-plist which are not in STAGEDIR
===> No pkg-plist issues found (check-plist)

Thanks a lot


[1] openal is more than a audio backend nowadays, it is required to provide the xaudio API that is used by quite a few games... I don't know the intended target for ports wine users, but maybe it could be considered to enable it by default
Comment 1 Gerald Pfeifer freebsd_committer freebsd_triage 2016-12-17 00:34:28 UTC
Thanks for the report.

How did you notice that those %%STAGING%% items have moved into the
default build?

I'm asking, since I just double checked, and indeed both wine-devel
and wine-staging build and test just fine as is.  Which is concerning
in that it would be good to understand why this issue was not flagged.
Comment 2 Matthieu Volat 2016-12-17 09:47:26 UTC
The "hard way", I had a game that would not work, so I compared the output of `make makeplist` with pkg-plist. There, I noticed that quite some files were present in my work/stage directory but were flagged %%STAGING%% (and @comment-ed in the working plist).

I'm not really sure how this could escape the plist-check...
Comment 3 commit-hook freebsd_committer freebsd_triage 2016-12-17 14:35:05 UTC
A commit references this bug:

Author: gerald
Date: Sat Dec 17 14:34:04 UTC 2016
New revision: 428764
URL: https://svnweb.freebsd.org/changeset/ports/428764

Log:
  Fix the package list: Over the last couple of snapshots, a number of
  components has moved from the Wine Staging project into Wine proper,
  so %%STAGING%%foo/bar/smthng in pkg-plist now becomes just foo/bar/smthng.

  However, make check-plist did not notice this and indeed both the
  port before this update and with this update always pass check-plist
  without issues, both when the STAGING option is set and when it's not.

  (This is not a cosmetic issue, by the way, it did affect functionality
  of the Wine ports.)

  PR:		215338
  Submitted by:	Matthieu Volat <mazhe@alkumuna.eu>

Changes:
  head/emulators/wine-devel/Makefile
  head/emulators/wine-devel/pkg-plist
Comment 4 Gerald Pfeifer freebsd_committer freebsd_triage 2016-12-17 14:39:26 UTC
(In reply to Matthieu Volat from comment #2)
> I'm not really sure how this could escape the plist-check...

Nor do I, this is really unexpected.

I did a number of tests with and without your patch, with and without
STAGING set and now committed just the part of your patch that removed
the %%STAGING%% markers from pkg-plist so that (i) the port is fixed
quickly, even before RC2 is ready, and (ii) to have a good example to
report on ports@FreeBSD.org.

I'll get to the OPENAL changes later, and should there be anything I
might have missed (beyond the OPENAL changes an the one reordering at
the top of pkg-plist), please let me know.

Great detective work on your part, and great to provide a patch on top.
Much appreciated!
Comment 5 Matthieu Volat 2016-12-18 19:15:40 UTC
Thanks a lot for all the wine-related work!
Comment 6 commit-hook freebsd_committer freebsd_triage 2016-12-30 17:43:49 UTC
A commit references this bug:

Author: gerald
Date: Fri Dec 30 17:42:45 UTC 2016
New revision: 430011
URL: https://svnweb.freebsd.org/changeset/ports/430011

Log:
  Fix pkg-plist (and hence packaging) when building with OpenAL (and the
  OPENAL option).  Many more Windows libraries included now.

  PR:		215338
  Submitted by:	Matthieu Volat <mazhe@alkumuna.eu>

Changes:
  head/emulators/wine-devel/Makefile
  head/emulators/wine-devel/pkg-plist
Comment 7 Gerald Pfeifer freebsd_committer freebsd_triage 2016-12-30 18:18:04 UTC
Matthieu, I believe with this all the issues you reported should be
addressed (and I'll keep pushing on why `make check-plist` does not
catch the %%STAGING%% changes).

Should there be anything missing, please drop me a note.

Thanks again for your fine input!
Comment 8 Matthieu Volat 2016-12-30 19:24:49 UTC
Thanks for reviewing the issue and fixing it! And for making wine on freebsd possible!