openbsd-ports/x11/mplayer/patches/patch-configure

$OpenBSD: patch-configure,v 1.42 2007/11/15 07:50:27 jakemsr Exp $
--- configure.orig	Sun Jun 11 11:35:47 2006
+++ configure	Thu Jul 19 23:31:17 2007
@@ -77,7 +77,7 @@ cc_check() {
 }
 
 cxx_check() {
-  compile_check $TMPCPP $@ -lstdc++
+  compile_check $TMPCPP $@ -lstdc++ -lm
 }
 
 tmp_run() {
@@ -839,6 +839,8 @@ if x86 || x86_64 ; then
   pparam=`echo $exts | sed -e s/k6_mtrr/mtrr/ -e s/cyrix_arr/mtrr/ -e s/centaur_mcr/mtrr/ \
                            -e s/xmm/sse/ -e s/kni/sse/`
 
+  if x86_64 ; then pparam="3dnow 3dnowext mmx mmxext xmm sse sse2" ; fi
+
   for ext in $pparam ; do
     eval _$ext=auto && eval _$ext=yes
   done
@@ -2939,7 +2941,7 @@ int main(void) { pthread_t tid; return pthread_create 
 EOF
 _pthreads=no
 if not hpux ; then
-  for _ld_tmp in "-lpthreadGC2" "" "-lpthread" "-pthread" ; do
+  for _ld_tmp in "-lpthreadGC2" "" "-pthread" "-lpthread" ; do
     # for crosscompilation, we cannot execute the program, be happy if we can link statically
     cc_check $_ld_tmp && (tmp_run || test "$_ld_static") && _ld_pthread="$_ld_tmp" && _pthreads=yes && break
   done
@@ -2970,7 +2972,7 @@ fi
 echores "$_rpath"
 
 echocheck "iconv"
-if test "$_iconv" = auto ; then
+if test "$_iconv" != no ; then
   _iconv_tmp='#include <iconv.h>'
 
   cat > $TMPC << EOF
@@ -4137,6 +4139,8 @@ if test "$_aa" = yes ; then
   _def_aa='#define HAVE_AA 1'
   if cygwin ; then
     _ld_aa=`aalib-config --libs | cut -d " " -f 2,5,6`
+  else
+    _ld_aa="-laa"
   fi
   _vosrc="$_vosrc vo_aa.c"
   _vomodules="aa $_vomodules"
@@ -5089,7 +5093,7 @@ echores "$_sgiaudio"
 
 
 echocheck "VCD support"
-if linux || bsdos || freebsd || netbsd || sunos || darwin ; then
+if linux || bsdos || freebsd || netbsd || sunos || darwin || openbsd ; then
   _inputmodules="vcd $_inputmodules"
   _def_vcd='#define HAVE_VCD 1'
   _vcd="yes"
@@ -6723,7 +6727,7 @@ if test "$_tv_bsdbt848" = auto ; then
  if test "$_tv" = yes ; then
     cat > $TMPC <<EOF
 #include <sys/types.h>
-#if defined(__NetBSD__)
+#if defined(__NetBSD__) || defined(__OpenBSD__)
 #include <dev/ic/bt8xx.h>
 #else
 #include <machine/ioctl_bt848.h>
@@ -7453,7 +7457,7 @@ CACA_LIB = $_ld_caca
 # audio output
 ALSA_LIB = $_ld_alsa
 NAS_LIB = $_ld_nas
-ARTS_LIB = $_ld_arts
+ARTS_LIB = $_ld_arts -lstdc++
 ARTS_INC = $_inc_arts
 ESD_LIB = $_ld_esd
 ESD_INC = $_inc_esd
@@ -7764,7 +7768,7 @@ $_def_malloc
 $_def_memalign
 #ifndef HAVE_MEMALIGN
 # define memalign(a,b) malloc(b)
-#define MEMALIGN_HACK 1
+/* #undef MEMALIGN_HACK 1 */
 #endif
 
 /* Define this if your system has the "alloca.h" header file */
@@ -8042,7 +8046,7 @@ $_def_vcd
 #define DEFAULT_DVD_DEVICE	"/dev/rdiskN"
 #elif defined(__OpenBSD__)
 #define DEFAULT_CDROM_DEVICE	"/dev/rcd0a"
-#define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
+#define DEFAULT_DVD_DEVICE	"/dev/rcd0c"
 #elif defined(__FreeBSD__)
 #define DEFAULT_CDROM_DEVICE	"/dev/acd0"
 #define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
- quit using select() for audio playback. we end up counting bytes in the playback buffer and waiting until there's enough space anyway. - use -pthread instead of -lpthread for pthreads linkage - don't even try to use the "real time sample counter" on BSD, since it's not that same as with Sun audio. - use the audio(4) interface to the mixer "master" volume control - actually mute the audio when output volume is '0' - set the audio(4) blocksize to match size of chunks to be written - provide BSD equivilents to some Sun functionality 2007-11-15 02:50:27 -05:00			$OpenBSD: patch-configure,v 1.42 2007/11/15 07:50:27 jakemsr Exp $
			`--- configure.orig Sun Jun 11 11:35:47 2006`
			`+++ configure Thu Jul 19 23:31:17 2007`
- add live555 support - regen patches while here from brad ok robert@ 2007-04-19 04:37:09 -04:00			`@@ -77,7 +77,7 @@ cc_check() {`
			`}`

			`cxx_check() {`
			`- compile_check $TMPCPP $@ -lstdc++`
			`+ compile_check $TMPCPP $@ -lstdc++ -lm`
			`}`

			`tmp_run() {`
Bring back CPU extentions on amd64. "lock ok" sturm@ 2006-08-16 11:17:15 -04:00			`@@ -839,6 +839,8 @@ if x86 \|\| x86_64 ; then`
			pparam=`echo $exts \| sed -e s/k6_mtrr/mtrr/ -e s/cyrix_arr/mtrr/ -e s/centaur_mcr/mtrr/ \
			-e s/xmm/sse/ -e s/kni/sse/`

			`+ if x86_64 ; then pparam="3dnow 3dnowext mmx mmxext xmm sse sse2" ; fi`
			`+`
			`for ext in $pparam ; do`
			`eval _$ext=auto && eval _$ext=yes`
			`done`
- quit using select() for audio playback. we end up counting bytes in the playback buffer and waiting until there's enough space anyway. - use -pthread instead of -lpthread for pthreads linkage - don't even try to use the "real time sample counter" on BSD, since it's not that same as with Sun audio. - use the audio(4) interface to the mixer "master" volume control - actually mute the audio when output volume is '0' - set the audio(4) blocksize to match size of chunks to be written - provide BSD equivilents to some Sun functionality 2007-11-15 02:50:27 -05:00			`@@ -2939,7 +2941,7 @@ int main(void) { pthread_t tid; return pthread_create`
			`EOF`
			`_pthreads=no`
			`if not hpux ; then`
			`- for _ld_tmp in "-lpthreadGC2" "" "-lpthread" "-pthread" ; do`
			`+ for _ld_tmp in "-lpthreadGC2" "" "-pthread" "-lpthread" ; do`
			`# for crosscompilation, we cannot execute the program, be happy if we can link statically`
			`cc_check $_ld_tmp && (tmp_run \|\| test "$_ld_static") && _ld_pthread="$_ld_tmp" && _pthreads=yes && break`
			`done`
Bring back CPU extentions on amd64. "lock ok" sturm@ 2006-08-16 11:17:15 -04:00			`@@ -2970,7 +2972,7 @@ fi`
update to versio 1.0pre8; include the speex and mpcdec codecs by default; this version of mplayer now uses gtk2; ok biorn@ and tested by many 2006-07-19 17:40:47 -04:00			`echores "$_rpath"`
Update to mplayer-0.90pre8; from biorn@dce.chalmers.se 2002-10-14 05:50:48 -04:00
			`echocheck "iconv"`
			`-if test "$_iconv" = auto ; then`
			`+if test "$_iconv" != no ; then`
			`_iconv_tmp='#include <iconv.h>'`

			`cat > $TMPC << EOF`
Bring back CPU extentions on amd64. "lock ok" sturm@ 2006-08-16 11:17:15 -04:00			`@@ -4137,6 +4139,8 @@ if test "$_aa" = yes ; then`
unbreak aa FLAVOR. Found and tested by Matthias Kilian 2005-05-13 12:14:00 -04:00			`_def_aa='#define HAVE_AA 1'`
			`if cygwin ; then`
			_ld_aa=`aalib-config --libs \| cut -d " " -f 2,5,6`
			`+ else`
			`+ _ld_aa="-laa"`
			`fi`
			`_vosrc="$_vosrc vo_aa.c"`
			`_vomodules="aa $_vomodules"`
Bring back CPU extentions on amd64. "lock ok" sturm@ 2006-08-16 11:17:15 -04:00			`@@ -5089,7 +5093,7 @@ echores "$_sgiaudio"`
update to 1.0pre5 ok pvalchev@ 2004-10-18 02:48:08 -04:00

			`echocheck "VCD support"`
Finally take it to 1.0pre6a Prodded by espi@, ok sturm@ 2005-03-09 11:07:29 -05:00			`-if linux \|\| bsdos \|\| freebsd \|\| netbsd \|\| sunos \|\| darwin ; then`
			`+if linux \|\| bsdos \|\| freebsd \|\| netbsd \|\| sunos \|\| darwin \|\| openbsd ; then`
update to 1.0pre5 ok pvalchev@ 2004-10-18 02:48:08 -04:00			`_inputmodules="vcd $_inputmodules"`
			`_def_vcd='#define HAVE_VCD 1'`
update to versio 1.0pre8; include the speex and mpcdec codecs by default; this version of mplayer now uses gtk2; ok biorn@ and tested by many 2006-07-19 17:40:47 -04:00			`_vcd="yes"`
Bring back CPU extentions on amd64. "lock ok" sturm@ 2006-08-16 11:17:15 -04:00			`@@ -6723,7 +6727,7 @@ if test "$_tv_bsdbt848" = auto ; then`
enable bktr(4) support, and enhance the bktr(4) support by: - adding support for setting the channel set - making it use audio(4) instead of ossaudio(3) - making it explicitly mute the tuner on exit - use the tuner as default video source, as opposed to RCA ok biorn@, robert@ 2006-01-17 02:41:58 -05:00			`if test "$_tv" = yes ; then`
			`cat > $TMPC <<EOF`
			`#include <sys/types.h>`
			`-#if defined(__NetBSD__)`
			`+#if defined(__NetBSD__) \|\| defined(__OpenBSD__)`
			`#include <dev/ic/bt8xx.h>`
			`#else`
			`#include <machine/ioctl_bt848.h>`
Bring back CPU extentions on amd64. "lock ok" sturm@ 2006-08-16 11:17:15 -04:00			`@@ -7453,7 +7457,7 @@ CACA_LIB = $_ld_caca`
Security: Upgrade to 1.0pre5try2 (see http://www.mplayerhq.hu/) Also unbreak arts FLAVOR (from Stephan Tesch) and fix up DESCR (from Michael Knudsen and joshua stein). ok sturm@ 2004-12-22 17:22:13 -05:00			`# audio output`
			`ALSA_LIB = $_ld_alsa`
			`NAS_LIB = $_ld_nas`
			`-ARTS_LIB = $_ld_arts`
			`+ARTS_LIB = $_ld_arts -lstdc++`
			`ARTS_INC = $_inc_arts`
			`ESD_LIB = $_ld_esd`
			`ESD_INC = $_inc_esd`
Bring back CPU extentions on amd64. "lock ok" sturm@ 2006-08-16 11:17:15 -04:00			`@@ -7764,7 +7768,7 @@ $_def_malloc`
Finally take it to 1.0pre6a Prodded by espi@, ok sturm@ 2005-03-09 11:07:29 -05:00			`$_def_memalign`
			`#ifndef HAVE_MEMALIGN`
			`# define memalign(a,b) malloc(b)`
			`-#define MEMALIGN_HACK 1`
update to versio 1.0pre8; include the speex and mpcdec codecs by default; this version of mplayer now uses gtk2; ok biorn@ and tested by many 2006-07-19 17:40:47 -04:00			`+/* #undef MEMALIGN_HACK 1 */`
Finally take it to 1.0pre6a Prodded by espi@, ok sturm@ 2005-03-09 11:07:29 -05:00			`#endif`

			`/* Define this if your system has the "alloca.h" header file */`
enable xvidcore tweak default dvd device to match OpenBSD. 2007-01-22 10:04:04 -05:00			`@@ -8042,7 +8046,7 @@ $_def_vcd`
			`#define DEFAULT_DVD_DEVICE "/dev/rdiskN"`
			`#elif defined(__OpenBSD__)`
			`#define DEFAULT_CDROM_DEVICE "/dev/rcd0a"`
			`-#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE`
			`+#define DEFAULT_DVD_DEVICE "/dev/rcd0c"`
			`#elif defined(__FreeBSD__)`
			`#define DEFAULT_CDROM_DEVICE "/dev/acd0"`
			`#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE`