Commit graph

97 commits

Author SHA1 Message Date
Rene Ladan
90ba594028 multimedia/libva: clean up code specific to FreeBSD 11.3
Phabricator:	D26646
Submitted by:	jbeich (partial)
2020-10-17 14:47:07 +00:00
Jan Beich
b52812065e multimedia/libva: unbreak fetch
fetch: https://github.com/intel/libva/commit/f601fc614d8d.patch: size mismatch: expected 3148, actual 3150

--- 12525d4cd7c3.patch.old
+++ 12525d4cd7c3.patch
@@ -10,7 +10,7 @@ ld: error: unable to find library -ldl
  2 files changed, 10 insertions(+), 5 deletions(-)

 diff --git a/configure.ac b/configure.ac
-index acb4c79..a62f4fd 100644
+index acb4c799..a62f4fda 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -209,6 +209,11 @@ if test "$ac_cv_have_gnuc_visibility_attribute" = "yes"; then
@@ -26,7 +26,7 @@ index acb4c79..a62f4fd 100644
  ssp_cc=yes
  if test "X$CC-cc" != "X"; then
 diff --git a/va/Makefile.am b/va/Makefile.am
-index 6742177..6155895 100644
+index 67421775..6155895a 100644
 --- a/va/Makefile.am
 +++ b/va/Makefile.am
 @@ -92,7 +92,7 @@ libva_la_SOURCES		= $(libva_source_c)
--- 36f53f358a9c.patch.old
+++ 36f53f358a9c.patch
@@ -12,7 +12,7 @@ Subject: [PATCH] va/va: don't try to use RTLD_NODELETE
  1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/va/va.c b/va/va.c
-index 6230d7f..0c278f6 100644
+index 6230d7f9..0c278f67 100644
 --- a/va/va.c
 +++ b/va/va.c
 @@ -451,7 +451,7 @@ static VAStatus va_openDriver(VADisplay dpy, char *driver_name)
--- 810d1974a54c.patch.old
+++ 810d1974a54c.patch
@@ -12,7 +12,7 @@ On DragonFly and FreeBSD config are installed to /usr/
  4 files changed, 7 insertions(+), 4 deletions(-)

 diff --git a/meson.build b/meson.build
