pkg/30447: More amd64 and XviD support in mplayer

[fun%naobsd.org@localhost]

>Number:         30447
>Category:       pkg
>Synopsis:       More amd64 and XviD support in mplayer
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Jun 06 16:30:00 +0000 2005
>Originator:     FUKAUMI Naoki
>Release:        NetBSD 3.99.5
>Organization:
        FUKAUMI Naoki
>Environment:
System: NetBSD turion64.naobsd.org 3.99.5 NetBSD 3.99.5 (TURION64) #0: Sun May 
29 14:20:53 JST 2005 
root%turion64.naobsd.org@localhost:/usr/obj/amd64/sys/arch/amd64/compile/TURION64
 amd64
Architecture: x86_64
Machine: amd64
>Description:
        Add MMX/SSE/3DNow support on amd64. (patch-ag is from FreeBSD ports)
        Add XviD support on all ports.
>How-To-Repeat:
>Fix:
        Patch is below. patch-ag is uuencoded.

Index: distinfo
===================================================================
RCS file: /home/fun/cvsroot/NetBSD/pkgsrc/multimedia/mplayer-share/distinfo,v
retrieving revision 1.21
diff -u -r1.21 distinfo
--- distinfo    31 May 2005 19:15:11 -0000      1.21
+++ distinfo    5 Jun 2005 17:48:49 -0000
@@ -12,12 +12,13 @@
 SHA1 (mplayer-1.0rc7/font-arial-cp1250.tar.bz2) = 
ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68
 RMD160 (mplayer-1.0rc7/font-arial-cp1250.tar.bz2) = 
a2fc7ae07b0d80936ea58e168e1047efccb9eb91
 Size (mplayer-1.0rc7/font-arial-cp1250.tar.bz2) = 249705 bytes
-SHA1 (patch-aa) = 7e4eaab0042979c44271c361d00e1c05a04c93bc
+SHA1 (patch-aa) = a805886f10de278208037ab64ecc5951e4d67044
 SHA1 (patch-ab) = 1a08f717e326d83b355eee26e1be9c0636b735c5
 SHA1 (patch-ac) = 3b9ae32e6e656ec4b58b7e51a1c2eaa280384f3e
 SHA1 (patch-ad) = d705dd315e913593223b83e533c60a9620d34cc8
 SHA1 (patch-ae) = 601808d8c89cba68156fb3c95fe9fcfb8da4fca0
 SHA1 (patch-af) = 6eab8572b239f6ac7afc03ad6254a7c97f90663e
+SHA1 (patch-ag) = 2605bf6657c1fbd0eabb1a2d00c3c29e00d467ea
 SHA1 (patch-da) = be092da4f854708c1ef47f10c26e361c095a6799
 SHA1 (patch-dc) = b11ef06a89f13e2ae5e013d569aa5acc99c770aa
 SHA1 (patch-dd) = e5b23b73a1e53e3185ecbac26042432395cd5e63
Index: options.mk
===================================================================
RCS file: /home/fun/cvsroot/NetBSD/pkgsrc/multimedia/mplayer-share/options.mk,v
retrieving revision 1.3
diff -u -r1.3 options.mk
--- options.mk  2 Jun 2005 16:08:31 -0000       1.3
+++ options.mk  5 Jun 2005 17:48:49 -0000
@@ -11,7 +11,7 @@
 # -------------------------------------------------------------------------
 
 # Options supported by both mplayer* or mencoder*.
-PKG_SUPPORTED_OPTIONS= gif jpeg mad dv dvdread oss png theora vorbis
+PKG_SUPPORTED_OPTIONS= gif jpeg mad dv dvdread oss png theora vorbis xvid
 
 # Set options based on the specific package being built.
 .if !empty(PKGNAME:M*mplayer*)
@@ -33,8 +33,7 @@
 
 # Platform-specific options.
 .if ${MACHINE_ARCH} == "i386"
-PKG_SUPPORTED_OPTIONS+= mplayer-runtime-cpudetection mplayer-win32 \
-                       xvid
+PKG_SUPPORTED_OPTIONS+= mplayer-runtime-cpudetection mplayer-win32
 .endif
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \
     ${MACHINE_ARCH} == "alpha"
