5 files changed, 52 insertions, 13 deletions
diff --git a/v4l2-apps/lib/libv4l/ChangeLog b/v4l2-apps/lib/libv4l/ChangeLog
index 9d642da7c..3cdabde0d 100644
--- a/v4l2-apps/lib/libv4l/ChangeLog
+++ b/v4l2-apps/lib/libv4l/ChangeLog
@@ -1,3 +1,9 @@
+libv4l-0.3.8
+------------
+* work around wrong REQUEST_BUFFERS ioctl return code from certain drivers
+* add pkg-config (.pc) files for easier detection if libv4l is available
+
+
 libv4l-0.3.7
 ------------
 * Add spca505/6 and spca508 cam specific formats (YUYV per line variations)
diff --git a/v4l2-apps/lib/libv4l/Makefile b/v4l2-apps/lib/libv4l/Makefile
index 3497fdbf2..ee6d555c3 100644
--- a/v4l2-apps/lib/libv4l/Makefile
+++ b/v4l2-apps/lib/libv4l/Makefile
@@ -1,10 +1,10 @@
 LIB_RELEASE=0
-V4L2_LIB_VERSION=$(LIB_RELEASE).3.7
+V4L2_LIB_VERSION=$(LIB_RELEASE).3.8
 
 all clean install:
-	$(MAKE) -C libv4lconvert $@
-	$(MAKE) -C libv4l2 $@
-	$(MAKE) -C libv4l1 $@
+	$(MAKE) -C libv4lconvert V4L2_LIB_VERSION=$(V4L2_LIB_VERSION) $@
+	$(MAKE) -C libv4l2 V4L2_LIB_VERSION=$(V4L2_LIB_VERSION) $@
+	$(MAKE) -C libv4l1 V4L2_LIB_VERSION=$(V4L2_LIB_VERSION) $@
 
 export: clean
 	mkdir /tmp/libv4l-$(V4L2_LIB_VERSION)
diff --git a/v4l2-apps/lib/libv4l/libv4l1/Makefile b/v4l2-apps/lib/libv4l/libv4l1/Makefile
index 8cb064cd4..4e9206bf6 100644
--- a/v4l2-apps/lib/libv4l/libv4l1/Makefile
+++ b/v4l2-apps/lib/libv4l/libv4l1/Makefile
@@ -12,7 +12,7 @@ V4L1_OBJS     = libv4l1.o log.o ../libv4l2/libv4l2.so
 V4L1_LIB      = libv4l1.so
 V4L1COMPAT    = v4l1compat.so
 V4L1COMPAT_O  = v4l1compat.o libv4l1.so
-TARGETS       = $(V4L1_LIB) $(V4L1COMPAT)
+TARGETS       = $(V4L1_LIB) $(V4L1COMPAT) libv4l1.pc
 INCLUDES      = ../include/libv4l1.h
 
 ifeq ($(LIB_RELEASE),)
@@ -34,6 +34,16 @@ $(V4L1_LIB): $(V4L1_OBJS)
 
 $(V4L1COMPAT): $(V4L1COMPAT_O) $(V4L1_LIB)
 
+libv4l1.pc:
+	echo prefix=$(PREFIX) > libv4l1.pc
+	echo libdir=$(LIBDIR) >> libv4l1.pc
+	echo >> libv4l1.pc
+	echo 'Name: libv4l1' >> libv4l1.pc
+	echo 'Description: v4l1 compatibility library' >> libv4l1.pc
+	echo 'Version: '$(V4L2_LIB_VERSION) >> libv4l1.pc
+	echo 'Libs: -L$${libdir} -lv4l1' >> libv4l1.pc
+	echo 'Cflags: -I$${prefix}/include' >> libv4l1.pc
+
 install: all
 	mkdir -p $(DESTDIR)$(PREFIX)/include
 	install -p -m 644 $(INCLUDES) $(DESTDIR)$(PREFIX)/include
@@ -43,10 +53,11 @@ install: all
 	  ln -f -s $(V4L1_LIB).$(LIB_RELEASE) $(V4L1_LIB)
 	install -m 755 $(V4L1COMPAT).$(LIB_RELEASE) \
 	  $(DESTDIR)$(LIBDIR)/libv4l/$(V4L1COMPAT)
+	mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
+	install -m 644 libv4l1.pc $(DESTDIR)$(LIBDIR)/pkgconfig
 
 clean::
-	rm -f *.so* *.o log *~
-	rm -f *.d
+	rm -f *.so* *.o *.d libv4l1.pc log *~
 
 %.o: %.c
 	$(CC) -c -MMD $(CPPFLAGS) $(CFLAGS) -o $@ $<
diff --git a/v4l2-apps/lib/libv4l/libv4l2/Makefile b/v4l2-apps/lib/libv4l/libv4l2/Makefile
index 1258e379b..0e63eae71 100644
--- a/v4l2-apps/lib/libv4l/libv4l2/Makefile
+++ b/v4l2-apps/lib/libv4l/libv4l2/Makefile
@@ -12,7 +12,7 @@ V4L2_OBJS     = libv4l2.o log.o ../libv4lconvert/libv4lconvert.so
 V4L2_LIB      = libv4l2.so
 V4L2CONVERT   = v4l2convert.so
 V4L2CONVERT_O = v4l2convert.o libv4l2.so
