ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/mports/trunk/multimedia/ffmpeg0/Makefile
(Generate patch)

Comparing trunk/multimedia/ffmpeg/Makefile (file contents):
Revision 9343 by laffer1, Sat Feb 27 22:40:54 2010 UTC vs.
Revision 10170 by laffer1, Sat Nov 6 16:05:39 2010 UTC

# Line 1 | Line 1
1 < # $MidnightBSD: mports/multimedia/ffmpeg/Makefile,v 1.4 2010/02/27 22:18:33 laffer1 Exp $
1 > # $MidnightBSD: mports/multimedia/ffmpeg/Makefile,v 1.5 2010/02/27 22:40:54 laffer1 Exp $
2  
3   PORTNAME=       ffmpeg
4 < PORTVERSION=    0.5
4 > PORTVERSION=    0.6
5   PORTEPOCH=      1
6   CATEGORIES=     multimedia audio ipv6 net
7   MASTER_SITES=   http://ffmpeg.org/releases/
# Line 19 | Line 19 | USE_GMAKE=     yes
19   MAKE_JOBS_SAFE= yes
20   WANT_SDL=       yes
21  
22 < OPTIONS=        AMR_NB  "AMR Narrow Band encoder" off \
23 <                AMR_WB  "AMR Wide Band encoder" off \
22 > OPTIONS=        AMR_NB  "AMR Narrow Band encoder (opencore)" off \
23 >                AMR_WB  "AMR Wide Band encoder (opencore)" off \
24                  DIRAC   "Dirac codec via libdirac" off \
25                  FAAC    "FAAC mp4/aac audio encoder" off \
26                  FAAD    "FAAD mp4/aac audio decoder" on \
27                  FFSERVER "Build and install ffserver" on \
28                  GSM     "GSM audio codec" off \
29                IPV6    "IPV6 network support" on \
29                  LAME    "LAME MP3 encoder" off \
30                  OPENJPEG        "JPEG 2000 decoder" off \
31                  OPTIMIZED_CFLAGS "Additional optimizations" off \
32                  SCHROEDINGER    "Dirac codec via libschroedinger" on \
33                  SDL     "SDL support (build ffplay)" off \
34                  SPEEX   "Speex audio decoder" off \
35 +                SSSE3   "Enable ssse3 support" on \
36                  THEORA  "Theora encoder (implies OGG)" on \
37                VHOOK   "Video hook support" off \
37                  VORBIS  "Vorbis encoder via libvorbis (implies OGG)" on \
38                  X264    "H.264 encoder" on \
39                  XVID    "Xvid encoder via xvidcore" on
# Line 72 | Line 71 | CONFIGURE_ARGS+=--prefix="${PREFIX}" \
71                  --mandir="${PREFIX}/man" \
72                  --enable-shared \
73                  --enable-gpl \
75                --enable-swscale \
74                  --enable-postproc \
75                  --enable-avfilter \
76                  --enable-avfilter-lavf \
# Line 88 | Line 86 | SHLIB_VER=     1
86   PLIST_SUB=      SHLIB_VER=${SHLIB_VER}
87   USE_LDCONFIG=   yes
88  
89 < DOC_FILES=      Changelog COPYING.GPL COPYING.LGPL \
90 <                CREDITS INSTALL MAINTAINERS README
89 > DOC_FILES=      Changelog COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 \
90 >                COPYING.LGPLv3 CREDITS INSTALL LICENSE MAINTAINERS README \
91 >                RELEASE
92   # under doc subdirectory
93 < DOC_DOCFILES=   APIchanges avutil.txt faq.html ffmpeg-doc.html \
93 > DOC_DOCFILES=   APIchanges TODO avutil.txt developer.html faq.html \
94                  ffmpeg_powerpc_performance_evaluation_howto.txt \
95 <                ffplay-doc.html ffserver-doc.html general.html \
96 <                issue_tracker.txt optimization.txt \
97 <                snow.txt soc.txt swscale.txt TODO
95 >                ffmpeg-doc.html ffplay-doc.html ffprobe-doc.html \
96 >                ffserver-doc.html general.html issue_tracker.txt \
97 >                libavfilter.html optimization.txt rate_distortion.txt \
98 >                snow.txt soc.txt swscale.txt tablegen.txt viterbi.txt
99   PORTDOCS=       *
100  
101 + .if !defined(WITHOUT_SSSE3)
102 + BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
103 + CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
104 + MAKE_ENV+=      COMPILER_PATH=${LOCALBASE}/bin
105 + .endif
106 +
107   .ifndef(WITHOUT_FFSERVER)
108   USE_RC_SUBR=    ffserver
109   .endif
110  
111   # sse hardware vector support
112 < .if (defined(MACHINE_CPU) && ${MACHINE_CPU:Msse} == "sse")
112 > .if defined(MACHINE_CPU) && (${MACHINE_CPU:Msse} == "sse" || ${MACHINE_CPU:Mamd64} == "amd64")
113   WITH_BUILTIN_VECTOR=    yes
114   .else
115   CONFIGURE_ARGS+=        --disable-sse
116   .endif
117  
118   # mmx support
119 < .if ${MACHINE_CPU:Mmmx} == ""
119 > .if defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx} == "" && ${MACHINE_CPU:Mamd64} == ""
120   CONFIGURE_ARGS+=        --disable-mmx
121   WITHOUT_BUILTIN_VECTOR= yes
122   .endif
123  
124 < # builtin vector, requires mmx
124 > # builtin vector, requires mmx and sse
125   .if !defined(WITHOUT_BUILTIN_VECTOR) && defined(WITH_BUILTIN_VECTOR)
126   FFMPEG_CFLAGS+=         -msse
127   .endif
# Line 123 | Line 129 | FFMPEG_CFLAGS+=                -msse
129   # PORTDOCS
130   .ifndef(NOPORTDOCS)
131   BUILD_DEPENDS+=         texi2html:${PORTSDIR}/textproc/texi2html
132 < MAN1+=          ffmpeg.1
132 > MAN1+=          ffmpeg.1 ffprobe.1
133   . ifndef(WITHOUT_FFSERVER)
134   MAN1+=          ffserver.1
135   . endif
136   .endif
137  
138   # optimizations
139 < .ifdef(WITH_OPTIMIZED_CFLAGS)
140 < CFLAGS:=        ${CFLAGS:N-O*} -O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer
135 < .else
136 < CFLAGS:=        ${CFLAGS:N-O0} -O2
137 < DEBUG_FLAGS+=   -O2
139 > .if defined(WITH_OPTIMIZED_CFLAGS)
140 > CFLAGS+=        -O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer
141   .endif
142  
143   # amr
144 + .if defined(WITH_AMR_NB) || defined (WITH_AMR_WB)
145 + LIB_DEPENDS+=   opencore-amrnb.0:${PORTSDIR}/audio/opencore-amr
146 + .endif
147 +
148   .ifdef(WITH_AMR_NB)
149 < LIB_DEPENDS+=   amrnb.3:${PORTSDIR}/audio/libamrnb
143 < CONFIGURE_ARGS+=        --enable-libamr-nb --enable-nonfree
149 > CONFIGURE_ARGS+=        --enable-libopencore-amrnb --enable-version3
150   .else
151 < CONFIGURE_ARGS+=        --disable-libamr-nb
151 > CONFIGURE_ARGS+=        --disable-libopencore-amrnb
152   .endif
153  
154   .ifdef(WITH_AMR_WB)
155 < LIB_DEPENDS+=   amrwb.3:${PORTSDIR}/audio/libamrwb
150 < CONFIGURE_ARGS+=        --enable-libamr-wb --enable-nonfree
155 > CONFIGURE_ARGS+=        --enable-libopencore-amrwb --enable-version3
156   .else
157 < CONFIGURE_ARGS+=        --disable-libamr-wb
157 > CONFIGURE_ARGS+=        --disable-libopencore-amrwb
158   .endif
159  
160   # dirac
# Line 163 | Line 168 | CONFIGURE_ARGS+=       --disable-libdirac
168   # faac
169   .ifdef(WITH_FAAC)
170   LIB_DEPENDS+=   faac.0:${PORTSDIR}/audio/faac
171 < CONFIGURE_ARGS+=        --enable-libfaac
171 > CONFIGURE_ARGS+=        --enable-libfaac --enable-nonfree
172   .else
173   CONFIGURE_ARGS+=        --disable-libfaac
174   .endif
# Line 193 | Line 198 | CONFIGURE_ARGS+=       --enable-libgsm
198   CONFIGURE_ARGS+=        --disable-libgsm
199   .endif
200  
196 # vhook
197 .if defined(WITH_VHOOK)
198 USE_EFL=                imlib2
199 LIB_DEPENDS+=           freetype.9:${PORTSDIR}/print/freetype2
200 PLIST_SUB+=     VHOOK=""
201 .else
202 CONFIGURE_ARGS+=        --disable-vhook
203 PLIST_SUB+=     VHOOK="@comment "
204 .endif
205
206 # ipv6
207 .ifndef(WITHOUT_IPV6)
208 CONFIGURE_ARGS+=        --enable-ipv6
209 .else
210 CONFIGURE_ARGS+=        --disable-ipv6
211 .endif
212
201   # mp3
202   .ifdef(WITH_LAME)
203   LIB_DEPENDS+=   mp3lame.0:${PORTSDIR}/audio/lame
# Line 270 | Line 258 | FFMPEG_CFLAGS+=                -I${LOCALBASE}/include/vorbis
258   CONFIGURE_ARGS+=        --disable-libvorbis
259   .endif
260  
261 + CONFIGURE_ARGS+=        --disable-libvpx
262 +
263   # x264
264   .ifndef(WITHOUT_X264)
265 < LIB_DEPENDS+=   x264.65:${PORTSDIR}/multimedia/x264
265 > LIB_DEPENDS+=   x264.50:${PORTSDIR}/multimedia/x264
266   CONFIGURE_ARGS+=        --enable-libx264
267   .else
268   CONFIGURE_ARGS+=        --disable-libx264
# Line 302 | Line 292 | post-patch:
292          @${REINPLACE_CMD} -E \
293                  -e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g; \
294                  s|%%LOCALBASE%%|${LOCALBASE}|g; \
295 <                s|-pthread|${PTHREAD_LIBS}|g" \
295 >                s|-pthread|${PTHREAD_LIBS}|g; \
296 >                s|gsm/gsm.h|gsm.h|g" \
297                  ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
298          @${REINPLACE_CMD} -e 's|-ldl||; s|$$(LIBMAJOR)|${SHLIB_VER}|g;' \
299                  ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}

Comparing trunk/multimedia/ffmpeg/Makefile (property cvs2svn:cvs-rev):
Revision 9343 by laffer1, Sat Feb 27 22:40:54 2010 UTC vs.
Revision 10170 by laffer1, Sat Nov 6 16:05:39 2010 UTC

# Line 1 | Line 1
1 < 1.5
1 > 1.6

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines