Date: Wed, 21 Nov 2007 06:39:02 GMT From: Volkov Andrey <support@nolty.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/118168: [patch] multimedia/transcode. Add WITHOUT_X11 and WITHOUT_DVDREAD. Message-ID: <200711210639.lAL6d2wv081126@www.freebsd.org> Resent-Message-ID: <200711210640.lAL6e0sC069678@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 118168 >Category: ports >Synopsis: [patch] multimedia/transcode. Add WITHOUT_X11 and WITHOUT_DVDREAD. >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Nov 21 06:40:00 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Volkov Andrey >Release: FreeBSD 6.2-STABLE i386 >Organization: Nolty >Environment: FreeBSD ns.nolty.ru 6.3-PRERELEASE FreeBSD 6.3-PRERELEASE #12: Mon Oct 29 16:07:30 YEKT 2007 root@ns.nolty.ru:/usr/obj/usr/src/sys/NNS i386 >Description: This patch prevents transcode to be compiled with X when WITHOUT_X11 is set. Transcode 1.0.4 compiles and works perfectly without heavy X11 libraries. I also introduced variable WITHOUT_DVDREAD. It is used to prevent libdvdread to be installed as a dependency. According to the 'configure' script, it is not required. This patch is very useful when transcode is used on a server. >How-To-Repeat: >Fix: Patch attached with submission follows: --- Makefile.orig 2007-11-21 01:50:54.000000000 +0500 +++ Makefile 2007-11-21 01:51:14.000000000 +0500 @@ -14,8 +14,7 @@ MAINTAINER= multimedia@FreeBSD.org COMMENT= A text-console utility for video stream processing -LIB_DEPENDS= dvdread.5:${PORTSDIR}/multimedia/libdvdread \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 \ avcodec.1:${PORTSDIR}/multimedia/ffmpeg BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv @@ -24,7 +23,6 @@ FAKEDIR= ${WRKDIR}/fake PLIST= ${WRKDIR}/plist USE_GETOPT_LONG=yes -USE_XLIB= yes USE_GMAKE= yes USE_LDCONFIG= yes WANT_SDL= yes @@ -35,7 +33,6 @@ SDL_CONFIG="${SDL_CONFIG}" CONFIGURE_ARGS+= --with-libavcodec-includes=${LOCALBASE}/include/ffmpeg \ --with-libavcodec-libs=${LOCALBASE}/lib \ - --with-libdvdread-prefix=${LOCALBASE} \ --with-libiconv-prefix=${LOCALBASE} \ --enable-oss \ --enable-gtk=no @@ -64,6 +61,18 @@ CONFIGURE_ARGS+= --enable-bktr .endif +.if !defined(WITHOUT_X11) +USE_XLIB= yes +CONFIGURE_ARGS+= --with-x +.endif + +.if !defined(WITHOUT_DVDREAD) +LIB_DEPENDS+= dvdread.5:${PORTSDIR}/multimedia/libdvdread +CONFIGURE_ARGS+= --with-libdvdread-prefix=${LOCALBASE} --enable-libdvdread +.else +CONFIGURE_ARGS+= --enable-libdvdread=no +.endif + .if defined(WITH_VORBIS) || exists(${LOCALBASE}/lib/libvorbis.so) LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis CONFIGURE_ARGS+= --with-vorbis-prefix=${LOCALBASE} --enable-vorbis @@ -178,6 +187,14 @@ @${ECHO_MSG} @${ECHO_MSG} "You can enable extra optimizations by defining WITH_OPTIMIZED_CFLAGS." .endif +.if !defined(WITHOUT_X11) + @${ECHO_MSG} + @${ECHO_MSG} "You can disable X modules by defining WITHOUT_X11." +.endif +.if !defined(WITHOUT_DVDREAD) + @${ECHO_MSG} + @${ECHO_MSG} "You can disable dvdread modules by defining WITHOUT_DVDREAD." +.endif .if !defined(WITH_FREETYPE) @${ECHO_MSG} @${ECHO_MSG} "You can enable text/subtitler modules by defining WITH_FREETYPE." >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200711210639.lAL6d2wv081126>