Date: Sat, 17 Jun 2006 05:54:58 +0400 From: Tarc <tarc@tarc.po.cs.msu.su> To: "Thomas E. Zander" <riggs@rrr.de> Cc: ports@freebsd.org Subject: [options fix] mplayer 1.0pre8 port Message-ID: <20060617015458.GY22799@tarc.po.cs.msu.su> In-Reply-To: <20060615160316.GE908@marvin.riggiland.au> References: <20060615160316.GE908@marvin.riggiland.au>
next in thread | previous in thread | raw e-mail | index | archive | help
--IS0zKkzwUGydFO0o Content-Type: text/plain; charset=koi8-r Content-Disposition: inline On Thu, Jun 15, 2006 at 06:03:16PM +0200, Thomas E. Zander wrote: > Good evening, > > at this location > > http://www.rrr.de/~riggs/mplayer/mplayer.tar.bz2 > > you find the first preview of the port update to mplayer for the > current release 1.0pre8. > The pre8 release is a quite heavy update with some extensive changes, > so is the port. I'd like to take this upgrade as an opportunity to make > use of the OPTIONS framework for mplayer builds. some OPTIONS issue: some missed options added and some simplifyes for generig building. file attached -- Best regards, Arseny Nasokin --IS0zKkzwUGydFO0o Content-Type: text/plain; charset=koi8-r Content-Disposition: attachment; filename="Makefile.diff" --- Makefile.orig Sat Jun 17 05:01:18 2006 +++ Makefile Sat Jun 17 05:51:13 2006 @@ -158,6 +158,10 @@ OPTIONS+= FRIBIDI "Enable FriBiDi support" off OPTIONS+= LIRC "Enable lirc support" off OPTIONS+= CDPARANOIA "Enable cdparanoia support" off +OPTIONS+= MMX "Enable using MMX code (if WITH_RTCPU defined)" off +OPTIONS+= SSE "Enable SSE/SSE2 code" off +OPTIONS+= 3DNOW "Enable using 3dNow! instructions on AMD" off +OPTIONS+= DSP "Enable using of AMD Athlon DSP extentions" off .endif WANT_GNOME= yes @@ -173,26 +177,6 @@ .include <bsd.port.pre.mk> -.if !defined(MPLAYER_GENERIC_BUILD) -.if defined(WITHOUT_X11) -WITHOUT_GUI= yes -BUILD_DEPENDS+= imake:${X_IMAKE_PORT} -CONFIGURE_ARGS+=--disable-x11 -.else -USE_XLIB= yes -CONFIGURE_ARGS+=--with-x11libdir=${X11BASE}/lib \ - --with-x11incdir=${X11BASE}/include -.endif - -.if defined(WITH_LANG) -CONFIGURE_ARGS+=--language=${WITH_LANG} -.endif -.else -USE_XLIB= yes -CONFIGURE_ARGS+=--with-x11libdir=${X11BASE}/lib \ - --with-x11incdir=${X11BASE}/include -.endif #MPLAYER_GENERIC_BUILD - #Building of vidix dependent shared libs is only possible #on i386 at the moment. .if ${ARCH} == "i386" @@ -215,11 +199,8 @@ CONFIGURE_ARGS+=--enable-runtime-cpudetection #GUI USE_GNOME+= gtk20 -.if defined(PKGNAMESUFFIX) PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gtk2 -.else -PKGNAMESUFFIX= -gtk2 -.endif + CONFIGURE_ARGS+= --enable-gui PLIST_SUB+= GMPLAYER="" RUN_DEPENDS+= ${LOCALBASE}/share/mplayer/Skin:${PORTSDIR}/multimedia/mplayer-skins @@ -231,63 +212,41 @@ MLINKS+= mplayer.1 mencoder.1 PLIST_SUB+= MENCODER="" #ARTS -CONFIGURE_ARGS+= --disable-arts -#Fribidi -CONFIGURE_ARGS+= --disable-fribidi -#Cdparanoia -CONFIGURE_ARGS+= --disable-cdparanoia -#Caca -CONFIGURE_ARGS+= --disable-caca -#Libungif -CONFIGURE_ARGS+= --disable-gif -#Libdv -CONFIGURE_ARGS+= --disable-libdv -#Mad -CONFIGURE_ARGS+= --disable-mad -#Theora -CONFIGURE_ARGS+= --disable-theora -#x264 -CONFIGURE_ARGS+= --disable-x264 -#Svgalib -LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib -#Aalib -LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib -#SDL -USE_SDL= sdl -#Esound -CONFIGURE_ARGS+= --disable-esd -#Vorbis -LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis -#Live media -CONFIGURE_ARGS+= --disable-live -#XviD -CONFIGURE_ARGS+= --enable-xvid -LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid -#Freetype -CONFIGURE_ARGS+= --with-extraincdir=${LOCALBASE}/include/freetype2 \ - --enable-freetype -LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 -#XAnim codecs -BUILD_DEPENDS+= xanim:${PORTSDIR}/multimedia/xanim -CONFIGURE_ARGS+= --enable-xanim \ - --with-xanimlibdir=${X11BASE}/lib/X11/xanim -#Optical drive descriptors -.if ${OSVERSION} < 500000 -DEFAULT_DVD_DEVICE=/dev/acd0c -DEFAULT_CDROM_DEVICE=/dev/acd0c -.else -DEFAULT_DVD_DEVICE=/dev/acd0 -DEFAULT_CDROM_DEVICE=/dev/acd0 -.endif + +.for module in ARTS FRIBIDI CDPARANOIA LIBCACA LIBUNGIF LIBDV MAD THEORA X264 FRIBIDI LIVEMEDIA ESOUND OCFLAGS RTC MENCODER NVIDIA LIRC XMMS +WITHOUT_${module}=yes +.undef(WITH_${module}) +.endfor + +.for module in GUI SVGALIB AALIB SDL XVID FREETYPE XANIM WITH_RTCPU WIN32 X11 +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 -.if defined(WITH_DEBUG) -CONFIGURE_ARGS+= --enable-debug=3 +.endif #MPLAYER_GENERIC_BUILD + +.if defined(WITHOUT_X11) +WITHOUT_GUI= yes +BUILD_DEPENDS+= imake:${X_IMAKE_PORT} +CONFIGURE_ARGS+=--disable-x11 +.else +USE_XLIB= yes +CONFIGURE_ARGS+=--with-x11libdir=${X11BASE}/lib \ + --with-x11incdir=${X11BASE}/include .endif -.else #MPLAYER_GENERIC_BUILD -.if defined(WITH_OCFLAGS) +.if defined(WITH_LANG) +CONFIGURE_ARGS+=--language=${WITH_LANG} +.endif + +.if defined(WITH_OCFLAGS) && !defined(WITHOUT_OCFLAGS) CFLAGS+= -O3 -ffast-math -fomit-frame-pointer .endif @@ -297,29 +256,32 @@ CATEGORIES+= ipv6 .endif -.if !defined(WITHOUT_GUI) +.if defined (WITH_GUI) &&!defined(WITHOUT_GUI) PLIST_SUB+= GMPLAYER="" .if !defined(WITHOUT_SKINS) RUN_DEPENDS+= ${LOCALBASE}/share/mplayer/Skin:${PORTSDIR}/multimedia/mplayer-skins .endif + .if ( ${OSVERSION} < 500000 ) USE_GCC= 3.4 .endif + USE_GNOME+= gtk20 -.if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gtk2 -.else -PKGNAMESUFFIX= -gtk2 -.endif CONFIGURE_ARGS+= --enable-gui + +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gtk2 + + .if defined(WITH_LANG) WITH_LANG= "" .endif + .else PLIST_SUB+= GMPLAYER="@comment " +#GUI building?!! .endif -.if defined(WITH_RTC) +.if defined(WITH_RTC) && !defined(WITHOUT_RTC) BUILD_DEPENDS+= ${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc RUN_DEPENDS+= ${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc CONFIGURE_ARGS+= --enable-rtc @@ -337,46 +299,46 @@ PLIST_SUB+= MENCODER="@comment " .endif -.if defined(WITH_NVIDIA) +.if defined(WITH_NVIDIA) && !defined(WITHOUT_NVIDIA) LIB_DEPENDS+= XvMCNVIDIA.1:${PORTSDIR}/x11/nvidia-driver CONFIGURE_ARGS+= --enable-xvmc \ --enable-xvmclib=XvMCNVIDIA .endif -.if defined(WITH_ARTS) +.if defined(WITH_ARTS) && !defined(WITHOUT_ARTS) LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts CONFIGURE_ARGS+= --enable-arts .else CONFIGURE_ARGS+= --disable-arts .endif -.if defined(WITH_FRIBIDI) +.if defined(WITH_FRIBIDI) && !defined(WITHOUT_FRIBIDI) LIB_DEPENDS+= fribidi.0:${PORTSDIR}/converters/fribidi CONFIGURE_ARGS+= --enable-fribidi .else CONFIGURE_ARGS+= --disable-fribidi .endif -.if defined(WITH_CDPARANOIA) +.if defined(WITH_CDPARANOIA) && !defined(WITHOUT_CDPARANOIA) LIB_DEPENDS+= cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia .else CONFIGURE_ARGS+= --disable-cdparanoia .endif -.if defined(WITH_LIBCACA) +.if defined(WITH_LIBCACA) && !defined(WITHOUT_LIBCACA) BUILD_DEPENDS+= ${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca .else CONFIGURE_ARGS+= --disable-caca .endif -.if defined(WITH_LIBUNGIF) +.if defined(WITH_LIBUNGIF) && !defined(WITHOUT_LIBUNGIF) LIB_DEPENDS+= ungif.5:${PORTSDIR}/graphics/libungif #CONFIGURE_ARGS+= --enable-gif .else CONFIGURE_ARGS+= --disable-gif .endif -.if defined(WITH_LIBDV) +.if defined(WITH_LIBDV) && !defined(WITHOUT_LIBDV) LIB_DEPENDS+= dv.4:${PORTSDIR}/multimedia/libdv CONFIGURE_ARGS+= --enable-libdv @@ -384,14 +346,14 @@ CONFIGURE_ARGS+= --disable-libdv .endif -.if defined(WITH_LIRC) +.if defined(WITH_LIRC) && !defined(WITHOUT_LIRC) LIB_DEPENDS+= lirc_client.0:${PORTSDIR}/comms/lirc CONFIGURE_ARGS+= --enable-lirc .else CONFIGURE_ARGS+= --disable-lirc .endif -.if defined(WITH_MAD) +.if defined(WITH_MAD) && !defined(WITHOUT_MAD) LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad CONFIGURE_ARGS+= --enable-mad \ @@ -400,7 +362,7 @@ CONFIGURE_ARGS+= --disable-mad .endif -.if defined(WITH_SDL) +.if defined(WITH_SDL) && !defined(WITHOUT_SDL) USE_SDL= sdl WITH_AALIB= yes WITH_SVGALIB= yes @@ -408,31 +370,31 @@ CONFIGURE_ARGS+= --disable-sdl .endif -.if defined(WITH_SVGALIB) +.if defined(WITH_SVGALIB) && !defined(WITHOUT_SVGALIB) LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib .else CONFIGURE_ARGS+= --disable-svga .endif -.if defined(WITH_AALIB) +.if defined(WITH_AALIB) && !defined(WITHOUT_AALIB) LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib .else CONFIGURE_ARGS+= --disable-aa .endif -.if defined(WITH_THEORA) +.if defined(WITH_THEORA) && !defined(WITHOUT_THEORA) LIB_DEPENDS+= theora.2:${PORTSDIR}/multimedia/libtheora .else CONFIGURE_ARGS+= --disable-theora .endif -.if defined(WITH_X264) +.if defined(WITH_X264) && !defined(WITHOUT_X264) LIB_DEPENDS+= x264.47:${PORTSDIR}/multimedia/x264 .else CONFIGURE_ARGS+= --disable-x264 .endif -.if defined(WITH_ESOUND) +.if defined(WITH_ESOUND) && !defined(WITHOUT_ESOUND) USE_GNOME+= esound .if defined(PKGNAMESUFFIX) PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-esound @@ -443,12 +405,12 @@ CONFIGURE_ARGS+= --disable-esd .endif -.if !defined(WITH_TREMOR) +.if !defined(WITH_TREMOR) && !defined(WITHOUT_TREMOR) CONFIGURE_ARGS+= --disable-internal-tremor LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis .endif -.if defined(WITH_REALPLAYER) +.if defined(WITH_REALPLAYER) && !defined(WITHOUT_REALPLAYER) CONFIGURE_ARGS+= --enable-real \ --with-reallibdir=${X11BASE}/lib/RealPlayer/codecs RUN_DEPENDS+= realplay:${PORTSDIR}/multimedia/linux-realplayer @@ -457,7 +419,7 @@ CONFIGURE_ARGS+= --disable-real .endif -.if defined(WITH_LIVEMEDIA) +.if defined(WITH_LIVEMEDIA) && !defined(WITHOUT_LIVEMEDIA) CONFIGURE_ARGS+= --enable-live \ --with-livelibdir=${LOCALBASE}/live RUN_DEPENDS+= ${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia @@ -466,28 +428,28 @@ CONFIGURE_ARGS+= --disable-live .endif -.if defined(WITH_XVID) +.if defined(WITH_XVID) && !defined(WITHOUT_XVID) CONFIGURE_ARGS+= --enable-xvid LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid .else CONFIGURE_ARGS+= --disable-xvid .endif -.if defined(WITH_XMMS) +.if defined(WITH_XMMS) && !defined(WITHOUT_XMMS) CONFIGURE_ARGS+= --enable-xmms LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms .else CONFIGURE_ARGS+= --disable-xmms .endif -.if defined(WITH_DTS) +.if defined(WITH_DTS) && !defined(WITHOUT_DTS) CONFIGURE_ARGS+= --enable-libdts BUILD_DEPENDS+= ${LOCALBASE}/lib/libdts.a:${PORTSDIR}/multimedia/libdts .else CONFIGURE_ARGS+= --disable-libdts .endif -.if defined(WITH_FREETYPE) +.if defined(WITH_FREETYPE) && !defined(WITHOUT_FREETYPE) CONFIGURE_ARGS+= --with-extraincdir=${LOCALBASE}/include/freetype2 \ --enable-freetype LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 @@ -496,14 +458,14 @@ CONFIGURE_ARGS+= --disable-freetype .endif -.if defined(WITH_XANIM) +.if defined(WITH_XANIM) && !defined(WITHOUT_XANIM) BUILD_DEPENDS+= xanim:${PORTSDIR}/multimedia/xanim CONFIGURE_ARGS+=--enable-xanim --with-xanimlibdir=${X11BASE}/lib/X11/xanim .else CONFIGURE_ARGS+=--disable-xanim .endif -.if defined(WITH_DVD_DEVICE) +.if defined(WITH_DVD_DEVICE) DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE} .else .if ${OSVERSION} < 500000 @@ -531,7 +493,7 @@ # "enable" build for other archs .if ${ARCH} == "i386" -.if defined(RTCPU) +.if defined(WITH_RTCPU) && !defined(WITHOUT_RTCPU) CONFIGURE_ARGS+=--enable-runtime-cpudetection .else #WITHOUT_RUNTIME_CPUDETECTION .if defined(WITHOUT_MMX) @@ -547,7 +509,7 @@ CONFIGURE_ARGS+=--disable-mmx2 --disable-sse --disable-sse2 .endif .endif #WITHOUT_RUNTIME_CPUDETECTION -.if defined(WITH_WIN32) +.if defined(WITH_WIN32) && !defined(WITHOUT_WIN32) RUN_DEPENDS+= ${CODEC_DETECTION_FILE}:${CODEC_PORT} CONFIGURE_ARGS+= --with-win32libdir=${LOCALBASE}/lib/win32 CODEC_PORT= ${PORTSDIR}/multimedia/win32-codecs @@ -557,7 +519,6 @@ --disable-qtx-codecs .endif .endif # ARCH == i386 -.endif #MPLAYER_GENERIC_BUILD pre-everything:: @${ECHO_MSG} "N - O - T - E" @@ -565,6 +526,7 @@ @${ECHO_MSG} "There are some knobs which *can* *not* be selected via the" @${ECHO_MSG} "OPTIONS framework. You might want to check the Makefile in" @${ECHO_MSG} "order to learn more about them." + @${ECHO_MSG} "There are: <FILL ME THERE>" .if !defined(WITHOUT_GUI) @${ECHO_MSG} "If you want to use the GUI, you can either install" --IS0zKkzwUGydFO0o--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060617015458.GY22799>