Attachment #85438 for bug #121636

View | Details | Raw Unified | Return to bug 121636
Collapse All | Expand All





PORTNAME=	ffmpeg
DISTVERSION=	2007-10-04
PORTREVISION=	3
CATEGORIES=	multimedia audio ipv6 net
MASTER_SITES=	${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR=	ahze

USE_GMAKE=	yes
WANT_SDL=	yes

OPTIONS=	AMR_NB	"AMR narrowband encoder" off \
		AMR_WB	"AMR wideband encoder" off \
		FAAC	"FAAC mp4/aac audio encoder" off \
		FAAD	"FAAD mp4/aac audio decoder" on \
		GSM	"gsm audio codec" off \
		IPV6	"IPV6 network support" on \
		LAME	"lame MP3 codec" off \
		LIBA52	"liba52 support"	on \
		OGG	"OGG codec" on \
		OPTIMIZED_CFLAGS "Additional optimizations" off \
		SDL	"SDL support (build ffplay)" off \
		SWSCALER "Software scaler support" off \
		THEORA	"libtheora support (implies OGG)" on \
		VHOOK	"video hooking" on \
		VHOOK_FREETYPE2 "drawtext support (implies VHOOK)" off \
		VHOOK_IMLIB2 "imlib2 support (implies VHOOK)" off \
		VORBIS	"libvorbisenc support (implies OGG)" on \
		X264	"X.264 codec" on \
		XVID	"XVID codec" off

.include <bsd.port.pre.mk>

CONFIGURE_ARGS+=--cc="${CC}" --prefix="${PREFIX}" \

#CONFIGURE_ARGS+=	--enable-libdts
#.endif
## faac
.ifdef(WITH_FAAC) || exists(${LOCALBASE}/lib/libfaac.so)
LIB_DEPENDS+=		faac.0:${PORTSDIR}/audio/faac

.ifdef(WITH_FAAC)
LIB_DEPENDS+=		faac.0:${PORTSDIR}/audio/faac
CONFIGURE_ARGS+=	--enable-libfaac
.else
CONFIGURE_ARGS+=	--disable-libfaac
.endif

## faad
.ifndef(WITHOUT_FAAD)
LIB_DEPENDS+=		faad.0:${PORTSDIR}/audio/faad

CONFIGURE_ARGS+=	--enable-libfaad \
			--enable-libfaadbin
.else
CONFIGURE_ARGS+=	--disable-libfaad
.endif

## amr
.ifdef(WITH_AMR_NB)
LIB_DEPENDS+=		amrnb.3:${PORTSDIR}/audio/libamrnb

CONFIGURE_ARGS+=	--enable-libamr-nb
.else
CONFIGURE_ARGS+=	--disable-libamr-nb
.endif
.ifdef(WITH_AMR_WB) || exists($LOCALBASE}/lib/libamrwb.so)
LIB_DEPENDS+=		amrwb.3:${PORTSDIR}/audio/libamrwb

.ifdef(WITH_AMR_WB)
LIB_DEPENDS+=		amrwb.3:${PORTSDIR}/audio/libamrwb
CONFIGURE_ARGS+=	--enable-libamr-wb
.else
CONFIGURE_ARGS+=	--disable-libamr-wb
.endif

USE_RC_SUBR=		ffserver

.if ${MACHINE_CPU:Mmmx}==""

WITHOUT_BUILTIN_VECTOR=	yes
.endif
## gsm
.ifdef(WITH_GSM)
LIB_DEPENDS+=		gsm.1:${PORTSDIR}/audio/gsm

CONFIGURE_ARGS+=	--enable-libgsm
.else
CONFIGURE_ARGS+=	--disable-libgsm
.endif
## mp3
.ifdef(WITH_LAME)
LIB_DEPENDS+=		mp3lame.0:${PORTSDIR}/audio/lame

CONFIGURE_ARGS+=	--enable-libmp3lame
.else
CONFIGURE_ARGS+=	--disable-libmp3lame
.endif

## ogg
.if !defined(WITHOUT_OGG) || !defined(WITHOUT_VORBIS) || !defined(WITHOUT_THEORA)
LIB_DEPENDS+=		ogg.5:${PORTSDIR}/audio/libogg

CONFIGURE_ARGS+=	--enable-libogg
.else
CONFIGURE_ARGS+=	--disable-libogg
.endif

## SDL
.ifdef(WITH_SDL)
USE_SDL+=	sdl

PLIST_FILES+=	bin/ffplay
.if !defined(NOPORTDOCS)
MAN1+=	ffplay.1

CONFIGURE_ARGS+=	--enable-swscaler
PLIST_SUB+=	SWSCAL=""
.else
CONFIGURE_ARGS+=	--disable-swscaler
PLIST_SUB+=	SWSCAL="@comment "
.endif

## theora
.if !defined(WITHOUT_THEORA)
WITH_OGG=	yes
LIB_DEPENDS+=		theora.0:${PORTSDIR}/multimedia/libtheora

CONFIGURE_ARGS+=	--enable-libtheora
.else
CONFIGURE_ARGS+=	--disable-libtheora
.endif

## vorbis
.if !defined(WITHOUT_VORBIS)
WITH_OGG=	yes
LIB_DEPENDS+=		vorbisenc.2:${PORTSDIR}/audio/libvorbis

