Skip to content

Commit

Permalink
libva-2.22.0 (untested)
Browse files Browse the repository at this point in the history
  • Loading branch information
fd00 committed Jan 7, 2025
1 parent 89cb54a commit a837d77
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 134 deletions.
85 changes: 28 additions & 57 deletions libva/README
Original file line number Diff line number Diff line change
Expand Up @@ -10,61 +10,46 @@ limited to GPUs or Intel specific hardware, as other hardware and manufacturers
can also freely use this API for hardware accelerated video decoding.

Runtime requirements:
cygwin-3.3.6-1
libGL1-19.1.6-1
libX11_6-1.8.1-1
libXext6-1.3.4-1
libXfixes3-6.0.0-1
libdrm2-2.4.114-1bl1
libva-devel-2.16.0-1bl1
libva-drm2-2.16.0-1bl1
libva-glx2-2.16.0-1bl1
libva-x11_2-2.16.0-1bl1
libva2-2.16.0-1bl1
pkg-config-1.9.3-1
cygwin-3.5.4-1
libdrm2-2.4.124-1bl1
libva-devel-2.22.0-1bl1
libva-drm-devel-2.22.0-1bl1
libva-drm2-2.22.0-1bl1
libva2-2.22.0-1bl1
pkg-config-2.3.0-1

Build requirements:
(besides corresponding -devel packages)
autoconf-15-1
automake-11-1
binutils-2.39-1
cygport-0.35.4-1
gcc-core-11.3.0-1
gcc-g++-11.3.0-1
libGL-devel-19.1.6-1
libX11-devel-1.8.1-1
libXext-devel-1.3.4-1
libXfixes-devel-6.0.0-1
libdrm-devel-2.4.114-1bl1
libtool-2.4.7-1
make-4.3-1
binutils-2.43.1-1
cygport-0.36.9-1
gcc-core-12.4.0-3
gcc-g++-12.4.0-3
libdrm-devel-2.4.124-1bl1
meson-1.3.2-1
ninja-1.12.0-1

Canonical website:
https://github.com/intel/libva

Canonical download:
https://github.com/intel/libva/archive/refs/tags/2.16.0.tar.gz
https://github.com/intel/libva/archive/refs/tags/2.22.0.tar.gz

-------------------------------------------

Build instructions:
1. unpack libva-2.16.0-X-src.tar.xz
1. unpack libva-2.22.0-X-src.tar.xz
2. if you use setup to install this src package,
it will be unpacked under /usr/src automatically
% cd /usr/src
% cygport ./libva-2.16.0-X.cygport all
% cygport ./libva-2.22.0-X.cygport all

This will create:
/usr/src/libva-2.16.0-X-src.tar.xz
/usr/src/libva-2.16.0-X.tar.xz
/usr/src/libva2-2.16.0-X.tar.xz
/usr/src/libva-devel-2.16.0-X.tar.xz
/usr/src/libva-drm2-2.16.0-X.tar.xz
/usr/src/libva-drm-devel-2.16.0-X.tar.xz
/usr/src/libva-glx2-2.16.0-X.tar.xz
/usr/src/libva-glx-devel-2.16.0-X.tar.xz
/usr/src/libva-x11_2-2.16.0-X.tar.xz
/usr/src/libva-x11-devel-2.16.0-X.tar.xz
/usr/src/libva-2.22.0-X-src.tar.xz
/usr/src/libva-2.22.0-X.tar.xz
/usr/src/libva2-2.22.0-X.tar.xz
/usr/src/libva-devel-2.22.0-X.tar.xz
/usr/src/libva-drm2-2.22.0-X.tar.xz
/usr/src/libva-drm-devel-2.22.0-X.tar.xz

-------------------------------------------

Expand All @@ -76,6 +61,7 @@ Files included in the binary package:
/usr/share/doc/libva/COPYING
/usr/share/doc/libva/NEWS
/usr/share/doc/libva/README.md
/usr/share/doc/libva/security.md

(libva2)
/usr/bin/cygva-2.dll
Expand All @@ -91,6 +77,7 @@ Files included in the binary package:
/usr/include/va/va_dec_jpeg.h
/usr/include/va/va_dec_vp8.h
/usr/include/va/va_dec_vp9.h
/usr/include/va/va_dec_vvc.h
/usr/include/va/va_drmcommon.h
/usr/include/va/va_egl.h
/usr/include/va/va_enc_av1.h
Expand All @@ -108,7 +95,6 @@ Files included in the binary package:
/usr/include/va/va_tpi.h
/usr/include/va/va_version.h
/usr/include/va/va_vpp.h
/usr/include/va/va_x11.h
/usr/lib/libva.dll.a
/usr/lib/pkgconfig/libva.pc

Expand All @@ -120,28 +106,13 @@ Files included in the binary package:
/usr/lib/libva-drm.dll.a
/usr/lib/pkgconfig/libva-drm.pc

(libva-glx2)
/usr/bin/cygva-glx-2.dll

