1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-13 03:03:15 +00:00
Commit Graph

139 Commits

Author SHA1 Message Date
Jan Beich
3ac70fd534 multimedia/x264: update to 0.148.2728
Changes:	https://git.videolan.org/?p=x264.git;a=shortlog;h=4d5c8b01a48f72f9c40651e92c39294326a0863f
2016-12-25 07:28:01 +00:00
Jan Beich
0c612c4aa3 multimedia/ffmpeg: update to 3.2.2
Changes:	https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/n3.2.2:/Changelog
PR:		207547
Submitted by:	riggs, ebirth@b0ss.net (libressl fix)
Exp-run by:	antoine (3 tries)
2016-12-11 15:22:47 +00:00
Gerald Pfeifer
89f8b05214 Bump PORTREVISIONS for ports depending on the canonical version of GCC and
lang/gcc which have moved from GCC 4.8.5 to GCC 4.9.4 (at least under some
circumstances such as versions of FreeBSD or platforms).

In particular that is ports with USE_GCC=yes, USE_GCC=any, or one of
gcc-c++11-lib, openmp, nestedfct, c++11-lib as well as c++14-lang,
c++11-lang, c++0x, c11 requested via USES=compiler.
2016-11-20 09:38:08 +00:00
Jan Beich
1feedf04f0 multimedia/{lib,}x264: unbreak ASM on mips* after r422672
ASM=on is nop on many Tier2 and Tier3 architectures: arm + armeb, mips +
mipsel, ia64, sparc64. mips64 may be able to use MSA optimizations but the
ancient GCC in base doesn't support -msa flag and lang/gcc* are broken.

arm (aka armv4t) failed as:
  You specified a pre-ARMv6 or Thumb-1 CPU in your CFLAGS.
  If you really want to run on such a CPU, configure with --disable-asm.

mips (o32) failed as: [1]
  You specified a pre-MSA CPU in your CFLAGS.
  If you really want to run on such a CPU, configure with --disable-asm.

PR:		213443
Reported by:	pkg-fallout [1]
Obtained from:	PkgSrc
Approved by:	portmgr blanket
2016-10-28 23:39:12 +00:00
Jan Beich
8edb48f13d multimedia/libx264: unbreak ASM on armv6 after r422672
/nxb-bin/usr/bin/cc -I. -I. -c -DSTACK_ALIGNMENT=4 -DPIC -DHIGH_BIT_DEPTH=0 -DBIT_DEPTH=8 -o common/arm/quant-a.o common/arm/quant-a.S
<instantiation>:29:5: error: instruction requires: armv6t2
    rbit r1, r1
    ^
common/arm/quant-a.S:362:1: note: while in macro instantiation
decimate_score_1x 15
^
<instantiation>:29:5: error: instruction requires: armv6t2
    rbit r1, r1
    ^
/tmp/quant-a-8aad5d.s:515:1: note: while in macro instantiation
decimate_score_1x 16
^

PR:		213443
Reported by:	pkg-fallout, Bernd Walter, Mikael Urankar
Approved by:	portmgr blanket
2016-10-28 23:39:01 +00:00
Jan Beich
56782787db multimedia/x264: switch to _ENABLE option helper
Many opposite switches are not available, so with default options
selected this change incurs the following warnings.

  multimedia/libx264:
    Unknown option --enable-asm, ignored
    Unknown option --disable-debug, ignored
    Unknown option --enable-opencl, ignored

  multimedia/x264:
    Unknown option --enable-asm, ignored
    Unknown option --disable-debug, ignored
    Unknown option --enable-lsmash, ignored

Differential Revision:	https://reviews.freebsd.org/D7958
Requested by:	koobs (maintainer)
2016-09-23 13:14:54 +00:00
Jan Beich
4d4012b533 multimedia/x264: update to 0.148.2708
Changes:	https://git.videolan.org/?p=x264.git;a=shortlog;h=86b71982e131eaa70125f8d0e725fcade9c4c677
Differential Revision:	https://reviews.freebsd.org/D7958
Approved by:	koobs (maintainer)
2016-09-23 13:14:29 +00:00
Jan Beich
e7577aa20f multimedia/x264: add OPENCL option, enabled by default
Before OpenCL can be used for lookahead install at least one
implementation: devel/freeocl, devel/pocl, lang/beignet or lang/clover.

  $ x264 --fullhelp | fgrep opencl
	--opencl                Enable use of OpenCL
	--opencl-clbin <string> Specify path of compiled OpenCL kernel cache
	--opencl-device <integer> Specify OpenCL device ordinal

where the options also work in other apps e.g.,

  $ ffmpeg -i <input-file> -codec:v libx264 -x264opts opencl:opencl-device=1 <output-file>
  $ mpv --ovc libx264 --ovcopts-add x264opts=opencl:opencl-device=1 -o <output-file> <input-file>