CONFIGURE_ARGS+=	--enable-libvorbis
FFMPEG_CFLAGS+=		-I${LOCALBASE}/include/vorbis
.else
CONFIGURE_ARGS+=	--disable-libvorbis
.endif

# x264
.ifndef(WITHOUT_X264)
LIB_DEPENDS+=		x264.50:${PORTSDIR}/multimedia/x264

.if !defined(WITHOUT_BUILTIN_VECTOR) && defined(WITH_BUILTIN_VECTOR)
FFMPEG_CFLAGS+=		-msse
.endif
. ifdef(WITH_FREETYPE2) || exists(${LOCALBASE}/lib/libfreetype.so)
LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2

.if !defined(WITHOUT_VHOOK) || defined(WITH_VHOOK_FREETYPE2) || defined(WITH_VHOOK_IMLIB2)
. ifdef(WITH_VHOOK_FREETYPE2)
LIB_DEPENDS+=   freetype.9:${PORTSDIR}/print/freetype2
PLIST_FILES+=   lib/vhook/drawtext.so
CONFIGURE_ARGS+=	--enable-freetype2
. else
CONFIGURE_ARGS+=	--disable-freetype2
. endif # freetype2
. ifdef(WITH_VHOOK_IMLIB2)
USE_EFL+=	imlib2
.  if !exists(${LOCALBASE}/include/X11/Xlib.h)
CFLAGS+=	-DX_DISPLAY_MISSING
.  endif
PLIST_FILES+=   lib/vhook/imlib2.so
CONFIGURE_ARGS+=	--enable-imlib2
. else
CONFIGURE_ARGS+=	--disable-imlib2
. endif # imlib2
CONFIGURE_ARGS+=	--enable-vhook
PLIST_SUB+=	VHOOK=""
.else
CONFIGURE_ARGS+=	--disable-vhook
PLIST_SUB+=	VHOOK="@comment "
. endif

## xvid
.ifdef(WITH_XVID)
LIB_DEPENDS+=		xvidcore.4:${PORTSDIR}/multimedia/xvid

CONFIGURE_ARGS+=	--enable-libxvid
.else
CONFIGURE_ARGS+=	--disable-libxvid
.endif

pre-configure:
.if defined(WITHOUT_OGG) && (!defined(WITHOUT_VORBIS) || !defined(WITHOUT_THEORA))
	@${ECHO_MSG}	WITH_VORBIS or WITH_THEORA defined, libogg will be built
	@${ECHO_MSG}
.endif
#.ifndef(WITH_DTS)
#	@${ECHO_MSG} 'Define WITH_DTS to enable DTS codec'
#	@${ECHO_MSG}
#.endif
.ifndef(WITH_FAAC)
	@${ECHO_MSG} 'Define WITH_FAAC to enable FAAC mp4/aac audio encoder'
	@${ECHO_MSG}
.endif
.ifndef(WITHOUT_FAAD)
	@${ECHO_MSG} 'Define WITHOUT_FAAD to disable FAAD mp4/aac audio decoder'
	@${ECHO_MSG}
.endif
.ifndef(WITH_FREETYPE2)
	@${ECHO_MSG} 'Define WITH_FREETYPE2 to enable VHOOK drawtext FREETYPE2 codec'
	@${ECHO_MSG}
.endif
.ifndef(WITHOUT_IPV6)
	@${ECHO_MSG} 'Define WITHOUT_IPV6 to disable IPV6 network support'
	@${ECHO_MSG}
.endif
.ifndef(WITH_LAME)
	@${ECHO_MSG} 'Define WITH_LAME to enable lame MP3 codec'
	@${ECHO_MSG}
.endif
.ifndef(WITH_OGG)
	@${ECHO_MSG} 'Define WITH_OGG to enable OGG codec'
	@${ECHO_MSG}
.endif
.ifndef(WITH_OPTIMIZED_CFLAGS)
	@${ECHO_MSG} 'You can enable additional compilation optimizations'
	@${ECHO_MSG} 'by defining WITH_OPTIMIZED_CFLAGS'
	@${ECHO_MSG}
.endif
.ifndef(WITH_SWSCALER)
	@${ECHO_MSG} 'Define WITH_SWSCALER to enable software scaler support'
	@${ECHO_MSG} 'Warning: swscaler does not work with VLC!'
	@${ECHO_MSG}
.endif
.ifndef(WITHOUT_THEORA)
	@${ECHO_MSG} 'Define WITHOUT_THEORA to disable libtheora support'
	@${ECHO_MSG}
.endif
.ifndef(WITHOUT_VORBIS)
	@${ECHO_MSG} 'Define WITHOUT_VORBIS to enable libvorbisenc VORBIS codec'
	@${ECHO_MSG}
.endif
.ifndef(WITHOUT_X264)
	@${ECHO_MSG} 'Define WITHOUT_X264 to disable X264 codec'
	@${ECHO_MSG}
.endif
.if defined(WITHOUT_VHOOK) && (defined(WITH_VHOOK_FREETYPE2) || defined(WITH_VHOOK_IMLIB2))
	@${ECHO_MSG}	WITH_VHOOK_FREETYPE2 or WITH_VHOOK_IMLIB2 defined, video hooks will be built
	@${ECHO_MSG}
.endif

post-patch:

	fi
.ifndef(NOPORTDOCS)
	${MKDIR} ${DOCSDIR}
.for FILE in ${DOC_FILES}
	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
