Commit graph

103 commits

Author SHA1 Message Date
Tobias C. Berner
b1a1d38bf9 Replace bsd.qt.mk by Uses/qt.mk and Uses/qt-dist.mk
From now on, ports that depend on Qt4 will have to set
	USES=		qt:4
	USE_QT=		foo bar
ports depending on Qt5 will use
	USES=		qt:5
	USE_QT=		foo bar

PR:		229225
Exp-run by:	antoine
Reviewed by:	mat
Approved by:	portmgr (antoine)
Differential Revision:	→https://reviews.freebsd.org/D15540
2018-06-28 17:39:53 +00:00
Steve Wills
49fc630438 graphics/opencv: bump PORTREVISION for r469681 2018-05-11 20:00:42 +00:00
Steve Wills
11d608cdfc graphics/opencv: add missing LIB_DEPENDS 2018-05-11 18:07:32 +00:00
Steve Wills
532105a93c graphics/opencv: Update to 3.4.1
PR:		210505
Submitted by:	rozhuk.im@gmail.com (partially, further work was done)
Exp-run by:	antoine
2018-05-09 01:10:11 +00:00
Jan Beich
c400a2c8b6 multimedia/ffmpeg: update to 4.0
- FFSERVER support was removed upstream
- libressl now uses libtls backend instead of patching openssl one
- Clang i386 no longer uses 16-byte aligned stack

Changes:	https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/n4.0:/Changelog
ABI:		https://abi-laboratory.pro/tracker/timeline/ffmpeg/
PR:		227726
Exp-run by:	antoine
Differential Revision:	https://reviews.freebsd.org/D15175
2018-05-02 15:07:27 +00:00
Antoine Brodin
2b48fc5ec2 opencv-java fails to build with python3 2018-02-15 10:03:41 +00:00
Tobias C. Berner
51d04637cb New USES=eigen
Usage:
    USES=eigen:<version>[,<type>]

    version: 2 or 3 (required)
    type:    build (default), run

  For example:
    USES=eigen:2,build,run
  will add a BUILD- and RUN_DEPENDS on math/eigen2, and
    USES=eigen:3
  will add a BUILD_DEPENDS on math/eigen3.

* Convert the existing ports to use it
  - biology/iqtree: remove run time dependency (seemed not to be needed)
  - graphics/movit: remove run time dependency (seemed not to be needed)
  - science/avogadro: add run time dependeny (installed cmake file requires it to be present)

Reviewed by:	rakuco, mat
Differential Revision:	https://reviews.freebsd.org/D13702
2018-01-02 16:49:24 +00:00
Mathieu Arnold
551be3c723 Convert Python ports to FLAVORS.
Ports using USE_PYTHON=distutils are now flavored.  They will
  automatically get flavors (py27, py34, py35, py36) depending on what
  versions they support.

  There is also a USE_PYTHON=flavors for ports that do not use distutils
  but need FLAVORS to be set.  A USE_PYTHON=noflavors can be set if
  using distutils but flavors are not wanted.

  A new USE_PYTHON=optsuffix that will add PYTHON_PKGNAMESUFFIX has been
  added to cope with Python ports that did not have the Python
  PKGNAMEPREFIX but are flavored.

  USES=python now also exports a PY_FLAVOR variable that contains the
  current python flavor.  It can be used in dependency lines when the
  port itself is not python flavored.  For example, deskutils/calibre.

  By default, all the flavors are generated.  To only generate flavors
  for the versions in PYTHON2_DEFAULT and PYTHON3_DEFAULT, define
  BUILD_DEFAULT_PYTHON_FLAVORS in your make.conf.

  In all the ports with Python dependencies, the *_DEPENDS entries MUST
  end with the flavor so that the framework knows which to build/use.
  This is done by appending '@${PY_FLAVOR}' after the origin (or
  @${FLAVOR} if in a Python module with Python flavors, as the content
  will be the same).  For example:

    RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}

PR:		223071
Reviewed by:	portmgr, python
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D12464
2017-11-30 15:50:30 +00:00
Mark Linimon
bc08ebb723 Temporarily uncomment the added armv7 line to allow an MFC that does not drag
in world+dog.

