assembler complains about. Pull in two upstream changes to fix these until
they are on the stable branch.
Without these these ports fail to build on AArch64.
Approved by: koobs
Differential Revision: https://reviews.freebsd.org/D4781
Move the libx264 patch for stdint.h handling on FreeBSD to the multimedia/x264
port, as FILESDIR is inherited from there, thus causing the patch not to be
applied.
Reported by: kwm
Reviewed by: kwm
Tested by: kwm
Differential Revision: https://reviews.freebsd.org/D3168
Delete distinfo from libx264 since it is s now subordinate to the x264 port.
Also correctly update distinfo for x264, including the example.y4m.bz2 video
file for profile guided optimization (OPTION: PGO).
PR: 201260
Reported by: Ajtim <lumiwa gmail com> (via email)
- Update to 0.144.2533 (from upstream stable branch) [1]
- Switch x264 and libx264 ports to master/slave ports respectively
- Bump PORTREVISION for dependent ports as the shared library version
has changed.
multimedia/x264:
- Clean up and update "updating instructions" in Makefile header
- Tweak COMMENT
- Only LIB_DEPENDS on libx264 and add PLIST_FILES if this isn't the
libx264 port.
- Allow COMMENT, USES, OPTIONS_*, CONFIGURE_ARGS to be overriden in
libx264 port.
- Place common configure arguments in a CONFIGURE_COMMON_ARGS variable
to make overriding values without duplication easier.
- Use --prefix configure argument over post-patch replacements
- Enable stripping of binaries and libraries if DEBUG is off. Remove
post-install target STRIP_CMD accordingly.
- Delete patch-Makefile in favour of patching WRKSRC/configure to
identify amd64, arm64 and mipsn32. powerpc and powerpc64 are now
covered upstream without needing patches.
- Patch out a bogus compiler argument check (cc_check) that results
in -Wno-maybe-uninitialized being added to CFLAGS causing causes
warnings when clang is cc. The cc_check function checks for basename
$CC to identify compiler type (icl, clang, gcc, etc).
multimedia/libx264:
- Remove all Makefile entries that are duplicated or common and found
in the master port (x264).
- Set lib as the PKGNAMEPREFIX
- Tweak COMMENT
- Delete upstreamed ARM patches [1]
- Delete all but one patch, as they duplicate those in x264.
- Dont remove pkgconfig/libdata directory
Changes:
https://git.videolan.org/?p=x264.git;a=shortlog;h=refs/heads/stable
Based on:
PR: 201260 [1]
Submitted by: Andrey Cherkashin <andoriyu gmail com> [1]
An encoding error condition is created when HI10P is enabled
in libx264, since the x264 is not built with that options.
Make x264 use the headers provided by the libx264 port, not the ones
that come with the sources, so the configuration options between the
two ports (libx264 and x264) can't end up mismatched.
Thanks to astrodog and a_b (IRC) for coming up with an elegant solution. [1]
While I'm here:
- Update COMMENT to reflect this is just the x264 CLI frontend
- Add LICENSE_FILE
- Tweak BUILD_DEPENDS
- Sort USES and OPTIONS
- Update GCC_DESC to match libx264
- Use OPTIONS helpers (except for PGO & GCC .. *shakes fist*)
- Sort PLIST_*
- Remove conditional LDFLAGS (-fstack-protector is now handled by the
framework)
- Whitespace alignment
- Remove pkgconfig REINPLACE_CMD, its not needed here.
- Strip x264 binary x264
PR: 195292 [1]
Submitted by: Harrison Grundy <harrison dot grundy at astrodoggroup com>
- Split x264 into two ports: the CLI application (x264), and the library
(libx264). This will allow x264 to use lavf and friends from ffmpeg for
decoding and demuxing while preventing a circular dependency between the
two: x264 can depend on ffmpeg, but ffmpeg will depend on libx264 rather
than x264.
- Add the LAVF option to the CLI port, making the dependency on ffmpeg
optional.
- Update to 0.142.2455.
- Amend fixes to local patches so that they can apply to the new upstream
files.
- Provide the git revision and other version information to the build
environment, allowing the CLI binary to display this information (like the
Windows builds).
- Remove unsupported build options (X11_OUTPUT).
- Ensure that the library and CLI ports each have the appropriate options.
- Add notes for future contributors who wish to update the ports.
- Bump PORTREVISION for all dependent ports.
PR: 187805
Differential Revision: https://reviews.freebsd.org/D1159
Submitted by: Andrew Berg <aberg010@my.hennepintech.edu>
Approved by: koobs (maintainer, mentor)
Inadvertently left the new HI10P option included in OPTIONS_DEFAULT in the
last commit while I was testing. Remove it.
PR: ports/186138
Submitted by: Anton Sayetsky <vsjcfm@gmail.com>
- Remove PGO as a default option, because RESTRICTED DISTFILES is
causing >500 package builds to be skipped/ignored. I've found a
number of more liberally licensed test sequences that can be used
in a future update.
- Bump PORTREVISION
While I'm here:
- Rename GCC44 option to GCC (4.4 is no longer the default)
- Split out GCC and ASM options, allowing a user to select to use
a modern GCC version, and continue to opt-in-or-out of ASM
optimizations for performance comparisons, benchmarks or the like.
- Honour WITH_DEBUG from make.conf in DEBUG option
- Replace USE_GMAKE with USES=gmake
- pkg-descr: Tab -> space in WWW:
- Remove LICENSE_FILE for those listed in bsd.licenses.db.mk
- Remove unused MASTER_SITE_SUBDIR
- Fix COMMENT conditional assignment since there's no slave port
- Remove other vestigial SLAVE_PORT items
- Remove avc2avi related entries (no references in source)
- Remove TARGET_ARCH from CONFIGURE/MAKE environment (no references)
- Remove CFLAGS/LDFLAGS from CONFIGURE_ARGS causing duplication
- Remove pre. and post. mk includes, theyre not needed
- Remove unecessary MGCC sections related to setting COMPILER_PATH
- Remove NO_STAGE=yes, since this port is staging compatible aready
- Whitespace alignment
PR: ports/171542
Reported by: tijl
Reviewed by: tijl, bapt
Right now this is a noop in the former case and a noop in the latter
case unless lang/gcc44 has been installed explicitly.
This puts a bit more emphasis on standardizing on a canonical version
"current" GCC and makes it easier to update that canonical version
by changing the default in Mk/bsd.gcc.mk and updating the lang/gcc port.
That is, USE_GCC=yes means "use a decent/modern version of GCC" without
having to worry about details.
Approved by: portmgr (bdrewery)
broken on clang.
However, setting USE_GCC=any appears to be insufficient: the too-clever
configure glop sees that clang is installed and attempts to use it
regardless.
This commit is thus a temporary measure.
Hat: portmgr
was enabled for userland on src/share/mk/bsd.sys.mk
(SVN rev 180012 on 2008-06-25 21:33:28Z by ru)
- For OSVERSION >= 800040, add -fstack-protector to LDFLAGS