.endfor
.for FILE in ${DOC_DOCFILES}
	${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${DOCSDIR}
.endfor
.endif


Lines 47-56 Link Here

(-)ports/multimedia/ffmpeg/pkg-plist (-4 / +4 lines)
47	%%SWSCAL%%lib/libswscale.so	47	%%SWSCAL%%lib/libswscale.so
48	%%SWSCAL%%lib/libswscale.so.%%SHLIB_VER%%	48	%%SWSCAL%%lib/libswscale.so.%%SHLIB_VER%%
49	%%SWSCAL%%lib/libswscale.so.0.5.0	49	%%SWSCAL%%lib/libswscale.so.0.5.0
50	lib/vhook/fish.so	50	%%VHOOK%%lib/vhook/fish.so
51	lib/vhook/null.so	51	%%VHOOK%%lib/vhook/null.so
52	lib/vhook/ppm.so	52	%%VHOOK%%lib/vhook/ppm.so
53	lib/vhook/watermark.so	53	%%VHOOK%%lib/vhook/watermark.so
54	libdata/pkgconfig/libavcodec.pc	54	libdata/pkgconfig/libavcodec.pc
55	libdata/pkgconfig/libavformat.pc	55	libdata/pkgconfig/libavformat.pc
56	libdata/pkgconfig/libavutil.pc	56	libdata/pkgconfig/libavutil.pc




--- configure.orig	2007-09-29 22:25:06.000000000 +0200
+++ configure	2008-03-12 08:59:27.000000000 +0100
@@ -211,11 +211,11 @@
 
 # "tr '[a-z]' '[A-Z]'" is a workaround for Solaris tr not grokking "tr a-z A-Z"
 toupper(){

 }
 
 set_all(){
@@ -604,9 +604,11 @@
     ffmpeg
     ffplay
     ffserver
+    freetype2
     gpl
     gprof
     gray
+    imlib2
     ipv6
     liba52
     liba52bin
@@ -1033,15 +1035,9 @@
     enable fast_unaligned
   ;;
   x86_64|amd64)

   ;;
   # armv4l is a subset of armv[567]*l
   arm|armv[4567]*l)
@@ -1491,8 +1487,8 @@
 
 if check_func dlopen; then
     ldl=
-elif check_func dlopen -ldl; then
-    ldl=-ldl
+elif check_func dlopen ; then
+    ldl=
 fi
 
 check_func fork
@@ -1597,10 +1593,17 @@
 if enabled vhook; then
     check_ldflags -rdynamic
     check_ldflags -export-dynamic
+    if enabled imlib2; then
+        check_foo_config imlib2 imlib2 Imlib2.h imlib_load_font
+    fi
+    if enabled freetype2; then
+        check_foo_config freetype2 freetype ft2build.h FT_Init_FreeType
+    fi
+else
+    disable imlib2
+    disable freetype2
 fi
 
-check_foo_config imlib2 imlib2 Imlib2.h imlib_load_font
-check_foo_config freetype2 freetype ft2build.h FT_Init_FreeType
 
 ##########################################
 # SDL check
@@ -1705,12 +1708,6 @@
     check_cflags -Os            # not all compilers support -Os
     optimize="small"
 elif enabled optimize; then

 fi
 
 # PIC flags for shared library objects where they are needed
@@ -1894,15 +1891,15 @@
 if enabled shared; then
   echo "BUILD_SHARED=yes" >> config.mak
   echo "PIC=-fPIC -DPIC" >> config.mak

+  echo "SPPMAJOR=1" >> config.mak
   echo "SPPVERSION=$pp_version" >> config.mak
-  echo "LAVCMAJOR=${lavc_version%%.*}" >> config.mak
+  echo "LAVCMAJOR=1" >> config.mak
   echo "LAVCVERSION=$lavc_version" >> config.mak
-  echo "LAVFMAJOR=${lavf_version%%.*}" >> config.mak
+  echo "LAVFMAJOR=1" >> config.mak
   echo "LAVFVERSION=$lavf_version" >> config.mak
-  echo "LAVUMAJOR=${lavu_version%%.*}" >> config.mak
+  echo "LAVUMAJOR=1" >> config.mak
   echo "LAVUVERSION=$lavu_version" >> config.mak
-  echo "SWSMAJOR=${sws_version%%.*}" >> config.mak
+  echo "SWSMAJOR=1" >> config.mak
   echo "SWSVERSION=$sws_version" >> config.mak
   echo "SLIBNAME=${SLIBNAME}" >> config.mak
   echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
@@ -1911,7 +1908,7 @@
   echo "SLIB_INSTALL_EXTRA_CMD=${SLIB_INSTALL_EXTRA_CMD}" >> config.mak
 fi
 echo "LIB_INSTALL_EXTRA_CMD=${LIB_INSTALL_EXTRA_CMD}" >> config.mak
-echo "EXTRALIBS=$extralibs" >> config.mak
+echo "EXTRALIBS=-L/usr/local/lib -L/usr/local/lib $extralibs" >> config.mak
 
 print_config ARCH_   $TMPH config.mak $ARCH_LIST
 print_config HAVE_   $TMPH config.mak $HAVE_LIST
@@ -1932,7 +1929,7 @@
 
 echo "SRC_PATH=\"$source_path\"" >> config.mak
 echo "SRC_PATH_BARE=$source_path" >> config.mak

