[Midnightbsd-cvs] mports [17047] trunk/multimedia/libv4l: libv4l 0.8.8
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Sep 13 22:09:44 EDT 2014
Revision: 17047
http://svnweb.midnightbsd.org/mports/?rev=17047
Author: laffer1
Date: 2014-09-13 22:09:43 -0400 (Sat, 13 Sep 2014)
Log Message:
-----------
libv4l 0.8.8
Modified Paths:
--------------
trunk/multimedia/libv4l/Makefile
trunk/multimedia/libv4l/distinfo
trunk/multimedia/libv4l/pkg-plist
Added Paths:
-----------
trunk/multimedia/libv4l/files/patch-include_libv4l1-videodev.h
trunk/multimedia/libv4l/files/patch-libv4lconvert_control_libv4lcontrol.c
Modified: trunk/multimedia/libv4l/Makefile
===================================================================
--- trunk/multimedia/libv4l/Makefile 2014-09-14 02:08:29 UTC (rev 17046)
+++ trunk/multimedia/libv4l/Makefile 2014-09-14 02:09:43 UTC (rev 17047)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= libv4l
-PORTVERSION= 0.8.1
+PORTVERSION= 0.8.8
CATEGORIES= multimedia
MASTER_SITES= http://linuxtv.org/downloads/v4l-utils/
DISTNAME= v4l-utils-${PORTVERSION}
@@ -8,31 +8,26 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= Video4Linux library
-LICENSE= lgpl
-BUILD_DEPENDS= v4l_compat>=1.0.20101027:${PORTSDIR}/multimedia/v4l_compat
+LICENSE= gpl2
-MAKE_ARGS= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LIBDIR="${PREFIX}/lib"
-USE_BZIP2= yes
-USE_GMAKE= yes
+BUILD_DEPENDS= v4l_compat>=1.0.20120501:${PORTSDIR}/multimedia/v4l_compat
+LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg
+
+MAKE_ARGS= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib" LIBDIR="${PREFIX}/lib"
+USES= gmake tar:bzip2
USE_LDCONFIG= yes
FAKE_OPTS+= trueprefix
WRKSRC= ${WRKDIR}/${DISTNAME}/lib
-.include <bsd.port.pre.mk>
-
post-patch:
-.if ${OSVERSION} < 3000
- @${REINPLACE_CMD} -e 's|-fvisibility=hidden||g' -e 's|-lrt||g' \
- ${WRKSRC}/libv4l1/Makefile \
- ${WRKSRC}/libv4l2/Makefile \
- ${WRKSRC}/libv4lconvert/Makefile
-.endif
@${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
+ -e 's|-lrt||g' \
${WRKSRC}/libv4l1/Makefile \
${WRKSRC}/libv4l2/Makefile \
${WRKSRC}/libv4lconvert/Makefile
@${RM} ${WRKSRC}/../include/linux/videodev2.h
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: trunk/multimedia/libv4l/distinfo
===================================================================
--- trunk/multimedia/libv4l/distinfo 2014-09-14 02:08:29 UTC (rev 17046)
+++ trunk/multimedia/libv4l/distinfo 2014-09-14 02:09:43 UTC (rev 17047)
@@ -1,3 +1,2 @@
-SHA256 (v4l-utils-0.8.1.tar.bz2) = 2b03003f1e081c5c98d1fe287c0d88a6c720ca972c4d80a1782146bbde1ac5ea
-RMD160 (v4l-utils-0.8.1.tar.bz2) = da497fa64f53365112db596c1884eb66be5ad32f
-SIZE (v4l-utils-0.8.1.tar.bz2) = 287114
+SHA256 (v4l-utils-0.8.8.tar.bz2) = 5fa4c6f4b6f5410de57271a03cc9a15f15195ef3fc05a8e42ecf507d6d70a87f
+SIZE (v4l-utils-0.8.8.tar.bz2) = 420888
Added: trunk/multimedia/libv4l/files/patch-include_libv4l1-videodev.h
===================================================================
--- trunk/multimedia/libv4l/files/patch-include_libv4l1-videodev.h (rev 0)
+++ trunk/multimedia/libv4l/files/patch-include_libv4l1-videodev.h 2014-09-14 02:09:43 UTC (rev 17047)
@@ -0,0 +1,18 @@
+diff -ru v4l-utils-0.8.4.orig/lib/include/libv4l1-videodev.h v4l-utils-0.8.4/lib/include/libv4l1-videodev.h
+--- include/libv4l1-videodev.h 2011-06-27 09:52:38.000000000 +0200
++++ include/libv4l1-videodev.h 2011-06-27 09:55:51.000000000 +0200
+@@ -2,7 +2,14 @@
+ #ifndef __LINUX_VIDEODEV_H
+ #define __LINUX_VIDEODEV_H
+
++#ifdef linux
+ #include <linux/ioctl.h>
++#endif
++
++#ifdef __FreeBSD__
++#include <sys/ioctl.h>
++#endif
++
+ #include <stdint.h>
+
+ #define VID_TYPE_CAPTURE 1 /* Can capture */
Added: trunk/multimedia/libv4l/files/patch-libv4lconvert_control_libv4lcontrol.c
===================================================================
--- trunk/multimedia/libv4l/files/patch-libv4lconvert_control_libv4lcontrol.c (rev 0)
+++ trunk/multimedia/libv4l/files/patch-libv4lconvert_control_libv4lcontrol.c 2014-09-14 02:09:43 UTC (rev 17047)
@@ -0,0 +1,40 @@
+--- libv4lconvert/control/libv4lcontrol.c.orig 2012-05-02 21:17:37.000000000 +0200
++++ libv4lconvert/control/libv4lcontrol.c 2012-05-06 08:52:42.000000000 +0200
+@@ -345,6 +345,16 @@
+ unsigned short *vendor_id, unsigned short *product_id,
+ int *speed)
+ {
++#ifdef __FreeBSD__
++#define WEBCAMD_IOCTL_GET_USB_VENDOR_ID _IOR('q', 250, unsigned short)
++#define WEBCAMD_IOCTL_GET_USB_PRODUCT_ID _IOR('q', 251, unsigned short)
++#define WEBCAMD_IOCTL_GET_USB_SPEED _IOR('q', 252, unsigned int)
++ if (ioctl(data->fd, WEBCAMD_IOCTL_GET_USB_VENDOR_ID, vendor_id) == 0 &&
++ ioctl(data->fd, WEBCAMD_IOCTL_GET_USB_PRODUCT_ID, product_id) == 0 &&
++ ioctl(data->fd, WEBCAMD_IOCTL_GET_USB_SPEED, speed) == 0)
++ return (1);
++ return (0);
++#else
+ FILE *f;
+ int i, minor;
+ struct stat st;
+@@ -434,6 +444,7 @@
+ return 0; /* Should never happen */
+
+ return 1;
++#endif
+ }
+
+ /*
+@@ -456,7 +456,12 @@
+ while (isspace(*start)) start++;
+ n = strlen(start);
+ while (n > 0 && isspace(start[n-1])) --n;
++#ifndef __FreeBSD__
+ trimmed_dmi = strndupa(start, n);
++#else
++ trimmed_dmi = (char *)alloca(n + 1);
++ strlcpy(trimmed_dmi, start, n + 1);
++#endif
+
+ /* find trimmed value */
+ for (entry_ptr = table_entries; *entry_ptr; entry_ptr++) {
Modified: trunk/multimedia/libv4l/pkg-plist
===================================================================
--- trunk/multimedia/libv4l/pkg-plist 2014-09-14 02:08:29 UTC (rev 17046)
+++ trunk/multimedia/libv4l/pkg-plist 2014-09-14 02:09:43 UTC (rev 17047)
@@ -1,17 +1,18 @@
+include/libv4l1-videodev.h
+include/libv4l1.h
+include/libv4l2.h
include/libv4lconvert.h
-include/libv4l2.h
-include/libv4l1.h
lib/libv4l/ov511-decomp
lib/libv4l/ov518-decomp
+lib/libv4l/v4l1compat.so
lib/libv4l/v4l2convert.so
-lib/libv4l/v4l1compat.so
+lib/libv4l1.so
+lib/libv4l1.so.0
+lib/libv4l2.so
+lib/libv4l2.so.0
+lib/libv4lconvert.so
lib/libv4lconvert.so.0
-lib/libv4lconvert.so
+libdata/pkgconfig/libv4l1.pc
+libdata/pkgconfig/libv4l2.pc
libdata/pkgconfig/libv4lconvert.pc
-libdata/pkgconfig/libv4l2.pc
-libdata/pkgconfig/libv4l1.pc
-lib/libv4l2.so.0
-lib/libv4l2.so
-lib/libv4l1.so.0
-lib/libv4l1.so
@dirrm lib/libv4l
More information about the Midnightbsd-cvs
mailing list