Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics libv4l, libv4l1: Update graphics/libv4l with ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/d62f06e696fc
branches: trunk
changeset: 437861:d62f06e696fc
user: ryoon <ryoon%pkgsrc.org@localhost>
date: Wed Sep 02 09:54:33 2020 +0000
description:
libv4l, libv4l1: Update graphics/libv4l with libv4l1
* Copy graphics/libv4l1 to graphics/libv4l.
* Remove graphics/libv4l1.
diffstat:
graphics/libv4l/Makefile | 39 +-
graphics/libv4l/PLIST | 25 +-
graphics/libv4l/buildlink3.mk | 6 +-
graphics/libv4l/distinfo | 35 +-
graphics/libv4l/files/videodev2.h | 2430 ++++++
graphics/libv4l/files/videoio.h | 3912 ++++++++-
graphics/libv4l/patches/patch-aa | 29 -
graphics/libv4l/patches/patch-ab | 19 -
graphics/libv4l/patches/patch-ac | 23 -
graphics/libv4l/patches/patch-ad | 108 -
graphics/libv4l/patches/patch-ae | 68 -
graphics/libv4l/patches/patch-af | 113 -
graphics/libv4l/patches/patch-ah | 23 -
graphics/libv4l/patches/patch-ai | 13 -
graphics/libv4l/patches/patch-aj | 23 -
graphics/libv4l/patches/patch-ak | 84 -
graphics/libv4l/patches/patch-al | 39 -
graphics/libv4l/patches/patch-am | 78 -
graphics/libv4l/patches/patch-configure | 81 +
graphics/libv4l/patches/patch-lib_include_libv4l1-videodev.h | 13 +
graphics/libv4l/patches/patch-lib_include_libv4l2rds.h | 13 +
graphics/libv4l/patches/patch-lib_include_libv4lconvert.h | 22 +
graphics/libv4l/patches/patch-lib_libv4l-mplane_libv4l-mplane.c | 13 +
graphics/libv4l/patches/patch-lib_libv4l1_libv4l1.c | 13 +
graphics/libv4l/patches/patch-lib_libv4l2_libv4l2.c | 26 +
graphics/libv4l/patches/patch-lib_libv4l2_log.c | 13 +
graphics/libv4l/patches/patch-lib_libv4l2_v4l2convert.c | 13 +
graphics/libv4l/patches/patch-lib_libv4l2rds_libv4l2rds.c | 13 +
graphics/libv4l/patches/patch-lib_libv4lconvert_control_libv4lcontrol.c | 22 +
graphics/libv4l/patches/patch-lib_libv4lconvert_libv4lsyscall-priv.h | 28 +
graphics/libv4l/patches/patch-lib_libv4lconvert_processing_libv4lprocessing.h | 13 +
graphics/libv4l1/DESCR | 4 -
graphics/libv4l1/Makefile | 71 -
graphics/libv4l1/PLIST | 23 -
graphics/libv4l1/buildlink3.mk | 13 -
graphics/libv4l1/distinfo | 19 -
graphics/libv4l1/files/videodev.h | 356 -
graphics/libv4l1/files/videodev2.h | 2430 ------
graphics/libv4l1/files/videoio.h | 3419 --------
graphics/libv4l1/patches/patch-configure | 81 -
graphics/libv4l1/patches/patch-lib_include_libv4l1-videodev.h | 13 -
graphics/libv4l1/patches/patch-lib_include_libv4l2rds.h | 13 -
graphics/libv4l1/patches/patch-lib_include_libv4lconvert.h | 22 -
graphics/libv4l1/patches/patch-lib_libv4l-mplane_libv4l-mplane.c | 13 -
graphics/libv4l1/patches/patch-lib_libv4l1_libv4l1.c | 13 -
graphics/libv4l1/patches/patch-lib_libv4l2_libv4l2.c | 26 -
graphics/libv4l1/patches/patch-lib_libv4l2_log.c | 13 -
graphics/libv4l1/patches/patch-lib_libv4l2_v4l2convert.c | 13 -
graphics/libv4l1/patches/patch-lib_libv4l2rds_libv4l2rds.c | 13 -
graphics/libv4l1/patches/patch-lib_libv4lconvert_control_libv4lcontrol.c | 22 -
graphics/libv4l1/patches/patch-lib_libv4lconvert_libv4lsyscall-priv.h | 28 -
graphics/libv4l1/patches/patch-lib_libv4lconvert_processing_libv4lprocessing.h | 13 -
52 files changed, 6085 insertions(+), 7883 deletions(-)
diffs (truncated from 14336 to 300 lines):
diff -r 17a35c2a7345 -r d62f06e696fc graphics/libv4l/Makefile
--- a/graphics/libv4l/Makefile Wed Sep 02 04:08:11 2020 +0000
+++ b/graphics/libv4l/Makefile Wed Sep 02 09:54:33 2020 +0000
@@ -1,39 +1,60 @@
-# $NetBSD: Makefile,v 1.18 2019/11/14 15:25:59 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2020/09/02 09:54:33 ryoon Exp $
-DISTNAME= libv4l-0.4.3
-PKGREVISION= 4
+LIBV4L_VERS= 1.18.1
+DISTNAME= v4l-utils-${LIBV4L_VERS}
CATEGORIES= graphics
-#MASTER_SITES= http://people.atrpms.net/~hdegoede/
+PKGNAME= libv4l-${LIBV4L_VERS}
+MASTER_SITES= https://www.linuxtv.org/downloads/v4l-utils/
+EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
#HOMEPAGE= http://people.atrpms.net/~hdegoede/
COMMENT= Video4Linux userspace library
LICENSE= gnu-gpl-v2
+FORTIFY_SUPPORTED= no
+GNU_CONFIGURE= yes
USE_GCC_RUNTIME= yes
+USE_LANGUAGES= c c++
+USE_LIBTOOL= yes
+USE_TOOLS+= gmake
-USE_TOOLS+= gmake
+CONFIGURE_ARGS+= --disable-libdvbv5
+CONFIGURE_ARGS+= --disable-nls
+CONFIGURE_ARGS+= --disable-v4l-utils
.include "../../mk/bsd.prefs.mk"
-.if (${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly") \
- && !exists(/usr/include/sys/videoio.h)
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
+NEWHEADER!= ${GREP} V4L2_SEL_TGT_CROP /usr/include/sys/videoio.h > /dev/null 2>&1 || echo "no"
+.endif
+
+.if (${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly") && !exists(/usr/include/sys/videoio.h)
PLIST.needs_videoio= yes
INSTALLATION_DIRS+= include/sys
pre-configure:
${MKDIR} ${BUILDLINK_DIR}/include/sys
cp ${FILESDIR}/videoio.h ${BUILDLINK_DIR}/include/sys
- cp ${FILESDIR}/videodev.h ${BUILDLINK_DIR}/include
post-install:
${INSTALL_DATA} ${FILESDIR}/videoio.h ${DESTDIR}${PREFIX}/include/sys
-.elif !exists(/usr/include/linux/videodev.h)
+
+.elif (${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly") && ${NEWHEADER} == "no"
+
+pre-configure:
+ ${MKDIR} ${BUILDLINK_DIR}/include/sys
+ cp ${FILESDIR}/videoio.h ${BUILDLINK_DIR}/include/sys
+
+.elif ${OPSYS} == "Linux" && !exists(/usr/include/linux/videodev.h)
pre-configure:
${MKDIR} ${BUILDLINK_DIR}/include/linux
cp ${FILESDIR}/videodev.h ${BUILDLINK_DIR}/include/linux
${LN} -sf ${BUILDLINK_DIR}/include/linux/videodev.h \
${BUILDLINK_DIR}/include/
+ cp ${FILESDIR}/videodev2.h ${BUILDLINK_DIR}/include/linux
+ ${LN} -sf ${BUILDLINK_DIR}/include/linux/videodev2.h \
+ ${BUILDLINK_DIR}/include/
.endif
PLIST_VARS= needs_videoio
diff -r 17a35c2a7345 -r d62f06e696fc graphics/libv4l/PLIST
--- a/graphics/libv4l/PLIST Wed Sep 02 04:08:11 2020 +0000
+++ b/graphics/libv4l/PLIST Wed Sep 02 09:54:33 2020 +0000
@@ -1,16 +1,23 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:59:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2020/09/02 09:54:33 ryoon Exp $
+include/libv4l-plugin.h
+include/libv4l1-videodev.h
include/libv4l1.h
include/libv4l2.h
+include/libv4l2rds.h
include/libv4lconvert.h
${PLIST.needs_videoio}include/sys/videoio.h
-lib/libv4l/v4l1compat.so
-lib/libv4l/v4l2convert.so
-lib/libv4l1.so
-lib/libv4l1.so.0
-lib/libv4l2.so
-lib/libv4l2.so.0
-lib/libv4lconvert.so
-lib/libv4lconvert.so.0
+lib/libv4l/ov511-decomp
+lib/libv4l/ov518-decomp
+lib/libv4l/plugins/libv4l-mplane.la
+lib/libv4l/v4l1compat.la
+lib/libv4l/v4l2convert.la
+lib/libv4l1.la
+lib/libv4l2.la
+lib/libv4l2rds.la
+lib/libv4lconvert.la
lib/pkgconfig/libv4l1.pc
lib/pkgconfig/libv4l2.pc
+lib/pkgconfig/libv4l2rds.pc
lib/pkgconfig/libv4lconvert.pc
+lib/v4l1compat.so
+lib/v4l2convert.so
diff -r 17a35c2a7345 -r d62f06e696fc graphics/libv4l/buildlink3.mk
--- a/graphics/libv4l/buildlink3.mk Wed Sep 02 04:08:11 2020 +0000
+++ b/graphics/libv4l/buildlink3.mk Wed Sep 02 09:54:33 2020 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2020/09/02 09:54:33 ryoon Exp $
BUILDLINK_TREE+= libv4l
.if !defined(LIBV4L_BUILDLINK3_MK)
LIBV4L_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.libv4l+= libv4l>=0.4.3nb2
-BUILDLINK_ABI_DEPENDS.libv4l+= libv4l>=0.4.3nb2
+BUILDLINK_API_DEPENDS.libv4l+= libv4l>=1.18.1
+BUILDLINK_ABI_DEPENDS.libv4l+= libv4l>=1.18.1
BUILDLINK_PKGSRCDIR.libv4l?= ../../graphics/libv4l
.endif # LIBV4L_BUILDLINK3_MK
diff -r 17a35c2a7345 -r d62f06e696fc graphics/libv4l/distinfo
--- a/graphics/libv4l/distinfo Wed Sep 02 04:08:11 2020 +0000
+++ b/graphics/libv4l/distinfo Wed Sep 02 09:54:33 2020 +0000
@@ -1,18 +1,19 @@
-$NetBSD: distinfo,v 1.18 2020/02/26 17:28:51 maya Exp $
+$NetBSD: distinfo,v 1.19 2020/09/02 09:54:33 ryoon Exp $
-SHA1 (libv4l-0.4.3.tar.gz) = 2539aa6b04650b97c9fc7ba95721f1e362a73031
-RMD160 (libv4l-0.4.3.tar.gz) = 4f0435d955f15602ac093385607417fab71deb17
-SHA512 (libv4l-0.4.3.tar.gz) = 3c474b431e632170fd9546a40ac5b4d2526198e95f0a96d4e4581746f662ab2ac4ac97811582567118a3dbee468288ced322ef1251ea82b474f1a0948a3a533d
-Size (libv4l-0.4.3.tar.gz) = 83022 bytes
-SHA1 (patch-aa) = 2e6e4d525be190a890c03ca3d00ba77f7e06d124
-SHA1 (patch-ab) = 5ade487d6d64d280f3fdae8afad99fbd0b6e5eda
-SHA1 (patch-ac) = 5457af836909f1c9f759c6a780daeb13968ec91f
-SHA1 (patch-ad) = 998090cf0748a9ecb51455de1fc5c0371795f226
-SHA1 (patch-ae) = ac2be9e54fd8bb5ecedb67c72b27d702abe75603
-SHA1 (patch-af) = 755ea097776507f28e91050171f3ff9f879a5354
-SHA1 (patch-ah) = c3f6a185fe8380b5c6b1f81cb62f0f4afef24449
-SHA1 (patch-ai) = 8f22e4050d5e20981bfdd1fc51e572e42347c2b5
-SHA1 (patch-aj) = 521abdfba83a34716ce0909f75d784fe0b6ecc8a
-SHA1 (patch-ak) = 64995ff50b0f306703d42177920fe5ce230fee85
-SHA1 (patch-al) = 8d020ef01f9956b37f718a529306e5f13aaa03a3
-SHA1 (patch-am) = 21573a1e8cb19dd1d96b4e4898b72ef4ea22a984
+SHA1 (v4l-utils-1.18.1.tar.bz2) = 05017f531d4082efce26392c01d085dd4da10f18
+RMD160 (v4l-utils-1.18.1.tar.bz2) = 7eb9e7aaf0ef4249477479cb4573501935046998
+SHA512 (v4l-utils-1.18.1.tar.bz2) = 2e9f77abc2fd65bd6a5508831185a941553441384719293f99ece7e6c53c37bb142eb3719532b11f1cef48df691667d2a4235d920338d672738d40659d499056
+Size (v4l-utils-1.18.1.tar.bz2) = 1995211 bytes
+SHA1 (patch-configure) = 5831acf2dbe102537632036ccf3b8a33be68ccb3
+SHA1 (patch-lib_include_libv4l1-videodev.h) = 84256cb64dd755b8a12edd9844bc362c35f10dd4
+SHA1 (patch-lib_include_libv4l2rds.h) = ca375e9bac291c8cc295a3393e0497eb12a01cb9
+SHA1 (patch-lib_include_libv4lconvert.h) = e5807fa26d4e73a001f829640902cf22c14b6dfe
+SHA1 (patch-lib_libv4l-mplane_libv4l-mplane.c) = df0d6f863ce3b7ff4b2ad87b8cd348785d0200c7
+SHA1 (patch-lib_libv4l1_libv4l1.c) = 9aa0fd6dccd372f81e409c6ac0768be94957ab31
+SHA1 (patch-lib_libv4l2_libv4l2.c) = f086f39fd25684f91be773637d1922416d224dc4
+SHA1 (patch-lib_libv4l2_log.c) = bcab0be4b49a38271bbc2b4a1d56f9289a471d40
+SHA1 (patch-lib_libv4l2_v4l2convert.c) = f5fefb20f83005b0f91010af6ec9b7f9f76fabe0
+SHA1 (patch-lib_libv4l2rds_libv4l2rds.c) = f6779f323a64bb12ea14829241363f2fc0f9ee2c
+SHA1 (patch-lib_libv4lconvert_control_libv4lcontrol.c) = e4a96570f22d837bbf7248231464a143c339e8ea
+SHA1 (patch-lib_libv4lconvert_libv4lsyscall-priv.h) = 2795b366f05365bf7a7caa142ff4b93b38603787
+SHA1 (patch-lib_libv4lconvert_processing_libv4lprocessing.h) = ecb02a055df546eb0f4bcea96f1a55e312495cdd
diff -r 17a35c2a7345 -r d62f06e696fc graphics/libv4l/files/videodev2.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/libv4l/files/videodev2.h Wed Sep 02 09:54:33 2020 +0000
@@ -0,0 +1,2430 @@
+/* SPDX-License-Identifier: ((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) */
+/*
+ * Video for Linux Two header file
+ *
+ * Copyright (C) 1999-2012 the contributors
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * Alternatively you can redistribute this file under the terms of the
+ * BSD license as stated below:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. The names of its contributors may not be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Header file for v4l or V4L2 drivers and applications
+ * with public API.
+ * All kernel-specific stuff were moved to media/v4l2-dev.h, so
+ * no #if __KERNEL tests are allowed here
+ *
+ * See https://linuxtv.org for more info
+ *
+ * Author: Bill Dirks <bill%thedirks.org@localhost>
+ * Justin Schoeman
+ * Hans Verkuil <hverkuil%xs4all.nl@localhost>
+ * et al.
+ */
+#ifndef _UAPI__LINUX_VIDEODEV2_H
+#define _UAPI__LINUX_VIDEODEV2_H
+
+#ifdef __NetBSD__
+#include <sys/types.h>
+#include <sys/ioccom.h>
+#include <sys/time.h>
+#else
+#ifndef __KERNEL__
+#include <sys/time.h>
+#endif
+#include <linux/compiler.h>
+#include <linux/ioctl.h>
+#include <linux/types.h>
+#include <linux/v4l2-common.h>
+#include <linux/v4l2-controls.h>
+#endif
+
+typedef uint8_t __u8;
+typedef int8_t __s8;
+typedef uint16_t __u16;
+typedef int16_t __s16;
+typedef uint32_t __u32;
+typedef int32_t __s32;
+typedef uint64_t __u64;
+typedef int64_t __s64;
+typedef uint32_t __le32;
+
+/*
+ * Common stuff for both V4L1 and V4L2
+ * Moved from videodev.h
+ */
+#define VIDEO_MAX_FRAME 32
+#define VIDEO_MAX_PLANES 8
+
+/*
+ * M I S C E L L A N E O U S
+ */
+
+/* Four-character-code (FOURCC) */
+#define v4l2_fourcc(a, b, c, d)\
+ ((__u32)(a) | ((__u32)(b) << 8) | ((__u32)(c) << 16) | ((__u32)(d) << 24))
+#define v4l2_fourcc_be(a, b, c, d) (v4l2_fourcc(a, b, c, d) | (1 << 31))
+
+/*
+ * E N U M S
+ */
+enum v4l2_field {
+ V4L2_FIELD_ANY = 0, /* driver can choose from none,
+ top, bottom, interlaced
+ depending on whatever it thinks
+ is approximate ... */
+ V4L2_FIELD_NONE = 1, /* this device has no fields ... */
+ V4L2_FIELD_TOP = 2, /* top field only */
+ V4L2_FIELD_BOTTOM = 3, /* bottom field only */
+ V4L2_FIELD_INTERLACED = 4, /* both fields interlaced */
+ V4L2_FIELD_SEQ_TB = 5, /* both fields sequential into one
+ buffer, top-bottom order */
+ V4L2_FIELD_SEQ_BT = 6, /* same as above + bottom-top order */
+ V4L2_FIELD_ALTERNATE = 7, /* both fields alternating into
+ separate buffers */
+ V4L2_FIELD_INTERLACED_TB = 8, /* both fields interlaced, top field
+ first and the top field is
+ transmitted first */
+ V4L2_FIELD_INTERLACED_BT = 9, /* both fields interlaced, top field
+ first and the bottom field is
+ transmitted first */
+};
+#define V4L2_FIELD_HAS_TOP(field) \
+ ((field) == V4L2_FIELD_TOP ||\
+ (field) == V4L2_FIELD_INTERLACED ||\
+ (field) == V4L2_FIELD_INTERLACED_TB ||\
Home |
Main Index |
Thread Index |
Old Index