From d9fcd7e5495fbd0fe020223823338d21ce31dcaf Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 13 Feb 2009 12:56:07 +0100 Subject: libv4l2util: rename from libv4l2 to prevent clash with the libv4l2 conversion library From: Hans Verkuil libv4l2 was introduced to fix conversion problems. But this clashed with the already existing libv4l2 utility library. Renamed that libv4l2 library and header to libv4l2util. Priority: normal Signed-off-by: Hans Verkuil --- v4l2-apps/lib/Makefile | 6 ++--- v4l2-apps/lib/frequencies.c | 2 +- v4l2-apps/lib/libv4l2util.h | 45 ++++++++++++++++++++++++++++++++++++ v4l2-apps/lib/v4l2.h | 45 ------------------------------------ v4l2-apps/test/Makefile | 6 ++--- v4l2-apps/util/Makefile | 6 ++--- v4l2-apps/util/qv4l2/ctrl-tab.cpp | 2 +- v4l2-apps/util/qv4l2/general-tab.cpp | 2 +- v4l2-apps/util/qv4l2/qv4l2.cpp | 2 +- v4l2-apps/util/qv4l2/qv4l2.pro | 2 +- 10 files changed, 59 insertions(+), 59 deletions(-) create mode 100644 v4l2-apps/lib/libv4l2util.h delete mode 100644 v4l2-apps/lib/v4l2.h diff --git a/v4l2-apps/lib/Makefile b/v4l2-apps/lib/Makefile index 8443039b4..f3f413071 100644 --- a/v4l2-apps/lib/Makefile +++ b/v4l2-apps/lib/Makefile @@ -2,12 +2,12 @@ CPPFLAGS += -I../include -I.. -includes = v4l2.h +includes = libv4l2util.h objects = frequencies.o v4l2_driver.o -sharedlib = libv4l2.so -staticlib = libv4l2.a +sharedlib = libv4l2util.so +staticlib = libv4l2util.a ifeq ($(prefix),) prefix = /usr diff --git a/v4l2-apps/lib/frequencies.c b/v4l2-apps/lib/frequencies.c index 64379d2b0..df8d47dba 100644 --- a/v4l2-apps/lib/frequencies.c +++ b/v4l2-apps/lib/frequencies.c @@ -22,7 +22,7 @@ #include #include -#include "v4l2.h" +#include "libv4l2util.h" /* This source was originally written by Nathan Laredo . He kindly gave permission to release this source under the LGPL diff --git a/v4l2-apps/lib/libv4l2util.h b/v4l2-apps/lib/libv4l2util.h new file mode 100644 index 000000000..fde7cdc75 --- /dev/null +++ b/v4l2-apps/lib/libv4l2util.h @@ -0,0 +1,45 @@ +/* Copyright (C) 2006 Hans Verkuil + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#ifndef _V4L2UTIL_H_ +#define _V4L2UTIL_H_ + +/* --------------------------------------------------------------------- */ + +struct v4l2_channel_list { + const char * const name; /* channel name */ + unsigned freq; /* channel frequency in kHz */ +}; + +struct v4l2_channel_lists { + const char * const name; /* channel list name */ + const struct v4l2_channel_list * const list; + unsigned count; /* number of channels in channel list */ +}; + +extern const struct v4l2_channel_lists v4l2_channel_lists[]; + +/* This list is sorted alphabetically on ISO code. The last item is + denoted by a NULL pointer for the iso_code. */ +struct v4l2_country_std_map { + const char * const iso_code; /* The 2-character upper case ISO-3166 country code */ + v4l2_std_id std; /* The TV standard(s) in use */ +}; + +extern const struct v4l2_country_std_map v4l2_country_std_map[]; + +#endif diff --git a/v4l2-apps/lib/v4l2.h b/v4l2-apps/lib/v4l2.h deleted file mode 100644 index 172688853..000000000 --- a/v4l2-apps/lib/v4l2.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright (C) 2006 Hans Verkuil - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -#ifndef _V4L2_H_ -#define _V4L2_H_ - -/* --------------------------------------------------------------------- */ - -struct v4l2_channel_list { - const char * const name; /* channel name */ - unsigned freq; /* channel frequency in kHz */ -}; - -struct v4l2_channel_lists { - const char * const name; /* channel list name */ - const struct v4l2_channel_list * const list; - unsigned count; /* number of channels in channel list */ -}; - -extern const struct v4l2_channel_lists v4l2_channel_lists[]; - -/* This list is sorted alphabetically on ISO code. The last item is - denoted by a NULL pointer for the iso_code. */ -struct v4l2_country_std_map { - const char * const iso_code; /* The 2-character upper case ISO-3166 country code */ - v4l2_std_id std; /* The TV standard(s) in use */ -}; - -extern const struct v4l2_country_std_map v4l2_country_std_map[]; - -#endif diff --git a/v4l2-apps/test/Makefile b/v4l2-apps/test/Makefile index a996c0baf..e3879bc5e 100644 --- a/v4l2-apps/test/Makefile +++ b/v4l2-apps/test/Makefile @@ -21,10 +21,10 @@ clean:: install: -../lib/libv4l2.a: ../lib/v4l2_driver.c ../lib/frequencies.c - make -C ../lib libv4l2.a +../lib/libv4l2util.a: ../lib/v4l2_driver.c ../lib/frequencies.c + make -C ../lib libv4l2util.a -driver-test: driver-test.o ../lib/libv4l2.a +driver-test: driver-test.o ../lib/libv4l2util.a pixfmt-test: pixfmt-test.o $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ -lX11 diff --git a/v4l2-apps/util/Makefile b/v4l2-apps/util/Makefile index f2c4c0a38..80bffc50d 100644 --- a/v4l2-apps/util/Makefile +++ b/v4l2-apps/util/Makefile @@ -36,11 +36,11 @@ v4l2-dbg.o: v4l2-dbg.h v4l2-dbg-bttv.h v4l2-dbg-em28xx.h v4l2-dbg-saa7134.h v4l2_sysfs_path.o: v4l2_sysfs_path.c ../lib/v4l2_driver.h -v4l2_sysfs_path: v4l2_sysfs_path.o ../lib/libv4l2.a +v4l2_sysfs_path: v4l2_sysfs_path.o ../lib/libv4l2util.a $(CC) $^ -o $@ -lsysfs -../lib/libv4l2.a: - $(MAKE) -C ../lib libv4l2.a +../lib/libv4l2util.a: + $(MAKE) -C ../lib libv4l2util.a install: mkdir -p $(prefix)/bin diff --git a/v4l2-apps/util/qv4l2/ctrl-tab.cpp b/v4l2-apps/util/qv4l2/ctrl-tab.cpp index c7d1a275c..6f436b494 100644 --- a/v4l2-apps/util/qv4l2/ctrl-tab.cpp +++ b/v4l2-apps/util/qv4l2/ctrl-tab.cpp @@ -1,6 +1,6 @@ #include "qv4l2.h" -#include "v4l2.h" +#include "libv4l2util.h" #include #include diff --git a/v4l2-apps/util/qv4l2/general-tab.cpp b/v4l2-apps/util/qv4l2/general-tab.cpp index 3b9ad2e5b..78656cf10 100644 --- a/v4l2-apps/util/qv4l2/general-tab.cpp +++ b/v4l2-apps/util/qv4l2/general-tab.cpp @@ -20,7 +20,7 @@ #include "qv4l2.h" #include "general-tab.h" -#include "v4l2.h" +#include "libv4l2util.h" #include #include diff --git a/v4l2-apps/util/qv4l2/qv4l2.cpp b/v4l2-apps/util/qv4l2/qv4l2.cpp index d144723d9..764fbd172 100644 --- a/v4l2-apps/util/qv4l2/qv4l2.cpp +++ b/v4l2-apps/util/qv4l2/qv4l2.cpp @@ -1,7 +1,7 @@ #include "qv4l2.h" #include "general-tab.h" -#include "v4l2.h" +#include "libv4l2util.h" #include #include diff --git a/v4l2-apps/util/qv4l2/qv4l2.pro b/v4l2-apps/util/qv4l2/qv4l2.pro index 5e0b7555d..770c2d702 100644 --- a/v4l2-apps/util/qv4l2/qv4l2.pro +++ b/v4l2-apps/util/qv4l2/qv4l2.pro @@ -9,4 +9,4 @@ CONFIG += debug # Input HEADERS += qv4l2.h general-tab.h SOURCES += qv4l2.cpp general-tab.cpp ctrl-tab.cpp -LIBS += -lv4l2 -L../../lib +LIBS += -lv4l2util -L../../lib -- cgit v1.2.3