+echo "BUILD_ROOT=\"$(pwd)\"" >> config.mak
 
 # Apparently it's not possible to portably echo a backslash.
 enabled asmalign_pot &&
@@ -2008,8 +2005,8 @@
 Version: $version
 Requires: $requires
 Conflicts:
-Libs: -L\${libdir} $libs
-Cflags: -I\${includedir} -I\${includedir}/$include
+Libs: -L\${libdir} $libs -L/usr/local/lib
+Cflags: -I\${includedir} -I\${includedir}/$include -I/usr/local/include
 EOF
 }
 
@@ -2032,7 +2029,8 @@
 Requires: $requires
 Conflicts:
 Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs
-Cflags: -I\${includedir}
+Ldflags: -L/usr/local/lib
+Cflags: -I\${includedir} -I/usr/local/include
 EOF
 }

Return to bug 121636

Lines 7-13 Link Here

(-)ports/multimedia/ffmpeg/Makefile (-88 / +88 lines)
7		7
8	PORTNAME= ffmpeg	8	PORTNAME= ffmpeg
9	DISTVERSION= 2007-10-04	9	DISTVERSION= 2007-10-04
10	PORTREVISION= 2	10	PORTREVISION= 3
11	CATEGORIES= multimedia audio ipv6 net	11	CATEGORIES= multimedia audio ipv6 net
12	MASTER_SITES= ${MASTER_SITE_LOCAL}	12	MASTER_SITES= ${MASTER_SITE_LOCAL}
13	MASTER_SITE_SUBDIR= ahze	13	MASTER_SITE_SUBDIR= ahze
Lines 21-26 Link Here
21	USE_GMAKE= yes	21	USE_GMAKE= yes
22	WANT_SDL= yes	22	WANT_SDL= yes
23		23
		24	OPTIONS= AMR_NB "AMR narrowband encoder" off \
		25	AMR_WB "AMR wideband encoder" off \
		26	FAAC "FAAC mp4/aac audio encoder" off \
		27	FAAD "FAAD mp4/aac audio decoder" on \
		28	GSM "gsm audio codec" off \
		29	IPV6 "IPV6 network support" on \
		30	LAME "lame MP3 codec" off \
		31	LIBA52 "liba52 support" on \
		32	OGG "OGG codec" on \
		33	OPTIMIZED_CFLAGS "Additional optimizations" off \
		34	SDL "SDL support (build ffplay)" off \
		35	SWSCALER "Software scaler support" off \
		36	THEORA "libtheora support (implies OGG)" on \
		37	VHOOK "video hooking" on \
		38	VHOOK_FREETYPE2 "drawtext support (implies VHOOK)" off \
		39	VHOOK_IMLIB2 "imlib2 support (implies VHOOK)" off \
		40	VORBIS "libvorbisenc support (implies OGG)" on \
		41	X264 "X.264 codec" on \
		42	XVID "XVID codec" off
		43
24	.include <bsd.port.pre.mk>	44	.include <bsd.port.pre.mk>
25		45
26	CONFIGURE_ARGS+=--cc="${CC}" --prefix="${PREFIX}" \	46	CONFIGURE_ARGS+=--cc="${CC}" --prefix="${PREFIX}" \
Lines 86-114 Link Here
86	#CONFIGURE_ARGS+= --enable-libdts	106	#CONFIGURE_ARGS+= --enable-libdts
87	#.endif	107	#.endif
88	## faac	108	## faac
89	.ifdef(WITH_FAAC) \|\| exists(${LOCALBASE}/lib/libfaac.so)
90	LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac
91		109
		110	.ifdef(WITH_FAAC)
		111	LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac
92	CONFIGURE_ARGS+= --enable-libfaac	112	CONFIGURE_ARGS+= --enable-libfaac
		113	.else
		114	CONFIGURE_ARGS+= --disable-libfaac
93	.endif	115	.endif
		116
94	## faad	117	## faad
95	.ifndef(WITHOUT_FAAD) \|\| exists(${LOCALBASE}/lib/libfaad.so)	118	.ifndef(WITHOUT_FAAD)
96	LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad	119	LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad
97
98	CONFIGURE_ARGS+= --enable-libfaad \	120	CONFIGURE_ARGS+= --enable-libfaad \
99	--enable-libfaadbin	121	--enable-libfaadbin
		122	.else
		123	CONFIGURE_ARGS+= --disable-libfaad
100	.endif	124	.endif
		125
101	## amr	126	## amr
102	.ifdef(WITH_AMR_NB) \|\| exists($LOCALBASE}/lib/libamrnb.so)	127	.ifdef(WITH_AMR_NB)
103	LIB_DEPENDS+= amrnb.3:${PORTSDIR}/audio/libamrnb	128	LIB_DEPENDS+= amrnb.3:${PORTSDIR}/audio/libamrnb
104
105	CONFIGURE_ARGS+= --enable-libamr-nb	129	CONFIGURE_ARGS+= --enable-libamr-nb
		130	.else
		131	CONFIGURE_ARGS+= --disable-libamr-nb
106	.endif	132	.endif
107	.ifdef(WITH_AMR_WB) \|\| exists($LOCALBASE}/lib/libamrwb.so)
108	LIB_DEPENDS+= amrwb.3:${PORTSDIR}/audio/libamrwb
109		133
		134	.ifdef(WITH_AMR_WB)
		135	LIB_DEPENDS+= amrwb.3:${PORTSDIR}/audio/libamrwb
