mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00
Code Issues Releases Activity

1) make it work on -current given recent malloc.h problem

Browse Source 
2) remove esound options since they do not work yet
3) bump PORTREVISION due to (1)

Submitted by:	maintainer
This commit is contained in:
Mario Sergio Fujikawa Ferreira 2001-11-15 04:42:26 +00:00
parent 74588482c4
commit 4f167bb911
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=50036
6 changed files with 120 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
graphics/mplayer/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= mplayer
PORTVERSION= 0.50.0.2
PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://ftp.mplayerhq.hu/MPlayer/releases/ \
http://www.stud.uni-karlsruhe.de/~uedc/mplayer/ \
@ -22,10 +23,10 @@ RUN_DEPENDS= ${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/graphics/mplayer-fonts
USE_BZIP2= yes
USE_GMAKE= yes
USE_XLIB= yes
WANT_ESOUND= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
CONFIGURE_ARGS= --disable-esd
MAN1= mplayer.1
MANCOMPRESSED= no
@ -51,10 +52,6 @@ LIB_DEPENDS+= dvdcss.0:${PORTSDIR}/graphics/libdvdcss \
dvdread.2:${PORTSDIR}/graphics/libdvdread
.endif
.if defined(WITH_ESOUND) || defined(HAVE_ESOUND)
USE_ESOUND= yes
.endif
.if defined(WITH_SVGALIB)
LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib
.endif
@ -74,9 +71,6 @@ CONFIGURE_ARGS+=--disable-3dnow
.if defined(WITHOUT_DSP) || defined(WITHOUT_3DNOW) || ${OSVERSION} < 400021
CONFIGURE_ARGS+=--disable-3dnowex
.endif
.if !(defined(WITH_ESOUND) || defined(HAVE_ESOUND))
CONFIGURE_ARGS+=--disable-esd
.endif
.if defined(WITHOUT_SSE)
CONFIGURE_ARGS+=--disable-mmx2 --disable-sse
.endif
@ -107,9 +101,6 @@ pre-everything::
.if !defined(WITH_DVD)
@${ECHO_MSG} "You can enable DVD support by defining WITH_DVD."
.endif
.if !(defined(WITH_ESOUND) || defined(HAVE_ESOUND))
@${ECHO_MSG} "You can enable ESOUND sound support by defining WITH_ESOUND."
.endif
.if !defined(WITH_SVGALIB)
@${ECHO_MSG} "You can enable SVGALIB support by defining WITH_SVGALIB."
.endif

42
graphics/mplayer/files/patch-ad
View File

@ -1,5 +1,5 @@
--- configure.old Sun Oct 7 23:36:29 2001
+++ configure Fri Oct 12 11:22:39 2001
+++ configure Tue Nov 13 15:38:29 2001
@@ -299,7 +299,7 @@
_confcygwin="TARGET_CYGWIN=no"
_confwin32=
@ -56,7 +56,41 @@
{ _gl=no; echo "GL includes not found!";}
else
$_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -lm $_socklib > /dev/null 2>&1 || \
@@ -1645,33 +1634,33 @@
@@ -998,33 +987,10 @@
# ---
# check availability of some header files
-cat > $TMPC << EOF
-#include <malloc.h>
-int main( void ) { return 0; }
-EOF
-_memalign_def=
_memalign=no
_malloc_h=no
-if $_cc -o $TMPO $TMPC 2> /dev/null ; then
-_malloc_h=yes
-# check for memalign - atmos
-# should this be restricted to x86, or customized for cpu types (opt for cacheline sizes)?
-cat > $TMPC << EOF
-#include <malloc.h>
-int main ( void ) {
-char *string = NULL;
-string = memalign(64, sizeof(char));
-return 0;
-}
-EOF
-_memalign_def='/* #define memalign(a,b) malloc(b) */'
-_memalign=yes
-$_cc -o $TMPO $TMPC 2> /dev/null || _memalign=no
-if [ "$_memalign" = "no" ]; then
_memalign_def='#define memalign(a,b) malloc(b)'
-fi
-fi
cat > $TMPC << EOF
@@ -1645,33 +1611,33 @@
echo
echo $_echo_n "Checking for gtk version ... $_echo_c"
@ -96,7 +130,7 @@
[ -z "$_gliblib" ] && { echo 'glib not found.'; exit 1; }
echo "done"
@@ -1700,7 +1689,7 @@
@@ -1700,7 +1666,7 @@
if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" ]; then
# Under XFree86 4.x GL port is poorly designed
if [ -r /usr/X11R6/bin/XFree86 ]; then
@ -105,7 +139,7 @@
else
_gllib='-lGL'
fi
@@ -1926,7 +1915,7 @@
@@ -1926,7 +1892,7 @@
# Under FreeBSD (maybe other systems as well?) we have to add to CFLAGS
# for MT applications:
if [ "$system_name" = "FreeBSD" ]; then

13
multimedia/mplayer/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= mplayer
PORTVERSION= 0.50.0.2
PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://ftp.mplayerhq.hu/MPlayer/releases/ \
http://www.stud.uni-karlsruhe.de/~uedc/mplayer/ \
@ -22,10 +23,10 @@ RUN_DEPENDS= ${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/graphics/mplayer-fonts
USE_BZIP2= yes
USE_GMAKE= yes
USE_XLIB= yes
WANT_ESOUND= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
CONFIGURE_ARGS= --disable-esd
MAN1= mplayer.1
MANCOMPRESSED= no
@ -51,10 +52,6 @@ LIB_DEPENDS+= dvdcss.0:${PORTSDIR}/graphics/libdvdcss \
dvdread.2:${PORTSDIR}/graphics/libdvdread
.endif
.if defined(WITH_ESOUND) || defined(HAVE_ESOUND)
USE_ESOUND= yes
.endif
.if defined(WITH_SVGALIB)
LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib
.endif
@ -74,9 +71,6 @@ CONFIGURE_ARGS+=--disable-3dnow
.if defined(WITHOUT_DSP) || defined(WITHOUT_3DNOW) || ${OSVERSION} < 400021
CONFIGURE_ARGS+=--disable-3dnowex
.endif
.if !(defined(WITH_ESOUND) || defined(HAVE_ESOUND))
CONFIGURE_ARGS+=--disable-esd
.endif
.if defined(WITHOUT_SSE)
CONFIGURE_ARGS+=--disable-mmx2 --disable-sse
.endif
@ -107,9 +101,6 @@ pre-everything::
.if !defined(WITH_DVD)
@${ECHO_MSG} "You can enable DVD support by defining WITH_DVD."
.endif
.if !(defined(WITH_ESOUND) || defined(HAVE_ESOUND))
@${ECHO_MSG} "You can enable ESOUND sound support by defining WITH_ESOUND."
.endif
.if !defined(WITH_SVGALIB)
@${ECHO_MSG} "You can enable SVGALIB support by defining WITH_SVGALIB."
.endif

42
multimedia/mplayer/files/patch-ad
View File

@ -1,5 +1,5 @@
--- configure.old Sun Oct 7 23:36:29 2001
+++ configure Fri Oct 12 11:22:39 2001
+++ configure Tue Nov 13 15:38:29 2001
@@ -299,7 +299,7 @@
_confcygwin="TARGET_CYGWIN=no"
_confwin32=
@ -56,7 +56,41 @@
{ _gl=no; echo "GL includes not found!";}
else
$_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -lm $_socklib > /dev/null 2>&1 || \
@@ -1645,33 +1634,33 @@
@@ -998,33 +987,10 @@
# ---
# check availability of some header files
-cat > $TMPC << EOF
-#include <malloc.h>
-int main( void ) { return 0; }
-EOF
-_memalign_def=
_memalign=no
_malloc_h=no
-if $_cc -o $TMPO $TMPC 2> /dev/null ; then
-_malloc_h=yes
-# check for memalign - atmos
-# should this be restricted to x86, or customized for cpu types (opt for cacheline sizes)?
-cat > $TMPC << EOF
-#include <malloc.h>
-int main ( void ) {
-char *string = NULL;
-string = memalign(64, sizeof(char));
-return 0;
-}
-EOF
-_memalign_def='/* #define memalign(a,b) malloc(b) */'
-_memalign=yes
-$_cc -o $TMPO $TMPC 2> /dev/null || _memalign=no
-if [ "$_memalign" = "no" ]; then
_memalign_def='#define memalign(a,b) malloc(b)'
-fi
-fi
cat > $TMPC << EOF
@@ -1645,33 +1611,33 @@
echo
echo $_echo_n "Checking for gtk version ... $_echo_c"
@ -96,7 +130,7 @@
[ -z "$_gliblib" ] && { echo 'glib not found.'; exit 1; }
echo "done"
@@ -1700,7 +1689,7 @@
@@ -1700,7 +1666,7 @@
if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" ]; then
# Under XFree86 4.x GL port is poorly designed
if [ -r /usr/X11R6/bin/XFree86 ]; then
@ -105,7 +139,7 @@
else
_gllib='-lGL'
fi
@@ -1926,7 +1915,7 @@
@@ -1926,7 +1892,7 @@
# Under FreeBSD (maybe other systems as well?) we have to add to CFLAGS
# for MT applications:
if [ "$system_name" = "FreeBSD" ]; then

13
multimedia/mplayerxp/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= mplayer
PORTVERSION= 0.50.0.2
PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://ftp.mplayerhq.hu/MPlayer/releases/ \
http://www.stud.uni-karlsruhe.de/~uedc/mplayer/ \
@ -22,10 +23,10 @@ RUN_DEPENDS= ${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/graphics/mplayer-fonts
USE_BZIP2= yes
USE_GMAKE= yes
USE_XLIB= yes
WANT_ESOUND= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
CONFIGURE_ARGS= --disable-esd
MAN1= mplayer.1
MANCOMPRESSED= no
@ -51,10 +52,6 @@ LIB_DEPENDS+= dvdcss.0:${PORTSDIR}/graphics/libdvdcss \
dvdread.2:${PORTSDIR}/graphics/libdvdread
.endif
.if defined(WITH_ESOUND) || defined(HAVE_ESOUND)
USE_ESOUND= yes
.endif
.if defined(WITH_SVGALIB)
LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib
.endif
@ -74,9 +71,6 @@ CONFIGURE_ARGS+=--disable-3dnow
.if defined(WITHOUT_DSP) || defined(WITHOUT_3DNOW) || ${OSVERSION} < 400021
CONFIGURE_ARGS+=--disable-3dnowex
.endif
.if !(defined(WITH_ESOUND) || defined(HAVE_ESOUND))
CONFIGURE_ARGS+=--disable-esd
.endif
.if defined(WITHOUT_SSE)
CONFIGURE_ARGS+=--disable-mmx2 --disable-sse
.endif
@ -107,9 +101,6 @@ pre-everything::
.if !defined(WITH_DVD)
@${ECHO_MSG} "You can enable DVD support by defining WITH_DVD."
.endif
.if !(defined(WITH_ESOUND) || defined(HAVE_ESOUND))
@${ECHO_MSG} "You can enable ESOUND sound support by defining WITH_ESOUND."
.endif
.if !defined(WITH_SVGALIB)
@${ECHO_MSG} "You can enable SVGALIB support by defining WITH_SVGALIB."
.endif

42
multimedia/mplayerxp/files/patch-ad
View File

@ -1,5 +1,5 @@
--- configure.old Sun Oct 7 23:36:29 2001
+++ configure Fri Oct 12 11:22:39 2001
+++ configure Tue Nov 13 15:38:29 2001
@@ -299,7 +299,7 @@
_confcygwin="TARGET_CYGWIN=no"
_confwin32=
@ -56,7 +56,41 @@
{ _gl=no; echo "GL includes not found!";}
else
$_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -lm $_socklib > /dev/null 2>&1 || \
@@ -1645,33 +1634,33 @@
@@ -998,33 +987,10 @@
# ---
# check availability of some header files
-cat > $TMPC << EOF
-#include <malloc.h>
-int main( void ) { return 0; }
-EOF
-_memalign_def=
_memalign=no
_malloc_h=no
-if $_cc -o $TMPO $TMPC 2> /dev/null ; then
-_malloc_h=yes
-# check for memalign - atmos
-# should this be restricted to x86, or customized for cpu types (opt for cacheline sizes)?
-cat > $TMPC << EOF
-#include <malloc.h>
-int main ( void ) {
-char *string = NULL;
-string = memalign(64, sizeof(char));
-return 0;
-}
-EOF
-_memalign_def='/* #define memalign(a,b) malloc(b) */'
-_memalign=yes
-$_cc -o $TMPO $TMPC 2> /dev/null || _memalign=no
-if [ "$_memalign" = "no" ]; then
_memalign_def='#define memalign(a,b) malloc(b)'
-fi
-fi
cat > $TMPC << EOF
@@ -1645,33 +1611,33 @@
echo
echo $_echo_n "Checking for gtk version ... $_echo_c"
@ -96,7 +130,7 @@
[ -z "$_gliblib" ] && { echo 'glib not found.'; exit 1; }
echo "done"
@@ -1700,7 +1689,7 @@
@@ -1700,7 +1666,7 @@
if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" ]; then
# Under XFree86 4.x GL port is poorly designed
if [ -r /usr/X11R6/bin/XFree86 ]; then
@ -105,7 +139,7 @@
else
_gllib='-lGL'
fi
@@ -1926,7 +1915,7 @@
@@ -1926,7 +1892,7 @@
# Under FreeBSD (maybe other systems as well?) we have to add to CFLAGS
# for MT applications:
if [ "$system_name" = "FreeBSD" ]; then