Global description does not fit with the logic used here.
USE=openssl's description was also updated in a prior commit
to state that it disables gnutls (aka, it is now mentioned both
ways).
I considered inverting the logic, but felt that it would be worse
unless USE=openssl is the default (i.e. you go out of your way
to enable non-default USE=openssl but it does nothing as long as
gnutls is set). And then, I am not inclined to change the default
given issues like bug #905113 had.
If this continues to confuse users we could always give it up
and do a REQUIRED_USE, albeit it may annoy some users with
conflicts.
Closes: https://bugs.gentoo.org/905113
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Using "Enables" rather than "Enable" and full stops is unusual
as far as USE descriptions go. Wording may still not be best
and what I came up with may not necessarily be better in some
cases, but it should be a bit more consistent.
There is a few USE like hardcoded-tables or libxml2 that haven't
touched given they are due to be dropped after cleanup old ebuilds.
Not sure if the slot=0 bit was ever used? I've seen it got added a
few years ago but ffmpeg in the tree at the time didn't have other
slots to give it any meaning.
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This does not list all changes compared to original due to being
essentially a rewrite (not much sense in looking at the diff
given almost no lines in common), but to list or explain notable
ones:
* Cleanup a lot of obsolete logic, like mirror://gentoo snapshots,
SCM type, <openssl-3 handling, etc...
* Re-arrange IUSE=soc handling to drop the IUSE when FFMPEG_SOC_PATCH
is empty until maintainer of the patch has time to look at that
(easier to bump without it and removes the need to mask in 9999)
* Drop some IUSE, ffmpeg has a bit too many often confusing users and,
while debatable, some are not really useful to control bare at most
for expert user that could use EXTRA_ECONF if *really* wanted:
- debug (disabled): does very little beside override users' -g*,
albeit if want nasm debug symbols will need to set X86ASMFLAGS.
- encode (enabled): debated keeping it for disabling encoders
without their own USE for bit of size/build time reduction despite
no dependencies, but feel it is not really worth it as it
complicates the ebuild and can break expectations for a lot
of revdeps (many likely lack the [encode] that they need) --
removal also handles bug #770439
- fftools_* (disabled): almost no distros install these, many have
rather generic names, we were missing installing new ones,
upstream ffmpeg does not even have an install target for them,
and a global USE_EXPAND for this feels wasteful (*could* consider
adding a all-in-one IUSE=tools if some are wanted by users anyway
but let us try without and see if anyone complains)
- glslang (disabled): redundant with USE=shaderc and is a pain to
use directly given glslang often breaks things, esp. worse for
packages with a slow release cycle and old LTS versions like
ffmpeg (bug #918989, bug #920283, bug #922333, bug #922433) --
upstream also seems to favour shaderc: "libshaderc and libglslang
are mutually exclusive, if in doubt, disable libglslang"
(from ./configure)
- harcoded-tables (disabled): off by default upstream and listed as a
"experts only" option that seemingly provide little gains for a
notable size increase, do not believe it is worth exposing as a USE
- iconv (enabled): virtual/libiconv is essentially free anywhere but
prefix and disabling iconv can be rather broken for a few things
- network (enabled): no dependencies, fairly small, and many revdeps
likely expect it to be enabled and just missing the [network]
(tempting to do the same with USE=postproc but it would still be
conditional through USE=gpl and be more confusing, and then forcing
GPL also has its own issues)
- oss (auto): does not have a dedicated option and just checks
linux-headers and is very small, hardly anyone need this
but that argument could be applied to a *ton* of in/outdevs,
filters, de/encoders, and such and we would never see the end
of it
- pic (enabled): makes little sense not to enable nowadays and
handles bug #903754 + bug #916067 -- USE had the secondary
effect of disabling x86-32 asm which still doing given it is
difficult to support either way due to textrels and
>=binutils-2.41's enforcing (bug #916067, bug #920808), and
it is possibly broken for older hardware (bug #733556) -- as
a minor bonus, this should also let LTO work with abi_x86_32
(bug #654118)
- static-libs (disabled): cannot think of much of a use for this
esp. given how massive these libraries are and it would still
require to link with all its shared-only dependencies
- test (irrelevant): tests are not gone but there is no dependencies
(bc and wget are not needed) nor REQUIRED_USE to handle anymore,
thus USE is useless
- threads (auto): no real sense in disabling (bug #868471), and
leaving it auto let ffmpeg figure out the right implementation
to use which in most cases means default --enable-pthreads
- cpu_flags_* + cpudetection (enabled): tentatively anyway, just
let ffmpeg do its thing normally -- simplifies the ebuild a lot,
"should" fix bug #915384, and also handles whatever ebuild
was doing wrong wrt bug #752507 + bug #778035 (one minor "issue"
however is that all these flags being removed will leave users
confused as to what happened, if reading this and worried about
optimizations.. then no they are *not* disabled, and it is fine
for other machines thanks to detection at runtime)
* New IUSE:
- openmpt: requested in bug #921313
- npp: requested in bug #695210 -- note have not tested the
arm64 (sbsa) support, but it should work in theory as cuda
toolkit does install npp prebuilt arm64 libraries
- rabbitmq: trivial, may as well add support
(meant to add more but others did not fare as well and will leave
for later rather than during big changes, kept some minor notes in
the ebuild about things still not supported)
* Renamed IUSE:
- mp3->lame: this is only for encoding but it made it "sound"
needed for decoding (not the only case like this but this one
felt too generic), may surprise those that had it actually
enabled for encoding
- libxml2->xml and libdrm->drm: given newly enabling these by
default (see below), it's a good occasion to rename to the
more commonly used USE without causing issues
- libv4l->v4l: to be precise IUSE=v4l was removed and it gained
the meaning that IUSE=libv4l had -- old v4l is always enabled
(if linux) due to the hard dependency on linux-headers (see below)
-- given the old REQUIRED_USE with libv4l? ( v4l ), all users of
libv4l will have the new USE enabled already
- libdvdnav+libdvdread->dvd(combined): similar to mpv, simpler
for users when they just want dvds to work than worry about
each library (dvd support is new in ffmpeg-7, so this only
ever been masked)
* Enable a few extra IUSE by default that, while not everyone needs,
are useful and have dependencies that many users will already have.
- libass,truetype,fontconfig: for proper text/subtitles drawing
(kdenlive also wants [libass]), albeit video players tend to
have their own handling (that pull the same depdencies)
- drm: used in various pieces of code and little reason to
disable when mesa depends on libdrm either way
- xml: needed for DASH-type streams, notably used by youtube,
and about everyone has libxml2
(one downside of new defaults is MULTILIB_USEDEP, users that only
selectively enable abi_x86_32 rather than globally may be faced with
conflicts when updating)
* Always depend on linux-headers if linux, not *required* (except for
v4l) but this prevents a lot of automagic and going through alternate
code paths if missing (also go with >=6 which is needed for v4l2m2m
and I believe also USE=soc for v4l2request)
* Add missing vulkan-headers dependency wrt bug #865201, and also
opencl-headers wrt bug #941506 (not 100% sure that this is what
happened for the latter, but given binhost is setup it is likely).
* Bump nv-codec-headers min req to 12.1.14.0, while not *required*
it spares us for setting up ranges and 11.x is due for cleanup.
* Add missing x11-base/xorg-proto wrt bug #934196 -- technically
was longer an issue given libX11 RDEPENDs on it "now", but would
still rather keep these for now.
* Depend on >=librsvg-2.52 wrt bug #918613, USE=svg is not essential
for arches without rust and upstream bug been went 1.5 years without
activity.
* Update REQUIRED_USE a bit, cuda does not *need* nvenc (just get
one filter in less), libplacebo does nothing without sdl(ffplay)
or vulkan, and few others like these (likely still missing some).
* Drop musl HAVE_POSIX_IOCTL workaround, this is automatically set by
./configure since ffmpeg-7.1. However, note that there is another
related issue with libv4l (not v4l) that is not fixed (bug #911499).
* No longer ignore ffmpeg-spec-disposition test, fixed in 7.1.1.
* Fix verify-sig paths on prefix wrt bug #947253 (untested)
* No longer pass e.g. --disable-indev=alsa when already doing
--disable-alsa, ./configure seem to figure this out just fine.
* No longer pass --cpu, this expects the -march=<exact> reported by
the compiler or probes compiler with =native if =host), however it
does not account for -mno-* both passed or implied by =native and
could enable things it shouldn't. Furthermore, it adds -march=<exact>
after the users' -march=native (which is more correct, can enable
or disable additional features). This option only seem like trouble
and likely does not get tested much. Removing also handles
bug #830165 albeit ffmpeg-chromium is still affected.
* Replace EXTRA_FFMPEG_CONF by EXTRA_ECONF, while it is not using
econf nor autoconf, the latter is more widely known while the former
needs users to look at the ebuild -- also die if old variable is set
so users know about this change.
* Skip installing doc/*.txt, that seems mostly oriented at ffmpeg devs,
and feels noisy in the docdir, but do keep doc/APIChanges
* Replace all *GPL* by the + version given ./configure always output
with "or later" when listing the final license.
* Maybe not best way to go about this, but when doing incompatible
--enable-gpl --enable-nonfree, on top of the RESTRICT="bindist"
also add "all-rights-reserved" so a typical freedom ACCEPT_LICENSE
can block it.
* Rearrange chromium patch a bit to need less ebuild logic, and make
it unused for ffmpeg-compat.
* Drop EGIT_MIN_CLONE_TYPE, shallow clones seem fine now? If not,
could consider just using the official github mirror by default.
List of closed bugs may not be complete, plans are to recheck
still-open bugs after this is merged.
Bug: https://bugs.gentoo.org/830165
Closes: https://bugs.gentoo.org/654118
Closes: https://bugs.gentoo.org/695210
Closes: https://bugs.gentoo.org/733556
Closes: https://bugs.gentoo.org/752507
Closes: https://bugs.gentoo.org/770439
Closes: https://bugs.gentoo.org/778035
Closes: https://bugs.gentoo.org/865201
Closes: https://bugs.gentoo.org/868471
Closes: https://bugs.gentoo.org/903754
Closes: https://bugs.gentoo.org/915384
Closes: https://bugs.gentoo.org/916067
Closes: https://bugs.gentoo.org/918613
Closes: https://bugs.gentoo.org/918989
Closes: https://bugs.gentoo.org/920283
Closes: https://bugs.gentoo.org/920808
Closes: https://bugs.gentoo.org/921313
Closes: https://bugs.gentoo.org/922333
Closes: https://bugs.gentoo.org/922433
Closes: https://bugs.gentoo.org/934196
Closes: https://bugs.gentoo.org/941506
Closes: https://bugs.gentoo.org/947253
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Two versions to support the range of (not-masked) in-tree
nvidia-drivers and what older ffmpeg versions may require to work
(albeit unneededed right now, ffmpeg-6.1.1 is broken with 13.0
but that version is due for cleanup either way).
Add a pkg_postinst to inform of driver support, but do not reintroduce
a nvidia-drivers RDEPEND (leads to complications and this is supposed
to be headers-only, runtime is optional).
Also simplify the ebuild, the makefile's `all` target does nothing
but a sed (not worth a src_compile), and the unintuitive LIBDIR=share
installs to /usr/<libdir>/pkgconfig like the `mv` does.
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
May as well take too, same pseudo-upstream as ffmpeg and it can
be sensitive to the versions sometimes requiring to set upper or
lower bounds.
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Others are still welcome to work on this though, it's just that
media-video is mostly a placeholder project at this point and
hasn't touched ffmpeg in nearly 3 years.
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
With USE="-doc test", if we have dev-ada/e3-testsuite installed but not
dev-python/sphinx, we end up failing because we don't return early if
*ONLY* USE=test and end up looking for doc deps.
Feel like I'm missing a more elegant way of doing this (other than relying
on just the implicit return which doesnt't simplify much) but let's get
it fixed in any case.
Bug: https://bugs.gentoo.org/951067
Signed-off-by: Sam James <sam@gentoo.org>
As explained in the previous commit, pystring changed soname and thus we
had to introduce a subslot, and all revdeps need to depend on said
subslot. Also force a rebuild by revbumping.
Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
```
* CMP: =dev-cpp/pystring-1.1.3-r1 with dev-cpp/pystring-1.1.4/image
* FILES:-usr/lib64/libpystring.so.0.0
* FILES:+usr/lib64/libpystring.so (-rwxr-xr-x root:root)
* SONAME:-libpystring.so.0.0(64)
* SONAME:+libpystring.so(64)
```
This breaks binpackage usage. preserved-libs sort of saves you, maybe,
if you built locally. Reverse dependencies are linked to .so.0.0, but
the new package only contains .so -- technically, if the reverse were
true, linked binaries would still work if you squint, but in the current
state this simply does not work at all.
The background here is weird. Upstream has a Makefile, which calls the
system libtool (broken!) and produces a soname of .so.0 in the event
that it succeeds at producing a library. We patched in an unofficial
cmake build (???) that set the soname to .so.0.0 instead, which isn't
very libtool of them but whatever. Upstream didn't actually accept that,
they wrote their own which is "simpler" and set the soname to .so.
Now we have 3 different sonames in use, but one of them was only in use
in *Gentoo* for a couple of days, unstable, back in 2021.
As standard, we solve changing sonames by bumping subslot to force a
rebuild. Straight to stable it goes, with a revbump since people
already have it installed and now have broken binaries.
Bug: https://github.com/gentoo/gentoo/pull/21209
Bug: https://github.com/gentoo/gentoo/pull/39761
Bug: https://github.com/imageworks/pystring/pull/29
Fixes: 91773fd1eb
Fixes: 4b6bedcedf
Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>