-TARGETS       = $(V4L2_LIB) $(V4L2CONVERT)
+TARGETS       = $(V4L2_LIB) $(V4L2CONVERT) libv4l2.pc
 INCLUDES      = ../include/libv4l2.h
 
 ifeq ($(LIB_RELEASE),)
@@ -33,6 +33,16 @@ $(V4L2_LIB): $(V4L2_OBJS)
 
 $(V4L2CONVERT): $(V4L2CONVERT_O) $(V4L2_LIB)
 
+libv4l2.pc:
+	echo prefix=$(PREFIX) > libv4l2.pc
+	echo libdir=$(LIBDIR) >> libv4l2.pc
+	echo >> libv4l2.pc
+	echo 'Name: libv4l2' >> libv4l2.pc
+	echo 'Description: v4l2 device access library' >> libv4l2.pc
+	echo 'Version: '$(V4L2_LIB_VERSION) >> libv4l2.pc
+	echo 'Libs: -L$${libdir} -lv4l2' >> libv4l2.pc
+	echo 'Cflags: -I$${prefix}/include' >> libv4l2.pc
+
 install: all
 	mkdir -p $(DESTDIR)$(PREFIX)/include
 	install -p -m 644 $(INCLUDES) $(DESTDIR)$(PREFIX)/include
@@ -42,10 +52,11 @@ install: all
 	  ln -f -s $(V4L2_LIB).$(LIB_RELEASE) $(V4L2_LIB)
 	install -m 755 $(V4L2CONVERT).$(LIB_RELEASE) \
 	  $(DESTDIR)$(LIBDIR)/libv4l/$(V4L2CONVERT)
+	mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
+	install -m 644 libv4l2.pc $(DESTDIR)$(LIBDIR)/pkgconfig
 
 clean::
-	rm -f *.so* *.o log *~
-	rm -f *.d
+	rm -f *.so* *.o *.d libv4l2.pc log *~
 
 %.o: %.c
 	$(CC) -c -MMD $(CPPFLAGS) $(CFLAGS) -o $@ $<
diff --git a/v4l2-apps/lib/libv4l/libv4lconvert/Makefile b/v4l2-apps/lib/libv4l/libv4lconvert/Makefile
index 38071de94..3fd561f4e 100644
--- a/v4l2-apps/lib/libv4l/libv4lconvert/Makefile
+++ b/v4l2-apps/lib/libv4l/libv4lconvert/Makefile
@@ -11,7 +11,7 @@ LDFLAGS       = -shared
 CONVERT_LIB   = libv4lconvert.so
 CONVERT_OBJS  = libv4lconvert.o tinyjpeg.o sn9c10x.o pac207.o \
 		jidctflt.o spca561-decompress.o rgbyuv.o spca501.o bayer.o
-TARGETS       = $(CONVERT_LIB)
+TARGETS       = $(CONVERT_LIB) libv4lconvert.pc
 INCLUDES      = ../include/libv4lconvert.h
 
 ifeq ($(LIB_RELEASE),)
@@ -30,6 +30,16 @@ all: $(TARGETS)
 
 $(CONVERT_LIB): $(CONVERT_OBJS)
 
+libv4lconvert.pc:
+	echo prefix=$(PREFIX) > libv4lconvert.pc
+	echo libdir=$(LIBDIR) >> libv4lconvert.pc
+	echo >> libv4lconvert.pc
+	echo 'Name: libv4lconvert' >> libv4lconvert.pc
+	echo 'Description: v4l format conversion library' >> libv4lconvert.pc
+	echo 'Version: '$(V4L2_LIB_VERSION) >> libv4lconvert.pc
+	echo 'Libs: -L$${libdir} -lv4lconvert' >> libv4lconvert.pc
+	echo 'Cflags: -I$${prefix}/include' >> libv4lconvert.pc
+
 install: all
 	mkdir -p $(DESTDIR)$(PREFIX)/include
 	install -p -m 644 $(INCLUDES) $(DESTDIR)$(PREFIX)/include
@@ -37,10 +47,11 @@ install: all
 	install -m 755 $(CONVERT_LIB).$(LIB_RELEASE) $(DESTDIR)$(LIBDIR)
 	cd $(DESTDIR)$(LIBDIR) && \
 	  ln -f -s $(CONVERT_LIB).$(LIB_RELEASE) $(CONVERT_LIB)
+	mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
+	install -m 644 libv4lconvert.pc $(DESTDIR)$(LIBDIR)/pkgconfig
 
 clean::
-	rm -f *.so* *.o log *~
-	rm -f *.d
+	rm -f *.so* *.o *.d libv4lconvert.pc log *~
 
 %.o: %.c
 	$(CC) -c -MMD $(CPPFLAGS) $(CFLAGS) -o $@ $<