Differential Revision:	https://reviews.freebsd.org/D7958
Approved by:	koobs (maintainer)
2016-09-23 13:14:10 +00:00
Jan Beich
c50fea9186 multimedia/x264: don't require SSE on i386 with ASM=on (default)
Remove "-march=i686 -mfpmath=sse -msse" and "-msse2" on later versions
when building C files. This doesn't affect hand-written assembly which
relies on CPUID but may pessimize compiler (around 2.3 % on Skylake).

Differential Revision:	https://reviews.freebsd.org/D7958
Approved by:	koobs (maintainer)
2016-09-23 13:12:07 +00:00
Jan Beich
3c0234cb16 multimedia/x264: add FFMS and LSMASH options
Switch to LSMASH by default to follow vendor configure behavior.

Approved by:	koobs (maintainer, via private mail)
Differential Revision:	https://reviews.freebsd.org/D5861
2016-04-13 09:53:47 +00:00
Jan Beich
8539486dea multimedia/x264: correct LAVF option description
LAVF only supports demuxing via libavformat.

Approved by:	koobs (maintainer, via private mail)
Differential Revision:	https://reviews.freebsd.org/D5863
2016-04-13 09:53:15 +00:00
Jan Beich
65019b8904 multimedia/{,lib}x264: modernize
- Convert to option helpers
- Convert to USES=localbase + respect CPPFLAGS
- Convert to USES=shebangfix (can be zsh->bash symlink)
- Simplify SLAVE_PORT conditionals into ?=, += and !target()
- Drop unnecessary `cd` before PGO sample
- Drop no longer necessary .include <bsd.port.options.mk>

Approved by:	koobs (maintainer, via private mail)
Differential Revision:	https://reviews.freebsd.org/D5862
2016-04-13 09:52:35 +00:00
Jan Beich
539aa1fa0d multimedia/x264: make options actually affect dependencies
Approved by:	koobs (maintainer, via private mail)
Differential Revision:	https://reviews.freebsd.org/D5860
2016-04-13 09:51:42 +00:00
Mathieu Arnold
8d6597e0bb Remove ${PORTSDIR}/ from dependencies, categories m, n, o, and p.
With hat:	portmgr
Sponsored by:	Absolight
2016-04-01 14:16:16 +00:00
Andrew Turner
9813418ad5 Fix x264 on AArch64. quant-a.S and deblock-a.S have syntax the LLVM
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
2016-01-04 15:04:55 +00:00
Gerald Pfeifer
242073ad09 Add GCC_DESC to Mk/bsd.options.desc.mk. Use this in a number of ports
instead of their own respective settings.
2015-11-16 00:30:00 +00:00
Kubilay Kocak
ed82601d9e multimedia/libx264: Move libx264 stdin.h patch to x264 port
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
2015-07-23 09:21:44 +00:00
Kubilay Kocak
5e51e3926b multimedia/{lib}x264: Fix distinfo's
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)
2015-07-03 12:14:08 +00:00
Kubilay Kocak
9b08af5e1a multimedia/{lib}x264: Update to 0.144.2533 and major refactor
- 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]
2015-07-03 07:02:44 +00:00
John Marino
798eb9e9cb multimedia category: Remove $PTHREAD_LIBS
approved by:	PTHREAD blanket
2015-03-25 17:36:47 +00:00
Kubilay Kocak
2d2f4b45f0 multimedia/{lib}x264: Update minimum yasm version
Update the minimum version of yasm required in BUILD_DEPENDS.

PR:		196991
Submitted by:	takefu airport.fm
2015-01-27 04:38:11 +00:00
Kubilay Kocak
23384aba46 multimedia/{lib}x264: Fix build on ARMv6
- Fix build for missing symbols on ARMv6 [1]
- Backport upstream 9463ec00 to fix default AS on ARM [2]
- Remove unecessary WRKSRC override (x264)
- Whitespace alignment

[2] http://git.videolan.org/?p=x264.git;a=patch;h=9463ec

PR:		196033 [1]
Submitted by:	Mikael Urandar <mikael.urankar at gmail com> [1]
Tested by:	sbruno
2014-12-31 06:20:13 +00:00
Kubilay Kocak
23c446e547 multimedia/x264: Use libx264's config headers
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>
2014-12-27 10:17:54 +00:00
Alexey Dokuchaev
e39acdf6a2 - Remove options' descriptions which are already in the standard pool
- Improve wording and make sure they all fit nicely in 80-char window

