Date: Thu, 3 May 2007 05:10:11 GMT From: "Thomas E. Zander" <riggs@rrr.de> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/111980: multimedia/mplayer: compilation error Message-ID: <200705030510.l435ABmk070744@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/111980; it has been noted by GNATS.
From: "Thomas E. Zander" <riggs@rrr.de>
To: bug-followup@FreeBSD.ORG
Cc: Robert Gogolok <gogo@cs.uni-sb.de>
Subject: Re: ports/111980: multimedia/mplayer: compilation error
Date: Thu, 3 May 2007 07:07:21 +0200
--huq684BweRXVnRxX
Content-Type: text/plain; charset=iso-8859-15
Content-Disposition: inline
I believe I have found a solution that addresses several weaknesses:
o This PR, i.e. mplayer builds on i386 if WITH_DEBUG is defined
o ports/111088, i.e. this port does no longer depend on lame if
PACKAGE_BUILDING is specified. In fact, all dependencies on
restricted software is removed in this case, that would allow us to
remove mplayer from LEGAL.
o Correct a dependency problem with the latest libcaca update
Robert, could you please test if this solves your problem? If possible,
I'd be interested in amd64 results as well (although I don't expect a
problem there).
Edwin, could you please briefly review if I am right with the
LEGAL/PACKAGE_BUILDING assumption and can we close 111088 as well if we
commit this diff?
Thanks,
Riggs
--
- "[...] I talked to the computer at great length and
-- explained my view of the Universe to it" said Marvin.
--- And what happened?" pressed Ford.
---- "It committed suicide." said Marvin.
--huq684BweRXVnRxX
Content-Type: text/x-diff; charset=iso-8859-15
Content-Disposition: attachment; filename="mplayer.diff"
diff -ruN /usr/ports/multimedia/mplayer/Makefile mplayer/Makefile
--- /usr/ports/multimedia/mplayer/Makefile Wed May 2 08:58:40 2007
+++ mplayer/Makefile Thu May 3 11:42:12 2007
@@ -8,16 +8,6 @@
# Some of the knobs are not tunable by the OPTIONS framework. These are
# explained here in detail.
#
-# Core funcionality:
-#
-# MPLAYER_GENERIC_BUILD
-# default: undefined
-# By default, the mplayer port creates a custom build based on personal
-# preferences.
-# If you want to build a generic package with certain fixed options,
-# suitable for any CPU within ${ARCH}, define this knob.
-# Note: Other knobs and especially OPTIONS
-#
# CPU features:
#
# The following is only of interest if you haven't enabled
@@ -83,7 +73,7 @@
PORTNAME= mplayer
PORTVERSION= 0.99.10
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= multimedia audio
MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \
http://www2.mplayerhq.hu/MPlayer/releases/ \
@@ -127,11 +117,12 @@
OPTIONS= DEBUG "Include debug symbols in mplayer's binary files" off
#Collect OPTIONS menu
-.if !defined(MPLAYER_GENERIC_BUILD)
OPTIONS+= RTCPU "Let mplayer dynamically check for CPU features" on
OPTIONS+= OCFLAGS "Use optimized compiler flags" on
OPTIONS+= SIMD "Allow mplayer to use vector engines (MMX...)" on
+.if !defined(PACKAGE_BUILDING)
OPTIONS+= MENCODER "Support encoding of multimedia files" on
+.endif
OPTIONS+= IPV6 "Include inet6 network support" on
OPTIONS+= X11 "Enable X11 support for mplayer's video output" on
OPTIONS+= GUI "Enable GTK2 graphical user interface with X11" on
@@ -162,7 +153,9 @@
OPTIONS+= TREMOR "Use built-in tremor instead of libvorbis" off
OPTIONS+= XMMS "Enable XMMS plugin support" off
OPTIONS+= THEORA "Enable ogg theora video support" off
+.if !defined(PACKAGE_BUILDING)
OPTIONS+= WIN32 "Enable win32 codec set on the IA32 arch" on
+.endif
OPTIONS+= X264 "Enable x264 (H.264) video codec support" off
OPTIONS+= XANIM "Enable xanim DLL support" off
OPTIONS+= XVID "Enable XVID video codec support" on
@@ -175,7 +168,6 @@
OPTIONS+= CDPARANOIA "Enable cdparanoia support" off
OPTIONS+= LIBLZO "Enable external liblzo library" off
OPTIONS+= JOYSTICK "Enable joystick support" off
-.endif
WANT_GNOME= yes
WANT_SDL= yes
@@ -224,41 +216,6 @@
PLIST_SUB+= VIDIX="@comment "
.endif
-# Esablish de-facto dependencies for either building generic mplayer
-# binary-suitable package or custom build
-
-.if defined(MPLAYER_GENERIC_BUILD)
-#Compiler flags
-CFLAGS= #let mplayer decide the flags
-
-#Defaults for generic build
-INCL_MODULES= RTCPU IPV6 X11 GUI SDL SKINS FREETYPE AALIB TREMOR \
- WIN32 XVID
-EXCL_MODULES= OCFLAGS MENCODER VIDIX NVIDIA RTC ARTS ESOUND \
- JACK POLYP NAS OPENAL LIBUNGIF LIBCACA SVGALIB \
- LIBDV MAD TWOLAME DTS LIBMPCDEC FAAC LADSPA SPEEX \
- XMMS THEORA X264 XANIM REALPLAYER LIVEMEDIA SMB \
- FRIBIDI LIRC LIBCDIO CDPARANOIA LIBLZO
-
-.for module in ${EXCL_MODULES}
-WITHOUT_${module}=yes
-.undef(WITH_${module})
-.endfor
-
-.for module in ${INCL_MODULES}
-WITH_${module}=yes
-.undef(WITHOUT_${module})
-.endfor
-
-.undef(WITH_DVD_DEVICE)
-.undef(WITH_CDROM_DEVICE)
-.undef(WITH_LANG)
-
-#Kernel granularity
-DEFAULT_KERN_HZ=1024
-CFLAGS+= -fno-force-addr
-.endif #MPLAYER_GENERIC_BUILD
-
.if !defined(WITHOUT_X11)
USE_XLIB= yes
.else
@@ -271,8 +228,18 @@
CONFIGURE_ARGS+=--language=${WITH_LANG}
.endif
+#On i386, gcc runs out of general purpose registers when
+#trying to compile a debug version with the default flags.
+.if defined(WITH_DEBUG)
+.if ${ARCH} == "i386"
+DEBUG_FLAGS= -g -O -fomit-frame-pointer
+.endif
+.else
.if !defined(WITHOUT_OCFLAGS)
CFLAGS+= -O3 -ffast-math -fomit-frame-pointer
+.else
+CFLAGS+= -O -fomit-frame-pointer
+.endif
.endif
.if defined(WITHOUT_IPV6)
@@ -308,7 +275,7 @@
CONFIGURE_ARGS+= --disable-rtc
.endif
-.if !defined(WITHOUT_MENCODER)
+.if !defined(WITHOUT_MENCODER) && !defined(PACKAGE_BUILDING)
LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame
MLINKS+= mplayer.1 mencoder.1
PLIST_SUB+= MENCODER=""
@@ -350,7 +317,7 @@
.endif
.if defined(WITH_LIBCACA)
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
+LIB_DEPENDS+=caca.0:${PORTSDIR}/graphics/libcaca
.else
CONFIGURE_ARGS+= --disable-caca
.endif
@@ -466,7 +433,7 @@
RUN_DEPENDS+= realplay:${PORTSDIR}/multimedia/linux-realplayer
BUILD_DEPENDS+= realplay:${PORTSDIR}/multimedia/linux-realplayer
.else
-.if !defined(WITHOUT_WIN32)
+.if !defined(WITHOUT_WIN32) && !defined(PACKAGE_BUILDING)
CONFIGURE_ARGS+= --enable-real \
--with-reallibdir=${LOCALBASE}/lib/win32
.else
@@ -609,7 +576,7 @@
CONFIGURE_ARGS+=--disable-mmxext --disable-sse --disable-sse2
.endif
.endif #WITH_RTCPU
-.if !defined(WITHOUT_WIN32)
+.if !defined(WITHOUT_WIN32) && !defined(PACKAGE_BUILDING)
RUN_DEPENDS+= ${CODEC_DETECTION_FILE}:${CODEC_PORT}
CONFIGURE_ARGS+= --with-win32libdir=${LOCALBASE}/lib/win32
CODEC_PORT= ${PORTSDIR}/multimedia/win32-codecs
@@ -659,15 +626,6 @@
@${REINPLACE_CMD} -e \
's|irqp = 1024|irqp = ${DEFAULT_KERN_HZ}|' \
${WRKSRC}/mplayer.c
-.endif
-.if defined(MPLAYER_GENERIC_BUILD) && defined(WITH_DEBUG)
- @${REINPLACE_CMD} -e \
- 's|1.0pre8|1.0pre8-FreeBSD-generic-debug|' \
- ${WRKSRC}/version.sh
-.elif defined(MPLAYER_GENERIC_BUILD)
- @${REINPLACE_CMD} -e \
- 's|1.0pre8|1.0pre8-FreeBSD-generic|' \
- ${WRKSRC}/version.sh
.endif
post-configure:
--huq684BweRXVnRxX--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200705030510.l435ABmk070744>