o Update to snapshot 20050526

o Fix PLIST typos
o Improve WITH{,OUT}_BUILTIN_VECTOR Makefile support
o Re-enable theora support [1]. This is still being investigated
o This version's ffplay recognizes neither .mkv nor .ogm

Reviewed by:	kwm [1]

6 files changed, 97 insertions, 43 deletions

diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index af96c8f25811..1c0d908daff8 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -55,7 +55,7 @@ INSTALLS_SHLIB=	yes
 NO_LATEST_LINK=	yes
 CONFLICTS=      ffmpeg-[0-9]*-*
 
-RELEASE_DATE=	20050522
+RELEASE_DATE=	20050526
 SHLIB_VERSION=	1
 
 MAN1=		ffmpeg.1
@@ -244,9 +244,13 @@ CONFIGURE_ARGS+=	--enable-pp \
 			--enable-shared-pp
 
 LIB_FILES+=		libavcodec/libpostproc/libpostproc.a
-PLIST_DIRS+=		include/ffmpeg/postproc \
-			include/ffmpeg
-PLIST_FILES+=		include/ffmpeg/postproc/postprocess.h
+PLIST_DIRS+=		include/ffmpeg/postproc
+PLIST_FILES+=		include/ffmpeg/postproc/postprocess.h \
+			lib/libpostproc.a \
+			lib/libpostproc.so \
+			lib/libpostproc.so.0 \
+			lib/libpostproc.so.%%SHLIB_VERSION%% \
+			libdata/pkgconfig/libpostproc.pc
 .endif
 ## pthreads
 .ifndef(WITHOUT_PTHREADS)
@@ -263,7 +267,6 @@ PLIST_FILES+=	bin/ffplay
 CONFIGURE_ARGS+=	--disable-ffplay
 .endif
 ## theora
-.undef WITH_THEORA
 .ifdef(WITH_THEORA)
 LIB_DEPENDS+=		theora.1:${PORTSDIR}/multimedia/libtheora
 
@@ -321,6 +324,12 @@ LIB_DEPENDS+=		xvidcore.4:${PORTSDIR}/multimedia/xvid
 CONFIGURE_ARGS+=	--enable-xvid
 .endif
 
+###
+### XXX - PLIST_DIRS come after PLIST entries so some aforementioned
+### entries breaks PLIST
+###
+PLIST_DIRS+=		include/ffmpeg
+
 pre-everything::
 .ifndef(WITHOUT_LIBA52)
 	@${ECHO_MSG} 'You can disable liba52 support by defining WITHOUT_LIBA52'
@@ -513,18 +522,16 @@ post-patch:
 		-e 's|#include <SDL|#include <SDL11/SDL|'
 .endif
 .ifndef(WITHOUT_POSTPROCESS)
-	@${REINPLACE_CMD} -E \
-		-e 's|^(SPPVERSION).*$$|\1=${SHLIB_VERSION}|' \
-		-e 's|\$$[(]SPPLIB[)].0|$$(SPPLIB).${SHLIB_VERSION}|' \
-		${WRKSRC}/libavcodec/libpostproc/Makefile
-# XXX - libavcodec.so needs libpostproc.so but looks for libpostproc.so.0
-# exists
 	@${LN} -sf libpostproc.so \
 		${WRKSRC}/libavcodec/libpostproc/libpostproc.so.${SHLIB_VERSION}
 .endif
-.ifndef(WITHOUT_BUILTIN_VECTOR)
+.if !defined(WITHOUT_BUILTIN_VECTOR) && defined(WITH_BUILTIN_VECTOR)
 	@${REINPLACE_CMD} -E \
-		-e 's|^(builtin_vector).*$$|\1=yes|' \
+		-e 's|^([[:space:]]+builtin_vector).*$$|\1=yes|' \
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+.else
+	@${REINPLACE_CMD} -E \
+		-e 's|^([[:space:]]+builtin_vector).*$$|\1=no|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 .endif
 