Approved by:	maintainer (koobs)
2014-11-27 12:06:05 +00:00
Johannes Jost Meixner
4f12f3b178 multimedia/x264: General overhaul
- 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)
2014-11-22 16:23:34 +00:00
Baptiste Daroussin
4f274163c7 Prevent x264 to link to ffmpeg if ffmpeg is already installed on the system which will lead to a circular dependencies which is revealed by pkg autodeps functionnality
Reported by:	kwm
2014-05-15 18:53:46 +00:00
Koop Mast
efa53a3a2d Support powerpc64.
Patch by:	andreast@
Submitted by:	nathan whitehorn
Approved by:	maintainer
2014-02-04 21:16:12 +00:00
Matthias Andree
152afa0d84 Strip debug symbols from bin/x264 unless WITH_DEBUG is set.
Approved by:	portmgr (implicit/blanket)
2014-01-28 23:04:38 +00:00
Kubilay Kocak
fca351ebff multimedia/x264: Turn HI10P option off by default.
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>
2014-01-27 01:53:33 +00:00
Kubilay Kocak
1c14e8f796 multimedia/x264: Add OPTION for High 10 Profile 10-bit encoding
- Add OPTION for High 10 Profile 10-bit encoding
- Bump PORTREVISION

PR:		ports/185381
Submitted by:	Kenta S <kentas@hush.com>
2014-01-26 00:58:05 +00:00
William Grzybowski
fd854dda72 multimedia/gpac-libgpac: update to 0.5
- Update to 0.5
- Export symbols required by x264
- Bump revision of dependent ports

PR:		ports/180906
Submitted by:	Vladimir Kondratiev <wulf mail.mipt.ru>
2013-10-31 21:33:48 +00:00
Kubilay Kocak
51bfa6a800 multimedia/x264: Update to 20130827 snapshot
- Update to 20130827 snapshot
- Add CONFIGURE_ARGS to disable OpenCL, fixes configure failure
- Chase library version bump in dependent ports

PR:		ports/182484
Submitted by:	mm
Reviewed by:	kwm, bapt
2013-10-07 09:21:13 +00:00
Kubilay Kocak
9dcf5bec4a multimedia/x264: Remove PGO as a default OPTION, Big cleanup.
- 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
2013-09-26 15:43:36 +00:00
Kubilay Kocak
4518526cea multimedia/x264: Take maintainership
- Take maintainership
2013-09-21 02:58:29 +00:00
Martin Matuska
e602585c8d Returning maintainership on my multimedia ports to ports@freebsd.org 2013-09-20 21:49:30 +00:00
Baptiste Daroussin
855fb638fb Add NO_STAGE all over the place in preparation for the staging support (cat: multimedia) 2013-09-20 20:57:48 +00:00
Gerald Pfeifer
41e60477bd Replace USE_GCC=4.6+ and USE_GCC=4.4+ by USE_GCC=yes.
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)
2013-08-17 16:27:24 +00:00
Alex Kozlov
d4041784dc - Remove MAKE_JOBS_SAFE variable
Approved by:	portmgr (bdrewery)
2013-08-14 22:35:50 +00:00
Mark Linimon
09cbb54789 Attempt to force this port to build only with gcc. It is known to be
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
2012-10-09 22:43:05 +00:00
Martin Matuska
750e2aa153 Use shared description of PGO option
PR:		ports/170454
2012-08-07 16:37:31 +00:00
Martin Matuska
6081dbeead Fix fetchability of example.y4m.bz2
PR:		ports/170103
Reported by:	Sayetsky Anton
2012-07-24 17:27:57 +00:00
Martin Matuska
1a43bc6e54 Update multimedia/x264 to 0.125.2201
Switch to new options framework
2012-07-23 19:27:25 +00:00
Dirk Meyer
2b74a89bc8 - update png to 1.5.10 2012-06-01 05:26:28 +00:00
Martin Matuska
67ba64053e Bump PORTREVISION due to gpac-libgpac fix 2012-05-19 07:31:11 +00:00
Martin Matuska
1c34903a44 Add missing patch 2012-04-25 19:09:59 +00:00
Martin Matuska
f74b3c4c83 Update x264 to 0.123.2189 2012-04-25 14:19:00 +00:00
Martin Matuska
ecd2e410b5 Add shells/bash to BUILD_DEPENDS and use bash to properly configure
as it uses constructs unsupported by /bin/sh.
2011-12-21 23:49:00 +00:00
Martin Matuska
26cbc33e1b Update x264 to 0.119.2113 2011-12-21 08:48:28 +00:00
Martin Matuska
5edf0c1313 Fix missing entry in distinfo for PGO option 2011-10-10 21:08:57 +00:00
Martin Matuska
3877ad0a33 Update x264 to 0.116.2076 2011-10-10 10:04:07 +00:00