-index aabae7b..41d338e 100644
+index aabae7b8..41d338ea 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -63,6 +63,8 @@ libva_lt_version = '@0@.@1@.@2@'.format(libva_lt_current,
@@ -37,7 +37,7 @@ index aabae7b..41d338e 100644
    WITH_WAYLAND = wayland_dep.found()
  endif
 diff --git a/va/Makefile.am b/va/Makefile.am
-index c0b0cfd..6742177 100644
+index c0b0cfd3..67421775 100644
 --- a/va/Makefile.am
 +++ b/va/Makefile.am
 @@ -24,6 +24,7 @@ SUBDIRS =
@@ -49,7 +49,7 @@ index c0b0cfd..6742177 100644

  LDADD = \
 diff --git a/va/meson.build b/va/meson.build
-index 8c9d036..228489a 100644
+index 8c9d0362..228489a7 100644
 --- a/va/meson.build
 +++ b/va/meson.build
 @@ -62,7 +62,7 @@ libva = shared_library(
@@ -62,7 +62,7 @@ index 8c9d036..228489a 100644
    link_args : '-Wl,-version-script,' + libva_sym_path,
    link_depends : libva_sym,
 diff --git a/va/va.c b/va/va.c
-index 7f014a1..6230d7f 100644
+index 7f014a15..6230d7f9 100644
 --- a/va/va.c
 +++ b/va/va.c
 @@ -71,7 +71,7 @@ int va_parseConfig(char *env, char *env_value)
--- 853c679c628a.patch.old
+++ 853c679c628a.patch
@@ -14,7 +14,7 @@ sed: 1: "1i#include "sysdeps.h"
  1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/va/wayland/Makefile.am b/va/wayland/Makefile.am
-index 705efa3..f48afb4 100644
+index 705efa3d..f48afb4d 100644
 --- a/va/wayland/Makefile.am
 +++ b/va/wayland/Makefile.am
 @@ -70,7 +70,7 @@ va_wayland_drm.c: $(protocol_source_h)
--- f601fc614d8d.patch.old
+++ f601fc614d8d.patch
@@ -20,7 +20,7 @@ Subject: [PATCH] va/va_trace: implement gettid() for B
  1 file changed, 34 insertions(+), 5 deletions(-)

 diff --git a/va/va_trace.c b/va/va_trace.c
-index d34fc40..8cdd27b 100755
+index d34fc405..8cdd27ba 100755
 --- a/va/va_trace.c
 +++ b/va/va_trace.c
 @@ -48,12 +48,41 @@
2020-09-25 12:49:04 +00:00
Jan Beich
9baf586313 multimedia/libva: update to 2.9.0
Changes:	https://github.com/intel/libva/compare/2.8.0...2.9.0
ABI:		https://abi-laboratory.pro/tracker/timeline/libva/
Reported by:	Repology
2020-09-12 23:06:58 +00:00
Jan Beich
a8d6fa7f73 multimedia/libva: update to 2.8.0
Changes:	https://github.com/intel/libva/compare/2.7.1...2.8.0
ABI:		https://abi-laboratory.pro/tracker/timeline/libva/
Reported by:	GitHub (watch releases)
2020-06-26 16:01:17 +00:00
Jan Beich
432b3cfab0 multimedia/libva: update to 2.7.1
Changes:	https://github.com/intel/libva/compare/2.7.0...2.7.1
ABI:		https://abi-laboratory.pro/tracker/timeline/libva/
Reported by:	GitHub (watch releases)
2020-04-20 08:39:00 +00:00
Jan Beich
c1d95949dd multimedia/libva: backport iHD fix for X11
$ pkg install libva-utils libva-intel-media-driver
$ vainfo
libva info: VA-API version 1.7.0
libva info: Trying to open /usr/local/lib/dri/i965_drv_video.so
libva info: va_openDriver() returns -1
vaInitialize failed with error code -1 (unknown libva error),exit

MFH:		  2020Q2
2020-04-17 15:06:47 +00:00
Jan Beich
04baa08be8 multimedia/libva: update to 2.7.0
Changes:	https://github.com/intel/libva/compare/2.6.1...2.7.0
ABI:		https://abi-laboratory.pro/tracker/timeline/libva/
Reported by:	Repology
2020-04-02 22:19:00 +00:00
Jan Beich
02a3509070 multimedia/libva: drop FreeBSD 12.0 support after r527628 2020-03-27 23:34:14 +00:00
Jan Beich
8b437afd93 multimedia/libva: backport some upstream fixes
- https://github.com/intel/libva/commit/04acc7860feb will be required
  by libva-intel-media-driver-20.2.0, see https://github.com/intel/media-driver/commit/2baead9b10cd
- https://github.com/intel/libva/commit/48f446b32a4f is a fix for
  regression in libva-2.6.0
2020-02-29 22:52:59 +00:00
Jan Beich
0c9d4f1808 multimedia/libva: update to 2.6.1
Changes:	https://github.com/intel/libva/releases/tag/2.6.1
ABI:		https://abi-laboratory.pro/tracker/timeline/libva/
Reported by:	GitHub (watch releases)
2020-01-17 15:33:02 +00:00
Jan Beich
ef1435f2d0 multimedia/libva: switch to upstream patches 2020-01-15 19:41:54 +00:00
Jan Beich
fcf88c9c4d multimedia/libva: respect PREFIX for libva.conf
libva.conf is mainly used for debugging, so no need to rebuild.
2020-01-01 12:22:23 +00:00
Jan Beich
a38d205c03 multimedia/libva: update to 2.6.0
Changes:	https://github.com/intel/libva/releases/tag/2.6.0
ABI:		https://abi-laboratory.pro/tracker/timeline/libva/
Reported by:	GitHub (watch releases)
2019-12-25 14:59:50 +00:00
Rene Ladan
ee06ec39ce Clean up support for FreeBSD 11.2.
While here, modernize some comments in Mk/bsd.*.mk.

Note that graphics/drm-fbsd11.2-kmod is not renamed yet, this was somewhat
under discussion.

Submitted by:	rene
Reviewed by:	antoine, jbeich, mat, zeising
Differential Revision:	https://reviews.freebsd.org/D21974
2019-11-07 16:30:12 +00:00
Niclas Zeising
7ad72d866d Add USES=xorg USES=gl, ports categories l and m
Add USES=xorg and USES=gl to ports in categories starting with 'l' and 'm'.
While here, try to sprinkle other USES (mostly gnome and sdl) as needed.
2019-11-06 18:09:44 +00:00
Jan Beich
8fd0fb2b98 Add more gettid() aliases to my ports
https://man.openbsd.org/getthrid.2
https://illumos.org/man/3C/thr_self
2019-07-10 01:16:24 +00:00
Jan Beich
46e7fd2685 multimedia/libva: drop -lpthread on FreeBSD 11.4/12.1/13.0
libva doesn't use threads unless LIBVA_TRACE is passed via environment.

PR:		238650
2019-07-10 01:16:13 +00:00
Jan Beich
e86c810acd multimedia/libva: update to 2.5.0
Changes:	https://github.com/intel/libva/releases/tag/2.5.0
ABI:		https://abi-laboratory.pro/tracker/timeline/libva/
Reported by:	GitHub (watch releases), portscout
2019-07-05 14:45:08 +00:00
Jan Beich
234ec47174 Switch DragonFly to pthread_getthreadid_np in my ports
https://github.com/DragonFlyBSD/DragonFlyBSD/commit/c0f25c26521a
2019-06-17 08:36:27 +00:00
Jan Beich
a2c8ba796e multimedia/libva: replace post-patch with upstream fix 2019-06-01 00:59:09 +00:00
Jan Beich
8f4287ac35 multimedia/libva: reroll
--- libva-2.4.1.orig/meson.build	2019-04-07 17:44:47 UTC
+++ libva-2.4.1/meson.build	2019-04-17 10:07:39 UTC
@@ -20,7 +20,7 @@ project(
 # - reset minor version to zero when major version is incremented
 va_api_major_version = 1
 va_api_minor_version = 4
-va_api_micro_version = 0
+va_api_micro_version = 1

 va_api_version = '@0@.@1@.@2@'.format(va_api_major_version,
 				      va_api_minor_version,

Reported by:	Ravenports
2019-05-13 15:20:51 +00:00
Jan Beich
3f9711da55 multimedia/libva: unbreak on GCC architectures after r498397
../va/va_trace.c: In function 'va_TraceVAEncMiscParameterBuffer':
../va/va_trace.c:3309: error: 'for' loop initial declaration used outside C99 mode

PR:		237171
Reported by:	pkg-fallout
2019-04-10 11:52:06 +00:00
Jan Beich
c2caa41e89 multimedia/libva: update to 2.4.1
Changes:	https://github.com/intel/libva/releases/tag/2.4.1
Changes:	https://github.com/intel/libva/compare/2.4.0...2.4.1
MFH:		2019Q2
2019-04-08 17:36:12 +00:00
Jan Beich
d419c25145 multimedia/libva: update upstream patches (nop)
Prefer drmGetNodeTypeFromFd over drmGetDeviceNameFromFd2 but on
FreeBSD there's little difference as both compare strings.
2019-04-03 13:00:23 +00:00
Jan Beich
188bd12e78 multimedia/libva: don't skip r497485 fix 2019-04-02 08:11:43 +00:00
Jan Beich
a6c3990e0d multimedia/libva: unbreak DRM backend in some cases
$ vainfo
error: XDG_RUNTIME_DIR not set in the environment.
error: can't connect to X server!
vaInitialize failed with error code 1 (operation failed),exit

$ ls -lL /dev/dri
total 0
crw-rw----  1 root  video  0x188 Mar 30 17:28 card0
crw-rw----  1 root  video  0x208 Mar 30 17:28 renderD128

$ echo $((0x208 & 0x80))
0

Reported by:	김종성 (via private mail)
2019-04-01 15:19:00 +00:00
Jan Beich
14a6544d4e multimedia/libva: move GLX into slave
libva-glx isn't widely used and makes it hard to unify mesa-* ports
into one due to circular dependency.

See also: https://github.com/mpv-player/mpv/commit/a18dc01655b8
Obtained from:	Greg V (based on)
2019-03-15 15:27:31 +00:00
Jan Beich
fae8e5bf08 multimedia/libva: update to 2.4.0
Changes:	https://github.com/intel/libva/releases/tag/2.4.0
2019-01-26 00:43:01 +00:00
Jan Beich
023437cf09 multimedia/libva: sort USEs 2019-01-18 00:24:41 +00:00
Jan Beich
80bf417f55 multimedia/libva: drop DEBUG option
Neither NDEBUG nor _DEBUG are used by libva itself. NDEBUG guards
assert() but libva doesn't use those despite including <assert.h>.
2019-01-18 00:17:00 +00:00
Jan Beich
8f57676c02 multimedia/libva: USE_GITHUB doesn't support bzip2 2019-01-18 00:01:55 +00:00
Jan Beich
c2828a7218 multimedia/libva{,-intel-driver}: convert to USES=meson
Meson is faster than autoreconf + libtool and easier to maintain.
Force rebuild to catch regressions early.
2019-01-17 23:56:33 +00:00
Jan Beich
a653947346 multimedia/libva{,-intel-driver}: better group variables
Consistent style across my ports helps to process issues faster.
2019-01-17 23:56:20 +00:00
Jan Beich
09384ce004 multimedia/libva{,-intel-driver}: clean up
- Add BUILD_DEPENDS to intel driver for wl_drm_interface fix
- Rewrite gettid() to make it easier to maintain
- Update description from upstream
- Drop unused v4l_compat dependency
- Drop unused USES=alias as <alloca.h> is gone
- Drop libGL dependency as intel driver uses libEGL via dlopen on Wayland
- Drop --program-prefix after vainfo moved to libva-utils
- Drop fmake workaround as USES=gmake is used
- Drop -ldl workaround for FreeBSD < 11.2
- Drop RTLD_NODELETE workaround for FreeBSD < 8.0
- Drop GLX_GLXEXT_VERSION workaround for Mesa < 7.8.1
- Drop Created by as the port diverged a lot (even more with Meson)
- Hint intel driver isn't actively developed (but still maintained)
- Clarify libdrm dependency
2019-01-17 23:54:42 +00:00
Guido Falsi
b062a5caad - Unbreak Wayland support in libva-intel-driver with Mesa 18.3 [1]
- Allow disabling X11 support in libva [2]
- Update minimum version requirement in libva-intel-media-driver
  BUILD_DEPENDS (required by submitter/maintainer) [1]
- While here, silence some portling warnings
- Pass maintainership to jbeich (submitter) [1]

PR:		234891 [1], 234925 [2]
Submitted by:	jbeich
2019-01-16 18:04:05 +00:00
Jan Beich
46b56c6d84 multimedia/libva-intel-media-driver: update to 18.4.p4.75 (prerelease snapshot)
Changes:	https://github.com/intel/media-driver/compare/intel-media-18.3.0...567da1b8
2018-12-26 18:07:34 +00:00
Jan Beich
9be294e152 multimedia/libva: drop dependency on GNU sed
Approved by:	madpilot (maintainer)
Differential Revision:	https://reviews.freebsd.org/D18510
2018-12-12 00:18:41 +00:00
Jan Beich
f14586159d graphics/mesa-libs: enable WAYLAND by default here and in consumers
PR:		227509
Requested by:	Johannes Lundberg, Greg V
Reviewed by:	tobik (earlier version)
Approved by:	madpilot, x11 (zeising), maintainer timeout (2 weeks)
Exp-run by:	antoine
2018-11-11 23:54:06 +00:00
Guido Falsi
400043b826 - Update libva to 2.3.0
- Update libva-utils to 2.3.0
- Update WWW and GH_ACCOUNT to new upstream account
2018-10-03 07:07:02 +00:00
Thomas Zander
84b6aee905 Bump PORTREVISION to chase update of multimedia/v4l_compat and libv4l 2018-09-29 08:04:27 +00:00
Niclas Zeising
0fae2e9e0e Change x11/xorgproto to become a build dep
Change x11/xorgproto to become a build time dependency when added to
USE_XORG.  Change the dependency to be on the port, rather than a file the
port installs.
Fix fallout.
Bump portrevision on depending ports.

PR:		230909
Reviewed by:	eadler
Approved by:	portmgr (antoine)
Obtained from:	https://github.com/FreeBSDDesktop/freebsd-ports/tree/feature/xorgproto
exp-run:	antoine
Differential Revision:	https://reviews.freebsd.org/D16906
2018-09-11 18:34:27 +00:00
Niclas Zeising
15dac70c75 Switch to xorgproto instead of individual packages
Upstream used to distribute protocol headers as separate packages, but has
decided to merge those to a common package, named xorgproto.  This update
tracks that change.

* Add a new port, x11/xorgproto, with are protocol headers for xorg.
* Hook the new protocol port to the build and to infrastructure in
  bsd.xorg.mk.
* Update all ports with a dependency on any of the old *proto packages to
  instead depend on xorgproto.  Bump portrevision.
* Delete the old *proto packages, update MOVED.

PR:		230023
Submitted by:	zeising
Approved by:	portmgr (antoine)
exp-run by:	antoine
2018-07-31 18:41:30 +00:00
Guido Falsi
62a774daf1 - Update libva to 2.2.0
- Update libva-intel-driver 2.2.0
- Add Missing dependency

- Update libva-utils to 2.2.0
- Add missing dependencies
- Add WAYLAND option
- Cleanup some testing comments which slipped in by mistake
2018-07-14 06:37:14 +00:00
Guido Falsi
76c677c186 Update libva, libva-intel-driver and libva-utils to 2.1.0 2018-02-12 22:37:33 +00:00
Guido Falsi
7a8364fb88 Make libva and it's drivers install modules in the standard location
PREFIX/lib/dri.

This is the same location where other ports(mesa) install drivers,
so that everything works out of the box.

PR:		224424
Submitted by:	Greg V <greg@unrelenting.technology>
2017-12-18 21:25:57 +00:00
Guido Falsi
29ded653f1 - Fix build when compiling wayland support [1]
- Add an explicit WAYLAND option to allow users enabling or disabling
  it, to avoid silent dependencies. Off by default

Reported by:	"Alex V. Petrov" <alexvpetrov@gmail.com> [1]
2017-12-13 11:44:16 +00:00
Guido Falsi
c26152ae1a - Update libva to 2.0.0
- Update libva-intel-driver to 2.0.0
- Update libva-utils to 2.0.0
- Bump dependent ports due to shlib bump
- Import upstream patch to fix multimedia/mpv [1]
- Import upstream patch to fix multimedia/gstreamer1-vaapi [2]

Approved by:	cpm [1], multimedia (timeout) [2]
Obtained from:	2ecf240b1c [1]
		https://cgit.freedesktop.org/gstreamer/gstreamer-vaapi/commit/gst-libs/gst/vaapi/gstvaapiutils.c?id=777bba473e3ed1c7b8b7f7f0322892851c70dfd9 [2]
Differential Revision:	https://reviews.freebsd.org/D12761
2017-12-12 21:29:57 +00:00
Guido Falsi
1502725f9d Update libva, libva-utils and libva-intel-driver to 1.8.3 2017-06-29 17:55:22 +00:00
Guido Falsi
c139c9d6e7 Update libva, libva-utils and liva-intel-driver to 1.8.2 2017-05-24 09:41:39 +00:00
Matthew Rezny
b760897dde Revision bump of all ports with USE_GL after consolidation of mesa-libs
Approved by:	swills (mentor)
Differential Revision:	https://reviews.freebsd.org/D10845
2017-05-23 05:03:14 +00:00