Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

media-video/obs-studio: Various updates. #9689

Closed
wants to merge 7 commits into from

Conversation

Chiitoo
Copy link
Contributor

@Chiitoo Chiitoo commented Aug 24, 2018

Not sure how the QA issue didn't come up last time (maybe something changed in repoman... did not check a look).

Let's see if gentoo-repo-qa-bot yells at me again when doing the Python thingies like so...

@gentoo-bot
Copy link

Pull Request assignment

Areas affected: ebuilds
Packages affected: media-video/obs-studio

media-video/obs-studio: @Chiitoo

Bugs linked: 662702

In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

@gentoo-bot gentoo-bot added self-maintained The PR changes only packages that are maintained by the submitter (i.e. no need to ask anybody else) assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. labels Aug 24, 2018
@Chiitoo
Copy link
Contributor Author

Chiitoo commented Aug 31, 2018

Updated with the bump to be for version 22.0.2 instead of 22.0.1.

@@ -6,7 +6,7 @@ EAPI=6
PYTHON_COMPAT=( python{3_4,3_5,3_6} )
CMAKE_MIN_VERSION=3.9.6
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

3.9.6 is current default in cmake-utils.eclass so this line could be dropped

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dropped it shall be.

@@ -3,9 +3,10 @@

EAPI=6

PYTHON_COMPAT=( python{3_4,3_5,3_6} )
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you check if it may be fine with python3_7 already?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I forget why I didn't go for it before, but regardless, it looks like only 3.6 is officially supported (while things may work on other versions as well).

That's based on a chat in the upstream IRC channel.

The documentation [1] I was going by only mentioned 3.6 being required for Windows, and I couldn't see/find any issues with the versions we had at the time, so I added all three.

  1. https://obsproject.com/docs/scripting.html

pulseaudio? ( media-sound/pulseaudio )
python? ( ${PYTHON_DEPS} )
speexdsp? ( media-libs/speexdsp )
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please switch to USE=speex here, which is used elsewhere in tree already.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This I also considered when adding it, but the Speex DSP, and its purpose here seemed to be different enough from Speex. I can certainly go with 'speex' instead, however.

Copy link
Member

@a17r a17r Sep 6, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes please. speexdsp and speex are two parts of the same software, and while they are independently packaged for some time now, there is no reason to follow through with more use flag granularity as well.

@Chiitoo
Copy link
Contributor Author

Chiitoo commented Sep 7, 2018

Changes:

  • Restricted supported Python versions to 3.6, since that's what upstream seems to require.
  • Removed the 'CMAKE_MIN_VERSION'.
  • Renamed USE="speexdsp" to "speex".
  • Removed the 'use less automagic' patch (upstreamed) from 9999.
  • Bumped version bump to 22.0.3 (though it's just a macOS hotfix).

@a17r
Copy link
Member

a17r commented Oct 4, 2018

  • Restricted supported Python versions to 3.6, since that's what upstream seems to require.

Are you sure it does not work with 3.5? Because that change may end up some people with conflicts on upgrade. I tend to 'keep it if there's no bug report'.

@Chiitoo
Copy link
Contributor Author

Chiitoo commented Oct 4, 2018

  • Restricted supported Python versions to 3.6, since that's what upstream seems to require.

Are you sure it does not work with 3.5? Because that change may end up some people with conflicts on upgrade. I tend to 'keep it if there's no bug report'.

Not at all. I've heard no reports of it not working, and as such, was indeed wondering which would be the better way forward.

I'll change it back.

Thanks!

Since FFmpeg 4 is still masked, depending on a USE-flag specific to
that version is a QA violation, so for now only the 9999 version
will be compatible with it.

Signed-off-by: Jimi Huotari <chiitoo@gentoo.org>
Package-Manager: Portage-2.3.48, Repoman-2.3.10
Previously, the fact that 'python-any-r1.eclass' is intended for
build-time dependent packages only was completely missed, while
Python is required at run-time when used for OBS Studio scripting.

Closes: https://bugs.gentoo.org/662702
Signed-off-by: Jimi Huotari <chiitoo@gentoo.org>
Package-Manager: Portage-2.3.48, Repoman-2.3.10
Signed-off-by: Jimi Huotari <chiitoo@gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.10
The use of the flag is similar enough to the existing one.

Signed-off-by: Jimi Huotari <chiitoo@gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Signed-off-by: Jimi Huotari <chiitoo@gentoo.org>
Package-Manager: Portage-2.3.48, Repoman-2.3.10
Signed-off-by: Jimi Huotari <chiitoo@gentoo.org>
Package-Manager: Portage-2.3.48, Repoman-2.3.10
Closes: https://bugs.gentoo.org/665766
Signed-off-by: Jimi Huotari <chiitoo@gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.10
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2018-10-04 14:16 UTC
Newest commit scanned: 803016b
Status: ✅ good

No issues found

@gentoo-bot gentoo-bot closed this in ce3a089 Oct 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. self-maintained The PR changes only packages that are maintained by the submitter (i.e. no need to ask anybody else)
Projects
None yet
4 participants