diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
| commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
| tree | 7617315e619f969c13e79c1f44c2428871719357 /package/v4l-utils | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/v4l-utils')
| -rw-r--r-- | package/v4l-utils/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/v4l-utils/Makefile b/package/v4l-utils/Makefile index 64e500858..814489b8a 100644 --- a/package/v4l-utils/Makefile +++ b/package/v4l-utils/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= v4l-utils PKG_VERSION:= 1.0.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 2127f2d06be9162b0d346f7037a9e852 -PKG_DESCR:= Video4Linux2 utilities -PKG_SECTION:= multimedia +PKG_DESCR:= video4linux utilities +PKG_SECTION:= mm/video PKG_BUILDDEP:= libjpeg-turbo PKG_SITES:= http://linuxtv.org/downloads/v4l-utils/ PKG_LIBNAME:= libv4l @@ -18,7 +18,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 PKG_LIBC_DEPENDS:= glibc PKG_SUBPKGS:= V4L_UTILS LIBV4L -PKGSC_LIBV4L:= libs +PKGSC_LIBV4L:= libs/video PKGSD_LIBV4L:= Video4Linux2 libraries ifeq ($(ADK_STATIC),y) |