Re: pkg/46566: Update multimedia/mplayer to 1.1

To: pkg-manager%netbsd.org@localhost,gnats-admin%netbsd.org@localhost,pkgsrc-bugs%netbsd.org@localhost,Leonardo Taccari <iamleot%gmail.com@localhost>
Subject: Re: pkg/46566: Update multimedia/mplayer to 1.1
From: Leonardo Taccari <iamleot%gmail.com@localhost>
Date: Sun, 10 Jun 2012 17:20:03 +0000 (UTC)
The following reply was made to PR pkg/46566; it has been noted by GNATS.

From: Leonardo Taccari <iamleot%gmail.com@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/46566: Update multimedia/mplayer to 1.1
Date: Sun, 10 Jun 2012 19:18:14 +0200

 --CE+1k2dSO48ffgeK
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Hello all!
 I am very sorry that applying my patches broken multimedia/mplayer and
 the aa support... I updated the patches to fix this problem and I will
 attach them in this email.
 
 If you prefer to receive these and previous patches in other ways feel
 free to send an email to me!
 
 In the PR I forgot to mention that I didn't tested multimedia/gmplayer
 but the patches to update it should be trivial.
 
 
 Ciao,
 L.
 
 --CE+1k2dSO48ffgeK
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename=patches-new
 
 Index: distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/multimedia/mplayer-share/distinfo,v
 retrieving revision 1.74
 diff -u -r1.74 distinfo
 --- distinfo   2 Nov 2011 16:35:14 -0000       1.74
 +++ distinfo   10 Jun 2012 17:12:49 -0000
 @@ -1,20 +1,15 @@
  $NetBSD: distinfo,v 1.74 2011/11/02 16:35:14 drochner Exp $
  
 -SHA1 (mplayer/mplayer-20100913.tar.bz2) = 
6fd3acb29fa8455636bcd86f9f333da4763daa6d
 -RMD160 (mplayer/mplayer-20100913.tar.bz2) = 
