From d0b50b88354eb636994f34be266d92d05e5ade76 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Thu, 25 Jul 2019 23:20:17 +0000 Subject: [PATCH] vaapiVdpau: fixup for libva-2.5.0 --- .../libraries/vaapi-vdpau/default.nix | 31 ++++++++++--------- .../libraries/vaapi-vdpau/glext85.patch | 20 ------------ 2 files changed, 17 insertions(+), 34 deletions(-) delete mode 100644 pkgs/development/libraries/vaapi-vdpau/glext85.patch diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix index 07ca9d2e62e1..f31f7e430e08 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -1,10 +1,5 @@ -{ stdenv, fetchurl, libvdpau, libGLU_combined, libva, pkgconfig }: -let - libvdpau08patch = (fetchurl { url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch?revision=1.1"; - name = "libva-vdpau-driver-0.7.4-libvdpau-0.8.patch"; - sha256 = "1n2cys59wyv8ylx9i5m3s6856mgx24hzcp45w1ahdfbzdv9wrfbl"; - }); -in +{ stdenv, fetchurl, fetchpatch, libvdpau, libGLU_combined, libva, pkgconfig }: + stdenv.mkDerivation rec { name = "libva-vdpau-driver-0.7.4"; @@ -13,23 +8,31 @@ stdenv.mkDerivation rec { sha256 = "1fcvgshzyc50yb8qqm6v6wn23ghimay23ci0p8sm8gxcy211jp0m"; }; - patches = [ ./glext85.patch - (fetchurl { url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch?revision=1.1"; - name = "libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch"; - sha256 = "166svcav6axkrlb3i4rbf6dkwjnqdf69xw339az1f5yabj72pqqs"; - }) ]; + patches = [ + (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/libva-vdpau-driver-0.7.4-glext-85.patch"; + sha256 = "0f0v7cl7kna3jcfnxw48b9mfl0hpacw72df9vym96sa2206vqlb0"; }) + (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/libva-vdpau-driver-0.7.4-drop-h264-api.patch"; + sha256 = "0q5w83jbf4qqmhwf54h906pzxgvhqv7g2vrkw7jzgnrxhhj9sj60"; }) + (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/libva-vdpau-driver-0.7.4-fix_type.patch"; + sha256 = "0s5dk6aa4sm0iyicnf2fwfsrqbvr58nbp77mhjg5bvwlar7znqv7"; }) + (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/sigfpe-crash.patch"; + sha256 = "15snqf60ib0xb3cnav5b2r55qv8lv2fa4p6jwxajh8wbvqpw0ibz"; }) + (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/implement-vaquerysurfaceattributes.patch"; + sha256 = "1dapx3bqqblw6l2iqqw1yff6qifam8q4m2rq343kwb3dqhy2ymy5"; }) + (fetchpatch { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch"; + sha256 = "1m4is6lk580mppsx2mvdv1xifj6gvx724si4qynsm9qrdfdc9fby"; }) + ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libvdpau libGLU_combined libva ]; preConfigure = '' - patch -p0 < ${libvdpau08patch} # use -p0 instead of -p1 sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure ''; meta = { - homepage = https://cgit.freedesktop.org/vaapi/vdpau-driver/; + homepage = "https://cgit.freedesktop.org/vaapi/vdpau-driver"; license = stdenv.lib.licenses.gpl2Plus; description = "VDPAU driver for the VAAPI library"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/vaapi-vdpau/glext85.patch b/pkgs/development/libraries/vaapi-vdpau/glext85.patch deleted file mode 100644 index 073b8cf11904..000000000000 --- a/pkgs/development/libraries/vaapi-vdpau/glext85.patch +++ /dev/null @@ -1,20 +0,0 @@ -http://www.mail-archive.com/libva@lists.freedesktop.org/msg01457.html - -diff --git a/src/utils_glx.h b/src/utils_glx.h -index 19d03e4..f270fba 100644 ---- a/src/utils_glx.h -+++ b/src/utils_glx.h -@@ -42,6 +42,13 @@ typedef void (*PFNGLVDPAUMAPSURFACESNVPROC)(GLsizei numSurfaces, const GLvdpauSu - typedef void (*PFNGLVDPAUUNMAPSURFACESNVPROC)(GLsizei numSurface, const GLvdpauSurfaceNV *surfaces); - #endif - -+#if GL_GLEXT_VERSION >= 85 -+/* XXX: PFNGLMULTITEXCOORD2FPROC got out of the GL_VERSION_1_3_DEPRECATED -+ block and is not defined if GL_VERSION_1_3 is defined in -+ Redefine the type here as an interim solution */ -+typedef void (*PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t); -+#endif -+ - /* GLX_EXT_texture_from_pixmap */ - #if GLX_GLXEXT_VERSION < 18 - typedef void (*PFNGLXBINDTEXIMAGEEXTPROC)(Display *, GLXDrawable, int, const int *);