@@ -574,11 +581,14 @@ post-install:
 .endfor
 .for file in ${LIB_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/lib/${file:T}
+	@${LN} -sf ${file:T:R}.so \
+		${PREFIX}/lib/${file:T:R}.so.${SHLIB_VERSION}
 .endfor
 .ifndef(WITHOUT_POSTPROCESS)
-	@${MKDIR} ${PREFIX}/include/ffmpeg/postproc
-	@${INSTALL_DATA} ${WRKSRC}/libavcodec/libpostproc/postprocess.h \
-		${PREFIX}/include/ffmpeg/postproc/postprocess.h
+# XXX - libavcodec.so needs libpostproc.so but looks for libpostproc.so.0
+# existence instead of libpostproc.so.${SHLIB_VERSION}
+	@${LN} -sf libpostproc.so \
+		${PREFIX}/lib/libpostproc.so.0
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/ffmpeg-devel/distinfo b/multimedia/ffmpeg-devel/distinfo
index 7c2e5e16a8cb..8b8996712480 100644
--- a/multimedia/ffmpeg-devel/distinfo
+++ b/multimedia/ffmpeg-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (FFMpeg-20050522.tar.bz2) = 3b5df7c38b8c79c7cb90304286d8d64c
-SIZE (FFMpeg-20050522.tar.bz2) = 1598347
+MD5 (FFMpeg-20050526.tar.bz2) = e663d2ec7cbc76467fc70d18cdb22f08
+SIZE (FFMpeg-20050526.tar.bz2) = 1599199
diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile b/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile
index 96f23b48f7da..e2d43cc5c7a3 100644
--- a/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile
+++ b/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile
@@ -1,13 +1,28 @@
---- libavcodec/Makefile.orig	Sun May  1 17:07:56 2005
-+++ libavcodec/Makefile	Sun May  1 17:08:29 2005
-@@ -303,8 +303,8 @@
+--- libavcodec/Makefile.orig	Sun May 22 20:58:35 2005
++++ libavcodec/Makefile	Thu May 26 13:30:41 2005
+@@ -463,8 +463,7 @@
  	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
  else
  	install -d $(libdir)
 -	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavcodec-$(VERSION).so
 -	ln -sf libavcodec-$(VERSION).so $(libdir)/libavcodec.so
-+	${BSD_INSTALL_DATA} $(SLIB) $(prefix)/lib/libavcodec.so.1
-+	cd $(prefix)/lib && ln -sf libavcodec.so.1 libavcodec.so
- 	ldconfig || true
++	${BSD_INSTALL_DATA} $(SLIB) $(libdir)/libavcodec.so
+ 	$(LDCONFIG) || true
  endif
  ifeq ($(CONFIG_PP),yes)
+@@ -479,12 +478,12 @@
+ 
+ install-headers:
+ 	mkdir -p "$(prefix)/include/ffmpeg"
+-	install -m 644 $(SRC_PATH)/libavcodec/avcodec.h \
++	${BSD_INSTALL_DATA} $(SRC_PATH)/libavcodec/avcodec.h \
+ 	               $(SRC_PATH)/libavcodec/common.h \
+ 	               $(SRC_PATH)/libavcodec/rational.h \
+                 "$(prefix)/include/ffmpeg"
+-	install -d $(libdir)/pkgconfig
+-	install -m 644 ../libavcodec.pc $(libdir)/pkgconfig
++	install -d $(prefix)/libdata/pkgconfig
++	${BSD_INSTALL_DATA} ../libavcodec.pc $(prefix)/libdata/pkgconfig
+ 
+ #
+ # include dependency files if they exist
diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec::libpostproc::Makefile b/multimedia/ffmpeg-devel/files/patch-libavcodec::libpostproc::Makefile
new file mode 100644
index 000000000000..67c531e3bebc
--- /dev/null
+++ b/multimedia/ffmpeg-devel/files/patch-libavcodec::libpostproc::Makefile
@@ -0,0 +1,24 @@
+--- libavcodec/libpostproc/Makefile.orig	Thu May 26 13:50:31 2005
++++ libavcodec/libpostproc/Makefile	Thu May 26 14:00:11 2005
+@@ -56,16 +56,14 @@
+ 	install $(INSTALLSTRIP) -m 755 $(SPPLIB) "$(prefix)"
+ else
+ 	install -d $(libdir)
+-	install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(libdir)/$(SPPLIB).$(SPPVERSION)
+-	ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB)
+-	ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB).$(SPPMAJOR)
+-	install -d $(libdir)/pkgconfig
+-	install -m 644 ../../libpostproc.pc $(libdir)/pkgconfig
++	${BSD_INSTALL_DATA} $(SPPLIB) $(libdir)/libpostproc.so
++	install -d $(prefix)/libdata/pkgconfig
++	${BSD_INSTALL_DATA} ../../libpostproc.pc $(prefix)/libdata/pkgconfig
+ 	$(LDCONFIG) || true
+ endif
+ endif
+-	mkdir -p $(prefix)/include/postproc
+-	install -m 644 $(SRC_PATH)/libavcodec/libpostproc/postprocess.h $(prefix)/include/postproc/postprocess.h
++	mkdir -p $(prefix)/include/ffmpeg/postproc
++	${BSD_INSTALL_DATA} $(SRC_PATH)/libavcodec/libpostproc/postprocess.h $(prefix)/include/ffmpeg/postproc/postprocess.h
+ 
+ 
+ #
diff --git a/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile b/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile
index 5cb229d585e7..74f8e4edd0d6 100644
--- a/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile
+++ b/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile
@@ -1,22 +1,28 @@
---- libavformat/Makefile.orig	Tue Apr 26 07:17:51 2005
-+++ libavformat/Makefile	Sun May  1 17:15:15 2005
-@@ -37,7 +37,7 @@
- OBJS+= framehook.o 
- 
- ifeq ($(CONFIG_VIDEO4LINUX),yes)
--OBJS+= grab.o
-+OBJS+= grab_bsdbktr.o
- endif
- 
- ifeq ($(CONFIG_DV1394),yes)
-@@ -109,8 +109,8 @@
+--- libavformat/Makefile.orig	Sun May 22 20:58:36 2005
++++ libavformat/Makefile	Thu May 26 13:30:00 2005
+@@ -109,8 +109,7 @@
  	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
  else
  	install -d $(libdir)
 -	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavformat-$(VERSION).so
 -	ln -sf libavformat-$(VERSION).so $(libdir)/libavformat.so
