Ping (and include minor update to 1.12.3)
On Sat, Feb 04, 2017 at 03:21:53PM +0100, Ingo Feinerer wrote:
> Update multimedia/libv4l 1.10.1 -> 1.12.2.
>
> Following patches can be deleted (now included as such in upstream):
>
> patch-configure_ac
> patch-lib_include_libv4l1-videodev_h
> patch-lib_include_libv4l2rds_h
> patch-lib_include_libv4lconvert_h
> patch-lib_libv4l-mplane_libv4l-mplane_c
> patch-lib_libv4l1_libv4l1_c
> patch-lib_libv4l2_log_c
> patch-lib_libv4l2_v4l2convert_c
> patch-lib_libv4l2rds_libv4l2rds_c
> patch-lib_libv4lconvert_libv4lsyscall-priv_h
> patch-lib_libv4lconvert_processing_libv4lprocessing_h
>
> Following patches can be deleted as well but have been addressed by
> upstream in a different way:
>
> patch-lib_libv4lconvert_jpeg_memsrcdest_c
> patch-lib_libv4lconvert_jpeg_memsrcdest_h
>
> Instead of changing the function signature they check for
> !defined(MEM_SRCDST_SUPPORTED) which is intended to exclude the memsrc
> implementation for libjpeg-turbo.
>
> Note: this update requires sys/videoio.h >= 1.15.
>
> Successfully tested on amd64 in combination with baresip.
>
> OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/libv4l/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 25 Jun 2016 12:37:55 -0000 1.8
+++ Makefile 18 Feb 2017 12:01:42 -0000
@@ -2,10 +2,9 @@
COMMENT = libv4l userspace library
-VERSION = 1.10.1
+VERSION = 1.12.3
DISTNAME = v4l-utils-${VERSION}
PKGNAME = libv4l-${VERSION}
-REVISION = 0
SHARED_LIBS += v4l1 0.0 # 0.0
SHARED_LIBS += v4l2 0.0 # 0.0
@@ -21,19 +20,21 @@ MAINTAINER = Ingo Feinerer <feinerer@lo
# LGPLv2+
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += c jpeg m pthread
+WANTLIB += c execinfo jpeg m pthread
MASTER_SITES = http://linuxtv.org/downloads/v4l-utils/
EXTRACT_SUFX = .tar.bz2
BUILD_DEPENDS = devel/argp-standalone
-LIB_DEPENDS = graphics/jpeg>=1.5.0v0
+LIB_DEPENDS = devel/libexecinfo \
+ graphics/jpeg>=1.5.0v0
SEPARATE_BUILD = Yes
LIBTOOL_FLAGS = --tag=disable-static
CONFIGURE_STYLE = autoconf
-CONFIGURE_ARGS = --disable-doxygen-doc
+CONFIGURE_ARGS = --disable-doxygen-doc \
+ --disable-static
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/libv4l/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 17 Jun 2016 05:25:51 -0000 1.3
+++ distinfo 18 Feb 2017 12:01:42 -0000
@@ -1,2 +1,2 @@
-SHA256 (v4l-utils-1.10.1.tar.bz2) =
YUfMwp/n3TxcOZTWE8TyoJm6yLRGlKluXPTXysqDNsA=
-SIZE (v4l-utils-1.10.1.tar.bz2) = 1352235
+SHA256 (v4l-utils-1.12.3.tar.bz2) =
Wkfdbw59/pAtlGBcAdOFpKTodYP/WFbW8YGQDqgc9G4=
+SIZE (v4l-utils-1.12.3.tar.bz2) = 1588049
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- patches/patch-configure_ac 7 Jan 2016 17:12:21 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.1.1.1 2016/01/07 17:12:21 feinerer Exp $
---- configure.ac.orig Mon Oct 12 22:33:47 2015
-+++ configure.ac Sat Jan 2 20:55:35 2016
-@@ -142,6 +142,9 @@ case "$host_os" in
- linux*)
- linux_os="yes"
- ;;
-+ freebsd*)
-+ freebsd_os="yes"
-+ ;;
- esac
-
- AM_CONDITIONAL([LINUX_OS], [test x$linux_os = xyes])
-@@ -410,7 +413,7 @@ AS_IF([test x$enable_libv4l = xno], [AC_SUBST([ENFOR
-
- if test "x$linux_os" = "xyes"; then
- CPPFLAGS="-I\$(top_srcdir)/include $CPPFLAGS"
--else
-+elif test "x$freebsd_os" = "xyes"; then
- CPPFLAGS="-I\$(top_srcdir)/contrib/freebsd/include $CPPFLAGS"
- fi
-
Index: patches/patch-lib_include_libv4l1-videodev_h
===================================================================
RCS file: patches/patch-lib_include_libv4l1-videodev_h
diff -N patches/patch-lib_include_libv4l1-videodev_h
--- patches/patch-lib_include_libv4l1-videodev_h 7 Jan 2016 17:12:21
-0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-lib_include_libv4l1-videodev_h,v 1.1.1.1 2016/01/07 17:12:21
feinerer Exp $
---- lib/include/libv4l1-videodev.h.orig Tue Nov 24 19:57:39 2015
-+++ lib/include/libv4l1-videodev.h Tue Nov 24 19:57:52 2015
-@@ -6,7 +6,7 @@
- #include <linux/ioctl.h>
- #endif
-
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ||
defined(__OpenBSD__)
- #include <sys/ioctl.h>
- #endif
-
Index: patches/patch-lib_include_libv4l2rds_h
===================================================================
RCS file: patches/patch-lib_include_libv4l2rds_h
diff -N patches/patch-lib_include_libv4l2rds_h
--- patches/patch-lib_include_libv4l2rds_h 7 Jan 2016 17:12:21 -0000
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-lib_include_libv4l2rds_h,v 1.1.1.1 2016/01/07 17:12:21
feinerer Exp $
---- lib/include/libv4l2rds.h.orig Sat Sep 19 20:54:16 2015
-+++ lib/include/libv4l2rds.h Sun Nov 22 10:50:47 2015
-@@ -24,7 +24,11 @@
- #include <stdbool.h>
- #include <stdint.h>
-
-+#if defined(__OpenBSD__)
-+#include <sys/videoio.h>
-+#else
- #include <linux/videodev2.h>
-+#endif
-
- #ifdef __cplusplus
- extern "C" {
Index: patches/patch-lib_include_libv4lconvert_h
===================================================================
RCS file: patches/patch-lib_include_libv4lconvert_h
diff -N patches/patch-lib_include_libv4lconvert_h
--- patches/patch-lib_include_libv4lconvert_h 7 Jan 2016 17:12:21 -0000
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-$OpenBSD: patch-lib_include_libv4lconvert_h,v 1.1.1.1 2016/01/07 17:12:21
feinerer Exp $
---- lib/include/libv4lconvert.h.orig Sat Sep 19 20:54:16 2015
-+++ lib/include/libv4lconvert.h Sun Nov 22 10:51:01 2015
-@@ -28,7 +28,7 @@
- #include <linux/ioctl.h>
- #endif
-
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ||
defined(__OpenBSD__)
- #include <sys/time.h>
- #include <sys/types.h>
- #include <sys/ioctl.h>
-@@ -36,7 +36,11 @@
-
- /* end broken header workaround includes */
-
-+#if defined(__OpenBSD__)
-+#include <sys/videoio.h>
-+#else
- #include <linux/videodev2.h>
-+#endif
-
- #ifdef __cplusplus
- extern "C" {
Index: patches/patch-lib_libv4l-mplane_libv4l-mplane_c
===================================================================
RCS file: patches/patch-lib_libv4l-mplane_libv4l-mplane_c
diff -N patches/patch-lib_libv4l-mplane_libv4l-mplane_c
--- patches/patch-lib_libv4l-mplane_libv4l-mplane_c 7 Jan 2016 17:12:21
-0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-lib_libv4l-mplane_libv4l-mplane_c,v 1.1.1.1 2016/01/07
17:12:21 feinerer Exp $
---- lib/libv4l-mplane/libv4l-mplane.c.orig Sun Nov 22 11:16:57 2015
-+++ lib/libv4l-mplane/libv4l-mplane.c Sun Nov 22 11:21:26 2015
-@@ -26,7 +26,12 @@
- #include <unistd.h>
- #include <sys/syscall.h>
-
-+#if defined(__OpenBSD__)
-+#include <sys/videoio.h>
-+#include <sys/ioctl.h>
-+#else
- #include <linux/videodev2.h>
-+#endif
-
- #include "libv4l-plugin.h"
-
Index: patches/patch-lib_libv4l1_libv4l1_c
===================================================================
RCS file: patches/patch-lib_libv4l1_libv4l1_c
diff -N patches/patch-lib_libv4l1_libv4l1_c
--- patches/patch-lib_libv4l1_libv4l1_c 7 Jan 2016 17:12:21 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-lib_libv4l1_libv4l1_c,v 1.1.1.1 2016/01/07 17:12:21 feinerer
Exp $
---- lib/libv4l1/libv4l1.c.orig Sun Nov 22 11:15:15 2015
-+++ lib/libv4l1/libv4l1.c Sun Nov 22 11:15:40 2015
-@@ -58,7 +58,11 @@
- #include <sys/types.h>
- #include <sys/mman.h>
- #include "../libv4lconvert/libv4lsyscall-priv.h"
-+#if defined(__OpenBSD__)
-+#include <sys/videoio.h>
-+#else
- #include <linux/videodev2.h>
-+#endif
- #include <libv4l2.h>
- #include "libv4l1.h"
- #include "libv4l1-priv.h"
Index: patches/patch-lib_libv4l2_log_c
===================================================================
RCS file: patches/patch-lib_libv4l2_log_c
diff -N patches/patch-lib_libv4l2_log_c
--- patches/patch-lib_libv4l2_log_c 7 Jan 2016 17:12:21 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-lib_libv4l2_log_c,v 1.1.1.1 2016/01/07 17:12:21 feinerer Exp $
---- lib/libv4l2/log.c.orig Sun Nov 22 11:12:14 2015
-+++ lib/libv4l2/log.c Sun Nov 22 11:12:43 2015
-@@ -28,7 +28,11 @@
- #include <string.h>
- #include <errno.h>
- #include "../libv4lconvert/libv4lsyscall-priv.h"
-+#if defined(__OpenBSD__)
-+#include <sys/videoio.h>
-+#else
- #include <linux/videodev2.h>
-+#endif
- #include "libv4l2.h"
- #include "libv4l2-priv.h"
-
Index: patches/patch-lib_libv4l2_v4l2convert_c
===================================================================
RCS file: patches/patch-lib_libv4l2_v4l2convert_c
diff -N patches/patch-lib_libv4l2_v4l2convert_c
--- patches/patch-lib_libv4l2_v4l2convert_c 31 Jan 2016 07:12:25 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-lib_libv4l2_v4l2convert_c,v 1.2 2016/01/31 07:12:25 feinerer
Exp $
---- lib/libv4l2/v4l2convert.c.orig Sat Jan 30 11:53:05 2016
-+++ lib/libv4l2/v4l2convert.c Sat Jan 30 11:54:10 2016
-@@ -36,7 +36,11 @@
- #include <string.h>
- #include <sys/ioctl.h>
- #include <sys/mman.h>
-+#if defined(__OpenBSD__)
-+#include <sys/videoio.h>
-+#else
- #include <linux/videodev2.h>
-+#endif
- #include <libv4l2.h>
- #include "../libv4lconvert/libv4lsyscall-priv.h"
-
Index: patches/patch-lib_libv4l2rds_libv4l2rds_c
===================================================================
RCS file: patches/patch-lib_libv4l2rds_libv4l2rds_c
diff -N patches/patch-lib_libv4l2rds_libv4l2rds_c
--- patches/patch-lib_libv4l2rds_libv4l2rds_c 7 Jan 2016 17:12:21 -0000
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-lib_libv4l2rds_libv4l2rds_c,v 1.1.1.1 2016/01/07 17:12:21
feinerer Exp $
---- lib/libv4l2rds/libv4l2rds.c.orig Sun Nov 22 11:16:07 2015
-+++ lib/libv4l2rds/libv4l2rds.c Sun Nov 22 11:16:30 2015
-@@ -27,7 +27,11 @@
- #include <sys/types.h>
- #include <sys/mman.h>
-
-+#if defined(__OpenBSD__)
-+#include <sys/videoio.h>
-+#else
- #include <linux/videodev2.h>
-+#endif
-
- #include "../include/libv4l2rds.h"
-
Index: patches/patch-lib_libv4lconvert_Makefile_in
===================================================================
RCS file:
/cvs/ports/multimedia/libv4l/patches/patch-lib_libv4lconvert_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-lib_libv4lconvert_Makefile_in
--- patches/patch-lib_libv4lconvert_Makefile_in 17 Jun 2016 05:25:51 -0000
1.2
+++ patches/patch-lib_libv4lconvert_Makefile_in 18 Feb 2017 12:01:42 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-lib_libv4lconvert_Makefi
OpenBSD does not have an rt library.
---- lib/libv4lconvert/Makefile.in.orig Wed Jun 15 20:59:32 2016
-+++ lib/libv4lconvert/Makefile.in Thu Jun 16 06:50:24 2016
-@@ -492,7 +492,7 @@ libv4lconvert_la_SOURCES = libv4lconvert.c tinyjpeg.c
+--- lib/libv4lconvert/Makefile.in.orig Sun Jan 22 22:00:05 2017
++++ lib/libv4lconvert/Makefile.in Tue Jan 24 15:17:18 2017
+@@ -500,7 +500,7 @@ libv4lconvert_la_SOURCES = libv4lconvert.c tinyjpeg.c
libv4lconvert-priv.h libv4lsyscall-priv.h tinyjpeg.h \
tinyjpeg-internal.h $(am__append_1)
libv4lconvert_la_CPPFLAGS = $(CFLAG_VISIBILITY) $(ENFORCE_LIBV4L_STATIC)
Index: patches/patch-lib_libv4lconvert_control_libv4lcontrol_c
===================================================================
RCS file:
/cvs/ports/multimedia/libv4l/patches/patch-lib_libv4lconvert_control_libv4lcontrol_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-lib_libv4lconvert_control_libv4lcontrol_c
--- patches/patch-lib_libv4lconvert_control_libv4lcontrol_c 7 Jan 2016
17:12:21 -0000 1.1.1.1
+++ patches/patch-lib_libv4lconvert_control_libv4lcontrol_c 18 Feb 2017
12:01:42 -0000
@@ -1,15 +1,11 @@
-$OpenBSD: patch-lib_libv4lconvert_control_libv4lcontrol_c,v 1.1.1.1 2016/01/07
17:12:21 feinerer Exp $
---- lib/libv4lconvert/control/libv4lcontrol.c.orig Sun Nov 22 10:58:54 2015
-+++ lib/libv4lconvert/control/libv4lcontrol.c Sun Nov 22 10:59:21 2015
-@@ -35,7 +35,11 @@
- #include "libv4lcontrol.h"
- #include "libv4lcontrol-priv.h"
- #include "../libv4lsyscall-priv.h"
-+#if defined(__OpenBSD__)
-+#include <sys/videoio.h>
-+#else
- #include <linux/videodev2.h>
-+#endif
-
- #define ARRAY_SIZE(x) ((int)sizeof(x) / (int)sizeof((x)[0]))
+$OpenBSD$
+--- lib/libv4lconvert/control/libv4lcontrol.c.orig Sat Jan 28 10:40:56 2017
++++ lib/libv4lconvert/control/libv4lcontrol.c Sat Jan 28 10:41:11 2017
+@@ -20,7 +20,6 @@
+ */
+ #include <sys/types.h>
+-#include <sys/sysmacros.h>
+ #include <sys/mman.h>
+ #include <fcntl.h>
+ #include <sys/stat.h>
Index: patches/patch-lib_libv4lconvert_jpeg_memsrcdest_c
===================================================================
RCS file: patches/patch-lib_libv4lconvert_jpeg_memsrcdest_c
diff -N patches/patch-lib_libv4lconvert_jpeg_memsrcdest_c
--- patches/patch-lib_libv4lconvert_jpeg_memsrcdest_c 25 Jun 2016 12:37:55
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-lib_libv4lconvert_jpeg_memsrcdest_c,v 1.1 2016/06/25 12:37:55
sthen Exp $
-
-Adapt for jpeg-turbo 1.5.0 jpeg_mem_src() API change
-
---- lib/libv4lconvert/jpeg_memsrcdest.c.orig Wed Jun 15 18:13:54 2016
-+++ lib/libv4lconvert/jpeg_memsrcdest.c Wed Jun 15 18:15:38 2016
-@@ -148,7 +148,7 @@ term_source (j_decompress_ptr cinfo)
- */
-
- GLOBAL(void)
--jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
-+jpeg_mem_src (j_decompress_ptr cinfo, const unsigned char * buffer,
- unsigned long bufsize)
- {
- my_src_ptr src;
Index: patches/patch-lib_libv4lconvert_jpeg_memsrcdest_h
===================================================================
RCS file: patches/patch-lib_libv4lconvert_jpeg_memsrcdest_h
diff -N patches/patch-lib_libv4lconvert_jpeg_memsrcdest_h
--- patches/patch-lib_libv4lconvert_jpeg_memsrcdest_h 25 Jun 2016 12:37:55
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-lib_libv4lconvert_jpeg_memsrcdest_h,v 1.1 2016/06/25 12:37:55
sthen Exp $
-
-Adapt for jpeg-turbo 1.5.0 jpeg_mem_src() API change
-
---- lib/libv4lconvert/jpeg_memsrcdest.h.orig Wed Jun 15 18:13:59 2016
-+++ lib/libv4lconvert/jpeg_memsrcdest.h Wed Jun 15 18:15:56 2016
-@@ -3,7 +3,7 @@
- #if JPEG_LIB_VERSION < 80
-
- void
--jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
-+jpeg_mem_src (j_decompress_ptr cinfo, const unsigned char * buffer,
- unsigned long bufsize);
-
- void
Index: patches/patch-lib_libv4lconvert_libv4lsyscall-priv_h
===================================================================
RCS file: patches/patch-lib_libv4lconvert_libv4lsyscall-priv_h
diff -N patches/patch-lib_libv4lconvert_libv4lsyscall-priv_h
--- patches/patch-lib_libv4lconvert_libv4lsyscall-priv_h 31 Jan 2016
07:12:25 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-$OpenBSD: patch-lib_libv4lconvert_libv4lsyscall-priv_h,v 1.2 2016/01/31
07:12:25 feinerer Exp $
---- lib/libv4lconvert/libv4lsyscall-priv.h.orig Sat Jan 30 11:56:05 2016
-+++ lib/libv4lconvert/libv4lsyscall-priv.h Sat Jan 30 12:00:34 2016
-@@ -63,6 +63,15 @@
- #define MMAP2_PAGE_SHIFT 0
- #endif
-
-+#if defined(__OpenBSD__)
-+#include <sys/syscall.h>
-+#include <sys/types.h>
-+#include <sys/ioctl.h>
-+#define _IOC_NR(cmd) ((cmd) & 0xFF)
-+#define _IOC_TYPE(cmd) IOCGROUP(cmd)
-+#define MMAP2_PAGE_SHIFT 0
-+#endif
-+
- #undef SYS_OPEN
- #undef SYS_CLOSE
- #undef SYS_IOCTL
-@@ -97,6 +106,11 @@
- #define SYS_MMAP(addr, len, prot, flags, fd, off) \
- syscall(SYS_mmap, (void *)(addr), (size_t)(len), \
- (int)(prot), (int)(flags), (int)(fd), (off_t)(off))
-+#elif defined(__OpenBSD__)
-+register_t __syscall(quad_t, ...);
-+#define SYS_MMAP(addr, len, prot, flags, fd, offset) \
-+ __syscall((quad_t)SYS_mmap, (void *)(addr), (size_t)(len), \
-+ (int)(prot), (int)(flags), (int)(fd), 0,
(off_t)(offset))
- #else
- #define SYS_MMAP(addr, len, prot, flags, fd, off) \
- syscall(SYS_mmap2, (void *)(addr), (size_t)(len), \
Index: patches/patch-lib_libv4lconvert_processing_libv4lprocessing_h
===================================================================
RCS file: patches/patch-lib_libv4lconvert_processing_libv4lprocessing_h
diff -N patches/patch-lib_libv4lconvert_processing_libv4lprocessing_h
--- patches/patch-lib_libv4lconvert_processing_libv4lprocessing_h 7 Jan
2016 17:12:21 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-lib_libv4lconvert_processing_libv4lprocessing_h,v 1.1.1.1
2016/01/07 17:12:21 feinerer Exp $
---- lib/libv4lconvert/processing/libv4lprocessing.h.orig Sat Sep 19
20:54:17 2015
-+++ lib/libv4lconvert/processing/libv4lprocessing.h Sun Nov 22 10:50:26 2015
-@@ -22,7 +22,11 @@
- #define __LIBV4LPROCESSING_H
-
- #include "../libv4lsyscall-priv.h"
-+#if defined(__OpenBSD__)
-+#include <sys/videoio.h>
-+#else
- #include <linux/videodev2.h>
-+#endif
-
- struct v4lprocessing_data;
- struct v4lcontrol_data;
