aboutsummaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
authorlioux <lioux@FreeBSD.org>2005-05-19 11:23:57 +0800
committerlioux <lioux@FreeBSD.org>2005-05-19 11:23:57 +0800
commit08981b99e81591bb66226578f0f9f94ca07933bd (patch)
tree4e4a10cb5719f492b296441fbb19894981578b72 /multimedia
parent6671a0a38451ddd90928c6c93df9f6e27dd61ea9 (diff)
downloadfreebsd-ports-gnome-08981b99e81591bb66226578f0f9f94ca07933bd.tar.gz
freebsd-ports-gnome-08981b99e81591bb66226578f0f9f94ca07933bd.tar.zst
freebsd-ports-gnome-08981b99e81591bb66226578f0f9f94ca07933bd.zip
o Do not set BROKEN if any variation of the ffmpeg port is already
installed; fixed by both changing FFMPEG_{C,LD}FLAGS -I/-L searching orders and looking for libraries directly inside of the ffmpeg port BEFORE the local {C,L}DFLAGS [1] o Update to snapshot 20050518 since it works now that multimedia/x264 port has been updated to snapshot 20050518 Submitted by: ahze [1]
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/ffmpeg-devel/Makefile16
-rw-r--r--multimedia/ffmpeg-devel/distinfo4
2 files changed, 10 insertions, 10 deletions
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index ef7cedfe2314..ff80be9c335e 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -27,7 +27,7 @@ CONFIGURE_ARGS= --cc="${CC}" --prefix="${PREFIX}" \
--enable-shared \
--source-path=${WRKSRC}
-FFMPEG_CFLAGS= ${CFLAGS} \
+FFMPEG_CFLAGS= \
-I${WRKSRC}/libavcodec \
-I${WRKSRC}/libavcodec/i386 \
-I${WRKSRC}/libavformat \
@@ -35,11 +35,15 @@ FFMPEG_CFLAGS= ${CFLAGS} \
-I${X11BASE}/include \
-I. -I.. \
-L${LOCALBASE}/lib \
- -L${X11BASE}/lib
-FFMPEG_LDFLAGS= ${LDFLAGS} \
+ -L${X11BASE}/lib \
+ ${CFLAGS}
+FFMPEG_LDFLAGS= \
-L${WRKSRC}/libavcodec/libpostproc \
+ -L${WRKSRC}/libavcodec \
+ -L${WRKSRC}/libavformat \
-L${LOCALBASE}/lib \
-L${X11BASE}/lib \
+ ${LDFLAGS} \
-lm \
-fpie \
-fPIE
@@ -50,7 +54,7 @@ INSTALLS_SHLIB= yes
NO_LATEST_LINK= yes
CONFLICTS= ffmpeg-[0-9]*-*
-RELEASE_DATE= 20050514
+RELEASE_DATE= 20050518
SHLIB_VERSION= 1
MAN1= ffmpeg.1
@@ -73,10 +77,6 @@ LIB_FILES= libavcodec/libavcodec.a libavformat/libavformat.a
.include <bsd.port.pre.mk>
-.if (exists(${LOCALBASE}/lib/libavformat.so))
-BROKEN= 'Please remove previous version of ${PORTNAME} to continue build'
-.endif
-
##
## default options
##
diff --git a/multimedia/ffmpeg-devel/distinfo b/multimedia/ffmpeg-devel/distinfo
index a4c67365e592..935c16d294f8 100644
--- a/multimedia/ffmpeg-devel/distinfo
+++ b/multimedia/ffmpeg-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (FFMpeg-20050514.tar.bz2) = 15d92a23e2eb4e212fc592f0c99ee4d3
-SIZE (FFMpeg-20050514.tar.bz2) = 1537060
+MD5 (FFMpeg-20050518.tar.bz2) = f345c2ce92969a5e97772f9fbc008974
+SIZE (FFMpeg-20050518.tar.bz2) = 1590414