pkg/35080: add a 'liblive' option to mplayer/mencoder

["\"\" <Anthony Mallet" <anthony.mallet%useless-ficus.net@localhost>]

>Number:         35080
>Category:       pkg
>Synopsis:       add a 'liblive' option to mplayer/mencoder
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Nov 19 16:30:00 +0000 2006
>Originator:     "\"\" <Anthony Mallet" 
><anthony.mallet%useless-ficus.net@localhost>
>Release:        NetBSD 4.99.3 i386
>Organization:
>Environment:


System: NetBSD 4.99.3 (CITRUS) #4: Sat Oct 21 03:38:26 CEST 2006
        troot@citrus:/usr/obj/sys/arch/i386/compile/CITRUS



>Description:


The following patch adds a 'liblive' option to both mplayer and mencoder so 
that they can handle those type of streams (this is used by some french DSL 
providers to stream TV).
It uses updated liblive package proposed in PR#35079.
I had to twiddle the configure script because of the weird structure of liblive 
that we break out in pkgsrc.

-- Cheers,
Anthony



>How-To-Repeat:





>Fix:


--- mplayer-patch begins here ---
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/mplayer-share/distinfo,v
retrieving revision 1.34
diff -u -r1.34 distinfo
--- distinfo    31 Oct 2006 22:33:28 -0000      1.34
+++ distinfo    19 Nov 2006 16:16:30 -0000
@@ -3,7 +3,7 @@
 SHA1 (mplayer-1.0rc9/MPlayer-1.0rc1.tar.bz2) = 
a450c0b0749c343a8496ba7810363c9d46dfa73c
 RMD160 (mplayer-1.0rc9/MPlayer-1.0rc1.tar.bz2) = 
8cea02e832aec5d9e090829d61d0f131dcc177a2
 Size (mplayer-1.0rc9/MPlayer-1.0rc1.tar.bz2) = 8414213 bytes
-SHA1 (patch-aa) = ec50dd83f781fbac260ff469846c8c91b6471642
+SHA1 (patch-aa) = 0df338b23f1709bb31847e8f9b02973b310f2670
 SHA1 (patch-ab) = 29bf59ecb3d283708ae1c5002d1fa71cac627cc9
 SHA1 (patch-ac) = 6d0de4bd41d9842ea1bf46e9fbe60bf6a943b913
 SHA1 (patch-ah) = 7aeb9f04d622fcad8c40dc9edbb0a58277fc622b
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/mplayer-share/options.mk,v
retrieving revision 1.19
diff -u -r1.19 options.mk
--- options.mk  31 Oct 2006 22:33:28 -0000      1.19
+++ options.mk  19 Nov 2006 16:16:30 -0000
@@ -19,6 +19,7 @@
 .else
 PKG_SUPPORTED_OPTIONS= gif jpeg mad dts dv dvdread png theora vorbis
 .endif
+PKG_SUPPORTED_OPTIONS+= liblive
 
 # Set options based on the specific package being built.
 .if !empty(PKGNAME:M*mplayer*)
@@ -61,7 +62,7 @@
 .for _o_ in aalib arts cdparanoia dv dvdread esound gif jpeg \
            lame mad mplayer-menu mplayer-real \
            mplayer-runtime-cpudetection mplayer-win32 \
-           nas oss png sdl theora vorbis xvid
+           nas oss png sdl theora vorbis xvid liblive
 .  if !empty(PKG_SUPPORTED_OPTIONS:M${_o_})
 PKG_SUGGESTED_OPTIONS+=        ${_o_}
 .  endif
@@ -251,4 +252,12 @@
 CONFIGURE_ARGS+=       --disable-xvid
 .endif
 
+.if !empty(PKG_OPTIONS:Mliblive)
+CONFIGURE_ARGS+=       --enable-live
+CONFIGURE_ARGS+=       --with-livelibdir=${PREFIX}/include/liblive
+.  include "../../net/liblive/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-live
+.endif
+
 .endif # defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/mplayer-share/patches/patch-aa,v