PR:		211805
Submitted by:	ler
Reported by:	ler
2017-10-27 16:45:00 +00:00
Larry Rosenman
e5318043f7 graphics/opencv, graphics/py-opencv: Add USES = fortran, bump portrevisions
PR:		211806
Submitted by:	eric@camachat.org
Reported by:	hassonofer@gmail.com
2017-10-26 04:54:37 +00:00
Jan Beich
84e727457f multimedia/ffmpeg: update to 3.4
Notable changes:
- i386/amd64 now depend on NASM per https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/4f9297ac3b39
- NETCDF is now MYSOFA but the dependency doesn't exist in ports yet
- SCHROEDINGER is gone per https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/220b24c7c9
- DRM, LIBRSVG2, LIBXML2 are new options
- ABI isn't completely compatible: some structs have changed

Minor cleanup:
- Don't pass --disable-{in,out}dev when it's already blocked by disabled dependency
- Drop redundant "Enable" from option descriptions
- Switch CDIO_DESC to use Mk/bsd.options.desc.mk

Changes:	https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/n3.4:/Changelog
ABI:		https://abi-laboratory.pro/tracker/timeline/ffmpeg/
PR:		223057
Exp-run by:	antoine
2017-10-21 06:50:49 +00:00
Mark Linimon
3ef3461740 For ports that are explicitly enabled on armv6, also enable them
on armv7.  This has not been tested with an -exp run but should
"do no harm".

PR:		221894 (partial)
2017-10-10 21:31:30 +00:00
Ganael LAPLANCHE
31c1655dde Update tbb to 2018 and bump dependent ports' revisions 2017-09-17 07:03:14 +00:00
Jan Beich
d764059958 graphics/opencv: back out r423216 and r423063 (replaying r423316)
Renaming didn't help to unblock 3.x progress as co-existence with 2.x
was no less complex than simply fixing consumers. This commit also
restores directory-level history accidentally lost via git-svn.