110	CONFIGURE_ARGS+= --enable-libamr-wb	136	CONFIGURE_ARGS+= --enable-libamr-wb
		137	.else
		138	CONFIGURE_ARGS+= --disable-libamr-wb
111	.endif	139	.endif
		140
112	USE_RC_SUBR= ffserver	141	USE_RC_SUBR= ffserver
113		142
114	.if ${MACHINE_CPU:Mmmx}==""	143	.if ${MACHINE_CPU:Mmmx}==""
Lines 117-144 Link Here
117	WITHOUT_BUILTIN_VECTOR= yes	146	WITHOUT_BUILTIN_VECTOR= yes
118	.endif	147	.endif
119	## gsm	148	## gsm
120	.ifdef(WITH_GSM) \|\| exists(${LOCALBASE}/lib/libgsm.so)	149	.ifdef(WITH_GSM)
121	LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm	150	LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm
122		151
123	CONFIGURE_ARGS+= --enable-libgsm	152	CONFIGURE_ARGS+= --enable-libgsm
		153	.else
		154	CONFIGURE_ARGS+= --disable-libgsm
124	.endif	155	.endif
125	## mp3	156	## mp3
126	.ifdef(WITH_LAME) \|\| exists(${LOCALBASE}/lib/libmp3lame.so) \|\| defined(WITH_MP3)	157	.ifdef(WITH_LAME)
127	LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame	158	LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame
128
129	CONFIGURE_ARGS+= --enable-libmp3lame	159	CONFIGURE_ARGS+= --enable-libmp3lame
		160	.else
		161	CONFIGURE_ARGS+= --disable-libmp3lame
130	.endif	162	.endif
		163
131	## ogg	164	## ogg
132	.ifndef(WITHOUT_OGG) \|\| exists(${LOCALBASE}/lib/libogg.so)	165	.if !defined(WITHOUT_OGG) \|\| !defined(WITHOUT_VORBIS) \|\| !defined(WITHOUT_THEORA)
133	LIB_DEPENDS+= ogg.5:${PORTSDIR}/audio/libogg	166	LIB_DEPENDS+= ogg.5:${PORTSDIR}/audio/libogg
134
135	CONFIGURE_ARGS+= --enable-libogg	167	CONFIGURE_ARGS+= --enable-libogg
		168	.else
		169	CONFIGURE_ARGS+= --disable-libogg
136	.endif	170	.endif
137		171
138	## SDL	172	## SDL
139	.ifdef(WITH_SDL) \|\| ${HAVE_SDL:Msdl}	173	.ifdef(WITH_SDL)
140	USE_SDL+= sdl	174	USE_SDL+= sdl
141
142	PLIST_FILES+= bin/ffplay	175	PLIST_FILES+= bin/ffplay
143	.if !defined(NOPORTDOCS)	176	.if !defined(NOPORTDOCS)
144	MAN1+= ffplay.1	177	MAN1+= ffplay.1
Lines 152-175 Link Here
152	CONFIGURE_ARGS+= --enable-swscaler	185	CONFIGURE_ARGS+= --enable-swscaler
153	PLIST_SUB+= SWSCAL=""	186	PLIST_SUB+= SWSCAL=""
154	.else	187	.else
		188	CONFIGURE_ARGS+= --disable-swscaler
155	PLIST_SUB+= SWSCAL="@comment "	189	PLIST_SUB+= SWSCAL="@comment "
156	.endif	190	.endif
157		191
158	## theora	192	## theora
159	.if !defined(WITHOUT_THEORA)	193	.if !defined(WITHOUT_THEORA)
160	WITH_OGG= yes
161	LIB_DEPENDS+= theora.0:${PORTSDIR}/multimedia/libtheora	194	LIB_DEPENDS+= theora.0:${PORTSDIR}/multimedia/libtheora
162		195
163	CONFIGURE_ARGS+= --enable-libtheora	196	CONFIGURE_ARGS+= --enable-libtheora
		197	.else
		198	CONFIGURE_ARGS+= --disable-libtheora
164	.endif	199	.endif
		200
165	## vorbis	201	## vorbis
166	.if !defined(WITHOUT_VORBIS)	202	.if !defined(WITHOUT_VORBIS)
167	WITH_OGG= yes
168	LIB_DEPENDS+= vorbisenc.2:${PORTSDIR}/audio/libvorbis	203	LIB_DEPENDS+= vorbisenc.2:${PORTSDIR}/audio/libvorbis
169		204
170	CONFIGURE_ARGS+= --enable-libvorbis	205	CONFIGURE_ARGS+= --enable-libvorbis
171	FFMPEG_CFLAGS+= -I${LOCALBASE}/include/vorbis	206	FFMPEG_CFLAGS+= -I${LOCALBASE}/include/vorbis
		207	.else
		208	CONFIGURE_ARGS+= --disable-libvorbis
172	.endif	209	.endif
		210