79085d4ebdb824fc34f7bc128070ef11e874897d
 -Size (mplayer/mplayer-20100913.tar.bz2) = 9073690 bytes
 -SHA1 (patch-aa) = a1d82fd9999c656bd9ecf703cd9f2c0245330874
 -SHA1 (patch-ab) = 1a927d956155a7b9a2daa1a4f522e47d830c5af6
 -SHA1 (patch-ac) = 3d037c96537233cdbda582afdb878dcf3f43e923
 -SHA1 (patch-ad) = 84ce5a0f5cd8f59831c56b14dd2bc762793427ac
 -SHA1 (patch-ae) = 7e1f05cd6e09f8755debfff7061dadf0a8ca3a3f
 -SHA1 (patch-ag) = bef25568c913dcb8535afa51976ce7c94a6af5a2
 -SHA1 (patch-ah) = dcfc26ec1422581a03ab200cb95926f6fd896d5b
 -SHA1 (patch-an) = 3e72fb86abe7ab572f12a4fef002edb623ab6fae
 -SHA1 (patch-ar) = df7e7cdc6fb8187bbcf0b285afc14d275a51e17a
 -SHA1 (patch-as) = e353a1437101f661e012ce37004d8920913725cd
 -SHA1 (patch-libao2_ao_sun.c) = 14eedc06f70dd949da1fb84078877e7cf259eff1
 +SHA1 (mplayer/MPlayer-1.1.tar.gz) = e46e3294bc96daabe604e4e195721e4f2d1e5b48
 +RMD160 (mplayer/MPlayer-1.1.tar.gz) = 0369e57677c0c30f3b05f80ee1c4d8d7d1217e63
 +Size (mplayer/MPlayer-1.1.tar.gz) = 17018391 bytes
 +SHA1 (patch-aa) = bd0dab582534ae216b49eef52c4a6c82288ce23d
 +SHA1 (patch-ae) = e1178cd2ab74741e1f685029bbb461415705aa0d
 +SHA1 (patch-an) = 3b1af01b3b3e81d0583abb97b6a837b38476157b
 +SHA1 (patch-ar) = f48a889a11e2c958cf9e939d831e371b00474489
 +SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5
  SHA1 (patch-stream_dvb_tune.c) = b663830ff64ab31488684b1a324da50ab52d68cc
  SHA1 (patch-stream_dvbin.h) = 56f6e71fcdf6bf3afccbdbc8682834c806114677
 -SHA1 (patch-vb) = ce584c31e0e32865e87aa1f537a1f9e4817c7442
 -SHA1 (patch-ve_x264) = 1946a2b2a7643bbc1d3f6a8963e21c4f6cbd2c89
 +SHA1 (patch-sub_osd.c) = 47b17b4f7e998341a06ff231a1cbae30ec9651cc
 +SHA1 (patch-sub_subreader.c) = 06b7d90e2a46ee63e4385c805e2f5989549336b5
 +SHA1 (patch-ve_x264) = 42b133d230bc536d952cdc1b9b172891462fe388
 Index: options.mk
 ===================================================================
 RCS file: /cvsroot/pkgsrc/multimedia/mplayer-share/options.mk,v
 retrieving revision 1.44
 diff -u -r1.44 options.mk
 --- options.mk 9 Mar 2011 16:34:02 -0000       1.44
 +++ options.mk 10 Jun 2012 17:12:49 -0000
 @@ -21,9 +21,8 @@
  PKG_SUPPORTED_OPTIONS+=       oss
  .endif
  
 -PKG_OPTIONS_OPTIONAL_GROUPS=  faadgroup
 -PKG_OPTIONS_GROUP.faadgroup=  faad mplayer-internal-faad
 -PKG_SUGGESTED_OPTIONS+=               mplayer-internal-faad
 +PKG_SUPPORTED_OPTIONS+=       faad
 +PKG_SUGGESTED_OPTIONS+=               faad
  
  # Set options based on the specific package being built.
  .if !empty(PKGNAME:M*mplayer*)
 @@ -50,6 +49,7 @@
  PKG_SUPPORTED_OPTIONS+=       vidix
  .endif
  
 +# TODO: v4l2 option probably could be supported on Linux and OpenBSD too
  .if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/videoio.h)
  PKG_SUPPORTED_OPTIONS+=       v4l2
  PKG_SUGGESTED_OPTIONS+=       v4l2
 @@ -79,13 +79,13 @@
  # Define PKG_SUGGESTED_OPTIONS.
  # -------------------------------------------------------------------------
  
 -.for _o_ in aalib arts cdparanoia dv esound gif jpeg \
 +.for o in aalib arts cdparanoia dv esound gif jpeg \
            dvdread dvdnav \
            lame mad mplayer-menu mplayer-real \
            mplayer-default-cflags mplayer-runtime-cpudetection mplayer-win32 \
            nas oss pulseaudio png sdl theora vorbis x264 xvid vdpau
 -.  if !empty(PKG_SUPPORTED_OPTIONS:M${_o_})
 -PKG_SUGGESTED_OPTIONS+=       ${_o_}
 +.  if !empty(PKG_SUPPORTED_OPTIONS:M${o})
 +PKG_SUGGESTED_OPTIONS+=       ${o}
  .  endif
  .endfor
  .if ${OPSYS} == "Linux"
 @@ -104,7 +104,10 @@
  .include "../../mk/bsd.options.mk"
  
  .if !empty(PKG_OPTIONS:Maalib)
 +CONFIGURE_ARGS+=      --enable-aa
  .  include "../../graphics/aalib/buildlink3.mk"
 +.else
 +CONFIGURE_ARGS+=      --disable-aa
  .endif
  
  .if !empty(PKG_OPTIONS:Marts)
 @@ -118,6 +121,8 @@
  .if !empty(PKG_OPTIONS:Mcaca)
  CONFIGURE_ARGS+=      --enable-caca
  .  include "../../graphics/libcaca/buildlink3.mk"
 +.else
 +CONFIGURE_ARGS+=      --disable-caca
  .endif
  
  .if !empty(PKG_OPTIONS:Mcdparanoia)
 @@ -175,18 +180,17 @@
  .endif
  
  .if !empty(PKG_OPTIONS:Mfaac)
 +CONFIGURE_ARGS+=      --enable-faac
  .  include "../../audio/faac/buildlink3.mk"
  .else
  CONFIGURE_ARGS+=      --disable-faac
  .endif
  
 -.if empty(PKG_OPTIONS:Mfaad) && empty(PKG_OPTIONS:Mmplayer-internal-faad)
 -CONFIGURE_ARGS+=      --disable-faad-internal
 -.elif !empty(PKG_OPTIONS:Mfaad)
 +.if !empty(PKG_OPTIONS:Mfaad)
  CONFIGURE_ARGS+=      --enable-faad
  .  include "../../audio/faad2/buildlink3.mk"
  .else
 -CONFIGURE_ARGS+=      --enable-faad-internal
 +CONFIGURE_ARGS+=      --disable-faad
  .endif
  
  .if !empty(PKG_OPTIONS:Mggi)
 @@ -237,10 +241,7 @@
  .endif
  
  .if !empty(PKG_OPTIONS:Mmplayer-real)
 -EVAL_PREFIX+=         PREFIX.realplayer-codecs=realplayer-codecs
 -PREFIX.realplayer-codecs_DEFAULT=     ${LOCALBASE}
  CONFIGURE_ARGS+=      --enable-real
 -#CONFIGURE_ARGS+=     
