The patch number 8224 was added via Thierry MERLE <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Hans de Goede <[EMAIL PROTECTED]>
v4l2-library: libv4l-makefile-improvements.patch
Makefile improvements:
* Split DESTDIR into DESTDIR and PREFIX as used in most makefiles out there
* Add LIBDIR variable to allow installation in <prefix>/lib64 for example
* Install the wrappers in <libdir>/libv4l instead of directly under libdir,
as they are not libraries meant for linking
* preserve timestamps of header files when installing them
Signed-off-by: Hans de Goede <[EMAIL PROTECTED]>
Signed-off-by: Thierry MERLE <[EMAIL PROTECTED]>
---
v4l2-apps/lib/libv4l/README | 14 +++++++-----
v4l2-apps/lib/libv4l/libv4l1/Makefile | 23 +++++++++++---------
v4l2-apps/lib/libv4l/libv4l2/Makefile | 23 +++++++++++---------
v4l2-apps/lib/libv4l/libv4lconvert/Makefile | 18 +++++++++------
4 files changed, 46 insertions(+), 32 deletions(-)
diff -r dfaa04b1ee00 -r 5b3736e87821 v4l2-apps/lib/libv4l/README
--- a/v4l2-apps/lib/libv4l/README Fri Jul 04 19:26:40 2008 +0200
+++ b/v4l2-apps/lib/libv4l/README Fri Jul 04 19:28:49 2008 +0200
@@ -59,11 +59,12 @@ counterparts.
counterparts.
The preloadable libv4l1 wrapper which adds v4l2 device compatibility to v4l1
-applications is called v4l1compat.so. The preloadable libv4l1 wrapper which
-adds v4l2 device compatibility to v4l1 applications is called v4l2convert.so
+applications is called v4l1compat.so. The preloadable libv4l2 wrapper which
+adds support for various pixelformats to v4l2 applications is called
+v4l2convert.so.
Example usage (after install in default location):
-$ export LD_PRELOAD=/usr/local/lib/v4l1compat.so
+$ export LD_PRELOAD=/usr/local/lib/libv4l/v4l1compat.so
$ camorama
@@ -71,9 +72,12 @@ Installation Instructions
-------------------------
Simple type the following commands from the libv4l-x.y.z directory
-(adjusting DESTDIR as desired):
+(adjusting PREFIX as desired):
make
-make install DESTDIR=/usr/local
+make install PREFIX=/usr/local
+
+Note: make install also supports the DESTDIR=... paramter for installation
+into chroots.
FAQ
diff -r dfaa04b1ee00 -r 5b3736e87821 v4l2-apps/lib/libv4l/libv4l1/Makefile
--- a/v4l2-apps/lib/libv4l/libv4l1/Makefile Fri Jul 04 19:26:40 2008 +0200
+++ b/v4l2-apps/lib/libv4l/libv4l1/Makefile Fri Jul 04 19:28:49 2008 +0200
@@ -19,8 +19,12 @@ LIB_RELEASE = 0
LIB_RELEASE = 0
endif
-ifeq ($(DESTDIR),)
-DESTDIR = /usr/local
+ifeq ($(PREFIX),)
+PREFIX = /usr/local
+endif
+
+ifeq ($(LIBDIR),)
+LIBDIR = $(PREFIX)/lib
endif
all: $(TARGETS)
@@ -31,15 +35,14 @@ all: $(TARGETS)
$(V4L1COMPAT): $(V4L1COMPAT_O) $(V4L1_LIB)
install: all
- mkdir -p $(DESTDIR)/include
- cp $(INCLUDES) $(DESTDIR)/include
- mkdir -p $(DESTDIR)/lib
- cp $(V4L1_LIB).$(LIB_RELEASE) $(DESTDIR)/lib
- cd $(DESTDIR)/lib && \
+ mkdir -p $(DESTDIR)$(PREFIX)/include
+ install -p -m 644 $(INCLUDES) $(DESTDIR)$(PREFIX)/include
+ mkdir -p $(DESTDIR)$(LIBDIR)/libv4l
+ install -m 755 $(V4L1_LIB).$(LIB_RELEASE) $(DESTDIR)$(LIBDIR)
+ cd $(DESTDIR)$(LIBDIR) && \
ln -f -s $(V4L1_LIB).$(LIB_RELEASE) $(V4L1_LIB)
- cp $(V4L1COMPAT).$(LIB_RELEASE) $(DESTDIR)/lib
- cd $(DESTDIR)/lib && \
- ln -f -s $(V4L1COMPAT).$(LIB_RELEASE) $(V4L1COMPAT)
+ install -m 755 $(V4L1COMPAT).$(LIB_RELEASE) \
+ $(DESTDIR)$(LIBDIR)/libv4l/$(V4L1COMPAT)
clean::
rm -f *.so* *.o log *~
diff -r dfaa04b1ee00 -r 5b3736e87821 v4l2-apps/lib/libv4l/libv4l2/Makefile
--- a/v4l2-apps/lib/libv4l/libv4l2/Makefile Fri Jul 04 19:26:40 2008 +0200
+++ b/v4l2-apps/lib/libv4l/libv4l2/Makefile Fri Jul 04 19:28:49 2008 +0200
@@ -19,8 +19,12 @@ LIB_RELEASE = 0
LIB_RELEASE = 0
endif
-ifeq ($(DESTDIR),)
-DESTDIR = /usr/local
+ifeq ($(PREFIX),)
+PREFIX = /usr/local
+endif
+
+ifeq ($(LIBDIR),)
+LIBDIR = $(PREFIX)/lib
endif
all: $(TARGETS)
@@ -30,15 +34,14 @@ all: $(TARGETS)
$(V4L2CONVERT): $(V4L2CONVERT_O) $(V4L2_LIB)
install: all
- mkdir -p $(DESTDIR)/include
- cp $(INCLUDES) $(DESTDIR)/include
- mkdir -p $(DESTDIR)/lib
- cp $(V4L2_LIB).$(LIB_RELEASE) $(DESTDIR)/lib
- cd $(DESTDIR)/lib && \
+ mkdir -p $(DESTDIR)$(PREFIX)/include
+ install -p -m 644 $(INCLUDES) $(DESTDIR)$(PREFIX)/include
+ mkdir -p $(DESTDIR)$(LIBDIR)/libv4l
+ install -m 755 $(V4L2_LIB).$(LIB_RELEASE) $(DESTDIR)$(LIBDIR)
+ cd $(DESTDIR)$(LIBDIR) && \
ln -f -s $(V4L2_LIB).$(LIB_RELEASE) $(V4L2_LIB)
- cp $(V4L2CONVERT).$(LIB_RELEASE) $(DESTDIR)/lib
- cd $(DESTDIR)/lib && \
- ln -f -s $(V4L2CONVERT).$(LIB_RELEASE) $(V4L2CONVERT)
+ install -m 755 $(V4L2CONVERT).$(LIB_RELEASE) \
+ $(DESTDIR)$(LIBDIR)/libv4l/$(V4L2CONVERT)
clean::
rm -f *.so* *.o log *~
diff -r dfaa04b1ee00 -r 5b3736e87821 v4l2-apps/lib/libv4l/libv4lconvert/Makefile
--- a/v4l2-apps/lib/libv4l/libv4lconvert/Makefile Fri Jul 04 19:26:40
2008 +0200
+++ b/v4l2-apps/lib/libv4l/libv4lconvert/Makefile Fri Jul 04 19:28:49
2008 +0200
@@ -18,8 +18,12 @@ LIB_RELEASE = 0
LIB_RELEASE = 0
endif
-ifeq ($(DESTDIR),)
-DESTDIR = /usr/local
+ifeq ($(PREFIX),)
+PREFIX = /usr/local
+endif
+
+ifeq ($(LIBDIR),)
+LIBDIR = $(PREFIX)/lib
endif
all: $(TARGETS)
@@ -27,11 +31,11 @@ all: $(TARGETS)
$(CONVERT_LIB): $(CONVERT_OBJS)
install: all
- mkdir -p $(DESTDIR)/include
- cp $(INCLUDES) $(DESTDIR)/include
- mkdir -p $(DESTDIR)/lib
- cp $(CONVERT_LIB).$(LIB_RELEASE) $(DESTDIR)/lib
- cd $(DESTDIR)/lib && \
+ mkdir -p $(DESTDIR)$(PREFIX)/include
+ install -p -m 644 $(INCLUDES) $(DESTDIR)$(PREFIX)/include
+ mkdir -p $(DESTDIR)$(LIBDIR)
+ install -m 755 $(CONVERT_LIB).$(LIB_RELEASE) $(DESTDIR)$(LIBDIR)
+ cd $(DESTDIR)$(LIBDIR) && \
ln -f -s $(CONVERT_LIB).$(LIB_RELEASE) $(CONVERT_LIB)
clean::
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/5b3736e878216ca7f8c6ea805dc7b780b4b23db4
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