173	# x264	211	# x264
174	.ifndef(WITHOUT_X264)	212	.ifndef(WITHOUT_X264)
175	LIB_DEPENDS+= x264.50:${PORTSDIR}/multimedia/x264	213	LIB_DEPENDS+= x264.50:${PORTSDIR}/multimedia/x264
Lines 182-265 Link Here
182	.if !defined(WITHOUT_BUILTIN_VECTOR) && defined(WITH_BUILTIN_VECTOR)	220	.if !defined(WITHOUT_BUILTIN_VECTOR) && defined(WITH_BUILTIN_VECTOR)
183	FFMPEG_CFLAGS+= -msse	221	FFMPEG_CFLAGS+= -msse
184	.endif	222	.endif
185	. ifdef(WITH_FREETYPE2) \|\| exists(${LOCALBASE}/lib/libfreetype.so)
186	LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2
187		223
188	PLIST_FILES+= lib/vhook/drawtext.so	224	.if !defined(WITHOUT_VHOOK) \|\| defined(WITH_VHOOK_FREETYPE2) \|\| defined(WITH_VHOOK_IMLIB2)
		225	. ifdef(WITH_VHOOK_FREETYPE2)
		226	LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2
		227	PLIST_FILES+= lib/vhook/drawtext.so
		228	CONFIGURE_ARGS+= --enable-freetype2
		229	. else
		230	CONFIGURE_ARGS+= --disable-freetype2
189	. endif # freetype2	231	. endif # freetype2
190	. ifdef(WITH_IMLIB2) \|\| exists(${LOCALBASE}/lib/libImlib2.so)	232	. ifdef(WITH_VHOOK_IMLIB2)
191	USE_EFL+= imlib2	233	USE_EFL+= imlib2
192		234	. if !exists(${LOCALBASE}/include/X11/Xlib.h)
193	PLIST_FILES+= lib/vhook/imlib2.so	235	CFLAGS+= -DX_DISPLAY_MISSING
		236	. endif
		237	PLIST_FILES+= lib/vhook/imlib2.so
		238	CONFIGURE_ARGS+= --enable-imlib2
194	. else	239	. else
195	WITHOUT_IMLIB2= yes	240	CONFIGURE_ARGS+= --disable-imlib2
196	. endif # imlib2	241	. endif # imlib2
		242	CONFIGURE_ARGS+= --enable-vhook
		243	PLIST_SUB+= VHOOK=""
		244	.else
		245	CONFIGURE_ARGS+= --disable-vhook
		246	PLIST_SUB+= VHOOK="@comment "
		247	. endif
197		248
198	## xvid	249	## xvid
199	.ifdef(WITH_XVID) \|\| exists(${LOCALBASE}/lib/libxvidcore.so)	250	.ifdef(WITH_XVID)
200	LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid	251	LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
201
202	CONFIGURE_ARGS+= --enable-libxvid	252	CONFIGURE_ARGS+= --enable-libxvid
		253	.else
		254	CONFIGURE_ARGS+= --disable-libxvid