Index: patches/patch-aa
===================================================================
RCS file: 
/home/fun/cvsroot/NetBSD/pkgsrc/multimedia/mplayer-share/patches/patch-aa,v
retrieving revision 1.11
diff -u -r1.11 patch-aa
--- patches/patch-aa    31 May 2005 19:15:11 -0000      1.11
+++ patches/patch-aa    5 Jun 2005 17:48:49 -0000
@@ -1,8 +1,8 @@
 $NetBSD: patch-aa,v 1.11 2005/05/31 19:15:11 jmmv Exp $
 
---- configure.orig     2005-04-13 13:46:35.000000000 +0200
-+++ configure
-@@ -408,7 +408,7 @@ for ac_option do
+--- configure.orig     2005-04-13 20:46:35.000000000 +0900
++++ configure  2005-06-05 02:58:55.000000000 +0900
+@@ -408,7 +408,7 @@
      _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
      ;;
    --with-extralibdir=*)
@@ -11,7 +11,7 @@
      ;;
    --enable-runtime-cpudetection)
      _runtime_cpudetection=yes
-@@ -596,7 +596,7 @@ if test "$_skip_cc_check" != yes ; then
+@@ -596,7 +596,7 @@
    echocheck "$_cc version"
    cc_vendor=gnu
    cc_name=`( $_cc -v ) 2>&1 | _tail 1 | cut -d ' ' -f 1`
@@ -20,7 +20,16 @@
    if test "$?" -gt 0; then
      cc_version="not found"
    fi
-@@ -743,7 +743,7 @@ case "$host_arch" in
+@@ -701,7 +701,7 @@
+ elif darwin ; then
+   # use hostinfo on Darwin
+   _cpuinfo="hostinfo"
+-elif x86; then
++elif x86 || test $host_arch = "x86_64"; then
+   # all other OSes try to extract CPU information from a small helper
+   # program TOOLS/cpuinfo instead
+   $_cc -o TOOLS/cpuinfo TOOLS/cpuinfo.c
+@@ -743,7 +743,7 @@
  
    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`
@@ -29,7 +38,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`
  
-@@ -1797,7 +1797,8 @@ for ac_option do
+@@ -1797,7 +1797,8 @@
      _inc_x11=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
      ;;
    --with-x11libdir=*)

begin 644 patch-ag
M)$YE=$)31"0*"BTM+2!43T],4R]C<'5I;F9O+F,N;W)I9PE-;VX@3V-T(#$Q
M(#(Q.C(V.C$S(#(P,#0**RLK(%1/3TQ3+V-P=6EN9F\N8PE3=6X@36%Y(#(R
M(#(P.C4W.C$Q(#(P,#4*0$`@+30P+#$S("LT,"PY($!`"B!C<'5I9"AI;G0@
M9G5N8RD@>PH@"6-P=6ED7W)E9W-?="!R96=S.PH@(V1E9FEN90E#4%5)1`DB
M+F)Y=&4@,'@P9BP@,'AA,CL@(@HM"6%S;2@B<'5S:"`E)65B>#L@(@HM"2`@
M("`B;6]V;"`E-"PE)65A>#L@(B!#4%5)1`HM"2`@("`B;6]V;"`E)65A>"PE
M,#L@;6]V;"`E)65B>"PE,3L@;6]V;"`E)65C>"PE,CL@;6]V;"`E)65D>"PE
M,SL@(@HM"2`@("`B<&]P("4E96)X(@HM"0DZ("(];2(@*')E9W,N96%X*2P@
M(CUM(B`H<F5G<RYE8G@I+"`B/6TB("AR96=S+F5C>"DL("(];2(@*')E9W,N
M961X*0HM"0DZ(")G(B`H9G5N8RD*+0D).B`B)65A>"(L("(E96-X(BP@(B5E
M9'@B*3L**PEA<VTH0U!5240**PD).B`B/6$B("AR96=S+F5A>"DL("(]8B(@
M*')E9W,N96)X*2P@(CUC(B`H<F5G<RYE8W@I+"`B/60B("AR96=S+F5D>"D*
F*PD).B`B,"(@*&9U;F,I*3L*(`ER971U<FX@<F5G<SL*('T*(`IS
`
end