retrieving revision 1.17
diff -u -r1.17 patch-aa
--- patches/patch-aa    31 Oct 2006 22:33:28 -0000      1.17
+++ patches/patch-aa    19 Nov 2006 16:16:30 -0000
@@ -1,8 +1,6 @@
-$NetBSD: patch-aa,v 1.17 2006/10/31 22:33:28 wiz Exp $
-
---- configure.orig     2006-10-22 22:32:31.000000000 +0000
-+++ configure
-@@ -515,7 +515,7 @@ for ac_option do
+--- configure.orig     2006-10-23 00:32:31.000000000 +0200
++++ configure  2006-11-19 00:48:56.000000000 +0100
+@@ -515,7 +515,7 @@
      _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
      ;;
    --with-extralibdir=*)
@@ -11,7 +9,7 @@
      ;;
    --extra-libs=*)
      _extra_libs=`echo $ac_option | cut -d '=' -f 2`
-@@ -719,11 +719,11 @@ if test "$_gcc_check" = yes ; then
+@@ -719,11 +719,11 @@
    esac
    echores "$cc_version"
   else
@@ -25,7 +23,7 @@
    if test "$?" -gt 0; then
      cc_version="not found"
    fi
-@@ -855,7 +855,7 @@ if x86 || x86_64 ; then
+@@ -855,7 +855,7 @@
    # gather more CPU information
    pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | _head 1`
    pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2  | cut -d ' ' -f 2 
| _head 1`
@@ -34,7 +32,7 @@
    pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | 
cut -d ' ' -f 2 | _head 1`
    pstepping=`$_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 
| _head 1`
  
-@@ -3034,7 +3034,6 @@ fi
+@@ -3034,7 +3034,6 @@
  echores "$_pthreads"
  
  echocheck "rpath"
@@ -42,7 +40,7 @@
  if test "$_rpath" = yes ; then
    for I in `echo $_ld_extra | sed 's/-L//g'` ; do
      tmp="$tmp ` echo $I | sed 's/.*/ -L& -Wl,-R&/'`"
-@@ -4192,7 +4191,7 @@ fi
+@@ -4192,7 +4191,7 @@
  if test "$_aa" = yes ; then
    _def_aa='#define HAVE_AA 1'
    if cygwin ; then
@@ -51,3 +49,27 @@
    fi
    _vosrc="$_vosrc vo_aa.c"
    _vomodules="aa $_vomodules"
+@@ -6086,15 +6085,15 @@
+ if test "$_live" = yes && test "$_network" = yes ; then
+   _res_comment="using $_livelibdir"
+   _def_live='#define STREAMING_LIVE555 1'
+-  _ld_live="$_livelibdir/liveMedia/libliveMedia.a \
+-           $_livelibdir/groupsock/libgroupsock.a \
+-           $_livelibdir/UsageEnvironment/libUsageEnvironment.a \
+-           $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a \
++  _ld_live="-lliveMedia \
++           -lgroupsock \
++           -lUsageEnvironment \
++           -lBasicUsageEnvironment \
+            -lstdc++"
+-  _inc_extra="$_inc_extra -I$_livelibdir/liveMedia/include \
+-             -I$_livelibdir/UsageEnvironment/include \
+-             -I$_livelibdir/BasicUsageEnvironment/include \
+-             -I$_livelibdir/groupsock/include"
++  _inc_extra="$_inc_extra -I$_livelibdir/liveMedia \
++             -I$_livelibdir/UsageEnvironment \
++             -I$_livelibdir/BasicUsageEnvironment \
++             -I$_livelibdir/groupsock"
+  _inputmodules="live555 $_inputmodules"
+ elif test "$_live_dist" = yes && test "$_network" = yes ; then
+   _res_comment="using distribution version"
--- mplayer-patch ends here ---