cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Make amd64 use MMX and friends. Tested by niallo and naddy.

Browse Source 
- Avoid picking up libdv and libsmb

Looks fine, naddy@
This commit is contained in:
biorn 2005-04-01 06:28:57 +00:00
parent ce2ded9891
commit 1d0de42f06
3 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x11/mplayer/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.81 2005/03/27 04:10:51 pvalchev Exp $
# $OpenBSD: Makefile,v 1.82 2005/04/01 06:28:57 biorn Exp $
# May not be hard to add more.
ONLY_FOR_ARCHS= amd64 i386 powerpc sparc64 arm
@ -7,7 +7,7 @@ COMMENT= "Movie player supporting MPEG, DivX, AVI, ASF, MOV & more"
DISTNAME= MPlayer-1.0pre6a
DIST_SUBDIR= mplayer
PKGNAME= ${DISTNAME:L}p0
PKGNAME= ${DISTNAME:L}p1
CATEGORIES= x11
EXTRACT_SUFX= .tar.bz2
@ -57,6 +57,8 @@ CONFIGURE_ARGS+=--disable-alsa \
--disable-caca \
--disable-vidix \
--disable-xvid \
--disable-libdv \
--disable-smb \
--enable-select \
--enable-vorbis \
--enable-menu \

28
x11/mplayer/patches/patch-configure
View File

@ -1,7 +1,23 @@
$OpenBSD: patch-configure,v 1.30 2005/03/09 16:07:29 biorn Exp $
$OpenBSD: patch-configure,v 1.31 2005/04/01 06:28:58 biorn Exp $
--- configure.orig Thu Dec 23 16:36:00 2004
+++ configure Fri Dec 31 01:09:24 2004
@@ -2180,7 +2180,7 @@ echores "$_setlocale"
+++ configure Wed Mar 9 20:19:18 2005
@@ -700,10 +700,15 @@ fi
x86_exts_check()
{
+ case $host_arch in
+ x86_64) pparam="3dnow 3dnowext mmx mmxext xmm sse2"
+ ;;
+ *)
pparam=`$_cpuinfo | grep 'features' | cut -d ':' -f 2 | _head 1`
if test -z "$pparam" ; then
pparam=`$_cpuinfo | grep 'flags' | cut -d ':' -f 2 | _head 1`
fi
+ esac
_mmx=no
_3dnow=no
@@ -2180,7 +2185,7 @@ echores "$_setlocale"
echocheck "iconv"
@ -10,7 +26,7 @@ $OpenBSD: patch-configure,v 1.30 2005/03/09 16:07:29 biorn Exp $
_iconv_tmp='#include <iconv.h>'
cat > $TMPC << EOF
@@ -4659,7 +4659,7 @@ echores "$_sgiaudio"
@@ -4659,7 +4664,7 @@ echores "$_sgiaudio"
echocheck "VCD support"
@ -19,7 +35,7 @@ $OpenBSD: patch-configure,v 1.30 2005/03/09 16:07:29 biorn Exp $
_inputmodules="vcd $_inputmodules"
_def_vcd='#define HAVE_VCD 1'
echores "ok"
@@ -6607,7 +6607,7 @@ CACA_LIB = $_ld_caca
@@ -6607,7 +6612,7 @@ CACA_LIB = $_ld_caca
# audio output
ALSA_LIB = $_ld_alsa
NAS_LIB = $_ld_nas
@ -28,7 +44,7 @@ $OpenBSD: patch-configure,v 1.30 2005/03/09 16:07:29 biorn Exp $
ARTS_INC = $_inc_arts
ESD_LIB = $_ld_esd
ESD_INC = $_inc_esd
@@ -6877,7 +6877,7 @@ $_def_malloc
@@ -6877,7 +6882,7 @@ $_def_malloc
$_def_memalign
#ifndef HAVE_MEMALIGN
# define memalign(a,b) malloc(b)

18
x11/mplayer/patches/patch-cpudetect_c
View File

@ -1,22 +1,6 @@
$OpenBSD: patch-cpudetect_c,v 1.1 2005/03/09 16:07:29 biorn Exp $
$OpenBSD: patch-cpudetect_c,v 1.2 2005/04/01 06:28:58 biorn Exp $
--- cpudetect.c.orig Thu Oct 21 13:55:19 2004
+++ cpudetect.c Mon Jan 10 19:47:32 2005
@@ -182,6 +182,7 @@ void GetCpuCaps( CpuCaps *caps)
// caps->hasMMX2 = 0;
// caps->hasMMX = 0;
+#ifndef ARCH_X86_64
#ifndef HAVE_MMX
if(caps->hasMMX) mp_msg(MSGT_CPUDETECT,MSGL_WARN,"MMX supported but disabled\n");
caps->hasMMX=0;
@@ -206,6 +207,7 @@ void GetCpuCaps( CpuCaps *caps)
if(caps->has3DNowExt) mp_msg(MSGT_CPUDETECT,MSGL_WARN,"3DNowExt supported but disabled\n");
caps->has3DNowExt=0;
#endif
+#endif
}
@@ -320,7 +322,10 @@ LONG CALLBACK win32_sig_handler_sse(EXCE
*/
static void check_os_katmai_support( void )