diff options
author | Jesse Gilles <jgilles@multitech.com> | 2011-08-30 17:04:45 -0500 |
---|---|---|
committer | Jesse Gilles <jgilles@multitech.com> | 2011-08-30 17:04:45 -0500 |
commit | e9629e5fcaaeafc4a51ba2b0941055d92549b892 (patch) | |
tree | c82df8a9f01890cad462eb2d024b72993c7bdcec /multitech/recipes/v4l4j/files/makefiles.patch | |
parent | 00508710beeff0223dafc1f906ee3a779b8d3339 (diff) |
add v4l4j 0.8.10
Diffstat (limited to 'multitech/recipes/v4l4j/files/makefiles.patch')
-rw-r--r-- | multitech/recipes/v4l4j/files/makefiles.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/multitech/recipes/v4l4j/files/makefiles.patch b/multitech/recipes/v4l4j/files/makefiles.patch new file mode 100644 index 0000000..ffccaf6 --- /dev/null +++ b/multitech/recipes/v4l4j/files/makefiles.patch @@ -0,0 +1,41 @@ +Index: v4l4j-0.8.10/libvideo/Makefile +=================================================================== +--- v4l4j-0.8.10.orig/libvideo/Makefile 2011-03-27 00:06:05.000000000 -0500 ++++ v4l4j-0.8.10/libvideo/Makefile 2011-08-22 14:59:05.417274581 -0500 +@@ -71,12 +71,12 @@ + qc-probe.o fps-param-probe.o v4l1-query.o v4l2-query.o v4l1-tuner.o \ + v4l2-tuner.o palettes.o + +-CC := gcc ++#CC := gcc + CFLAGS := $(DBG) -DVER_MAJ=$(VERSION_MAJOR) -DVER_MIN=$(VERSION_MINOR) \ + $(OPTIMISATION) -fPIC -I. + +-LD := gcc +-LDFLAGS := -lm -lrt -shared ++LD := $(CC) ++LDFLAGS += -lm -lrt -shared + + all: $(LIB).$(LIB_RELEASE) + +Index: v4l4j-0.8.10/src/Makefile +=================================================================== +--- v4l4j-0.8.10.orig/src/Makefile 2010-11-15 05:10:14.000000000 -0600 ++++ v4l4j-0.8.10/src/Makefile 2011-08-22 14:59:31.337596732 -0500 +@@ -41,13 +41,13 @@ + v4l4j_DeviceInfo.o v4l4j_VideoDevice.o v4l4j_Control.o v4l4j_Tuner.o \ + v4l4j_ResolutionInfo.o v4l4j_FrameInterval.o + +-CC := gcc ++#CC := gcc + INCLUDES := -I$(JDK_HOME)/include -I$(JDK_HOME)/include/linux/ \ + -I$(LIBVIDEO_PATH) -I. + CFLAGS := $(INCLUDES) $(DBG) $(OPTIMISATION) -fPIC + +-LD := gcc +-LDFLAGS := -shared -ljpeg -L$(LIBVIDEO_PATH) -l$(LIBVIDEO_NAME) ++LD := $(CC) ++LDFLAGS += -shared -ljpeg -L$(LIBVIDEO_PATH) -l$(LIBVIDEO_NAME) + + all: $(LIB) + |