(libva-glx-devel)
/usr/include/va/va_backend_glx.h
/usr/include/va/va_glx.h
/usr/lib/libva-glx.dll.a
/usr/lib/pkgconfig/libva-glx.pc

(libva-x11_2)
/usr/bin/cygva-x11-2.dll

(libva-x11-devel)
/usr/include/va/va_dri2.h
/usr/include/va/va_dricommon.h
/usr/lib/libva-x11.dll.a
/usr/lib/pkgconfig/libva-x11.pc

------------------

Port Notes:

----- version 2.22.0-1bl1 -----
Version bump.

----- version 2.16.0-1bl1 -----
Version bump.

Expand Down
50 changes: 0 additions & 50 deletions libva/libva-2.16.0-1bl1.src.patch

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ LICENSE="MIT"
LICENSE_SPDX="SPDX-License-Identifier: MIT"
LICENSE_URI="COPYING"

BUILD_REQUIRES="libGL-devel libX11-devel libXext-devel libXfixes-devel libdrm-devel"
BUILD_REQUIRES="libdrm-devel"

inherit meson

DOCS="
*.md
Expand All @@ -29,10 +31,6 @@ PKG_NAMES="
${PN}-devel
${PN}-drm2
${PN}-drm-devel
${PN}-glx2
${PN}-glx-devel
${PN}-x11_2
${PN}-x11-devel
"
libva_CONTENTS="
usr/share
Expand All @@ -49,6 +47,7 @@ libva_devel_CONTENTS="
usr/include/va/va_dec_av1.h
usr/include/va/va_dec_hevc.h
usr/include/va/va_dec_jpeg.h
usr/include/va/va_dec_vvc.h
usr/include/va/va_dec_vp8.h
usr/include/va/va_dec_vp9.h
usr/include/va/va_drmcommon.h
Expand All @@ -68,7 +67,6 @@ libva_devel_CONTENTS="
usr/include/va/va_tpi.h
usr/include/va/va_version.h
usr/include/va/va_vpp.h
usr/include/va/va_x11.h
usr/lib/libva.dll.a
usr/lib/pkgconfig/libva.pc
"
Expand All @@ -80,29 +78,8 @@ libva_drm_devel_CONTENTS="
usr/lib/libva-drm.dll.a
usr/lib/pkgconfig/libva-drm.pc
"
libva_glx2_CONTENTS="
usr/bin/cygva-glx-2.dll
"
libva_glx_devel_CONTENTS="
usr/include/va/va_glx.h
usr/include/va/va_backend_glx.h
usr/lib/libva-glx.dll.a
usr/lib/pkgconfig/libva-glx.pc
"
libva_x11_2_CONTENTS="
usr/bin/cygva-x11-2.dll
"
libva_x11_devel_CONTENTS="
usr/include/va/va_dri*.h
usr/lib/libva-x11.dll.a
usr/lib/pkgconfig/libva-x11.pc
"
libva_SUMMARY="${SUMMARY} (licensing & readmes)"
libva2_SUMMARY="${SUMMARY} (runtime)"
libva_devel_SUMMARY="${SUMMARY} (development)"
libva_drm2_SUMMARY="${SUMMARY} (runtime / drm)"
libva_drm_devel_SUMMARY="${SUMMARY} (developemnt / drm)"
libva_glx2_SUMMARY="${SUMMARY} (runtime / glx)"
libva_glx_devel_SUMMARY="${SUMMARY} (developemnt / glx)"
libva_x11_2_SUMMARY="${SUMMARY} (runtime / x11)"
libva_x11_devel_SUMMARY="${SUMMARY} (developemnt / x11)"
24 changes: 24 additions & 0 deletions libva/libva-2.22.0-1bl1.src.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
--- origsrc/libva-2.22.0/va/va.c 2024-06-20 15:49:27.000000000 +0900
+++ src/libva-2.22.0/va/va.c 2025-01-07 15:19:21.543744200 +0900
@@ -44,7 +44,11 @@
#else
#include <dlfcn.h>
#include <unistd.h>
+#if defined(_CYGWIN__)
+#define DRIVER_EXTENSION "_drv_video.dll"
+#else
#define DRIVER_EXTENSION "_drv_video.so"
+#endif
#define DRIVER_PATH_STRING "%s/%s%s"
#define ENV_VAR_SEPARATOR ":"
#endif
--- origsrc/libva-2.22.0/va/va_compat.c 2024-06-20 15:49:27.000000000 +0900
+++ src/libva-2.22.0/va/va_compat.c 2025-01-07 15:20:17.838347700 +0900
@@ -40,6 +40,6 @@ vaCreateSurfaces_0_32_0(
return vaCreateSurfaces(dpy, format, width, height, surfaces, num_surfaces,
NULL, 0);
}
-#if !defined(_WIN32)
+#if !defined(_WIN32) && !defined(__CYGWIN__)
VA_CPP_HELPER_ALIAS(vaCreateSurfaces, 0, 32, 0);
#endif

0 comments on commit a837d77

Please sign in to comment.