Date: Wed, 30 Jun 2004 08:19:28 -0400 From: Tom McLaughlin <tmclaugh@sdf.lonestar.org> To: Kirill Ponomarew <krion@FreeBSD.org> Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/68431: multimedia/mplayer: fix WITHOUT_RUNTIME_CPUDETECTION knob and respect CFLAGS Message-ID: <1088597968.91358.49.camel@compass.straycat.dhs.org> In-Reply-To: <200406300736.i5U7aEBV087729@freefall.freebsd.org> References: <200406300736.i5U7aEBV087729@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-cV+V6IIMx1N2L7qMgqVE
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Attached is a better patch after having talked to maintainer and pav@
yesterday. Removed optimized CFLAGS knob changes and renamed
patch-configure back to patch-ad to not clutter up attic. Thanks.
--=-cV+V6IIMx1N2L7qMgqVE
Content-Disposition: attachment; filename=mplayer_cpudetect_cflags-NEW.diff
Content-Type: text/x-patch; name=mplayer_cpudetect_cflags-NEW.diff
Content-Transfer-Encoding: 7bit
Index: mplayer/Makefile
===================================================================
RCS file: /home/ncvs/ports/multimedia/mplayer/Makefile,v
retrieving revision 1.96
diff -u -r1.96 Makefile
--- mplayer/Makefile 14 Jun 2004 14:47:12 -0000 1.96
+++ mplayer/Makefile 29 Jun 2004 22:52:27 -0000
@@ -642,11 +642,9 @@
@${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>|' \
Index: mplayer/files/patch-ad
===================================================================
RCS file: /home/ncvs/ports/multimedia/mplayer/files/patch-ad,v
retrieving revision 1.17
diff -u -r1.17 patch-ad
--- mplayer/files/patch-ad 11 Jun 2004 18:08:51 -0000 1.17
+++ mplayer/files/patch-ad 29 Jun 2004 22:52:27 -0000
@@ -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
--=-cV+V6IIMx1N2L7qMgqVE--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1088597968.91358.49.camel>