PR:		210505
Pointy hat to:	jbeich (should've discussed first)
2017-04-14 05:30:25 +00:00
Jan Beich
ba3ffd9b12 graphics/opencv: add suffix to make room for 3.x series
To avoid confusion, the main port is to track the latest release.
Whether to rename includes/libraries as well making it possible to
install 2.x and 3.x side-by-side remains to be investigated.

PR:		210505 (for tracking)
Inspired by:	PkgSrc
2016-10-03 17:47:08 +00:00
Jan Beich
2765ae7dd3 graphics/opencv: update to 2.4.13.1
Changes:	https://github.com/opencv/opencv/compare/2.4.9...2.4.13.1
ABI:		https://abi-laboratory.pro/tracker/timeline/opencv/
MFH:		2016Q4
2016-10-03 17:46:28 +00:00
Jan Beich
4035d20097 graphics/opencv: drop unused line after r260084
WANT_* variables are a relic of the dark times before bsd.port.options.mk.
2016-10-03 17:46:09 +00:00
Jan Beich
ee9c3ffc7d graphics/opencv: chase HTTP redirect
opencv.org points to Itseez repo which is confusing unless one clicks
on the link.

Pointyhat to:	jbeich (r423059)
2016-10-03 10:07:02 +00:00
Jan Beich
411f691479 graphics/py-opencv: drop python3 vestige after r422698
PYTHON_REL is defined in bsd.port.pre.mk, so this unlikely to ever have
worked unless defined via make.conf. Note, USES=python only supports
overriding PYTHON_VERSION apart from DEFAULT_VERSIONS=python*.

  $ make -V PYTHON_VERSION PYTHON_REL=3500
  python2.7

  $ PYTHON_REL=3500 make -V PYTHON_REL
  2712

  $ make -V PYTHON_REL PYTHON_VERSION=python3.5
  3502

PR:		204519 (for tracking)
2016-10-01 15:36:15 +00:00
Jan Beich
a98b7437f9 graphics/opencv: unbreak build on 9.x after r421231
In file included from /usr/local/include/eigen3/unsupported/Eigen/MatrixFunctions:58,
                 from modules/contrib/src/rgbdodometry.cpp:65:
/usr/local/include/eigen3/unsupported/Eigen/src/MatrixFunctions/MatrixExponential.h: In member function 'void Eigen::MatrixExponential<MatrixType>::computeUV(float)':
/usr/local/include/eigen3/unsupported/Eigen/src/MatrixFunctions/MatrixExponential.h:296: error: call of overloaded 'pow(int, int&)' is ambiguous
/usr/include/math.h:210: note: candidates are: double pow(double, double)
/usr/include/c++/4.2/cmath:357: note:                 float std::pow(float, float)
/usr/include/c++/4.2/cmath:361: note:                 long double std::pow(long double, long double)
/usr/include/c++/4.2/cmath:365: note:                 double std::pow(double, int)
/usr/include/c++/4.2/cmath:369: note:                 float std::pow(float, int)
/usr/include/c++/4.2/cmath:373: note:                 long double std::pow(long double, int)

Reported by:	pkg-fallout
2016-10-01 13:26:56 +00:00
Jan Beich
552cb2f2ea graphics/opencv: convert to option helpers (cpu) 2016-10-01 13:26:39 +00:00
Jan Beich
aefea3c684 graphics/opencv: convert to option helpers (nested) 2016-10-01 13:26:24 +00:00
Jan Beich
727af3cbb0 graphics/opencv: convert to options helpers (mechanic) 2016-10-01 13:26:08 +00:00
Jan Beich
e602128f7a graphics/opencv: switch to new home 2016-10-01 13:25:52 +00:00
Ruslan Makhmatkhanov
16a147efd1 graphics/py-opencv: limit python version to 2.x
Python module of OpenCV 2.4.9 is not compatible with Python 3.x
- both on cmake infrastructure level and on module itself level,
so just mark it as Python 2.x only and remove all the python3
shims - they are don't make any difference anyway.
We can patch that hardly to make it work, but it's better to just
update to latest version that have python3 support out of the box.

PR:		204519 (for tracking)
2016-09-23 22:45:02 +00:00
Jason E. Hale
4b895ef634 Return to pool. Unfortunately, I don't have time to maintain this port. 2016-09-19 22:53:55 +00:00
Jan Beich
7249102712 graphics/opencv: unbreak build with ffmpeg 3.0
modules/highgui/src/ffmpeg_codecs.hpp:104:7: error: use of undeclared identifier 'CODEC_ID_H264'; did you mean 'AV_CODEC_ID_H264'?
    { CODEC_ID_H264, MKTAG('H', '2', '6', '4') },
      ^~~~~~~~~~~~~
modules/highgui/src/ffmpeg_codecs.hpp:121:7: error: use of undeclared identifier 'CODEC_ID_MPEG4'; did you mean 'AV_CODEC_ID_MPEG4'?
    { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') },
      ^~~~~~~~~~~~~~
[...]

PR:		208895
Reported by:	antoine (via exp-run)
Submitted by:	Ben Woods <woodsb02@gmail.com>
Approved by:	maintainer timeout (jhale, 3 weeks)
Obtained from:	Debian
2016-05-07 17:22:02 +00:00
Mathieu Arnold
4e1b79a0a6 Remove ${PORTSDIR}/ from dependencies, categories d, e, f, and g.
With hat:	portmgr
Sponsored by:	Absolight
2016-04-01 14:00:51 +00:00
Ganael LAPLANCHE
dc896708f2 Update devel/tbb to 4.4.0 and bump dependent ports' revisions
PR:		202777
Submitted by:	oleksii.tsai@gmail.com
2015-09-02 18:22:35 +00:00
Raphael Kubo da Costa
23ee2a7d62 Uses/cmake.mk: Replace CMAKE_ENV with CONFIGURE_ENV.
Instead of defining a variable that is almost always based on CONFIGURE_ENV,
just use CONFIGURE_ENV directly.

This also matches the behavior of other ports that do not use autotools (so
most ports can just worry about CONFIGURE_ENV). Additionally, the fact that
we do not use ?= means we do not have problems if another file in Uses/
needs to set CONFIGURE_ENV (with CMAKE_ENV, the order of the arguments to
USES would matter).

Ports which set CMAKE_ENV have been adjusted accordingly. In most cases,
CMAKE_ENV was just replaced with CONFIGURE_ENV, the exceptions being:
* databases/sqliteman: CMAKE_ENV line removed; setting QMAKESPEC there has
                       no effect on the build system.
* devel/freeocl: CMAKE_ENV line removed; FREEOCL_CXX_COMPILER is already
                 retrieved from the CMAKE_CXX_COMPILER variable in the build
                 system.
* graphics/openimageio: CMAKE_ENV line removed; setting Qt variables there
                        has no effect on the build system.

Reviewed by:		makc
Differential Revision:	https://reviews.freebsd.org/D3403
2015-08-18 10:51:01 +00:00
Alberto Villa
a036ac25c5 graphics/opencv: fix configure when EIGEN is off
When EIGEN option is off, CMAKE_ARGS is reset, thus enabling build of
tests and docs (causing some leftovers), and, should it be installed,
linking against libdc1394 even when option DC1394 is off. PORTREVISION
bump is needed to address the latter case.

Meanwhile, re-enable make jobs.

Differential Revision:	https://reviews.freebsd.org/D2893
Reviewed by:	jhale (maintainer)
Approved by:	jhale (maintainer)
MFH:		2015Q2
2015-06-25 08:36:42 +00:00
Antoine Brodin
6e5719ca80 Convert to USES=jpeg 2015-06-22 18:33:20 +00:00
Jason E. Hale
ac1d131dba - Make SIMD option default across the board. The behavior should be the same
since the package builders don't set CPUTYPE.

Suggested by:	tijl
2015-06-14 23:52:36 +00:00
Jason E. Hale
6ca338fac7 - Add SIMD option to specifically disable CPU optimizations and prevent crashes
with ffmpeg on processors that do not support SSE instructions.  OFF by
  default for package building, ON with autodetect for ports to keep with
  POLA. [1][2]
- Bump PORTREVISION on all opencv ports

PR:		199715 [1], 200234 [2]
Submitted by:	Randy Westlund <rwestlun@gmail.com> [1], sasamotikomi@gmail.com [2]
2015-06-14 15:28:03 +00:00
Antoine Brodin
1b85bc9332 Switch PYTHON_REL from a 3 digits number to a 4 digits number to handle
python 2.7.10

Differential Revision:	https://reviews.freebsd.org/D2639
Reviewed by:	sunpoet, mva
2015-05-26 16:47:02 +00:00
Koop Mast
cc721b9b0e Add patch from debian to fix the installed pkg-config files.
This allows the gstreamer plugin to actualy link to the needed opencv libraries.

PR:		196021
Approved by:	maintainer timeout (4 months)
Obtained from:	debian
2015-04-16 08:01:48 +00:00
Baptiste Daroussin
bb21093773 Bump portrevision after png update 2014-12-25 20:54:41 +00:00
Antoine Brodin
7ae46e9b12 Change libpng15.so to libpng.so in LIB_DEPENDS to prepare the upgrade 2014-12-25 19:04:25 +00:00
Juergen Lock
ddb6d1d6f7 - Update libxine to 1.2.6 - changelog is here:
http://anonscm.debian.org/hg/xine-lib/xine-lib-1.2/file/9aef7a72d009/ChangeLog

- Remove an inline from include/xine/xineutils.h for the benefit
  of using libxine with base gcc 4.2 .

- Bump PORTREVISIONs for ports depending on libxine. (now also non-default
  rdeps as per the new rule)
2014-10-18 21:10:39 +00:00
Ganael LAPLANCHE
7373fd9b08 Update devel/tbb to 4.3.0 and bump dependent ports' revisions
PR:		193214
Submitted by:	Oleksii Tsai <oleksii.tsai@googlemail.com>
2014-09-16 07:05:28 +00:00
Jason E. Hale
68669fc03d - Update to 2.4.9
- Update LICENSE
- Convert USE_PYTHON -> USES
2014-09-02 00:36:27 +00:00
Jason E. Hale
db5c7e9c09 - Fix typo in QT4 OPENGL logic 2013-12-11 15:04:33 +00:00
Ganael LAPLANCHE
6e39a5dd87 - Update devel/tbb to 4.2.2
- Cleanup DISTNAME and WRKSRC definitions
- Use INSTALL_LIB instead of INSTALL_DATA + STRIP_CMD
- Bump dependent ports' revisions

PR:		ports/184526
Submitted by:	delphij
2013-12-11 07:53:16 +00:00
Jason E. Hale
049486f9e8 - Fix build with QT4 option (error: GL/glx.h: No such file or directory) [1]
- Specify major Qt version number to squash some CMake warnings about Qt5
- Use OPTIONS_RADIO for GUI support - build only allows use of one toolkit
- Make OpenGL support optional (off by default since it only works with
  GUI support)
- Allow OpenGL support with GTK2

Reported by:	Wolfgang Riegler <wolfgang.riegler@gmx.de> [1]
2013-12-10 23:56:44 +00:00
Jason E. Hale
44331a4941 - Move CFLAGS to python block. They are causing build errors by picking
up old headers if a previous version is installed and are not needed for
  the main build

Reported by:	Andrzej Tobola <ato@iem.pw.edu.pl>, Kevin Oberman <rkoberman@gmail.com>
2013-12-08 10:55:57 +00:00
Jason E. Hale
3a64305d43 - Update graphics/*opencv* to 2.4.7
- Revert options helpers to if statements since the OFF condition is not
  applied when OPTIONS_EXCLUDE is used
- Move most of the OpenCV modules from the graphics/opencv-core port to
  graphics/opencv, leaving opencv-core as just the bare minimum required
  for building ffmpeg with OpenCV support
- Install examples for python and java bindings
- Add new slave port graphics/opencv-java: Java bindings for OpenCV
- Bump PORTREVISION and make dependency adjustments and fixes for
  dependent ports
- Add UPDATING entry
2013-12-04 02:51:00 +00:00
Jason E. Hale
2d7bc5f000 - Allow build with clang without libc++ on 8.x and 9.x [1][2][3]
- Fix build on powerpc64 [4]

PR:		ports/183238 [1], ports/183954 [2], ports/182046 [4]
Submitted by:	Chess Griffin <chess@chessgriffin.com> [1],
		Guillaume Bibaut <yom@iaelu.net> [2],
		jhibbits [4]
Patched by:	tijl (via private mail) [3]
2013-11-25 15:19:00 +00:00
Rusmir Dusko
1752bb5a6e graphics/ilmbase
- Update to 2.0.1
- Change master sites to SAVANNAH
- Change maintainer email to @FreeBSD.org
- Remove conflict with non existent Port
- USES pathfix pkgconfig
- Add executable
- Add DOCS Option
- Support STAGEDIR and add OPTIONS_SUB
- Use pathfix instead of simple patches
- Adjust patches
- Change WWW

graphics/OpenEXR

- Update to 2.0.1
- Change master sites to SAVANNAH
- Change maintainer email to @FreeBSD.org
- Use the new format for LIB_DEPENDS
- USES gmake pathfix pkgconfig
- Add DOCS and EXAMPLES Options
- Support STAGEDIR and add OPTIONS_SUB
- Change REINPLACE_CMD
- Add extra patch for EXAMPLES
- Remove obsolete patches

- Bump dependent ports' revisions

Approved by:	pawel / wg (mentors)
2013-10-31 00:32:31 +00:00
Jason E. Hale
e496edf8b6 - Fix typos in EIGEN option
- Fix build with modern compilers in the contrib module [1]
- Fix build of opencv-core with clang in the ts module [2]
- Fix build with QT option [3]
- Fix build of py-opencv with clang [4]

Reported by:	avg [1], Robert Huff <roberthuff@rcn.com> [2]
PR:		ports/182443 [3], ports/182837 [4]
Submitted by:	O. Hartmann <ohartman@zedat.fu-berlin.de> [3], pawel [4]
2013-10-22 22:03:28 +00:00
Jason E. Hale
2c24ec70f8 - Fix ffmpeg dependency due to recent move
While here:
- Convert to options helpers
- Convert to new LIB_DEPENDS syntax
- Fix a few typos and portlint(1) warnings

Reported by:	avg
Patched by:	wg
2013-10-21 23:17:11 +00:00