203	.endif	255	.endif
204		256
205	pre-everything::	257	pre-configure:
206	.ifndef(WITHOUT_A52)	258	.if defined(WITHOUT_OGG) && (!defined(WITHOUT_VORBIS) \|\| !defined(WITHOUT_THEORA))
207	@${ECHO_MSG} 'You can disable liba52 support by defining WITHOUT_LIBA52'	259	@${ECHO_MSG} WITH_VORBIS or WITH_THEORA defined, libogg will be built
208	@${ECHO_MSG}
209	.endif
210	#.ifndef(WITH_DTS)
211	# @${ECHO_MSG} 'Define WITH_DTS to enable DTS codec'
212	# @${ECHO_MSG}
213	#.endif
214	.ifndef(WITH_FAAC)
215	@${ECHO_MSG} 'Define WITH_FAAC to enable FAAC mp4/aac audio encoder'
216	@${ECHO_MSG}
217	.endif
218	.ifndef(WITHOUT_FAAD)
219	@${ECHO_MSG} 'Define WITHOUT_FAAD to disable FAAD mp4/aac audio decoder'
220	@${ECHO_MSG}
221	.endif
222	.ifndef(WITH_FREETYPE2)
223	@${ECHO_MSG} 'Define WITH_FREETYPE2 to enable VHOOK drawtext FREETYPE2 codec'
224	@${ECHO_MSG}
225	.endif
226	.ifndef(WITHOUT_IPV6)
227	@${ECHO_MSG} 'Define WITHOUT_IPV6 to disable IPV6 network support'
228	@${ECHO_MSG}
229	.endif
230	.ifndef(WITH_LAME)
231	@${ECHO_MSG} 'Define WITH_LAME to enable lame MP3 codec'
232	@${ECHO_MSG}
233	.endif
234	.ifndef(WITH_OGG)
235	@${ECHO_MSG} 'Define WITH_OGG to enable OGG codec'
236	@${ECHO_MSG}
237	.endif
238	.ifndef(WITH_OPTIMIZED_CFLAGS)
239	@${ECHO_MSG} 'You can enable additional compilation optimizations'
240	@${ECHO_MSG} 'by defining WITH_OPTIMIZED_CFLAGS'
241	@${ECHO_MSG}
242	.endif
243	.ifndef(WITH_SWSCALER)
244	@${ECHO_MSG} 'Define WITH_SWSCALER to enable software scaler support'
245	@${ECHO_MSG} 'Warning: swscaler does not work with VLC!'
246	@${ECHO_MSG}
247	.endif
248	.ifndef(WITHOUT_THEORA)
249	@${ECHO_MSG} 'Define WITHOUT_THEORA to disable libtheora support'
250	@${ECHO_MSG}
251	.endif
252	.ifndef(WITHOUT_VORBIS)
253	@${ECHO_MSG} 'Define WITHOUT_VORBIS to enable libvorbisenc VORBIS codec'
254	@${ECHO_MSG}
255	.endif
256	.ifndef(WITHOUT_X264)
257	@${ECHO_MSG} 'Define WITHOUT_X264 to disable X264 codec'
258	@${ECHO_MSG}
259	.endif	260	.endif
260	.ifndef(WITH_XVID)	261	.if defined(WITHOUT_VHOOK) && (defined(WITH_VHOOK_FREETYPE2) \|\| defined(WITH_VHOOK_IMLIB2))
261	@${ECHO_MSG} 'Define WITH_XVID to enable XVID codec'	262	@${ECHO_MSG} WITH_VHOOK_FREETYPE2 or WITH_VHOOK_IMLIB2 defined, video hooks will be built
262	@${ECHO_MSG}
263	.endif	263	.endif
264		264
265	post-patch:	265	post-patch:
Lines 340-350 Link Here
340	fi	340	fi
341	.ifndef(NOPORTDOCS)	341	.ifndef(NOPORTDOCS)
342	${MKDIR} ${DOCSDIR}	342	${MKDIR} ${DOCSDIR}
343	.for file in ${DOC_FILES}	343	.for FILE in ${DOC_FILES}
344	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}	344	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
345	.endfor	345	.endfor
346	.for file in ${DOC_DOCFILES}	346	.for FILE in ${DOC_DOCFILES}
347	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}	347	${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${DOCSDIR}
348	.endfor	348	.endfor
349	.endif	349	.endif
350		350

Lines 1-6 Link Here

(-)ports/multimedia/ffmpeg/files/patch-configure (-18 / +70 lines)
1	--- configure.orig 2007-07-08 13:47:15.000000000 -0400	1	--- configure.orig 2007-09-29 22:25:06.000000000 +0200
2	+++ configure 2007-07-09 12:37:09.000000000 -0400	2	+++ configure 2008-03-12 08:59:27.000000000 +0100
3	@@ -210,11 +210,11 @@	3	@@ -211,11 +211,11 @@
4		4
5	# "tr '[a-z]' '[A-Z]'" is a workaround for Solaris tr not grokking "tr a-z A-Z"	5	# "tr '[a-z]' '[A-Z]'" is a workaround for Solaris tr not grokking "tr a-z A-Z"
6	toupper(){	6	toupper(){
Lines 14-20 Link Here
14	}	14	}
15		15
16	set_all(){	16	set_all(){
17	@@ -992,15 +992,9 @@	17	@@ -604,9 +604,11 @@
		18	ffmpeg
		19	ffplay
		20	ffserver
		21	+ freetype2
		22	gpl
		23	gprof
		24	gray
		25	+ imlib2
		26	ipv6
		27	liba52
		28	liba52bin
		29	@@ -1033,15 +1035,9 @@
18	enable fast_unaligned	30	enable fast_unaligned
19	;;	31	;;
20	x86_64\|amd64)	32	x86_64\|amd64)
Lines 32-38 Link Here
32	;;	44	;;
33	# armv4l is a subset of armv[567]*l	45	# armv4l is a subset of armv[567]*l
34	arm\|armv[4567]*l)	46	arm\|armv[4567]*l)
35	@@ -1734,12 +1728,6 @@	47	@@ -1491,8 +1487,8 @@
		48
		49	if check_func dlopen; then
		50	ldl=
		51	-elif check_func dlopen -ldl; then
		52	- ldl=-ldl
		53	+elif check_func dlopen ; then
		54	+ ldl=
		55	fi
		56
		57	check_func fork
		58	@@ -1597,10 +1593,17 @@
		59	if enabled vhook; then
		60	check_ldflags -rdynamic
		61	check_ldflags -export-dynamic
		62	+ if enabled imlib2; then
		63	+ check_foo_config imlib2 imlib2 Imlib2.h imlib_load_font
		64	+ fi
		65	+ if enabled freetype2; then
		66	+ check_foo_config freetype2 freetype ft2build.h FT_Init_FreeType
		67	+ fi
		68	+else
		69	+ disable imlib2
		70	+ disable freetype2
		71	fi
		72
		73	-check_foo_config imlib2 imlib2 Imlib2.h imlib_load_font
		74	-check_foo_config freetype2 freetype ft2build.h FT_Init_FreeType
		75
		76	##########################################
		77	# SDL check
		78	@@ -1705,12 +1708,6 @@