--realcodecsdir="${PREFIX.realplayer-codecs}/lib/RealPlayer8-Codecs"
  DEPENDS+=             
realplayer-codecs>=8nb2:../../multimedia/realplayer-codecs
  .else
  CONFIGURE_ARGS+=      --disable-real
 @@ -253,10 +254,7 @@
  .endif
  
  .if !empty(PKG_OPTIONS:Mmplayer-win32)
 -EVAL_PREFIX+=         PREFIX.win32-codecs=win32-codecs
 -PREFIX.win32-codecs_DEFAULT=  ${LOCALBASE}
  CONFIGURE_ARGS+=      --enable-win32dll
 -#CONFIGURE_ARGS+=     --win32codecsdir="${PREFIX.win32-codecs}/lib/win32"
  DEPENDS+=             win32-codecs>=011227:../../multimedia/win32-codecs
  .else
  CONFIGURE_ARGS+=      --disable-win32dll
 @@ -304,9 +302,7 @@
  CONFIGURE_ARGS+=      --disable-theora
  .endif
  
 -.if !empty(PKG_OPTIONS:Mv4l2)
 -CONFIGURE_ARGS+=      --enable-tv-v4l2
 -.else
 +.if empty(PKG_OPTIONS:Mv4l2)
  CONFIGURE_ARGS+=      --disable-tv-v4l2
  .endif
  
 @@ -322,6 +318,7 @@
  .endif
  
  .if !empty(PKG_OPTIONS:Mx264)
 +CONFIGURE_ARGS+=      --enable-x264
  .  include "../../multimedia/x264-devel/buildlink3.mk"
  .else
  CONFIGURE_ARGS+=      --disable-x264
 @@ -344,6 +341,7 @@
  .endif
  
  .if !empty(PKG_OPTIONS:Mvdpau)
 +CONFIGURE_ARGS+=      --enable-vdpau
  .  include "../../multimedia/libvdpau/buildlink3.mk"
  .else
  CONFIGURE_ARGS+=      --disable-vdpau
 Index: patches/patch-aa
 ===================================================================
 RCS file: /cvsroot/pkgsrc/multimedia/mplayer-share/patches/patch-aa,v
 retrieving revision 1.27
 diff -u -r1.27 patch-aa
 --- patches/patch-aa   9 Jul 2011 15:51:52 -0000       1.27
 +++ patches/patch-aa   10 Jun 2012 17:12:49 -0000
 @@ -1,31 +1,18 @@
  $NetBSD: patch-aa,v 1.27 2011/07/09 15:51:52 jmcneill Exp $
  
 ---- configure.orig    2010-09-13 03:12:07.000000000 +0000
 +--- configure.orig    2012-05-22 18:01:51.000000000 +0000
  +++ configure
 -@@ -1471,6 +1471,12 @@ if test -z "$_target" ; then
 -    powerpc) # Darwin returns 'powerpc'
 -      host_arch=ppc
 -      ;;
 -+   mipseb|mipsel) # NetBSD
 -+     host_arch=mips
 -+     ;;
 -+   sh3eb|sh3el) # NetBSD
 -+     host_arch=sh
 -+     ;;
 -    *) # uname -p on Linux returns 'unknown' for the processor type,
 -       # OpenBSD returns 'Intel Pentium/MMX ("Genuine Intel" 586-class)'
 - 
 -@@ -1488,7 +1494,8 @@ if test -z "$_target" ; then
 -       sparc64) host_arch=sparc64 ;;
 +@@ -1520,7 +1520,8 @@ if test -z "$_target" ; then
 +       sun4*|sparc*) host_arch=sparc ;;
         parisc*|hppa*|9000*) host_arch=hppa ;;
         arm*|zaurus|cats) host_arch=arm ;;
  -      sh3|sh4|sh4a) host_arch=sh ;;
 -+      sh3) host_arch=sh ;;
 -+      sh4|sh4a) host_arch=sh4 ;;
 ++      sh3*) host_arch=sh ;;
 ++       sh4|sh4a) host_arch=sh4 ;;
         s390) host_arch=s390 ;;
         s390x) host_arch=s390x ;;
         *mips*) host_arch=mips ;;
 -@@ -1645,7 +1652,7 @@ else
 +@@ -1674,7 +1675,7 @@ else
         cc_name=$cc_name_tmp
         echocheck "$_cc version"
         cc_vendor=gnu
 @@ -34,7 +21,7 @@
         case $cc_version in
           2.96*)
             cc_fail=yes
 -@@ -1763,7 +1770,7 @@ if x86 ; then
 +@@ -1798,7 +1799,7 @@ if x86 ; then
     # gather more CPU information
     pname=$($_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -n 1)
     pvendor=$($_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2  | cut -d ' ' -f 
2 | head -n 1)
 @@ -43,7 +30,7 @@
     pmodel=$($_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 
| cut -d ' ' -f 2 | head -n 1)
     pstepping=$($_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 
2 | head -n 1)
   
 -@@ -2238,7 +2245,12 @@ case "$host_arch" in
 +@@ -2274,7 +2275,12 @@ case "$host_arch" in
       test $_fast_clz = "auto" && _fast_clz=yes
       ;;
   
 @@ -57,44 +44,37 @@
       arch='sh4'
       iproc='sh4'
       ;;
 -@@ -3713,7 +3725,6 @@ test "$_w32threads" = yes && def_threads
 - echores "$_w32threads"
 - 
 - echocheck "rpath"
 --netbsd &&_rpath=yes
 - if test "$_rpath" = yes ; then
 -   for I in $(echo $extra_ldflags | sed 's/-L//g') ; do
 -     tmp="$tmp $(echo $I | sed 's/.*/ -L& -Wl,-R&/')"
 -@@ -3978,7 +3989,6 @@ echores "$_vsscanf"
 - 
 - echocheck "swab()"
 - cat > $TMPC << EOF
 --#define _XOPEN_SOURCE 600
 - #include <unistd.h>
 - int main(void) { swab(0, 0, 0); return 0; }
 - EOF
 -@@ -4488,7 +4498,11 @@ EOF
 +@@ -4288,7 +4294,11 @@ if test "$_x11" = auto && test "$_x11_he
              -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/local/lib64 