-+	${BSD_INSTALL_DATA} $(SLIB) $(prefix)/lib/libavformat.so.1
-+	ln -sf libavformat.so.1 $(prefix)/lib/libavformat.so
- 	ldconfig || true
++	${BSD_INSTALL_DATA} $(SLIB) $(libdir)/libavformat.so
+ 	$(LDCONFIG) || true
  endif
  else
+@@ -122,12 +121,12 @@
+ 
+ install-headers:
+ 	mkdir -p "$(prefix)/include/ffmpeg"
+-	install -m 644 $(SRC_PATH)/libavformat/avformat.h $(SRC_PATH)/libavformat/avio.h \
++	${BSD_INSTALL_DATA} $(SRC_PATH)/libavformat/avformat.h $(SRC_PATH)/libavformat/avio.h \
+                 $(SRC_PATH)/libavformat/rtp.h $(SRC_PATH)/libavformat/rtsp.h \
+                 $(SRC_PATH)/libavformat/rtspcodes.h \
+                 "$(prefix)/include/ffmpeg"
+-	install -d $(libdir)/pkgconfig
+-	install -m 644 ../libavformat.pc $(libdir)/pkgconfig
++	install -d $(prefix)/libdata/pkgconfig
++	${BSD_INSTALL_DATA} ../libavformat.pc $(prefix)/libdata/pkgconfig
+ 
+ %.o: %.c
+ 	$(CC) $(CFLAGS) -c -o $@ $< 
diff --git a/multimedia/ffmpeg-devel/pkg-plist b/multimedia/ffmpeg-devel/pkg-plist
index 9719bf8443bb..226b277554dd 100644
--- a/multimedia/ffmpeg-devel/pkg-plist
+++ b/multimedia/ffmpeg-devel/pkg-plist
@@ -14,7 +14,6 @@ lib/libavcodec.so.%%SHLIB_VERSION%%
 lib/libavformat.a
 lib/libavformat.so
 lib/libavformat.so.%%SHLIB_VERSION%%
-lib/libpostproc.a
-lib/libpostproc.so
-lib/libpostproc.so.0
-lib/libpostproc.so.%%SHLIB_VERSION%%
+libdata/pkgconfig/libavcodec.pc
+libdata/pkgconfig/libavformat.pc
+@unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true