diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-24 11:07:35 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-24 11:07:35 -0300 |
| commit | 8d32e471d53634b308adf93007922a6ccbd2b830 (patch) | |
| tree | 606fdcd5508936ffdfc7cf510a16b7324c2792e2 /community/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch | |
| parent | 4c9d76f582ae64854e30113e7f7dc621af3db820 (diff) | |
| parent | 1e1e4927b05d9b242bfe83794e3a98ab2c8f79ef (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/augeas/PKGBUILD
community/chmsee/PKGBUILD
community/cupsddk/PKGBUILD
community/optipng/PKGBUILD
community/pcb/PKGBUILD
community/taglib-rcc/PKGBUILD
community/wmctrl/PKGBUILD
extra/c-ares/PKGBUILD
multilib/lib32-freetype2/PKGBUILD
Diffstat (limited to 'community/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch')
| -rw-r--r-- | community/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/community/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch b/community/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch index b1cfd49f1..d0772783d 100644 --- a/community/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch +++ b/community/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch @@ -2,14 +2,15 @@ Index: tvtime-1.0.2/src/videoinput.c =================================================================== --- tvtime-1.0.2.orig/src/videoinput.c +++ tvtime-1.0.2/src/videoinput.c -@@ -35,8 +35,8 @@ +@@ -35,8 +35,9 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include "videodev.h" -#include "videodev2.h" -+#include <linux/videodev.h> ++#include <libv4l1-videodev.h> +#include <linux/videodev2.h> ++#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */ #include "videoinput.h" #include "mixer.h" |