ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

gst-plugins-good: Fix build against current kernel headers

Browse Source 
http://hydra.nixos.org/build/15638774
This commit is contained in:
Eelco Dolstra 2014-10-09 12:25:27 +02:00
parent a2c7804903
commit c0bfdf16a3
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "1ijswgcrdp243mfsyza31fpzq6plz40p4b83vkr2x4x7807889vy";
};
patches = [ ./v4l.patch ];
patches = [ ./v4l.patch ./linux-headers-3.9.patch ];
configureFlags = "--disable-oss";

27
pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/linux-headers-3.9.patch Normal file
View File

@ -0,0 +1,27 @@
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-plugins/gst-plugins-v4l2/files/gst-plugins-v4l2-0.10.31-linux-headers-3.9.patch
From 8e633d2059cb835448021cf79becb487aff10975 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Mon, 18 Mar 2013 14:59:35 +0000
Subject: v4l2: fix compilation against newer kernel headers as on FC19
---
diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c
index 07d390a..4c10f4f 100644
--- a/sys/v4l2/v4l2_calls.c
+++ b/sys/v4l2/v4l2_calls.c
@@ -291,8 +291,12 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object)
break;
case V4L2_CID_HFLIP:
case V4L2_CID_VFLIP:
+#ifndef V4L2_CID_PAN_RESET
case V4L2_CID_HCENTER:
+#endif
+#ifndef V4L2_CID_TILT_RESET
case V4L2_CID_VCENTER:
+#endif
#ifdef V4L2_CID_PAN_RESET
case V4L2_CID_PAN_RESET:
#endif
--
cgit v0.9.0.2-2-gbebe