diff options
| author | pav <pav@FreeBSD.org> | 2004-07-01 16:27:47 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2004-07-01 16:27:47 +0800 |
| commit | 1f8f7201f96ea6b17fe7e2156e350ab6b1ca6662 (patch) | |
| tree | b259a966ea4666546d8781d9638a7d8f642b69e5 /multimedia | |
| parent | 1bf7a212a948c87987326764c9799021350cca3f (diff) | |
| download | freebsd-ports-gnome-1f8f7201f96ea6b17fe7e2156e350ab6b1ca6662.tar.gz freebsd-ports-gnome-1f8f7201f96ea6b17fe7e2156e350ab6b1ca6662.tar.zst freebsd-ports-gnome-1f8f7201f96ea6b17fe7e2156e350ab6b1ca6662.zip | |
- Respect CFLAGS, fix WITHOUT_RUNTIME_CPUDETECTION knob, style
PR: ports/68431
Submitted by: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Approved by: maintainer
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/mplayer/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/mplayer/files/patch-ad | 25 |
2 files changed, 23 insertions, 6 deletions
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 6a653daa148d..b57012294e6b 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -642,11 +642,9 @@ post-patch: @${REINPLACE_CMD} -e \ 's|libxmms.so.1|libxmms.so|' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} - @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \ - ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \ s|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \ - ${WRKSRC}/configure + ${WRKSRC}/${CONFIGURE_SCRIPT} .if defined(WITH_RTC) @${REINPLACE_CMD} -e \ 's|<linux/rtc.h>|<rtc.h>|' \ diff --git a/multimedia/mplayer/files/patch-ad b/multimedia/mplayer/files/patch-ad index f7e930c1dab2..d16072f7d5ba 100644 --- a/multimedia/mplayer/files/patch-ad +++ b/multimedia/mplayer/files/patch-ad @@ -1,5 +1,5 @@ ---- configure.orig Mon Apr 26 11:44:06 2004 -+++ configure Wed Apr 28 16:09:47 2004 +--- configure.orig Mon Apr 26 05:44:06 2004 ++++ configure Sun Jun 27 03:30:21 2004 @@ -339,7 +339,7 @@ @@ -123,7 +123,26 @@ int main(void) { return RTC_IRQP_READ; } EOF _rtc=no -@@ -5772,7 +5722,7 @@ +@@ -5736,7 +5686,7 @@ + _stripbinaries=no + elif test -z "$CFLAGS" ; then + if test "$host_arch" != "mips" ; then +- CFLAGS="-O4 $_march $_mcpu -pipe -ffast-math -fomit-frame-pointer" ++ CFLAGS="-O" + else + CFLAGS="-O4 $_march $_mcpu -ffast-math -fomit-frame-pointer" + fi +@@ -5746,6 +5696,9 @@ + _stripbinaries=no + fi + else ++ if test "$_runtime_cpudetection" = no ; then ++ CFLAGS="$CFLAGS $_march $_mcpu" ++ fi + cat <<EOF + + MPlayer compilation will use the CFLAGS set by you, but: +@@ -5772,7 +5725,7 @@ CFLAGS="$CFLAGS -D_REENTRANT" elif bsd ; then # FIXME bsd needs this so maybe other OS'es |