diff options
| author | flz <flz@FreeBSD.org> | 2005-09-28 19:00:10 +0800 |
|---|---|---|
| committer | flz <flz@FreeBSD.org> | 2005-09-28 19:00:10 +0800 |
| commit | c3b118a90bc321bc2ad601c4ba723668e7d609ad (patch) | |
| tree | 3e4bd251a4ce790c939b976765555f8205108322 /multimedia/mplayer | |
| parent | ce761f80b197207332b7867af5bddc2ebbfd08f3 (diff) | |
| download | freebsd-ports-graphics-c3b118a90bc321bc2ad601c4ba723668e7d609ad.tar.gz freebsd-ports-graphics-c3b118a90bc321bc2ad601c4ba723668e7d609ad.tar.zst freebsd-ports-graphics-c3b118a90bc321bc2ad601c4ba723668e7d609ad.zip | |
- Correctly detect infrared control interface lirc
(by Daniel O'Connor <doconnor@gsoft.com.au>).
- Remove obsolete "--disable-tremor" from CONFIGURE_ARGS.
PR: ports/86664
Submitted by: maintainer
Diffstat (limited to 'multimedia/mplayer')
| -rw-r--r-- | multimedia/mplayer/Makefile | 17 | ||||
| -rw-r--r-- | multimedia/mplayer/files/patch-ad | 20 |
2 files changed, 33 insertions, 4 deletions
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 1e3e509034c..86556d65ee4 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -178,6 +178,9 @@ # WITH_LIBDV # default: autodetect # +# WITH_LIRC +# default: autodetect +# # WITH_MAD # default: autodetect # @@ -303,8 +306,7 @@ CONFIGURE_ARGS= --with-extralibdir=${LOCALBASE}/lib \ --enable-menu \ --disable-libfame \ --disable-external-faad \ - --disable-tv-v4l \ - --disable-tremor + --disable-tv-v4l .if !defined(MPLAYER_GENERIC_BUILD) .if defined(WITHOUT_X11) @@ -388,6 +390,10 @@ WITH_LIBDV= yes WITH_LIBUNGIF= yes .endif +.if exists(${LOCALBASE}/lib/liblirc_client.so.0) +WITH_LIRC= yes +.endif + .if exists(${LOCALBASE}/lib/libmad.so.2) WITH_MAD= yes .endif @@ -656,6 +662,13 @@ CONFIGURE_ARGS+= --enable-libdv CONFIGURE_ARGS+= --disable-libdv .endif +.if defined(WITH_LIRC) +LIB_DEPENDS+= lirc_client.0:${PORTSDIR}/comms/lirc +CONFIGURE_ARGS+= --enable-lirc +.else +CONFIGURE_ARGS+= --disable-lirc +.endif + .if defined(WITH_MAD) LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad diff --git a/multimedia/mplayer/files/patch-ad b/multimedia/mplayer/files/patch-ad index 47d4c8fd354..7b037c5c485 100644 --- a/multimedia/mplayer/files/patch-ad +++ b/multimedia/mplayer/files/patch-ad @@ -1,5 +1,5 @@ ---- configure.orig Wed Apr 13 07:46:35 2005 -+++ configure Thu Jun 2 23:54:17 2005 +--- configure.orig Wed Apr 13 13:46:35 2005 ++++ configure Tue Sep 27 21:31:54 2005 @@ -29,9 +29,9 @@ echo >> "$TMPLOG" cat "$TMPC" >> "$TMPLOG" @@ -189,3 +189,19 @@ fi # 64 bit file offsets? if test "$_largefiles" = yes || freebsd ; then +@@ -6640,13 +6582,11 @@ + echocheck "lirc" + if test "$_lirc" = auto ; then + _lirc=no +- if test -c /dev/lirc -o -c /dev/lirc/0 ; then +- cat > $TMPC <<EOF ++ cat > $TMPC <<EOF + #include <lirc/lirc_client.h> + int main(void) { return 0; } + EOF +- cc_check -llirc_client && _lirc=yes +- fi ++ cc_check -llirc_client && _lirc=yes + fi + if test "$_lirc" = yes ; then + _def_lirc='#define HAVE_LIRC 1' |