36	check_cflags -Os # not all compilers support -Os	79	check_cflags -Os # not all compilers support -Os
37	optimize="small"	80	optimize="small"
38	elif enabled optimize; then	81	elif enabled optimize; then
Lines 45-51 Link Here
45	fi	88	fi
46		89
47	# PIC flags for shared library objects where they are needed	90	# PIC flags for shared library objects where they are needed
48	@@ -1927,15 +1915,15 @@	91	@@ -1894,15 +1891,15 @@
49	if enabled shared; then	92	if enabled shared; then
50	echo "BUILD_SHARED=yes" >> config.mak	93	echo "BUILD_SHARED=yes" >> config.mak
51	echo "PIC=-fPIC -DPIC" >> config.mak	94	echo "PIC=-fPIC -DPIC" >> config.mak
Lines 53-72 Link Here
53	+ echo "SPPMAJOR=1" >> config.mak	96	+ echo "SPPMAJOR=1" >> config.mak
54	echo "SPPVERSION=$pp_version" >> config.mak	97	echo "SPPVERSION=$pp_version" >> config.mak
55	- echo "LAVCMAJOR=${lavc_version%%.*}" >> config.mak	98	- echo "LAVCMAJOR=${lavc_version%%.*}" >> config.mak
56	+ echo "LAVCMAJOR=%%SHLIB_VER%%" >> config.mak	99	+ echo "LAVCMAJOR=1" >> config.mak
57	echo "LAVCVERSION=$lavc_version" >> config.mak	100	echo "LAVCVERSION=$lavc_version" >> config.mak
58	- echo "LAVFMAJOR=${lavf_version%%.*}" >> config.mak	101	- echo "LAVFMAJOR=${lavf_version%%.*}" >> config.mak
59	+ echo "LAVFMAJOR=%%SHLIB_VER%%" >> config.mak	102	+ echo "LAVFMAJOR=1" >> config.mak
60	echo "LAVFVERSION=$lavf_version" >> config.mak	103	echo "LAVFVERSION=$lavf_version" >> config.mak
61	- echo "LAVUMAJOR=${lavu_version%%.*}" >> config.mak	104	- echo "LAVUMAJOR=${lavu_version%%.*}" >> config.mak
62	+ echo "LAVUMAJOR=%%SHLIB_VER%%" >> config.mak	105	+ echo "LAVUMAJOR=1" >> config.mak
63	echo "LAVUVERSION=$lavu_version" >> config.mak	106	echo "LAVUVERSION=$lavu_version" >> config.mak
64	- echo "SWSMAJOR=${sws_version%%.*}" >> config.mak	107	- echo "SWSMAJOR=${sws_version%%.*}" >> config.mak
65	+ echo "SWSMAJOR=%%SHLIB_VER%%" >> config.mak	108	+ echo "SWSMAJOR=1" >> config.mak
66	echo "SWSVERSION=$sws_version" >> config.mak	109	echo "SWSVERSION=$sws_version" >> config.mak
67	echo "SLIBNAME=${SLIBNAME}" >> config.mak	110	echo "SLIBNAME=${SLIBNAME}" >> config.mak
68	echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak	111	echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
69	@@ -1969,7 +1957,7 @@	112	@@ -1911,7 +1908,7 @@
		113	echo "SLIB_INSTALL_EXTRA_CMD=${SLIB_INSTALL_EXTRA_CMD}" >> config.mak
		114	fi
		115	echo "LIB_INSTALL_EXTRA_CMD=${LIB_INSTALL_EXTRA_CMD}" >> config.mak
		116	-echo "EXTRALIBS=$extralibs" >> config.mak
		117	+echo "EXTRALIBS=-L/usr/local/lib -L/usr/local/lib $extralibs" >> config.mak
		118
		119	print_config ARCH_ $TMPH config.mak $ARCH_LIST
		120	print_config HAVE_ $TMPH config.mak $HAVE_LIST
		121	@@ -1932,7 +1929,7 @@
70		122
71	echo "SRC_PATH=\"$source_path\"" >> config.mak	123	echo "SRC_PATH=\"$source_path\"" >> config.mak
72	echo "SRC_PATH_BARE=$source_path" >> config.mak	124	echo "SRC_PATH_BARE=$source_path" >> config.mak
Lines 74-98 Link Here
74	+echo "BUILD_ROOT=\"$(pwd)\"" >> config.mak	126	+echo "BUILD_ROOT=\"$(pwd)\"" >> config.mak
75		127
76	# Apparently it's not possible to portably echo a backslash.	128	# Apparently it's not possible to portably echo a backslash.
77	if enabled asmalign_pot; then	129	enabled asmalign_pot &&
78	@@ -2047,8 +2035,8 @@	130	@@ -2008,8 +2005,8 @@
79	Version: $version	131	Version: $version
80	Requires: $requires	132	Requires: $requires
81	Conflicts:	133	Conflicts:
82	-Libs: -L\${libdir} $libs	134	-Libs: -L\${libdir} $libs
83	-Cflags: -I\${includedir} -I\${includedir}/$include	135	-Cflags: -I\${includedir} -I\${includedir}/$include
84	+Libs: -L\${libdir} $libs -L%%LOCALBASE%%/lib	136	+Libs: -L\${libdir} $libs -L/usr/local/lib
85	+Cflags: -I\${includedir} -I\${includedir}/$include -I%%LOCALBASE%%/include	137	+Cflags: -I\${includedir} -I\${includedir}/$include -I/usr/local/include
86	EOF	138	EOF
87	}	139	}
88		140
89	@@ -2071,7 +2059,8 @@	141	@@ -2032,7 +2029,8 @@
90	Requires: $requires	142	Requires: $requires
91	Conflicts:	143	Conflicts:
92	Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs	144	Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs
93	-Cflags: -I\${includedir}	145	-Cflags: -I\${includedir}
94	+Ldflags: -L%%LOCALBASE%%/lib	146	+Ldflags: -L/usr/local/lib
95	+Cflags: -I\${includedir} -I%%LOCALBASE%%/include	147	+Cflags: -I\${includedir} -I/usr/local/include
96	EOF	148	EOF
97	}	149	}