View | Details | Raw Unified | Return to bug 202280
Collapse All | Expand All

(-)multimedia/libv4l/Makefile (-5 / +6 lines)
Lines 4-10 Link Here
4
4
5
PORTNAME?=	libv4l
5
PORTNAME?=	libv4l
6
PORTVERSION=	1.6.3
6
PORTVERSION=	1.6.3
7
PORTREVISION?=	0
7
PORTREVISION?=	1
8
CATEGORIES=	multimedia
8
CATEGORIES=	multimedia
9
MASTER_SITES=	http://linuxtv.org/downloads/v4l-utils/:master \
9
MASTER_SITES=	http://linuxtv.org/downloads/v4l-utils/:master \
10
		LOCAL/kwm:local
10
		LOCAL/kwm:local
Lines 24-30 Link Here
24
24
25
.if ${LIBV4L_SLAVE} != compat
25
.if ${LIBV4L_SLAVE} != compat
26
BUILD_DEPENDS+=	v4l_compat>=${PORTVERSION}:${PORTSDIR}/multimedia/v4l_compat
26
BUILD_DEPENDS+=	v4l_compat>=${PORTVERSION}:${PORTSDIR}/multimedia/v4l_compat
27
LIB_DEPENDS+=	libargp.so:${PORTSDIR}/devel/argp-standalone
28
27
29
GNU_CONFIGURE=	yes
28
GNU_CONFIGURE=	yes
30
CPPFLAGS+=	-I${LOCALBASE}/include
29
CPPFLAGS+=	-I${LOCALBASE}/include
Lines 38-49 Link Here
38
37
39
. if ${LIBV4L_SLAVE} == utils
38
. if ${LIBV4L_SLAVE} == utils
40
BUILD_DEPENDS+=	libv4l>=${PORTVERSION}:${PORTSDIR}/multimedia/libv4l
39
BUILD_DEPENDS+=	libv4l>=${PORTVERSION}:${PORTSDIR}/multimedia/libv4l
41
LIB_DEPENDS+=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
40
LIB_DEPENDS+=	libargp.so:${PORTSDIR}/devel/argp-standalone \
42
# Disabling building libv4l in the utils slave is too much hackery 
41
		libv4l2.so:${PORTSDIR}/multimedia/libv4l
42
# Disabling building libv4l in the utils slave is too much hackery
43
# Lets wait for subpackages
43
# Lets wait for subpackages
44
CONFIGURE_ARGS+=--enable-v4l-utils 
44
CONFIGURE_ARGS+=--enable-v4l-utils
45
. else
45
. else
46
CONFIGURE_ARGS+=--disable-v4l-utils --enable-libv4l
46
CONFIGURE_ARGS+=--disable-v4l-utils --enable-libv4l
47
EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-configure
47
. endif
48
. endif
48
.endif
49
.endif
49
50
(-)multimedia/libv4l/files/extra-patch-configure (+78 lines)
Line 0 Link Here
1
--- configure.orig	2015-08-12 21:40:16 UTC
2
+++ configure
3
@@ -18563,75 +18563,6 @@ fi
4
 
5
 LIBS=$dl_saved_libs
6
 
7
-ac_fn_c_check_header_mongrel "$LINENO" "argp.h" "ac_cv_header_argp_h" "$ac_includes_default"
8
-if test "x$ac_cv_header_argp_h" = xyes; then :
9
-
10
-else
11
-  as_fn_error $? "Cannot continue: argp.h not found" "$LINENO" 5
12
-fi
13
-
14
-
15
-argp_saved_libs=$LIBS
16
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing argp_parse" >&5
17
-$as_echo_n "checking for library containing argp_parse... " >&6; }
18
-if ${ac_cv_search_argp_parse+:} false; then :
19
-  $as_echo_n "(cached) " >&6
20
-else
21
-  ac_func_search_save_LIBS=$LIBS
22
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
23
-/* end confdefs.h.  */
24
-
25
-/* Override any GCC internal prototype to avoid an error.
26
-   Use char because int might match the return type of a GCC
27
-   builtin and then its argument prototype would still apply.  */
28
-#ifdef __cplusplus
29
-extern "C"
30
-#endif
31
-char argp_parse ();
32
-int
33
-main ()
34
-{
35
-return argp_parse ();
36
-  ;
37
-  return 0;
38
-}
39
-_ACEOF
40
-for ac_lib in '' argp; do
41
-  if test -z "$ac_lib"; then
42
-    ac_res="none required"
43
-  else
44
-    ac_res=-l$ac_lib
45
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
46
-  fi
47
-  if ac_fn_c_try_link "$LINENO"; then :
48
-  ac_cv_search_argp_parse=$ac_res
49
-fi
50
-rm -f core conftest.err conftest.$ac_objext \
51
-    conftest$ac_exeext
52
-  if ${ac_cv_search_argp_parse+:} false; then :
53
-  break
54
-fi
55
-done
56
-if ${ac_cv_search_argp_parse+:} false; then :
57
-
58
-else
59
-  ac_cv_search_argp_parse=no
60
-fi
61
-rm conftest.$ac_ext
62
-LIBS=$ac_func_search_save_LIBS
63
-fi
64
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_argp_parse" >&5
65
-$as_echo "$ac_cv_search_argp_parse" >&6; }
66
-ac_res=$ac_cv_search_argp_parse
67
-if test "$ac_res" != no; then :
68
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
69
-  test "$ac_cv_search_argp_parse" = "none required" || ARGP_LIBS=$ac_cv_search_argp_parse
70
-else
71
-  as_fn_error $? "unable to find the argp_parse() function" "$LINENO" 5
72
-fi
73
-
74
-
75
-LIBS=$argp_saved_libs
76
 
77
 ac_fn_c_check_header_mongrel "$LINENO" "linux/i2c-dev.h" "ac_cv_header_linux_i2c_dev_h" "$ac_includes_default"
78
 if test "x$ac_cv_header_linux_i2c_dev_h" = xyes; then :

Return to bug 202280