[gephex-devel] gephex--main--0.4--patch-1837

[gephex at sonnenland.kexbox.org]

Archive: gephex at gephex.org--2004
New revision: gephex--main--0.4--patch-1837

--
Revision: gephex--main--0.4--patch-1837
Archive: gephex at gephex.org--2004
Creator: The Gephex Source Archive <gephex at gephex.org>
Date: Thu Jan 20 22:25:36 CET 2005
Standard-date: 2005-01-20 21:25:36 GMT
New-files: modules/src/capturemodule/.arch-ids/videodev2.h.id
    modules/src/capturemodule/videodev2.h
Modified-files: modules/src/capturemodule/Makefile.am
    modules/src/capturemodule/v4l2capturedriver.cpp
New-patches: gephex at gephex.org--2004/gephex--main--0.4--patch-1837
    martin at gephex.org--2004/gephex--fixbug-75--0.4--base-0
    martin at gephex.org--2004/gephex--fixbug-75--0.4--patch-1
Summary: [MERGE-REQUEST] bugfix for #75
Keywords: 

Patches applied:

 * martin at gephex.org--2004/gephex--fixbug-75--0.4--base-0
   tag of gephex at gephex.org--2004/gephex--main--0.4--patch-1836

 * martin at gephex.org--2004/gephex--fixbug-75--0.4--patch-1
   add videodev2.h kernel header

* added directories

    {arch}/gephex/gephex--fixbug-75
    {arch}/gephex/gephex--fixbug-75/gephex--fixbug-75--0.4
    {arch}/gephex/gephex--fixbug-75/gephex--fixbug-75--0.4/martin at gephex.org--2004
    {arch}/gephex/gephex--fixbug-75/gephex--fixbug-75--0.4/martin at gephex.org--2004/patch-log

* added files

    modules/src/capturemodule/.arch-ids/videodev2.h.id
    modules/src/capturemodule/videodev2.h
    {arch}/gephex/gephex--fixbug-75/gephex--fixbug-75--0.4/martin at gephex.org--2004/patch-log/base-0
    {arch}/gephex/gephex--fixbug-75/gephex--fixbug-75--0.4/martin at gephex.org--2004/patch-log/patch-1
    {arch}/gephex/gephex--main/gephex--main--0.4/gephex at gephex.org--2004/patch-log/patch-1837

* modified files

--- orig/modules/src/capturemodule/Makefile.am
+++ mod/modules/src/capturemodule/Makefile.am
@@ -23,7 +23,8 @@
 	v4l2capturedriver.h \
 	v4l1.h \
 	v4l1.cpp \
-	videodev.h
+	videodev.h \
+	videodev2.h
 
 capturemodule_la_LDFLAGS = -module -avoid-version -no-undefined -lscale -lcolorconv
 capturemodule_la_LIBADD= -L at builddir@/../libscale -L at builddir@/../libcolorconv


--- orig/modules/src/capturemodule/v4l2capturedriver.cpp
+++ mod/modules/src/capturemodule/v4l2capturedriver.cpp
@@ -45,7 +45,7 @@
 
 #include <asm/types.h>          /* for videodev2.h */
 
-#include <linux/videodev2.h>
+#include "videodev2.h"  // local copy of kernel header
 
 
 #include "libscale.h"