-L/usr/X11R6/lib64 \
              -L/usr/lib ; do
       if netbsd; then
 --      _ld_tmp="$I -lXext -lX11 $_ld_pthread -Wl,-R$(echo $I | sed s/^-L//)"
 -+      if test -n "$I" ; then
 -+        _ld_tmp="$I -lXext -lX11 $_ld_pthread -Wl,-R$(echo $I | sed s/^-L//)"
 -+      else
 -+        _ld_tmp="-lXext -lX11 $_ld_pthread"
 -+      fi
 +-      ld_tmp="$I -lXext -lX11 $ld_pthread -Wl,-R$(echo $I | sed s/^-L//)"
 ++       if test -n "$I" ; then
 ++        ld_tmp="$I -lXext -lX11 $ld_pthread -Wl,-R$(echo $I | sed s/^-L//)"
 ++       else
 ++        ld_tmp="-lXext -lX11 $ld_pthread"
 ++       fi
       else
 -       _ld_tmp="$I -lXext -lX11 $_ld_pthread"
 +       ld_tmp="$I -lXext -lX11 $ld_pthread"
       fi
 -@@ -5016,7 +5016,6 @@ EOF
 -       extra_cflags="$extra_cflags $_inc_tmp" && break
 +@@ -4669,6 +4679,8 @@ if test "$_aa" = yes ; then
 +   def_aa='#define CONFIG_AA 1'
 +   if cygwin ; then
 +     libs_mplayer="$libs_mplayer $(aalib-config --libs | cut -d " " -f 2,5,6)"
 ++  else
 ++    libs_mplayer="$libs_mplayer $(aalib-config --libs)"
 +   fi
 +   vomodules="aa $vomodules"
 + else
 +@@ -4756,7 +4768,6 @@ EOF
 +       extra_cflags="$extra_cflags $inc_tmp" && break
     done
   fi
  -echores "$_dvb"
   if test "$_dvb" = yes ; then
     _dvbin=yes
     inputmodules="dvb $inputmodules"
 -@@ -5025,14 +5024,28 @@ if test "$_dvb" = yes ; then
 +@@ -4765,14 +4776,29 @@ if test "$_dvb" = yes ; then
     aomodules="mpegpes(dvb) $aomodules"
     vomodules="mpegpes(dvb) $vomodules"
   else
 @@ -125,17 +105,16 @@
  +    vomodules="mpegpes(file) $vomodules"
  +  fi
   fi
 --
 + 
  +echores "$_dvb"
   
   if darwin; then
   
 -@@ -5623,8 +5637,13 @@ if test "$_ivtv" = auto ; then
 +@@ -5338,7 +5364,12 @@ echocheck "IVTV TV-Out (pre linux-2.6.24
 + if test "$_ivtv" = auto ; then
     cat > $TMPC << EOF
 - #include <stdlib.h>
 - #include <inttypes.h>
 -++#ifdef __linux__
 - #include <linux/types.h>
 + #include <sys/time.h>
 ++#ifdef __linux__
   #include <linux/videodev2.h>
  +#elif defined(__NetBSD__) || defined(__OpenBSD__)
  +#include <sys/types.h>
 @@ -144,12 +123,3 @@
   #include <linux/ivtv.h>
   #include <sys/ioctl.h>
   int main(void) {
 -@@ -8057,7 +8076,7 @@ echores "$_tv_v4l1"
 - echocheck "Video 4 Linux 2 TV interface"
 - if test "$_tv_v4l2" = auto ; then
 -   _tv_v4l2=no
 --  if test "$_tv" = yes && linux ; then
 -+  if test "$_tv" = yes && (linux || netbsd || openbsd) ; then
 -     header_check linux/videodev2.h && _tv_v4l2=yes
 -   fi
 - fi
 
 --CE+1k2dSO48ffgeK--
Prev by Date: Re: pkg/45814: lang/gcc45 doesn't build on 5.99.5x/i386
Next by Date: pkg/46577: Old PAM problem with -DNO_STATIC_MODULES has come back.
Previous by Thread: pkg/46566: Update multimedia/mplayer to 1.1
Next by Thread: Re: pkg/46566: Update multimedia/mplayer to 1.1
Indexes:
Home | Main Index | Thread Index | Old Index