FreeBSD Bugzilla – Attachment 79291 Details for
Bug 113921
[PATCH] multimedia/transcode: chase multimedia/mjpegtools update
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
transcode-1.0.3_2.patch
transcode-1.0.3_2.patch (text/plain), 6.51 KB, created by
Naram Qashat
on 2007-06-21 21:00:11 UTC
(
hide
)
Description:
transcode-1.0.3_2.patch
Filename:
MIME Type:
Creator:
Naram Qashat
Created:
2007-06-21 21:00:11 UTC
Size:
6.51 KB
patch
obsolete
>diff -ruN --exclude=CVS /usr/ports/multimedia/transcode/Makefile /celes/transcode/Makefile >--- /usr/ports/multimedia/transcode/Makefile Thu May 31 01:49:09 2007 >+++ /celes/transcode/Makefile Thu Jun 21 15:28:41 2007 >@@ -7,7 +7,7 @@ > > PORTNAME= transcode > PORTVERSION= 1.0.3 >-PORTREVISION= 1 >+PORTREVISION= 2 > CATEGORIES= multimedia > MASTER_SITES= http://fromani.exit1.org/ > >@@ -48,82 +48,83 @@ > > .include <bsd.port.pre.mk> > >-.if defined(WITH_FREETYPE) || exists(${LOCALBASE}/lib/libfreetype.so) >+.if defined(WITH_FREETYPE) || (exists(${LOCALBASE}/lib/libfreetype.so) && !defined(WITHOUT_FREETYPE)) > LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 > CONFIGURE_ARGS+= --with-ft-prefix=${LOCALBASE} --enable-freetype2 > .else > CONFIGURE_ARGS+= --disable-fttest --enable-freetype=no > .endif > >-.if defined(WITH_OGG) || exists(${LOCALBASE}/lib/libogg.so) >+.if defined(WITH_OGG) || (exists(${LOCALBASE}/lib/libogg.so) && !defined(WITHOUT_OGG)) > LIB_DEPENDS+= ogg.5:${PORTSDIR}/audio/libogg > CONFIGURE_ARGS+= --with-ogg-prefix=${LOCALBASE} --enable-ogg > .else > CONFIGURE_ARGS+= --enable-ogg=no > .endif > >-.if defined(WITH_BKTR) >+.if defined(WITH_BKTR) && !defined(WITHOUT_BKTR) > CONFIGURE_ARGS+= --enable-bktr > .endif > >-.if defined(WITH_VORBIS) || exists(${LOCALBASE}/lib/libvorbis.so) >+.if defined(WITH_VORBIS) || (exists(${LOCALBASE}/lib/libvorbis.so) && !defined(WITHOUT_VORBIS)) > LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis > CONFIGURE_ARGS+= --with-vorbis-prefix=${LOCALBASE} --enable-vorbis > .else > CONFIGURE_ARGS+= --enable-vorbis=no > .endif > >-.if defined(WITH_THEORA) || exists(${LOCALBASE}/lib/libtheora.so) >+.if defined(WITH_THEORA) || (exists(${LOCALBASE}/lib/libtheora.so) && !defined(WITHOUT_THEORA)) > LIB_DEPENDS+= theora.2:${PORTSDIR}/multimedia/libtheora > CONFIGURE_ARGS+= --with-theora-prefix=${LOCALBASE} --enable-theora > .else > CONFIGURE_ARGS+= --enable-theora=no > .endif > >-.if defined(WITH_IMAGEMAGICK) || exists(${LOCALBASE}/lib/libMagick.so) >+.if defined(WITH_IMAGEMAGICK) || (exists(${LOCALBASE}/lib/libMagick.so) && !defined(WITHOUT_IMAGEMAGICK)) > LIB_DEPENDS+= Magick.10:${PORTSDIR}/graphics/ImageMagick > CONFIGURE_ARGS+= --enable-imagemagick --with-imagemagick-prefix=${LOCALBASE} > .else > CONFIGURE_ARGS+= --enable-imagemagick=no > .endif > >-.if defined(WITH_MJPEG) || exists(${LOCALBASE}/lib/liblavjpeg.so) >-LIB_DEPENDS+= lavjpeg-1.8.0:${PORTSDIR}/multimedia/mjpegtools >+.if defined(WITH_MJPEG) || (exists(${LOCALBASE}/lib/liblavjpeg.so) && !defined(WITHOUT_MJPEG)) >+LIB_DEPENDS+= lavjpeg-1.9:${PORTSDIR}/multimedia/mjpegtools > CONFIGURE_ARGS+= --enable-mjpegtools > .else > CONFIGURE_ARGS+= --enable-mjpegtools=no > .endif > >-.if defined(WITH_AVIFILE) || exists(${LOCALBASE}/lib/libaviplay.so) >+.if defined(WITH_AVIFILE) || (exists(${LOCALBASE}/lib/libaviplay.so) && !defined(WITHOUT_AVIFILE)) > LIB_DEPENDS+= aviplay:${PORTSDIR}/multimedia/avifile > CONFIGURE_ARGS+= --with-avifile-prefix=${LOCALBASE} --enable-avifile > .else > CONFIGURE_ARGS+= --enable-avifile=no > .endif > >-.if defined(WITH_SDL) || ${HAVE_SDL:Msdl}!="" >+.if defined(WITH_SDL) || (${HAVE_SDL:Msdl}!="" && !defined(WITHOUT_SDL)) > USE_SDL+= sdl > WITH_LIBDV= yes >+.undef WITHOUT_LIBDV > CONFIGURE_ARGS+= --enable-sdl --with-sdl-prefix=${LOCALBASE} > .else > CONFIGURE_ARGS+= --enable-sdl=no > .endif > >-.if !defined(WITHOUT_XML) || ${HAVE_GNOME:Mlibxml2}!="" >+.if defined(WITH_XML) || (${HAVE_GNOME:Mlibxml2}!="" && !defined(WITHOUT_XML)) > USE_GNOME+= libxml2 > CONFIGURE_ARGS+= --enable-libxml2 --with-libxml2-prefix=${LOCALBASE} > .else > CONFIGURE_ARGS+= --enable-libxml2=no > .endif > >-.if defined(WITH_LIBDV) || exists(${LOCALBASE}/lib/libdv.so) >+.if defined(WITH_LIBDV) || (exists(${LOCALBASE}/lib/libdv.so) && !defined(WITHOUT_LIBDV)) > LIB_DEPENDS+= dv.4:${PORTSDIR}/multimedia/libdv > CONFIGURE_ARGS+= --with-pal-yuv=YV12 --enable-libdv > .else > CONFIGURE_ARGS+= --enable-libdv=no > .endif > >-.if defined(WITH_QUICKTIME) || exists(${LOCALBASE}/lib/libquicktime.so) >+.if defined(WITH_QUICKTIME) || (exists(${LOCALBASE}/lib/libquicktime.so) && !defined(WITHOUT_QUICKTIME)) > LIB_DEPENDS+= quicktime.0:${PORTSDIR}/multimedia/libquicktime > CONFIGURE_ARGS+= --enable-libquicktime \ > --with-libquicktime-prefix=${LOCALBASE} \ >@@ -132,17 +133,17 @@ > CONFIGURE_ARGS+= --enable-libquicktime=no > .endif > >-.if defined(WITH_FAME) # Disable.. meh # || exists(${LOCALBASE}/lib/libfame.so) >+.if defined(WITH_FAME) # Disable.. meh # || (exists(${LOCALBASE}/lib/libfame.so) && !defined(WITHOUT_FAME)) > LIB_DEPENDS+= fame-0.9:${PORTSDIR}/multimedia/libfame > CONFIGURE_ARGS+= --with-libfame-prefix=${LOCALBASE} --enable-libfame > .endif > >-.if defined(WITH_XVID) || exists(${LOCALBASE}/lib/libxvidcore.so) >+.if defined(WITH_XVID) || (exists(${LOCALBASE}/lib/libxvidcore.so) && !defined(WITHOUT_XVID)) > LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid > RUN_DEPENDS+= xvid4conf:${PORTSDIR}/multimedia/xvid4conf > .endif > >-.if defined(WITH_LIBA52_DEFAULT) || exists(${LOCALBASE}/lib/liba52.so) >+.if defined(WITH_LIBA52_DEFAULT) || (exists(${LOCALBASE}/lib/liba52.so) && !defined(WITHOUT_LIBA52)) > WITH_LIBA52= yes > CONFIGURE_ARGS+= --enable-a52-default-decoder > .endif >@@ -154,14 +155,14 @@ > CONFIGURE_ARGS+= --with-a52=no > .endif > >-.if defined(WITH_LAME) || exists(${LOCALBASE}/lib/libmp3lame.so) >+.if defined(WITH_LAME) || (exists(${LOCALBASE}/lib/libmp3lame.so) && !defined(WITHOUT_LAME)) > LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame > CONFIGURE_ARGS+= --with-lame-prefix=${LOCALBASE} > .else > CONFIGURE_ARGS+= --disable-lame > .endif > >-.if defined(WITH_LZO) || exists(${LOCALBASE}/lib/liblzo.so) >+.if defined(WITH_LZO) || (exists(${LOCALBASE}/lib/liblzo.so) && !defined(WITHOUT_LZO)) > LIB_DEPENDS+= lzo.1:${PORTSDIR}/archivers/lzo > CONFIGURE_ARGS+= --enable-lzo --with-lzo-prefix=${LOCALBASE} \ > --with-lzo-includes=${LOCALBASE} >@@ -169,7 +170,7 @@ > CONFIGURE_ARGS+= --enable-lzo=no > .endif > >-.if (defined(WITH_DIVX5) && ${ARCH}=="i386") || exists(${LINUXBASE}/usr/lib/libdivxdecore.so) >+.if (defined(WITH_DIVX5) && ${ARCH}=="i386") || (exists(${LINUXBASE}/usr/lib/libdivxdecore.so) && !defined(WITHOUT_DIVX5)) > BUILD_DEPENDS+= ${LINUXBASE}/usr/lib/libdivxdecore.so:${PORTSDIR}/multimedia/linux-divx4linux > CFLAGS+= -I${LINUXBASE}/usr/include/divx > .else >@@ -209,9 +210,9 @@ > @${ECHO_MSG} "You can enable realtime-previewing by defining WITH_SDL." > @${ECHO_MSG} "This implies WITH_LIBDV." > .endif >-.if !defined(WITHOUT_XML) >+.if !defined(WITH_XML) > @${ECHO_MSG} >- @${ECHO_MSG} "You can disable libxml2-dependent modules by defining WITHOUT_XML." >+ @${ECHO_MSG} "You can enable libxml2-dependent modules by defining WITH_XML." > .endif > .if !defined(WITH_LAME) > @${ECHO_MSG}
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 113921
: 79291